Serialize disabledness

Author: dcwhite

src/Dataflow/Engine/Controller/NetworkEditorController.cc

@@ -457,6 +457,7 @@ void NetworkEditorController::loadNetwork(const NetworkFileHandle& xml)
         serializationManager_->updateModuleNotes(xml->moduleNotes);
         serializationManager_->updateConnectionNotes(xml->connectionNotes);
         serializationManager_->updateModuleTags(xml->moduleTags);
+        serializationManager_->updateDisabledComponents(xml->disabledComponents);
       }
       else
         Log::get() << INFO <<  "module position editor unavailable, module positions at default" << std::endl;
@@ -493,23 +494,23 @@ void NetworkEditorController::appendToNetwork(const NetworkFileHandle& xml)
       auto originalConnections = theNetwork_->connections();
 
       auto info = conv.appendXmlData(xml->network);
-      size_t startIndex = info.newModuleStartIndex;
+      auto startIndex = info.newModuleStartIndex;
       ModuleCounter modulesDone;
       for (size_t i = startIndex; i < theNetwork_->nmodules(); ++i)
       {
-        ModuleHandle module = theNetwork_->module(i);
+        auto module = theNetwork_->module(i);
         moduleAdded_(module->get_module_name(), module, modulesDone);
       }
 
       {
         auto disable(createDynamicPortSwitch());
         //this is handled by NetworkXMLConverter now--but now the logic is convoluted.
         //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())
+        for (const auto& cd : theNetwork_->connections())
         {
           if (std::find(originalConnections.begin(), originalConnections.end(), cd) == originalConnections.end())
           {
-            ConnectionId id = ConnectionId::create(cd);
+            auto id = ConnectionId::create(cd);
             connectionAdded_(cd);
           }
         }
@@ -526,6 +527,7 @@ void NetworkEditorController::appendToNetwork(const NetworkFileHandle& xml)
         serializationManager_->updateConnectionNotes(xml->connectionNotes);
         xml->moduleTags.tags = remapIdBasedContainer(xml->moduleTags.tags, info.moduleIdMapping);
         serializationManager_->updateModuleTags(xml->moduleTags);
+        //TODO: need disabled here?
       }
       else
         Log::get() << INFO << "module position editor unavailable, module positions at default" << std::endl;

src/Dataflow/Network/Module.cc

@@ -264,7 +264,7 @@ bool Module::doExecute() NOEXCEPT
 
   try
   {
-    if (!isDisabled())
+    if (!executionDisabled())
       execute();
     returnCode = true;
   }
@@ -325,7 +325,7 @@ bool Module::doExecute() NOEXCEPT
   auto endState = ModuleExecutionState::Completed;
   executionState_->transitionTo(endState);
 
