Changeset 3211 for branches/Rappture 1.2

Timestamp:

Dec 18, 2012, 10:49:56 AM (12 years ago)

Author:

ldelgass

Message:

• Add 'preinterp' command to cutplane,heightmap,pseudocolor to toggle VTK's InterpolateScalarsBeforeMapping? behavior
• Reduce axis title/label font size

Location:

branches/Rappture 1.2/packages/vizservers/vtkvis

Files:

• RpCutplane.cpp (modified) (2 diffs)
• RpCutplane.h (modified) (1 diff)
• RpHeightMap.cpp (modified) (1 diff)
• RpHeightMap.h (modified) (1 diff)
• RpPseudoColor.cpp (modified) (1 diff)
• RpPseudoColor.h (modified) (1 diff)
• RpVtkRenderer.cpp (modified) (1 diff)
• RpVtkRenderer.h (modified) (3 diffs)
• RpVtkRendererCmd.cpp (modified) (6 diffs)
• RpVtkRendererGraphicsObjs.cpp (modified) (3 diffs)

branches/Rappture 1.2/packages/vizservers/vtkvis/RpCutplane.cpp

@@ -158 +158 @@
             // Map scalars through lookup table regardless of type
             _mapper[i]->SetColorModeToMapScalars();
-            //_mapper->InterpolateScalarsBeforeMappingOn();
+            //_mapper[i]->InterpolateScalarsBeforeMappingOn();
         }
         _cutPlane[i] = vtkSmartPointer<vtkPlane>::New();
@@ -375 +375 @@
 }
 
