Changeset 3153

Timestamp:

Aug 24, 2012, 2:14:24 PM (12 years ago)

Author:

ldelgass

Message:

Protocol support for colormapping contour2ds.

Location:

trunk/packages/vizservers/vtkvis

Files:

• RpVtkRenderer.cpp (modified) (2 diffs)
• RpVtkRenderer.h (modified) (1 diff)
• RpVtkRendererCmd.cpp (modified) (2 diffs)
• RpVtkRendererGraphicsObjs.cpp (modified) (2 diffs)
• protocol.txt (modified) (2 diffs)

trunk/packages/vizservers/vtkvis/RpVtkRenderer.cpp

@@ -897 +897 @@
 void Renderer::updateColorMap(ColorMap *cmap)
 {
+    for (Contour2DHashmap::iterator itr = _contour2Ds.begin();
+         itr != _contour2Ds.end(); ++itr) {
+        if (itr->second->getColorMap() == cmap) {
+            itr->second->updateColorMap();
+            _needsRedraw = true;
+        }
+    }
     for (Contour3DHashmap::iterator itr = _contour3Ds.begin();
          itr != _contour3Ds.end(); ++itr) {
@@ -974 +981 @@
 bool Renderer::colorMapUsed(ColorMap *cmap)
 {
+    for (Contour2DHashmap::iterator itr = _contour2Ds.begin();
+         itr != _contour2Ds.end(); ++itr) {
+        if (itr->second->getColorMap() == cmap)
+            return true;
+    }
     for (Contour3DHashmap::iterator itr = _contour3Ds.begin();
          itr != _contour3Ds.end(); ++itr) {

trunk/packages/vizservers/vtkvis/RpVtkRenderer.h

@@ -369 +369 @@
     void setContour2DContourList(const DataSetId& id, const std::vector<double>& contours);
 
+    void setContour2DColorMode(const DataSetId& id,
+                               Contour2D::ColorMode mode,
+                               const char *name, double range[2] = NULL);
+
+    void setContour2DColorMode(const DataSetId& id,
+                               Contour2D::ColorMode mode,
+                               DataSet::DataAttributeType type,
+                               const char *name, double range[2] = NULL);
+
     // 3D Contour (isosurface) plots
 

trunk/packages/vizservers/vtkvis/RpVtkRendererCmd.cpp

@@ -1064 +1064 @@
 
 static int
+Contour2DColorMapOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                    Tcl_Obj *const *objv)
+{
+    const char *colorMapName = Tcl_GetString(objv[2]);
+    if (objc == 4) {
+        const char *dataSetName = Tcl_GetString(objv[3]);
+        g_renderer->setGraphicsObjectColorMap<Contour2D>(dataSetName, colorMapName);
+    } else {
+        g_renderer->setGraphicsObjectColorMap<Contour2D>("all", colorMapName);
+    }
+    return TCL_OK;
+}
+
+static int
+Contour2DColorModeOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                     Tcl_Obj *const *objv)
+{
+    Contour2D::ColorMode mode;
+    const char *str = Tcl_GetString(objv[2]);
+    if (str[0] == 'c' && strcmp(str, "ccolor") == 0) {
+        mode = Contour2D::COLOR_CONSTANT;
+    } else if (str[0] == 's' && strcmp(str, "scalar") == 0) {
+        mode = Contour2D::COLOR_BY_SCALAR;
+    } else if (str[0] == 'v' && strcmp(str, "vmag") == 0) {
+        mode = Contour2D::COLOR_BY_VECTOR_MAGNITUDE;
+    } else if (str[0] == 'v' && strcmp(str, "vx") == 0) {
+        mode = Contour2D::COLOR_BY_VECTOR_X;
+    } else if (str[0] == 'v' && strcmp(str, "vy") == 0) {
+        mode = Contour2D::COLOR_BY_VECTOR_Y;
+    } else if (str[0] == 'v' && strcmp(str, "vz") == 0) {
+        mode = Contour2D::COLOR_BY_VECTOR_Z;
+    } else {
+        Tcl_AppendResult(interp, "bad color mode option \"", str,
+                         "\": should be one of: 'scalar', 'vmag', 'vx', 'vy', 'vz', 'ccolor'", (char*)NULL);
+        return TCL_ERROR;
+    }
+    const char *fieldName = Tcl_GetString(objv[3]);
+    if (mode == Contour2D::COLOR_CONSTANT) {
+        fieldName = NULL;
+    }
+    if (objc == 5) {
+        const char *name = Tcl_GetString(objv[4]);
+        g_renderer->setContour2DColorMode(name, mode, fieldName);
+    } else {
+        g_renderer->setContour2DColorMode("all", mode, fieldName);
+    }
+    return TCL_OK;
+}
+
+static int
 Contour2DLightingOp(ClientData clientData, Tcl_Interp *interp, int objc, 
                     Tcl_Obj *const *objv)
@@ -1210 +1260 @@
 static Rappture::CmdSpec contour2dOps[] = {
     {"add",       1, Contour2DAddOp, 4, 5, "oper value ?dataSetName?"},
-    {"color",     1, Contour2DLineColorOp, 5, 6, "r g b ?dataSetName?"},
+    {"ccolor",    2, Contour2DLineColorOp, 5, 6, "r g b ?dataSetName?"},
+    {"colormap",  7, Contour2DColorMapOp, 3, 4, "colorMapName ?dataSetName?"},
+    {"colormode", 7, Contour2DColorModeOp, 4, 5, "mode fieldName ?dataSetName?"},
     {"delete",    1, Contour2DDeleteOp, 2, 3, "?dataSetName?"},
     {"lighting",  3, Contour2DLightingOp, 3, 4, "bool ?dataSetName?"},

trunk/packages/vizservers/vtkvis/RpVtkRendererGraphicsObjs.cpp

@@ -361 +361 @@
 }
 
+
+/**
+ * \brief Set the color mode for the specified DataSet
+ */
+void Renderer::setContour2DColorMode(const DataSetId& id,
+                                     Contour2D::ColorMode mode,
+                                     DataSet::DataAttributeType type,
+                                     const char *name, double range[2])
+{
+    Contour2DHashmap::iterator itr;
+
+    bool doAll = false;
+
+    if (id.compare("all") == 0) {
+        itr = _contour2Ds.begin();
+        doAll = true;
+    } else {
+        itr = _contour2Ds.find(id);
+    }
+    if (itr == _contour2Ds.end()) {
+        ERROR("Contour2D not found: %s", id.c_str());
+        return;
+    }
+
+    do {
+        itr->second->setColorMode(mode, type, name, range);
+    } while (doAll && ++itr != _contour2Ds.end());
+
+    _needsRedraw = true;
+}
+
+/**
+ * \brief Set the color mode for the specified DataSet
+ */
+void Renderer::setContour2DColorMode(const DataSetId& id,
+                                     Contour2D::ColorMode mode,
+                                     const char *name, double range[2])
+{
+    Contour2DHashmap::iterator itr;
+
+    bool doAll = false;
+
+    if (id.compare("all") == 0) {
+        itr = _contour2Ds.begin();
+        doAll = true;
+    } else {
+        itr = _contour2Ds.find(id);
+    }
+    if (itr == _contour2Ds.end()) {
+        ERROR("Contour2D not found: %s", id.c_str());
+        return;
+    }
+
+    do {
+        itr->second->setColorMode(mode, name, range);
+    } while (doAll && ++itr != _contour2Ds.end());
+
+    _needsRedraw = true;
+}
+
 /**
  * \brief Create a new Contour3D and associate it with the named DataSet
@@ -1465 +1525 @@
 }
 
-
 /**
  * \brief Set the color mode for the specified DataSet

trunk/packages/vizservers/vtkvis/protocol.txt

@@ -149 +149 @@
 contour2d add contourlist <list> <?datasetName?>
           list = {isoval1 isoval2 isoval3...}
-contour2d color <r> <g> <b> <?datasetName?>
+contour2d ccolor <r> <g> <b> <?datasetName?>
           synonym for linecolor
+contour2d colormap <colormapName> <?datasetName?>
+contour2d colormode <scalar|vmag|vx|vy|vz|ccolor> <fieldName> <?datasetName?>
+          Set the field used to color the object.  'ccolor' means to use
+          the constant color defined by the ccolor subcommand.  'scalar' uses
+          the active scalar field.  'vmag' uses the magnitude of the current
+          vector field, and 'vx','vy','vz' use the corresponding component of
+          the active vector field.
 contour2d delete <?datasetName?>
 contour2d lighting <bool> <?datasetName?>
@@ -342 +349 @@
 
 pseudocolor add <?datasetName?>
-pseudocolor ccolor r g b <?datasetName?>
+pseudocolor ccolor <r> <g> <b> <?datasetName?>
 pseudocolor colormap <colormapName> <?datasetName?>
 pseudocolor colormode <scalar|vmag|vx|vy|vz|ccolor> <fieldName> <?datasetName?>