#8522 Summary Plot: Add menu item to add plot axis.

ApplicationLibCode/Commands/SummaryPlotCommands/CMakeLists_files.cmake

@@ -43,6 +43,7 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicSetSourceSteppingEnsembleCurveSetFeature.h
     ${CMAKE_CURRENT_LIST_DIR}/RicActivateCurveFilterInToolbarFeature.h
     ${CMAKE_CURRENT_LIST_DIR}/RicNewDerivedSummaryFeature.h
+    ${CMAKE_CURRENT_LIST_DIR}/RicNewPlotAxisPropertiesFeature.h
     ${CMAKE_CURRENT_LIST_DIR}/RicShowSummaryPlotManagerFeature.h
 )
 
@@ -91,6 +92,7 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RicSetSourceSteppingEnsembleCurveSetFeature.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicActivateCurveFilterInToolbarFeature.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicNewDerivedSummaryFeature.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/RicNewPlotAxisPropertiesFeature.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RicShowSummaryPlotManagerFeature.cpp
 )
 

ApplicationLibCode/Commands/SummaryPlotCommands/RicNewPlotAxisPropertiesFeature.cpp

@@ -0,0 +1,67 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2022-     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 "RicNewPlotAxisPropertiesFeature.h"
+
+#include "RiaPlotDefines.h"
+
+#include "RimPlotAxisProperties.h"
+#include "RimSummaryPlot.h"
+
+#include "RiuPlotMainWindowTools.h"
+
+#include "cafSelectionManagerTools.h"
+
+#include <QAction>
+
+CAF_CMD_SOURCE_INIT( RicNewPlotAxisPropertiesFeature, "RicNewPlotAxisPropertiesFeature" );
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+bool RicNewPlotAxisPropertiesFeature::isCommandEnabled()
+{
+    std::vector<RimSummaryPlot*> summaryPlots = caf::selectedObjectsByTypeStrict<RimSummaryPlot*>();
+    return summaryPlots.size() == 1;
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RicNewPlotAxisPropertiesFeature::onActionTriggered( bool isChecked )
+{
+    std::vector<RimSummaryPlot*> summaryPlots = caf::selectedObjectsByTypeStrict<RimSummaryPlot*>();
+    if ( summaryPlots.size() != 1 ) return;
+
+    RimSummaryPlot* summaryPlot = summaryPlots[0];
+
+    RimPlotAxisProperties* newPlotAxisProperties =
+        summaryPlot->addNewAxisProperties( RiaDefines::PlotAxis::PLOT_AXIS_LEFT, "New Axis" );
+
+    summaryPlot->updateConnectedEditors();
+    RiuPlotMainWindowTools::selectAsCurrentItem( newPlotAxisProperties );
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+void RicNewPlotAxisPropertiesFeature::setupActionLook( QAction* actionToSetup )
+{
+    actionToSetup->setText( "New Plot Axis" );
+    actionToSetup->setIcon( QIcon( ":/LeftAxis16x16.png" ) );
+}

ApplicationLibCode/Commands/SummaryPlotCommands/RicNewPlotAxisPropertiesFeature.h

@@ -0,0 +1,35 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2022-     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 RicNewPlotAxisPropertiesFeature : public caf::CmdFeature
+{
+    CAF_CMD_HEADER_INIT;
+
+protected:
+    // Overrides
+    bool isCommandEnabled() override;
+    void onActionTriggered( bool isChecked ) override;
+    void setupActionLook( QAction* actionToSetup ) override;
+};

ApplicationLibCode/ProjectDataModel/RimContextCommandBuilder.cpp

@@ -677,6 +677,7 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
             menuBuilder << "RicNewSummaryEnsembleCurveSetFeature";
             menuBuilder << "RicDuplicateSummaryCrossPlotFeature";
             menuBuilder << "RicNewSummaryCrossPlotCurveFeature";
+            menuBuilder << "RicNewPlotAxisPropertiesFeature";
             menuBuilder << "Separator";
             menuBuilder << "RicSavePlotTemplateFeature";
 

ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp

@@ -1715,6 +1715,28 @@ void RimSummaryPlot::axisLogarithmicChanged( const caf::SignalEmitter* emitter,
     loadDataAndUpdate();
 }
 
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+RimPlotAxisProperties* RimSummaryPlot::addNewAxisProperties( RiaDefines::PlotAxis plotAxis, const QString& name )
+{
+    RiuPlotAxis newPlotAxis = plotWidget()->createNextPlotAxis( plotAxis );
+    return addNewAxisProperties( newPlotAxis, name );
+}
+
+//--------------------------------------------------------------------------------------------------
+///
+//--------------------------------------------------------------------------------------------------
+RimPlotAxisProperties* RimSummaryPlot::addNewAxisProperties( RiuPlotAxis plotAxis, const QString& name )
+{
+    RimPlotAxisProperties* axisProperties = new RimPlotAxisProperties;
+    axisProperties->setNameAndAxis( name, plotAxis.axis(), plotAxis.index() );
+    m_axisProperties.push_back( axisProperties );
+    connectAxisSignals( axisProperties );
+
+    return axisProperties;
+}
+
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.h

@@ -189,6 +189,8 @@ public:
 
     RimPlotAxisPropertiesInterface* axisPropertiesForPlotAxis( RiuPlotAxis plotAxis ) const;
 
+    RimPlotAxisProperties* addNewAxisProperties( RiaDefines::PlotAxis, const QString& name );
+
 public:
     // RimViewWindow overrides
     void deleteViewWidget() override;
@@ -211,6 +213,8 @@ private:
 
     void connectCurveToPlot( RimSummaryCurve* curve, bool update, bool autoAssignPlotAxis );
 
+    RimPlotAxisProperties* addNewAxisProperties( RiuPlotAxis plotAxis, const QString& name );
+
 protected:
     // Overridden PDM methods
     caf::PdmFieldHandle* userDescriptionField() override;

ApplicationLibCode/UserInterface/RiuQtChartsPlotWidget.cpp

@@ -905,7 +905,9 @@ void RiuQtChartsPlotWidget::addAxis( RiuPlotAxis plotAxis, bool isEnabled, bool
 {
     QValueAxis* axis = new QValueAxis();
     qtChart()->addAxis( axis, mapPlotAxisToQtAlignment( plotAxis.axis() ) );
-    m_axes[plotAxis] = axis;
+    m_axes[plotAxis]          = axis;
+    m_axesEnabled[plotAxis]   = isEnabled;
+    m_axesAutoScale[plotAxis] = isAutoScale;
 }
 
 //--------------------------------------------------------------------------------------------------