improved BBox and CreateColorMap

Author: Brig Bagley

src/Interface/Modules/Render/ES/shaders/ColorMapLegend.fs

@@ -24,21 +24,39 @@
    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
    DEALINGS IN THE SOFTWARE.
-*/
+ */
 #ifdef OPENGL_ES
-  #ifdef GL_FRAGMENT_PRECISION_HIGH
-    // Default precision
-    precision highp float;
-  #else
-    precision mediump float;
-  #endif
+#ifdef GL_FRAGMENT_PRECISION_HIGH
+// Default precision
+precision highp float;
+#else
+precision mediump float;
+#endif
 #endif
 
 uniform sampler1D uTX0;
 
 varying float vFieldData;
+uniform float   uCMInvert;
+uniform float   uCMShift;
+uniform float   uCMResolution;
 
 void main()
 {
-  gl_FragColor = texture1D( uTX0, vFieldData );
+   float param = vFieldData;
+   float shift = uCMShift;
+   if (uCMInvert != 0.) {
+      param = 1. - param;
+      shift = shift * -1.;
+   }
+   //apply the resolution
+   int res = int(uCMResolution);
+   param = float(int(param * (float(res)))) / float(res - 1);
+   // the shift is a gamma.
+   float bp = 1. / tan((3.14159265359 / 2.) *  ( 0.5 - shift * 0.5));
+   param = pow(param,bp);
+
+   vec4 color = texture1D( uTX0, param );
+   color.a       = 1.0;
+   gl_FragColor = color;
 }

src/Interface/Modules/Visualization/CreateBasicColorMapDialog.cc

@@ -35,6 +35,7 @@ using namespace SCIRun::Dataflow::Networks;
 using namespace SCIRun::Core::Algorithms;
 using namespace SCIRun::Core::Datatypes;
 
