Moved Octave script command features to a separate sub folder

ApplicationCode/Commands/OctaveScriptCommands/CMakeLists_files.cmake

@@ -0,0 +1,40 @@
+
+# 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}RicAddScriptPathFeature.h
+${CEE_CURRENT_LIST_DIR}RicDeleteScriptPathFeature.h
+${CEE_CURRENT_LIST_DIR}RicEditScriptFeature.h
+${CEE_CURRENT_LIST_DIR}RicExecuteScriptFeature.h
+${CEE_CURRENT_LIST_DIR}RicExecuteScriptForCasesFeature.h
+${CEE_CURRENT_LIST_DIR}RicNewScriptFeature.h
+${CEE_CURRENT_LIST_DIR}RicScriptFeatureImpl.h
+)
+
+set (SOURCE_GROUP_SOURCE_FILES
+${CEE_CURRENT_LIST_DIR}RicAddScriptPathFeature.cpp
+${CEE_CURRENT_LIST_DIR}RicDeleteScriptPathFeature.cpp
+${CEE_CURRENT_LIST_DIR}RicEditScriptFeature.cpp
+${CEE_CURRENT_LIST_DIR}RicExecuteScriptFeature.cpp
+${CEE_CURRENT_LIST_DIR}RicExecuteScriptForCasesFeature.cpp
+${CEE_CURRENT_LIST_DIR}RicNewScriptFeature.cpp
+${CEE_CURRENT_LIST_DIR}RicScriptFeatureImpl.cpp
+)
+
+set (QT_MOC_HEADERS
+${QT_MOC_HEADERS}
+${CEE_CURRENT_LIST_DIR}RicExecuteScriptForCasesFeature.h
+)
+
+list(APPEND CODE_HEADER_FILES
+${SOURCE_GROUP_HEADER_FILES}
+)
+
+list(APPEND CODE_SOURCE_FILES
+${SOURCE_GROUP_SOURCE_FILES}
+)
+
+source_group( "ToggleCommands" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES} ${CEE_CURRENT_LIST_DIR}CMakeLists_files.cmake )

ApplicationCode/Commands/OctaveScriptCommands/RicAddScriptPathFeature.cpp

