#2053 Curve calc. Add 'Create copy' context menu

ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculator.cpp

@@ -25,6 +25,8 @@
 #include "RimSummaryCalculation.h"
 #include "RimSummaryCalculationCollection.h"
 
+#include "RiuCalculationsContextMenuManager.h"
+
 #include "cafPdmUiListEditor.h"
 #include "cafPdmUiPushButtonEditor.h"
 #include "cafPdmUiTreeSelectionEditor.h"
@@ -39,8 +41,8 @@ RicSummaryCurveCalculator::RicSummaryCurveCalculator()
 {
     CAF_PDM_InitObject("RicSummaryCurveCalculator", "", "", "");
 
-    CAF_PDM_InitFieldNoDefault(&m_currentCalculation, "CurrentCalculation", "Current Calculation", "", "", "");
+    CAF_PDM_InitFieldNoDefault(&m_currentCalculation, "CurrentCalculation", "", "", "", "");
-    m_currentCalculation.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::TOP);
+    m_currentCalculation.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
     //m_currentCalculation.uiCapability()->setUiEditorTypeName(caf::PdmUiTreeSelectionEditor::uiEditorTypeName());
     m_currentCalculation.uiCapability()->setUiEditorTypeName(caf::PdmUiListEditor::uiEditorTypeName());
 
@@ -49,6 +51,8 @@ RicSummaryCurveCalculator::RicSummaryCurveCalculator()
     
     CAF_PDM_InitFieldNoDefault(&m_deleteCalculation, "DeleteCalculation", "Delete Calculation", "", "", "");
     RicSummaryCurveCalculator::assignPushButtonEditor(&m_deleteCalculation);
+
+    m_calcContextMenuMgr = std::unique_ptr<RiuCalculationsContextMenuManager>(new RiuCalculationsContextMenuManager());
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -266,4 +270,15 @@ void RicSummaryCurveCalculator::onEditorWidgetsCreated()
     {
         m_currentCalculation->attachToWidget();
     }
+
+    for (const auto& e : m_currentCalculation.uiCapability()->connectedEditors())
+    {
+        caf::PdmUiListEditor* listEditor = dynamic_cast<caf::PdmUiListEditor*>(e);
+        if (!listEditor) continue;
+
+        QWidget* widget = listEditor->editorWidget();
+        if (!widget) continue;
+
+        m_calcContextMenuMgr->attachWidget(widget, this);
+    }
 }

ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculator.h

@@ -18,13 +18,14 @@
 
 #pragma once
 
-
 #include "cafPdmField.h"
 #include "cafPdmObject.h"
 #include "cafPdmPtrField.h"
+#include <memory>
 
 class RimSummaryCalculationCollection;
 class RimSummaryCalculation;
+class RiuCalculationsContextMenuManager;
 
 //==================================================================================================
 /// 
@@ -44,6 +45,8 @@ public:
     bool            parseExpression() const;
     bool            calculate() const;
 
+    static RimSummaryCalculationCollection* calculationCollection();
+
 private:
     virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
     virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
@@ -52,8 +55,6 @@ private:
     virtual void onEditorWidgetsCreated();
 
 private:
-    static RimSummaryCalculationCollection* calculationCollection();
-
     // TODO : Move to a common caf helper class
     static void assignPushButtonEditor(caf::PdmFieldHandle* fieldHandle);
     static void assignPushButtonEditorText(caf::PdmUiEditorAttribute* attribute, const QString& text);
@@ -63,4 +64,6 @@ private:
     
     caf::PdmField<bool>                 m_newCalculation;
     caf::PdmField<bool>                 m_deleteCalculation;
+
+    std::unique_ptr<RiuCalculationsContextMenuManager> m_calcContextMenuMgr;
 };

ApplicationCode/ProjectDataModel/RimSummaryCalculation.cpp

@@ -129,11 +129,19 @@ const std::vector<time_t>& RimSummaryCalculation::timeSteps() const
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimSummaryCalculation::setDefaultExpression(const QString& expr)
+void RimSummaryCalculation::setExpression(const QString& expr)
 {
     m_expression = expr;
 }
 
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RimSummaryCalculation::expression() const
+{
+    return m_expression;
+}
+
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ProjectDataModel/RimSummaryCalculation.h

