Merge branch 'annotation-items' into dev

ApplicationCode/Commands/GridCrossPlotCommands/CMakeLists_files.cmake

@@ -4,13 +4,18 @@ ${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
+${CMAKE_CURRENT_LIST_DIR}/RicSaturationPressureUi.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
+${CMAKE_CURRENT_LIST_DIR}/RicSaturationPressureUi.cpp
+)
 
 list(APPEND CODE_HEADER_FILES
 ${SOURCE_GROUP_HEADER_FILES}

ApplicationCode/Commands/GridCrossPlotCommands/RicCreateSaturationPressurePlotsFeature.cpp

@@ -0,0 +1,139 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  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 <http://www.gnu.org/licenses/gpl.html>
+//  for more details.
+//
+/////////////////////////////////////////////////////////////////////////////////
+
+#include "RicCreateSaturationPressurePlotsFeature.h"
+#include "RicSaturationPressureUi.h"
+
+#include "RiaApplication.h"
+
+#include "RimEclipseResultCase.h"
+#include "RimMainPlotCollection.h"
+#include "RimProject.h"
+#include "RimSaturationPressurePlot.h"
+#include "RimSaturationPressurePlotCollection.h"
+
+#include "RiuPlotMainWindow.h"
+#include "RiuPlotMainWindowTools.h"
+
+#include "cafPdmUiPropertyViewDialog.h"
+#include "cafSelectionManager.h"
+
+#include <QAction>
+
+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<RimSaturationPressurePlotCollection>();
+
+    if (!collection)
+    {
+        collection                 = project->mainPlotCollection()->saturationPressurePlotCollection();
+        launchedFromPlotCollection = false;
+    }
+
+    std::vector<RimEclipseResultCase*> eclipseCases;
+    {
+        RiaApplication*       app = RiaApplication::instance();
+        std::vector<RimCase*> cases;
+        app->project()->allCases(cases);
+        for (auto* rimCase : cases)
+        {
+            auto erc = dynamic_cast<RimEclipseResultCase*>(rimCase);
+            if (erc)
+            {
+                eclipseCases.push_back(erc);
+            }
+        }
+    }
+
+    RimEclipseResultCase* eclipseResultCase = nullptr;
+
+    if (!eclipseCases.empty())
+    {
+        if (eclipseCases.size() == 1)
+        {
+            eclipseResultCase = eclipseCases[0];
+        }
+        else
+        {
+            RicSaturationPressureUi saturationPressureUi;
+            saturationPressureUi.setSelectedCase(eclipseCases[0]);
+
+            RiuPlotMainWindow* plotwindow = RiaApplication::instance()->mainPlotWindow();
+
+            caf::PdmUiPropertyViewDialog propertyDialog(
+                plotwindow, &saturationPressureUi, "Select Case to create Pressure Saturation plots", "");
+
+            if (propertyDialog.exec() == QDialog::Accepted)
+            {
+                eclipseResultCase = dynamic_cast<RimEclipseResultCase*>(saturationPressureUi.selectedCase());
+            }
+        }
+    }
+
+    if (eclipseResultCase)
+    {
+        eclipseResultCase->ensureReservoirCaseIsOpen();
+        collection->createSaturationPressurePlots(eclipseResultCase);
+
+        std::vector<RimSaturationPressurePlot*> 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<RimSaturationPressurePlotCollection>();
+    if (!collection)
+    {
+        actionToSetup->setText("New Grid Cross Plot from 3d View");
+    }
+    else
+    {
+        actionToSetup->setText("Create Saturation Pressure Plots");
+    }
+    actionToSetup->setIcon(QIcon(":/SummaryXPlotsLight16x16.png"));
+}

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 <http://www.gnu.org/licenses/gpl.html>
+//  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;
+};

ApplicationCode/Commands/GridCrossPlotCommands/RicSaturationPressureUi.cpp

@@ -0,0 +1,67 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2017-     Statoil 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 <http://www.gnu.org/licenses/gpl.html>
+//  for more details.
+//
+/////////////////////////////////////////////////////////////////////////////////
+
+#include "RicSaturationPressureUi.h"
+
+#include "RimTools.h"
+
+#include "cafPdmUiFilePathEditor.h"
+
+CAF_PDM_SOURCE_INIT(RicSaturationPressureUi, "RicSaturationPressureUi");
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+RicSaturationPressureUi::RicSaturationPressureUi()
+{
+    CAF_PDM_InitObject("RicSaturationPressureUi", "", "", "");
+
+    CAF_PDM_InitFieldNoDefault(&m_caseToApply, "CaseToApply", "Case to Apply", "", "", "");
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicSaturationPressureUi::setSelectedCase(RimEclipseCase* eclipseCase)
+{
+    m_caseToApply = eclipseCase;
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+RimEclipseCase* RicSaturationPressureUi::selectedCase() const
+{
+    return m_caseToApply();
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+QList<caf::PdmOptionItemInfo> RicSaturationPressureUi::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions,
+                                                                             bool*                      useOptionsOnly)
+{
+    QList<caf::PdmOptionItemInfo> options;
+
+    if (fieldNeedingOptions == &m_caseToApply)
+    {
+        RimTools::caseOptionItems(&options);
+    }
+
+    return options;
+}

ApplicationCode/Commands/GridCrossPlotCommands/RicSaturationPressureUi.h

@@ -0,0 +1,47 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2017-     Statoil 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 <http://www.gnu.org/licenses/gpl.html>
+//  for more details.
+//
+/////////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+#include "RimEclipseCase.h"
+
+#include "cafPdmField.h"
+#include "cafPdmObject.h"
+#include "cafPdmPtrField.h"
+
+//==================================================================================================
+///
+///
+//==================================================================================================
+class RicSaturationPressureUi : public caf::PdmObject
+{
+    CAF_PDM_HEADER_INIT;
+
+public:
+    RicSaturationPressureUi();
+
+    void            setSelectedCase(RimEclipseCase* eclipseCase);
+    RimEclipseCase* selectedCase() const;
+
+protected:
+    QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions,
+                                                        bool*                      useOptionsOnly) override;
+
+private:
+    caf::PdmPtrField<RimEclipseCase*> m_caseToApply;
+};