Refactoring for #1387

Author: dcwhite

src/Core/Datatypes/Color.h

@@ -33,6 +33,8 @@
 
 #include <iosfwd>
 #include <Core/Datatypes/Datatype.h>
+#include <Core/Datatypes/Geometry.h>
+#include <Core/Algorithms/Base/Variable.h>
 #include <Core/Datatypes/share.h>
 
 namespace SCIRun {
@@ -49,24 +51,24 @@ namespace Datatypes {
     ColorRGB(double r, double g, double b);
     ColorRGB(double r, double g, double b, double a);
     //adjust alpha while copying
-    ColorRGB(const ColorRGB& color, double a);
+    //ColorRGB(const ColorRGB& color, double a);
 
     // These equality operations should use floating point comparisons.
-    inline bool operator==(const ColorRGB& c) const {
+    bool operator==(const ColorRGB& c) const {
       return ((r_==c.r_)&&(g_==c.g_)&&(b_==c.b_)&&(a_==c.a_));
     }
 
-    inline bool operator!=(const ColorRGB& c) const {
+    bool operator!=(const ColorRGB& c) const {
       return !(*this == c);
     }
 
     /// \todo Add normalization function to normalize 0 - 255 to 0 - 1.0.
     ///       useful when reading colors from strings.
 
-    inline double r() const {return r_;}
-    inline double g() const {return g_;}
-    inline double b() const {return b_;}
-    inline double a() const {return a_;}
+    double r() const {return r_;}
+    double g() const {return g_;}
+    double b() const {return b_;}
+    double a() const {return a_;}
 
     std::string toString() const;
   };
@@ -75,6 +77,11 @@ namespace Datatypes {
 
   SCISHARE std::ostream& operator<<(std::ostream& out, const ColorRGB& color);
 
+  struct SCISHARE ViewSceneFeedback : ModuleFeedback
+  {
+    Algorithms::Variable info;
+  };
+
 }}}
 
 

src/Core/Datatypes/Geometry.cc

@@ -36,11 +36,6 @@ GeometryObject::GeometryObject(const GeometryIDGenerator& idGenerator, const std
 {
 }
 
-GeometryObject::GeometryObject(const std::string& tag) :
-objectName_(tag)
-{
-}
-
 GeometryObject* GeometryObject::clone() const
 {
   return nullptr; //TODO

src/Core/Datatypes/Geometry.h

@@ -43,7 +43,6 @@ namespace Datatypes
   {
   public:
     GeometryObject(const GeometryIDGenerator& idGenerator, const std::string& tag);
-    GeometryObject(const std::string& tag);
 
     GeometryObject(const GeometryObject& other) = delete;
     GeometryObject& operator=(const GeometryObject& other) = delete;
@@ -58,6 +57,11 @@ namespace Datatypes
     const std::string objectName_;     ///< Name of this object. Should be unique across all modules in the network.
   };
 
+  struct SCISHARE ModuleFeedback
+  {
+    // tag class
+  };
+
 }}}
 
 

src/Core/GeometryPrimitives/BBox.cc

@@ -111,8 +111,7 @@ BBox::overlaps_inside(const BBox & bb) const
 }
 
 bool 
