diff --git a/ApplicationCode/ModelVisualization/Riv3dWellLogPlanePartMgr.cpp b/ApplicationCode/ModelVisualization/Riv3dWellLogPlanePartMgr.cpp index 3af944b13d..ab5d95b3db 100644 --- a/ApplicationCode/ModelVisualization/Riv3dWellLogPlanePartMgr.cpp +++ b/ApplicationCode/ModelVisualization/Riv3dWellLogPlanePartMgr.cpp @@ -88,9 +88,8 @@ void Riv3dWellLogPlanePartMgr::appendPlaneToModel(cvf::ModelBasicList* } for (Rim3dWellLogCurve* rim3dWellLogCurve : m_wellPath->rim3dWellLogCurveCollection()->vectorOf3dWellLogCurves()) { - if (rim3dWellLogCurve->isShowingTimeDependentResultInView(m_gridView) != isStaticResult) + if (rim3dWellLogCurve->showInView(m_gridView) && rim3dWellLogCurve->isShowingTimeDependentResult() != isStaticResult) { - append3dWellLogCurveToModel(model, displayCoordTransform, wellPathClipBoundingBox, diff --git a/ApplicationCode/ProjectDataModel/Rim3dView.cpp b/ApplicationCode/ProjectDataModel/Rim3dView.cpp index d52301a474..8349d352ef 100644 --- a/ApplicationCode/ProjectDataModel/Rim3dView.cpp +++ b/ApplicationCode/ProjectDataModel/Rim3dView.cpp @@ -419,7 +419,7 @@ bool Rim3dView::hasVisibleTimeStepDependent3dWellLogCurves() const wellPathCollection()->descendantsIncludingThisOfType(wellLogCurves); for (const Rim3dWellLogCurve* curve : wellLogCurves) { - if (curve->isShowingTimeDependentResultInView(this)) + if (curve->showInView(this) && curve->isShowingTimeDependentResult()) { return true; } diff --git a/ApplicationCode/ProjectDataModel/Rim3dWellLogCurve.h b/ApplicationCode/ProjectDataModel/Rim3dWellLogCurve.h index 3c218da2a1..480b3d60a6 100644 --- a/ApplicationCode/ProjectDataModel/Rim3dWellLogCurve.h +++ b/ApplicationCode/ProjectDataModel/Rim3dWellLogCurve.h @@ -66,8 +66,8 @@ public: cvf::Color3f color() const; bool isShowingCurve() const; - virtual bool isShowingTimeDependentResultInView(const Rim3dView* gridView) const { return showInView(gridView); } - virtual bool showInView(const Rim3dView* gridView) const { return isShowingCurve(); } + virtual bool isShowingTimeDependentResult() const { return isShowingCurve(); } + virtual bool showInView(const Rim3dView* gridView) const { return isShowingCurve(); } virtual bool followAnimationTimeStep() const { return false; } virtual void curveValuesAndMds(std::vector* values, std::vector* measuredDepthValues) const = 0; virtual void curveValuesAndMdsAtTimeStep(std::vector* values, std::vector* measuredDepthValues, int timeStep) const; diff --git a/ApplicationCode/ProjectDataModel/Rim3dWellLogExtractionCurve.cpp b/ApplicationCode/ProjectDataModel/Rim3dWellLogExtractionCurve.cpp index 11cd0d7fcf..5ca4654383 100644 --- a/ApplicationCode/ProjectDataModel/Rim3dWellLogExtractionCurve.cpp +++ b/ApplicationCode/ProjectDataModel/Rim3dWellLogExtractionCurve.cpp @@ -378,20 +378,16 @@ double Rim3dWellLogExtractionCurve::rkbDiff() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool Rim3dWellLogExtractionCurve::isShowingTimeDependentResultInView(const Rim3dView* gridView) const +bool Rim3dWellLogExtractionCurve::isShowingTimeDependentResult() const { - if (showInView(gridView)) + if (dynamic_cast(m_case())) { - if (dynamic_cast(m_case())) - { - return m_eclipseResultDefinition->hasDynamicResult(); - } - else if (dynamic_cast(m_case())) - { - return m_geomResultDefinition->hasResult(); - } + return m_eclipseResultDefinition->hasDynamicResult(); + } + else if (dynamic_cast(m_case())) + { + return m_geomResultDefinition->hasResult(); } - return false; } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/Rim3dWellLogExtractionCurve.h b/ApplicationCode/ProjectDataModel/Rim3dWellLogExtractionCurve.h index c76cda2b59..22510a404f 100644 --- a/ApplicationCode/ProjectDataModel/Rim3dWellLogExtractionCurve.h +++ b/ApplicationCode/ProjectDataModel/Rim3dWellLogExtractionCurve.h @@ -54,7 +54,7 @@ public: virtual QString createAutoName() const override; double rkbDiff() const; - virtual bool isShowingTimeDependentResultInView(const Rim3dView* gridView) const override; + virtual bool isShowingTimeDependentResult() const override; virtual bool showInView(const Rim3dView* gridView) const override;