-  if (!isDisabled())
+  if (!executionDisabled())
   {
     resetStateChanged();
     inputsChanged_ = false;

src/Dataflow/Network/Module.h

@@ -103,8 +103,8 @@ namespace Networks {
 
     virtual const MetadataMap& metadata() const override final;
 
-    virtual bool isDisabled() const override final { return disabled_; }
-    virtual void setDisabled(bool disable) override final { disabled_ = disable; }
+    virtual bool executionDisabled() const override final { return executionDisabled_; }
+    virtual void setExecutionDisabled(bool disable) override final { executionDisabled_ = disable; }
 
   private:
     virtual Core::Datatypes::DatatypeHandleOption get_input_handle(const PortId& id) override final;
@@ -303,7 +303,7 @@ namespace Networks {
     std::atomic<bool> threadStopped_ { false };
 
     ModuleExecutionStateHandle executionState_;
-    std::atomic<bool> disabled_ { false };
+    std::atomic<bool> executionDisabled_ { false };
 
     Core::Logging::LoggerHandle log_;
     Core::Algorithms::AlgorithmStatusReporter::UpdaterFunc updaterFunc_;

src/Dataflow/Network/ModuleInterface.h

@@ -178,8 +178,8 @@ namespace Networks {
 
     virtual bool isStoppable() const = 0;
 
-    virtual bool isDisabled() const = 0;
-    virtual void setDisabled(bool disable) = 0;
+    virtual bool executionDisabled() const = 0;
+    virtual void setExecutionDisabled(bool disable) = 0;
   };
 
   struct SCISHARE DataPortException : virtual Core::ExceptionBase {};

src/Dataflow/Network/Tests/MockModule.h

@@ -88,8 +88,8 @@ namespace SCIRun {
           MOCK_METHOD1(setReexecutionStrategy, void(ModuleReexecutionStrategyHandle));
           MOCK_METHOD0(enqueueExecuteAgain, void());
           MOCK_METHOD1(connectExecuteSelfRequest, boost::signals2::connection(const ExecutionSelfRequestSignalType::slot_type&));
-          MOCK_METHOD1(setDisabled, void(bool));
-          MOCK_CONST_METHOD0(isDisabled, bool(void));
+          MOCK_METHOD1(setExecutionDisabled, void(bool));
+          MOCK_CONST_METHOD0(executionDisabled, bool(void));
         };
 
         typedef boost::shared_ptr<MockModule> MockModulePtr;

src/Dataflow/Serialization/Network/ModulePositionGetter.h

@@ -59,7 +59,7 @@ namespace Networks {
     virtual ModuleTagsHandle dumpModuleTags(ModuleFilter filter) const = 0;
     virtual void updateModuleTags(const ModuleTags& notes) = 0;
 
-    virtual DisabledComponentsHandle dumpDisabledComponents(ModuleFilter filter) const = 0;
+    virtual DisabledComponentsHandle dumpDisabledComponents(ModuleFilter modFilter, ConnectionFilter connFilter) const = 0;
     virtual void updateDisabledComponents(const DisabledComponents& disabled) = 0;
   };
 

src/Dataflow/Serialization/Network/NetworkDescriptionSerialization.h

@@ -82,7 +82,7 @@ namespace Networks {
   typedef std::map<std::string, ModuleWithState> ModuleMapXML;
   typedef std::map<std::string, NoteXML> NotesMapXML;
   typedef std::map<std::string, int> ModuleTagsMapXML;
-  typedef std::map<std::string, bool> DisabledComponentMapXML;
+  typedef std::vector<std::string> DisabledComponentListXML;
 
   struct SCISHARE ModuleNotes
   {
@@ -101,8 +101,8 @@ namespace Networks {
 
   struct SCISHARE DisabledComponents
   {
-    DisabledComponentMapXML disabledModules;
-    DisabledComponentMapXML disabledConnections;
+    DisabledComponentListXML disabledModules;
+    DisabledComponentListXML disabledConnections;
   };
 
   class SCISHARE NetworkXML

src/Dataflow/Serialization/Network/NetworkXMLSerializer.cc

@@ -200,7 +200,7 @@ NetworkFileHandle NetworkToXML::to_xml_data(const NetworkHandle& network, Module
     file->moduleNotes = *nesm_->dumpModuleNotes(modFilter);
     file->connectionNotes = *nesm_->dumpConnectionNotes(connFilter);
     file->moduleTags = *nesm_->dumpModuleTags(modFilter);
-    file->disabledComponents = *nesm_->dumpDisabledComponents(modFilter);
+    file->disabledComponents = *nesm_->dumpDisabledComponents(modFilter, connFilter);
   }
   return file;
 }

src/Interface/Application/Connection.cc

@@ -303,7 +303,6 @@ void ConnectionLine::toggleDisabled()
 void ConnectionLine::setDisabled(bool disabled)
 {
   disabled_ = disabled;
-  qDebug() << "Disabled set to " << disabled_ << "on" << id_.id_.c_str();
   if (disabled_)
   {
     menu_->disableAction_->setText("Enable");
@@ -340,7 +339,6 @@ void ConnectionLine::trackNodes()
 {
   if (fromPort_ && toPort_)
   {
-    //qDebug() << "trackNodes";
     drawer_->draw(this, fromPort_->position(), toPort_->position());
     updateNotePosition();
     setZValue(defaultZValue());

src/Interface/Application/ModuleProxyWidget.cc

@@ -128,7 +128,7 @@ ModuleProxyWidget::ModuleProxyWidget(ModuleWidget* module, QGraphicsItem* parent
   connect(module, SIGNAL(noteUpdated(const Note&)), this, SLOT(updateNote(const Note&)));
   connect(module, SIGNAL(requestModuleVisible()), this, SLOT(ensureThisVisible()));
   connect(module, SIGNAL(deleteMeLater()), this, SLOT(deleteLater()));
-  connect(module, SIGNAL(moduleDisabled(bool)), this, SLOT(disableModuleGUI(bool)));
+  connect(module, SIGNAL(executionDisabled(bool)), this, SLOT(disableModuleGUI(bool)));
 
   stackDepth_ = 0;
 }