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: Renamed methods in uiTreeOrdering to align with uiOrdering

Browse Source
This commit is contained in:
Jacob Støren
2017-03-22 15:57:04 +01:00
parent 908fc991bf
commit cde71ef07a
12 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -110,7 +110,7 @@ PdmUiTreeOrdering* PdmUiObjectHandle::uiTreeOrdering(QString uiConfigName /*= ""
void PdmUiObjectHandle::addDefaultUiTreeChildren(PdmUiTreeOrdering* uiTreeOrdering)
{
#if 1
if (!uiTreeOrdering->forgetRemainingFields())
if (uiTreeOrdering->isIncludingRemainingChildren())
{
// Add the remaining Fields To UiConfig
std::vector<PdmFieldHandle*> fields;

12
Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiTreeOrdering.h
View File

@@ -76,9 +76,9 @@ public:
void add(PdmObjectHandle* object);
PdmUiTreeOrdering* add(const QString & title, const QString& iconResourceName );
/// If the rest of the fields containing children is supposed to be omitted, setForgetRemainingFileds to true.
void setForgetRemainingFields(bool val) { m_forgetRemainingFields = val; }
/// To stop the tree generation at this level, doIgnoreSubTree to true
/// If the rest of the fields containing children is supposed to be omitted, set skipRemainingFields to true.
void skipRemainingChildren(bool doSkip = true) { m_forgetRemainingFields = doSkip; }
/// To stop the tree generation at this level, setIgnoreSubTree to true
void setIgnoreSubTree(bool doIgnoreSubTree ) { m_isToIgnoreSubTree = doIgnoreSubTree; }
// Testing for the PdmItem being represented
@@ -89,7 +89,7 @@ public:
// Access to the PdmItem being represented
PdmUiItem* activeItem() const;
PdmObjectHandle* object() const;
PdmObjectHandle* object() const;
PdmFieldHandle* field() const;
PdmUiItem* uiItem() const;
@@ -104,8 +104,8 @@ public:
private:
friend class PdmObjectHandle; friend class PdmUiObjectHandle;
bool forgetRemainingFields() const { return m_forgetRemainingFields; }
bool ignoreSubTree() const { return m_isToIgnoreSubTree; }
bool isIncludingRemainingChildren() const { return !m_forgetRemainingFields; }
bool ignoreSubTree() const { return m_isToIgnoreSubTree; }
bool containsField(const PdmFieldHandle* field);
bool containsObject(const PdmObjectHandle* object);
void appendChild( PdmUiTreeOrdering* child);