+void Cutplane::setInterpolateBeforeMapping(bool state)
+{
+    for (int i = 0; i < 3; i++) {
+        if (_mapper[i] != NULL) {
+            _mapper[i]->SetInterpolateScalarsBeforeMapping((state ? 1 : 0));
+        }
+    }
+}
+
 /**
  * \brief Select a 2D slice plane from a 3D DataSet

branches/Rappture 1.2/packages/vizservers/vtkvis/RpCutplane.h

@@ -66 +66 @@
     void setSliceVisibility(Axis axis, bool state);
 
+    void setInterpolateBeforeMapping(bool state);
+
     void setColorMode(ColorMode mode, DataSet::DataAttributeType type,
                       const char *name, double range[2] = NULL);

branches/Rappture 1.2/packages/vizservers/vtkvis/RpHeightMap.cpp

@@ -470 +470 @@
 }
 
+void HeightMap::setInterpolateBeforeMapping(bool state)
+{
+    if (_dsMapper != NULL) {
+        _dsMapper->SetInterpolateScalarsBeforeMapping((state ? 1 : 0));
+    }
+}
+
 void HeightMap::setAspect(double aspect)
 {

branches/Rappture 1.2/packages/vizservers/vtkvis/RpHeightMap.h

@@ -72 +72 @@
     }
 
+    void setInterpolateBeforeMapping(bool state);
+
     void setNumContours(int numContours);
 

branches/Rappture 1.2/packages/vizservers/vtkvis/RpPseudoColor.cpp

@@ -220 +220 @@
 }
 
+void PseudoColor::setInterpolateBeforeMapping(bool state)
+{
+    if (_dsMapper != NULL) {
+        _dsMapper->SetInterpolateScalarsBeforeMapping((state ? 1 : 0));
+    }
+}
+
 void PseudoColor::updateRanges(Renderer *renderer)
 {

branches/Rappture 1.2/packages/vizservers/vtkvis/RpPseudoColor.h

@@ -48 +48 @@
     virtual void setClippingPlanes(vtkPlaneCollection *planes);
 
+    void setInterpolateBeforeMapping(bool state);
+
     void setColorMode(ColorMode mode, DataSet::DataAttributeType type,
                       const char *name, double range[2] = NULL);

branches/Rappture 1.2/packages/vizservers/vtkvis/RpVtkRenderer.cpp

@@ -533 +533 @@
     _cubeAxesActor->SetViewAngleLODThreshold(0);
     _cubeAxesActor->SetEnableViewAngleLOD(0);
-    _cubeAxesActor->SetScreenSize(10.0);
+    // Attempt to set font sizes for 2D (this currently doesn't work)
+    for (int i = 0; i < 3; i++) {
+        _cubeAxesActor->GetTitleTextProperty(i)->SetFontSize(14);
+        _cubeAxesActor->GetLabelTextProperty(i)->SetFontSize(12);
+    }
+    // Set font pixel size for 3D
+    _cubeAxesActor->SetScreenSize(8.0);
 #endif
     _cubeAxesActor->SetBounds(0, 1, 0, 1, 0, 1);

branches/Rappture 1.2/packages/vizservers/vtkvis/RpVtkRenderer.h

@@ -453 +453 @@
                               const char *name, double range[2] = NULL);
 
+    void setCutplaneInterpolateBeforeMapping(const DataSetId& id, bool state);
+
     // Cylinders
 
@@ -499 +501 @@
     void setHeightMapContourList(const DataSetId& id, const std::vector<double>& contours);
 
+    void setHeightMapInterpolateBeforeMapping(const DataSetId& id, bool state);
+
     void setHeightMapContourSurfaceVisibility(const DataSetId& id, bool state);
 
@@ -554 +558 @@
                                  DataSet::DataAttributeType type,
                                  const char *name, double range[2] = NULL);
+
+    void setPseudoColorInterpolateBeforeMapping(const DataSetId& id, bool state);
 
     // Spheres

branches/Rappture 1.2/packages/vizservers/vtkvis/RpVtkRendererCmd.cpp

@@ -2684 +2684 @@
 
 static int
+CutplanePreInterpOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                    Tcl_Obj *const *objv)
+{
+    bool state;
+    if (GetBooleanFromObj(interp, objv[2], &state) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (objc == 4) {
+        const char *name = Tcl_GetString(objv[3]);
+        g_renderer->setCutplaneInterpolateBeforeMapping(name, state);
+    } else {
+        g_renderer->setCutplaneInterpolateBeforeMapping("all", state);
+    }
+    return TCL_OK;
+}
+
+static int
 CutplaneScaleOp(ClientData clientData, Tcl_Interp *interp, int objc, 
                 Tcl_Obj *const *objv)
@@ -2812 +2829 @@
     {"orient",       2, CutplaneOrientOp, 6, 7, "qw qx qy qz ?dataSetName?"},
     {"outline",      2, CutplaneOutlineOp, 3, 4, "bool ?dataSetName?"},
-    {"pos",          1, CutplanePositionOp, 5, 6, "x y z ?dataSetName?"},
+    {"pos",          2, CutplanePositionOp, 5, 6, "x y z ?dataSetName?"},
+    {"preinterp",    2, CutplanePreInterpOp, 3, 4, "bool ?dataSetName?"},
     {"scale",        2, CutplaneScaleOp, 5, 6, "sx sy sz ?dataSetName?"},
     {"slice",        2, CutplaneVolumeSliceOp, 4, 5, "axis ratio ?dataSetName?"},
@@ -4713 +4731 @@
 
 static int
+HeightMapPreInterpOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                     Tcl_Obj *const *objv)
+{
+    bool state;
+    if (GetBooleanFromObj(interp, objv[2], &state) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (objc == 4) {
+        const char *name = Tcl_GetString(objv[3]);
+        g_renderer->setHeightMapInterpolateBeforeMapping(name, state);
+    } else {
+        g_renderer->setHeightMapInterpolateBeforeMapping("all", state);
+    }
+    return TCL_OK;
+}
+
+static int
 HeightMapScaleOp(ClientData clientData, Tcl_Interp *interp, int objc, 
                  Tcl_Obj *const *objv)
@@ -4812 +4847 @@
     {"opacity",      2, HeightMapOpacityOp, 3, 4, "value ?dataSetName?"},
     {"orient",       2, HeightMapOrientOp, 6, 7, "qw qx qy qz ?dataSetName?"},
-    {"pos",          1, HeightMapPositionOp, 5, 6, "x y z ?dataSetName?"},
+    {"pos",          2, HeightMapPositionOp, 5, 6, "x y z ?dataSetName?"},
+    {"preinterp",    2, HeightMapPreInterpOp, 3, 4, "bool ?dataSetName?"},
     {"scale",        2, HeightMapScaleOp, 5, 6, "sx sy sz ?dataSetName?"},
     {"slice",        2, HeightMapVolumeSliceOp, 4, 5, "axis ratio ?dataSetName?"},
@@ -6728 +6764 @@
 
 static int
+PseudoColorPreInterpOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                       Tcl_Obj *const *objv)
+{
+    bool state;
+    if (GetBooleanFromObj(interp, objv[2], &state) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (objc == 4) {
+        const char *name = Tcl_GetString(objv[3]);
+        g_renderer->setPseudoColorInterpolateBeforeMapping(name, state);
+    } else {
+        g_renderer->setPseudoColorInterpolateBeforeMapping("all", state);
+    }
+    return TCL_OK;
+}
+
+static int
 PseudoColorScaleOp(ClientData clientData, Tcl_Interp *interp, int objc, 
                    Tcl_Obj *const *objv)
@@ -6792 +6845 @@
     {"opacity",   2, PseudoColorOpacityOp, 3, 4, "value ?dataSetName?"},
     {"orient",    2, PseudoColorOrientOp, 6, 7, "qw qx qy qz ?dataSetName?"},
-    {"pos",       1, PseudoColorPositionOp, 5, 6, "x y z ?dataSetName?"},
+    {"pos",       2, PseudoColorPositionOp, 5, 6, "x y z ?dataSetName?"},
+    {"preinterp", 2, PseudoColorPreInterpOp, 3, 4, "bool ?dataSetName?"},
     {"scale",     1, PseudoColorScaleOp, 5, 6, "sx sy sz ?dataSetName?"},
     {"visible",   1, PseudoColorVisibleOp, 3, 4, "bool ?dataSetName?"},

branches/Rappture 1.2/packages/vizservers/vtkvis/RpVtkRendererGraphicsObjs.cpp

@@ -929 +929 @@
 }
 
+void Renderer::setCutplaneInterpolateBeforeMapping(const DataSetId& id, bool state)
+{
+    CutplaneHashmap::iterator itr;
+
+    bool doAll = false;
+
+    if (id.compare("all") == 0) {
+        itr = _cutplanes.begin();
+        doAll = true;
+    } else {
+        itr = _cutplanes.find(id);
+    }
+
+    if (itr == _cutplanes.end()) {
+        ERROR("Cutplane not found: %s", id.c_str());
+        return;
+    }
+
+    do {
+        itr->second->setInterpolateBeforeMapping(state);
+     } while (doAll && ++itr != _cutplanes.end());
+
+    _needsRedraw = true;
+}
+
 /**
  * \brief Create a new Cylinder and associate it with an ID
@@ -1479 +1504 @@
 }
 
+void Renderer::setHeightMapInterpolateBeforeMapping(const DataSetId& id, bool state)
+{
+    HeightMapHashmap::iterator itr;
+
+    bool doAll = false;
+
+    if (id.compare("all") == 0) {
+        itr = _heightMaps.begin();
+        doAll = true;
+    } else {
+        itr = _heightMaps.find(id);
+    }
+    if (itr == _heightMaps.end()) {
+        ERROR("HeightMap not found: %s", id.c_str());
+        return;
+    }
+
+    do {
+        itr->second->setInterpolateBeforeMapping(state);
+    } while (doAll && ++itr != _heightMaps.end());
+
+    _needsRedraw = true;
+}
+
 /**
  * \brief Turn on/off rendering height map contour lines for the given DataSet
@@ -2014 +2063 @@
     do {
         itr->second->setColorMode(mode, name, range);
+    } while (doAll && ++itr != _pseudoColors.end());
+
+    _needsRedraw = true;
+}
+
+void Renderer::setPseudoColorInterpolateBeforeMapping(const DataSetId& id, bool state)
+{
+    PseudoColorHashmap::iterator itr;
+
+    bool doAll = false;
+
+    if (id.compare("all") == 0) {
+        itr = _pseudoColors.begin();
+        doAll = true;
+    } else {
+        itr = _pseudoColors.find(id);
+    }
+    if (itr == _pseudoColors.end()) {
+        ERROR("PseudoColor not found: %s", id.c_str());
+        return;
+    }
+
+    do {
+        itr->second->setInterpolateBeforeMapping(state);
     } while (doAll && ++itr != _pseudoColors.end());