Error when no vectors given. Warning when zero vector and default to small

vector. Composite renamed to CompositeGeometryObject.

Author: tpat

src/Graphics/Datatypes/GeometryImpl.cc

@@ -39,11 +39,11 @@ isClippable_(isClippable)
 
 }
 
-Composite::~Composite()
+CompositeGeometryObject::~CompositeGeometryObject()
 {
 }
 
-void Composite::addToList(GeometryBaseHandle handle, GeomList& list)
+void CompositeGeometryObject::addToList(GeometryBaseHandle handle, GeomList& list)
 {
   if (handle.get() == this)
   {

src/Graphics/Datatypes/GeometryImpl.h

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

src/Modules/Legacy/Visualization/ShowAndEditDipoles.cc

@@ -102,6 +102,7 @@ ShowAndEditDipoles::ShowAndEditDipoles()
   widgetIter_ = 0;
   resolution_ = 20;
   previousScaleFactor_ = 0.0;
+  zeroVectorRescale_ = 1.0e-3;
 }
 
 void ShowAndEditDipoles::setStateDefaults()
@@ -135,6 +136,11 @@ void ShowAndEditDipoles::execute()
     error("Input field was not a valid point cloud.");
     return;
   }
+  else if(!fi.is_vector())
+  {
+    error("Input field does not contain vectors.");
+    return;
+  }
 
   loadData();
 
@@ -205,7 +211,26 @@ void ShowAndEditDipoles::loadData()
     }
   }
 
-  if(state->getValue(Sizing).toInt() == SizingType::NORMALIZE_VECTOR_DATA)
+  bool zeroVector = false;
+  for(int i = 0; i < scale_.size(); i++)
+  {
+    if(scale_[i] == 0.0)
+    {
+      scale_[i] = zeroVectorRescale_;
+      direction_[i] = Vector(1, 1, 1).normal();
+      zeroVector = true;
+      std::cout << "zero vec resc " << zeroVectorRescale_ << std::endl;
+    }
+  }
+
+  if(zeroVector)
+  {
+    warning("Input data contains zero vectors.");
+      return;
+  }
+
+  if((previousSizing_ != state->getValue(Sizing).toInt() || state->getValue(Reset).toBool())
+     && state->getValue(Sizing).toInt() == SizingType::NORMALIZE_VECTOR_DATA)
   {
     scale_.clear();
     for(int i = 0; i < pos_.size(); i++)
@@ -215,6 +240,8 @@ void ShowAndEditDipoles::loadData()
   }
 }
 
+
+
 void ShowAndEditDipoles::loadFromParameters()
 {
   auto state = get_state();
@@ -660,7 +687,7 @@ GeometryHandle ShowAndEditDipoles::addLines()
   // Create lines between every point
   for(int a = 0; a < pos_.size(); a++)
   {
-    for(int b = 0; b < pos_.size(); b++)
+    for(int b = a + 1; b < pos_.size(); b++)
     {
       glyphs.addLine(pos_[a], pos_[b], lineCol_, lineCol_);
     }

src/Modules/Legacy/Visualization/ShowAndEditDipoles.h

@@ -96,6 +96,7 @@ namespace SCIRun {
         int widgetIter_;
         double resolution_;
         double previousScaleFactor_;
+        double zeroVectorRescale_;
 
         Core::Datatypes::ColorRGB deflPointCol_;
         Core::Datatypes::ColorRGB deflCol_;