Merge branch 'master' into tensor_tests

Author: dcwhite

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);
 

src/ExampleNets/regression/tensorOrders.srn5

@@ -677,7 +677,9 @@ RESULT = ten;</value>
 									<name>TensorsColoring</name>
 									<value>
 										<which>2</which>
+
 										<value>Colormap Lookup</value>
+
 									</value>
 								</second>
 							</item>
@@ -1426,6 +1428,7 @@ RESULT = ten;</value>
 				</port2_>
 			</item>
 			<item>
+
 				<moduleId1_>GetFieldBoundary:8</moduleId1_>
 				<port1_>
 					<name>BoundaryField</name>
@@ -1435,6 +1438,7 @@ RESULT = ten;</value>
 				<port2_>
 					<name>Field</name>
 					<id>1</id>
+
 				</port2_>
 			</item>
 			<item>
@@ -1443,6 +1447,7 @@ RESULT = ten;</value>
 					<name>BoundaryField</name>
 					<id>0</id>
 				</port1_>
+
 				<moduleId2_>ShowFieldGlyphs:8</moduleId2_>
 				<port2_>
 					<name>PrimaryData</name>
@@ -1453,11 +1458,14 @@ RESULT = ten;</value>
 				<moduleId1_>RescaleColorMap:1</moduleId1_>
 				<port1_>
 					<name>ColorMapOutput</name>
+
 					<id>0</id>
 				</port1_>
 				<moduleId2_>ShowFieldGlyphs:8</moduleId2_>
 				<port2_>
+
 					<name>PrimaryColorMap</name>
+
 					<id>0</id>
 				</port2_>
 			</item>

src/Graphics/Glyphs/GlyphGeom.cc

@@ -202,12 +202,10 @@ void GlyphGeom::buildObject(GeometryObjectSpire& geom, const std::string& unique
   geom.passes().push_back(pass);
 }
 
-void GlyphGeom::addArrow(const Point& p1, const Point& p2, double radius, double resolution,
+void GlyphGeom::addArrow(const Point& p1, const Point& p2, double radius, double ratio, double resolution,
   const ColorRGB& color1, const ColorRGB& color2)
 {
-  double ratio = 0.5;
-
-  Point mid(ratio * (p1.x() + p2.x()), ratio * (p1.y() + p2.y()), ratio * (p1.z() + p2.z()));
+  Point mid((p1.x() * ratio + p2.x() * (1 - ratio)), (p1.y() * ratio + p2.y() * (1 - ratio)), (p1.z() * ratio + p2.z() * (1 - ratio)));
 
   generateCylinder(p1, mid, radius / 6.0, radius / 6.0, resolution, color1, color2);
   generateCylinder(mid, p2, radius, 0.0, resolution, color1, color2);

src/Graphics/Glyphs/GlyphGeom.h

@@ -53,7 +53,7 @@ namespace SCIRun {
         const Datatypes::ColorScheme& colorScheme, RenderState state,
         const Datatypes::SpireIBO::PRIMITIVE& primIn, const Core::Geometry::BBox& bbox);
 
-      void addArrow(const Core::Geometry::Point& p1, const Core::Geometry::Point& p2, double radius, double resolution,
+      void addArrow(const Core::Geometry::Point& p1, const Core::Geometry::Point& p2, double radius, double ratio, double resolution,
         const Core::Datatypes::ColorRGB& color1, const Core::Datatypes::ColorRGB& color2);
       void addSphere(const Core::Geometry::Point& p, double radius, double resolution, const Core::Datatypes::ColorRGB& color);
       void addBox(const Core::Geometry::Point& center, Core::Geometry::Tensor& t, double scale);

src/Interface/Modules/Visualization/CMakeLists.txt

@@ -32,10 +32,6 @@ SET(Interface_Modules_Visualization_FORMS
   GenerateStreamLines.ui
   ShowField.ui
   ShowFieldGlyphs.ui
-  ShowFieldGlyphsScalarTab.ui
-  ShowFieldGlyphsVectorTab.ui
-  ShowFieldGlyphsTensorTab.ui
-  ShowFieldGlyphsSecondaryTab.ui
   ShowString.ui
   ShowColorMap.ui
   RescaleColorMap.ui
@@ -48,9 +44,6 @@ SET(Interface_Modules_Visualization_HEADERS
   share.h
   ShowFieldDialog.h
   ShowFieldGlyphsDialog.h
-  ShowFieldGlyphsScalarTabDialog.h
-  ShowFieldGlyphsVectorTabDialog.h
-  ShowFieldGlyphsTensorTabDialog.h
   ShowStringDialog.h
   ShowColorMapDialog.h
   RescaleColorMapDialog.h
@@ -62,9 +55,6 @@ SET(Interface_Modules_Visualization_SOURCES
   GenerateStreamLinesDialog.cc
   ShowFieldDialog.cc
   ShowFieldGlyphsDialog.cc
-  ShowFieldGlyphsScalarTabDialog.cc
-  ShowFieldGlyphsVectorTabDialog.cc
-  ShowFieldGlyphsTensorTabDialog.cc
   ShowStringDialog.cc
   ShowColorMapDialog.cc
   RescaleColorMapDialog.cc