OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#1344 Replaced use of defineUiOrdering() with uiOrdering()

Browse Source
This commit is contained in:
Jacob Støren 2017-03-22 15:02:42 +01:00
parent c77e674601
commit b443b6662d
8 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ProjectDataModel/RimCellEdgeColors.cpp
View File

@ -262,7 +262,7 @@ void RimCellEdgeColors::defineUiOrdering(QString uiConfigName, caf::PdmUiOrderin
if (isUsingSingleVariable()) if (isUsingSingleVariable())
{ {
m_singleVarEdgeResultColors->defineUiOrdering(uiConfigName,uiOrdering ); m_singleVarEdgeResultColors->uiOrdering(uiConfigName,uiOrdering );
} }
else else
{ {

2
ApplicationCode/ProjectDataModel/RimEclipseFaultColors.cpp
View File

@ -111,7 +111,7 @@ caf::PdmFieldHandle* RimEclipseFaultColors::objectToggleField()
void RimEclipseFaultColors::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) void RimEclipseFaultColors::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{ {
caf::PdmUiGroup* group1 = uiOrdering.addNewGroup("Result"); caf::PdmUiGroup* group1 = uiOrdering.addNewGroup("Result");
m_customFaultResultColors->defineUiOrdering(uiConfigName, *group1); m_customFaultResultColors->uiOrdering(uiConfigName, *group1);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

2
ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.cpp
View File

@ -184,7 +184,7 @@ void RimEclipsePropertyFilter::defineUiOrdering(QString uiConfigName, caf::PdmUi
// Fields declared in RimResultDefinition // Fields declared in RimResultDefinition
caf::PdmUiGroup* group1 = uiOrdering.addNewGroup("Result"); caf::PdmUiGroup* group1 = uiOrdering.addNewGroup("Result");
resultDefinition->defineUiOrdering(uiConfigName, *group1); resultDefinition->uiOrdering(uiConfigName, *group1);
// Fields declared in RimCellFilter // Fields declared in RimCellFilter
uiOrdering.add(&filterMode); uiOrdering.add(&filterMode);

2
ApplicationCode/ProjectDataModel/RimGeoMechPropertyFilter.cpp
View File

@ -133,7 +133,7 @@ void RimGeoMechPropertyFilter::defineUiOrdering(QString uiConfigName, caf::PdmUi
uiOrdering.add(&name); uiOrdering.add(&name);
caf::PdmUiGroup* group1 = uiOrdering.addNewGroup("Result"); caf::PdmUiGroup* group1 = uiOrdering.addNewGroup("Result");
resultDefinition->defineUiOrdering(uiConfigName, *group1); resultDefinition->uiOrdering(uiConfigName, *group1);
uiOrdering.add(&isActive); uiOrdering.add(&isActive);
uiOrdering.add(&filterMode); uiOrdering.add(&filterMode);

6
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp
View File

@ -441,7 +441,7 @@ void RimSummaryCurve::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
curveDataGroup->add(&m_selectedVariableDisplayField); curveDataGroup->add(&m_selectedVariableDisplayField);
caf::PdmUiGroup* curveVarSelectionGroup = curveDataGroup->addNewGroup("Vector Selection"); caf::PdmUiGroup* curveVarSelectionGroup = curveDataGroup->addNewGroup("Vector Selection");
m_summaryFilter->defineUiOrdering(uiConfigName, *curveVarSelectionGroup); m_summaryFilter->uiOrdering(uiConfigName, *curveVarSelectionGroup);
curveVarSelectionGroup->add(&m_uiFilterResultSelection); curveVarSelectionGroup->add(&m_uiFilterResultSelection);
@ -457,12 +457,12 @@ void RimSummaryCurve::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
if (m_isUsingAutoName) if (m_isUsingAutoName)
{ {
caf::PdmUiGroup* autoNameGroup = appearanceGroup->addNewGroup("Auto Name Config"); caf::PdmUiGroup* autoNameGroup = appearanceGroup->addNewGroup("Auto Name Config");
m_curveNameConfig->defineUiOrdering(uiConfigName, *autoNameGroup); m_curveNameConfig->uiOrdering(uiConfigName, *autoNameGroup);
} }
uiOrdering.add(&m_plotAxis); uiOrdering.add(&m_plotAxis);
uiOrdering.skipRemainingFields(true); // For now. uiOrdering.skipRemainingFields(); // For now.
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

2
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveAutoName.cpp
View File

@ -279,6 +279,8 @@ void RimSummaryCurveAutoName::defineUiOrdering(QString uiConfigName, caf::PdmUiO
} }
uiOrdering.add(&m_showAdvancedProperties); uiOrdering.add(&m_showAdvancedProperties);
uiOrdering.skipRemainingFields();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

4
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveFilter.cpp
View File

@ -194,7 +194,7 @@ void RimSummaryCurveFilter::defineUiOrdering(QString uiConfigName, caf::PdmUiOrd
caf::PdmUiGroup* curveVarSelectionGroup = curveDataGroup->addNewGroup("Vector Selection"); caf::PdmUiGroup* curveVarSelectionGroup = curveDataGroup->addNewGroup("Vector Selection");
m_summaryFilter->defineUiOrdering(uiConfigName, *curveVarSelectionGroup); m_summaryFilter->uiOrdering(uiConfigName, *curveVarSelectionGroup);
curveVarSelectionGroup->add(&m_uiFilterResultMultiSelection); curveVarSelectionGroup->add(&m_uiFilterResultMultiSelection);
@ -219,7 +219,7 @@ void RimSummaryCurveFilter::defineUiOrdering(QString uiConfigName, caf::PdmUiOrd
} }
caf::PdmUiGroup* autoNameGroup = uiOrdering.addNewGroup("Curve Name Configuration"); caf::PdmUiGroup* autoNameGroup = uiOrdering.addNewGroup("Curve Name Configuration");
m_curveNameConfig->defineUiOrdering(uiConfigName, *autoNameGroup); m_curveNameConfig->uiOrdering(uiConfigName, *autoNameGroup);
uiOrdering.add(&m_plotAxis); uiOrdering.add(&m_plotAxis);
uiOrdering.add(&m_autoApplyChangesToPlot); uiOrdering.add(&m_autoApplyChangesToPlot);

2
ApplicationCode/ProjectDataModel/Summary/RimSummaryFilter.cpp
View File

@ -446,6 +446,8 @@ void RimSummaryFilter::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering
} }
} }
uiOrdering.skipRemainingFields();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------