Merge branch 'master' into gui_B

Author: dcwhite

src/Core/GeometryPrimitives/Transform.cc

@@ -76,6 +76,12 @@ Transform::Transform(const Point& p, const Vector& i,
   load_basis(p, i, j, k);
 }
 
+const Transform& Transform::Identity()
+{
+  static Transform id;
+  return id;
+}
+
 void
 Transform::load_basis(const Point &p,
                       const Vector &x,

src/Core/GeometryPrimitives/Transform.h

@@ -72,6 +72,8 @@ namespace SCIRun {
         double get_imat_val(int i, int j) const { return imat[i][j]; }
         void set_imat_val(int i, int j, double val) { imat[i][j] = val; }
 
+        static const Transform& Identity();
+
         Transform();
         Transform(const Transform&);
         Transform& operator=(const Transform&);

src/Core/Utils/Tests/TypeIDTableTests.cc

@@ -28,12 +28,14 @@
 
 #include <gtest/gtest.h>
 #include <boost/thread.hpp>
+#include <boost/lexical_cast.hpp>
+#include <boost/format.hpp>
 
 #include <Core/Utils/TypeIDTable.h>
 
 using namespace SCIRun::Core::Utility;
 
-struct Dummy 
+struct Dummy
 {
   int x;
 };
@@ -51,7 +53,7 @@ bool operator!=(const Dummy& x1, const Dummy& x2)
 TEST(TypeIDTableTests, CanConstructEmpty)
 {
   TypeIDTable<Dummy> table;
-  
+
   auto ctor = table.findConstructorInfo("LatVolMesh");
 
   EXPECT_FALSE(ctor);
@@ -133,3 +135,15 @@ TEST(TypeIDTableTests, MultithreadedAccessIsSafe)
 
   EXPECT_EQ(1, trueCount);
 }
+
+TEST(StringFormatting, NewWayMatchesOldWay)
+{
+  double x = 3.14159265;
+  char s[32];
+  sprintf(s, "%8.4f", x);
+  auto expected = boost::lexical_cast<std::string>(s);
+
+  auto actual = str(boost::format("%8.4f") % x);
+
+  EXPECT_EQ(expected, actual);
+}

src/Dataflow/Network/Module.cc

@@ -963,7 +963,6 @@ void Module::sendFeedbackUpstreamAlongIncomingConnections(const ModuleFeedback&
     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/ModuleStateInterface.cc

@@ -60,7 +60,7 @@ void StateChangeObserver::initStateObserver(ModuleStateInterface* state)
   if (state)
   {
     //LOG_DEBUG("StateChangeObserver::initStateObserver(), connecting to state" << std::endl);
-    conn_ = state->connect_state_changed(boost::bind(&StateChangeObserver::stateChanged, this));
+    conn_ = state->connectStateChanged(boost::bind(&StateChangeObserver::stateChanged, this));
   }
 }
 

src/Dataflow/Network/ModuleStateInterface.h

@@ -77,7 +77,8 @@ namespace Networks {
 
     typedef boost::signals2::signal<void()> state_changed_sig_t;
 
-    virtual boost::signals2::connection connect_state_changed(state_changed_sig_t::slot_function_type subscriber) = 0;
+    virtual boost::signals2::connection connectStateChanged(state_changed_sig_t::slot_function_type subscriber) = 0;
+    virtual boost::signals2::connection connectSpecificStateChanged(const Name& stateKeyToObserve, state_changed_sig_t::slot_function_type subscriber) = 0;
   };
 
   class SCISHARE ModuleStateInterfaceFactory

src/Dataflow/Network/NullModuleState.cc

@@ -57,9 +57,14 @@ ModuleStateHandle NullModuleState::clone() const
   return boost::make_shared<NullModuleState>();
 }
 
-boost::signals2::connection NullModuleState::connect_state_changed(state_changed_sig_t::slot_function_type subscriber)
+boost::signals2::connection NullModuleState::connectStateChanged(state_changed_sig_t::slot_function_type)
 {
-  return boost::signals2::connection();
+  return {};
+}
+
+boost::signals2::connection NullModuleState::connectSpecificStateChanged(const Name&, state_changed_sig_t::slot_function_type)
+{
+  return {};
 }
 
 NullModuleState::TransientValueOption NullModuleState::getTransientValue(const Name& name) const

src/Dataflow/Network/NullModuleState.h

@@ -41,15 +41,16 @@ namespace State {
   class SCISHARE NullModuleState : public SCIRun::Dataflow::Networks::ModuleStateInterface
   {
   public:
-    virtual void setValue(const Name&, const SCIRun::Core::Algorithms::AlgorithmParameter::Value&);
-    virtual const Value getValue(const Name&) const;
-    virtual Keys getKeys() const;
-    virtual bool containsKey(const Name&) const;
-    virtual SCIRun::Dataflow::Networks::ModuleStateHandle clone() const;
-    virtual TransientValueOption getTransientValue(const Name& name) const;
-    virtual void setTransientValue(const Name& name, const TransientValue& value, bool b);
-    virtual boost::signals2::connection connect_state_changed(state_changed_sig_t::slot_function_type subscriber);
-    virtual void fireTransientStateChangeSignal() {}
+    virtual void setValue(const Name&, const SCIRun::Core::Algorithms::AlgorithmParameter::Value&) override;
+    virtual const Value getValue(const Name&) const override;
+    virtual Keys getKeys() const override;
+    virtual bool containsKey(const Name&) const override;
+    virtual SCIRun::Dataflow::Networks::ModuleStateHandle clone() const override;
+    virtual TransientValueOption getTransientValue(const Name& name) const override;
+    virtual void setTransientValue(const Name& name, const TransientValue& value, bool b) override;
+    virtual boost::signals2::connection connectStateChanged(state_changed_sig_t::slot_function_type subscriber) override;
+    virtual boost::signals2::connection connectSpecificStateChanged(const Name& stateKeyToObserve, state_changed_sig_t::slot_function_type subscriber) override;
+    virtual void fireTransientStateChangeSignal() override {}
   };
 
 }}}

