Add event command factory collaborator

dcwhite · dcwhite · commit f8787c3dd809 · 2016-04-14T13:01:43.000-06:00
diff --git a/src/Core/Application/Application.cc b/src/Core/Application/Application.cc
@@ -168,7 +168,8 @@ NetworkEditorControllerHandle Application::controller()
     ExecutionStrategyFactoryHandle exe(new DesktopExecutionStrategyFactory(parameters()->threadMode()));
     AlgorithmFactoryHandle algoFactory(new HardCodedAlgorithmFactory);
     ReexecuteStrategyFactoryHandle reexFactory(new DynamicReexecutionStrategyFactory(parameters()->reexecuteMode()));
-    private_->controller_.reset(new NetworkEditorController(moduleFactory, sf, exe, algoFactory, reexFactory, private_->cmdFactory_));
+    NetworkEventCommandFactoryHandle eventCmdFactory(new NullCommandFactory);
+    private_->controller_.reset(new NetworkEditorController(moduleFactory, sf, exe, algoFactory, reexFactory, private_->cmdFactory_, eventCmdFactory));
 
     /// @todo: sloppy way to initialize this but similar to v4, oh well
     IEPluginManager::Initialize();
diff --git a/src/Core/Command/Command.h b/src/Core/Command/Command.h
@@ -93,6 +93,18 @@ namespace SCIRun
         QuitCommand
       };
 
+      enum class NetworkEventCommands
+      {
+        PostModuleAdd
+        //TODO: add more based on user request
+      };
+
+      class SCISHARE NullCommand : public ParameterizedCommand
+      {
+      public:
+        virtual bool execute() override { return true; }
+      };
+
       SCISHARE std::string mostRecentFileCode();
     }
   }
diff --git a/src/Core/Command/CommandFactory.cc b/src/Core/Command/CommandFactory.cc
@@ -28,4 +28,9 @@
 
 #include <Core/Command/CommandFactory.h>
 
-//using namespace SCIRun::Core::Commands;
+using namespace SCIRun::Core::Commands;
+
+CommandHandle NullCommandFactory::create(NetworkEventCommands) const 
+{
+  return boost::make_shared<NullCommand>();
+}
diff --git a/src/Core/Command/CommandFactory.h b/src/Core/Command/CommandFactory.h
@@ -39,14 +39,30 @@ namespace SCIRun
   {
     namespace Commands
     {
-      class SCISHARE GlobalCommandFactory : boost::noncopyable
+      template <typename CommandTypeEnum>
+      class CommandFactory : boost::noncopyable
       {
       public:
-        virtual ~GlobalCommandFactory() {}
-        virtual CommandHandle create(GlobalCommands type) const = 0;
+        virtual ~CommandFactory() {}
+        virtual CommandHandle create(CommandTypeEnum type) const = 0;
+      };
+
+      class SCISHARE GlobalCommandFactory : public CommandFactory<GlobalCommands>
+      {
+      };
+
+      class SCISHARE NetworkEventCommandFactory : public CommandFactory<NetworkEventCommands>
+      {
+      };
+
+      class SCISHARE NullCommandFactory : public NetworkEventCommandFactory
+      {
+      public:
+        virtual CommandHandle create(NetworkEventCommands) const override;
       };
 
       typedef boost::shared_ptr<GlobalCommandFactory> GlobalCommandFactoryHandle;
+      typedef boost::shared_ptr<NetworkEventCommandFactory> NetworkEventCommandFactoryHandle;
     }
   }
 }