@@ -47,7 +47,8 @@ public:
     const std::vector<double>&      values() const;
     const std::vector<time_t>&      timeSteps() const;
 
-    void                            setDefaultExpression(const QString& expr);
+    void                            setExpression(const QString& expr);
+    QString                         expression() const;
 
     bool                            parseExpression();
     bool                            calculate();

ApplicationCode/ProjectDataModel/RimSummaryCalculationCollection.cpp

@@ -50,7 +50,7 @@ RimSummaryCalculation* RimSummaryCalculationCollection::addCalculation()
 
     QString varName = QString("Calculation_%1").arg(m_calcuations.size() + 1);
     calculation->setDescription(varName);
-    calculation->setDefaultExpression(varName + " := a + b");
+    calculation->setExpression(varName + " := a + b");
     calculation->parseExpression();
 
     m_calcuations.push_back(calculation);
@@ -60,6 +60,41 @@ RimSummaryCalculation* RimSummaryCalculationCollection::addCalculation()
     return calculation;
 }
 
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+RimSummaryCalculation* RimSummaryCalculationCollection::addCalculationCopy(const RimSummaryCalculation* sourceCalculation)
+{
+    RimSummaryCalculation* calcCopy = dynamic_cast<RimSummaryCalculation*>(
+        sourceCalculation->xmlCapability()->copyByXmlSerialization(caf::PdmDefaultObjectFactory::instance()));
+    CVF_ASSERT(calcCopy);
+
+    std::set<QString> calcNames;
+    for (const auto& calc : m_calcuations)
+    {
+        calcNames.insert(calc->findLeftHandSide(calc->expression()));
+    }
+
+    QString expression = calcCopy->expression();
+    QString currVarName = calcCopy->findLeftHandSide(expression);
+
+    QString newVarName = currVarName;
+    while (calcNames.count(newVarName) > 0)
+    {
+        newVarName += "_copy";
+    }
+
+    expression.replace(currVarName, newVarName);
+    calcCopy->setExpression(expression);
+    calcCopy->parseExpression();
+
+    m_calcuations.push_back(calcCopy);
+
+    rebuildCaseMetaData();
+
+    return calcCopy;
+}
+
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ProjectDataModel/RimSummaryCalculationCollection.h

@@ -38,6 +38,7 @@ public:
     RimSummaryCalculationCollection();
 
     RimSummaryCalculation*              addCalculation();
+    RimSummaryCalculation*              addCalculationCopy(const RimSummaryCalculation* sourceCalculation);
     void                                deleteCalculation(RimSummaryCalculation* calculation);
     std::vector<RimSummaryCalculation*> calculations() const;
 

ApplicationCode/UserInterface/CMakeLists_files.cmake

@@ -61,6 +61,7 @@ ${CEE_CURRENT_LIST_DIR}RiuSummaryCurveDefSelectionDialog.h
 ${CEE_CURRENT_LIST_DIR}RiuSummaryCurveDefSelectionEditor.h
 ${CEE_CURRENT_LIST_DIR}RiuSummaryVectorDescriptionMap.h
 ${CEE_CURRENT_LIST_DIR}RiuExpressionContextMenuManager.h
