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

#1340 AppFwk : Improve how defineUiOrdering handles remaining fields

Browse Source
This commit is contained in:
Magne Sjaastad
2017-03-21 13:47:53 +01:00
parent 98bb97ea34
commit df3ef7106d
17 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Application/RiaPreferences.cpp
View File

@@ -191,7 +191,7 @@ void RiaPreferences::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
uiOrdering.add(&defaultCurveFilter); uiOrdering.add(&defaultCurveFilter);
} }
uiOrdering.setForgetRemainingFields(true); uiOrdering.skipRemainingFields(true);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

2
ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp
View File

@@ -207,7 +207,7 @@ void Rim3dOverlayInfoConfig::defineUiOrdering(QString uiConfigName, caf::PdmUiOr
} }
statGroup->add(&m_statisticsCellRange); statGroup->add(&m_statisticsCellRange);
uiOrdering.setForgetRemainingFields(true); uiOrdering.skipRemainingFields(true);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

2
ApplicationCode/ProjectDataModel/RimCellEdgeColors.cpp
View File

@@ -273,7 +273,7 @@ void RimCellEdgeColors::defineUiOrdering(QString uiConfigName, caf::PdmUiOrderin
uiOrdering.add(&useZVariable); uiOrdering.add(&useZVariable);
} }
uiOrdering.setForgetRemainingFields(true); uiOrdering.skipRemainingFields(true);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

2
ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.cpp
View File

@@ -206,7 +206,7 @@ void RimEclipsePropertyFilter::defineUiOrdering(QString uiConfigName, caf::PdmUi
uiOrdering.add(&m_upperBound); uiOrdering.add(&m_upperBound);
} }
uiOrdering.setForgetRemainingFields(true); uiOrdering.skipRemainingFields(true);
updateReadOnlyStateOfAllFields(); updateReadOnlyStateOfAllFields();
updateRangeLabel(); updateRangeLabel();

2
ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp
View File

@@ -945,7 +945,7 @@ void RimEclipseResultDefinition::defineUiOrdering(QString uiConfigName, caf::Pdm
} }
uiOrdering.add(&m_resultVariableUiField); uiOrdering.add(&m_resultVariableUiField);
uiOrdering.setForgetRemainingFields(true); uiOrdering.skipRemainingFields(true);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

2
ApplicationCode/ProjectDataModel/RimEclipseWell.cpp
View File

@@ -353,7 +353,7 @@ void RimEclipseWell::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
showWellCellFence.uiCapability()->setUiReadOnly(!showWellCells()); showWellCellFence.uiCapability()->setUiReadOnly(!showWellCells());
uiOrdering.setForgetRemainingFields(true); uiOrdering.skipRemainingFields(true);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

2
ApplicationCode/ProjectDataModel/RimGeoMechPropertyFilter.cpp
View File

@@ -150,7 +150,7 @@ void RimGeoMechPropertyFilter::defineUiOrdering(QString uiConfigName, caf::PdmUi
updateReadOnlyStateOfAllFields(); updateReadOnlyStateOfAllFields();
uiOrdering.setForgetRemainingFields(true); uiOrdering.skipRemainingFields(true);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

2
ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.cpp
View File

@@ -119,7 +119,7 @@ void RimGeoMechResultDefinition::defineUiOrdering(QString uiConfigName, caf::Pdm
if (m_isTimeLapseResultUiField()) if (m_isTimeLapseResultUiField())
timeLapseGr->add(&m_timeLapseBaseTimestepUiField); timeLapseGr->add(&m_timeLapseBaseTimestepUiField);
uiOrdering.setForgetRemainingFields(true); uiOrdering.skipRemainingFields(true);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

2
ApplicationCode/ProjectDataModel/RimIntersection.cpp
View File

@@ -228,7 +228,7 @@ void RimIntersection::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
updateWellExtentDefaultValue(); updateWellExtentDefaultValue();
uiOrdering.setForgetRemainingFields(true); uiOrdering.skipRemainingFields(true);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

2
ApplicationCode/ProjectDataModel/RimTernaryLegendConfig.cpp
View File

@@ -321,7 +321,7 @@ void RimTernaryLegendConfig::defineUiOrdering(QString uiConfigName, caf::PdmUiOr
group->add(&ternaryRangeSummary); group->add(&ternaryRangeSummary);
} }
uiOrdering.setForgetRemainingFields(true); uiOrdering.skipRemainingFields(true);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

2
ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp
View File

@@ -420,7 +420,7 @@ void RimWellLogExtractionCurve::defineUiOrdering(QString uiConfigName, caf::PdmU
} }
uiOrdering.setForgetRemainingFields(true); uiOrdering.skipRemainingFields(true);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