diff --git a/src/Dataflow/Engine/Controller/NetworkEditorController.cc b/src/Dataflow/Engine/Controller/NetworkEditorController.cc
@@ -64,14 +64,16 @@ using namespace SCIRun::Core::Commands;
 using namespace SCIRun::Core::Thread;
 
 NetworkEditorController::NetworkEditorController(ModuleFactoryHandle mf, ModuleStateFactoryHandle sf, ExecutionStrategyFactoryHandle executorFactory,
-  AlgorithmFactoryHandle af, ReexecuteStrategyFactoryHandle reex, GlobalCommandFactoryHandle cmdFactory, NetworkEditorSerializationManager* nesm) :
+  AlgorithmFactoryHandle af, ReexecuteStrategyFactoryHandle reex, GlobalCommandFactoryHandle cmdFactory, 
+  NetworkEventCommandFactoryHandle eventCmdFactory, NetworkEditorSerializationManager* nesm) :
   theNetwork_(new Network(mf, sf, af, reex)),
   moduleFactory_(mf),
   stateFactory_(sf),
   algoFactory_(af),
   reexFactory_(reex),
   executorFactory_(executorFactory),
   cmdFactory_(cmdFactory),
+  eventCmdFactory_(eventCmdFactory ? eventCmdFactory : boost::make_shared<NullCommandFactory>()),
   serializationManager_(nesm),
   signalSwitch_(true)
 {
@@ -225,12 +227,15 @@ ModuleHandle NetworkEditorController::addModule(const ModuleLookupInfo& info)
     /*emit*/ moduleAdded_(info.module_name_, realModule, dummy);
   }
   printNetwork();