src/Dataflow/Network/Tests/MockModuleState.h

@@ -47,7 +47,8 @@ namespace SCIRun {
           MOCK_CONST_METHOD0(clone, ModuleStateHandle());
           MOCK_CONST_METHOD1(getTransientValue, TransientValueOption(const Name&));
           MOCK_METHOD3(setTransientValue, void(const Name&, const TransientValue&, bool));
-          MOCK_METHOD1(connect_state_changed, boost::signals2::connection(state_changed_sig_t::slot_function_type));
+          MOCK_METHOD1(connectStateChanged, boost::signals2::connection(state_changed_sig_t::slot_function_type));
+          MOCK_METHOD2(connectSpecificStateChanged, boost::signals2::connection(const Name&, state_changed_sig_t::slot_function_type));
           MOCK_METHOD0(fireTransientStateChangeSignal, void());
         };
 

src/Dataflow/State/SimpleMapModuleState.cc

@@ -104,16 +104,24 @@ void SimpleMapModuleState::setValue(const Name& parameterName, const SCIRun::Cor
   {
     LOG_DEBUG("----signaling from state map: (" << parameterName.name_ << ", " << SCIRun::Core::to_string(value) << "), num_slots = " << stateChangedSignal_.num_slots() << std::endl);
     stateChangedSignal_();
+    auto specSig = specificStateChangeSignalMap_.find(parameterName);
+    if (specSig != specificStateChangeSignalMap_.end())
+      specSig->second();
   }
 }
 
-boost::signals2::connection SimpleMapModuleState::connect_state_changed(state_changed_sig_t::slot_function_type subscriber)
+boost::signals2::connection SimpleMapModuleState::connectStateChanged(state_changed_sig_t::slot_function_type subscriber)
 {
   auto conn = stateChangedSignal_.connect(subscriber);
-  LOG_DEBUG("SimpleMapModuleState::connect_state_changed, num_slots = " << stateChangedSignal_.num_slots() << std::endl);
+  LOG_DEBUG("SimpleMapModuleState::connectStateChanged, num_slots = " << stateChangedSignal_.num_slots() << std::endl);
   return conn;
 }
 
+boost::signals2::connection SimpleMapModuleState::connectSpecificStateChanged(const Name& stateKeyToObserve, state_changed_sig_t::slot_function_type subscriber)
+{
+  return specificStateChangeSignalMap_[stateKeyToObserve].connect(subscriber);
+}
+
 ModuleStateInterface::Keys SimpleMapModuleState::getKeys() const
 {
   Keys keys;
@@ -145,7 +153,12 @@ void SimpleMapModuleState::setTransientValue(const Name& name, const TransientVa
   //print();
 
   if (fireSignal)
+  {
     fireTransientStateChangeSignal();
+    auto specSig = specificStateChangeSignalMap_.find(name);
+    if (specSig != specificStateChangeSignalMap_.end())
+      specSig->second();
+  }
 }
 
 void SimpleMapModuleState::fireTransientStateChangeSignal()