Merge branch 'master' into travisRunTesting

Author: dcwhite

src/Core/Algorithms/Legacy/Fields/RegisterWithCorrespondences.cc

@@ -54,7 +54,6 @@ RegisterWithCorrespondencesAlgo::RegisterWithCorrespondencesAlgo()
 
 AlgorithmOutput RegisterWithCorrespondencesAlgo::run_generic(const AlgorithmInput& input) const
 {
-  std::cout << "ALGO" << std::endl;
   auto input_field = input.get<Field>(Variables::InputField);
   auto corres1 = input.get<Field>(Correspondences1);
   auto corres2 = input.get<Field>(Correspondences2);
@@ -65,15 +64,12 @@ AlgorithmOutput RegisterWithCorrespondencesAlgo::run_generic(const AlgorithmInpu
   switch (op)
   {
   case 0:
-    std::cout << "runM" << std::endl;
     runM(input_field, corres1, corres2, return_field);
     break;
   case 1:
-    std::cout << "runA" << std::endl;
     runA(input_field, corres1, corres2, return_field);
     break;
   case 2:
-    std::cout << "runN" << std::endl;
     runN(input_field, corres1, corres2, return_field);
     break;
   }
@@ -227,10 +223,10 @@ bool RegisterWithCorrespondencesAlgo::runM(FieldHandle input, FieldHandle Cors1,
     Bm(3, L1) = 1;
 
     //vertical x,y,z
-    Bm(L1 + 4) = num_cors1, P.x();
-    Bm(L1 + 4) = num_cors1 + 1, P.y();
-    Bm(L1 + 4) = num_cors1 + 2, P.z();
-    Bm(L1 + 4) = num_cors1 + 3, 1;
+    Bm(L1 + 4, num_cors1) = P.x();
+    Bm(L1 + 4, num_cors1 + 1) = P.y();
+    Bm(L1 + 4, num_cors1 + 2) = P.z();
+    Bm(L1 + 4, num_cors1 + 3) = 1;
   }
 
   for (int L1 = num_cors1; L1 < num_cors1 + 4; ++L1)
@@ -244,7 +240,6 @@ bool RegisterWithCorrespondencesAlgo::runM(FieldHandle input, FieldHandle Cors1,
   //put in sigmas
   DenseMatrixHandle SMat;
   radial_basis_func(icors2, icors2, SMat);
-  double temp = 0;
 
   for (int i = 0; i < num_cors1; ++i)
   {
@@ -754,7 +749,6 @@ bool RegisterWithCorrespondencesAlgo::make_new_pointsA(VMesh* points, VMesh* Cor
   Point P, Pp;
 
   points->size(num_pts);
-  int msz = coefs.size();
 
   for (int i = 0; i < num_pts; ++i)
   {

src/Dataflow/Network/Module.cc

@@ -46,6 +46,9 @@
 #include <Core/Thread/Mutex.h>
 #include <Core/Thread/Interruptible.h>
 
+//TODO remove once method is extracted below
+#include <Dataflow/Network/Connection.h>
+
 using namespace SCIRun::Dataflow::Networks;
 using namespace SCIRun::Engine::State;
 using namespace SCIRun::Core::Logging;
@@ -292,7 +295,7 @@ bool Module::do_execute() throw()
   {
     error(std::string("MODULE ERROR: std::exception caught: ") + e.what());
   }
-  catch (const boost::thread_interrupted& e)
+  catch (const boost::thread_interrupted&)
   {
     error("MODULE ERROR: execution thread interrupted by user.");
     threadStopValue = true;
@@ -337,6 +340,7 @@ void Module::set_state(ModuleStateHandle state)
 {
   state_ = state;
   initStateObserver(state_.get());
+  postStateChangeInternalSignalHookup();
 }
 
 AlgorithmBase& Module::algo()
@@ -509,7 +513,9 @@ Module::Builder& Module::Builder::using_func(ModuleMaker create)
 Module::Builder& Module::Builder::setStateDefaults()
 {
   if (module_)
+  {
     module_->setStateDefaults();
+  }
   return *this;
 }
 
@@ -912,3 +918,17 @@ bool Module::isStoppable() const
 {
   return dynamic_cast<const Core::Thread::Interruptible*>(this) != nullptr;
 }
+
+void Module::sendFeedbackUpstreamAlongIncomingConnections(const Variable::Value& info)
+{
+  for (auto& inputPort : inputPorts())
+  {
+    if (inputPort->nconnections() > 0)
+    {
+      auto connection = inputPort->connection(0); // only one incoming connection for input ports
+      VariableHandle feedback(new Variable(Name(inputPort->id().toString()), info));
+      //TODO: extract port method
+      connection->oport_->sendConnectionFeedback(feedback);
+    }
+  }
+}

src/Dataflow/Network/Module.h

@@ -259,6 +259,10 @@ namespace Networks {
     size_t add_output_port(OutputPortHandle);
     virtual void removeInputPort(const PortId& id);
 
+    //For modules that need to initialize some internal state signal/slots, this needs to be called after set_state to reinitialize.
+    virtual void postStateChangeInternalSignalHookup() {}
+    void sendFeedbackUpstreamAlongIncomingConnections(const Core::Algorithms::Variable::Value& info);
+
   private:
     template <class T>
     boost::shared_ptr<T> getRequiredInputAtIndex(const PortId& id);

src/Dataflow/Network/Port.cc

@@ -84,12 +84,12 @@ size_t Port::nconnections() const
   return connections_.size();
 }
 
-ModuleId Port::getUnderlyingModuleId() const 
+ModuleId Port::getUnderlyingModuleId() const
 {
   return module_->get_id();
 }
 
-size_t Port::getIndex() const 
+size_t Port::getIndex() const
 {
   return index_;
 }
@@ -148,9 +148,9 @@ bool InputPort::hasChanged() const
 
 boost::signals2::connection InputPort::connectDataOnPortHasChanged(const DataOnPortHasChangedSignalType::slot_type& subscriber)
 {
-  return sink()->connectDataHasChanged([this, subscriber] (DatatypeHandle data) 
-  { 
-    subscriber(this->id(), data); 
+  return sink()->connectDataHasChanged([this, subscriber] (DatatypeHandle data)
+  {
+    subscriber(this->id(), data);
   });
 }
 
@@ -200,3 +200,13 @@ PortDataDescriber OutputPort::getPortDataDescriber() const
 {
   return [this]() { return source_->describeData(); };
 }
+
+boost::signals2::connection OutputPort::connectConnectionFeedbackListener(const ConnectionFeedbackSignalType::slot_type& subscriber)
+{
+  return cxnFeedback_.connect(subscriber);
+}
+
+void OutputPort::sendConnectionFeedback(SCIRun::Core::Algorithms::VariableHandle info)
+{
+  cxnFeedback_(info);
+}

src/Dataflow/Network/Port.h

@@ -30,7 +30,7 @@
 
 
 #ifndef DATAFLOW_NETWORK_PORT_H
-#define DATAFLOW_NETWORK_PORT_H 
+#define DATAFLOW_NETWORK_PORT_H
 
 #include <string>
 #include <vector>
@@ -43,7 +43,7 @@
 namespace SCIRun {
 namespace Dataflow {
 namespace Networks {
-  
+
 class SCISHARE Port : virtual public PortInterface, boost::noncopyable
 {
 public:
@@ -125,8 +125,11 @@ class SCISHARE OutputPort : public Port, public OutputPortInterface
   virtual bool hasData() const override;
   virtual void attach(Connection* conn) override;
   virtual PortDataDescriber getPortDataDescriber() const override;
+  virtual boost::signals2::connection connectConnectionFeedbackListener(const ConnectionFeedbackSignalType::slot_type& subscriber) override;
+  virtual void sendConnectionFeedback(SCIRun::Core::Algorithms::VariableHandle info) override;
 private:
   DatatypeSourceInterfaceHandle source_;
+  ConnectionFeedbackSignalType cxnFeedback_;
 };
 
 #ifdef WIN32

src/Dataflow/Network/PortInterface.h

@@ -32,13 +32,14 @@
 
 
 #ifndef DATAFLOW_NETWORK_PORT_INTERFACE_H
-#define DATAFLOW_NETWORK_PORT_INTERFACE_H 
+#define DATAFLOW_NETWORK_PORT_INTERFACE_H
 
 #include <string>
 #include <vector>
 #include <boost/signals2/signal.hpp>
 #include <Dataflow/Network/NetworkFwd.h>
 #include <Core/Datatypes/Datatype.h>
+#include <Core/Algorithms/Base/Variable.h>
 #include <Dataflow/Network/share.h>
 
 namespace SCIRun {
@@ -69,7 +70,7 @@ namespace Networks {
     virtual void setIndex(size_t index) = 0;
     virtual void setId(const PortId& id) = 0;
   };
-  
+
   typedef boost::signals2::signal<void(const PortId&, SCIRun::Core::Datatypes::DatatypeHandle)> DataOnPortHasChangedSignalType;
   typedef boost::function<std::string()> PortDataDescriber;
 
@@ -83,7 +84,9 @@ namespace Networks {
     virtual bool hasChanged() const = 0;
     virtual boost::signals2::connection connectDataOnPortHasChanged(const DataOnPortHasChangedSignalType::slot_type& subscriber) = 0;
   };
-  
+
+  typedef boost::signals2::signal<void(SCIRun::Core::Algorithms::VariableHandle)> ConnectionFeedbackSignalType;
+
   class SCISHARE OutputPortInterface : virtual public PortInterface
   {
   public:
@@ -92,6 +95,8 @@ namespace Networks {
     virtual bool hasData() const = 0;
     virtual OutputPortInterface* clone() const { return 0; } // TODO
     virtual PortDataDescriber getPortDataDescriber() const = 0;
+    virtual boost::signals2::connection connectConnectionFeedbackListener(const ConnectionFeedbackSignalType::slot_type& subscriber) = 0;
+    virtual void sendConnectionFeedback(SCIRun::Core::Algorithms::VariableHandle info) = 0;
   };
 
   class SCISHARE PortConnectionDeterminer

src/Dataflow/Network/Tests/MockPorts.h

@@ -54,7 +54,7 @@ namespace SCIRun {
 
         typedef boost::shared_ptr<MockPortDescription> MockPortDescriptionPtr;
 
-        class MockInputPort : public InputPortInterface  
+        class MockInputPort : public InputPortInterface
         {
         public:
           MOCK_METHOD1(attach, void(Connection*));
@@ -79,7 +79,7 @@ namespace SCIRun {
 
         typedef boost::shared_ptr<MockInputPort> MockInputPortPtr;
 
-        class MockOutputPort : public OutputPortInterface  
+        class MockOutputPort : public OutputPortInterface
         {
         public:
           MOCK_METHOD1(attach, void(Connection*));
@@ -98,16 +98,16 @@ namespace SCIRun {
           MOCK_METHOD1(setIndex, void(size_t));
           MOCK_CONST_METHOD0(hasData, bool());
           MOCK_CONST_METHOD0(getPortDataDescriber, PortDataDescriber());
+          MOCK_METHOD1(connectConnectionFeedbackListener, boost::signals2::connection(const ConnectionFeedbackSignalType::slot_type&));
+          MOCK_METHOD1(sendConnectionFeedback, void(SCIRun::Core::Algorithms::VariableHandle));
         };
 
         typedef boost::shared_ptr<MockOutputPort> MockOutputPortPtr;
 
         class MockDatatypeSink : public DatatypeSinkInterface
         {
         public:
-          //MOCK_CONST_METHOD0(hasData, bool());
           MOCK_CONST_METHOD0(clone, DatatypeSinkInterface*());
-          //MOCK_METHOD1(setHasData, void(bool));
           MOCK_METHOD0(waitForData, void());
           MOCK_METHOD0(invalidateProvider, void());
           MOCK_METHOD0(receive, Core::Datatypes::DatatypeHandleOption());