+
+  eventCmdFactory_->create(NetworkEventCommands::PostModuleAdd)->execute();
+
   return realModule;
 }
 
 ModuleHandle NetworkEditorController::addModuleImpl(const ModuleLookupInfo& info)
 {
-  ModuleHandle realModule = theNetwork_->add_module(info);
+  auto realModule = theNetwork_->add_module(info);
   if (realModule) /// @todo: mock network throws here due to null, need to have it return a mock module.
   {
     realModule->addPortConnection(connectPortAdded(boost::bind(&ModuleInterface::portAddedSlot, realModule.get(), _1, _2)));
@@ -258,7 +263,7 @@ void NetworkEditorController::interruptModule(const ModuleId& id)
 ModuleHandle NetworkEditorController::duplicateModule(const ModuleHandle& module)
 {
   ENSURE_NOT_NULL(module, "Cannot duplicate null module");
-  ModuleId id(module->get_id());
+  auto id(module->get_id());
   auto newModule = addModuleImpl(module->get_info());
   newModule->set_state(module->get_state()->clone());
   static ModuleCounter dummy;
@@ -446,7 +451,7 @@ void NetworkEditorController::loadNetwork(const NetworkFileHandle& xml)
       ModuleCounter modulesDone;
       for (size_t i = 0; i < theNetwork_->nmodules(); ++i)
       {
-        ModuleHandle module = theNetwork_->module(i);
+        auto module = theNetwork_->module(i);
         moduleAdded_(module->get_module_name(), module, modulesDone);
         networkDoneLoading_(static_cast<int>(i));
       }
@@ -457,7 +462,7 @@ void NetworkEditorController::loadNetwork(const NetworkFileHandle& xml)
         //They need to be signaled again after the modules are signaled to alert the GUI. Hence the disabling of DPM
         for (const ConnectionDescription& cd : theNetwork_->connections())
         {
-          ConnectionId id = ConnectionId::create(cd);
+          auto id = ConnectionId::create(cd);
           connectionAdded_(cd);
         }
       }
diff --git a/src/Dataflow/Engine/Controller/NetworkEditorController.h b/src/Dataflow/Engine/Controller/NetworkEditorController.h
@@ -91,6 +91,7 @@ namespace Engine {
       Core::Algorithms::AlgorithmFactoryHandle algoFactory,
       Networks::ReexecuteStrategyFactoryHandle reexFactory,
       Core::Commands::GlobalCommandFactoryHandle cmdFactory,
+      Core::Commands::NetworkEventCommandFactoryHandle eventCmdFactory,
       Networks::NetworkEditorSerializationManager* nesm = nullptr);
     NetworkEditorController(Networks::NetworkHandle network, ExecutionStrategyFactoryHandle executorFactory, Networks::NetworkEditorSerializationManager* nesm = nullptr);
     ~NetworkEditorController();
@@ -174,6 +175,7 @@ namespace Engine {
     ExecutionStrategyHandle currentExecutor_;
     ExecutionStrategyFactoryHandle executorFactory_;
     Core::Commands::GlobalCommandFactoryHandle cmdFactory_;
+    Core::Commands::NetworkEventCommandFactoryHandle eventCmdFactory_;
     Networks::NetworkEditorSerializationManager* serializationManager_;
 
     ExecutionQueueManager executionManager_;
diff --git a/src/Dataflow/Engine/Python/Tests/NetworkEditorPythonAPITests.cc b/src/Dataflow/Engine/Python/Tests/NetworkEditorPythonAPITests.cc
@@ -59,7 +59,7 @@ class PythonControllerFunctionalTests : public ModuleTest
 TEST_F(PythonControllerFunctionalTests, CanAddModule)
 {
   ModuleFactoryHandle mf(new HardCodedModuleFactory);
-  NetworkEditorController controller(mf, nullptr, nullptr, nullptr, nullptr, nullptr);
+  NetworkEditorController controller(mf, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr);
   initModuleParameters(false);
 
   ASSERT_EQ(0, controller.getNetwork()->nmodules());
@@ -75,7 +75,7 @@ TEST_F(PythonControllerFunctionalTests, CanAddModule)
 TEST_F(PythonControllerFunctionalTests, CanAddMultipleModule)
 {
   ModuleFactoryHandle mf(new HardCodedModuleFactory);
-  NetworkEditorController controller(mf, nullptr, nullptr, nullptr, nullptr, nullptr);
+  NetworkEditorController controller(mf, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr);
   initModuleParameters(false);
 
   ASSERT_EQ(0, controller.getNetwork()->nmodules());
@@ -91,7 +91,7 @@ TEST_F(PythonControllerFunctionalTests, CanChangeModuleState)
 {
   ModuleFactoryHandle mf(new HardCodedModuleFactory);
   ModuleStateFactoryHandle sf(new SimpleMapModuleStateFactory);
-  NetworkEditorController controller(mf, sf, nullptr, nullptr, nullptr, nullptr);
+  NetworkEditorController controller(mf, sf, nullptr, nullptr, nullptr, nullptr, nullptr);
   initModuleParameters(false);
 
   ASSERT_EQ(0, controller.getNetwork()->nmodules());
@@ -111,7 +111,7 @@ TEST_F(PythonControllerFunctionalTests, CanChangeModuleState)
 TEST_F(PythonControllerFunctionalTests, CanConnectModules)
 {
   ModuleFactoryHandle mf(new HardCodedModuleFactory);
-  NetworkEditorController controller(mf, nullptr, nullptr, nullptr, nullptr, nullptr);
+  NetworkEditorController controller(mf, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr);
   initModuleParameters(false);
 
   ASSERT_EQ(0, controller.getNetwork()->nmodules());
@@ -133,7 +133,7 @@ TEST_F(PythonControllerFunctionalTests, DISABLED_CanExecuteNetwork)
   ModuleFactoryHandle mf(new HardCodedModuleFactory);
   ModuleStateFactoryHandle sf(new SimpleMapModuleStateFactory);
   ExecutionStrategyFactoryHandle exe(new DesktopExecutionStrategyFactory(boost::none));
-  NetworkEditorController controller(mf, sf, exe, nullptr, nullptr, nullptr);
+  NetworkEditorController controller(mf, sf, exe, nullptr, nullptr, nullptr, nullptr);
   initModuleParameters(false);
 
   PythonInterpreter::Instance().run_string("m1 = scirun_add_module(\"CreateLatVol\")");
@@ -149,7 +149,7 @@ TEST_F(PythonControllerFunctionalTests, DISABLED_CanExecuteNetwork)
 TEST_F(PythonControllerFunctionalTests, CanAddModuleWithStaticFunction)
 {
   ModuleFactoryHandle mf(new HardCodedModuleFactory);
-  NetworkEditorController controller(mf, nullptr, nullptr, nullptr, nullptr, nullptr);
+  NetworkEditorController controller(mf, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr);
   initModuleParameters(false);
 
   ASSERT_EQ(0, controller.getNetwork()->nmodules());
@@ -165,7 +165,7 @@ TEST_F(PythonControllerFunctionalTests, CanAddModuleWithStaticFunction)
 TEST_F(PythonControllerFunctionalTests, CanAddMultipleModulesWithStaticFunction)
 {
   ModuleFactoryHandle mf(new HardCodedModuleFactory);
-  NetworkEditorController controller(mf, nullptr, nullptr, nullptr, nullptr, nullptr);
+  NetworkEditorController controller(mf, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr);
   initModuleParameters(false);
 
   ASSERT_EQ(0, controller.getNetwork()->nmodules());
@@ -181,7 +181,7 @@ TEST_F(PythonControllerFunctionalTests, CanGetModuleStateWithStaticFunction)
 {
   ModuleFactoryHandle mf(new HardCodedModuleFactory);
   ModuleStateFactoryHandle sf(new SimpleMapModuleStateFactory);
-  NetworkEditorController controller(mf, sf, nullptr, nullptr, nullptr, nullptr);
+  NetworkEditorController controller(mf, sf, nullptr, nullptr, nullptr, nullptr, nullptr);
   initModuleParameters(false);
 
   ASSERT_EQ(0, controller.getNetwork()->nmodules());
@@ -203,7 +203,7 @@ TEST_F(PythonControllerFunctionalTests, CanChangeModuleStateWithStaticFunction)
 {
   ModuleFactoryHandle mf(new HardCodedModuleFactory);
   ModuleStateFactoryHandle sf(new SimpleMapModuleStateFactory);
-  NetworkEditorController controller(mf, sf, nullptr, nullptr, nullptr, nullptr);
+  NetworkEditorController controller(mf, sf, nullptr, nullptr, nullptr, nullptr, nullptr);
   initModuleParameters(false);
 
   ASSERT_EQ(0, controller.getNetwork()->nmodules());
@@ -224,7 +224,7 @@ TEST_F(PythonControllerFunctionalTests, CanChangeModuleStateWithStaticFunction)
 TEST_F(PythonControllerFunctionalTests, CanConnectModulesWithStaticFunction)
 {
   ModuleFactoryHandle mf(new HardCodedModuleFactory);
-  NetworkEditorController controller(mf, nullptr, nullptr, nullptr, nullptr, nullptr);
+  NetworkEditorController controller(mf, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr);
   initModuleParameters(false);
 
   ASSERT_EQ(0, controller.getNetwork()->nmodules());
@@ -243,7 +243,7 @@ TEST_F(PythonControllerFunctionalTests, CanConnectModulesWithStaticFunction)
 TEST_F(PythonControllerFunctionalTests, CanDisconnectModulesWithStaticFunction)
 {
   ModuleFactoryHandle mf(new HardCodedModuleFactory);
-  NetworkEditorController controller(mf, nullptr, nullptr, nullptr, nullptr, nullptr);
+  NetworkEditorController controller(mf, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr);
   initModuleParameters(false);
 
   ASSERT_EQ(0, controller.getNetwork()->nmodules());
diff --git a/src/Dataflow/Serialization/Network/Tests/NetworkSerializationTests.cc b/src/Dataflow/Serialization/Network/Tests/NetworkSerializationTests.cc
@@ -165,7 +165,7 @@ TEST(SerializeNetworkTest, RoundTripObject)
   serializer.save_xml(networkXML, ostr1);
 
   ModuleFactoryHandle mf(new HardCodedModuleFactory);
-  NetworkEditorController controller(mf, nullptr, nullptr, nullptr, nullptr, nullptr);
+  NetworkEditorController controller(mf, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr);
   NetworkXMLConverter converter(mf, nullptr, nullptr, nullptr, &controller);
   NetworkHandle network = converter.from_xml_data(networkXML);
   ASSERT_TRUE(network.get() != nullptr);
@@ -185,7 +185,7 @@ TEST(SerializeNetworkTest, FullTestWithModuleState)
   ModuleFactoryHandle mf(new HardCodedModuleFactory);
   ModuleStateFactoryHandle sf(new SimpleMapModuleStateFactory);
   ExecutionStrategyFactoryHandle exe(new DesktopExecutionStrategyFactory(boost::optional<std::string>()));
-  NetworkEditorController controller(mf, sf, exe, nullptr, nullptr, nullptr);
+  NetworkEditorController controller(mf, sf, exe, nullptr, nullptr, nullptr, nullptr);
   
   ModuleHandle matrix1Send = controller.addModule("SendTestMatrix");
   ModuleHandle matrix2Send = controller.addModule("SendTestMatrix");
@@ -231,7 +231,7 @@ TEST(SerializeNetworkTest, FullTestWithModuleState)
   XMLSerializer::save_xml(*xml, ostr, "network");
   std::cout << ostr.str() << std::endl;
 
-  NetworkEditorController controller2(mf, sf, exe, nullptr, nullptr, nullptr);
+  NetworkEditorController controller2(mf, sf, exe, nullptr, nullptr, nullptr, nullptr);
   controller2.loadNetwork(xml);
 
   NetworkHandle deserialized = controller2.getNetwork();
@@ -251,7 +251,7 @@ TEST(SerializeNetworkTest, FullTestWithDynamicPorts)
 {
   ModuleFactoryHandle mf(new HardCodedModuleFactory);
   ModuleStateFactoryHandle sf(new SimpleMapModuleStateFactory);
-  NetworkEditorController controller(mf, sf, nullptr, nullptr, nullptr, nullptr);
+  NetworkEditorController controller(mf, sf, nullptr, nullptr, nullptr, nullptr, nullptr);
 
   std::vector<ModuleHandle> showFields;
   showFields.push_back(controller.addModule("ShowField"));
@@ -281,7 +281,7 @@ TEST(SerializeNetworkTest, FullTestWithDynamicPorts)
   std::ostringstream ostr;
   XMLSerializer::save_xml(*xml, ostr, "network");
 
-  NetworkEditorController controller2(mf, sf, nullptr, nullptr, nullptr, nullptr);
+  NetworkEditorController controller2(mf, sf, nullptr, nullptr, nullptr, nullptr, nullptr);
   controller2.loadNetwork(xml);
 
   NetworkHandle deserialized = controller2.getNetwork();
diff --git a/src/Interface/Application/TriggeredEventsWindow.cc b/src/Interface/Application/TriggeredEventsWindow.cc
@@ -50,6 +50,7 @@ void TriggeredEventsWindow::setScripts(const QMap<QString, QString>& scripts)
 {
   scripts_ = scripts;
 
+  //TODO: hardcode the only enabled entry
   eventListWidget_->setCurrentItem(eventListWidget_->item(1));
   scriptPlainTextEdit_->setPlainText(scripts_[eventListWidget_->currentItem()->text()]);
 }
diff --git a/src/Interface/Application/TriggeredEventsWindow.ui b/src/Interface/Application/TriggeredEventsWindow.ui
@@ -94,11 +94,6 @@
             <set>ItemIsSelectable|ItemIsDragEnabled|ItemIsUserCheckable</set>
            </property>
           </item>
-          <item>
-           <property name="text">
-            <string>Dummy</string>
-           </property>
-          </item>
          </widget>
         </item>
        </layout>
diff --git a/src/Modules/Factory/Tests/ModuleReplaceBuilderTests.cc b/src/Modules/Factory/Tests/ModuleReplaceBuilderTests.cc
@@ -56,7 +56,7 @@ TEST(HardCodedModuleFactoryTests, ListAllModules)
 TEST_F(ModuleReplaceTests, CanComputeConnectedPortInfoFromModule)
 {
   ModuleFactoryHandle mf(new HardCodedModuleFactory);
-  NetworkEditorController controller(mf, nullptr, nullptr, nullptr, nullptr, nullptr);
+  NetworkEditorController controller(mf, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr);
   initModuleParameters(false);
 
   auto network = controller.getNetwork();
@@ -190,7 +190,7 @@ TEST_F(ModuleReplaceTests, CurrentConnectionsFilterReplacements)
   auto filter = builder.build();
 
   ModuleFactoryHandle mf(new HardCodedModuleFactory);
-  NetworkEditorController controller(mf, nullptr, nullptr, nullptr, nullptr, nullptr);
+  NetworkEditorController controller(mf, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr);
   initModuleParameters(false);
   auto network = controller.getNetwork();
   ModuleHandle send = controller.addModule("SendTestMatrix");
diff --git a/src/Modules/Math/Tests/PortCachingUnitTest.cc b/src/Modules/Math/Tests/PortCachingUnitTest.cc
@@ -152,7 +152,7 @@ TEST_P(PortCachingUnitTest, TestWithMockReexecute)
   ModuleFactoryHandle mf(new HardCodedModuleFactory);
   ModuleStateFactoryHandle sf(new SimpleMapModuleStateFactory);
   AlgorithmFactoryHandle af(new HardCodedAlgorithmFactory);
-  NetworkEditorController controller(mf, sf, nullptr, af, nullptr, nullptr);
+  NetworkEditorController controller(mf, sf, nullptr, af, nullptr, nullptr, nullptr);
 
   auto network = controller.getNetwork();
 
@@ -574,7 +574,7 @@ TEST_F(ReexecuteStrategySimpleUnitTest, JustInputsChanged)
   ModuleFactoryHandle mf(new HardCodedModuleFactory);
   ModuleStateFactoryHandle sf(new SimpleMapModuleStateFactory);
   AlgorithmFactoryHandle af(new HardCodedAlgorithmFactory);
-  NetworkEditorController controller(mf, sf, nullptr, af, nullptr, nullptr);
+  NetworkEditorController controller(mf, sf, nullptr, af, nullptr, nullptr, nullptr);
 
   auto network = controller.getNetwork();
 
@@ -662,7 +662,7 @@ TEST_F(ReexecuteStrategySimpleUnitTest, JustStateChanged)
   ModuleFactoryHandle mf(new HardCodedModuleFactory);
   ModuleStateFactoryHandle sf(new SimpleMapModuleStateFactory);
   AlgorithmFactoryHandle af(new HardCodedAlgorithmFactory);
-  NetworkEditorController controller(mf, sf, nullptr, af, nullptr, nullptr);
+  NetworkEditorController controller(mf, sf, nullptr, af, nullptr, nullptr, nullptr);
 
   auto network = controller.getNetwork();
 
@@ -747,7 +747,7 @@ TEST_F(ReexecuteStrategySimpleUnitTest, DISABLED_JustOportsCached)
   ModuleFactoryHandle mf(new HardCodedModuleFactory);
   ModuleStateFactoryHandle sf(new SimpleMapModuleStateFactory);
   AlgorithmFactoryHandle af(new HardCodedAlgorithmFactory);
-  NetworkEditorController controller(mf, sf, nullptr, af, nullptr, nullptr);
+  NetworkEditorController controller(mf, sf, nullptr, af, nullptr, nullptr, nullptr);
 
   auto network = controller.getNetwork();
 
@@ -848,7 +848,7 @@ TEST(PortCachingFunctionalTest, TestSourceSinkInputsChanged)
   ModuleFactoryHandle mf(new HardCodedModuleFactory);
   ModuleStateFactoryHandle sf(new SimpleMapModuleStateFactory);
   AlgorithmFactoryHandle af(new HardCodedAlgorithmFactory);
-  NetworkEditorController controller(mf, sf, nullptr, af, re, nullptr);
+  NetworkEditorController controller(mf, sf, nullptr, af, re, nullptr, nullptr);
 
   auto network = controller.getNetwork();
 
diff --git a/src/Modules/Math/Tests/ReportMatrixInfoTests.cc b/src/Modules/Math/Tests/ReportMatrixInfoTests.cc
@@ -82,7 +82,7 @@ TEST(DynamicPortTests, DynamicPortsCloneThemselves)
   ModuleStateFactoryHandle sf_;
   AlgorithmFactoryHandle af_;
   ModuleFactoryHandle mf(new HardCodedModuleFactory);
-  NetworkEditorController controller(mf, sf_, nullptr, af_, nullptr, nullptr);
+  NetworkEditorController controller(mf, sf_, nullptr, af_, nullptr, nullptr, nullptr);
 
   auto network = controller.getNetwork();
   ModuleHandle hasDynamic = network->add_module(ViewScene::staticInfo_);

Original file line number	Diff line number	Diff line change
`@@ -39,14 +39,30 @@ namespace SCIRun`
`39`	`39`	`{`
`40`	`40`	`namespace Commands`
`41`	`41`	`{`
`42`		`- class SCISHARE GlobalCommandFactory : boost::noncopyable`
	`42`	`+ template <typename CommandTypeEnum>`
	`43`	`+ class CommandFactory : boost::noncopyable`
`43`	`44`	`{`
`44`	`45`	`public:`
`45`		`- virtual ~GlobalCommandFactory() {}`
`46`		`- virtual CommandHandle create(GlobalCommands type) const = 0;`
	`46`	`+ virtual ~CommandFactory() {}`
	`47`	`+ virtual CommandHandle create(CommandTypeEnum type) const = 0;`
	`48`	`+ };`
	`49`	`+`
	`50`	`+ class SCISHARE GlobalCommandFactory : public CommandFactory<GlobalCommands>`
	`51`	`+ {`
	`52`	`+ };`
	`53`	`+`
	`54`	`+ class SCISHARE NetworkEventCommandFactory : public CommandFactory<NetworkEventCommands>`
	`55`	`+ {`
	`56`	`+ };`
	`57`	`+`
	`58`	`+ class SCISHARE NullCommandFactory : public NetworkEventCommandFactory`
	`59`	`+ {`
	`60`	`+ public:`
	`61`	`+ virtual CommandHandle create(NetworkEventCommands) const override;`
`47`	`62`	`};`
`48`	`63`
`49`	`64`	`typedef boost::shared_ptr<GlobalCommandFactory> GlobalCommandFactoryHandle;`
	`65`	`+ typedef boost::shared_ptr<NetworkEventCommandFactory> NetworkEventCommandFactoryHandle;`
`50`	`66`	`}`
`51`	`67`	`}`
`52`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,14 +64,16 @@ using namespace SCIRun::Core::Commands;`
`64`	`64`	`using namespace SCIRun::Core::Thread;`
`65`	`65`
`66`	`66`	`NetworkEditorController::NetworkEditorController(ModuleFactoryHandle mf, ModuleStateFactoryHandle sf, ExecutionStrategyFactoryHandle executorFactory,`
`67`		`- AlgorithmFactoryHandle af, ReexecuteStrategyFactoryHandle reex, GlobalCommandFactoryHandle cmdFactory, NetworkEditorSerializationManager* nesm) :`
	`67`	`+ AlgorithmFactoryHandle af, ReexecuteStrategyFactoryHandle reex, GlobalCommandFactoryHandle cmdFactory,`
	`68`	`+ NetworkEventCommandFactoryHandle eventCmdFactory, NetworkEditorSerializationManager* nesm) :`
`68`	`69`	`theNetwork_(new Network(mf, sf, af, reex)),`
`69`	`70`	`moduleFactory_(mf),`
`70`	`71`	`stateFactory_(sf),`
`71`	`72`	`algoFactory_(af),`
`72`	`73`	`reexFactory_(reex),`
`73`	`74`	`executorFactory_(executorFactory),`
`74`	`75`	`cmdFactory_(cmdFactory),`
	`76`	`+ eventCmdFactory_(eventCmdFactory ? eventCmdFactory : boost::make_shared<NullCommandFactory>()),`
`75`	`77`	`serializationManager_(nesm),`
`76`	`78`	`signalSwitch_(true)`
`77`	`79`	`{`
`@@ -225,12 +227,15 @@ ModuleHandle NetworkEditorController::addModule(const ModuleLookupInfo& info)`
`225`	`227`	`/emit/ moduleAdded_(info.module_name_, realModule, dummy);`
`226`	`228`	`}`
`227`	`229`	`printNetwork();`
	`230`	`+`
	`231`	`+ eventCmdFactory_->create(NetworkEventCommands::PostModuleAdd)->execute();`
	`232`	`+`
`228`	`233`	`return realModule;`
`229`	`234`	`}`
`230`	`235`
`231`	`236`	`ModuleHandle NetworkEditorController::addModuleImpl(const ModuleLookupInfo& info)`
`232`	`237`	`{`
`233`		`- ModuleHandle realModule = theNetwork_->add_module(info);`
	`238`	`+ auto realModule = theNetwork_->add_module(info);`
`234`	`239`	`if (realModule) /// @todo: mock network throws here due to null, need to have it return a mock module.`
`235`	`240`	`{`
`236`	`241`	`realModule->addPortConnection(connectPortAdded(boost::bind(&ModuleInterface::portAddedSlot, realModule.get(), _1, _2)));`
`@@ -258,7 +263,7 @@ void NetworkEditorController::interruptModule(const ModuleId& id)`
`258`	`263`	`ModuleHandle NetworkEditorController::duplicateModule(const ModuleHandle& module)`
`259`	`264`	`{`
`260`	`265`	`ENSURE_NOT_NULL(module, "Cannot duplicate null module");`
`261`		`- ModuleId id(module->get_id());`
	`266`	`+ auto id(module->get_id());`
`262`	`267`	`auto newModule = addModuleImpl(module->get_info());`
`263`	`268`	`newModule->set_state(module->get_state()->clone());`
`264`	`269`	`static ModuleCounter dummy;`
`@@ -446,7 +451,7 @@ void NetworkEditorController::loadNetwork(const NetworkFileHandle& xml)`
`446`	`451`	`ModuleCounter modulesDone;`
`447`	`452`	`for (size_t i = 0; i < theNetwork_->nmodules(); ++i)`
`448`	`453`	`{`
`449`		`- ModuleHandle module = theNetwork_->module(i);`
	`454`	`+ auto module = theNetwork_->module(i);`
`450`	`455`	`moduleAdded_(module->get_module_name(), module, modulesDone);`
`451`	`456`	`networkDoneLoading_(static_cast<int>(i));`
`452`	`457`	`}`
`@@ -457,7 +462,7 @@ void NetworkEditorController::loadNetwork(const NetworkFileHandle& xml)`
`457`	`462`	`//They need to be signaled again after the modules are signaled to alert the GUI. Hence the disabling of DPM`
`458`	`463`	`for (const ConnectionDescription& cd : theNetwork_->connections())`
`459`	`464`	`{`
`460`		`- ConnectionId id = ConnectionId::create(cd);`
	`465`	`+ auto id = ConnectionId::create(cd);`
`461`	`466`	`connectionAdded_(cd);`
`462`	`467`	`}`
`463`	`468`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ void TriggeredEventsWindow::setScripts(const QMap<QString, QString>& scripts)`
`50`	`50`	`{`
`51`	`51`	`scripts_ = scripts;`
`52`	`52`
	`53`	`+ //TODO: hardcode the only enabled entry`
`53`	`54`	`eventListWidget_->setCurrentItem(eventListWidget_->item(1));`
`54`	`55`	`scriptPlainTextEdit_->setPlainText(scripts_[eventListWidget_->currentItem()->text()]);`
`55`	`56`	`}`