OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-12 08:25:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove "uiConfigName" from uiOrdering-functions

Browse Source
This commit is contained in:
Rebecca Cox committed 2017-11-07 10:00:10 +01:00
1 parent de093fda4c
commit 3919b3012b
5 files changed
+15 -15
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp
+4 -4
View File
@@ -1184,16 +1184,16 @@ void RimWellRftPlot::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
{ {
RimWellLogTrack* track = m_wellLogPlot->trackByIndex(0); RimWellLogTrack* track = m_wellLogPlot->trackByIndex(0);
track->uiOrderingForShowFormationNamesAndCase(uiConfigName, uiOrdering); track->uiOrderingForShowFormationNamesAndCase(uiOrdering);
caf::PdmUiGroup* legendAndAxisGroup = uiOrdering.addNewGroup("Legend and Axis"); caf::PdmUiGroup* legendAndAxisGroup = uiOrdering.addNewGroup("Legend and Axis");
legendAndAxisGroup->setCollapsedByDefault(true); legendAndAxisGroup->setCollapsedByDefault(true);
m_wellLogPlot->uiOrderingForPlot(uiConfigName, *legendAndAxisGroup); m_wellLogPlot->uiOrderingForPlot(*legendAndAxisGroup);
track->uiOrderingForVisibleXRange(uiConfigName, *legendAndAxisGroup); track->uiOrderingForVisibleXRange(*legendAndAxisGroup);
m_wellLogPlot->uiOrderingForVisibleDepthRange(uiConfigName, *legendAndAxisGroup); m_wellLogPlot->uiOrderingForVisibleDepthRange(*legendAndAxisGroup);
} }
uiOrdering.skipRemainingFields(true); uiOrdering.skipRemainingFields(true);
ApplicationCode/ProjectDataModel/RimWellLogPlot.cpp
+4 -4
View File
@@ -532,7 +532,7 @@ bool RimWellLogPlot::isPltPlotChild() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimWellLogPlot::uiOrderingForVisibleDepthRange(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) void RimWellLogPlot::uiOrderingForVisibleDepthRange(caf::PdmUiOrdering& uiOrdering)
{ {
caf::PdmUiGroup* gridGroup = uiOrdering.addNewGroup("Visible Depth Range"); caf::PdmUiGroup* gridGroup = uiOrdering.addNewGroup("Visible Depth Range");
gridGroup->add(&m_isAutoScaleDepthEnabled); gridGroup->add(&m_isAutoScaleDepthEnabled);
@@ -543,7 +543,7 @@ void RimWellLogPlot::uiOrderingForVisibleDepthRange(QString uiConfigName, caf::P
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimWellLogPlot::uiOrderingForPlot(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) void RimWellLogPlot::uiOrderingForPlot(caf::PdmUiOrdering& uiOrdering)
{ {
RimWellRftPlot* rftp; RimWellRftPlot* rftp;
firstAncestorOrThisOfType(rftp); firstAncestorOrThisOfType(rftp);
@@ -580,8 +580,8 @@ void RimWellLogPlot::depthZoomMinMax(double* minimumDepth, double* maximumDepth)
void RimWellLogPlot::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) void RimWellLogPlot::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{ {
uiOrdering.add(&m_userName); uiOrdering.add(&m_userName);
uiOrderingForPlot(uiConfigName, uiOrdering); uiOrderingForPlot(uiOrdering);
uiOrderingForVisibleDepthRange(uiConfigName, uiOrdering); uiOrderingForVisibleDepthRange(uiOrdering);
uiOrdering.skipRemainingFields(true); uiOrdering.skipRemainingFields(true);
} }
ApplicationCode/ProjectDataModel/RimWellLogPlot.h
+2 -2
View File
@@ -107,8 +107,8 @@ public:
RimWellPltPlot* pltPlot() const; RimWellPltPlot* pltPlot() const;
bool isPltPlotChild() const; bool isPltPlotChild() const;
void uiOrderingForVisibleDepthRange(QString uiConfigName, caf::PdmUiOrdering& uiOrdering); void uiOrderingForVisibleDepthRange(caf::PdmUiOrdering& uiOrdering);
void uiOrderingForPlot(QString uiConfigName, caf::PdmUiOrdering& uiOrdering); void uiOrderingForPlot(caf::PdmUiOrdering& uiOrdering);
protected: protected:
ApplicationCode/ProjectDataModel/RimWellLogTrack.cpp
+3 -3
View File
@@ -763,7 +763,7 @@ void RimWellLogTrack::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
} }
} }
uiOrderingForVisibleXRange(uiConfigName, uiOrdering); uiOrderingForVisibleXRange(uiOrdering);
uiOrdering.skipRemainingFields(true); uiOrdering.skipRemainingFields(true);
} }
@@ -893,7 +893,7 @@ std::vector<RimWellLogCurve* > RimWellLogTrack::curvesVector()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimWellLogTrack::uiOrderingForShowFormationNamesAndCase(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) void RimWellLogTrack::uiOrderingForShowFormationNamesAndCase(caf::PdmUiOrdering& uiOrdering)
{ {
caf::PdmUiGroup* formationGroup = uiOrdering.addNewGroup("Formation Names"); caf::PdmUiGroup* formationGroup = uiOrdering.addNewGroup("Formation Names");
formationGroup->setCollapsedByDefault(true); formationGroup->setCollapsedByDefault(true);
@@ -904,7 +904,7 @@ void RimWellLogTrack::uiOrderingForShowFormationNamesAndCase(QString uiConfigNam
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimWellLogTrack::uiOrderingForVisibleXRange(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) void RimWellLogTrack::uiOrderingForVisibleXRange(caf::PdmUiOrdering& uiOrdering)
{ {
caf::PdmUiGroup* gridGroup = uiOrdering.addNewGroup("Visible X Axis Range"); caf::PdmUiGroup* gridGroup = uiOrdering.addNewGroup("Visible X Axis Range");
gridGroup->add(&m_isAutoScaleXEnabled); gridGroup->add(&m_isAutoScaleXEnabled);
ApplicationCode/ProjectDataModel/RimWellLogTrack.h
+2 -2
View File
@@ -99,8 +99,8 @@ public:
QString description(); QString description();
std::vector<RimWellLogCurve* > curvesVector(); std::vector<RimWellLogCurve* > curvesVector();
void uiOrderingForShowFormationNamesAndCase(QString uiConfigName, caf::PdmUiOrdering& uiOrdering); void uiOrderingForShowFormationNamesAndCase(caf::PdmUiOrdering& uiOrdering);
void uiOrderingForVisibleXRange(QString uiConfigName, caf::PdmUiOrdering& uiOrdering); void uiOrderingForVisibleXRange(caf::PdmUiOrdering& uiOrdering);
private: private:
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override; virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;