Merge branch 'master' into ParaGenerateStreamLines

Author: dcwhite

src/CMakeLists.txt

@@ -625,6 +625,7 @@ SET_PROPERTY(TARGET Algorithms_Math         PROPERTY FOLDER "Core/Algorithms")
 SET_PROPERTY(TARGET Algorithms_Field         PROPERTY FOLDER "Core/Algorithms")
 SET_PROPERTY(TARGET Algorithms_Describe         PROPERTY FOLDER "Core/Algorithms")
 SET_PROPERTY(TARGET Algorithms_BrainStimulator         PROPERTY FOLDER "Core/Algorithms")
+SET_PROPERTY(TARGET Algorithms_Legacy_Inverse         PROPERTY FOLDER "Core/Algorithms")
 SET_PROPERTY(TARGET Algorithms_Factory   PROPERTY FOLDER "Core/Algorithms")
 SET_PROPERTY(TARGET Core_Algorithms_Legacy_Fields         PROPERTY FOLDER "Core/Algorithms")
 SET_PROPERTY(TARGET Core_Algorithms_Legacy_Forward         PROPERTY FOLDER "Core/Algorithms")

src/Core/Application/Application.cc

@@ -181,7 +181,7 @@ namespace
       if (!script_.empty())
       {
         PythonInterpreter::Instance().importSCIRunLibrary();
-        PythonInterpreter::Instance().run_string(script_);
+        PythonInterpreter::Instance().run_script(script_);
       }
       return true;
     }
@@ -199,9 +199,17 @@ namespace
       switch (type)
       {
       case NetworkEventCommands::PostModuleAdd:
-        return boost::make_shared<HardCodedPythonTestCommand>(prefs.postModuleAddScript_temporarySolution.val(), prefs.postModuleAddScriptEnabled_temporarySolution.val());
+        return boost::make_shared<HardCodedPythonTestCommand>(
+          prefs.postModuleAdd.script.val(),
+          prefs.postModuleAdd.enabled.val());
       case NetworkEventCommands::OnNetworkLoad:
-        return boost::make_shared<HardCodedPythonTestCommand>(prefs.onNetworkLoadScript_temporarySolution.val(), prefs.onNetworkLoadScriptEnabled_temporarySolution.val());
+        return boost::make_shared<HardCodedPythonTestCommand>(
+          prefs.onNetworkLoad.script.val(),
+          prefs.onNetworkLoad.enabled.val());
+      case NetworkEventCommands::ApplicationStart:
+        return boost::make_shared<HardCodedPythonTestCommand>(
+          prefs.applicationStart.script.val(),
+          prefs.applicationStart.enabled.val());
       }
       return nullptr;
     }
@@ -238,10 +246,6 @@ NetworkEditorControllerHandle Application::controller()
 
     /// @todo: sloppy way to initialize this but similar to v4, oh well
     IEPluginManager::Initialize();
-
-    /// @todo split out into separate piece
-    // TODO: turn off until Matlab services are converted.
-    // private_->start_eai();
   }
   return private_->controller_;
 }

src/Core/Application/Preferences/Preferences.cc

@@ -55,13 +55,15 @@ Preferences::Preferences() :
   highDPIAdjustment("highDPIAdjustment", false),
   modulesAreDockable("modulesAreDockable", true),
   networkBackgroundColor("backgroundColor", "#808080"),
-  postModuleAddScript_temporarySolution("postModuleAddScript_temporarySolution", ""),
-  postModuleAddScriptEnabled_temporarySolution("postModuleAddScriptEnabled_temporarySolution", false),
-  onNetworkLoadScript_temporarySolution("onNetworkLoadScript_temporarySolution", ""),
-  onNetworkLoadScriptEnabled_temporarySolution("onNetworkLoadScriptEnabled_temporarySolution", false)
+  postModuleAdd("postModuleAdd"),
+  onNetworkLoad("onNetworkLoad"),
+  applicationStart("applicationStart")
 {
 }
 
+TriggeredScriptInfo::TriggeredScriptInfo(const std::string& name) :
+  script(name + "_script", ""), enabled(name + "_enabled", false)
+{}
 
 boost::filesystem::path Preferences::dataDirectory() const
 {

src/Core/Application/Preferences/Preferences.h

@@ -62,8 +62,12 @@ namespace SCIRun
       ValueChangedSignal valueChanged_;
     };
 
-
-
+    struct TriggeredScriptInfo
+    {
+      explicit TriggeredScriptInfo(const std::string& name);
+      StringVariable script;
+      BooleanVariable enabled;
+    };
 
     class SCISHARE Preferences : boost::noncopyable
     {
@@ -73,8 +77,6 @@ namespace SCIRun
 	    Preferences();
 
     public:
-      /// @todo: reuse Seg3D state vars
-
       TrackedVariable<BooleanVariable> showModuleErrorDialogs;
       BooleanVariable saveBeforeExecute;
       BooleanVariable showModuleErrorInlineMessages;
@@ -87,11 +89,9 @@ namespace SCIRun
       TrackedVariable<BooleanVariable> modulesAreDockable;
       StringVariable networkBackgroundColor;
 
-      //super duper ugly.
-      StringVariable postModuleAddScript_temporarySolution;
-      BooleanVariable postModuleAddScriptEnabled_temporarySolution;
-      StringVariable onNetworkLoadScript_temporarySolution;
-      BooleanVariable onNetworkLoadScriptEnabled_temporarySolution;
+      TriggeredScriptInfo postModuleAdd;
+      TriggeredScriptInfo onNetworkLoad;
+      TriggeredScriptInfo applicationStart;
 
       std::string dataDirectoryPlaceholder() const;
 
@@ -101,13 +101,8 @@ namespace SCIRun
       std::vector<boost::filesystem::path> dataPath() const;
       void addToDataPath(const boost::filesystem::path& path);
       void setDataPath(const std::string& dirs); // ;-delimited
-      //TODO: remove path entry
-
-
-	    //void save_state();
 
     private:
-	    //void initialize_states();
 	    boost::filesystem::path dataDir_;
       std::vector<boost::filesystem::path> dataPath_;
     };

src/Core/Command/Command.h

@@ -99,7 +99,8 @@ namespace SCIRun
       enum class NetworkEventCommands
       {
         PostModuleAdd,
-        OnNetworkLoad
+        OnNetworkLoad,
+        ApplicationStart
         //TODO: add more based on user request
       };
 

src/Dataflow/Engine/Controller/NetworkEditorController.cc

@@ -85,6 +85,8 @@ NetworkEditorController::NetworkEditorController(ModuleFactoryHandle mf, ModuleS
 #ifdef BUILD_WITH_PYTHON
   NetworkEditorPythonAPI::setImpl(boost::make_shared<PythonImpl>(*this, cmdFactory_));
 #endif
+
+  eventCmdFactory_->create(NetworkEventCommands::ApplicationStart)->execute();
 }
 
 NetworkEditorController::NetworkEditorController(NetworkHandle network, ExecutionStrategyFactoryHandle executorFactory, NetworkEditorSerializationManager* nesm)