Working on SimulationReaderBase

Author: dcwhite

src/Modules/Basic/AsyncStreamingTestModule.cc

@@ -28,6 +28,7 @@
 #include <queue>
 #include <future>
 #include <Modules/Basic/AsyncStreamingTestModule.h>
+#include <Modules/Basic/SimulationReaderBaseModule.h>
 #include <Core/Datatypes/Legacy/Bundle/Bundle.h>
 #include <Core/Datatypes/DenseMatrix.h>
 #include <Core/Datatypes/DenseColumnMatrix.h>
@@ -48,7 +49,7 @@ namespace SCIRun::Modules::Basic
   using DataChunk = DenseMatrixHandle;
   //TODO: need thread-safe container to share
   using DataStream = std::queue<DataChunk>;
-  
+
 
   class StreamAppender
   {
@@ -92,22 +93,22 @@ namespace SCIRun::Modules::Basic
     {
       if (hasData())
       {
-        //wait for result. 
+        //wait for result.
         while (stream().empty())
         {
           logInfo("__MAIN__ Waiting for data");
           std::this_thread::sleep_for(std::chrono::milliseconds(1000));
         }
 
-        //once data is available, output to ports 
+        //once data is available, output to ports
         auto data = stream().front();
         {
           Guard g(dataMutex.get());
           stream().pop();
         }
 
         logInfo("__MAIN__ Received data: [{}] outputting matrix.", (*data)(0, 0));
-        module_->outputAsyncData(module_->bundleOutputs({ "Slice" }, { data }));
+        module_->sendOutput(module_->OutputSlice, bundleOutputs({ "Slice" }, { data }));
 
         logInfo("__MAIN__ Enqueue execute again");
         module_->enqueueExecuteAgain(false);
@@ -149,23 +150,6 @@ void AsyncStreamingTest::execute()
     impl_ = std::make_unique<StreamAppender>(this, castMatrix::toDense(input));
     impl_->beginPushDataAsync();
   }
-   
-  impl_->waitAndOutputEach();
-}
-
-void AsyncStreamingTest::outputAsyncData(BundleHandle data)
-{
-  sendOutput(OutputSlice, data);
-}
 
-Core::Datatypes::BundleHandle AsyncStreamingTest::bundleOutputs(std::initializer_list<std::string> names, std::initializer_list<DatatypeHandle> dataList)
-{
-  auto bundle = makeShared<Bundle>();
-  auto nIter = names.begin();
-  auto dIter = dataList.begin();
-  for (; nIter != names.end(); ++nIter, ++dIter)
-  {
-    bundle->set(*nIter, *dIter);
-  }
-  return bundle;
+  impl_->waitAndOutputEach();
 }

src/Modules/Basic/AsyncStreamingTestModule.h

@@ -50,9 +50,6 @@ namespace Basic {
     OUTPUT_PORT(0, OutputSlice, Bundle);
 
     MODULE_TRAITS_AND_INFO(ModuleFlags::NoAlgoOrUI)
-  protected:
-    void outputAsyncData(Core::Datatypes::BundleHandle data);
-    Core::Datatypes::BundleHandle bundleOutputs(std::initializer_list<std::string> names, std::initializer_list<Core::Datatypes::DatatypeHandle> dataList);
   private:
     friend class StreamAppender;
     std::unique_ptr<class StreamAppender> impl_;

src/Modules/Basic/CMakeLists.txt

@@ -40,6 +40,7 @@ SET(Modules_Basic_SRCS
   LoggingTester.cc
   CompositeModuleWithStaticPorts.cc
   CompositeModuleWithTypedStaticPorts.cc
+  SimulationReaderBaseModule.cc
 )
 
 SET(Modules_Basic_HEADERS
@@ -56,6 +57,7 @@ SET(Modules_Basic_HEADERS
   PlaceholderModule.h
   CompositeModuleWithStaticPorts.h
   CompositeModuleWithTypedStaticPorts.h
+  SimulationReaderBaseModule.h
   share.h
 )