Basic disabling works

Author: dcwhite

src/Dataflow/Network/Module.cc

@@ -264,7 +264,8 @@ bool Module::doExecute() NOEXCEPT
 
   try
   {
-    execute();
+    if (!isDisabled())
+      execute();
     returnCode = true;
   }
   catch (const std::bad_alloc&)
@@ -280,14 +281,14 @@ bool Module::doExecute() NOEXCEPT
   catch (Core::ExceptionBase& e)
   {
     /// @todo: this block is repetitive (logging-wise) if the macros are used to log AND throw an exception with the same message. Figure out a reasonable condition to enable it.
-    if (Core::Logging::Log::get().verbose())
+    if (Log::get().verbose())
     {
       std::ostringstream ostr;
       ostr << "Caught exception: " << e.typeName() << std::endl << "Message: " << e.what() << std::endl;
       error(ostr.str());
     }
 
-    if (Core::Logging::Log::get().verbose())
+    if (Log::get().verbose())
     {
       std::ostringstream ostrExtra;
       ostrExtra << boost::diagnostic_information(e) << std::endl;
@@ -323,8 +324,13 @@ bool Module::doExecute() NOEXCEPT
   //auto endState = returnCode ? ModuleExecutionState::Completed : ModuleExecutionState::Errored;
   auto endState = ModuleExecutionState::Completed;
   executionState_->transitionTo(endState);
-  resetStateChanged();
-  inputsChanged_ = false;
+
+  if (!isDisabled())
+  {
+    resetStateChanged();
+    inputsChanged_ = false;
+  }
+  
   executeEnds_(executionTime, id_);
   return returnCode;
 }

src/Interface/Application/Connection.cc

@@ -188,12 +188,13 @@ namespace SCIRun
     class ConnectionMenu : public QMenu
     {
     public:
-      ConnectionMenu(QWidget* parent = 0) : QMenu(parent)
+      explicit ConnectionMenu(QWidget* parent = nullptr) : QMenu(parent)
       {
         deleteAction_ = addAction(deleteAction);
         addWidgetToExecutionDisableList(deleteAction_);
         addAction(insertModuleAction)->setDisabled(true);
         disableAction_ = addAction(disableEnableAction);
+        addWidgetToExecutionDisableList(disableAction_);
         notesAction_ = addAction(editNotesAction);
       }
       ~ConnectionMenu()

src/Interface/Application/MainWindowCollaborators.h

@@ -99,7 +99,7 @@ namespace Gui {
     CORE_SINGLETON( WidgetDisablingService );
 
   private:
-    WidgetDisablingService() : ne_(0), serviceEnabled_(true) {}
+    WidgetDisablingService() {}
   public Q_SLOTS:
     void disableInputWidgets();
     void enableInputWidgets();
@@ -116,9 +116,9 @@ namespace Gui {
       std::copy(begin, end, std::back_inserter(inputWidgets_));
     }
   private:
-    NetworkEditor* ne_;
+    NetworkEditor* ne_ {nullptr};
     std::vector<InputWidget> inputWidgets_;
-    bool serviceEnabled_;
+    bool serviceEnabled_ {true};
   };
 
   inline void addWidgetToExecutionDisableList(const InputWidget& w)

src/Interface/Application/ModuleWidget.cc

@@ -1500,6 +1500,8 @@ void ModuleWidget::incomingConnectionStateChanged(bool disabled)
 
   Q_EMIT moduleDisabled(disabled_);
 
+  theModule_->setDisabled(disabled_);
+
   for (const auto& output : ports().outputs())
   {
     output->setConnectionsDisabled(disabled_ || disabled);