Merge branch 'master' of https://github.com/SCIInstitute/SCIRun into dipole_movement

Author: tpat

src/Core/Algorithms/Visualization/RenderFieldState.h

@@ -114,6 +114,7 @@ class SCISHARE RenderState
     POINT_GLYPH,
     SPHERE_GLYPH,
     ELLIPSOID_GLYPH,
+    SUPERELLIPSOID_GLYPH,
     BOX_GLYPH,
     AXIS_GLYPH,
     LINE_GLYPH,

src/Core/GeometryPrimitives/Transform.cc

@@ -839,6 +839,16 @@ Transform::operator=(const Transform& copy)
   return *this;
 }
 
+std::vector<Vector> Transform::get_column_vectors()
+{
+  std::vector<Vector> column_vectors(3);
+  for(int i = 0; i < 3; i++)
+  {
+    column_vectors[i] = Vector(mat[0][i], mat[1][i], mat[2][i]);
+  }
+  return column_vectors;
+}
+
 Point
 SCIRun::Core::Geometry::operator*(const Transform &t, const Point &d)
 {

src/Core/GeometryPrimitives/Transform.h

@@ -147,12 +147,13 @@ namespace SCIRun {
         /// Persistent I/O.
         static PersistentTypeID type_id;
         virtual void io(Piostream &stream);
+        std::vector<Vector> get_column_vectors();
       };
 
       SCISHARE Point operator*(const Transform &t, const Point &d);
       SCISHARE Vector operator*(const Transform &t, const Vector &d);
 
-      SCISHARE Tensor operator*(const Transform &t, const Tensor &d);
+     SCISHARE Tensor operator*(const Transform &t, const Tensor &d);
       SCISHARE Tensor operator*(const Tensor &d, const Transform &t);
 
       SCISHARE bool operator==(const Transform& lhs, const Transform& rhs);