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

#3649 Move from createUiGroup to defineUiOrdering/uiOrdering code in name config.

Browse Source
This commit is contained in:
Gaute Lindkvist
2018-11-09 10:39:23 +01:00
parent 72d3a6b46f
commit 68d12a325f
13 changed files with 81 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ApplicationCode/ProjectDataModel/Rim3dWellLogExtractionCurve.cpp
View File

@@ -508,7 +508,8 @@ void Rim3dWellLogExtractionCurve::defineUiOrdering(QString uiConfigName, caf::Pd
Rim3dWellLogCurve::configurationUiOrdering(uiOrdering);
m_nameConfig()->createUiGroup(uiConfigName, uiOrdering);
caf::PdmUiGroup* nameGroup = uiOrdering.addNewGroup("Curve Name");
m_nameConfig->uiOrdering(uiConfigName, *nameGroup);
uiOrdering.skipRemainingFields(true);
}

3
ApplicationCode/ProjectDataModel/Rim3dWellLogFileCurve.cpp
View File

@@ -252,7 +252,8 @@ void Rim3dWellLogFileCurve::defineUiOrdering(QString uiConfigName, caf::PdmUiOrd
Rim3dWellLogCurve::configurationUiOrdering(uiOrdering);
m_nameConfig()->createUiGroup(uiConfigName, uiOrdering);
caf::PdmUiGroup* nameGroup = uiOrdering.addNewGroup("Curve Name");
m_nameConfig->uiOrdering(uiConfigName, *nameGroup);
uiOrdering.skipRemainingFields(true);
}

3
ApplicationCode/ProjectDataModel/Rim3dWellLogRftCurve.cpp
View File

@@ -218,7 +218,8 @@ void Rim3dWellLogRftCurve::defineUiOrdering(QString uiConfigName, caf::PdmUiOrde
Rim3dWellLogCurve::configurationUiOrdering(uiOrdering);
m_nameConfig()->createUiGroup(uiConfigName, uiOrdering);
caf::PdmUiGroup* nameGroup = uiOrdering.addNewGroup("Curve Name");
m_nameConfig->uiOrdering(uiConfigName, *nameGroup);
uiOrdering.skipRemainingFields(true);
}

26
ApplicationCode/ProjectDataModel/RimContourMapNameConfig.cpp
View File

