From 5aa6ebbd76c2487f56d5cba3f9b3ba1a508f68ae Mon Sep 17 00:00:00 2001 From: Gaute Lindkvist Date: Tue, 15 May 2018 17:54:20 +0200 Subject: [PATCH] #2922 Change curve min/max when updating case and timestep. --- .../ProjectDataModel/Rim3dWellLogExtractionCurve.cpp | 12 ++++++++++++ .../ProjectDataModel/Rim3dWellLogExtractionCurve.h | 1 + .../ProjectDataModel/Rim3dWellLogRftCurve.cpp | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ApplicationCode/ProjectDataModel/Rim3dWellLogExtractionCurve.cpp b/ApplicationCode/ProjectDataModel/Rim3dWellLogExtractionCurve.cpp index d7cb84510b..6bbac0de76 100644 --- a/ApplicationCode/ProjectDataModel/Rim3dWellLogExtractionCurve.cpp +++ b/ApplicationCode/ProjectDataModel/Rim3dWellLogExtractionCurve.cpp @@ -265,6 +265,18 @@ caf::PdmFieldHandle* Rim3dWellLogExtractionCurve::userDescriptionField() return m_nameConfig()->nameField(); } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void Rim3dWellLogExtractionCurve::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) +{ + if (changedField == &m_timeStep || changedField == &m_case) + { + this->resetMinMaxValuesAndUpdateUI(); + } + Rim3dWellLogCurve::fieldChangedByUi(changedField, oldValue, newValue); +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/Rim3dWellLogExtractionCurve.h b/ApplicationCode/ProjectDataModel/Rim3dWellLogExtractionCurve.h index cdbb90a382..a37e06aec5 100644 --- a/ApplicationCode/ProjectDataModel/Rim3dWellLogExtractionCurve.h +++ b/ApplicationCode/ProjectDataModel/Rim3dWellLogExtractionCurve.h @@ -50,6 +50,7 @@ public: virtual QString createCurveAutoName() const override; protected: virtual caf::PdmFieldHandle* userDescriptionField() override; + virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override; private: virtual QList calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override; diff --git a/ApplicationCode/ProjectDataModel/Rim3dWellLogRftCurve.cpp b/ApplicationCode/ProjectDataModel/Rim3dWellLogRftCurve.cpp index 94cf60912d..29fb3db642 100644 --- a/ApplicationCode/ProjectDataModel/Rim3dWellLogRftCurve.cpp +++ b/ApplicationCode/ProjectDataModel/Rim3dWellLogRftCurve.cpp @@ -142,7 +142,7 @@ void Rim3dWellLogRftCurve::fieldChangedByUi(const caf::PdmFieldHandle* changedFi const QVariant& oldValue, const QVariant& newValue) { - if (changedField == &m_wellLogChannelName) + if (changedField == &m_wellLogChannelName || changedField == &m_timeStep) { this->resetMinMaxValuesAndUpdateUI(); }