#4219 Contact Pressure plots : Simplify creation of plots, hide obsolete title

ApplicationCode/Commands/GridCrossPlotCommands/RicCreateSaturationPressurePlotsFeature.cpp

@@ -102,22 +102,32 @@ void RicCreateSaturationPressurePlotsFeature::onActionTriggered(bool isChecked)
         }
     }
 
+    caf::PdmObject* objectToSelect = nullptr;
+
     if (eclipseResultCase)
     {
         eclipseResultCase->ensureReservoirCaseIsOpen();
-        collection->createSaturationPressurePlots(eclipseResultCase);
+        std::vector<RimSaturationPressurePlot*> plots = collection->createSaturationPressurePlots(eclipseResultCase);
-
-        std::vector<RimSaturationPressurePlot*> plots = collection->plots();
         for (auto plot : plots)
         {
             plot->loadDataAndUpdate();
             plot->zoomAll();
             plot->updateConnectedEditors();
         }
+
+        if (!plots.empty())
+        {
+            objectToSelect = plots.front();
+        }
     }
 
     collection->updateAllRequiredEditors();
     RiaApplication::instance()->getOrCreateAndShowMainPlotWindow();
+
+    if (objectToSelect)
+    {
+        RiuPlotMainWindowTools::selectAsCurrentItem(objectToSelect);
+    }
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.h

@@ -99,7 +99,7 @@ protected:
 
     void updatePlot();
 
-    QString xAxisParameterString() const;
+    virtual QString xAxisParameterString() const;
     QString yAxisParameterString() const;
 
     void updateAxisInQwt(RiaDefines::PlotAxis axisType);

ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotCurveSet.cpp

@@ -124,7 +124,9 @@ RimGridCrossPlotCurveSet::RimGridCrossPlotCurveSet()
     CAF_PDM_InitField(&m_customColor, "CustomColor", cvf::Color3f(cvf::Color3f::BLACK), "Custom Color", "", "", "");
 
     CAF_PDM_InitFieldNoDefault(&m_plotCellFilterCollection, "PlotCellFilterCollection", "Cell Filters", "", "", "");
+    m_plotCellFilterCollection.uiCapability()->setUiHidden(true);
     m_plotCellFilterCollection.uiCapability()->setUiTreeHidden(true);
+    m_plotCellFilterCollection.uiCapability()->setUiTreeChildrenHidden(true);
     m_plotCellFilterCollection = new RimPlotCellFilterCollection;
 
     setDefaults();

ApplicationCode/ProjectDataModel/GridCrossPlots/RimSaturationPressurePlot.cpp

@@ -177,6 +177,14 @@ void RimSaturationPressurePlot::initAfterRead()
     RimGridCrossPlot::initAfterRead();
 }
 
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RimSaturationPressurePlot::xAxisParameterString() const
+{
+    return "";
+}
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ProjectDataModel/GridCrossPlots/RimSaturationPressurePlot.h

@@ -40,7 +40,8 @@ public:
                                         int                           zeroBasedEquilRegionIndex);
 
 protected:
-    void initAfterRead() override;
+    void    initAfterRead() override;
+    QString xAxisParameterString() const override;
 
 private:
     RimPlotCellPropertyFilter* createEquilibriumRegionPropertyFilter(RimEclipseResultCase* eclipseResultCase,

ApplicationCode/ProjectDataModel/GridCrossPlots/RimSaturationPressurePlotCollection.cpp

@@ -45,14 +45,15 @@ RimSaturationPressurePlotCollection::~RimSaturationPressurePlotCollection() {}
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-void RimSaturationPressurePlotCollection::createSaturationPressurePlots(RimEclipseResultCase* eclipseResultCase)
+std::vector<RimSaturationPressurePlot*>
+    RimSaturationPressurePlotCollection::createSaturationPressurePlots(RimEclipseResultCase* eclipseResultCase)
 {
-    if (!eclipseResultCase) return;
+    std::vector<RimSaturationPressurePlot*> generatedPlots;
+
+    if (!eclipseResultCase) return generatedPlots;
 
     RigEclipseCaseData* eclipseCaseData = eclipseResultCase->eclipseCaseData();
-    if (!eclipseCaseData) return;
+    if (!eclipseCaseData) return generatedPlots;
-
-    m_saturationPressurePlots.deleteAllChildObjects();
 
     std::vector<RigEquil> equilData = eclipseCaseData->equilData();
     for (size_t i = 0; i < equilData.size(); i++)
@@ -67,7 +68,11 @@ void RimSaturationPressurePlotCollection::createSaturationPressurePlots(RimEclip
         plot->assignCaseAndEquilibriumRegion(RiaDefines::MATRIX_MODEL, eclipseResultCase, equilibriumRegion);
 
         m_saturationPressurePlots.push_back(plot);
+
+        generatedPlots.push_back(plot);
     }
+
+    return generatedPlots;
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ProjectDataModel/GridCrossPlots/RimSaturationPressurePlotCollection.h

@@ -35,7 +35,7 @@ public:
     RimSaturationPressurePlotCollection();
     ~RimSaturationPressurePlotCollection() override;
 
-    void createSaturationPressurePlots(RimEclipseResultCase* eclipseResultCase);
+    std::vector<RimSaturationPressurePlot*> createSaturationPressurePlots(RimEclipseResultCase* eclipseResultCase);
 
     std::vector<RimSaturationPressurePlot*> plots();
     void                                    deleteAllChildObjects();