-BBox::intersect(const Point& origin, const Vector& dir,
-                Point& hitPoint)
+BBox::intersect(const Point& origin, const Vector& dir, Point& hitPoint) const
 {
   Vector t1 = (cmin_ - origin) / dir;
   Vector t2 = (cmax_ - origin) / dir;

src/Core/GeometryPrimitives/BBox.h

@@ -242,7 +242,7 @@ class BBox {
 
     /// returns true if the ray hit the bbox and returns the hit point
     /// in hitNear
-    SCISHARE bool intersect(const Point& e, const Vector& v, Point& hitNear);
+    SCISHARE bool intersect(const Point& e, const Vector& v, Point& hitNear) const;
 
     friend std::ostream& operator<<(std::ostream& out, const BBox& b);
 

src/Dataflow/Network/Module.h

@@ -83,7 +83,7 @@ namespace Networks {
     virtual bool hasInputPort(const PortId& id) const;
     virtual bool hasOutputPort(const PortId& id) const;
     virtual InputPortHandle getInputPort(const PortId& id);
-    virtual OutputPortHandle getOutputPort(const PortId& id) const;
+    virtual OutputPortHandle getOutputPort(const PortId& id) const override final;
     virtual std::vector<InputPortHandle> findInputPortsWithName(const std::string& name) const;
     virtual std::vector<OutputPortHandle> findOutputPortsWithName(const std::string& name) const;
     virtual std::vector<InputPortHandle> inputPorts() const;
@@ -264,7 +264,7 @@ namespace Networks {
 
     //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 ModuleFeedback& feedback) const;
+    void sendFeedbackUpstreamAlongIncomingConnections(const Core::Datatypes::ModuleFeedback& feedback) const;
 
   private:
     template <class T>

src/Dataflow/Network/NetworkFwd.h

@@ -100,7 +100,6 @@ typedef boost::shared_ptr<NetworkFile> NetworkFileHandle;
 typedef std::map<std::string, std::map<std::string, std::map<std::string, ModuleDescription>>> ModuleDescriptionMap;
 typedef boost::function<bool(SCIRun::Dataflow::Networks::ModuleHandle)> ModuleFilter;
 typedef boost::function<bool(const SCIRun::Dataflow::Networks::ConnectionDescription&)> ConnectionFilter;
-typedef boost::any ModuleFeedback;
 
 }}}
 

src/Dataflow/Network/Port.cc

@@ -205,7 +205,7 @@ boost::signals2::connection OutputPort::connectConnectionFeedbackListener(const
   return cxnFeedback_.connect(subscriber);
 }
 
-void OutputPort::sendConnectionFeedback(ModuleFeedback info)
+void OutputPort::sendConnectionFeedback(const ModuleFeedback& info)
 {
   cxnFeedback_(info);
 }

src/Dataflow/Network/Port.h

@@ -127,7 +127,7 @@ class SCISHARE OutputPort : public Port, public OutputPortInterface
   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(ModuleFeedback info) override;
+  virtual void sendConnectionFeedback(const Core::Datatypes::ModuleFeedback& info) override;
 private:
   DatatypeSourceInterfaceHandle source_;
   ConnectionFeedbackSignalType cxnFeedback_;

src/Dataflow/Network/PortInterface.h

@@ -35,11 +35,9 @@
 #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 <Core/Datatypes/Geometry.h> //TODO
 #include <Dataflow/Network/share.h>
 
 namespace SCIRun {
@@ -73,7 +71,7 @@ namespace Networks {
     virtual void setId(const PortId& id) = 0;
   };
 
-  typedef boost::signals2::signal<void(const PortId&, SCIRun::Core::Datatypes::DatatypeHandle)> DataOnPortHasChangedSignalType;
+  typedef boost::signals2::signal<void(const PortId&, Core::Datatypes::DatatypeHandle)> DataOnPortHasChangedSignalType;
   typedef boost::function<std::string()> PortDataDescriber;
 
   class SCISHARE InputPortInterface : virtual public PortInterface
@@ -87,7 +85,7 @@ namespace Networks {
     virtual boost::signals2::connection connectDataOnPortHasChanged(const DataOnPortHasChangedSignalType::slot_type& subscriber) = 0;
   };
 
-  typedef boost::signals2::signal<void(ModuleFeedback)> ConnectionFeedbackSignalType;
+  typedef boost::signals2::signal<void(const Core::Datatypes::ModuleFeedback&)> ConnectionFeedbackSignalType;
 
   class SCISHARE OutputPortInterface : virtual public PortInterface
   {
@@ -99,13 +97,13 @@ namespace Networks {
     virtual OutputPortInterface* clone() const { return nullptr; } // TODO
     virtual PortDataDescriber getPortDataDescriber() const = 0;
     virtual boost::signals2::connection connectConnectionFeedbackListener(const ConnectionFeedbackSignalType::slot_type& subscriber) = 0;
-    virtual void sendConnectionFeedback(ModuleFeedback info) = 0;
+    virtual void sendConnectionFeedback(const Core::Datatypes::ModuleFeedback& info) = 0;
   };
 
   class SCISHARE PortConnectionDeterminer
   {
   public:
-    bool canBeConnected(const SCIRun::Dataflow::Networks::PortDescriptionInterface& port1, const SCIRun::Dataflow::Networks::PortDescriptionInterface& port2) const;
+    bool canBeConnected(const PortDescriptionInterface& port1, const PortDescriptionInterface& port2) const;
   };
 
 }}}