+typedef SCIRun::Modules::Visualization::CreateBasicColorMap CreateBasicColorMapModule;
 
 
 CreateBasicColorMapDialog::CreateBasicColorMapDialog(const std::string& name, ModuleStateHandle state,
@@ -46,7 +47,6 @@ CreateBasicColorMapDialog::CreateBasicColorMapDialog(const std::string& name, Mo
   ColorMap cm("Rainbow");
   previewColorMap_->setStyleSheet(buildGradientString(cm));
 
-  typedef SCIRun::Modules::Visualization::CreateBasicColorMap CreateBasicColorMapModule;
   resolutionSpin_->setValue(256);
   shiftSpin_->setValue(0.0);
   invertCheck_->setChecked(false);
@@ -67,6 +67,17 @@ CreateBasicColorMapDialog::CreateBasicColorMapDialog(const std::string& name, Mo
 void CreateBasicColorMapDialog::pull()
 {
   pull_newVersionToReplaceOld();
+  Pulling p(this);
+  std::string cm_name(state_->getValue(CreateBasicColorMapModule::ColorMapName).toString());
+  double cm_shift(state_->getValue(CreateBasicColorMapModule::ColorMapShift).toDouble());
+  int cm_res(state_->getValue(CreateBasicColorMapModule::ColorMapResolution).toInt());
+  bool cm_inv(state_->getValue(CreateBasicColorMapModule::ColorMapInvert).toBool());
+  colorMapNameComboBox_->setCurrentIndex(colorMapNameComboBox_->findText(QString::fromStdString(cm_name)));
+  shiftSpin_->setValue(cm_shift);
+  shiftSlider_->setValue(static_cast<int>(cm_shift * 100.));
+  resolutionSlider_->setValue(cm_res);
+  resolutionSpin_->setValue(cm_res);
+  invertCheck_->setChecked(cm_inv);
 }
 
 void CreateBasicColorMapDialog::updateColorMapPreview(QString s) {

src/Interface/Modules/Visualization/ShowField.ui

@@ -358,7 +358,7 @@
            </widget>
            <widget class="QGroupBox" name="groupBox_6">
             <property name="enabled">
-             <bool>false</bool>
+             <bool>true</bool>
             </property>
             <property name="geometry">
              <rect>

src/Interface/Modules/Visualization/ShowFieldDialog.cc

@@ -90,12 +90,12 @@ ShowFieldDialog::ShowFieldDialog(const std::string& name, ModuleStateHandle stat
   groupBox_4->setVisible(false); //Node Display Type Group Box
 
   //Edges Tab
-  groupBox_7->setVisible(false);//Edge Display Type Group Box
-  label_9->setVisible(false); //resolution label
-  cylinder_res_spin->setVisible(false); //resolution spinbox
-  label_8->setVisible(false); //scale label
-  cylinder_rad_spin->setVisible(false); //cylinder scale spinbox
-  groupBox_6->setVisible(false); //edge coloring
+  //groupBox_7->setVisible(false);//Edge Display Type Group Box
+  //label_9->setVisible(false); //resolution label
+  //cylinder_res_spin->setVisible(false); //resolution spinbox
+  //label_8->setVisible(false); //scale label
+  //cylinder_rad_spin->setVisible(false); //cylinder scale spinbox
+  //groupBox_6->setVisible(false); //edge coloring
 
   //Faces Tab
   groupBox_5->setVisible(false); //face coloring

src/Modules/Fields/EditMeshBoundingBox.cc

@@ -296,7 +296,7 @@ Core::Datatypes::GeometryHandle EditMeshBoundingBox::buildGeometryObject() {
     auto state = get_state();
     double scale = state->getValue(Scale).toDouble();
     scale = std::max(scale,0.01);
-    int num_strips = int(100. * scale);
+    int num_strips = 50.;
     std::vector<Vector> tri_points;
     std::vector<Vector> tri_normals;
     std::vector<uint32_t> tri_indices;

src/Modules/Visualization/CreateBasicColorMap.cc

@@ -67,6 +67,7 @@ void CreateBasicColorMap::execute()
   }
 }
 
+
 const AlgorithmParameterName CreateBasicColorMap::ColorMapName("ColorMapName");
 const AlgorithmParameterName CreateBasicColorMap::ColorMapInvert("ColorMapInvert");
 const AlgorithmParameterName CreateBasicColorMap::ColorMapShift("ColorMapShift");

src/Modules/Visualization/ShowColorMapModule.cc

@@ -67,10 +67,11 @@ void ShowColorMapModule::execute()
   boost::shared_ptr<SCIRun::Core::Datatypes::ColorMap> colorMap = getRequiredInput(ColorMapObject);
   if (needToExecute())
   {
-    GeometryHandle geom = buildGeometryObject(colorMap, get_state(), get_id());
+    std::ostringstream ostr;
+    ostr << get_id() << "_" << colorMap.get();
+    GeometryHandle geom = buildGeometryObject(colorMap, get_state(), ostr.str());
     sendOutput(GeometryOutput, geom);
   }
-   
 }
 
 SCIRun::Core::Datatypes::GeometryHandle
@@ -86,19 +87,19 @@ ShowColorMapModule::buildGeometryObject(boost::shared_ptr<SCIRun::Core::Datatype
   std::vector<double> colors;
   std::vector<uint32_t> indices;
   int32_t numVBOElements = 0;
-  ColorMap *map = cm.get();
+  ColorMap * map = cm.get();
   double resolution = 1. / static_cast<double>(map->getColorMapResolution());
 
   for (double i = 0.; i < 1.0; i+=resolution) {
     uint32_t offset = (uint32_t)points.size();
     points.push_back(Vector(0.,i,0.));
-    colors.push_back(map->getTransformedColor(i));
+    colors.push_back(i);
     points.push_back(Vector(1.,i,0.));
-    colors.push_back(map->getTransformedColor(i));
+    colors.push_back(i);
     points.push_back(Vector(0.,i+resolution,0.));
-    colors.push_back(map->getTransformedColor(i));
+    colors.push_back(i);
     points.push_back(Vector(1.,i+resolution,0.));
-    colors.push_back(map->getTransformedColor(i));
+    colors.push_back(i);
     numVBOElements+=2;
     indices.push_back(offset + 0);
     indices.push_back(offset + 1);
@@ -153,6 +154,10 @@ ShowColorMapModule::buildGeometryObject(boost::shared_ptr<SCIRun::Core::Datatype
   uniforms.push_back(GeometryObject::SpireSubPass::Uniform("uDisplayLength",static_cast<float>(displayLength)));
   GeometryObject::SpireVBO geomVBO = GeometryObject::SpireVBO(vboName, attribs, vboBufferSPtr,
 		numVBOElements,Core::Geometry::BBox(),true);
+  //push the color map parameters
+  uniforms.push_back(GeometryObject::SpireSubPass::Uniform("uCMInvert",map->getColorMapInvert()?1.f:0.f));
+  uniforms.push_back(GeometryObject::SpireSubPass::Uniform("uCMShift",static_cast<float>(map->getColorMapShift())));
+  uniforms.push_back(GeometryObject::SpireSubPass::Uniform("uCMResolution",static_cast<float>(map->getColorMapResolution())));
 
   geom->mVBOs.push_back(geomVBO);
 

src/Modules/Visualization/Tests/ShowFieldTests.cc

@@ -74,7 +74,7 @@ INSTANTIATE_TEST_CASE_P(
   ConstructLatVolGeometry,
   ShowFieldScalingTest,
   Values(20, 40, 60, 80
-  //, 100, 120, 150, 200 //to speed up make test
+  , 100, 120, 150, //200 //to speed up make test
   //, 256 // probably runs out of memory
   )
   );