Closes #739

Author: dcwhite

src/Dataflow/Engine/Scheduler/BasicMultithreadedNetworkExecutor.cc

@@ -47,7 +47,7 @@ namespace
 
     void operator()() const
     {
-      waitForStartupInit();
+      waitForStartupInit(*lookup_);
       /// @todo ESSENTIAL: scoped start/finish signaling
       bounds_.executeStarts_();
       for (int group = order_.minGroup(); group <= order_.maxGroup(); ++group)

src/Dataflow/Engine/Scheduler/DynamicMultithreadedNetworkExecutor.cc

@@ -55,12 +55,13 @@ namespace SCIRun {
           work_(new DynamicExecutor::ModuleWorkQueue(numModules)),
           producer_(new DynamicExecutor::ModuleProducer(context.addAdditionalFilter(ModuleWaitingFilter::Instance()),
             &context.lookup, context.bounds(), network, lock, work_, numModules)),
-          consumer_(new DynamicExecutor::ModuleConsumer(work_, &context.lookup, producer_))
+          consumer_(new DynamicExecutor::ModuleConsumer(work_, &context.lookup, producer_)),
+          network_(network)
         {
         }
         void operator()() const
         {
-          waitForStartupInit();
+          waitForStartupInit(*network_);
           boost::thread consume(boost::ref(*consumer_));
           boost::thread produce(boost::ref(*producer_));
           consume.join();
@@ -70,6 +71,7 @@ namespace SCIRun {
         DynamicExecutor::ModuleWorkQueuePtr work_;
         DynamicExecutor::ModuleProducerPtr producer_;
         DynamicExecutor::ModuleConsumerPtr consumer_;
+        const NetworkInterface* network_;
       };
 }}}
 

src/Dataflow/Engine/Scheduler/LinearSerialNetworkExecutor.cc

@@ -45,7 +45,7 @@ namespace
     }
     void operator()() const
     {
-      waitForStartupInit();
+      waitForStartupInit(lookup_);
       bounds_.executeStarts_();
       BOOST_FOREACH(const ModuleId& id, order_)
       {

src/Dataflow/Engine/Scheduler/SchedulerInterfaces.cc

@@ -56,15 +56,15 @@ const ExecutionBounds& ExecutionContext::bounds() const
   return executionBounds_;
 }
 
-bool WaitsForStartupInitialization::shouldWait_(true);
+bool WaitsForStartupInitialization::waitedAlready_(false);
 
-void WaitsForStartupInitialization::waitForStartupInit() const
+void WaitsForStartupInitialization::waitForStartupInit(const ExecutableLookup& lookup) const
 {
-  if (shouldWait_)
+  if (!waitedAlready_ && lookup.containsViewScene())
   {
     std::cout << "Waiting for rendering system initialization...." << std::endl;
     boost::this_thread::sleep(boost::posix_time::milliseconds(600));
     std::cout << "Done waiting." << std::endl;
-    shouldWait_ = false;
+    waitedAlready_ = true;
   }
 }

src/Dataflow/Engine/Scheduler/SchedulerInterfaces.h

@@ -144,9 +144,9 @@ namespace Engine {
   class SCISHARE WaitsForStartupInitialization
   {
   public:
-    void waitForStartupInit() const;
+    void waitForStartupInit(const Networks::ExecutableLookup& lookup) const;
   private:
-    static bool shouldWait_;
+    static bool waitedAlready_;
   };
 
 }}}

src/Dataflow/Network/Network.cc

@@ -244,6 +244,11 @@ void Network::clear()
   modules_.clear();
 }
 
+bool Network::containsViewScene() const
+{
+  return std::find_if(modules_.begin(), modules_.end(), [](ModuleHandle m) { return m->get_module_name() == "ViewScene"; }) != modules_.end();
+}
+
 ConnectionOutputPort::ConnectionOutputPort(ModuleHandle m, size_t index) : ModulePortIdPair(m, m->outputPorts().at(index)->id())
 {
 }

src/Dataflow/Network/Network.h

@@ -64,6 +64,7 @@ namespace Networks {
     virtual ConnectionDescriptionList connections() const;
     virtual int errorCode() const;
     virtual void incrementErrorCode(const ModuleId& moduleId);
+    virtual bool containsViewScene() const;
     virtual NetworkGlobalSettings& settings();
     virtual std::string toString() const;
     virtual void setModuleExecutionState(ModuleInterface::ExecutionState state, ModuleFilter filter);

src/Dataflow/Network/NetworkInterface.h

@@ -49,7 +49,8 @@ namespace Networks {
   {
   public:
     virtual ~ExecutableLookup() {}
-    virtual ExecutableObject* lookupExecutable(const ModuleId& id) const = 0; 
+    virtual ExecutableObject* lookupExecutable(const ModuleId& id) const = 0;
+    virtual bool containsViewScene() const = 0;
     virtual int errorCode() const = 0;
   };
 

src/Dataflow/Network/Tests/MockNetwork.h

@@ -60,6 +60,7 @@ namespace SCIRun {
           MOCK_METHOD0(settings, NetworkGlobalSettings&());
           MOCK_METHOD2(setModuleExecutionState, void(ModuleInterface::ExecutionState, ModuleFilter));
           MOCK_METHOD0(clear, void());
+          MOCK_CONST_METHOD0(containsViewScene, bool());
         };
 
         typedef boost::shared_ptr<MockNetwork> MockNetworkPtr;

src/Interface/Application/NetworkEditor.cc

@@ -177,6 +177,19 @@ namespace
     }
     return 0;
   }
+
+  ModuleProxyWidget* findFirstByName(const QList<QGraphicsItem*>& list, const std::string& name)
+  {
+    Q_FOREACH(QGraphicsItem* item, list)
+    {
+      if (auto w = dynamic_cast<ModuleProxyWidget*>(item))
+      {
+        if (w->getModuleWidget()->getModuleId().find(name) != std::string::npos)
+          return w;
+      }
+    }
+    return 0;
+  }
 }
 
 void NetworkEditor::duplicateModule(const SCIRun::Dataflow::Networks::ModuleHandle& module)
@@ -964,6 +977,11 @@ int NetworkEditor::currentZoomPercentage() const
   return static_cast<int>(currentScale_ * 100);
 }
 
+bool NetworkEditor::containsViewScene() const
+{
+  return findFirstByName(scene_->items(), "ViewScene") != nullptr;
+}
+
 NetworkEditor::~NetworkEditor()
 {
   Q_FOREACH(QGraphicsItem* item, scene_->items())