Re-enable disabled connection for VS works

Author: dcwhite

src/Dataflow/Network/Port.cc

@@ -154,22 +154,14 @@ boost::signals2::connection InputPort::connectDataOnPortHasChanged(const DataOnP
 {
   return sink()->connectDataHasChanged([this, subscriber] (DatatypeHandle data)
   {
-    std::cout << "connectDataHasChanged" << std::endl;
     if (!this->connections_.empty())
     {
-      std::cout << "connectDataHasChanged connections not empty" << std::endl;
       auto conn = *this->connections_.begin();
       if (!conn->disabled())
       {
-        std::cout << "enabled: " << conn->id() << std::endl;
         subscriber(this->id(), data);
       }
-      else
-      {
-        std::cout << "disabled: " << conn->id() << std::endl;
-      }
     }
-    std::cout << "connectDataHasChanged connections is empty" << std::endl;
   });
 }
 
@@ -196,15 +188,12 @@ void OutputPort::sendData(DatatypeHandle data)
   if (0 == nconnections())
     return;
 
-  for (Connection* c : connections_)
+  for (auto c : connections_)
   {
-    std::cout << c->id();
-    if (c && !c->disabled() && c->iport_)
+    if (c && c->iport_)
     {
       source_->send(c->iport_->sink());
-      std::cout << "\t sent.";
     }
-    std::cout << std::endl;
   }
 }
 

src/Dataflow/Network/SimpleSourceSink.cc

@@ -73,15 +73,14 @@ void SimpleSink::setGlobalPortCachingFlag(bool value)
 
 void SimpleSink::invalidateAll()
 {
-  for (SimpleSink* sink : instances_)
+  for (auto sink : instances_)
     sink->invalidateProvider();
 }
 
 DatatypeHandleOption SimpleSink::receive()
 {
   if (DatatypeHandle strong = weakData_.lock())
   {
-    //std::cout << "\tweak pointer converted to strong in Sink.receive" << std::endl;
     return strong;
   }
   return DatatypeHandleOption();
@@ -93,16 +92,12 @@ void SimpleSink::setData(DatatypeHandle data)
   {
     if (data)
     {
-      //std::cout << "\tSink.setData hasChanged is " << hasChanged_ << std::endl;
-      //std::cout << "\tSink.setData old id is " << strong->id() << " new id is " << data->id() << std::endl;
       hasChanged_ = strong->id() != data->id();
-      //std::cout << "\tSink.setData hasChanged set to " << hasChanged_ << std::endl;
     }
   }
   else if (data)
   {
     hasChanged_ = true;
-    //std::cout << "\tSink.setData: no previous weakData, hasChanged set to " << hasChanged_ << std::endl;
   }
 
   weakData_ = data;
@@ -112,7 +107,8 @@ void SimpleSink::setData(DatatypeHandle data)
 
 void SimpleSink::forceFireDataHasChanged()
 {
-  dataHasChanged_(weakData_.lock());
+  auto data = weakData_.lock();
+  dataHasChanged_(data);
 }
 
 DatatypeSinkInterface* SimpleSink::clone() const
@@ -124,7 +120,6 @@ bool SimpleSink::hasChanged() const
 {
   bool val = hasChanged_;
   hasChanged_ = false;
-  //std::cout << "\tSink.hasChanged() returns " << val << ", hasChanged set to " << hasChanged_ << std::endl;
   return val;
 }
 
@@ -167,7 +162,7 @@ std::set<SimpleSource*> SimpleSource::instances_;
 
 void SimpleSource::clearAllSources()
 {
-  for (SimpleSource* source : instances_)
+  for (auto source : instances_)
     source->data_.reset();
 }
 

src/Dataflow/Network/Tests/MockPorts.h

@@ -62,7 +62,7 @@ namespace SCIRun {
           MOCK_METHOD1(attach, void(Connection*));
           MOCK_METHOD1(detach, void(Connection*));
           MOCK_CONST_METHOD0(nconnections, size_t());
-          MOCK_CONST_METHOD1(connection, const Connection*(size_t));
+          MOCK_CONST_METHOD1(connection, Connection*(size_t));
           MOCK_CONST_METHOD0(get_typename, std::string());
           MOCK_CONST_METHOD0(get_portname, std::string());
           MOCK_CONST_METHOD0(getData, Core::Datatypes::DatatypeHandleOption());
@@ -78,6 +78,7 @@ namespace SCIRun {
           MOCK_METHOD1(setIndex, void(size_t));
           MOCK_METHOD1(connectDataOnPortHasChanged, boost::signals2::connection(const DataOnPortHasChangedSignalType::slot_type&));
           MOCK_CONST_METHOD0(firstConnectionId, boost::optional<ConnectionId>());
+          MOCK_METHOD0(resendNewDataSignal, void());
         };
 
         typedef boost::shared_ptr<MockInputPort> MockInputPortPtr;
@@ -88,7 +89,7 @@ namespace SCIRun {
           MOCK_METHOD1(attach, void(Connection*));
           MOCK_METHOD1(detach, void(Connection*));
           MOCK_CONST_METHOD0(nconnections, size_t());
-          MOCK_CONST_METHOD1(connection, const Connection*(size_t));
+          MOCK_CONST_METHOD1(connection, Connection*(size_t));
           MOCK_CONST_METHOD0(get_typename, std::string());
           MOCK_CONST_METHOD0(get_portname, std::string());
           MOCK_METHOD1(sendData, void(Core::Datatypes::DatatypeHandle));
@@ -118,6 +119,7 @@ namespace SCIRun {
           MOCK_METHOD0(receive, Core::Datatypes::DatatypeHandleOption());
           MOCK_CONST_METHOD0(hasChanged, bool());
           MOCK_METHOD1(connectDataHasChanged, boost::signals2::connection(const DataHasChangedSignalType::slot_type&));
+          MOCK_METHOD0(forceFireDataHasChanged, void());
         };
 
         typedef boost::shared_ptr<MockDatatypeSink> MockDatatypeSinkPtr;

src/Testing/ModuleTestBase/ModuleTestBase.cc

@@ -72,6 +72,7 @@ class StubbedDatatypeSink : public DatatypeSinkInterface
 
   void setData(DatatypeHandleOption data) { data_ = data; }
   virtual void invalidateProvider() override {}
+  virtual void forceFireDataHasChanged() override {}
 
   virtual boost::signals2::connection connectDataHasChanged(const DataHasChangedSignalType::slot_type&) override { return {}; }
 private: