Changeset 3983 for trunk

Timestamp:

Oct 2, 2013, 6:51:58 AM (11 years ago)

Author:

ldelgass

Message:

Add 'colormap define' as synonym for 'colormap add', since add can be used to
modify an existing colormap. Also tweak volume quality setting.

Location:

trunk/packages/vizservers/vtkvis

Files:

• RendererCmd.cpp (modified) (7 diffs)
• protocol.txt (modified) (1 diff)

trunk/packages/vizservers/vtkvis/RendererCmd.cpp

@@ -2509 +2509 @@
 static Rappture::CmdSpec colorMapOps[] = {
     {"add",    1, ColorMapAddOp,             5, 5, "colorMapName colormap alphamap"},
-    {"delete", 1, ColorMapDeleteOp,          2, 3, "?colorMapName?"},
+    {"define", 3, ColorMapAddOp,             5, 5, "colorMapName colormap alphamap"},
+    {"delete", 3, ColorMapDeleteOp,          2, 3, "?colorMapName?"},
     {"res",    1, ColorMapNumTableEntriesOp, 3, 4, "numTableEntries ?colorMapName?"}
 };
@@ -7165 +7166 @@
     range[1] = -DBL_MAX;
 
+    bool opaque = true;
+
     if (objc == 9) {
         const char *dataSetName = Tcl_GetString(objv[8]);
         if (!g_renderer->renderColorMap(colorMapName, dataSetName, legendType, fieldName, title,
-                                        range, width, height, true, numLabels, imgData)) {
+                                        range, width, height, opaque, numLabels, imgData)) {
             Tcl_AppendResult(interp, "Color map \"",
                              colorMapName, "\" or dataset \"",
@@ -7176 +7179 @@
     } else {
         if (!g_renderer->renderColorMap(colorMapName, "all", legendType, fieldName, title,
-                                        range, width, height, true, numLabels, imgData)) {
+                                        range, width, height, opaque, numLabels, imgData)) {
             Tcl_AppendResult(interp, "Color map \"",
                              colorMapName, "\" was not found", (char*)NULL);
@@ -7237 +7240 @@
         vtkSmartPointer<vtkUnsignedCharArray>::New();
 
-    if (!g_renderer->renderColorMap(colorMapName, width, height, true, imgData)) {
+    bool opaque = true;
+
+    if (!g_renderer->renderColorMap(colorMapName, width, height, opaque, imgData)) {
         Tcl_AppendResult(interp, "Color map \"",
                          colorMapName, "\" was not found", (char*)NULL);
@@ -7273 +7278 @@
 # endif // USE_THREADS
 #endif // DEBUG
+
     return TCL_OK;
 }
@@ -11936 +11942 @@
     double distance;
     double maxFactor = 4.0;
+#if 1
+    distance = 1.0 / (quality * (maxFactor - 1.0) + 1.0);
+#else
     if (quality >= 0.5) {
         distance = 1.0 / ((quality - 0.5) * (maxFactor - 1.0) * 2.0 + 1.0);
@@ -11941 +11950 @@
         distance = ((0.5 - quality) * (maxFactor - 1.0) * 2.0 + 1.0);
     }
+#endif
     if (objc == 4) {
         const char *name = Tcl_GetString(objv[3]);

trunk/packages/vizservers/vtkvis/protocol.txt

@@ -189 +189 @@
 
 colormap add <colorMapName> <colorMap> <opacityMap>
+         (Re-)define a colormap.  If colorMapName doesn't exist, it is created,
+         otherwise the colormap is redefined and all users will be updated.
          colorMap = Tcl list of {value r g b} control points
          opacityMap = Tcl list of {value alpha} control points
+colormap define <colorMapName> <colorMap> <opacityMap>
+         (Re-)define a colormap (same as 'add')
 colormap delete <?colorMapName?>
 colormap res <numberOfTableEntries>