From ae20e1af106e3110391e85bd288c39f20bf2afe5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Jensen?= Date: Tue, 31 Oct 2017 12:49:14 +0100 Subject: [PATCH] Refactoring. RimViewWindow.loadDataAndUpdate -> onLoadDataAndUpdate --- .../Flow/RimFlowCharacteristicsPlot.cpp | 10 +++++----- .../Flow/RimFlowCharacteristicsPlot.h | 3 +-- .../RimTofAccumulatedPhaseFractionsPlot.cpp | 6 +++--- .../Flow/RimTofAccumulatedPhaseFractionsPlot.h | 2 +- .../Flow/RimTotalWellAllocationPlot.cpp | 2 +- .../Flow/RimTotalWellAllocationPlot.h | 2 +- .../Flow/RimWellAllocationPlot.cpp | 8 ++++---- .../Flow/RimWellAllocationPlot.h | 3 +-- .../ProjectDataModel/Flow/RimWellPltPlot.cpp | 17 ++++------------- .../ProjectDataModel/Flow/RimWellPltPlot.h | 4 +--- .../ProjectDataModel/Flow/RimWellRftPlot.cpp | 2 +- .../ProjectDataModel/Flow/RimWellRftPlot.h | 3 +-- .../ProjectDataModel/RimEclipseView.cpp | 2 +- .../ProjectDataModel/RimEclipseView.h | 2 +- .../ProjectDataModel/RimGeoMechView.cpp | 2 +- .../ProjectDataModel/RimGeoMechView.h | 5 ++--- ApplicationCode/ProjectDataModel/RimView.h | 3 ++- .../ProjectDataModel/RimViewWindow.cpp | 10 +++++++++- .../ProjectDataModel/RimViewWindow.h | 3 ++- .../ProjectDataModel/RimWellLogPlot.cpp | 2 +- .../ProjectDataModel/RimWellLogPlot.h | 2 +- .../ProjectDataModel/Summary/RimSummaryPlot.cpp | 2 +- .../ProjectDataModel/Summary/RimSummaryPlot.h | 3 +-- 23 files changed, 46 insertions(+), 52 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/Flow/RimFlowCharacteristicsPlot.cpp b/ApplicationCode/ProjectDataModel/Flow/RimFlowCharacteristicsPlot.cpp index b67067dc91..dfc666c5c7 100644 --- a/ApplicationCode/ProjectDataModel/Flow/RimFlowCharacteristicsPlot.cpp +++ b/ApplicationCode/ProjectDataModel/Flow/RimFlowCharacteristicsPlot.cpp @@ -140,7 +140,7 @@ void RimFlowCharacteristicsPlot::setFromFlowSolution(RimFlowDiagSolution* flowSo m_flowDiagSolution = flowSolution; m_showWindow = true; - loadDataAndUpdate(); + onLoadDataAndUpdate(); } //-------------------------------------------------------------------------------------------------- @@ -168,7 +168,7 @@ void RimFlowCharacteristicsPlot::updateCurrentTimeStep() if (m_currentlyPlottedTimeSteps == calculatedTimesteps) return; - this->loadDataAndUpdate(); + this->onLoadDataAndUpdate(); } //-------------------------------------------------------------------------------------------------- @@ -526,7 +526,7 @@ void RimFlowCharacteristicsPlot::fieldChangedByUi(const caf::PdmFieldHandle* cha // All fields update plot - this->loadDataAndUpdate(); + this->onLoadDataAndUpdate(); } //-------------------------------------------------------------------------------------------------- @@ -548,7 +548,7 @@ QImage RimFlowCharacteristicsPlot::snapshotWindowContent() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimFlowCharacteristicsPlot::loadDataAndUpdate() +void RimFlowCharacteristicsPlot::onLoadDataAndUpdate() { updateMdiWindowVisibility(); @@ -652,7 +652,7 @@ void RimFlowCharacteristicsPlot::viewGeometryUpdated() if (m_cellFilter() == RigFlowDiagResults::CELLS_VISIBLE) { // Only need to reload data if cell filtering is based on visible cells in view. - loadDataAndUpdate(); + onLoadDataAndUpdate(); } } diff --git a/ApplicationCode/ProjectDataModel/Flow/RimFlowCharacteristicsPlot.h b/ApplicationCode/ProjectDataModel/Flow/RimFlowCharacteristicsPlot.h index d40b9d84c0..eee505c912 100644 --- a/ApplicationCode/ProjectDataModel/Flow/RimFlowCharacteristicsPlot.h +++ b/ApplicationCode/ProjectDataModel/Flow/RimFlowCharacteristicsPlot.h @@ -65,8 +65,6 @@ public: virtual void zoomAll() override; virtual QWidget* createViewWidget(QWidget* mainWindowParent) override; virtual void deleteViewWidget() override; - virtual void loadDataAndUpdate() override; - void viewGeometryUpdated(); enum TimeSelectionType @@ -85,6 +83,7 @@ protected: virtual QList calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override; virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override; virtual void defineEditorAttribute( const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute ); + virtual void onLoadDataAndUpdate() override; private: diff --git a/ApplicationCode/ProjectDataModel/Flow/RimTofAccumulatedPhaseFractionsPlot.cpp b/ApplicationCode/ProjectDataModel/Flow/RimTofAccumulatedPhaseFractionsPlot.cpp index 7e1309d88b..7f06884d8f 100644 --- a/ApplicationCode/ProjectDataModel/Flow/RimTofAccumulatedPhaseFractionsPlot.cpp +++ b/ApplicationCode/ProjectDataModel/Flow/RimTofAccumulatedPhaseFractionsPlot.cpp @@ -85,7 +85,7 @@ void RimTofAccumulatedPhaseFractionsPlot::deleteViewWidget() //-------------------------------------------------------------------------------------------------- void RimTofAccumulatedPhaseFractionsPlot::reloadFromWell() { - loadDataAndUpdate(); + onLoadDataAndUpdate(); } //-------------------------------------------------------------------------------------------------- @@ -151,7 +151,7 @@ void RimTofAccumulatedPhaseFractionsPlot::fieldChangedByUi(const caf::PdmFieldHa } else if (changedField == &m_maxTof) { - loadDataAndUpdate(); + onLoadDataAndUpdate(); } } @@ -189,7 +189,7 @@ QString RimTofAccumulatedPhaseFractionsPlot::description() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimTofAccumulatedPhaseFractionsPlot::loadDataAndUpdate() +void RimTofAccumulatedPhaseFractionsPlot::onLoadDataAndUpdate() { updateMdiWindowVisibility(); diff --git a/ApplicationCode/ProjectDataModel/Flow/RimTofAccumulatedPhaseFractionsPlot.h b/ApplicationCode/ProjectDataModel/Flow/RimTofAccumulatedPhaseFractionsPlot.h index 240a89d48d..5c7de82fe3 100644 --- a/ApplicationCode/ProjectDataModel/Flow/RimTofAccumulatedPhaseFractionsPlot.h +++ b/ApplicationCode/ProjectDataModel/Flow/RimTofAccumulatedPhaseFractionsPlot.h @@ -74,7 +74,7 @@ public: protected: // RimViewWindow overrides - virtual void loadDataAndUpdate() override; + virtual void onLoadDataAndUpdate() override; virtual QImage snapshotWindowContent() override; // Overridden PDM methods diff --git a/ApplicationCode/ProjectDataModel/Flow/RimTotalWellAllocationPlot.cpp b/ApplicationCode/ProjectDataModel/Flow/RimTotalWellAllocationPlot.cpp index bddfe8075d..de2ff98810 100644 --- a/ApplicationCode/ProjectDataModel/Flow/RimTotalWellAllocationPlot.cpp +++ b/ApplicationCode/ProjectDataModel/Flow/RimTotalWellAllocationPlot.cpp @@ -189,7 +189,7 @@ void RimTotalWellAllocationPlot::clearSlices() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimTotalWellAllocationPlot::loadDataAndUpdate() +void RimTotalWellAllocationPlot::onLoadDataAndUpdate() { updateMdiWindowVisibility(); diff --git a/ApplicationCode/ProjectDataModel/Flow/RimTotalWellAllocationPlot.h b/ApplicationCode/ProjectDataModel/Flow/RimTotalWellAllocationPlot.h index 201a25720e..d842136b0e 100644 --- a/ApplicationCode/ProjectDataModel/Flow/RimTotalWellAllocationPlot.h +++ b/ApplicationCode/ProjectDataModel/Flow/RimTotalWellAllocationPlot.h @@ -70,7 +70,7 @@ public: protected: // RimViewWindow overrides - virtual void loadDataAndUpdate() override; + virtual void onLoadDataAndUpdate() override; virtual QImage snapshotWindowContent() override; // Overridden PDM methods diff --git a/ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp b/ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp index 2e10ed9794..ddc92270c6 100644 --- a/ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp +++ b/ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp @@ -145,7 +145,7 @@ void RimWellAllocationPlot::setFromSimulationWell(RimSimWellInView* simWell) m_flowDiagSolution = m_case->defaultFlowDiagSolution(); } - loadDataAndUpdate(); + onLoadDataAndUpdate(); } //-------------------------------------------------------------------------------------------------- @@ -697,7 +697,7 @@ void RimWellAllocationPlot::fieldChangedByUi(const caf::PdmFieldHandle* changedF if (!sortedWellNames.size()) m_wellName = ""; else if ( sortedWellNames.count(m_wellName()) == 0 ){ m_wellName = *sortedWellNames.begin();} - loadDataAndUpdate(); + onLoadDataAndUpdate(); } else if ( changedField == &m_wellName || changedField == &m_timeStep @@ -706,7 +706,7 @@ void RimWellAllocationPlot::fieldChangedByUi(const caf::PdmFieldHandle* changedF || changedField == &m_smallContributionsThreshold || changedField == &m_flowType ) { - loadDataAndUpdate(); + onLoadDataAndUpdate(); } } @@ -787,7 +787,7 @@ QString RimWellAllocationPlot::description() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimWellAllocationPlot::loadDataAndUpdate() +void RimWellAllocationPlot::onLoadDataAndUpdate() { updateMdiWindowVisibility(); updateFromWell(); diff --git a/ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlot.h b/ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlot.h index 2d59d5fe76..91905fa38b 100644 --- a/ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlot.h +++ b/ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlot.h @@ -66,8 +66,6 @@ public: void setDescription(const QString& description); QString description() const; - virtual void loadDataAndUpdate() override; - virtual QWidget* viewWidget() override; virtual void zoomAll() override; @@ -96,6 +94,7 @@ protected: virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override; + virtual void onLoadDataAndUpdate() override; private: void updateFromWell(); diff --git a/ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.cpp b/ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.cpp index 96ceb66f80..cba9be1b04 100644 --- a/ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.cpp +++ b/ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.cpp @@ -412,16 +412,6 @@ void RimWellPltPlot::updateWidgetTitleWindowTitle() } } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -void RimWellPltPlot::syncCurvesFromUiSelection() -{ - RimWellLogTrack* plotTrack = m_wellLogPlot->trackByIndex(0); - const std::set>& curveDefs = selectedCurveDefs(); - updateCurvesInPlot(curveDefs); -} - //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- @@ -803,9 +793,10 @@ std::pair RimWellPltPlot::curveDefFromCurve(const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimWellPltPlot::updateCurvesInPlot(const std::set>& curveDefs) +void RimWellPltPlot::syncCurvesFromUiSelection() { - RimWellLogTrack* const plotTrack = m_wellLogPlot->trackByIndex(0); + RimWellLogTrack* plotTrack = m_wellLogPlot->trackByIndex(0); + const std::set>& curveDefs = selectedCurveDefs(); setPlotXAxisTitles(plotTrack); @@ -1497,7 +1488,7 @@ QString RimWellPltPlot::description() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimWellPltPlot::loadDataAndUpdate() +void RimWellPltPlot::onLoadDataAndUpdate() { if (m_doInitAfterLoad) { diff --git a/ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.h b/ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.h index fc942221ca..944f895d7b 100644 --- a/ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.h +++ b/ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.h @@ -84,8 +84,6 @@ public: void setDescription(const QString& description); QString description() const; - virtual void loadDataAndUpdate() override; - virtual QWidget* viewWidget() override; virtual void zoomAll() override; @@ -114,6 +112,7 @@ protected: virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override; virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute); + virtual void onLoadDataAndUpdate() override; virtual void initAfterRead() override; virtual void setupBeforeSave() override; @@ -149,7 +148,6 @@ private: std::set> selectedCurveDefs() const; std::set> curveDefsFromCurves() const; std::pair curveDefFromCurve(const RimWellLogCurve* curve) const; - void updateCurvesInPlot(const std::set>& curveDefs); void addStackedCurve(const QString& tracerName, const std::vector& depthValues, const std::vector& accFlow, diff --git a/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp b/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp index c2de2337ce..bfd4e2be28 100644 --- a/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp +++ b/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp @@ -1313,7 +1313,7 @@ QString RimWellRftPlot::description() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimWellRftPlot::loadDataAndUpdate() +void RimWellRftPlot::onLoadDataAndUpdate() { updateMdiWindowVisibility(); m_wellLogPlot->loadDataAndUpdate(); diff --git a/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.h b/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.h index dce13f6168..3b5951dbd1 100644 --- a/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.h +++ b/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.h @@ -71,8 +71,6 @@ public: void setDescription(const QString& description); QString description() const; - virtual void loadDataAndUpdate() override; - virtual QWidget* viewWidget() override; virtual void zoomAll() override; @@ -100,6 +98,7 @@ protected: virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override; + virtual void onLoadDataAndUpdate() override; private: static void addTimeStepToMap(std::map>& destMap, diff --git a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp index 3f9bd01be6..be83250091 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp @@ -736,7 +736,7 @@ void RimEclipseView::updateCurrentTimeStep() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimEclipseView::loadDataAndUpdate() +void RimEclipseView::onLoadDataAndUpdate() { updateScaleTransform(); diff --git a/ApplicationCode/ProjectDataModel/RimEclipseView.h b/ApplicationCode/ProjectDataModel/RimEclipseView.h index 8a29d3708a..0bf3d3edd0 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseView.h +++ b/ApplicationCode/ProjectDataModel/RimEclipseView.h @@ -125,7 +125,6 @@ public: // Display model generation - virtual void loadDataAndUpdate() override; bool isTimeStepDependentDataVisible() const; virtual void scheduleGeometryRegen(RivCellSetEnum geometryType) override; @@ -154,6 +153,7 @@ protected: virtual void initAfterRead() override; virtual void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override; virtual void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "") override; + virtual void onLoadDataAndUpdate() override; virtual void createPartCollectionFromSelection(cvf::Collection* parts) override; virtual bool showActiveCellsOnly() override; diff --git a/ApplicationCode/ProjectDataModel/RimGeoMechView.cpp b/ApplicationCode/ProjectDataModel/RimGeoMechView.cpp index 17c99b3770..f318180a83 100644 --- a/ApplicationCode/ProjectDataModel/RimGeoMechView.cpp +++ b/ApplicationCode/ProjectDataModel/RimGeoMechView.cpp @@ -103,7 +103,7 @@ RimGeoMechView::~RimGeoMechView(void) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimGeoMechView::loadDataAndUpdate() +void RimGeoMechView::onLoadDataAndUpdate() { caf::ProgressInfo progress(7, ""); progress.setNextProgressIncrement(5); diff --git a/ApplicationCode/ProjectDataModel/RimGeoMechView.h b/ApplicationCode/ProjectDataModel/RimGeoMechView.h index e5b3bcaadd..a432329ed3 100644 --- a/ApplicationCode/ProjectDataModel/RimGeoMechView.h +++ b/ApplicationCode/ProjectDataModel/RimGeoMechView.h @@ -63,8 +63,6 @@ public: RimGeoMechCase* geoMechCase(); virtual RimCase* ownerCase() const override; - virtual void loadDataAndUpdate() override; - caf::PdmChildField cellResult; RimGeoMechResultDefinition* cellResultResultDefinition(); @@ -88,7 +86,8 @@ public: protected: virtual void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "") override; - + virtual void onLoadDataAndUpdate() override; + virtual void createPartCollectionFromSelection(cvf::Collection* parts) override; private: diff --git a/ApplicationCode/ProjectDataModel/RimView.h b/ApplicationCode/ProjectDataModel/RimView.h index f6e0c8e4bf..d0b6f04a90 100644 --- a/ApplicationCode/ProjectDataModel/RimView.h +++ b/ApplicationCode/ProjectDataModel/RimView.h @@ -170,7 +170,6 @@ public: void forceShowWindowOn(); public: - virtual void loadDataAndUpdate() = 0; void updateGridBoxData(); virtual RimCase* ownerCase() const = 0; @@ -205,6 +204,8 @@ protected: virtual void resetLegendsInViewer() = 0; virtual void calculateCurrentTotalCellVisibility(cvf::UByteArray* totalVisibility, int timeStep) = 0; + virtual void onLoadDataAndUpdate() = 0; + RimWellPathCollection* wellPathsPartManager(); QPointer m_viewer; diff --git a/ApplicationCode/ProjectDataModel/RimViewWindow.cpp b/ApplicationCode/ProjectDataModel/RimViewWindow.cpp index 4718b549da..c9d7bf5d03 100644 --- a/ApplicationCode/ProjectDataModel/RimViewWindow.cpp +++ b/ApplicationCode/ProjectDataModel/RimViewWindow.cpp @@ -49,6 +49,14 @@ RimViewWindow::~RimViewWindow(void) if ( m_windowController() ) delete m_windowController() ; } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimViewWindow::loadDataAndUpdate() +{ + onLoadDataAndUpdate(); +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- @@ -143,7 +151,7 @@ void RimViewWindow::fieldChangedByUi(const caf::PdmFieldHandle* changedField, co { if (m_showWindow) { - loadDataAndUpdate(); + onLoadDataAndUpdate(); } else { diff --git a/ApplicationCode/ProjectDataModel/RimViewWindow.h b/ApplicationCode/ProjectDataModel/RimViewWindow.h index 96e627faf8..f869994792 100644 --- a/ApplicationCode/ProjectDataModel/RimViewWindow.h +++ b/ApplicationCode/ProjectDataModel/RimViewWindow.h @@ -47,6 +47,7 @@ public: RimViewWindow(void); virtual ~RimViewWindow(void); + void loadDataAndUpdate(); void handleMdiWindowClosed(); void setAs3DViewMdiWindow() { setAsMdiWindow(0); } @@ -72,7 +73,7 @@ protected: virtual void updateViewWidgetAfterCreation() {}; virtual void updateMdiWindowTitle(); // Has real default implementation virtual void deleteViewWidget() = 0; - virtual void loadDataAndUpdate() = 0; + virtual void onLoadDataAndUpdate() = 0; ////////// // Derived classes are not supposed to override this function. The intention is to always use m_showWindow diff --git a/ApplicationCode/ProjectDataModel/RimWellLogPlot.cpp b/ApplicationCode/ProjectDataModel/RimWellLogPlot.cpp index 0cc5716304..f401b7dfc3 100644 --- a/ApplicationCode/ProjectDataModel/RimWellLogPlot.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellLogPlot.cpp @@ -562,7 +562,7 @@ void RimWellLogPlot::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimWellLogPlot::loadDataAndUpdate() +void RimWellLogPlot::onLoadDataAndUpdate() { updateMdiWindowVisibility(); updateTracks(); diff --git a/ApplicationCode/ProjectDataModel/RimWellLogPlot.h b/ApplicationCode/ProjectDataModel/RimWellLogPlot.h index bfc409f8dc..71f2f38d6d 100644 --- a/ApplicationCode/ProjectDataModel/RimWellLogPlot.h +++ b/ApplicationCode/ProjectDataModel/RimWellLogPlot.h @@ -84,7 +84,6 @@ public: RimWellLogTrack* trackByIndex(size_t index); - virtual void loadDataAndUpdate() override; void updateTracks(); void updateTrackNames(); @@ -115,6 +114,7 @@ protected: virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering); virtual caf::PdmFieldHandle* userDescriptionField() { return &m_userName; } virtual QList calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override; + virtual void onLoadDataAndUpdate() override; virtual QImage snapshotWindowContent() override; diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp index 3580750bca..fddde215e2 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp @@ -1029,7 +1029,7 @@ void RimSummaryPlot::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimSummaryPlot::loadDataAndUpdate() +void RimSummaryPlot::onLoadDataAndUpdate() { updateMdiWindowVisibility(); diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.h b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.h index 79fd28e19a..f1a0557475 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.h +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.h @@ -72,8 +72,6 @@ public: caf::PdmObject* findRimCurveFromQwtCurve(const QwtPlotCurve* curve) const; size_t curveCount() const; - virtual void loadDataAndUpdate() override; - void detachAllCurves(); void updateCaseNameHasChanged(); @@ -118,6 +116,7 @@ protected: virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override; virtual void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "") override; virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute); + virtual void onLoadDataAndUpdate() override; virtual QImage snapshotWindowContent() override;