Merge pull request #1967 from Haydelj/showFieldTests

Closes #1965

Author: dcwhite

src/Modules/Visualization/ShowField.cc

@@ -347,9 +347,9 @@ GeometryHandle GeometryBuilder::buildGeometryObject(
   const GeometryIDGenerator& gid, Interruptible* interruptible)
 {
   // Function for reporting progress. TODO: use this variable somewhere!
-  //auto progressFunc = getUpdaterFunc();
+  // auto progressFunc = getUpdaterFunc();
 
-  /// \todo Determine a better way of handling all of the various object state_.
+  // todo Determine a better way of handling all of the various object state_.
   bool showNodes = state_->getValue(ShowField::ShowNodes).toBool();
   bool showEdges = state_->getValue(ShowField::ShowEdges).toBool();
   bool showFaces = state_->getValue(ShowField::ShowFaces).toBool();
@@ -363,24 +363,23 @@ GeometryHandle GeometryBuilder::buildGeometryObject(
 
   auto geom(boost::make_shared<GeometryObjectSpire>(gid, idname, true));
 
-  /// \todo Implement inputs_changes_ ? See old scirun ShowField.cc:293.
+  // todo Implement inputs_changes_ ? See old scirun ShowField.cc:293.
 
-  /// \todo Mind material properties (simple since we already have implemented
-  ///       most of this).
+  // todo Mind material properties (simple since we already have implemented
+  //      most of this).
 
-  /// \todo Handle assignment of color map. The color map will need to be
-  ///       available to us as we are building the meshes. Due to the way
-  ///       SCIRun expects meshes to be built.
+  // todo Handle assignment of color map. The color map will need to be
+  //      available to us as we are building the meshes. Due to the way
+  //      SCIRun expects meshes to be built.
 
-  /// \todo render_state_ DIRTY flag? See old scirun ShowField.cc:446.
+  // todo render_state_ DIRTY flag? See old scirun ShowField.cc:446.
 
   const int dim = field->vmesh()->dimensionality();
   if (showEdges && dim < 1) { showEdges = false; }
   if (showFaces && dim < 2) { showFaces = false; }
 
   if (showNodes)
   {
-    // Construct node geometry.
     renderNodes(field, colorMap, interruptible, getNodeRenderState(colorMap), geom, geom->uniqueID());
   }
 

src/Modules/Visualization/ShowField.h

@@ -120,9 +120,7 @@ namespace SCIRun {
 
         boost::shared_ptr<detail::GeometryBuilder> builder_;
       };
-
-
-
+      
     } // Visualization
   } // Modules
 } // SCIRun

src/Modules/Visualization/Tests/CMakeLists.txt

@@ -31,6 +31,7 @@ SET(Modules_Visualization_Tests_SRCS
   MatrixAsVectorFieldTests.cc
   RescaleColorMapTests.cc
   ShowColorMapTests.cc
+  ShowFieldFunctionalTests.cc
   ShowFieldTests.cc
   ShowMeshTests.cc
   ShowStringTests.cc