+${CEE_CURRENT_LIST_DIR}RiuCalculationsContextMenuManager.h
 )
 
 set (SOURCE_GROUP_SOURCE_FILES
@@ -118,6 +119,7 @@ ${CEE_CURRENT_LIST_DIR}RiuSummaryCurveDefSelectionDialog.cpp
 ${CEE_CURRENT_LIST_DIR}RiuSummaryCurveDefSelectionEditor.cpp
 ${CEE_CURRENT_LIST_DIR}RiuSummaryVectorDescriptionMap.cpp
 ${CEE_CURRENT_LIST_DIR}RiuExpressionContextMenuManager.cpp
+${CEE_CURRENT_LIST_DIR}RiuCalculationsContextMenuManager.cpp
 )
 
 list(APPEND CODE_HEADER_FILES
@@ -155,6 +157,7 @@ ${CEE_CURRENT_LIST_DIR}RiuFlowCharacteristicsPlot.h
 ${CEE_CURRENT_LIST_DIR}RiuNightchartsWidget.h
 ${CEE_CURRENT_LIST_DIR}RiuMessagePanel.h
 ${CEE_CURRENT_LIST_DIR}RiuExpressionContextMenuManager.h
+${CEE_CURRENT_LIST_DIR}RiuCalculationsContextMenuManager.h
 )
 
 list(APPEND QT_UI_FILES

ApplicationCode/UserInterface/RiuCalculationsContextMenuManager.cpp

@@ -0,0 +1,87 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  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 "RiuCalculationsContextMenuManager.h"
+#include "RimSummaryCalculationCollection.h"
+#include <QMenu>
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RiuCalculationsContextMenuManager::attachWidget(QWidget* widget, RicSummaryCurveCalculator* curveCalc)
+{
+    if (m_widget != widget)
+    {
+        widget->setContextMenuPolicy(Qt::CustomContextMenu);
+        QObject::connect(widget, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(slotMenuItems(QPoint)));
+
+        m_widget = widget;
+        m_curveCalc = std::unique_ptr<RicSummaryCurveCalculator>(curveCalc);
+    }
+
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RiuCalculationsContextMenuManager::slotMenuItems(QPoint point)
+{
+    QMenu menu;
+
+    QAction action("Create copy", this);
+    connect(&action, SIGNAL(triggered()), SLOT(slotCreateCalculationCopy()));
+    menu.addAction(&action);
+
+
+    QPoint globalPoint = point;
+    if (m_widget)
+    {
+        globalPoint = m_widget->mapToGlobal(point);
+
+        //m_textPosition = m_widget->textCursor().position();
+    }
+
+    menu.exec(globalPoint);
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RiuCalculationsContextMenuManager::slotCreateCalculationCopy()
+{
+    RimSummaryCalculation* currCalculation = m_curveCalc != nullptr ? m_curveCalc->currentCalculation() : nullptr;
+    
+    if (m_widget != nullptr && currCalculation != nullptr)
+    {
+        RimSummaryCalculationCollection* coll = RicSummaryCurveCalculator::calculationCollection();
+        coll->addCalculationCopy(currCalculation);
+        m_curveCalc->updateConnectedEditors();
+
+
+
+        //QAction* action = qobject_cast<QAction *>(sender());
+        //if (action)
+        //{
+        //    QTextCursor cursor = m_textEdit->textCursor();
+        //    cursor.setPosition(m_textPosition);
+
+        //    m_textEdit->setTextCursor(cursor);
+        //    m_textEdit->insertPlainText(action->text());
+        //}
+    }
+}

ApplicationCode/UserInterface/RiuCalculationsContextMenuManager.h

@@ -0,0 +1,58 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  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 "SummaryPlotCommands/RicSummaryCurveCalculator.h"
+#include "cafPdmChildArrayField.h"
+#include "cafPdmObject.h"
+#include "cafPdmField.h"
+#include <QPointer>
+#include <QAction>
+#include <QWidget>
+#include <memory>
+
+class RimSummaryCalculationVariable;
+
+//==================================================================================================
+///  
+///  
+//==================================================================================================
+class RiuCalculationsContextMenuManager : public QObject
+{
+    Q_OBJECT
+
+     static const std::map<QString, std::set<QString>> MENU_MAP;
+
+public:
+    RiuCalculationsContextMenuManager() { }
+
+	void attachWidget(QWidget* widget, RicSummaryCurveCalculator* curveCalc);
+
+public slots:
+	void slotMenuItems(QPoint point);
+
+private slots:
+	void slotCreateCalculationCopy();
+
+private:
+	QPointer<QWidget>                           m_widget;
+    std::unique_ptr<RicSummaryCurveCalculator>  m_curveCalc;
+	int                                         m_textPosition;
+    std::map<QString, std::unique_ptr<QAction>> m_actionCache;
+};