Added Geometry Composite class which lets you send multiple geometry handles through one port(similar to composite widget). Dipole module can now use input data which only fetches upstream when new data received, can show lines, and disable last vector.

Author: tpat

src/Graphics/Datatypes/GeometryImpl.cc

@@ -29,6 +29,7 @@
 #include <Graphics/Datatypes/GeometryImpl.h>
 
 using namespace SCIRun::Core;
+using namespace SCIRun::Core::Datatypes;
 using namespace SCIRun::Graphics::Datatypes;
 
 GeometryObjectSpire::GeometryObjectSpire(const GeometryIDGenerator& idGenerator, const std::string& tag, bool isClippable) :
@@ -37,3 +38,15 @@ isClippable_(isClippable)
 {
 
 }
+
+Composite::~Composite()
+{
+}
+
+void Composite::addToList(GeometryBaseHandle handle, GeomList& list)
+{
+  if (handle.get() == this)
+  {
+    list.insert(geoms_.begin(), geoms_.end());
+  }
+}

src/Graphics/Datatypes/GeometryImpl.h

@@ -287,7 +287,24 @@ namespace SCIRun {
 
       typedef boost::shared_ptr<GeometryObjectSpire> GeometryHandle;
 
+      class SCISHARE Composite : public GeometryObjectSpire
+      {
+      public:
+        template <typename GeomIter>
+          Composite(const Core::GeometryIDGenerator& idGenerator, const std::string& tag, GeomIter begin, GeomIter end)
+          : GeometryObjectSpire(idGenerator, tag, true), geoms_(begin, end)
+        {}
+        ~Composite();
+        void addToList(Core::Datatypes::GeometryBaseHandle handle, Core::Datatypes::GeomList& list) override;
+      private:
+        std::vector<GeometryHandle> geoms_;
+      };
 
+      template <typename GeomIter>
+        static GeometryHandle createGeomComposite(const Core::GeometryIDGenerator& idGenerator, const std::string& tag, GeomIter begin, GeomIter end)
+      {
+        return boost::make_shared<Composite>(idGenerator, tag, begin, end);
+      }
     }
   }
 }

src/Graphics/Widgets/SphereWidget.cc

@@ -43,7 +43,6 @@ SphereWidget::SphereWidget(const Core::GeometryIDGenerator& idGenerator,
   const Point& point, const BBox& bbox)
   : WidgetBase(idGenerator, "SphereWidget::" + name, true, point)
 {
-  //std::cout << "SphereWidget() point: " << point.get_string() << std::endl;
   int resolution = 10;
   if (radius < 0) radius = 1.;
   if (resolution < 0) resolution = 10.;

src/Graphics/Widgets/Widget.cc

@@ -112,10 +112,6 @@ WidgetHandle WidgetFactory::createDisk(const Core::GeometryIDGenerator& idGenera
   return boost::make_shared<DiskWidget>(idGenerator, name, scale, defaultColor, p1, p2, bbox);
 }
 
-CompositeWidget::~CompositeWidget()
-{
-}
-
 void CompositeWidget::addToList(GeometryBaseHandle handle, GeomList& list)
 {
   if (handle.get() == this)
@@ -124,15 +120,6 @@ void CompositeWidget::addToList(GeometryBaseHandle handle, GeomList& list)
   }
 }
 
-
-LinkedCompositeWidget::~LinkedCompositeWidget()
-{
-}
-
-void LinkedCompositeWidget::addToList(GeometryBaseHandle handle, GeomList& list)
+CompositeWidget::~CompositeWidget()
 {
-  if (handle.get() == this)
-  {
-    list.insert(widgets_.begin(), widgets_.end());
-  }
 }

src/Graphics/Widgets/Widget.h

@@ -78,19 +78,6 @@ namespace SCIRun
         std::vector<WidgetHandle> widgets_;
       };
 
-      class SCISHARE LinkedCompositeWidget : public WidgetBase
-      {
-      public:
-        template <typename WidgetIter>
-          LinkedCompositeWidget(const Core::GeometryIDGenerator& idGenerator, const std::string& tag, WidgetIter begin, WidgetIter end)
-          : WidgetBase(idGenerator, tag, true), widgets_(begin, end)
-        {}
-        ~LinkedCompositeWidget();
-        void addToList(Core::Datatypes::GeometryBaseHandle handle, Core::Datatypes::GeomList& list) override;
-      private:
-        std::vector<WidgetHandle> widgets_;
-      };
-
       class SCISHARE WidgetFactory
       {
       public:
@@ -122,17 +109,12 @@ namespace SCIRun
                                      const Core::Geometry::Point& p1,
                                      const Core::Geometry::Point& p2,
                                      const Core::Geometry::BBox& bbox);
-       template <typename WidgetIter>
+
+      template <typename WidgetIter>
         static WidgetHandle createComposite(const Core::GeometryIDGenerator& idGenerator, const std::string& tag, WidgetIter begin, WidgetIter end)
         {
           return boost::make_shared<CompositeWidget>(idGenerator, tag, begin, end);
         }
-
-       template <typename WidgetIter>
-       static WidgetHandle createLinkedComposite(const Core::GeometryIDGenerator& idGenerator, const std::string& tag, WidgetIter begin, WidgetIter end)
-       {
-         return boost::make_shared<LinkedCompositeWidget>(idGenerator, tag, begin, end);
-       }
       };
     }
   }