2
ApplicationCode/ProjectDataModel/RimWellLogPlot.cpp
View File

@@ -483,7 +483,7 @@ void RimWellLogPlot::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
uiOrdering.add(&m_showTrackLegends); uiOrdering.add(&m_showTrackLegends);
uiOrdering.setForgetRemainingFields(true); uiOrdering.skipRemainingFields(true);
} }

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

@@ -462,7 +462,7 @@ void RimSummaryCurve::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
uiOrdering.add(&m_plotAxis); uiOrdering.add(&m_plotAxis);
uiOrdering.setForgetRemainingFields(true); // For now. uiOrdering.skipRemainingFields(true); // For now.
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

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

@@ -225,7 +225,7 @@ void RimSummaryCurveFilter::defineUiOrdering(QString uiConfigName, caf::PdmUiOrd
uiOrdering.add(&m_autoApplyChangesToPlot); uiOrdering.add(&m_autoApplyChangesToPlot);
uiOrdering.add(&m_applyButtonField); uiOrdering.add(&m_applyButtonField);
uiOrdering.setForgetRemainingFields(true); uiOrdering.skipRemainingFields(true);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

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

@@ -301,7 +301,7 @@ void RimSummaryTimeAxisProperties::defineUiOrdering(QString uiConfigName, caf::P
timeGroup->add(&m_visibleTimeRangeMin); timeGroup->add(&m_visibleTimeRangeMin);
} }
uiOrdering.setForgetRemainingFields(true); uiOrdering.skipRemainingFields(true);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

13
Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiObjectHandle.cpp
View File

@@ -37,9 +37,12 @@ PdmUiObjectHandle* uiObj(PdmObjectHandle* obj)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void PdmUiObjectHandle::uiOrdering(QString uiConfigName, PdmUiOrdering& uiOrdering) void PdmUiObjectHandle::uiOrdering(QString uiConfigName, PdmUiOrdering& uiOrdering)
{ {
#if 1 // Restore state for includeRemainingFields, as this flag
// can be changed in defineUiOrdering()
bool includeRemaining_originalState = uiOrdering.includeRemainingFields();
this->defineUiOrdering(uiConfigName, uiOrdering); this->defineUiOrdering(uiConfigName, uiOrdering);
if (!uiOrdering.forgetRemainingFields()) if (uiOrdering.includeRemainingFields())
{ {
// Add the remaining Fields To UiConfig // Add the remaining Fields To UiConfig
std::vector<PdmFieldHandle*> fields; std::vector<PdmFieldHandle*> fields;
@@ -53,7 +56,11 @@ void PdmUiObjectHandle::uiOrdering(QString uiConfigName, PdmUiOrdering& uiOrderi
} }
} }
} }
#endif
// Restore incoming value
uiOrdering.skipRemainingFields(!includeRemaining_originalState);
CAF_ASSERT(includeRemaining_originalState == uiOrdering.includeRemainingFields());
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

8
Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiOrdering.h
View File

@@ -55,7 +55,7 @@ class PdmObjectHandle;
class PdmUiOrdering class PdmUiOrdering
{ {
public: public:
PdmUiOrdering(): m_forgetRemainingFields(false) { }; PdmUiOrdering(): m_skipRemainingFields(false) { };
virtual ~PdmUiOrdering(); virtual ~PdmUiOrdering();
PdmUiOrdering(const PdmUiOrdering&) = delete; PdmUiOrdering(const PdmUiOrdering&) = delete;
@@ -68,8 +68,8 @@ public:
void add(const PdmFieldHandle* field); void add(const PdmFieldHandle* field);
void add(const PdmObjectHandle* obj); void add(const PdmObjectHandle* obj);
bool forgetRemainingFields() const { return m_forgetRemainingFields; } bool includeRemainingFields() const { return !m_skipRemainingFields; }
void setForgetRemainingFields(bool val) { m_forgetRemainingFields = val; } void skipRemainingFields(bool val) { m_skipRemainingFields = val; }
const std::vector<PdmUiItem*>& uiItems() const { return m_ordering; } const std::vector<PdmUiItem*>& uiItems() const { return m_ordering; }
bool contains(const PdmUiItem* item) const; bool contains(const PdmUiItem* item) const;
@@ -77,7 +77,7 @@ public:
private: private:
std::vector<PdmUiItem*> m_ordering; ///< The order of groups and fields std::vector<PdmUiItem*> m_ordering; ///< The order of groups and fields
std::vector<PdmUiGroup*> m_createdGroups; ///< Owned PdmUiGroups, for mem management std::vector<PdmUiGroup*> m_createdGroups; ///< Owned PdmUiGroups, for mem management
bool m_forgetRemainingFields; bool m_skipRemainingFields;
}; };
//================================================================================================== //==================================================================================================