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

Remove "uiConfigName" from uiOrdering-functions

Browse Source
This commit is contained in:
Rebecca Cox 2017-11-06 10:26:16 +01:00
parent de093fda4c
commit 3919b3012b
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp
View File

@ -1184,16 +1184,16 @@ void RimWellRftPlot::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
{
RimWellLogTrack* track = m_wellLogPlot->trackByIndex(0);
track->uiOrderingForShowFormationNamesAndCase(uiConfigName, uiOrdering);
track->uiOrderingForShowFormationNamesAndCase(uiOrdering);
caf::PdmUiGroup* legendAndAxisGroup = uiOrdering.addNewGroup("Legend and Axis");
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);

8
ApplicationCode/ProjectDataModel/RimWellLogPlot.cpp
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");
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;
firstAncestorOrThisOfType(rftp);
@ -580,8 +580,8 @@ void RimWellLogPlot::depthZoomMinMax(double* minimumDepth, double* maximumDepth)
void RimWellLogPlot::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{
uiOrdering.add(&m_userName);
uiOrderingForPlot(uiConfigName, uiOrdering);
uiOrderingForVisibleDepthRange(uiConfigName, uiOrdering);
uiOrderingForPlot(uiOrdering);
uiOrderingForVisibleDepthRange(uiOrdering);
uiOrdering.skipRemainingFields(true);
}

4
ApplicationCode/ProjectDataModel/RimWellLogPlot.h
View File

@ -107,8 +107,8 @@ public:
RimWellPltPlot* pltPlot() const;
bool isPltPlotChild() const;
void uiOrderingForVisibleDepthRange(QString uiConfigName, caf::PdmUiOrdering& uiOrdering);
void uiOrderingForPlot(QString uiConfigName, caf::PdmUiOrdering& uiOrdering);
void uiOrderingForVisibleDepthRange(caf::PdmUiOrdering& uiOrdering);
void uiOrderingForPlot(caf::PdmUiOrdering& uiOrdering);
protected:

6
ApplicationCode/ProjectDataModel/RimWellLogTrack.cpp
View File

@ -763,7 +763,7 @@ void RimWellLogTrack::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
}
}
uiOrderingForVisibleXRange(uiConfigName, uiOrdering);
uiOrderingForVisibleXRange(uiOrdering);
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");
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");
gridGroup->add(&m_isAutoScaleXEnabled);

4
ApplicationCode/ProjectDataModel/RimWellLogTrack.h
View File

@ -99,8 +99,8 @@ public:
QString description();
std::vector<RimWellLogCurve* > curvesVector();
void uiOrderingForShowFormationNamesAndCase(QString uiConfigName, caf::PdmUiOrdering& uiOrdering);
void uiOrderingForVisibleXRange(QString uiConfigName, caf::PdmUiOrdering& uiOrdering);
void uiOrderingForShowFormationNamesAndCase(caf::PdmUiOrdering& uiOrdering);
void uiOrderingForVisibleXRange(caf::PdmUiOrdering& uiOrdering);
private:
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;