System : Moved files to Commands/EclipseCommands

ApplicationCode/Commands/EclipseCommands/CMakeLists_files.cmake

@@ -0,0 +1,57 @@
+
+# Use this workaround until we're on 2.8.3 on all platforms and can use CMAKE_CURRENT_LIST_DIR directly 
+if (${CMAKE_VERSION} VERSION_GREATER "2.8.2")
+    set(CEE_CURRENT_LIST_DIR  ${CMAKE_CURRENT_LIST_DIR}/)
+endif()
+
+set (SOURCE_GROUP_HEADER_FILES
+${CEE_CURRENT_LIST_DIR}RicAddEclipseInputPropertyFeature.h
+${CEE_CURRENT_LIST_DIR}RicAddOpmInputPropertyFeature.h
+${CEE_CURRENT_LIST_DIR}RicComputeStatisticsFeature.h
+${CEE_CURRENT_LIST_DIR}RicCreateGridCaseGroupFeature.h
+${CEE_CURRENT_LIST_DIR}RicEclipseCaseNewGroupExec.h
+${CEE_CURRENT_LIST_DIR}RicEclipseCaseNewGroupFeature.h
+${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterFeatureImpl.h
+${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterInsertExec.h
+${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterInsertFeature.h
+${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterNewExec.h
+${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterNewFeature.h
+${CEE_CURRENT_LIST_DIR}RicImportEclipseCaseFeature.h
+${CEE_CURRENT_LIST_DIR}RicImportInputEclipseCaseFeature.h
+${CEE_CURRENT_LIST_DIR}RicImportInputEclipseCaseOpmFeature.h
+${CEE_CURRENT_LIST_DIR}RicNewStatisticsCaseFeature.h
+${CEE_CURRENT_LIST_DIR}RicSaveEclipseInputPropertyFeature.h
+${CEE_CURRENT_LIST_DIR}RicSaveEclipseResultAsInputPropertyExec.h
+${CEE_CURRENT_LIST_DIR}RicSaveEclipseResultAsInputPropertyFeature.h
+)
+
+set (SOURCE_GROUP_SOURCE_FILES
+${CEE_CURRENT_LIST_DIR}RicAddEclipseInputPropertyFeature.cpp
+${CEE_CURRENT_LIST_DIR}RicAddOpmInputPropertyFeature.cpp
+${CEE_CURRENT_LIST_DIR}RicComputeStatisticsFeature.cpp
+${CEE_CURRENT_LIST_DIR}RicCreateGridCaseGroupFeature.cpp
+${CEE_CURRENT_LIST_DIR}RicEclipseCaseNewGroupExec.cpp
+${CEE_CURRENT_LIST_DIR}RicEclipseCaseNewGroupFeature.cpp
+${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterFeatureImpl.cpp
+${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterInsertExec.cpp
+${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterInsertFeature.cpp
+${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterNewExec.cpp
+${CEE_CURRENT_LIST_DIR}RicEclipsePropertyFilterNewFeature.cpp
+${CEE_CURRENT_LIST_DIR}RicImportEclipseCaseFeature.cpp
+${CEE_CURRENT_LIST_DIR}RicImportInputEclipseCaseFeature.cpp
+${CEE_CURRENT_LIST_DIR}RicImportInputEclipseCaseOpmFeature.cpp
+${CEE_CURRENT_LIST_DIR}RicNewStatisticsCaseFeature.cpp
+${CEE_CURRENT_LIST_DIR}RicSaveEclipseInputPropertyFeature.cpp
+${CEE_CURRENT_LIST_DIR}RicSaveEclipseResultAsInputPropertyExec.cpp
+${CEE_CURRENT_LIST_DIR}RicSaveEclipseResultAsInputPropertyFeature.cpp
+)
+
+list(APPEND CODE_HEADER_FILES
+${SOURCE_GROUP_HEADER_FILES}
+)
+
+list(APPEND CODE_SOURCE_FILES
+${SOURCE_GROUP_SOURCE_FILES}
+)
+
+source_group( "CommandFeature\\Eclipse" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_files.cmake )

ApplicationCode/Commands/EclipseCommands/RicAddEclipseInputPropertyFeature.cpp

@@ -0,0 +1,116 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  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 "RicAddEclipseInputPropertyFeature.h"
+
+#include "RimEclipseInputPropertyCollection.h"
+#include "RimEclipseInputCase.h"
+#include "RimEclipseInputCaseOpm.h"
+
+#include "RiaApplication.h"
+#include "RiuMainWindow.h"
+ 
+#include "cafSelectionManager.h"
+
+#include <QAction>
+#include <QFileDialog>
+#include <QStringList>
+#include <QFileInfo>
+
+CAF_CMD_SOURCE_INIT(RicAddEclipseInputPropertyFeature, "RicAddEclipseInputPropertyFeature");
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+bool RicAddEclipseInputPropertyFeature::isCommandEnabled()
+{
+    RimEclipseInputPropertyCollection* inputProp = selectedInputPropertyCollection();
+    if (inputProp)
+    {
+        RimEclipseInputCaseOpm* inputCaseOpm = NULL;
+
+        inputProp->firstAncestorOrThisOfType(inputCaseOpm);
+        if (inputCaseOpm)
+        {
+            return false;
+        }
+    }
+
+    return selectedInputPropertyCollection() != NULL;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicAddEclipseInputPropertyFeature::onActionTriggered(bool isChecked)
+{
+    RiaApplication* app = RiaApplication::instance();
+    QString defaultDir = app->lastUsedDialogDirectory("INPUT_FILES");
+    QStringList fileNames = QFileDialog::getOpenFileNames(RiuMainWindow::instance(), "Select Eclipse Input Property Files", defaultDir, "All Files (*.* *)");
+
+    if (fileNames.isEmpty()) return;
+
+    // Remember the directory to next time
+    defaultDir = QFileInfo(fileNames.last()).absolutePath();
+    app->setLastUsedDialogDirectory("INPUT_FILES", defaultDir);
+
+    RimEclipseInputPropertyCollection* inputPropertyCollection = selectedInputPropertyCollection();
+    if (inputPropertyCollection)
+    {
+        addEclipseInputProperty(fileNames, inputPropertyCollection);
+    }
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicAddEclipseInputPropertyFeature::setupActionLook(QAction* actionToSetup)
+{
+    actionToSetup->setText("Add Input Property");
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+RimEclipseInputPropertyCollection* RicAddEclipseInputPropertyFeature::selectedInputPropertyCollection() const
+{
+    std::vector<RimEclipseInputPropertyCollection*> selection;
+    caf::SelectionManager::instance()->objectsByType(&selection);
+
+    return selection.size() > 0 ? selection[0] : NULL;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicAddEclipseInputPropertyFeature::addEclipseInputProperty(const QStringList& fileNames, RimEclipseInputPropertyCollection* inputPropertyCollection)
+{
+    CVF_ASSERT(inputPropertyCollection);
+
+    RimEclipseInputCase* inputReservoir = dynamic_cast<RimEclipseInputCase*>(inputPropertyCollection->parentField()->ownerObject());
+    CVF_ASSERT(inputReservoir);
+    if (inputReservoir)
+    {
+        inputReservoir->openDataFileSet(fileNames);
+    }
+
+    inputPropertyCollection->updateConnectedEditors();
+}
+
+

ApplicationCode/Commands/EclipseCommands/RicAddEclipseInputPropertyFeature.h

@@ -0,0 +1,45 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  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"
+
+class RimEclipseInputPropertyCollection;
+class QStringList;
+
+//==================================================================================================
+/// 
+//==================================================================================================
+class RicAddEclipseInputPropertyFeature : public caf::CmdFeature
+{
+    CAF_CMD_HEADER_INIT;
+
+protected:
+    // Overrides
+    virtual bool isCommandEnabled();
+    virtual void onActionTriggered( bool isChecked );
+    virtual void setupActionLook( QAction* actionToSetup );
+
+private:
+    RimEclipseInputPropertyCollection* selectedInputPropertyCollection() const;
+    static void addEclipseInputProperty(const QStringList& fileNames, RimEclipseInputPropertyCollection* inputPropertyCollection);
+};
+
+

ApplicationCode/Commands/EclipseCommands/RicAddOpmInputPropertyFeature.cpp

@@ -0,0 +1,115 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  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 "RicAddOpmInputPropertyFeature.h"
+
+#include "RiaApplication.h"
+#include "RimEclipseInputCaseOpm.h"
+#include "RimEclipseInputPropertyCollection.h"
+#include "RiuMainWindow.h"
+
+#include "cafSelectionManager.h"
+
+#include <QAction>
+#include <QFileDialog>
+#include <QFileInfo>
+#include <QStringList>
+
+CAF_CMD_SOURCE_INIT(RicAddOpmInputPropertyFeature, "RicAddOpmInputPropertyFeature");
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+bool RicAddOpmInputPropertyFeature::isCommandEnabled()
+{
+    RimEclipseInputPropertyCollection* inputProp = selectedInputPropertyCollection();
+    if (inputProp)
+    {
+        RimEclipseInputCaseOpm* inputCaseOpm = NULL;
+
+        inputProp->firstAncestorOrThisOfType(inputCaseOpm);
+        if (inputCaseOpm)
+        {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicAddOpmInputPropertyFeature::onActionTriggered(bool isChecked)
+{
+    RiaApplication* app = RiaApplication::instance();
+    QString defaultDir = app->lastUsedDialogDirectory("INPUT_FILES");
+    QStringList fileNames = QFileDialog::getOpenFileNames(NULL, "Select Eclipse Input Property Files", defaultDir, "All Files (*.* *)");
+
+    if (fileNames.isEmpty()) return;
+
+    // Remember the directory to next time
+    defaultDir = QFileInfo(fileNames.last()).absolutePath();
+    app->setLastUsedDialogDirectory("INPUT_FILES", defaultDir);
+
+    RimEclipseInputPropertyCollection* inputPropertyCollection = selectedInputPropertyCollection();
+    if (inputPropertyCollection)
+    {
+        addEclipseInputProperty(fileNames, inputPropertyCollection);
+    }
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicAddOpmInputPropertyFeature::setupActionLook(QAction* actionToSetup)
+{
+    actionToSetup->setText("Add Input Property");
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+RimEclipseInputPropertyCollection* RicAddOpmInputPropertyFeature::selectedInputPropertyCollection() const
+{
+    std::vector<RimEclipseInputPropertyCollection*> selection;
+    caf::SelectionManager::instance()->objectsByType(&selection);
+
+    return selection.size() > 0 ? selection[0] : NULL;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicAddOpmInputPropertyFeature::addEclipseInputProperty(const QStringList& fileNames, RimEclipseInputPropertyCollection* inputPropertyCollection)
+{
+    CVF_ASSERT(inputPropertyCollection);
+
+    RimEclipseInputCaseOpm* inputCaseOpm = NULL;
+
+    inputPropertyCollection->firstAncestorOrThisOfType(inputCaseOpm);
+    if (inputCaseOpm)
+    {
+        inputCaseOpm->appendPropertiesFromStandaloneFiles(fileNames);
+    }
+
+    inputPropertyCollection->updateConnectedEditors();
+}
+
+

ApplicationCode/Commands/EclipseCommands/RicAddOpmInputPropertyFeature.h

@@ -0,0 +1,45 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  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"
+
+class RimEclipseInputPropertyCollection;
+class QStringList;
+
+//==================================================================================================
+/// 
+//==================================================================================================
+class RicAddOpmInputPropertyFeature : public caf::CmdFeature
+{
+    CAF_CMD_HEADER_INIT;
+
+protected:
+    // Overrides
+    virtual bool isCommandEnabled();
+    virtual void onActionTriggered( bool isChecked );
+    virtual void setupActionLook( QAction* actionToSetup );
+
+private:
+    RimEclipseInputPropertyCollection* selectedInputPropertyCollection() const;
+    static void addEclipseInputProperty(const QStringList& fileNames, RimEclipseInputPropertyCollection* inputPropertyCollection);
+};
+
+

ApplicationCode/Commands/EclipseCommands/RicComputeStatisticsFeature.cpp

@@ -0,0 +1,88 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  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 "RicComputeStatisticsFeature.h"
+
+#include "RimEclipseCase.h"
+#include "RimEclipseStatisticsCase.h"
+#include "RimEclipseStatisticsCaseCollection.h"
+#include "RimIdenticalGridCaseGroup.h"
+#include "RimCaseCollection.h"
+
+#include "cafSelectionManager.h"
+#include "cafCmdFeatureManager.h"
+
+#include <QAction>
+
+CAF_CMD_SOURCE_INIT(RicComputeStatisticsFeature, "RicComputeStatisticsFeature");
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+bool RicComputeStatisticsFeature::isCommandEnabled()
+{
+    std::vector<RimEclipseStatisticsCase*> selection = selectedCases();
+    if (selection.size() > 0)
+    {
+        RimEclipseStatisticsCase* statisticsCase = selection[0];
+        if (statisticsCase)
+        {
+            RimIdenticalGridCaseGroup* gridCaseGroup = NULL;
+            statisticsCase->firstAncestorOrThisOfType(gridCaseGroup);
+
+            RimCaseCollection* caseCollection = gridCaseGroup ? gridCaseGroup->caseCollection() : NULL;
+            return caseCollection ? caseCollection->reservoirs.size() > 0 : false;
+        }
+    }
+
+    return false;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicComputeStatisticsFeature::onActionTriggered(bool isChecked)
+{
+    std::vector<RimEclipseStatisticsCase*> selection = selectedCases();
+    if (selection.size() > 0)
+    {
+        RimEclipseStatisticsCase* statisticsCase = selection[0];
+
+        statisticsCase->computeStatisticsAndUpdateViews();
+    }
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicComputeStatisticsFeature::setupActionLook(QAction* actionToSetup)
+{
+    actionToSetup->setText("Compute");
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+std::vector<RimEclipseStatisticsCase*> RicComputeStatisticsFeature::selectedCases()
+{
+    std::vector<RimEclipseStatisticsCase*> selection;
+    caf::SelectionManager::instance()->objectsByType(&selection);
+
+    return selection;
+}

ApplicationCode/Commands/EclipseCommands/RicComputeStatisticsFeature.h

@@ -0,0 +1,43 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  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;
+
+//==================================================================================================
+/// 
+//==================================================================================================
+class RicComputeStatisticsFeature : public caf::CmdFeature
+{
+    CAF_CMD_HEADER_INIT;
+
+protected:
+    // Overrides
+    virtual bool isCommandEnabled();
+    virtual void onActionTriggered( bool isChecked );
+    virtual void setupActionLook( QAction* actionToSetup );
+
+private:
+    std::vector<RimEclipseStatisticsCase*> selectedCases();
+};

ApplicationCode/Commands/EclipseCommands/RicCreateGridCaseGroupFeature.cpp

@@ -0,0 +1,65 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  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 "RicCreateGridCaseGroupFeature.h"
+
+#include "RimEclipseCaseCollection.h"
+#include "RiaApplication.h"
+#include "RiuMultiCaseImportDialog.h"
+
+#include "cafSelectionManager.h"
+  
+#include <QAction>
+
+CAF_CMD_SOURCE_INIT(RicCreateGridCaseGroupFeature, "RicCreateGridCaseGroupFeature");
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+bool RicCreateGridCaseGroupFeature::isCommandEnabled()
+{
+    std::vector<RimEclipseCaseCollection*> selection;
+    caf::SelectionManager::instance()->objectsByType(&selection);
+
+    return selection.size() > 0;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicCreateGridCaseGroupFeature::onActionTriggered(bool isChecked)
+{
+    RiaApplication* app = RiaApplication::instance();
+    RiuMultiCaseImportDialog dialog;
+    int action = dialog.exec();
+    if (action == QDialog::Accepted)
+    {
+        QStringList gridFileNames = dialog.eclipseCaseFileNames();
+        app->addEclipseCases(gridFileNames);
+    }
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicCreateGridCaseGroupFeature::setupActionLook(QAction* actionToSetup)
+{
+    actionToSetup->setIcon(QIcon(":/CreateGridCaseGroup16x16.png"));
+    actionToSetup->setText("&Create Grid Case Group from Files");
+}

ApplicationCode/Commands/EclipseCommands/RicCreateGridCaseGroupFeature.h

@@ -0,0 +1,40 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  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 RicCreateGridCaseGroupFeature : public caf::CmdFeature
+{
+    CAF_CMD_HEADER_INIT;
+
+protected:
+    // Overrides
+    virtual bool isCommandEnabled();
+    virtual void onActionTriggered( bool isChecked );
+    virtual void setupActionLook( QAction* actionToSetup );
+};
+
+

ApplicationCode/Commands/EclipseCommands/RicEclipseCaseNewGroupExec.cpp

@@ -0,0 +1,88 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  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 "RicEclipseCaseNewGroupExec.h"
+
+#include "RimProject.h"
+#include "RimEclipseCase.h"
+#include "RimEclipseCaseCollection.h"
+#include "RimEclipseStatisticsCase.h"
+#include "RimIdenticalGridCaseGroup.h"
+#include "RimOilField.h"
+
+#include "RiaApplication.h"
+#include "RiuMainWindow.h"
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+RicEclipseCaseNewGroupExec::RicEclipseCaseNewGroupExec()
+    : CmdExecuteCommand(NULL)
+{
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+RicEclipseCaseNewGroupExec::~RicEclipseCaseNewGroupExec()
+{
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RicEclipseCaseNewGroupExec::name()
+{
+    return "New Grid Case Group";
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicEclipseCaseNewGroupExec::redo()
+{ 
+    RimProject* proj = RiaApplication::instance()->project();
+    CVF_ASSERT(proj);
+
+    RimEclipseCaseCollection* analysisModels = proj->activeOilField() ? proj->activeOilField()->analysisModels() : NULL;
+
+    if (analysisModels)
+    {
+        RimIdenticalGridCaseGroup* createdObject = new RimIdenticalGridCaseGroup;
+        proj->assignIdToCaseGroup(createdObject);
+
+        RimEclipseCase* createdReservoir = createdObject->createAndAppendStatisticsCase();
+        proj->assignCaseIdToCase(createdReservoir);
+        createdObject->name = QString("Grid Case Group %1").arg(analysisModels->caseGroups().size() + 1);
+
+        analysisModels->caseGroups().push_back(createdObject);
+        analysisModels->updateConnectedEditors();
+        RiuMainWindow::instance()->selectAsCurrentItem(createdObject);
+        RiuMainWindow::instance()->setExpanded(createdObject, true);
+    }
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicEclipseCaseNewGroupExec::undo()
+{
+    // TODO
+    CVF_ASSERT(0);
+}

ApplicationCode/Commands/EclipseCommands/RicEclipseCaseNewGroupExec.h

@@ -0,0 +1,37 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  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 "cafCmdExecuteCommand.h"
+
+//==================================================================================================
+/// 
+//==================================================================================================
+class RicEclipseCaseNewGroupExec : public caf::CmdExecuteCommand
+{
+public:
+    RicEclipseCaseNewGroupExec();
+    virtual ~RicEclipseCaseNewGroupExec();
+
+    virtual QString name();
+    virtual void redo();
+    virtual void undo();
+};
+

ApplicationCode/Commands/EclipseCommands/RicEclipseCaseNewGroupFeature.cpp

@@ -0,0 +1,65 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  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 "RicEclipseCaseNewGroupFeature.h"
+
+#include "RicEclipseCaseNewGroupExec.h"
+
+#include "RimCase.h"
+#include "RimEclipseCaseCollection.h"
+
+#include "cafSelectionManager.h"
+#include "cafCmdExecCommandManager.h"
+
+#include <QAction>
+
+CAF_CMD_SOURCE_INIT(RicEclipseCaseNewGroupFeature, "RicEclipseCaseNewGroupFeature");
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+bool RicEclipseCaseNewGroupFeature::isCommandEnabled()
+{
+    std::vector<RimCase*> caseSelection;
+    caf::SelectionManager::instance()->objectsByType(&caseSelection);
+
+    std::vector<RimEclipseCaseCollection*> caseCollSelection;
+    caf::SelectionManager::instance()->objectsByType(&caseCollSelection);
+
+    return caseSelection.size() > 0 || caseCollSelection.size() > 0;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicEclipseCaseNewGroupFeature::onActionTriggered(bool isChecked)
+{
+    RicEclipseCaseNewGroupExec* cmdExec = new RicEclipseCaseNewGroupExec();
+    caf::CmdExecCommandManager::instance()->processExecuteCommand(cmdExec);
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicEclipseCaseNewGroupFeature::setupActionLook(QAction* actionToSetup)
+{
+    actionToSetup->setText("New Grid Case Group");
+}
+
+

ApplicationCode/Commands/EclipseCommands/RicEclipseCaseNewGroupFeature.h

@@ -0,0 +1,39 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  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"
+
+
+//==================================================================================================
+/// 
+//==================================================================================================
+class RicEclipseCaseNewGroupFeature : public caf::CmdFeature
+{
+    CAF_CMD_HEADER_INIT;
+
+protected:
+    // Overrides
+    virtual bool isCommandEnabled();
+    virtual void onActionTriggered( bool isChecked );
+    virtual void setupActionLook( QAction* actionToSetup );
+};
+
+

ApplicationCode/Commands/EclipseCommands/RicEclipsePropertyFilterFeatureImpl.cpp

@@ -0,0 +1,127 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  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 "RicEclipsePropertyFilterFeatureImpl.h"
+
+#include "RimEclipsePropertyFilter.h"
+#include "RimEclipsePropertyFilterCollection.h"
+#include "RimEclipseView.h"
+#include "RimEclipseResultDefinition.h"
+#include "RimEclipseCellColors.h"
+#include "RimViewController.h"
+
+#include "cafSelectionManager.h"
+
+#include "cvfAssert.h"
+#include "RiuMainWindow.h"
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+std::vector<RimEclipsePropertyFilter*> RicEclipsePropertyFilterFeatureImpl::selectedPropertyFilters()
+{
+    std::vector<RimEclipsePropertyFilter*> propertyFilters;
+    caf::SelectionManager::instance()->objectsByType(&propertyFilters);
+
+    return propertyFilters;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+std::vector<RimEclipsePropertyFilterCollection*> RicEclipsePropertyFilterFeatureImpl::selectedPropertyFilterCollections()
+{
+    std::vector<RimEclipsePropertyFilterCollection*> propertyFilterCollections;
+    caf::SelectionManager::instance()->objectsByType(&propertyFilterCollections);
+
+    return propertyFilterCollections;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicEclipsePropertyFilterFeatureImpl::addPropertyFilter(RimEclipsePropertyFilterCollection* propertyFilterCollection)
+{
+    RimEclipsePropertyFilter* propertyFilter = new RimEclipsePropertyFilter();
+    propertyFilterCollection->propertyFilters.push_back(propertyFilter);
+    setDefaults(propertyFilter);
+
+    propertyFilterCollection->reservoirView()->scheduleGeometryRegen(PROPERTY_FILTERED);
+
+    propertyFilterCollection->updateConnectedEditors();
+    RiuMainWindow::instance()->selectAsCurrentItem(propertyFilter);
+
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicEclipsePropertyFilterFeatureImpl::insertPropertyFilter(RimEclipsePropertyFilterCollection* propertyFilterCollection, size_t index)
+{
+    RimEclipsePropertyFilter* propertyFilter = new RimEclipsePropertyFilter();
+    propertyFilterCollection->propertyFilters.insertAt(static_cast<int>(index), propertyFilter);
+    setDefaults(propertyFilter);
+
+    propertyFilterCollection->reservoirView()->scheduleGeometryRegen(PROPERTY_FILTERED);
+
+    propertyFilterCollection->updateConnectedEditors();
+    RiuMainWindow::instance()->selectAsCurrentItem(propertyFilter);
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+bool RicEclipsePropertyFilterFeatureImpl::isPropertyFilterCommandAvailable(caf::PdmObjectHandle* object)
+{
+    RimView* rimView = NULL;
+    object->firstAncestorOrThisOfType(rimView);
+    if (rimView)
+    {
+        RimViewController* vc = rimView->viewController();
+        if (vc && vc->isPropertyFilterOveridden())
+        {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicEclipsePropertyFilterFeatureImpl::setDefaults(RimEclipsePropertyFilter* propertyFilter)
+{
+    CVF_ASSERT(propertyFilter);
+
+    RimEclipsePropertyFilterCollection* propertyFilterCollection = propertyFilter->parentContainer();
+    CVF_ASSERT(propertyFilterCollection);
+
+    RimEclipseView* reservoirView = propertyFilterCollection->reservoirView();
+    CVF_ASSERT(reservoirView);
+
+    propertyFilter->resultDefinition->setEclipseCase(reservoirView->eclipseCase());
+    propertyFilter->resultDefinition->setResultVariable(reservoirView->cellResult->resultVariable());
+    propertyFilter->resultDefinition->setPorosityModel(reservoirView->cellResult->porosityModel());
+    propertyFilter->resultDefinition->setResultType(reservoirView->cellResult->resultType());
+    propertyFilter->resultDefinition->loadResult();
+    propertyFilter->setToDefaultValues();
+    propertyFilter->updateFilterName();
+    propertyFilter->m_categorySelection = true;
+}

ApplicationCode/Commands/EclipseCommands/RicEclipsePropertyFilterFeatureImpl.h

@@ -0,0 +1,51 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  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 <vector>
+#include <cstddef>
+
+class RimEclipsePropertyFilter;
+class RimEclipsePropertyFilterCollection;
+
+namespace caf
+{
+    class PdmObjectHandle;
+}
+
+//==================================================================================================
+/// 
+//==================================================================================================
+class RicEclipsePropertyFilterFeatureImpl
+{
+public:
+    static std::vector<RimEclipsePropertyFilter*>              selectedPropertyFilters();
+    static std::vector<RimEclipsePropertyFilterCollection*>    selectedPropertyFilterCollections();
+
+    static void addPropertyFilter(RimEclipsePropertyFilterCollection* propertyFilterCollection);
+    static void insertPropertyFilter(RimEclipsePropertyFilterCollection* propertyFilterCollection, size_t index);
+
+    static bool isPropertyFilterCommandAvailable(caf::PdmObjectHandle* object);
+
+private:
+    static void setDefaults(RimEclipsePropertyFilter* propertyFilter);
+};
+
+

ApplicationCode/Commands/EclipseCommands/RicEclipsePropertyFilterInsertExec.cpp

@@ -0,0 +1,76 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  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 "RicEclipsePropertyFilterInsertExec.h"
+
+
+#include "RicEclipsePropertyFilterFeatureImpl.h"
+
+#include "RimEclipsePropertyFilter.h"
+#include "RimEclipsePropertyFilterCollection.h"
+
+#include "cvfAssert.h"
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+RicEclipsePropertyFilterInsertExec::RicEclipsePropertyFilterInsertExec(RimEclipsePropertyFilter* propertyFilter)
+    : CmdExecuteCommand(NULL)
+{
+    CVF_ASSERT(propertyFilter);
+    m_propertyFilter = propertyFilter;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+RicEclipsePropertyFilterInsertExec::~RicEclipsePropertyFilterInsertExec()
+{
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RicEclipsePropertyFilterInsertExec::name()
+{
+    return "Insert Property Filter";
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicEclipsePropertyFilterInsertExec::redo()
+{ 
+    RimEclipsePropertyFilterCollection* propertyFilterCollection = m_propertyFilter->parentContainer();
+    CVF_ASSERT(propertyFilterCollection);
+
+    size_t index = propertyFilterCollection->propertyFilters.index(m_propertyFilter);
+    CVF_ASSERT(index < propertyFilterCollection->propertyFilters.size());
+
+    RicEclipsePropertyFilterFeatureImpl::insertPropertyFilter(propertyFilterCollection, index);
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicEclipsePropertyFilterInsertExec::undo()
+{
+    // TODO
+    CVF_ASSERT(0);
+}

ApplicationCode/Commands/EclipseCommands/RicEclipsePropertyFilterInsertExec.h

@@ -0,0 +1,43 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  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 "cafCmdExecuteCommand.h"
+#include "cafPdmPointer.h"
+
+class RimEclipsePropertyFilter;
+
+//==================================================================================================
+/// 
+//==================================================================================================
+class RicEclipsePropertyFilterInsertExec : public caf::CmdExecuteCommand
+{
+public:
+    RicEclipsePropertyFilterInsertExec(RimEclipsePropertyFilter* propertyFilter);
+    virtual ~RicEclipsePropertyFilterInsertExec();
+
+    virtual QString name();
+    virtual void redo();
+    virtual void undo();
+
+private:
+    caf::PdmPointer<RimEclipsePropertyFilter> m_propertyFilter;
+};
+

ApplicationCode/Commands/EclipseCommands/RicEclipsePropertyFilterInsertFeature.cpp

@@ -0,0 +1,69 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  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 "RicEclipsePropertyFilterInsertFeature.h"
+
+#include "RicEclipsePropertyFilterInsertExec.h"
+#include "RicEclipsePropertyFilterFeatureImpl.h"
+
+#include "RimEclipsePropertyFilter.h"
+
+#include "cafCmdExecCommandManager.h"
+
+#include <QAction>
+
+#include <vector>
+
+CAF_CMD_SOURCE_INIT(RicEclipsePropertyFilterInsertFeature, "RicEclipsePropertyFilterInsertFeature");
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+bool RicEclipsePropertyFilterInsertFeature::isCommandEnabled()
+{
+    std::vector<RimEclipsePropertyFilter*> propertyFilters = RicEclipsePropertyFilterFeatureImpl::selectedPropertyFilters();
+    if (propertyFilters.size() == 1)
+    {
+        return RicEclipsePropertyFilterFeatureImpl::isPropertyFilterCommandAvailable(propertyFilters[0]);
+    }
+
+    return false;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicEclipsePropertyFilterInsertFeature::onActionTriggered(bool isChecked)
+{
+    std::vector<RimEclipsePropertyFilter*> propertyFilters = RicEclipsePropertyFilterFeatureImpl::selectedPropertyFilters();
+    if (propertyFilters.size() == 1)
+    {
+        RicEclipsePropertyFilterInsertExec* filterExec = new RicEclipsePropertyFilterInsertExec(propertyFilters[0]);
+        caf::CmdExecCommandManager::instance()->processExecuteCommand(filterExec);
+    }
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicEclipsePropertyFilterInsertFeature::setupActionLook(QAction* actionToSetup)
+{
+    actionToSetup->setIcon(QIcon(":/CellFilter_Values.png"));
+    actionToSetup->setText("Insert Property Filter");
+}

ApplicationCode/Commands/EclipseCommands/RicEclipsePropertyFilterInsertFeature.h

@@ -0,0 +1,39 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  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"
+
+
+//==================================================================================================
+/// 
+//==================================================================================================
+class RicEclipsePropertyFilterInsertFeature : public caf::CmdFeature
+{
+    CAF_CMD_HEADER_INIT;
+
+protected:
+    // Overrides
+    virtual bool isCommandEnabled();
+    virtual void onActionTriggered( bool isChecked );
+    virtual void setupActionLook( QAction* actionToSetup );
+};
+
+

ApplicationCode/Commands/EclipseCommands/RicEclipsePropertyFilterNewExec.cpp

@@ -0,0 +1,69 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  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 "RicEclipsePropertyFilterNewExec.h"
+
+#include "RicEclipsePropertyFilterFeatureImpl.h"
+
+#include "RimEclipsePropertyFilter.h"
+#include "RimEclipsePropertyFilterCollection.h"
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+RicEclipsePropertyFilterNewExec::RicEclipsePropertyFilterNewExec(RimEclipsePropertyFilterCollection* propertyFilterCollection)
+    : CmdExecuteCommand(NULL)
+{
+    assert(propertyFilterCollection);
+    m_propertyFilterCollection = propertyFilterCollection;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+RicEclipsePropertyFilterNewExec::~RicEclipsePropertyFilterNewExec()
+{
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RicEclipsePropertyFilterNewExec::name()
+{
+    return "New Property Filter";
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicEclipsePropertyFilterNewExec::redo()
+{ 
+    RicEclipsePropertyFilterFeatureImpl::addPropertyFilter(m_propertyFilterCollection);
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicEclipsePropertyFilterNewExec::undo()
+{
+    m_propertyFilterCollection->propertyFilters.erase(m_propertyFilterCollection->propertyFilters.size() - 1);
+
+    m_propertyFilterCollection->updateConnectedEditors();
+}

ApplicationCode/Commands/EclipseCommands/RicEclipsePropertyFilterNewExec.h

@@ -0,0 +1,44 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  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 "cafCmdExecuteCommand.h"
+#include "cafPdmPointer.h"
+
+class RimEclipsePropertyFilterCollection;
+
+//==================================================================================================
+/// 
+//==================================================================================================
+class RicEclipsePropertyFilterNewExec : public caf::CmdExecuteCommand
+{
+public:
+    RicEclipsePropertyFilterNewExec(RimEclipsePropertyFilterCollection* propertyFilterCollection);
+    virtual ~RicEclipsePropertyFilterNewExec();
+
+    virtual QString name();
+    virtual void redo();
+    virtual void undo();
+
+private:
+    caf::PdmPointer<RimEclipsePropertyFilterCollection> m_propertyFilterCollection;
+};
+
+

ApplicationCode/Commands/EclipseCommands/RicEclipsePropertyFilterNewFeature.cpp

@@ -0,0 +1,68 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  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 "RicEclipsePropertyFilterNewFeature.h"
+
+#include "RicEclipsePropertyFilterNewExec.h"
+#include "RicEclipsePropertyFilterFeatureImpl.h"
+
+#include "RimEclipsePropertyFilter.h"
+#include "RimEclipsePropertyFilterCollection.h"
+
+#include "cafCmdExecCommandManager.h"
+
+#include <QAction>
+
+CAF_CMD_SOURCE_INIT(RicEclipsePropertyFilterNewFeature, "RicEclipsePropertyFilterNewFeature");
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+bool RicEclipsePropertyFilterNewFeature::isCommandEnabled()
+{
+    std::vector<RimEclipsePropertyFilterCollection*> filterCollections = RicEclipsePropertyFilterFeatureImpl::selectedPropertyFilterCollections();
+    if (filterCollections.size() == 1)
+    {
+        return RicEclipsePropertyFilterFeatureImpl::isPropertyFilterCommandAvailable(filterCollections[0]);
+    }
+
+    return false;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicEclipsePropertyFilterNewFeature::onActionTriggered(bool isChecked)
+{
+    std::vector<RimEclipsePropertyFilterCollection*> filterCollections = RicEclipsePropertyFilterFeatureImpl::selectedPropertyFilterCollections();
+    if (filterCollections.size() == 1)
+    {
+        RicEclipsePropertyFilterNewExec* filterExec = new RicEclipsePropertyFilterNewExec(filterCollections[0]);
+        caf::CmdExecCommandManager::instance()->processExecuteCommand(filterExec);
+    }
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicEclipsePropertyFilterNewFeature::setupActionLook(QAction* actionToSetup)
+{
+    actionToSetup->setIcon(QIcon(":/CellFilter_Values.png"));
+    actionToSetup->setText("New Property Filter");
+}

ApplicationCode/Commands/EclipseCommands/RicEclipsePropertyFilterNewFeature.h

@@ -0,0 +1,39 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  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"
+
+
+//==================================================================================================
+/// 
+//==================================================================================================
+class RicEclipsePropertyFilterNewFeature : public caf::CmdFeature
+{
+    CAF_CMD_HEADER_INIT;
+
+protected:
+    // Overrides
+    virtual bool isCommandEnabled();
+    virtual void onActionTriggered( bool isChecked );
+    virtual void setupActionLook( QAction* actionToSetup );
+};
+
+

ApplicationCode/Commands/EclipseCommands/RicImportEclipseCaseFeature.cpp

@@ -0,0 +1,75 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  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 "RicImportEclipseCaseFeature.h"
+
+#include "RimEclipseCaseCollection.h"
+#include "RiaApplication.h"
+#include "RiuMainWindow.h"
+
+#include "cafSelectionManager.h"
+  
+#include <QAction>
+#include <QFileDialog>
+
+CAF_CMD_SOURCE_INIT(RicImportEclipseCaseFeature, "RicImportEclipseCaseFeature");
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+bool RicImportEclipseCaseFeature::isCommandEnabled()
+{
+    return true;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicImportEclipseCaseFeature::onActionTriggered(bool isChecked)
+{
+    RiaApplication* app = RiaApplication::instance();
+
+    QString defaultDir = app->lastUsedDialogDirectory("BINARY_GRID");
+    QStringList fileNames = QFileDialog::getOpenFileNames(RiuMainWindow::instance(), "Import Eclipse File", defaultDir, "Eclipse Grid Files (*.GRID *.EGRID)");
+    if (fileNames.size()) defaultDir = QFileInfo(fileNames.last()).absolutePath();
+    app->setLastUsedDialogDirectory("BINARY_GRID", defaultDir);
+
+    int i;
+    for (i = 0; i < fileNames.size(); i++)
+    {
+        QString fileName = fileNames[i];
+
+        if (!fileNames.isEmpty())
+        {
+            if (app->openEclipseCaseFromFile(fileName))
+            {
+                app->addToRecentFiles(fileName);
+            }
+        }
+    }
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicImportEclipseCaseFeature::setupActionLook(QAction* actionToSetup)
+{
+    actionToSetup->setIcon(QIcon(":/Case48x48.png"));
+    actionToSetup->setText("Import Eclipse Case");
+}

ApplicationCode/Commands/EclipseCommands/RicImportEclipseCaseFeature.h

@@ -0,0 +1,40 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  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 RicImportEclipseCaseFeature : public caf::CmdFeature
+{
+    CAF_CMD_HEADER_INIT;
+
+protected:
+    // Overrides
+    virtual bool isCommandEnabled();
+    virtual void onActionTriggered( bool isChecked );
+    virtual void setupActionLook( QAction* actionToSetup );
+};
+
+

ApplicationCode/Commands/EclipseCommands/RicImportInputEclipseCaseFeature.cpp

@@ -0,0 +1,66 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  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 "RicImportInputEclipseCaseFeature.h"
+
+#include "RimEclipseCaseCollection.h"
+#include "RiaApplication.h"
+#include "RiuMainWindow.h"
+
+#include "cafSelectionManager.h"
+  
+#include <QAction>
+#include <QFileDialog>
+
+CAF_CMD_SOURCE_INIT(RicImportInputEclipseCaseFeature, "RicImportInputEclipseCaseFeature");
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+bool RicImportInputEclipseCaseFeature::isCommandEnabled()
+{
+    return true;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicImportInputEclipseCaseFeature::onActionTriggered(bool isChecked)
+{
+    RiaApplication* app = RiaApplication::instance();
+    QString defaultDir = app->lastUsedDialogDirectory("INPUT_FILES");
+    QStringList fileNames = QFileDialog::getOpenFileNames(RiuMainWindow::instance(), "Import Eclipse Input Files", defaultDir, "Eclipse Input Files and Input Properties Eclipse Input Files (*.GRDECL);;All Files (*.*)");
+
+    if (fileNames.isEmpty()) return;
+
+    // Remember the path to next time
+    app->setLastUsedDialogDirectory("INPUT_FILES", QFileInfo(fileNames.last()).absolutePath());
+
+    app->openInputEclipseCaseFromFileNames(fileNames);
+
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicImportInputEclipseCaseFeature::setupActionLook(QAction* actionToSetup)
+{
+    actionToSetup->setIcon(QIcon(":/EclipseInput48x48.png"));
+    actionToSetup->setText("Import Input Eclipse Case");
+}

ApplicationCode/Commands/EclipseCommands/RicImportInputEclipseCaseFeature.h

@@ -0,0 +1,40 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  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 RicImportInputEclipseCaseFeature : public caf::CmdFeature
+{
+    CAF_CMD_HEADER_INIT;
+
+protected:
+    // Overrides
+    virtual bool isCommandEnabled();
+    virtual void onActionTriggered( bool isChecked );
+    virtual void setupActionLook( QAction* actionToSetup );
+};
+
+

ApplicationCode/Commands/EclipseCommands/RicImportInputEclipseCaseOpmFeature.cpp

@@ -0,0 +1,100 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  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 "RicImportInputEclipseCaseOpmFeature.h"
+
+#include "RiaApplication.h"
+
+#include "RimDefines.h"
+#include "RimEclipseCaseCollection.h"
+#include "RimEclipseCellColors.h"
+#include "RimEclipseInputCaseOpm.h"
+#include "RimEclipseView.h"
+#include "RimOilField.h"
+#include "RimProject.h"
+
+#include "RiuMainWindow.h"
+
+#include "cafSelectionManager.h"
+  
+#include <QAction>
+#include <QFileDialog>
+
+CAF_CMD_SOURCE_INIT(RicImportInputEclipseCaseOpmFeature, "RicImportInputEclipseCaseOpmFeature");
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+bool RicImportInputEclipseCaseOpmFeature::isCommandEnabled()
+{
+    return true;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicImportInputEclipseCaseOpmFeature::onActionTriggered(bool isChecked)
+{
+    RiaApplication* app = RiaApplication::instance();
+    QString defaultDir = app->lastUsedDialogDirectory("INPUT_FILES");
+    QString fileName = QFileDialog::getOpenFileName(RiuMainWindow::instance(), "Import Eclipse Input file", defaultDir, "Eclipse Input Files (*.GRDECL);;All Files (*.*)");
+
+    if (fileName.isEmpty()) return;
+
+    // Remember the path to next time
+    app->setLastUsedDialogDirectory("INPUT_FILES", QFileInfo(fileName).absolutePath());
+
+    RimProject* proj = app->project();
+    RimEclipseCaseCollection* analysisModels = proj->activeOilField() ? proj->activeOilField()->analysisModels() : NULL;
+    if (analysisModels)
+    {
+        // This code originates from RiaApplication::openInputEclipseCaseFromFileNames
+
+        RimEclipseInputCaseOpm* rimInputReservoir = new RimEclipseInputCaseOpm();
+        proj->assignCaseIdToCase(rimInputReservoir);
+
+        rimInputReservoir->importNewEclipseGridAndProperties(fileName);
+
+        analysisModels->cases.push_back(rimInputReservoir);
+
+        RimEclipseView* riv = rimInputReservoir->createAndAddReservoirView();
+
+        riv->cellResult()->setResultType(RimDefines::INPUT_PROPERTY);
+        riv->hasUserRequestedAnimation = true;
+
+        riv->loadDataAndUpdate();
+
+        if (!riv->cellResult()->hasResult())
+        {
+            riv->cellResult()->setResultVariable(RimDefines::undefinedResultName());
+        }
+
+        analysisModels->updateConnectedEditors();
+
+        RiuMainWindow::instance()->selectAsCurrentItem(riv->cellResult());
+    }
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicImportInputEclipseCaseOpmFeature::setupActionLook(QAction* actionToSetup)
+{
+    actionToSetup->setIcon(QIcon(":/EclipseInput48x48.png"));
+    actionToSetup->setText("Import Input Eclipse Case (opm-parser) - BETA");
+}

ApplicationCode/Commands/EclipseCommands/RicImportInputEclipseCaseOpmFeature.h

@@ -0,0 +1,39 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  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 <vector>
+
+//==================================================================================================
+/// 
+//==================================================================================================
+class RicImportInputEclipseCaseOpmFeature : public caf::CmdFeature
+{
+    CAF_CMD_HEADER_INIT;
+
+protected:
+    // Overrides
+    virtual bool isCommandEnabled();
+    virtual void onActionTriggered( bool isChecked );
+    virtual void setupActionLook( QAction* actionToSetup );
+};
+
+

ApplicationCode/Commands/EclipseCommands/RicNewStatisticsCaseFeature.cpp

@@ -0,0 +1,127 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  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 <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()->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/EclipseCommands/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/Commands/EclipseCommands/RicSaveEclipseInputPropertyFeature.cpp

@@ -0,0 +1,133 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  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 "RicSaveEclipseInputPropertyFeature.h"
+
+#include "RimEclipseInputProperty.h"
+#include "RimEclipseInputPropertyCollection.h"
+#include "RimExportInputPropertySettings.h"
+#include "RimEclipseInputCase.h"
+
+#include "RifEclipseInputFileTools.h"
+
+#include "RiaApplication.h"
+#include "RiuMainWindow.h"
+
+#include "cafSelectionManager.h"
+#include "cafPdmUiPropertyViewDialog.h"
+
+#include <QAction>
+#include <QMessageBox>
+#include <QFileInfo>
+
+CAF_CMD_SOURCE_INIT(RicSaveEclipseInputPropertyFeature, "RicSaveEclipseInputPropertyFeature");
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+bool RicSaveEclipseInputPropertyFeature::isCommandEnabled()
+{
+    return selectedInputProperty() != NULL;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicSaveEclipseInputPropertyFeature::onActionTriggered(bool isChecked)
+{
+    RimEclipseInputProperty* inputProperty = selectedInputProperty();
+    if (!inputProperty) return;
+
+    {
+        bool isResolved = false;
+        if (inputProperty->resolvedState == RimEclipseInputProperty::RESOLVED || inputProperty->resolvedState == RimEclipseInputProperty::RESOLVED_NOT_SAVED)
+        {
+            isResolved = true;
+        }
+
+        if (!isResolved)
+        {
+            QMessageBox::warning(RiuMainWindow::instance(), "Export failure", "Property is not resolved, and then it is not possible to export the property.");
+
+            return;
+        }
+    }
+
+    RimExportInputSettings exportSettings;
+    exportSettings.eclipseKeyword = inputProperty->eclipseKeyword;
+
+    // Find input reservoir for this property
+    RimEclipseInputCase* inputReservoir = NULL;
+    {
+        RimEclipseInputPropertyCollection* inputPropertyCollection = dynamic_cast<RimEclipseInputPropertyCollection*>(inputProperty->parentField()->ownerObject());
+        if (!inputPropertyCollection) return;
+
+        inputReservoir = dynamic_cast<RimEclipseInputCase*>(inputPropertyCollection->parentField()->ownerObject());
+    }
+
+    if (!inputReservoir) return;
+
+    {
+        RiaApplication* app = RiaApplication::instance();
+        QString projectFolder = app->currentProjectPath();
+        if (projectFolder.isEmpty())
+        {   
+            projectFolder = inputReservoir->locationOnDisc();
+        }
+
+        QString outputFileName = projectFolder + "/" + inputProperty->eclipseKeyword;
+
+        exportSettings.fileName = outputFileName;
+    }
+
+    caf::PdmUiPropertyViewDialog propertyDialog(RiuMainWindow::instance(), &exportSettings, "Export Eclipse Property to Text File", "");
+    if (propertyDialog.exec() == QDialog::Accepted)
+    {
+        bool isOk = RifEclipseInputFileTools::writePropertyToTextFile(exportSettings.fileName, inputReservoir->reservoirData(), 0, inputProperty->resultName, exportSettings.eclipseKeyword);
+        if (isOk)
+        {
+            inputProperty->fileName = exportSettings.fileName;
+            inputProperty->eclipseKeyword = exportSettings.eclipseKeyword;
+            inputProperty->resolvedState = RimEclipseInputProperty::RESOLVED;
+
+            inputProperty->updateConnectedEditors();
+        }
+    }
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicSaveEclipseInputPropertyFeature::setupActionLook(QAction* actionToSetup)
+{
+    actionToSetup->setText("Save Property To File");
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+RimEclipseInputProperty* RicSaveEclipseInputPropertyFeature::selectedInputProperty() const
+{
+    std::vector<RimEclipseInputProperty*> selection;
+    caf::SelectionManager::instance()->objectsByType(&selection);
+
+    return selection.size() > 0 ? selection[0] : NULL;
+}
+
+

ApplicationCode/Commands/EclipseCommands/RicSaveEclipseInputPropertyFeature.h

@@ -0,0 +1,43 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  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"
+
+class RimEclipseInputProperty;
+
+//==================================================================================================
+/// 
+//==================================================================================================
+class RicSaveEclipseInputPropertyFeature : public caf::CmdFeature
+{
+    CAF_CMD_HEADER_INIT;
+
+protected:
+    // Overrides
+    virtual bool isCommandEnabled();
+    virtual void onActionTriggered( bool isChecked );
+    virtual void setupActionLook( QAction* actionToSetup );
+
+private:
+    RimEclipseInputProperty* selectedInputProperty() const;
+};
+
+

ApplicationCode/Commands/EclipseCommands/RicSaveEclipseResultAsInputPropertyExec.cpp

@@ -0,0 +1,113 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  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 "RicSaveEclipseResultAsInputPropertyExec.h"
+
+#include "RimEclipseCellColors.h"
+#include "RimBinaryExportSettings.h"
+#include "RimEclipseView.h"
+#include "RimEclipseCase.h"
+
+#include "RigCaseData.h"
+#include "RigCaseCellResultsData.h"
+
+#include "RifEclipseInputFileTools.h"
+#include "RifReaderInterface.h"
+
+#include "RiaApplication.h"
+#include "RiuMainWindow.h"
+
+#include "cafPdmUiPropertyViewDialog.h"
+
+#include <QFileInfo>
+#include <QMessageBox>
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+RicSaveEclipseResultAsInputPropertyExec::RicSaveEclipseResultAsInputPropertyExec(RimEclipseCellColors* cellColors)
+    : CmdExecuteCommand(NULL)
+{
+    CVF_ASSERT(cellColors);
+    m_cellColors = cellColors;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+RicSaveEclipseResultAsInputPropertyExec::~RicSaveEclipseResultAsInputPropertyExec()
+{
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+QString RicSaveEclipseResultAsInputPropertyExec::name()
+{
+    return "Save Property To File";
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicSaveEclipseResultAsInputPropertyExec::redo()
+{
+    CVF_ASSERT(m_cellColors);
+
+    if (!m_cellColors->reservoirView()) return;
+    if (!m_cellColors->reservoirView()->eclipseCase()) return;
+    if (!m_cellColors->reservoirView()->eclipseCase()->reservoirData()) return;
+
+    RimBinaryExportSettings exportSettings;
+    exportSettings.eclipseKeyword = m_cellColors->resultVariable();
+    {
+        RiaApplication* app = RiaApplication::instance();
+        QString projectFolder = app->currentProjectPath();
+        if (projectFolder.isEmpty())
+        {
+            projectFolder = m_cellColors->reservoirView()->eclipseCase()->locationOnDisc();
+        }
+
+        QString outputFileName = projectFolder + "/" + m_cellColors->resultVariable();
+
+        exportSettings.fileName = outputFileName;
+    }
+
+    caf::PdmUiPropertyViewDialog propertyDialog(RiuMainWindow::instance(), &exportSettings, "Export Binary Eclipse Data to Text File", "");
+    if (propertyDialog.exec() == QDialog::Accepted)
+    {
+        size_t timeStep = m_cellColors->reservoirView()->currentTimeStep();
+        RifReaderInterface::PorosityModelResultType porosityModel = RigCaseCellResultsData::convertFromProjectModelPorosityModel(m_cellColors->porosityModel());
+
+        bool isOk = RifEclipseInputFileTools::writeBinaryResultToTextFile(exportSettings.fileName, m_cellColors->reservoirView()->eclipseCase()->reservoirData(), porosityModel, timeStep, m_cellColors->resultVariable(), exportSettings.eclipseKeyword, exportSettings.undefinedValue);
+        if (!isOk)
+        {
+            QMessageBox::critical(NULL, "File export", "Failed to exported current result to " + exportSettings.fileName);
+        }
+    }
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicSaveEclipseResultAsInputPropertyExec::undo()
+{
+    // TODO
+    CVF_ASSERT(0);
+}

ApplicationCode/Commands/EclipseCommands/RicSaveEclipseResultAsInputPropertyExec.h

@@ -0,0 +1,43 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  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 "cafCmdExecuteCommand.h"
+#include "cafPdmPointer.h"
+
+class RimEclipseCellColors;
+
+//==================================================================================================
+/// 
+//==================================================================================================
+class RicSaveEclipseResultAsInputPropertyExec : public caf::CmdExecuteCommand
+{
+public:
+    RicSaveEclipseResultAsInputPropertyExec(RimEclipseCellColors* cellColors);
+    virtual ~RicSaveEclipseResultAsInputPropertyExec();
+
+    virtual QString name();
+    virtual void redo();
+    virtual void undo();
+
+private:
+    caf::PdmPointer<RimEclipseCellColors> m_cellColors;
+};
+

ApplicationCode/Commands/EclipseCommands/RicSaveEclipseResultAsInputPropertyFeature.cpp

@@ -0,0 +1,67 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  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 "RicSaveEclipseResultAsInputPropertyFeature.h"
+
+#include "RicSaveEclipseResultAsInputPropertyExec.h"
+
+#include "RimEclipseCellColors.h"
+#include "RimView.h"
+
+#include "cafSelectionManager.h"
+#include "cafCmdExecCommandManager.h"
+
+#include <QAction>
+
+CAF_CMD_SOURCE_INIT(RicSaveEclipseResultAsInputPropertyFeature, "RicSaveEclipseResultAsInputPropertyFeature");
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+bool RicSaveEclipseResultAsInputPropertyFeature::isCommandEnabled()
+{
+    std::vector<RimEclipseCellColors*> selection;
+    caf::SelectionManager::instance()->objectsByType(&selection);
+
+    return selection.size() == 1;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicSaveEclipseResultAsInputPropertyFeature::onActionTriggered(bool isChecked)
+{
+    std::vector<RimEclipseCellColors*> selection;
+    caf::SelectionManager::instance()->objectsByType(&selection);
+    if (selection.size() == 1)
+    {
+        RicSaveEclipseResultAsInputPropertyExec* cellResultSaveExec = new RicSaveEclipseResultAsInputPropertyExec(selection[0]);
+        caf::CmdExecCommandManager::instance()->processExecuteCommand(cellResultSaveExec);
+    }
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicSaveEclipseResultAsInputPropertyFeature::setupActionLook(QAction* actionToSetup)
+{
+    actionToSetup->setText("Save Property To File");
+}
+
+

ApplicationCode/Commands/EclipseCommands/RicSaveEclipseResultAsInputPropertyFeature.h

@@ -0,0 +1,39 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  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"
+
+
+//==================================================================================================
+/// 
+//==================================================================================================
+class RicSaveEclipseResultAsInputPropertyFeature : public caf::CmdFeature
+{
+    CAF_CMD_HEADER_INIT;
+
+protected:
+    // Overrides
+    virtual bool isCommandEnabled();
+    virtual void onActionTriggered( bool isChecked );
+    virtual void setupActionLook( QAction* actionToSetup );
+};
+
+