From 885435fba7b59f950b0213d80a1cc2e571db885a Mon Sep 17 00:00:00 2001 From: Gaute Lindkvist Date: Wed, 11 Sep 2019 15:50:22 +0200 Subject: [PATCH] #4703 Fix changing result position in GeoMech result definition --- .../ProjectDataModel/Rim3dWellLogCurve.cpp | 9 --------- ApplicationCode/ProjectDataModel/Rim3dWellLogCurve.h | 5 +---- .../ProjectDataModel/Rim3dWellLogExtractionCurve.cpp | 6 ++++-- .../ProjectDataModel/Rim3dWellLogFileCurve.cpp | 3 ++- .../ProjectDataModel/Rim3dWellLogRftCurve.cpp | 3 ++- .../ProjectDataModel/RimEclipseResultDefinition.cpp | 2 +- .../ProjectDataModel/RimGeoMechResultDefinition.cpp | 12 +----------- 7 files changed, 11 insertions(+), 29 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/Rim3dWellLogCurve.cpp b/ApplicationCode/ProjectDataModel/Rim3dWellLogCurve.cpp index fc46553295..3accbccb54 100644 --- a/ApplicationCode/ProjectDataModel/Rim3dWellLogCurve.cpp +++ b/ApplicationCode/ProjectDataModel/Rim3dWellLogCurve.cpp @@ -263,15 +263,6 @@ void Rim3dWellLogCurve::initAfterRead() this->createAutoName(); } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void Rim3dWellLogCurve::resetMinMaxValuesAndUpdateUI() -{ - this->resetMinMaxValues(); - this->updateConnectedEditors(); -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/Rim3dWellLogCurve.h b/ApplicationCode/ProjectDataModel/Rim3dWellLogCurve.h index 99f09ffad2..cce593410d 100644 --- a/ApplicationCode/ProjectDataModel/Rim3dWellLogCurve.h +++ b/ApplicationCode/ProjectDataModel/Rim3dWellLogCurve.h @@ -88,7 +88,7 @@ public: float minCurveUIValue() const; float maxCurveUIValue() const; - void resetMinMaxValuesAndUpdateUI(); + void resetMinMaxValues(); bool findClosestPointOnCurve( const cvf::Vec3d& globalIntersection, cvf::Vec3d* closestPoint, double* measuredDepthAtPoint, @@ -108,9 +108,6 @@ protected: caf::PdmUiEditorAttribute* attribute ) override; void initAfterRead() override; -private: - void resetMinMaxValues(); - protected: caf::PdmField m_drawPlane; caf::PdmField m_color; diff --git a/ApplicationCode/ProjectDataModel/Rim3dWellLogExtractionCurve.cpp b/ApplicationCode/ProjectDataModel/Rim3dWellLogExtractionCurve.cpp index 2f10e1d552..f37d232720 100644 --- a/ApplicationCode/ProjectDataModel/Rim3dWellLogExtractionCurve.cpp +++ b/ApplicationCode/ProjectDataModel/Rim3dWellLogExtractionCurve.cpp @@ -439,11 +439,13 @@ void Rim3dWellLogExtractionCurve::fieldChangedByUi( const caf::PdmFieldHandle* c m_geomResultDefinition->setGeoMechCase( geoMechCase ); } - this->resetMinMaxValuesAndUpdateUI(); + this->resetMinMaxValues(); + this->updateConnectedEditors(); } else if ( changedField == &m_timeStep ) { - this->resetMinMaxValuesAndUpdateUI(); + this->resetMinMaxValues(); + this->updateConnectedEditors(); } Rim3dWellLogCurve::fieldChangedByUi( changedField, oldValue, newValue ); } diff --git a/ApplicationCode/ProjectDataModel/Rim3dWellLogFileCurve.cpp b/ApplicationCode/ProjectDataModel/Rim3dWellLogFileCurve.cpp index cfd65e55b2..b209282090 100644 --- a/ApplicationCode/ProjectDataModel/Rim3dWellLogFileCurve.cpp +++ b/ApplicationCode/ProjectDataModel/Rim3dWellLogFileCurve.cpp @@ -183,7 +183,8 @@ void Rim3dWellLogFileCurve::fieldChangedByUi( const caf::PdmFieldHandle* changed { if ( changedField == &m_wellLogFile || changedField == &m_wellLogChannelName ) { - this->resetMinMaxValuesAndUpdateUI(); + this->resetMinMaxValues(); + this->updateConnectedEditors(); } Rim3dWellLogCurve::fieldChangedByUi( changedField, oldValue, newValue ); } diff --git a/ApplicationCode/ProjectDataModel/Rim3dWellLogRftCurve.cpp b/ApplicationCode/ProjectDataModel/Rim3dWellLogRftCurve.cpp index 42fd129c08..e23e55209e 100644 --- a/ApplicationCode/ProjectDataModel/Rim3dWellLogRftCurve.cpp +++ b/ApplicationCode/ProjectDataModel/Rim3dWellLogRftCurve.cpp @@ -148,7 +148,8 @@ void Rim3dWellLogRftCurve::fieldChangedByUi( const caf::PdmFieldHandle* changedF { if ( changedField == &m_wellLogChannelName || changedField == &m_timeStep ) { - this->resetMinMaxValuesAndUpdateUI(); + this->resetMinMaxValues(); + this->updateConnectedEditors(); } Rim3dWellLogCurve::fieldChangedByUi( changedField, oldValue, newValue ); } diff --git a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp index 819c0eafcc..7dd4425c55 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp @@ -435,7 +435,7 @@ void RimEclipseResultDefinition::updateAnyFieldHasChanged() this->firstAncestorOrThisOfType( rim3dWellLogCurve ); if ( rim3dWellLogCurve ) { - rim3dWellLogCurve->resetMinMaxValuesAndUpdateUI(); + rim3dWellLogCurve->resetMinMaxValues(); } RimEclipseContourMapProjection* contourMap = nullptr; diff --git a/ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.cpp b/ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.cpp index b0cf9d764a..d601c5f882 100644 --- a/ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.cpp +++ b/ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.cpp @@ -379,19 +379,9 @@ void RimGeoMechResultDefinition::fieldChangedByUi( const caf::PdmFieldHandle* ch } } - if ( propFilter ) - { - propFilter->updateConnectedEditors(); - } - - if ( curve ) - { - curve->updateConnectedEditors(); - } - if ( rim3dWellLogCurve ) { - rim3dWellLogCurve->resetMinMaxValuesAndUpdateUI(); + rim3dWellLogCurve->resetMinMaxValues(); } }