@@ -41,20 +41,6 @@ RimContourMapNameConfig::RimContourMapNameConfig(const RimNameConfigHolderInterf
m_customName = "Contour Map";
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::PdmUiGroup* RimContourMapNameConfig::createUiGroup(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{
caf::PdmUiGroup* nameGroup = RimNameConfig::createUiGroup(uiConfigName, uiOrdering);
nameGroup->add(&m_addCaseName);
nameGroup->add(&m_addAggregationType);
nameGroup->add(&m_addProperty);
nameGroup->add(&m_addSampleSpacing);
return nameGroup;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -97,3 +83,15 @@ void RimContourMapNameConfig::enableAllAutoNameTags(bool enable)
m_addProperty = enable;
m_addSampleSpacing = enable;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimContourMapNameConfig::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{
RimNameConfig::defineUiOrdering(uiConfigName, uiOrdering);
uiOrdering.add(&m_addCaseName);
uiOrdering.add(&m_addAggregationType);
uiOrdering.add(&m_addProperty);
uiOrdering.add(&m_addSampleSpacing);
}

4
ApplicationCode/ProjectDataModel/RimContourMapNameConfig.h
View File

@@ -30,7 +30,6 @@ class RimContourMapNameConfig : public RimNameConfig
public:
RimContourMapNameConfig(const RimNameConfigHolderInterface* configHolder = nullptr);
caf::PdmUiGroup* createUiGroup(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
bool addCaseName() const;
bool addAggregationType() const;
@@ -39,6 +38,9 @@ public:
void enableAllAutoNameTags(bool enable) override;
protected:
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
private:
caf::PdmField<bool> m_addCaseName;
caf::PdmField<bool> m_addAggregationType;

4
ApplicationCode/ProjectDataModel/RimContourMapView.cpp
View File

@@ -157,7 +157,9 @@ void RimContourMapView::defineUiOrdering(QString uiConfigName, caf::PdmUiOrderin
viewGroup->add(this->backgroundColorField());
viewGroup->add(&m_showAxisLines);
m_nameConfig()->createUiGroup(uiConfigName, uiOrdering);
caf::PdmUiGroup* nameGroup = uiOrdering.addNewGroup("Contour Map Name");
m_nameConfig->uiOrdering(uiConfigName, *nameGroup);
uiOrdering.skipRemainingFields(true);
}

18
ApplicationCode/ProjectDataModel/RimNameConfig.cpp
View File

@@ -77,14 +77,20 @@ QString RimNameConfig::name() const
}
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
caf::PdmUiGroup* RimNameConfig::createUiGroup(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
void RimNameConfig::uiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{
caf::PdmUiGroup* nameGroup = uiOrdering.addNewGroup("Curve Name");
nameGroup->add(&m_customName);
nameGroup->add(&m_autoName);
return nameGroup;
defineUiOrdering(uiConfigName, uiOrdering);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimNameConfig::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{
uiOrdering.add(&m_customName);
uiOrdering.add(&m_autoName);
}
//--------------------------------------------------------------------------------------------------

5
ApplicationCode/ProjectDataModel/RimNameConfig.h
View File

@@ -53,9 +53,10 @@ public:
caf::PdmFieldHandle* nameField();
QString name() const;
virtual caf::PdmUiGroup* createUiGroup(QString uiConfigName, caf::PdmUiOrdering& uiOrdering);
void uiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering);
protected:
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
QString autoName() const;
virtual void updateAllSettings();

27
ApplicationCode/ProjectDataModel/RimWellLogExtractionCurveNameConfig.cpp
View File

@@ -42,20 +42,6 @@ RimWellLogExtractionCurveNameConfig::RimWellLogExtractionCurveNameConfig(const R
m_customName = "Log Extraction";
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::PdmUiGroup* RimWellLogExtractionCurveNameConfig::createUiGroup(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{
caf::PdmUiGroup* nameGroup = RimNameConfig::createUiGroup(uiConfigName, uiOrdering);
nameGroup->add(&m_addCaseName);
nameGroup->add(&m_addProperty);
nameGroup->add(&m_addWellName);
nameGroup->add(&m_addTimestep);
nameGroup->add(&m_addDate);
return nameGroup;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -107,3 +93,16 @@ void RimWellLogExtractionCurveNameConfig::enableAllAutoNameTags(bool enable)
m_addTimestep = enable;
m_addDate = enable;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellLogExtractionCurveNameConfig::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{
RimNameConfig::defineUiOrdering(uiConfigName, uiOrdering);
uiOrdering.add(&m_addCaseName);
uiOrdering.add(&m_addProperty);
uiOrdering.add(&m_addWellName);
uiOrdering.add(&m_addTimestep);
uiOrdering.add(&m_addDate);
}

4
ApplicationCode/ProjectDataModel/RimWellLogExtractionCurveNameConfig.h
View File

@@ -30,7 +30,6 @@ class RimWellLogExtractionCurveNameConfig : public RimNameConfig
public:
RimWellLogExtractionCurveNameConfig(const RimNameConfigHolderInterface* configHolder = nullptr);
caf::PdmUiGroup* createUiGroup(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
bool addCaseName() const;
bool addProperty() const;
@@ -40,6 +39,9 @@ public:
void enableAllAutoNameTags(bool enable) override;
protected:
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
private:
caf::PdmField<bool> m_addCaseName;
caf::PdmField<bool> m_addProperty;

5
ApplicationCode/ProjectDataModel/RimWellLogPlot.cpp
View File

@@ -773,7 +773,10 @@ void RimWellLogPlot::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
m_commonDataSource->uiOrdering(uiConfigName, uiOrdering);
uiOrderingForDepthAxis(uiOrdering);
uiOrderingForPlotSettings(uiOrdering);
m_nameConfig()->createUiGroup(uiConfigName, uiOrdering);
caf::PdmUiGroup* nameGroup = uiOrdering.addNewGroup("Plot Name");
m_nameConfig->uiOrdering(uiConfigName, *nameGroup);
uiOrdering.skipRemainingFields(true);
}

27
ApplicationCode/ProjectDataModel/RimWellLogPlotNameConfig.cpp
View File

@@ -42,20 +42,6 @@ RimWellLogPlotNameConfig::RimWellLogPlotNameConfig(const RimNameConfigHolderInte
m_customName = "Well Log Plot";
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::PdmUiGroup* RimWellLogPlotNameConfig::createUiGroup(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{
caf::PdmUiGroup* nameGroup = RimNameConfig::createUiGroup(uiConfigName, uiOrdering);
nameGroup->add(&m_addCaseName);
nameGroup->add(&m_addWellName);
nameGroup->add(&m_addTimestep);
nameGroup->add(&m_addAirGap);
nameGroup->add(&m_addWaterDepth);
return nameGroup;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -108,3 +94,16 @@ void RimWellLogPlotNameConfig::enableAllAutoNameTags(bool enable)
m_addWaterDepth = enable;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellLogPlotNameConfig::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{
RimNameConfig::defineUiOrdering(uiConfigName, uiOrdering);
uiOrdering.add(&m_addCaseName);
uiOrdering.add(&m_addWellName);
uiOrdering.add(&m_addTimestep);
uiOrdering.add(&m_addAirGap);
uiOrdering.add(&m_addWaterDepth);
}

16
ApplicationCode/ProjectDataModel/RimWellLogPlotNameConfig.h
View File

@@ -30,14 +30,16 @@ class RimWellLogPlotNameConfig : public RimNameConfig
public:
RimWellLogPlotNameConfig(const RimNameConfigHolderInterface* configHolder = nullptr);
caf::PdmUiGroup* createUiGroup(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
bool addCaseName() const;
bool addWellName() const;
bool addTimeStep() const;
bool addAirGap() const;
bool addWaterDepth() const;
void enableAllAutoNameTags(bool enable) override;
bool addCaseName() const;
bool addWellName() const;
bool addTimeStep() const;
bool addAirGap() const;
bool addWaterDepth() const;
void enableAllAutoNameTags(bool enable) override;
protected:
void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
private:
caf::PdmField<bool> m_addCaseName;