Working on play mode

Author: dcwhite

src/Dataflow/Engine/Controller/NetworkEditorController.cc

@@ -372,7 +372,7 @@ void NetworkEditorController::executeGeneric(const ExecutableLookup* lookup, Mod
   executionManager_.enqueueContext(context);
 }
 
-ExecutionQueueManager::ExecutionQueueManager(ExecutionStrategyHandle& currentExecutor) : contexts_(1), currentExecutor_(currentExecutor),
+ExecutionQueueManager::ExecutionQueueManager(ExecutionStrategyHandle& currentExecutor) : contexts_(2), currentExecutor_(currentExecutor),
   executionLaunchThread_([this]() {executeTopContext(); } ),
   executionMutex_("executionQueue"),
   somethingToExecute_("executionQueue")

src/Dataflow/Network/Module.cc

@@ -700,5 +700,11 @@ bool SCIRun::Dataflow::Networks::canReplaceWith(ModuleHandle module, const Modul
 
 void Module::enqueueExecuteAgain()
 {
-  std::cout << "TODO: Module needs to execute again" << std::endl;
+  std::cout << "Module " << get_id() << " needs to execute again, signalling now" << std::endl;
+  executionSelfRequested_();
+}
+
+boost::signals2::connection Module::connectExecuteSelfRequest(const ExecutionSelfRequestSignalType::slot_type& subscriber)
+{
+  return executionSelfRequested_.connect(subscriber);
 }

src/Dataflow/Network/Module.h

@@ -97,6 +97,8 @@ namespace Networks {
     virtual void setExecutionState(ExecutionState state);
     virtual boost::signals2::connection connectExecutionStateChanged(const ExecutionStateChangedSignalType::slot_type& subscriber);
 
+    virtual boost::signals2::connection connectExecuteSelfRequest(const ExecutionSelfRequestSignalType::slot_type& subscriber);
+
     virtual void enqueueExecuteAgain();
 
   private:
@@ -281,6 +283,7 @@ namespace Networks {
     boost::atomic<ExecutionState> executionState_;
     ExecutionStateChangedSignalType executionStateChanged_;
     std::vector<boost::shared_ptr<boost::signals2::scoped_connection>> portConnections_;
+    ExecutionSelfRequestSignalType executionSelfRequested_;
 
     ModuleReexecutionStrategyHandle reexecute_;
 

src/Dataflow/Network/ModuleInterface.h

@@ -125,6 +125,9 @@ namespace Networks {
     virtual void setExecutionState(ExecutionState state) = 0;
     virtual boost::signals2::connection connectExecutionStateChanged(const ExecutionStateChangedSignalType::slot_type& subscriber) = 0;
 
+    typedef boost::signals2::signal<void()> ExecutionSelfRequestSignalType;
+    virtual boost::signals2::connection connectExecuteSelfRequest(const ExecutionSelfRequestSignalType::slot_type& subscriber) = 0;
+
     /// @todo for deserialization
     virtual void set_id(const std::string& id) = 0;
     virtual void set_state(ModuleStateHandle state) = 0;

src/Dataflow/Network/Tests/MockModule.h

@@ -86,6 +86,7 @@ namespace SCIRun {
           MOCK_CONST_METHOD0(getReexecutionStrategy, ModuleReexecutionStrategyHandle());
           MOCK_METHOD1(setReexecutionStrategy, void(ModuleReexecutionStrategyHandle));
           MOCK_METHOD0(enqueueExecuteAgain, void());
+          MOCK_METHOD1(connectExecuteSelfRequest, boost::signals2::connection(const ExecutionSelfRequestSignalType::slot_type&));
         };
 
         typedef boost::shared_ptr<MockModule> MockModulePtr;

src/ExampleNets/regression/playThroughMatrixSlices.srn5

@@ -79,7 +79,7 @@
 									<name>SliceIndex</name>
 									<value>
 										<which>0</which>
-										<value>2</value>
+										<value>0</value>
 									</value>
 								</second>
 							</item>

src/Interface/Modules/Math/GetMatrixSliceDialog.cc

@@ -62,8 +62,8 @@ GetMatrixSliceDialog::GetMatrixSliceDialog(const std::string& name, ModuleStateH
   pauseButton_->setIcon(QApplication::style()->standardIcon(QStyle::SP_MediaPause));
   connect(pauseButton_, SIGNAL(clicked()), this, SLOT(stopPlay()));
 
-  playButton_->setDisabled(true);
-  pauseButton_->setDisabled(true);
+  //playButton_->setDisabled(true);
+  //pauseButton_->setDisabled(true);
 }
 
 void GetMatrixSliceDialog::pull()
@@ -99,14 +99,13 @@ void GetMatrixSliceDialog::selectLastIndex()
 
 void GetMatrixSliceDialog::startPlay()
 {
-  std::cout << "play--needs requirements" << std::endl;
-  state_->setValue(Parameters::PlayMode, true);
+  //std::cout << "play--needs requirements" << std::endl;
+  state_->setTransientValue(Parameters::PlayMode, 1);
   Q_EMIT executeActionTriggered();
 }
 
 void GetMatrixSliceDialog::stopPlay()
 {
   std::cout << "pause--needs requirements" << std::endl;
-  state_->setValue(Parameters::PlayMode, false);
-  Q_EMIT executeActionTriggered();
+  state_->setTransientValue(Parameters::PlayMode, 2);
 }

src/Modules/Math/GetMatrixSlice.cc

@@ -60,24 +60,23 @@ void GetMatrixSlice::execute()
     setAlgoIntFromState(Parameters::SliceIndex);
     auto output = algo().run(withInputData((InputMatrix, input)));
     sendOutputFromAlgorithm(OutputMatrix, output);
-    get_state()->setValue(Parameters::MaxIndex, output.additionalAlgoOutput()->toInt());
+    auto maxIndex = output.additionalAlgoOutput()->toInt();
+    get_state()->setValue(Parameters::MaxIndex, maxIndex);
 
-    /*
-    auto playMode = get_state()->getValue(Parameters::PlayMode).toBool();
-    if (playMode)
+    std::cout << "checking play mode" << std::endl;
+    auto playMode = optional_any_cast_or_default<int>(get_state()->getTransientValue(Parameters::PlayMode));
+    if (playMode == 1)
     {
+      std::cout << "checking play mode: " << playMode << std::endl;
       auto nextIndex = algo().get(Parameters::SliceIndex).toInt() + 1;
-      auto maxIndex = algo().get(Parameters::IsSliceColumn).toBool() && input ? input->ncols() : input->nrows();
-      if (nextIndex >= maxIndex)
-      {
-        get_state()->setValue(Parameters::PlayMode, false);
-      }
-      else
-      {
-        get_state()->setValue(Parameters::SliceIndex, nextIndex);
-        enqueueExecuteAgain();
-      }
+      std::cout << "setting index to " << nextIndex % (maxIndex + 1) << std::endl;
+      get_state()->setValue(Parameters::SliceIndex, nextIndex % (maxIndex + 1));
+      enqueueExecuteAgain();
+      std::cout << "execute enqueued " << std::endl;
+    }
+    else if (playMode == 2)
+    {
+      std::cout << "execute paused" << std::endl;
     }
-    */
   }
 }