@@ -0,0 +1,74 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  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 "RicAddScriptPathFeature.h"
+
+#include "RicScriptFeatureImpl.h"
+
+#include "RimScriptCollection.h"
+#include "RiaApplication.h"
+#include "RiaPreferences.h"
+#include "RiuMainWindow.h"
+
+#include "cvfAssert.h"
+
+#include <QAction>
+#include <QFileDialog>
+
+CAF_CMD_SOURCE_INIT(RicAddScriptPathFeature, "RicAddScriptPathFeature");
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+bool RicAddScriptPathFeature::isCommandEnabled()
+{
+    std::vector<RimScriptCollection*> selection = RicScriptFeatureImpl::selectedScriptCollections();
+    return selection.size() > 0;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicAddScriptPathFeature::onActionTriggered(bool isChecked)
+{
+    QString selectedFolder = QFileDialog::getExistingDirectory(RiuMainWindow::instance(), "Select script folder");
+    if (!selectedFolder.isEmpty())
+    {
+        QString filePathString = RiaApplication::instance()->preferences()->scriptDirectories();
+
+        QChar separator(';');
+        if (!filePathString.isEmpty() && !filePathString.endsWith(separator, Qt::CaseInsensitive))
+        {
+            filePathString += separator;
+        }
+
+        filePathString += selectedFolder;
+
+        RiaApplication::instance()->preferences()->scriptDirectories = filePathString;
+        RiaApplication::instance()->applyPreferences();
+    }
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicAddScriptPathFeature::setupActionLook(QAction* actionToSetup)
+{
+    actionToSetup->setText("Add Script Path");
+}

ApplicationCode/Commands/OctaveScriptCommands/RicAddScriptPathFeature.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 RicAddScriptPathFeature : public caf::CmdFeature
+{
+    CAF_CMD_HEADER_INIT;
+
+protected:
+    // Overrides
+    virtual bool isCommandEnabled();
+    virtual void onActionTriggered( bool isChecked );
+    virtual void setupActionLook( QAction* actionToSetup );
+};
+
+

ApplicationCode/Commands/OctaveScriptCommands/RicDeleteScriptPathFeature.cpp

@@ -0,0 +1,81 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  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 "RicDeleteScriptPathFeature.h"
+
+#include "RicScriptFeatureImpl.h"
+
+#include "RimScriptCollection.h"
+#include "RiaApplication.h"
+#include "RiaPreferences.h"
+#include "RiuMainWindow.h"
+
+#include "cvfAssert.h"
+
+#include <QAction>
+#include <QMessageBox>
+
+CAF_CMD_SOURCE_INIT(RicDeleteScriptPathFeature, "RicDeleteScriptPathFeature");
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+bool RicDeleteScriptPathFeature::isCommandEnabled()
+{
+    std::vector<RimScriptCollection*> selection = RicScriptFeatureImpl::selectedScriptCollections();
+    return selection.size() > 0;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicDeleteScriptPathFeature::onActionTriggered(bool isChecked)
+{
+    std::vector<RimScriptCollection*> calcScriptCollections = RicScriptFeatureImpl::selectedScriptCollections();
+    RimScriptCollection* scriptCollection = calcScriptCollections.size() > 0 ? calcScriptCollections[0] : NULL;
+    if (scriptCollection)
+    {
+        QString toBeRemoved = scriptCollection->directory;
+
+        QString originalFilePathString = RiaApplication::instance()->preferences()->scriptDirectories();
+        QString filePathString = originalFilePathString.remove(toBeRemoved);
+
+        // Remove duplicate separators
+        QChar separator(';');
+        QString regExpString = QString("%1{1,5}").arg(separator);
+        filePathString.replace(QRegExp(regExpString), separator);
+
+        // Remove separator at end
+        if (filePathString.endsWith(separator))
+        {
+            filePathString = filePathString.left(filePathString.size() - 1);
+        }
+
+        RiaApplication::instance()->preferences()->scriptDirectories = filePathString;
+        RiaApplication::instance()->applyPreferences();
+    }
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicDeleteScriptPathFeature::setupActionLook(QAction* actionToSetup)
+{
+    actionToSetup->setText("Delete Script Path");
+}

ApplicationCode/Commands/OctaveScriptCommands/RicDeleteScriptPathFeature.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 RicDeleteScriptPathFeature : public caf::CmdFeature
+{
+    CAF_CMD_HEADER_INIT;
+
+protected:
+    // Overrides
+    virtual bool isCommandEnabled();
+    virtual void onActionTriggered( bool isChecked );
+    virtual void setupActionLook( QAction* actionToSetup );
+};
+
+

ApplicationCode/Commands/OctaveScriptCommands/RicEditScriptFeature.cpp

@@ -0,0 +1,79 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  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 "RicEditScriptFeature.h"
+
+#include "RicScriptFeatureImpl.h"
+
+#include "RimCalcScript.h"
+#include "RiaApplication.h"
+
+#include "RiuMainWindow.h"
+
+#include "cafSelectionManager.h"
+#include "cvfAssert.h"
+
+#include <QAction>
+#include <QMessageBox>
+
+CAF_CMD_SOURCE_INIT(RicEditScriptFeature, "RicEditScriptFeature");
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+bool RicEditScriptFeature::isCommandEnabled()
+{
+    std::vector<RimCalcScript*> selection = RicScriptFeatureImpl::selectedScripts();
+    return selection.size() > 0;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicEditScriptFeature::onActionTriggered(bool isChecked)
+{
+    std::vector<RimCalcScript*> selection = RicScriptFeatureImpl::selectedScripts();
+    CVF_ASSERT(selection.size() > 0);
+
+    RimCalcScript* calcScript = selection[0];
+
+    RiaApplication* app = RiaApplication::instance();
+    QString scriptEditor = app->scriptEditorPath();
+    if (!scriptEditor.isEmpty())
+    {
+        QStringList arguments;
+        arguments << calcScript->absolutePath;
+
+        QProcess* myProcess = new QProcess(this);
+        myProcess->start(scriptEditor, arguments);
+
+        if (!myProcess->waitForStarted(1000))
+        {
+            QMessageBox::warning(RiuMainWindow::instance(), "Script editor", "Failed to start script editor executable\n" + scriptEditor);
+        }
+    }
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicEditScriptFeature::setupActionLook(QAction* actionToSetup)
+{
+    actionToSetup->setText("Edit");
+}

ApplicationCode/Commands/OctaveScriptCommands/RicEditScriptFeature.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 RicEditScriptFeature : public caf::CmdFeature
+{
+    CAF_CMD_HEADER_INIT;
+
+protected:
+    // Overrides
+    virtual bool isCommandEnabled();
+    virtual void onActionTriggered( bool isChecked );
+    virtual void setupActionLook( QAction* actionToSetup );
+};
+
+

ApplicationCode/Commands/OctaveScriptCommands/RicExecuteScriptFeature.cpp

@@ -0,0 +1,78 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  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 "RicExecuteScriptFeature.h"
+
+#include "RicScriptFeatureImpl.h"
+
+#include "RimCalcScript.h"
+#include "RiaApplication.h"
+
+#include "cafSelectionManager.h"
+#include "cvfAssert.h"
+
+#include <QAction>
+#include <QFileInfo>
+
+CAF_CMD_SOURCE_INIT(RicExecuteScriptFeature, "RicExecuteScriptFeature");
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+bool RicExecuteScriptFeature::isCommandEnabled()
+{
+    std::vector<RimCalcScript*> selection = RicScriptFeatureImpl::selectedScripts();
+    return selection.size() > 0;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicExecuteScriptFeature::onActionTriggered(bool isChecked)
+{
+    std::vector<RimCalcScript*> selection = RicScriptFeatureImpl::selectedScripts();
+    CVF_ASSERT(selection.size() > 0);
+
+    RimCalcScript* calcScript = selection[0];
+
+    RiaApplication* app = RiaApplication::instance();
+    QString octavePath = app->octavePath();
+    if (!octavePath.isEmpty())
+    {
+        // TODO: Must rename RimCalcScript::absolutePath to absoluteFileName, as the code below is confusing
+        // absolutePath() is a function in QFileInfo
+        QFileInfo fi(calcScript->absolutePath());
+        QString octaveFunctionSearchPath = fi.absolutePath();
+
+        QStringList arguments = app->octaveArguments();
+        arguments.append("--path");
+        arguments << octaveFunctionSearchPath;
+        arguments << calcScript->absolutePath();
+
+        RiaApplication::instance()->launchProcess(octavePath, arguments);
+    }
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicExecuteScriptFeature::setupActionLook(QAction* actionToSetup)
+{
+    actionToSetup->setText("Execute");
+}

ApplicationCode/Commands/OctaveScriptCommands/RicExecuteScriptFeature.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 RicExecuteScriptFeature : public caf::CmdFeature
+{
+    CAF_CMD_HEADER_INIT;
+
+protected:
+    // Overrides
+    virtual bool isCommandEnabled();
+    virtual void onActionTriggered( bool isChecked );
+    virtual void setupActionLook( QAction* actionToSetup );
+};
+
+

ApplicationCode/Commands/OctaveScriptCommands/RicExecuteScriptForCasesFeature.cpp

@@ -0,0 +1,108 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  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 "RicExecuteScriptForCasesFeature.h"
+
+#include "RimCase.h"
+#include "RiaApplication.h"
+
+#include "cafSelectionManager.h"
+
+#include <QAction>
+#include <QFileInfo>
+
+CAF_CMD_SOURCE_INIT(RicExecuteScriptForCasesFeature, "RicExecuteScriptForCasesFeature");
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+bool RicExecuteScriptForCasesFeature::isCommandEnabled()
+{
+    std::vector<RimCase*> selection;
+    caf::SelectionManager::instance()->objectsByType(&selection);
+
+    if (selection.size() > 0)
+    {
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicExecuteScriptForCasesFeature::onActionTriggered(bool isChecked)
+{
+    // Dummy - handled by slotExecuteScriptForSelectedCases()
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicExecuteScriptForCasesFeature::setupActionLook(QAction* actionToSetup)
+{
+    actionToSetup->setText("Execute script");
+}
+
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicExecuteScriptForCasesFeature::slotExecuteScriptForSelectedCases()
+{
+    QAction* action = qobject_cast<QAction*>(sender());
+    if (!action) return;
+
+    QString scriptAbsolutePath = action->data().toString();
+
+    RiaApplication* app = RiaApplication::instance();
+    QString octavePath = app->octavePath();
+    if (!octavePath.isEmpty())
+    {
+        // TODO: Must rename RimCalcScript::absolutePath to absoluteFileName, as the code below is confusing
+        // absolutePath() is a function in QFileInfo
+
+        QFileInfo fi(scriptAbsolutePath);
+        QString octaveFunctionSearchPath = fi.absolutePath();
+
+        QStringList arguments = app->octaveArguments();
+        arguments.append("--path");
+        arguments << octaveFunctionSearchPath;
+        arguments << scriptAbsolutePath;
+
+        std::vector<RimCase*> selection;
+        caf::SelectionManager::instance()->objectsByType(&selection);
+
+        // Get case ID from selected cases in selection model
+        std::vector<int> caseIdsInSelection;
+        for (size_t i = 0; i < selection.size(); i++)
+        {
+            RimCase* casePtr = selection[i];
+            caseIdsInSelection.push_back(casePtr->caseId);
+        }
+
+        if (caseIdsInSelection.size() > 0)
+        {
+            RiaApplication::instance()->launchProcessForMultipleCases(octavePath, arguments, caseIdsInSelection);
+        }
+    }
+}

ApplicationCode/Commands/OctaveScriptCommands/RicExecuteScriptForCasesFeature.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 RicExecuteScriptForCasesFeature : public caf::CmdFeature
+{
+    Q_OBJECT
+    CAF_CMD_HEADER_INIT;
+
+protected:
+    // Overrides
+    virtual bool isCommandEnabled();
+    virtual void onActionTriggered( bool isChecked );
+    virtual void setupActionLook( QAction* actionToSetup );
+
+private slots:
+    void    slotExecuteScriptForSelectedCases();
+};
+
+

ApplicationCode/Commands/OctaveScriptCommands/RicNewScriptFeature.cpp

@@ -0,0 +1,105 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  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 "RicNewScriptFeature.h"
+
+#include "RicScriptFeatureImpl.h"
+
+#include "RimCalcScript.h"
+#include "RimScriptCollection.h"
+#include "RiaApplication.h"
+ 
+#include "RiuMainWindow.h"
+ 
+#include <QAction>
+#include <QFileInfo>
+#include <QMessageBox>
+
+CAF_CMD_SOURCE_INIT(RicNewScriptFeature, "RicNewScriptFeature");
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+bool RicNewScriptFeature::isCommandEnabled()
+{
+    std::vector<RimCalcScript*> selection = RicScriptFeatureImpl::selectedScripts();
+    return selection.size() > 0;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicNewScriptFeature::onActionTriggered(bool isChecked)
+{
+    std::vector<RimCalcScript*> calcScripts = RicScriptFeatureImpl::selectedScripts();
+    std::vector<RimScriptCollection*> calcScriptCollections = RicScriptFeatureImpl::selectedScriptCollections();
+
+    RimCalcScript* calcScript = calcScripts.size() > 0 ? calcScripts[0] : NULL;
+    RimScriptCollection* scriptColl = calcScriptCollections.size() > 0 ? calcScriptCollections[0] : NULL;
+
+    QString fullPathNewScript;
+
+    if (calcScript )
+    {
+        QFileInfo existingScriptFileInfo(calcScript->absolutePath());
+        fullPathNewScript = existingScriptFileInfo.absolutePath();
+    }
+    else if (scriptColl)
+    {
+        fullPathNewScript = scriptColl->directory();
+    }
+    else
+    {
+        return;
+    }
+
+    QString fullPathFilenameNewScript;
+
+    fullPathFilenameNewScript = fullPathNewScript + "/untitled.m";
+    int num= 1;
+    while (QFileInfo(fullPathFilenameNewScript).exists())
+    {
+        fullPathFilenameNewScript = fullPathNewScript + "/untitled" + QString::number(num) + ".m";
+        num++;
+    }
+
+    RiaApplication* app = RiaApplication::instance();
+    QString scriptEditor = app->scriptEditorPath();
+    if (!scriptEditor.isEmpty())
+    {
+        QStringList arguments;
+        arguments << fullPathFilenameNewScript;
+
+        QProcess* myProcess = new QProcess(this);
+        myProcess->start(scriptEditor, arguments);
+
+        if (!myProcess->waitForStarted(1000))
+        {
+            QMessageBox::warning(RiuMainWindow::instance(), "Script editor", "Failed to start script editor executable\n" + scriptEditor);
+        }
+    }
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RicNewScriptFeature::setupActionLook(QAction* actionToSetup)
+{
+    actionToSetup->setText("New");
+}

ApplicationCode/Commands/OctaveScriptCommands/RicNewScriptFeature.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 RicNewScriptFeature : public caf::CmdFeature
+{
+    CAF_CMD_HEADER_INIT;
+
+protected:
+    // Overrides
+    virtual bool isCommandEnabled();
+    virtual void onActionTriggered( bool isChecked );
+    virtual void setupActionLook( QAction* actionToSetup );
+};
+
+

ApplicationCode/Commands/OctaveScriptCommands/RicScriptFeatureImpl.cpp

@@ -0,0 +1,46 @@
+/////////////////////////////////////////////////////////////////////////////////
+//
+//  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 "RicScriptFeatureImpl.h"
+
+#include "RimCalcScript.h"
+#include "RimScriptCollection.h"
+#include "cafSelectionManager.h"
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+std::vector<RimCalcScript*> RicScriptFeatureImpl::selectedScripts()
+{
+    std::vector<RimCalcScript*> selection;
+    caf::SelectionManager::instance()->objectsByType(&selection);
+
+    return selection;
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+std::vector<RimScriptCollection*> RicScriptFeatureImpl::selectedScriptCollections()
+{
+    std::vector<RimScriptCollection*> selection;
+    caf::SelectionManager::instance()->objectsByType(&selection);
+
+    return selection;
+}

ApplicationCode/Commands/OctaveScriptCommands/RicScriptFeatureImpl.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"
+
+#include <vector>
+
+class RimCalcScript;
+class RimScriptCollection;
+
+//==================================================================================================
+/// 
+//==================================================================================================
+class RicScriptFeatureImpl
+{
+public:
+    static std::vector<RimCalcScript*>          selectedScripts();
+    static std::vector<RimScriptCollection*>    selectedScriptCollections();
+};
+
+