From 3e40331c5bed8c9486a7a32e4fb8d318987cdddf Mon Sep 17 00:00:00 2001 From: Rebecca Cox Date: Sun, 12 Nov 2017 21:22:12 +0100 Subject: [PATCH] #2129 Rft/Plt plot: Show formations on default --- ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.cpp | 8 ++++++++ ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp | 2 ++ ApplicationCode/ProjectDataModel/RimWellLogTrack.cpp | 8 ++++++++ ApplicationCode/ProjectDataModel/RimWellLogTrack.h | 2 ++ 4 files changed, 20 insertions(+) diff --git a/ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.cpp b/ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.cpp index 58851782fa..0dc81625dd 100644 --- a/ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.cpp +++ b/ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.cpp @@ -1119,6 +1119,7 @@ void RimWellPltPlot::fieldChangedByUi(const caf::PdmFieldHandle* changedField, c plotTrack->removeCurve(curve); } m_timeStepsToAddresses.clear(); + updateFormationsOnPlot(); } else if (changedField == &m_selectedSources) { @@ -1128,6 +1129,7 @@ void RimWellPltPlot::fieldChangedByUi(const caf::PdmFieldHandle* changedField, c if (changedField == &m_selectedSources || changedField == &m_selectedTimeSteps) { + updateFormationsOnPlot(); syncSourcesIoFieldFromGuiField(); syncCurvesFromUiSelection(); } @@ -1254,6 +1256,11 @@ void RimWellPltPlot::initAfterLoad() } } m_selectedSources = std::vector(selectedSources.begin(), selectedSources.end()); + + if( m_wellLogPlot->trackCount() > 0); + { + m_wellLogPlot->trackByIndex(0)->setShowFormations(true); + } } //-------------------------------------------------------------------------------------------------- @@ -1438,6 +1445,7 @@ void RimWellPltPlot::onLoadDataAndUpdate() } updateMdiWindowVisibility(); + updateFormationsOnPlot(); syncCurvesFromUiSelection(); m_wellLogPlot->loadDataAndUpdate(); } diff --git a/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp b/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp index eb70c01331..315f9c4d2f 100644 --- a/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp +++ b/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp @@ -258,6 +258,8 @@ void RimWellRftPlot::updateFormationsOnPlot() const { if (m_wellLogPlot->trackCount() > 0) { + m_wellLogPlot->trackByIndex(0)->setShowFormations(true); + RimProject* proj = RiaApplication::instance()->project(); RimWellPath* wellPath = proj->wellPathByName(m_wellPathNameOrSimWellName); diff --git a/ApplicationCode/ProjectDataModel/RimWellLogTrack.cpp b/ApplicationCode/ProjectDataModel/RimWellLogTrack.cpp index c40093e935..94f3eb629c 100644 --- a/ApplicationCode/ProjectDataModel/RimWellLogTrack.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellLogTrack.cpp @@ -655,6 +655,14 @@ void RimWellLogTrack::updateXZoom() updateConnectedEditors(); } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimWellLogTrack::setShowFormations(bool on) +{ + m_showFormations = on; +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/RimWellLogTrack.h b/ApplicationCode/ProjectDataModel/RimWellLogTrack.h index 77656eee60..101f35a56e 100644 --- a/ApplicationCode/ProjectDataModel/RimWellLogTrack.h +++ b/ApplicationCode/ProjectDataModel/RimWellLogTrack.h @@ -91,6 +91,8 @@ public: void updateXZoomAndParentPlotDepthZoom(); void updateXZoom(); + void setShowFormations(bool on); + RiuWellLogTrack* viewer(); RimWellLogCurve* curveDefinitionFromCurve(const QwtPlotCurve* curve) const;