(#388) Added RicNewStatisticsCaseFeature

ApplicationCode/Commands/CMakeLists_files.cmake

@@ -46,6 +46,7 @@ ${CEE_CURRENT_LIST_DIR}RicSaveEclipseResultAsInputPropertyExec.h
 ${CEE_CURRENT_LIST_DIR}RicImportEclipseCaseFeature.h
 ${CEE_CURRENT_LIST_DIR}RicImportInputEclipseCaseFeature.h
 ${CEE_CURRENT_LIST_DIR}RicCreateGridCaseGroupFeature.h
+${CEE_CURRENT_LIST_DIR}RicNewStatisticsCaseFeature.h
 
 ${CEE_CURRENT_LIST_DIR}RicWellPathsImportSsihubFeature.h
 ${CEE_CURRENT_LIST_DIR}RicWellPathsImportFileFeature.h
@@ -98,6 +99,7 @@ ${CEE_CURRENT_LIST_DIR}RicSaveEclipseResultAsInputPropertyExec.cpp
 ${CEE_CURRENT_LIST_DIR}RicImportEclipseCaseFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicImportInputEclipseCaseFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicCreateGridCaseGroupFeature.cpp
+${CEE_CURRENT_LIST_DIR}RicNewStatisticsCaseFeature.cpp
 
 ${CEE_CURRENT_LIST_DIR}RicWellPathsImportSsihubFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicWellPathsImportFileFeature.cpp

ApplicationCode/Commands/RicNewStatisticsCaseFeature.cpp

@@ -0,0 +1,129 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  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 <http://www.gnu.org/licenses/gpl.html> 
+//  for more details.
+//
+/////////////////////////////////////////////////////////////////////////////////
+
+#include "RicNewStatisticsCaseFeature.h"
+
+#include "RimEclipseStatisticsCase.h"
+#include "RimEclipseStatisticsCaseCollection.h"
+#include "RimIdenticalGridCaseGroup.h"
+#include "RimCaseCollection.h"
+#include "RimProject.h"
+
+#include "RiaApplication.h"
+#include "RiuMainWindow.h"
+
+#include "cafSelectionManager.h"
+#include "cafUiTreeModelPdm.h"
+#include "cafPdmUiTreeView.h"
+
+#include <QAction>
+
+CAF_CMD_SOURCE_INIT(RicNewStatisticsCaseFeature, "RicNewStatisticsCaseFeature");
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+bool RicNewStatisticsCaseFeature::isCommandEnabled()
+{
+    return selectedValidUIItem() != NULL;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicNewStatisticsCaseFeature::onActionTriggered(bool isChecked)
+{
+    caf::PdmUiItem* uiItem = selectedValidUIItem();
+    if (uiItem)
+    {
+        RimEclipseStatisticsCase* newCase = addStatisticalCalculation(uiItem);
+        if (newCase)
+        {
+            RiuMainWindow::instance()->projectTreeView()->selectAsCurrentItem(newCase);
+        }
+    }
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicNewStatisticsCaseFeature::setupActionLook(QAction* actionToSetup)
+{
+    actionToSetup->setText("New Statistics Case");
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+caf::PdmUiItem* RicNewStatisticsCaseFeature::selectedValidUIItem()
+{
+    std::vector<RimEclipseStatisticsCaseCollection*> statisticsCaseCollections;
+    caf::SelectionManager::instance()->objectsByType(&statisticsCaseCollections);
+
+    if (statisticsCaseCollections.size() > 0)
+    {
+        return statisticsCaseCollections[0];
+    }
+
+    std::vector<RimCaseCollection*> caseCollections;
+    caf::SelectionManager::instance()->objectsByType(&caseCollections);
+
+    if (caseCollections.size() > 0)
+    {
+        if (RimIdenticalGridCaseGroup::isStatisticsCaseCollection(caseCollections[0]))
+        {
+            return caseCollections[0];
+        }
+    }
+
+    return NULL;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+RimEclipseStatisticsCase* RicNewStatisticsCaseFeature::addStatisticalCalculation(caf::PdmUiItem* uiItem)
+{
+    RimIdenticalGridCaseGroup* caseGroup = NULL;
+
+    if (dynamic_cast<RimEclipseStatisticsCase*>(uiItem))
+    {
+        RimEclipseStatisticsCase* currentObject = dynamic_cast<RimEclipseStatisticsCase*>(uiItem);
+        caseGroup = currentObject->parentStatisticsCaseCollection()->parentCaseGroup();
+    }
+    else if (dynamic_cast<RimCaseCollection*>(uiItem))
+    {
+        RimCaseCollection* statColl = dynamic_cast<RimCaseCollection*>(uiItem);
+        caseGroup = statColl->parentCaseGroup();
+    }
+
+    if (caseGroup)
+    {
+        RimProject* proj = RiaApplication::instance()->project();
+        RimEclipseStatisticsCase* createdObject = caseGroup->createAndAppendStatisticsCase();
+        proj->assignCaseIdToCase(createdObject);
+
+        caseGroup->updateConnectedEditors();
+        return createdObject;
+    }
+    else
+    {
+        return NULL;
+    }
+}

ApplicationCode/Commands/RicNewStatisticsCaseFeature.h

@@ -0,0 +1,49 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  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 <http://www.gnu.org/licenses/gpl.html> 
+//  for more details.
+//
+/////////////////////////////////////////////////////////////////////////////////
+
+#pragma once
+
+#include "cafCmdFeature.h"
+
+#include <vector>
+
+class RimEclipseStatisticsCase;
+
+namespace caf
+{
+    class PdmUiItem;
+}
+
+//==================================================================================================
+/// 
+//==================================================================================================
+class RicNewStatisticsCaseFeature : public caf::CmdFeature
+{
+    CAF_CMD_HEADER_INIT;
+
+protected:
+    // Overrides
+    virtual bool isCommandEnabled();
+    virtual void onActionTriggered( bool isChecked );
+    virtual void setupActionLook( QAction* actionToSetup );
+
+private:
+    caf::PdmUiItem*             selectedValidUIItem();
+    RimEclipseStatisticsCase*   addStatisticalCalculation(caf::PdmUiItem* uiItem);
+};

ApplicationCode/ProjectDataModel/RimProject.cpp

@@ -587,10 +587,10 @@ void RimProject::actionsBasedOnSelection(QMenu& contextMenu)
             commandIds << "Separator";
             commandIds << "RicDeleteItemFeature";
         }
-        else if (dynamic_cast<RimEclipseStatisticsCaseCollection*>(uiItem))
+        else if (dynamic_cast<RimCaseCollection*>(uiItem))
         {
-            //menu.addAction(QString("New Statistics Case"), this, SLOT(slotNewStatisticsCase()));
-            //commandIds << "RicNewStatisticsCaseFeature"
+            // Todo: "Paste"
+            commandIds << "RicNewStatisticsCaseFeature";
         }
         else if (dynamic_cast<RimEclipseStatisticsCase*>(uiItem))
         {

ApplicationCode/ProjectDataModel/RimUiTreeView.cpp

@@ -975,6 +975,7 @@ void RimUiTreeView::slotCloseCase()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
+// OBSOLETE - see RicNewStatisticsCaseFeature
 void RimUiTreeView::slotNewStatisticsCase()
 {
     RimUiTreeModelPdm* myModel = dynamic_cast<RimUiTreeModelPdm*>(model());