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 AppFwk: Cleaning up in PdmUiOrdering

Browse Source
This commit is contained in:
Jacob Støren
2017-03-22 15:02:06 +01:00
parent c39462d19a
commit c77e674601
3 changed files with 35 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,10 +39,10 @@ void PdmUiObjectHandle::uiOrdering(QString uiConfigName, PdmUiOrdering& uiOrderi
{
// Restore state for includeRemainingFields, as this flag
// can be changed in defineUiOrdering()
bool includeRemaining_originalState = uiOrdering.includeRemainingFields();
bool includeRemaining_originalState = uiOrdering.isIncludingRemainingFields();
this->defineUiOrdering(uiConfigName, uiOrdering);
if (uiOrdering.includeRemainingFields())
if (uiOrdering.isIncludingRemainingFields())
{
// Add the remaining Fields To UiConfig
std::vector<PdmFieldHandle*> fields;
@@ -60,7 +60,7 @@ void PdmUiObjectHandle::uiOrdering(QString uiConfigName, PdmUiOrdering& uiOrderi
// Restore incoming value
uiOrdering.skipRemainingFields(!includeRemaining_originalState);
CAF_ASSERT(includeRemaining_originalState == uiOrdering.includeRemainingFields());
CAF_ASSERT(includeRemaining_originalState == uiOrdering.isIncludingRemainingFields());
}
//--------------------------------------------------------------------------------------------------