#849 Added import summary case command

ApplicationCode/Application/RiaApplication.cpp

@@ -47,11 +47,11 @@
 #include "RimEclipseView.h"
 #include "RimEclipseWellCollection.h"
 #include "RimFaultCollection.h"
+#include "RimFormationNamesCollection.h"
 #include "RimGeoMechCase.h"
 #include "RimGeoMechCellColors.h"
 #include "RimGeoMechModels.h"
 #include "RimGeoMechView.h"
-#include "RimGridSummaryCase.h"
 #include "RimIdenticalGridCaseGroup.h"
 #include "RimMainPlotCollection.h"
 #include "RimOilField.h"
@@ -68,7 +68,6 @@
 #include "RimWellLogPlotCollection.h"
 #include "RimWellPath.h"
 #include "RimWellPathCollection.h"
-#include "RimFormationNamesCollection.h"
 
 #include "RiuMainPlotWindow.h"
 #include "RiuMainWindow.h"
@@ -79,6 +78,7 @@
 #include "RiuViewer.h"
 #include "RiuWellLogPlot.h"
 
+#include "RicImportSummaryCaseFeature.h"
 #include "SummaryPlotCommands/RicNewSummaryPlotFeature.h"
 
 #include "cafFixedAtlasFont.h"
@@ -842,7 +842,7 @@ bool RiaApplication::openEclipseCase(const QString& caseName, const QString& cas
         RimSummaryCaseCollection* sumCaseColl = m_project->activeOilField() ? m_project->activeOilField()->summaryCaseCollection() : NULL;
         if(sumCaseColl)
         {
-            RimGridSummaryCase* newSumCase = sumCaseColl->createAndAddSummaryCaseFromEclipseResultCase(rimResultReservoir);
+            RimSummaryCase* newSumCase = sumCaseColl->createAndAddSummaryCaseFromEclipseResultCase(rimResultReservoir);
             if (newSumCase)
             {
                 newSumCase->loadCase();
@@ -1864,6 +1864,15 @@ bool RiaApplication::openFile(const QString& fileName)
     {
         loadingSucceded = openOdbCaseFromFile(fileName);
     }
+    else if (fileName.contains(".smspec", Qt::CaseInsensitive))
+    {
+        loadingSucceded = RicImportSummaryCaseFeature::createAndAddSummaryCaseFromFile(fileName);
+        if (loadingSucceded)
+        {
+            getOrCreateAndShowMainPlotWindow();
+            m_project->updateConnectedEditors();
+        }
+    }
 
     return loadingSucceded;
 }

ApplicationCode/Commands/CMakeLists_files.cmake

@@ -51,6 +51,7 @@ ${CEE_CURRENT_LIST_DIR}RicImportInputEclipseCaseOpmFeature.h
 ${CEE_CURRENT_LIST_DIR}RicSnapshotViewToClipboardFeature.h
 ${CEE_CURRENT_LIST_DIR}RicAddOpmInputPropertyFeature.h
 ${CEE_CURRENT_LIST_DIR}RicImportGeoMechCaseFeature.h
+${CEE_CURRENT_LIST_DIR}RicImportSummaryCaseFeature.h
 
 # General delete of any object in a child array field
 ${CEE_CURRENT_LIST_DIR}RicDeleteItemExec.h
@@ -104,6 +105,7 @@ ${CEE_CURRENT_LIST_DIR}RicImportInputEclipseCaseOpmFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicSnapshotViewToClipboardFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicAddOpmInputPropertyFeature.cpp
 ${CEE_CURRENT_LIST_DIR}RicImportGeoMechCaseFeature.cpp
+${CEE_CURRENT_LIST_DIR}RicImportSummaryCaseFeature.cpp
 
 
 # General delete of any object in a child array field

ApplicationCode/Commands/RicImportSummaryCaseFeature.cpp

@@ -0,0 +1,105 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2016-     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 "RicImportSummaryCaseFeature.h"
+
+#include "RiaApplication.h"
+
+#include "RimGridSummaryCase.h"
+#include "RimMainPlotCollection.h"
+#include "RimOilField.h"
+#include "RimProject.h"
+#include "RimSummaryCase.h"
+#include "RimSummaryCaseCollection.h"
+#include "RimSummaryPlotCollection.h"
+
+#include "SummaryPlotCommands/RicNewSummaryPlotFeature.h"
+
+#include <QAction>
+#include <QFileDialog>
+
+CAF_CMD_SOURCE_INIT(RicImportSummaryCaseFeature, "RicImportSummaryCaseFeature");
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+bool RicImportSummaryCaseFeature::isCommandEnabled()
+{
+    return true;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicImportSummaryCaseFeature::onActionTriggered(bool isChecked)
+{
+    RiaApplication* app = RiaApplication::instance();
+    QString defaultDir = app->lastUsedDialogDirectory("INPUT_FILES");
+    QStringList fileNames = QFileDialog::getOpenFileNames(NULL, "Import Summary Case", defaultDir, "Eclipse Summary File (*.SMSPEC);;All Files (*.*)");
+
+    if (fileNames.isEmpty()) return;
+
+    // Remember the path to next time
+    app->setLastUsedDialogDirectory("INPUT_FILES", QFileInfo(fileNames.last()).absolutePath());
+
+    RimProject* proj = app->project();
+
+    RimSummaryCaseCollection* sumCaseColl = proj->activeOilField() ? proj->activeOilField()->summaryCaseCollection() : nullptr;
+    if (!sumCaseColl) return;
+
+    for (auto f : fileNames)
+    {
+        RicImportSummaryCaseFeature::createAndAddSummaryCaseFromFile(f);
+    }
+
+    app->getOrCreateAndShowMainPlotWindow();
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicImportSummaryCaseFeature::setupActionLook(QAction* actionToSetup)
+{
+    actionToSetup->setIcon(QIcon(":/SummaryPlots16x16.png"));
+    actionToSetup->setText("Import Summary Case");
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+bool RicImportSummaryCaseFeature::createAndAddSummaryCaseFromFile(const QString& fileName)
+{
+    RiaApplication* app = RiaApplication::instance();
+    RimProject* proj = app->project();
+    RimSummaryCaseCollection* sumCaseColl = proj->activeOilField() ? proj->activeOilField()->summaryCaseCollection() : nullptr;
+    if (!sumCaseColl) return false;
+
+    RimSummaryCase* newSumCase = sumCaseColl->createAndAddSummaryCaseFromFileName(fileName);
+    newSumCase->loadCase();
+
+    RimMainPlotCollection* mainPlotColl = proj->mainPlotCollection();
+    RimSummaryPlotCollection* summaryPlotColl = mainPlotColl->summaryPlotCollection();
+
+    RicNewSummaryPlotFeature::createNewSummaryPlot(summaryPlotColl, newSumCase);
+
+    sumCaseColl->updateConnectedEditors();
+    app->addToRecentFiles(fileName);
+
+    return true;
+}
+

ApplicationCode/Commands/RicImportSummaryCaseFeature.h

@@ -0,0 +1,42 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  Copyright (C) 2016-     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 "cafCmdFeature.h"
+
+#include <QString>
+
+//==================================================================================================
+/// 
+//==================================================================================================
+class RicImportSummaryCaseFeature : public caf::CmdFeature
+{
+    CAF_CMD_HEADER_INIT;
+
+public:
+    static bool createAndAddSummaryCaseFromFile(const QString& fileName);
+
+protected:
+    // Overrides
+    virtual bool isCommandEnabled() override;
+    virtual void onActionTriggered( bool isChecked ) override;
+    virtual void setupActionLook( QAction* actionToSetup ) override;
+};
+
+

ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryPlotFeature.cpp

@@ -109,7 +109,6 @@ void RicNewSummaryPlotFeature::createNewSummaryPlot(RimSummaryPlotCollection* su
 
     summaryPlotColl->updateConnectedEditors();
     plot->loadDataAndUpdate();
-    
 
     if (RiaApplication::instance()->mainPlotWindow())
     {

ApplicationCode/ProjectDataModel/RimFileSummaryCase.cpp

@@ -32,7 +32,8 @@ CAF_PDM_SOURCE_INIT(RimFileSummaryCase,"FileSummaryCase");
 //--------------------------------------------------------------------------------------------------
 RimFileSummaryCase::RimFileSummaryCase()
 {
-
+    CAF_PDM_InitFieldNoDefault(&m_summaryHeaderFilename, "SummaryHeaderFilename", "Summary Header File", "", "", "");
+    m_summaryHeaderFilename.uiCapability()->setUiReadOnly(true);
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -49,6 +50,9 @@ RimFileSummaryCase::~RimFileSummaryCase()
 void RimFileSummaryCase::setSummaryHeaderFilename(const QString& fileName)
 {
     m_summaryHeaderFilename = fileName;
+
+    this->updateAutoShortName();
+    this->updateTreeItemName();
 }
 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ProjectDataModel/RimSummaryCaseCollection.cpp

@@ -23,6 +23,7 @@
 #include "RimGridSummaryCase.h"
 #include "RifEclipseSummaryTools.h"
 #include <QDir>
+#include "RimFileSummaryCase.h"
 
 
 CAF_PDM_SOURCE_INIT(RimSummaryCaseCollection,"SummaryCaseCollection");
@@ -121,7 +122,7 @@ void RimSummaryCaseCollection::loadAllSummaryCaseData()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimGridSummaryCase* RimSummaryCaseCollection::createAndAddSummaryCaseFromEclipseResultCase(RimEclipseResultCase* eclResCase)
+RimSummaryCase* RimSummaryCaseCollection::createAndAddSummaryCaseFromEclipseResultCase(RimEclipseResultCase* eclResCase)
 {
     QString gridFileName = eclResCase->gridFileName();
     if(RifEclipseSummaryTools::hasSummaryFiles(QDir::toNativeSeparators(gridFileName).toStdString()))
@@ -135,6 +136,20 @@ RimGridSummaryCase* RimSummaryCaseCollection::createAndAddSummaryCaseFromEclipse
     return nullptr;
 }
 
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+RimSummaryCase* RimSummaryCaseCollection::createAndAddSummaryCaseFromFileName(const QString& fileName)
+{
+    RimFileSummaryCase* newSumCase = new RimFileSummaryCase();
+
+    this->m_cases.push_back(newSumCase);
+    newSumCase->setSummaryHeaderFilename(fileName);
+    newSumCase->updateOptionSensitivity();
+
+    return newSumCase;
+}
+
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/ProjectDataModel/RimSummaryCaseCollection.h

@@ -21,7 +21,6 @@
 #include "cafPdmObject.h"
 
 class RimSummaryCase;
-class RimGridSummaryCase;
 class RimEclipseResultCase;
 
 class RimSummaryCaseCollection : public caf::PdmObject
@@ -35,7 +34,8 @@ public:
     size_t              summaryCaseCount();
 
     void                createSummaryCasesFromRelevantEclipseResultCases();
-    RimGridSummaryCase* createAndAddSummaryCaseFromEclipseResultCase(RimEclipseResultCase* eclResCase);
+    RimSummaryCase*     createAndAddSummaryCaseFromEclipseResultCase(RimEclipseResultCase* eclResCase);
+    RimSummaryCase*     createAndAddSummaryCaseFromFileName(const QString& fileName);
 
     void                loadAllSummaryCaseData();
 

ApplicationCode/UserInterface/RiuMainPlotWindow.cpp

@@ -159,6 +159,7 @@ void RiuMainPlotWindow::createMenus()
     importMenu->addAction(cmdFeatureMgr->action("RicImportEclipseCaseFeature"));
     importMenu->addAction(cmdFeatureMgr->action("RicImportInputEclipseCaseFeature"));
     importMenu->addAction(cmdFeatureMgr->action("RicImportInputEclipseCaseOpmFeature"));
+    importMenu->addAction(cmdFeatureMgr->action("RicImportSummaryCaseFeature"));
     importMenu->addAction(cmdFeatureMgr->action("RicCreateGridCaseGroupFeature"));
     importMenu->addSeparator();
 #ifdef USE_ODB_API

ApplicationCode/UserInterface/RiuMainWindow.cpp

@@ -323,6 +323,7 @@ void RiuMainWindow::createMenus()
     importMenu->addAction(cmdFeatureMgr->action("RicImportEclipseCaseFeature"));
     importMenu->addAction(cmdFeatureMgr->action("RicImportInputEclipseCaseFeature"));
     importMenu->addAction(cmdFeatureMgr->action("RicImportInputEclipseCaseOpmFeature"));
+    importMenu->addAction(cmdFeatureMgr->action("RicImportSummaryCaseFeature"));
     importMenu->addAction(cmdFeatureMgr->action("RicCreateGridCaseGroupFeature"));
     importMenu->addSeparator();
     #ifdef USE_ODB_API