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

#4703 Fix changing result position in GeoMech result definition

Browse Source
This commit is contained in:
Gaute Lindkvist 2019-09-11 15:50:22 +02:00
parent 2d555e1b67
commit 885435fba7
7 changed files with 11 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ApplicationCode/ProjectDataModel/Rim3dWellLogCurve.cpp
View File

@ -263,15 +263,6 @@ void Rim3dWellLogCurve::initAfterRead()
this->createAutoName(); this->createAutoName();
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void Rim3dWellLogCurve::resetMinMaxValuesAndUpdateUI()
{
this->resetMinMaxValues();
this->updateConnectedEditors();
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

5
ApplicationCode/ProjectDataModel/Rim3dWellLogCurve.h
View File

@ -88,7 +88,7 @@ public:
float minCurveUIValue() const; float minCurveUIValue() const;
float maxCurveUIValue() const; float maxCurveUIValue() const;
void resetMinMaxValuesAndUpdateUI(); void resetMinMaxValues();
bool findClosestPointOnCurve( const cvf::Vec3d& globalIntersection, bool findClosestPointOnCurve( const cvf::Vec3d& globalIntersection,
cvf::Vec3d* closestPoint, cvf::Vec3d* closestPoint,
double* measuredDepthAtPoint, double* measuredDepthAtPoint,
@ -108,9 +108,6 @@ protected:
caf::PdmUiEditorAttribute* attribute ) override; caf::PdmUiEditorAttribute* attribute ) override;
void initAfterRead() override; void initAfterRead() override;
private:
void resetMinMaxValues();
protected: protected:
caf::PdmField<DrawPlaneEnum> m_drawPlane; caf::PdmField<DrawPlaneEnum> m_drawPlane;
caf::PdmField<cvf::Color3f> m_color; caf::PdmField<cvf::Color3f> m_color;

6
ApplicationCode/ProjectDataModel/Rim3dWellLogExtractionCurve.cpp
View File

@ -439,11 +439,13 @@ void Rim3dWellLogExtractionCurve::fieldChangedByUi( const caf::PdmFieldHandle* c
m_geomResultDefinition->setGeoMechCase( geoMechCase ); m_geomResultDefinition->setGeoMechCase( geoMechCase );
} }
this->resetMinMaxValuesAndUpdateUI(); this->resetMinMaxValues();
this->updateConnectedEditors();
} }
else if ( changedField == &m_timeStep ) else if ( changedField == &m_timeStep )
{ {
this->resetMinMaxValuesAndUpdateUI(); this->resetMinMaxValues();
this->updateConnectedEditors();
} }
Rim3dWellLogCurve::fieldChangedByUi( changedField, oldValue, newValue ); Rim3dWellLogCurve::fieldChangedByUi( changedField, oldValue, newValue );
} }

3
ApplicationCode/ProjectDataModel/Rim3dWellLogFileCurve.cpp
View File

@ -183,7 +183,8 @@ void Rim3dWellLogFileCurve::fieldChangedByUi( const caf::PdmFieldHandle* changed
{ {
if ( changedField == &m_wellLogFile || changedField == &m_wellLogChannelName ) if ( changedField == &m_wellLogFile || changedField == &m_wellLogChannelName )
{ {
this->resetMinMaxValuesAndUpdateUI(); this->resetMinMaxValues();
this->updateConnectedEditors();
} }
Rim3dWellLogCurve::fieldChangedByUi( changedField, oldValue, newValue ); Rim3dWellLogCurve::fieldChangedByUi( changedField, oldValue, newValue );
} }

3
ApplicationCode/ProjectDataModel/Rim3dWellLogRftCurve.cpp
View File

@ -148,7 +148,8 @@ void Rim3dWellLogRftCurve::fieldChangedByUi( const caf::PdmFieldHandle* changedF
{ {
if ( changedField == &m_wellLogChannelName || changedField == &m_timeStep ) if ( changedField == &m_wellLogChannelName || changedField == &m_timeStep )
{ {
this->resetMinMaxValuesAndUpdateUI(); this->resetMinMaxValues();
this->updateConnectedEditors();
} }
Rim3dWellLogCurve::fieldChangedByUi( changedField, oldValue, newValue ); Rim3dWellLogCurve::fieldChangedByUi( changedField, oldValue, newValue );
} }

2
ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp
View File

@ -435,7 +435,7 @@ void RimEclipseResultDefinition::updateAnyFieldHasChanged()
this->firstAncestorOrThisOfType( rim3dWellLogCurve ); this->firstAncestorOrThisOfType( rim3dWellLogCurve );
if ( rim3dWellLogCurve ) if ( rim3dWellLogCurve )
{ {
rim3dWellLogCurve->resetMinMaxValuesAndUpdateUI(); rim3dWellLogCurve->resetMinMaxValues();
} }
RimEclipseContourMapProjection* contourMap = nullptr; RimEclipseContourMapProjection* contourMap = nullptr;

12
ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.cpp
View File

@ -379,19 +379,9 @@ void RimGeoMechResultDefinition::fieldChangedByUi( const caf::PdmFieldHandle* ch
} }
} }
if ( propFilter )
{
propFilter->updateConnectedEditors();
}
if ( curve )
{
curve->updateConnectedEditors();
}
if ( rim3dWellLogCurve ) if ( rim3dWellLogCurve )
{ {
rim3dWellLogCurve->resetMinMaxValuesAndUpdateUI(); rim3dWellLogCurve->resetMinMaxValues();
} }
} }