Merge branch 'master' into update_cleaver_UI

Author: allywarner

src/Core/Algorithms/Visualization/RenderFieldState.h

@@ -102,6 +102,13 @@ class SCISHARE RenderState
     MAX_ACTION_FLAGS
   };
 
+  enum InputPort
+  {
+   PRIMARY_PORT,
+   SECONDARY_PORT,
+   TERTIARY_PORT
+  };
+
   enum GlyphType
   {
     POINT_GLYPH,
@@ -135,6 +142,12 @@ class SCISHARE RenderState
   bool mFlags[MAX_ACTION_FLAGS];
   TransparencySortType mSortType = CONTINUOUS_SORT;
   GlyphType mGlyphType = POINT_GLYPH;
+//InputPort mTransparencyInput = PRIMARY_PORT;
+  InputPort mColorInput = PRIMARY_PORT;
+  InputPort mSecondaryVectorParameterInput = PRIMARY_PORT;
+  InputPort mSpringsMajorRadiusInput = PRIMARY_PORT;
+  InputPort mSpringsMinorRadiusInput = PRIMARY_PORT;
+  InputPort mSpringsPitchInput = PRIMARY_PORT;
 
   Core::Datatypes::ColorRGB defaultColor;
 };

src/Core/GeometryPrimitives/Tensor.cc

@@ -254,6 +254,17 @@ double Tensor::norm() const
   return (a);
 }
 
+double Tensor::magnitude()
+{
+  double eigenval1, eigenval2, eigenval3;
+  get_eigenvalues(eigenval1, eigenval2, eigenval3);
+
+  double magnitude = sqrt(eigenval1 * eigenval1 +
+                          eigenval2 * eigenval2 +
+                          eigenval3 * eigenval3);
+  return magnitude;
+}
+
 std::string Tensor::type_name(int) {
   static const std::string str("Tensor");
   return str;

src/Core/GeometryPrimitives/Tensor.h

@@ -97,6 +97,7 @@ class SCISHARE Tensor {
   void get_eigenvalues(double &l1, double &l2, double &l3);
 
   double norm() const;
+  double magnitude();
 
   void set_eigens(const Vector &e1, const Vector &e2, const Vector &e3);