From 614a3628f03c9b1dd4a8709d3ba894b742fe65d1 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Mon, 18 Mar 2019 12:41:44 +0100 Subject: [PATCH] Add collection and feature to create saturation pressure plots --- .../Application/RiaApplication.cpp | 49 +++++--- .../CMakeLists_files.cmake | 5 +- ...icCreateSaturationPressurePlotsFeature.cpp | 117 ++++++++++++++++++ .../RicCreateSaturationPressurePlotsFeature.h | 34 +++++ .../GridCrossPlots/CMakeLists_files.cmake | 7 +- .../GridCrossPlots/RimGridCrossPlot.cpp | 22 ++++ .../GridCrossPlots/RimGridCrossPlot.h | 3 + .../RimGridCrossPlotCollection.h | 5 - .../RimGridCrossPlotCurveSet.cpp | 17 +++ .../GridCrossPlots/RimGridCrossPlotCurveSet.h | 3 + .../RimSaturationPressurePlot.cpp | 80 ++++++++++++ .../RimSaturationPressurePlot.h | 39 ++++++ .../RimSaturationPressurePlotCollection.cpp | 82 ++++++++++++ .../RimSaturationPressurePlotCollection.h | 45 +++++++ .../RimContextCommandBuilder.cpp | 5 + .../RimMainPlotCollection.cpp | 18 ++- .../ProjectDataModel/RimMainPlotCollection.h | 66 +++++----- .../RimPlotAxisAnnotation.cpp | 16 ++- .../ProjectDataModel/RimPlotAxisAnnotation.h | 11 +- .../RimPlotAxisProperties.cpp | 26 +++- .../ProjectDataModel/RimPlotAxisProperties.h | 4 + .../ProjectDataModel/RimProject.cpp | 6 + 22 files changed, 595 insertions(+), 65 deletions(-) create mode 100644 ApplicationCode/Commands/GridCrossPlotCommands/RicCreateSaturationPressurePlotsFeature.cpp create mode 100644 ApplicationCode/Commands/GridCrossPlotCommands/RicCreateSaturationPressurePlotsFeature.h create mode 100644 ApplicationCode/ProjectDataModel/GridCrossPlots/RimSaturationPressurePlot.cpp create mode 100644 ApplicationCode/ProjectDataModel/GridCrossPlots/RimSaturationPressurePlot.h create mode 100644 ApplicationCode/ProjectDataModel/GridCrossPlots/RimSaturationPressurePlotCollection.cpp create mode 100644 ApplicationCode/ProjectDataModel/GridCrossPlots/RimSaturationPressurePlotCollection.h diff --git a/ApplicationCode/Application/RiaApplication.cpp b/ApplicationCode/Application/RiaApplication.cpp index cb61f61917..bb1af6e0ed 100644 --- a/ApplicationCode/Application/RiaApplication.cpp +++ b/ApplicationCode/Application/RiaApplication.cpp @@ -60,6 +60,8 @@ #include "RimPltPlotCollection.h" #include "RimProject.h" #include "RimRftPlotCollection.h" +#include "RimSaturationPressurePlot.h" +#include "RimSaturationPressurePlotCollection.h" #include "RimStimPlanColors.h" #include "RimSummaryCase.h" #include "RimSummaryCaseCollection.h" @@ -214,7 +216,7 @@ RiaApplication::RiaApplication(int& argc, char** argv) setWindowIcon(QIcon(":/AppLogo48x48.png")); - m_socketServer = new RiaSocketServer(this); + m_socketServer = new RiaSocketServer(this); #ifdef WIN32 m_startupDefaultDirectory = QDir::homePath(); @@ -227,7 +229,7 @@ RiaApplication::RiaApplication(int& argc, char** argv) // The creation of a font is time consuming, so make sure you really need your own font // instead of using the application font m_standardFont = RiaFontCache::getFont(RiaFontCache::FONT_SIZE_8); - + m_recentFileActionProvider = std::unique_ptr(new RiuRecentFileActionProvider); // Create main windows @@ -660,13 +662,14 @@ bool RiaApplication::loadProject(const QString& projectFileName) //-------------------------------------------------------------------------------------------------- void RiaApplication::loadAndUpdatePlotData() { - RimWellLogPlotCollection* wlpColl = nullptr; - RimSummaryPlotCollection* spColl = nullptr; - RimSummaryCrossPlotCollection* scpColl = nullptr; - RimFlowPlotCollection* flowColl = nullptr; - RimRftPlotCollection* rftColl = nullptr; - RimPltPlotCollection* pltColl = nullptr; - RimGridCrossPlotCollection* gcpColl = nullptr; + RimWellLogPlotCollection* wlpColl = nullptr; + RimSummaryPlotCollection* spColl = nullptr; + RimSummaryCrossPlotCollection* scpColl = nullptr; + RimFlowPlotCollection* flowColl = nullptr; + RimRftPlotCollection* rftColl = nullptr; + RimPltPlotCollection* pltColl = nullptr; + RimGridCrossPlotCollection* gcpColl = nullptr; + RimSaturationPressurePlotCollection* sppColl = nullptr; if (m_project->mainPlotCollection() && m_project->mainPlotCollection()->wellLogPlotCollection()) { @@ -696,6 +699,10 @@ void RiaApplication::loadAndUpdatePlotData() { gcpColl = m_project->mainPlotCollection()->gridCrossPlotCollection(); } + if (m_project->mainPlotCollection() && m_project->mainPlotCollection()->saturationPressurePlotCollection()) + { + sppColl = m_project->mainPlotCollection()->saturationPressurePlotCollection(); + } size_t plotCount = 0; plotCount += wlpColl ? wlpColl->wellLogPlots().size() : 0; @@ -705,6 +712,7 @@ void RiaApplication::loadAndUpdatePlotData() plotCount += rftColl ? rftColl->rftPlots().size() : 0; plotCount += pltColl ? pltColl->pltPlots().size() : 0; plotCount += gcpColl ? gcpColl->gridCrossPlots().size() : 0; + plotCount += sppColl ? sppColl->plots().size() : 0; if (plotCount > 0) { @@ -769,6 +777,15 @@ void RiaApplication::loadAndUpdatePlotData() plotProgress.incrementProgress(); } } + + if (sppColl) + { + for (const auto& sppPlot : sppColl->plots()) + { + sppPlot->loadDataAndUpdate(); + plotProgress.incrementProgress(); + } + } } } @@ -1420,7 +1437,7 @@ void RiaApplication::createMainWindow() m_mainWindow->setDefaultWindowSize(); m_mainWindow->setDefaultToolbarVisibility(); m_mainWindow->loadWinGeoAndDockToolBarLayout(); - m_mainWindow->showWindow(); + m_mainWindow->showWindow(); } //-------------------------------------------------------------------------------------------------- @@ -1579,7 +1596,8 @@ void RiaApplication::closeMainPlotWindowIfOpenButHidden() //-------------------------------------------------------------------------------------------------- void RiaApplication::addToRecentFiles(const QString& fileName) { - CVF_ASSERT(m_recentFileActionProvider && "The provider needs to be created before any attempts to use the recent file actions"); + CVF_ASSERT(m_recentFileActionProvider && + "The provider needs to be created before any attempts to use the recent file actions"); m_recentFileActionProvider->addFileName(fileName); } @@ -1588,7 +1606,8 @@ void RiaApplication::addToRecentFiles(const QString& fileName) //-------------------------------------------------------------------------------------------------- std::vector RiaApplication::recentFileActions() const { - CVF_ASSERT(m_recentFileActionProvider && "The provider needs to be created before any attempts to use the recent file actions"); + CVF_ASSERT(m_recentFileActionProvider && + "The provider needs to be created before any attempts to use the recent file actions"); return m_recentFileActionProvider->actions(); } @@ -1852,8 +1871,7 @@ bool RiaApplication::launchProcess(const QString& program, const QStringList& ar m_mainWindow->processMonitor()->stopMonitorWorkProcess(); - QMessageBox::warning( - m_mainWindow, "Script execution", "Failed to start script executable located at\n" + program); + QMessageBox::warning(m_mainWindow, "Script execution", "Failed to start script executable located at\n" + program); return false; } @@ -1915,8 +1933,7 @@ void RiaApplication::applyPreferences() if (m_mainWindow && m_mainWindow->projectTreeView()) { - m_mainWindow->projectTreeView()->enableAppendOfClassNameToUiItemText( - m_preferences->appendClassNameToUiText()); + m_mainWindow->projectTreeView()->enableAppendOfClassNameToUiItemText(m_preferences->appendClassNameToUiText()); if (mainPlotWindow()) mainPlotWindow()->projectTreeView()->enableAppendOfClassNameToUiItemText(m_preferences->appendClassNameToUiText()); } diff --git a/ApplicationCode/Commands/GridCrossPlotCommands/CMakeLists_files.cmake b/ApplicationCode/Commands/GridCrossPlotCommands/CMakeLists_files.cmake index 48f34dd236..58af3577f4 100644 --- a/ApplicationCode/Commands/GridCrossPlotCommands/CMakeLists_files.cmake +++ b/ApplicationCode/Commands/GridCrossPlotCommands/CMakeLists_files.cmake @@ -4,13 +4,16 @@ ${CMAKE_CURRENT_LIST_DIR}/RicCreateGridCrossPlotFeature.h ${CMAKE_CURRENT_LIST_DIR}/RicCreateGridCrossPlotCurveSetFeature.h ${CMAKE_CURRENT_LIST_DIR}/RicSwapGridCrossPlotCurveSetAxesFeature.h ${CMAKE_CURRENT_LIST_DIR}/RicPasteGridCrossPlotCurveSetFeature.h +${CMAKE_CURRENT_LIST_DIR}/RicCreateSaturationPressurePlotsFeature.h ) set (SOURCE_GROUP_SOURCE_FILES ${CMAKE_CURRENT_LIST_DIR}/RicCreateGridCrossPlotFeature.cpp ${CMAKE_CURRENT_LIST_DIR}/RicCreateGridCrossPlotCurveSetFeature.cpp ${CMAKE_CURRENT_LIST_DIR}/RicSwapGridCrossPlotCurveSetAxesFeature.cpp -${CMAKE_CURRENT_LIST_DIR}/RicPasteGridCrossPlotCurveSetFeature.cpp) +${CMAKE_CURRENT_LIST_DIR}/RicPasteGridCrossPlotCurveSetFeature.cpp +${CMAKE_CURRENT_LIST_DIR}/RicCreateSaturationPressurePlotsFeature.cpp +) list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES} diff --git a/ApplicationCode/Commands/GridCrossPlotCommands/RicCreateSaturationPressurePlotsFeature.cpp b/ApplicationCode/Commands/GridCrossPlotCommands/RicCreateSaturationPressurePlotsFeature.cpp new file mode 100644 index 0000000000..e11a8736fb --- /dev/null +++ b/ApplicationCode/Commands/GridCrossPlotCommands/RicCreateSaturationPressurePlotsFeature.cpp @@ -0,0 +1,117 @@ +///////////////////////////////////////////////////////////////////////////////// +// +// Copyright (C) 2019- Equinor ASA +// +// ResInsight is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at +// for more details. +// +///////////////////////////////////////////////////////////////////////////////// + +#include "RicCreateSaturationPressurePlotsFeature.h" + +#include "RiaApplication.h" + +#include "RimEclipseResultCase.h" +#include "RimMainPlotCollection.h" +#include "RimProject.h" +#include "RimSaturationPressurePlot.h" +#include "RimSaturationPressurePlotCollection.h" + +#include "RiuPlotMainWindowTools.h" + +#include "cafSelectionManager.h" + +#include + +CAF_CMD_SOURCE_INIT(RicCreateSaturationPressurePlotsFeature, "RicCreateSaturationPressurePlotsFeature"); + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +bool RicCreateSaturationPressurePlotsFeature::isCommandEnabled() +{ + return true; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RicCreateSaturationPressurePlotsFeature::onActionTriggered(bool isChecked) +{ + RimProject* project = RiaApplication::instance()->project(); + + bool launchedFromPlotCollection = true; + RimSaturationPressurePlotCollection* collection = + caf::SelectionManager::instance()->selectedItemAncestorOfType(); + + if (!collection) + { + collection = project->mainPlotCollection()->saturationPressurePlotCollection(); + launchedFromPlotCollection = false; + } + + std::vector eclipseCases; + { + RiaApplication* app = RiaApplication::instance(); + std::vector cases; + app->project()->allCases(cases); + for (auto* rimCase : cases) + { + auto erc = dynamic_cast(rimCase); + if (erc) + { + eclipseCases.push_back(erc); + } + } + } + + RimEclipseResultCase* eclipseResultCase = nullptr; + if (eclipseCases.size() == 1) + { + eclipseResultCase = eclipseCases[0]; + } + + if (eclipseResultCase) + { + eclipseResultCase->ensureReservoirCaseIsOpen(); + collection->createSaturationPressurePlots(eclipseResultCase); + + std::vector plots = collection->plots(); + for (auto plot : plots) + { + plot->loadDataAndUpdate(); + plot->zoomAll(); + plot->updateConnectedEditors(); + } + } + + collection->updateAllRequiredEditors(); + RiaApplication::instance()->getOrCreateAndShowMainPlotWindow(); +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RicCreateSaturationPressurePlotsFeature::setupActionLook(QAction* actionToSetup) +{ + RimSaturationPressurePlotCollection* collection = + caf::SelectionManager::instance()->selectedItemAncestorOfType(); + if (!collection) + { + actionToSetup->setText("New Grid Cross Plot from 3d View"); + } + else + { + actionToSetup->setText("Create Saturation Pressure Plots"); + } + actionToSetup->setIcon(QIcon(":/SummaryXPlotsLight16x16.png")); +} diff --git a/ApplicationCode/Commands/GridCrossPlotCommands/RicCreateSaturationPressurePlotsFeature.h b/ApplicationCode/Commands/GridCrossPlotCommands/RicCreateSaturationPressurePlotsFeature.h new file mode 100644 index 0000000000..4875c48629 --- /dev/null +++ b/ApplicationCode/Commands/GridCrossPlotCommands/RicCreateSaturationPressurePlotsFeature.h @@ -0,0 +1,34 @@ +///////////////////////////////////////////////////////////////////////////////// +// +// Copyright (C) 2019- Equinor ASA +// +// ResInsight is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at +// for more details. +// +///////////////////////////////////////////////////////////////////////////////// + +#pragma once + +#include "cafCmdFeature.h" + +//================================================================================================== +/// +//================================================================================================== +class RicCreateSaturationPressurePlotsFeature : public caf::CmdFeature +{ + CAF_CMD_HEADER_INIT; + +protected: + bool isCommandEnabled() override; + void onActionTriggered(bool isChecked) override; + void setupActionLook(QAction* actionToSetup) override; +}; diff --git a/ApplicationCode/ProjectDataModel/GridCrossPlots/CMakeLists_files.cmake b/ApplicationCode/ProjectDataModel/GridCrossPlots/CMakeLists_files.cmake index 60f8ca7c71..3f8b551631 100644 --- a/ApplicationCode/ProjectDataModel/GridCrossPlots/CMakeLists_files.cmake +++ b/ApplicationCode/ProjectDataModel/GridCrossPlots/CMakeLists_files.cmake @@ -4,13 +4,18 @@ ${CMAKE_CURRENT_LIST_DIR}/RimGridCrossPlot.h ${CMAKE_CURRENT_LIST_DIR}/RimGridCrossPlotCollection.h ${CMAKE_CURRENT_LIST_DIR}/RimGridCrossPlotCurve.h ${CMAKE_CURRENT_LIST_DIR}/RimGridCrossPlotCurveSet.h +${CMAKE_CURRENT_LIST_DIR}/RimSaturationPressurePlot.h +${CMAKE_CURRENT_LIST_DIR}/RimSaturationPressurePlotCollection.h ) set (SOURCE_GROUP_SOURCE_FILES ${CMAKE_CURRENT_LIST_DIR}/RimGridCrossPlot.cpp ${CMAKE_CURRENT_LIST_DIR}/RimGridCrossPlotCollection.cpp ${CMAKE_CURRENT_LIST_DIR}/RimGridCrossPlotCurve.cpp -${CMAKE_CURRENT_LIST_DIR}/RimGridCrossPlotCurveSet.cpp) +${CMAKE_CURRENT_LIST_DIR}/RimGridCrossPlotCurveSet.cpp +${CMAKE_CURRENT_LIST_DIR}/RimSaturationPressurePlot.cpp +${CMAKE_CURRENT_LIST_DIR}/RimSaturationPressurePlotCollection.cpp +) list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES} diff --git a/ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.cpp b/ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.cpp index 74b579fc5a..92db9015d2 100644 --- a/ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.cpp +++ b/ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.cpp @@ -151,6 +151,8 @@ QImage RimGridCrossPlot::snapshotWindowContent() //-------------------------------------------------------------------------------------------------- void RimGridCrossPlot::zoomAll() { + if (!m_qwtPlot) return; + setAutoZoomForAllAxes(true); updateAxisInQwt(RiaDefines::PLOT_AXIS_LEFT); updateAxisInQwt(RiaDefines::PLOT_AXIS_BOTTOM); @@ -277,6 +279,8 @@ void RimGridCrossPlot::updateAxisScaling() //-------------------------------------------------------------------------------------------------- void RimGridCrossPlot::updateAxisDisplay() { + if (!m_qwtPlot) return; + updateAxisInQwt(RiaDefines::PLOT_AXIS_BOTTOM); updateAxisInQwt(RiaDefines::PLOT_AXIS_LEFT); @@ -663,6 +667,8 @@ QString RimGridCrossPlot::yAxisParameterString() const //-------------------------------------------------------------------------------------------------- void RimGridCrossPlot::updateAxisInQwt(RiaDefines::PlotAxis axisType) { + if (!m_qwtPlot) return; + RimPlotAxisProperties* axisProperties = m_xAxisProperties(); QString axisParameterString = xAxisParameterString(); @@ -799,6 +805,22 @@ std::vector RimGridCrossPlot::visibleQwtCurves() const return plotCurves; } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +RimPlotAxisProperties* RimGridCrossPlot::xAxisProperties() +{ + return m_xAxisProperties(); +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +RimPlotAxisProperties* RimGridCrossPlot::yAxisProperties() +{ + return m_yAxisProperties(); +} + //-------------------------------------------------------------------------------------------------- /// Name Configuration /// diff --git a/ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.h b/ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.h index 97870d774a..b9a3c6e0d8 100644 --- a/ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.h +++ b/ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.h @@ -106,6 +106,9 @@ protected: void updateAxisFromQwt(RiaDefines::PlotAxis axisType); std::vector visibleQwtCurves() const; + RimPlotAxisProperties* xAxisProperties(); + RimPlotAxisProperties* yAxisProperties(); + private: caf::PdmField m_showLegend; caf::PdmField m_legendFontSize; diff --git a/ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotCollection.h b/ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotCollection.h index e9b9d7d3a2..8407e98367 100644 --- a/ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotCollection.h +++ b/ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotCollection.h @@ -17,7 +17,6 @@ ///////////////////////////////////////////////////////////////////////////////// #pragma once - #include "cafPdmChildArrayField.h" #include "cafPdmObject.h" @@ -43,8 +42,4 @@ public: private: caf::PdmChildArrayField m_gridCrossPlots; - -public: }; - - diff --git a/ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotCurveSet.cpp b/ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotCurveSet.cpp index 6468afe615..bbdd921c21 100644 --- a/ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotCurveSet.cpp +++ b/ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotCurveSet.cpp @@ -56,6 +56,7 @@ #include "cvfqtUtils.h" #include +#include "RimEclipseResultCase.h" CAF_PDM_SOURCE_INIT(RimGridCrossPlotCurveSet, "GridCrossPlotCurveSet"); @@ -901,6 +902,22 @@ bool RimGridCrossPlotCurveSet::isYAxisLogarithmic() const return parent->isYAxisLogarithmic(); } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimGridCrossPlotCurveSet::setFromCaseAndEquilibriumRegion(RimEclipseResultCase* eclipseCase, const QString& dynamicResultName) +{ + m_case = eclipseCase; + + m_xAxisProperty->setEclipseCase(eclipseCase); + m_xAxisProperty->setResultType(RiaDefines::DYNAMIC_NATIVE); + m_xAxisProperty->setResultVariable(dynamicResultName); + + m_yAxisProperty->setEclipseCase(eclipseCase); + m_yAxisProperty->setResultType(RiaDefines::STATIC_NATIVE); + m_yAxisProperty->setResultVariable("DEPTH"); +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotCurveSet.h b/ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotCurveSet.h index e4d6ea13ed..52b1f4b49d 100644 --- a/ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotCurveSet.h +++ b/ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotCurveSet.h @@ -40,6 +40,7 @@ class RimCase; class RimGridCrossPlotCurve; class RimGridView; class RimEclipseCase; +class RimEclipseResultCase; class RimEclipseCellColors; class RimEclipseResultDefinition; class RimRegularLegendConfig; @@ -120,6 +121,8 @@ public: bool isXAxisLogarithmic() const; bool isYAxisLogarithmic() const; + void setFromCaseAndEquilibriumRegion(RimEclipseResultCase* eclipseResultCase, const QString& dynamicResultName); + protected: void initAfterRead() override; void onLoadDataAndUpdate(bool updateParentPlot); diff --git a/ApplicationCode/ProjectDataModel/GridCrossPlots/RimSaturationPressurePlot.cpp b/ApplicationCode/ProjectDataModel/GridCrossPlots/RimSaturationPressurePlot.cpp new file mode 100644 index 0000000000..2dad98ad33 --- /dev/null +++ b/ApplicationCode/ProjectDataModel/GridCrossPlots/RimSaturationPressurePlot.cpp @@ -0,0 +1,80 @@ +///////////////////////////////////////////////////////////////////////////////// +// +// Copyright (C) 2019- Equinor ASA +// +// ResInsight is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at +// for more details. +// +///////////////////////////////////////////////////////////////////////////////// + +#include "RimSaturationPressurePlot.h" + +#include "RimEclipseResultCase.h" +#include "RimGridCrossPlotCurveSet.h" +#include "RimPlotAxisAnnotation.h" +#include "RimPlotAxisProperties.h" + +CAF_PDM_SOURCE_INIT(RimSaturationPressurePlot, "RimSaturationPressurePlot"); + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +RimSaturationPressurePlot::RimSaturationPressurePlot() +{ + CAF_PDM_InitObject("Saturation Pressure Plot", ":/SummaryXPlotLight16x16.png", "", ""); +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimSaturationPressurePlot::assignCaseAndEquilibriumRegion(RimEclipseResultCase* eclipseResultCase, int equilibriumRegion) +{ + { + RimGridCrossPlotCurveSet* curveSet = createCurveSet(); + curveSet->setFromCaseAndEquilibriumRegion(eclipseResultCase, "PRESSURE"); + } + { + RimGridCrossPlotCurveSet* curveSet = createCurveSet(); + curveSet->setFromCaseAndEquilibriumRegion(eclipseResultCase, "PDEW"); + } + { + RimGridCrossPlotCurveSet* curveSet = createCurveSet(); + curveSet->setFromCaseAndEquilibriumRegion(eclipseResultCase, "PBUB"); + } + + RimPlotAxisProperties* yAxisProps = yAxisProperties(); + + yAxisProps->setInvertedAxis(true); + + { + RimPlotAxisAnnotation* annotation = new RimPlotAxisAnnotation; + annotation->setEquilibriumData(eclipseResultCase, equilibriumRegion, RimPlotAxisAnnotation::PL_EQUIL_GAS_OIL_CONTACT); + + yAxisProps->appendAnnotation(annotation); + } + { + RimPlotAxisAnnotation* annotation = new RimPlotAxisAnnotation; + annotation->setEquilibriumData(eclipseResultCase, equilibriumRegion, RimPlotAxisAnnotation::PL_EQUIL_WATER_OIL_CONTACT); + + yAxisProps->appendAnnotation(annotation); + } +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimSaturationPressurePlot::initAfterRead() +{ + yAxisProperties()->showAnnotationObjectsInProjectTree(); + + RimGridCrossPlot::initAfterRead(); +} diff --git a/ApplicationCode/ProjectDataModel/GridCrossPlots/RimSaturationPressurePlot.h b/ApplicationCode/ProjectDataModel/GridCrossPlots/RimSaturationPressurePlot.h new file mode 100644 index 0000000000..60e154e8fd --- /dev/null +++ b/ApplicationCode/ProjectDataModel/GridCrossPlots/RimSaturationPressurePlot.h @@ -0,0 +1,39 @@ +///////////////////////////////////////////////////////////////////////////////// +// +// Copyright (C) 2019- Equinor ASA +// +// ResInsight is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at +// for more details. +// +///////////////////////////////////////////////////////////////////////////////// + +#pragma once + +#include "RimGridCrossPlot.h" + +class RimEclipseResultCase; + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +class RimSaturationPressurePlot : public RimGridCrossPlot +{ + CAF_PDM_HEADER_INIT; + +public: + RimSaturationPressurePlot(); + + void assignCaseAndEquilibriumRegion(RimEclipseResultCase* eclipseResultCase, int equilibriumRegion); + +protected: + void initAfterRead() override; +}; diff --git a/ApplicationCode/ProjectDataModel/GridCrossPlots/RimSaturationPressurePlotCollection.cpp b/ApplicationCode/ProjectDataModel/GridCrossPlots/RimSaturationPressurePlotCollection.cpp new file mode 100644 index 0000000000..18b6c5f8a8 --- /dev/null +++ b/ApplicationCode/ProjectDataModel/GridCrossPlots/RimSaturationPressurePlotCollection.cpp @@ -0,0 +1,82 @@ +///////////////////////////////////////////////////////////////////////////////// +// +// Copyright (C) 2019- Equinor ASA +// +// ResInsight is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at +// for more details. +// +///////////////////////////////////////////////////////////////////////////////// + +#include "RimSaturationPressurePlotCollection.h" + +#include "RigEclipseCaseData.h" +#include "RigEquil.h" + +#include "RimEclipseResultCase.h" +#include "RimSaturationPressurePlot.h" + +CAF_PDM_SOURCE_INIT(RimSaturationPressurePlotCollection, "RimSaturationPressurePlotCollection"); + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +RimSaturationPressurePlotCollection::RimSaturationPressurePlotCollection() +{ + CAF_PDM_InitObject("Saturation Pressure Plots", ":/SummaryXPlotsLight16x16.png", "", ""); + + CAF_PDM_InitFieldNoDefault(&m_saturationPressurePlots, "SaturationPressurePlots", "Saturation Pressure Plots", "", "", ""); + m_saturationPressurePlots.uiCapability()->setUiHidden(true); +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +RimSaturationPressurePlotCollection::~RimSaturationPressurePlotCollection() {} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimSaturationPressurePlotCollection::createSaturationPressurePlots(RimEclipseResultCase* eclipseResultCase) +{ + if (!eclipseResultCase) return; + + RigEclipseCaseData* eclipseCaseData = eclipseResultCase->eclipseCaseData(); + if (!eclipseCaseData) return; + + std::vector equilData = eclipseCaseData->equilData(); + for (size_t i = 0; i < equilData.size(); i++) + { + RimSaturationPressurePlot* plot = new RimSaturationPressurePlot(); + plot->setAsPlotMdiWindow(); + + int equilibriumRegion = static_cast(i) + 1; + plot->assignCaseAndEquilibriumRegion(eclipseResultCase, equilibriumRegion); + + m_saturationPressurePlots.push_back(plot); + } +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +std::vector RimSaturationPressurePlotCollection::plots() +{ + return m_saturationPressurePlots.childObjects(); +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimSaturationPressurePlotCollection::deleteAllChildObjects() +{ + m_saturationPressurePlots.deleteAllChildObjects(); +} diff --git a/ApplicationCode/ProjectDataModel/GridCrossPlots/RimSaturationPressurePlotCollection.h b/ApplicationCode/ProjectDataModel/GridCrossPlots/RimSaturationPressurePlotCollection.h new file mode 100644 index 0000000000..32dcfbd090 --- /dev/null +++ b/ApplicationCode/ProjectDataModel/GridCrossPlots/RimSaturationPressurePlotCollection.h @@ -0,0 +1,45 @@ +///////////////////////////////////////////////////////////////////////////////// +// +// Copyright (C) 2019- Equinor ASA +// +// ResInsight is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY +// WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. +// +// See the GNU General Public License at +// for more details. +// +///////////////////////////////////////////////////////////////////////////////// +#pragma once + +#include "cafPdmChildArrayField.h" +#include "cafPdmObject.h" + +class RimSaturationPressurePlot; +class RimEclipseResultCase; + +//================================================================================================== +/// +/// +//================================================================================================== +class RimSaturationPressurePlotCollection : public caf::PdmObject +{ + CAF_PDM_HEADER_INIT; + +public: + RimSaturationPressurePlotCollection(); + ~RimSaturationPressurePlotCollection() override; + + void createSaturationPressurePlots(RimEclipseResultCase* eclipseResultCase); + + std::vector plots(); + void deleteAllChildObjects(); + +private: + caf::PdmChildArrayField m_saturationPressurePlots; +}; diff --git a/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp b/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp index 17668c95f1..ff6ce5628d 100644 --- a/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp +++ b/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp @@ -95,6 +95,7 @@ #include "RimWellPathCollection.h" #include "RimWellPltPlot.h" #include "RimWellRftPlot.h" +#include "RimSaturationPressurePlotCollection.h" #include "RimEllipseFractureTemplate.h" #include "RimStimPlanFractureTemplate.h" @@ -470,6 +471,10 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection() { menuBuilder << "RicCreateGridCrossPlotFeature"; } + else if (dynamic_cast(uiItem)) + { + menuBuilder << "RicCreateSaturationPressurePlotsFeature"; + } else if (dynamic_cast(uiItem)) { menuBuilder << "RicPasteGridCrossPlotCurveSetFeature"; diff --git a/ApplicationCode/ProjectDataModel/RimMainPlotCollection.cpp b/ApplicationCode/ProjectDataModel/RimMainPlotCollection.cpp index 08c64222d2..9133220a8d 100644 --- a/ApplicationCode/ProjectDataModel/RimMainPlotCollection.cpp +++ b/ApplicationCode/ProjectDataModel/RimMainPlotCollection.cpp @@ -19,13 +19,14 @@ #include "RimMainPlotCollection.h" -#include "RimGridCrossPlot.h" -#include "RimGridCrossPlotCollection.h" #include "RimFlowCharacteristicsPlot.h" #include "RimFlowPlotCollection.h" +#include "RimGridCrossPlot.h" +#include "RimGridCrossPlotCollection.h" #include "RimPltPlotCollection.h" #include "RimProject.h" #include "RimRftPlotCollection.h" +#include "RimSaturationPressurePlotCollection.h" #include "RimSummaryCrossPlotCollection.h" #include "RimSummaryPlotCollection.h" #include "RimViewWindow.h" @@ -70,6 +71,9 @@ RimMainPlotCollection::RimMainPlotCollection() CAF_PDM_InitFieldNoDefault(&m_gridCrossPlotCollection, "Rim3dCrossPlotCollection", "3d Cross Plots", "", "", ""); m_gridCrossPlotCollection.uiCapability()->setUiHidden(true); + CAF_PDM_InitFieldNoDefault(&m_saturationPressurePlotCollection, "RimSaturationPressurePlotCollection", "Saturation Pressure Plots", "", "", ""); + m_saturationPressurePlotCollection.uiCapability()->setUiHidden(true); + m_wellLogPlotCollection = new RimWellLogPlotCollection(); m_rftPlotCollection = new RimRftPlotCollection(); m_pltPlotCollection = new RimPltPlotCollection(); @@ -77,6 +81,7 @@ RimMainPlotCollection::RimMainPlotCollection() m_summaryCrossPlotCollection = new RimSummaryCrossPlotCollection(); m_flowPlotCollection = new RimFlowPlotCollection(); m_gridCrossPlotCollection = new RimGridCrossPlotCollection; + m_saturationPressurePlotCollection = new RimSaturationPressurePlotCollection; } //-------------------------------------------------------------------------------------------------- @@ -158,6 +163,14 @@ RimGridCrossPlotCollection* RimMainPlotCollection::gridCrossPlotCollection() return m_gridCrossPlotCollection(); } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +RimSaturationPressurePlotCollection* RimMainPlotCollection::saturationPressurePlotCollection() +{ + return m_saturationPressurePlotCollection(); +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- @@ -170,6 +183,7 @@ void RimMainPlotCollection::deleteAllContainedObjects() m_summaryCrossPlotCollection()->deleteAllChildObjects(); m_gridCrossPlotCollection->deleteAllChildObjects(); m_flowPlotCollection()->closeDefaultPlotWindowAndDeletePlots(); + m_saturationPressurePlotCollection()->deleteAllChildObjects(); } diff --git a/ApplicationCode/ProjectDataModel/RimMainPlotCollection.h b/ApplicationCode/ProjectDataModel/RimMainPlotCollection.h index 8afee3325b..86576ff944 100644 --- a/ApplicationCode/ProjectDataModel/RimMainPlotCollection.h +++ b/ApplicationCode/ProjectDataModel/RimMainPlotCollection.h @@ -2,30 +2,29 @@ // // Copyright (C) 2015- Statoil ASA // Copyright (C) 2015- Ceetron Solutions AS -// +// // ResInsight is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// +// // ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY // WARRANTY; without even the implied warranty of MERCHANTABILITY or // FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at +// +// See the GNU General Public License at // for more details. // ///////////////////////////////////////////////////////////////////////////////// #pragma once -#include "cafPdmObject.h" -#include "cafPdmField.h" #include "cafPdmChildField.h" +#include "cafPdmField.h" +#include "cafPdmObject.h" -#include #include - +#include class RimWellLogPlotCollection; class RimRftPlotCollection; @@ -37,46 +36,49 @@ class RimSummaryPlot; class RifReaderEclipseSummary; class RimEclipseResultCase; class RimFlowPlotCollection; - +class RimSaturationPressurePlotCollection; //================================================================================================== -/// -/// +/// +/// //================================================================================================== class RimMainPlotCollection : public caf::PdmObject { CAF_PDM_HEADER_INIT; + public: RimMainPlotCollection(); ~RimMainPlotCollection() override; - RimWellLogPlotCollection* wellLogPlotCollection(); - RimRftPlotCollection* rftPlotCollection(); - RimPltPlotCollection* pltPlotCollection(); - RimSummaryPlotCollection* summaryPlotCollection(); - RimSummaryCrossPlotCollection* summaryCrossPlotCollection(); - RimFlowPlotCollection* flowPlotCollection(); - RimGridCrossPlotCollection* gridCrossPlotCollection(); + RimWellLogPlotCollection* wellLogPlotCollection(); + RimRftPlotCollection* rftPlotCollection(); + RimPltPlotCollection* pltPlotCollection(); + RimSummaryPlotCollection* summaryPlotCollection(); + RimSummaryCrossPlotCollection* summaryCrossPlotCollection(); + RimFlowPlotCollection* flowPlotCollection(); + RimGridCrossPlotCollection* gridCrossPlotCollection(); + RimSaturationPressurePlotCollection* saturationPressurePlotCollection(); + + void deleteAllContainedObjects(); + void updateCurrentTimeStepInPlots(); + void updatePlotsWithFormations(); + void updatePlotsWithCompletions(); + void deleteAllCachedData(); - void deleteAllContainedObjects(); - void updateCurrentTimeStepInPlots(); - void updatePlotsWithFormations(); - void updatePlotsWithCompletions(); - void deleteAllCachedData(); private: - // Overridden PDM methods caf::PdmFieldHandle* objectToggleField() override; - void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override; + void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override; private: - caf::PdmChildField m_wellLogPlotCollection; - caf::PdmChildField m_rftPlotCollection; - caf::PdmChildField m_pltPlotCollection; - caf::PdmChildField m_summaryPlotCollection; - caf::PdmChildField m_summaryCrossPlotCollection; - caf::PdmChildField m_flowPlotCollection; - caf::PdmChildField m_gridCrossPlotCollection; + caf::PdmChildField m_wellLogPlotCollection; + caf::PdmChildField m_rftPlotCollection; + caf::PdmChildField m_pltPlotCollection; + caf::PdmChildField m_summaryPlotCollection; + caf::PdmChildField m_summaryCrossPlotCollection; + caf::PdmChildField m_flowPlotCollection; + caf::PdmChildField m_gridCrossPlotCollection; + caf::PdmChildField m_saturationPressurePlotCollection; caf::PdmField m_show; }; diff --git a/ApplicationCode/ProjectDataModel/RimPlotAxisAnnotation.cpp b/ApplicationCode/ProjectDataModel/RimPlotAxisAnnotation.cpp index 8bd604a142..13e2da3a20 100644 --- a/ApplicationCode/ProjectDataModel/RimPlotAxisAnnotation.cpp +++ b/ApplicationCode/ProjectDataModel/RimPlotAxisAnnotation.cpp @@ -75,6 +75,18 @@ void RimPlotAxisAnnotation::setValue(double value) m_value = value; } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimPlotAxisAnnotation::setEquilibriumData(RimEclipseCase* eclipseCase, + int equilibriumRegion, + PlotAxisAnnotationType annotationType) +{ + m_sourceCase = eclipseCase; + m_equilNum = equilibriumRegion; + m_annotationType = annotationType; +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- @@ -166,7 +178,7 @@ QList RimPlotAxisAnnotation::calculateValueOptions(const { for (int i = 0; i < equilItems().size(); i++) { - QString uiText = QString("%1").arg(i+1); + QString uiText = QString("%1").arg(i + 1); options.push_back(caf::PdmOptionItemInfo(uiText, i)); } } @@ -200,7 +212,7 @@ void RimPlotAxisAnnotation::defineUiOrdering(QString uiConfigName, caf::PdmUiOrd //-------------------------------------------------------------------------------------------------- RigEquil RimPlotAxisAnnotation::selectedItem() const { - int index = m_equilNum() -1; + int index = m_equilNum() - 1; if (index < equilItems().size()) { diff --git a/ApplicationCode/ProjectDataModel/RimPlotAxisAnnotation.h b/ApplicationCode/ProjectDataModel/RimPlotAxisAnnotation.h index 834b05d37d..28d38ccfb0 100644 --- a/ApplicationCode/ProjectDataModel/RimPlotAxisAnnotation.h +++ b/ApplicationCode/ProjectDataModel/RimPlotAxisAnnotation.h @@ -50,6 +50,8 @@ public: void setName(const QString& name); void setValue(double value); + void setEquilibriumData(RimEclipseCase* eclipseCase, int equilibriumRegion, PlotAxisAnnotationType annotationType); + QString name() const; double value() const; @@ -65,17 +67,16 @@ protected: virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override; private: - RigEquil selectedItem() const; + RigEquil selectedItem() const; std::vector equilItems() const; private: caf::PdmField m_annotationType; - - caf::PdmField m_isActive; + + caf::PdmField m_isActive; caf::PdmField m_name; caf::PdmField m_value; caf::PdmPtrField m_sourceCase; - caf::PdmField m_equilNum; - + caf::PdmField m_equilNum; }; diff --git a/ApplicationCode/ProjectDataModel/RimPlotAxisProperties.cpp b/ApplicationCode/ProjectDataModel/RimPlotAxisProperties.cpp index b11df4f7fa..44cee61d66 100644 --- a/ApplicationCode/ProjectDataModel/RimPlotAxisProperties.cpp +++ b/ApplicationCode/ProjectDataModel/RimPlotAxisProperties.cpp @@ -99,7 +99,7 @@ RimPlotAxisProperties::RimPlotAxisProperties() CAF_PDM_InitFieldNoDefault(&m_annotations, "Annotations", "", "", "", ""); m_annotations.uiCapability()->setUiHidden(true); - m_annotations.uiCapability()->setUiTreeChildrenHidden(true); +// m_annotations.uiCapability()->setUiTreeChildrenHidden(true); updateOptionSensitivity(); } @@ -316,6 +316,14 @@ std::vector RimPlotAxisProperties::annotations() const return m_annotations.childObjects(); } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimPlotAxisProperties::appendAnnotation(RimPlotAxisAnnotation* annotation) +{ + m_annotations.push_back(annotation); +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- @@ -324,6 +332,22 @@ bool RimPlotAxisProperties::isActive() const return m_isActive; } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimPlotAxisProperties::setInvertedAxis(bool enable) +{ + m_isAxisInverted = enable; +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RimPlotAxisProperties::showAnnotationObjectsInProjectTree() +{ + m_annotations.uiCapability()->setUiTreeChildrenHidden(false); +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/RimPlotAxisProperties.h b/ApplicationCode/ProjectDataModel/RimPlotAxisProperties.h index 6f8543a119..cfc5f93b58 100644 --- a/ApplicationCode/ProjectDataModel/RimPlotAxisProperties.h +++ b/ApplicationCode/ProjectDataModel/RimPlotAxisProperties.h @@ -72,6 +72,7 @@ public: bool isAxisInverted() const; std::vector annotations() const; + void appendAnnotation(RimPlotAxisAnnotation* annotation); caf::PdmField customTitle; caf::PdmField titleFontSize; @@ -87,6 +88,9 @@ public: caf::PdmField valuesFontSize; bool isActive() const; + + void setInvertedAxis(bool enable); + void showAnnotationObjectsInProjectTree(); protected: void initAfterRead() override; diff --git a/ApplicationCode/ProjectDataModel/RimProject.cpp b/ApplicationCode/ProjectDataModel/RimProject.cpp index 7c62a3db44..df1961d3c3 100644 --- a/ApplicationCode/ProjectDataModel/RimProject.cpp +++ b/ApplicationCode/ProjectDataModel/RimProject.cpp @@ -48,6 +48,7 @@ #include "RimFractureTemplate.h" #include "RimFractureTemplateCollection.h" #include "RimGridCrossPlotCollection.h" +#include "RimSaturationPressurePlotCollection.h" #include "RimValveTemplate.h" #include "RimValveTemplateCollection.h" #include "RimGeoMechCase.h" @@ -1246,6 +1247,11 @@ void RimProject::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QS { itemCollection->add(mainPlotCollection->gridCrossPlotCollection()); } + + if (mainPlotCollection->saturationPressurePlotCollection()) + { + itemCollection->add(mainPlotCollection->saturationPressurePlotCollection()); + } } } else