Merge branch 'master' into qwt

Author: dcwhite

src/Core/Algorithms/Math/GetMatrixSliceAlgo.cc

@@ -80,7 +80,9 @@ boost::tuple<MatrixHandle, int> GetMatrixSliceAlgo::runImpl(MatrixHandle matrix,
     {
       auto sparse = matrix_cast::as_sparse(matrix);
       if (sparse)
-        return boost::make_tuple(boost::make_shared<SparseRowMatrix>(sparse->col(index)), max);
+      {
+        THROW_ALGORITHM_PROCESSING_ERROR("TODO: need a fix for slicing a column from SparseRowMatrix. Direct Eigen call is buggy. Waiting on an Eigen upgrade");
+      }
       return boost::make_tuple(nullptr, 0);
     }
   }
@@ -89,7 +91,6 @@ boost::tuple<MatrixHandle, int> GetMatrixSliceAlgo::runImpl(MatrixHandle matrix,
     checkIndex(index, matrix->nrows());
     auto max = matrix->nrows() - 1;
 
-    // dense case only now
     auto dense = matrix_cast::as_dense(matrix);
     if (dense)
       return boost::make_tuple(boost::make_shared<DenseMatrix>(dense->row(index)), max);

src/Core/Algorithms/Math/GetMatrixSliceAlgo.h

@@ -50,6 +50,13 @@ namespace SCIRun {
           GetMatrixSliceAlgo();
           virtual AlgorithmOutput run_generic(const AlgorithmInput& input) const override;
           boost::tuple<Datatypes::MatrixHandle, int> runImpl(Datatypes::MatrixHandle matrix, int index, bool getColumn) const;
+
+					enum PlayMode
+					{
+						PLAY = 1,
+						PAUSE = 2
+					};
+
         private:
           void checkIndex(int index, int max) const;
         };

src/Core/Algorithms/Math/Tests/GetMatrixSliceAlgoTests.cc

@@ -96,11 +96,13 @@ TEST(GetMatrixSliceAlgoTests, CanGetColumnOrRowSparse)
 
   for (int i = 0; i < m1->ncols(); ++i)
   {
-    auto col = algo.runImpl(m1, i, true);
+    EXPECT_THROW(algo.runImpl(m1, i, true), AlgorithmProcessingException);
+    /* TODO: fix in #822
     SparseRowMatrix expected(m1->col(i));
     ASSERT_TRUE(col.get<0>() != nullptr);
     EXPECT_EQ(expected, *matrix_cast::as_sparse(col.get<0>()));
     EXPECT_EQ(m1->ncols() - 1, col.get<1>());
+    */
   }
   for (int i = 0; i < m1->nrows(); ++i)
   {

src/Core/Thread/Legacy/CMakeLists.txt

@@ -45,7 +45,6 @@ SET(Core_Thread_Legacy_SRCS
   ThreadGroup.cc 
   Thread_unix.cc 
   ThreadPool.cc 
-  WorkQueue.cc 
 )
 
 SET(Core_Thread_Legacy_HEADERS
@@ -79,7 +78,6 @@ SET(Core_Thread_Legacy_HEADERS
   ThreadPool.h
   Time.h  
   UsedWithLockingHandle.h
-  WorkQueue.h
 )
 
 IF(WIN32)

src/Core/Thread/Legacy/WorkQueue.cc

@@ -296,7 +296,7 @@ void NetworkEditorController::loadNetwork(const NetworkFileHandle& xml)
       {
         ModuleHandle module = theNetwork_->module(i);
         moduleAdded_(module->get_module_name(), module, modulesDone);
-        networkDoneLoading_(i);
+        networkDoneLoading_(static_cast<int>(i));
       }
 
       {
@@ -334,34 +334,38 @@ void NetworkEditorController::clear()
 }
 
 // TODO:
-// - [ ] refactor duplication
+// - [X] refactor duplication
 // - [ ] set up execution context queue
 // - [ ] separate threads for looping through queue: another producer/consumer pair
 
 void NetworkEditorController::executeAll(const ExecutableLookup* lookup)
 {
-  if (!currentExecutor_)
-  {
-    currentExecutor_ = executorFactory_->createDefault();
-  }
-
-  ExecuteAllModules filter;
-  theNetwork_->setModuleExecutionState(ModuleInterface::Waiting, filter);
-  ExecutionContext context(*theNetwork_, lookup ? *lookup : *theNetwork_, filter);
-  currentExecutor_->execute(context);
+  executeGeneric(lookup, ExecuteAllModules::Instance());
 }
 
 void NetworkEditorController::executeModule(const ModuleHandle& module, const ExecutableLookup* lookup)
 {
-  if (!currentExecutor_)
-  {
-    currentExecutor_ = executorFactory_->createDefault();
-  }
-
   ExecuteSingleModule filter(module, *theNetwork_);
+  executeGeneric(lookup, filter);
+}
+
+void NetworkEditorController::initExecutor()
+{
+  executionManager_.initExecutor(executorFactory_);
+}
+
+ExecutionContextHandle NetworkEditorController::createExecutionContext(const ExecutableLookup* lookup, ModuleFilter filter)
+{
   theNetwork_->setModuleExecutionState(ModuleInterface::Waiting, filter);
-  ExecutionContext context(*theNetwork_, lookup ? *lookup : *theNetwork_, filter);
-  currentExecutor_->execute(context);
+  return boost::make_shared<ExecutionContext>(*theNetwork_, lookup ? *lookup : *theNetwork_, filter);
+}
+
+void NetworkEditorController::executeGeneric(const ExecutableLookup* lookup, ModuleFilter filter)
+{
+  initExecutor();
+  auto context = createExecutionContext(lookup, filter);
+
+  executionManager_.enqueueContext(context);
 }
 
 NetworkHandle NetworkEditorController::getNetwork() const
@@ -382,7 +386,7 @@ NetworkGlobalSettings& NetworkEditorController::getSettings()
 
 void NetworkEditorController::setExecutorType(int type)
 {
-  currentExecutor_ = executorFactory_->create((ExecutionStrategy::Type)type);
+  executionManager_.setExecutionStrategy(executorFactory_->create((ExecutionStrategy::Type)type));
 }
 
 const ModuleDescriptionMap& NetworkEditorController::getAllAvailableModuleDescriptions() const