Add disable method

Author: dcwhite

src/Dataflow/Network/Module.cc

@@ -154,11 +154,9 @@ Module::Module(const ModuleLookupInfo& info,
   const std::string& version)
   : info_(info),
   id_(info.module_name_, idGenerator_->makeId(info.module_name_)),
-  inputsChanged_(false),
   has_ui_(hasUi),
   state_(stateFactory ? stateFactory->make_state(info.module_name_) : new NullModuleState),
   metadata_(state_),
-  threadStopped_(false),
   executionState_(new detail::ModuleExecutionStateImpl)
 {
   iports_.set_module(this);

src/Dataflow/Network/Module.h

@@ -103,6 +103,9 @@ 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; }
+
   private:
     virtual Core::Datatypes::DatatypeHandleOption get_input_handle(const PortId& id) override final;
     virtual std::vector<Core::Datatypes::DatatypeHandleOption> get_dynamic_input_handles(const PortId& id) override final;
@@ -274,7 +277,7 @@ namespace Networks {
     template <class T>
     boost::shared_ptr<T> checkInput(Core::Datatypes::DatatypeHandleOption inputOpt, const PortId& id);
 
-    boost::atomic<bool> inputsChanged_;
+    boost::atomic<bool> inputsChanged_ { false };
 
 
     friend class Builder;
@@ -297,9 +300,10 @@ namespace Networks {
     ExecutionSelfRequestSignalType executionSelfRequested_;
 
     ModuleReexecutionStrategyHandle reexecute_;
-    std::atomic<bool> threadStopped_;
+    std::atomic<bool> threadStopped_ { false };
 
     ModuleExecutionStateHandle executionState_;
+    std::atomic<bool> disabled_ { false };
 
     Core::Logging::LoggerHandle log_;
     Core::Algorithms::AlgorithmStatusReporter::UpdaterFunc updaterFunc_;

src/Dataflow/Network/ModuleInterface.h

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

src/Dataflow/Network/Tests/MockModule.h

@@ -88,6 +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));
         };
 
         typedef boost::shared_ptr<MockModule> MockModulePtr;