Changeset 2123 for trunk/packages/vizservers/vtkvis/RpVtkRendererCmd.cpp

Timestamp:

Mar 8, 2011 2:43:17 PM (13 years ago)

Author:

ldelgass

Message:

• First pass at making dataSetName optional in commands, pass 'all' to methods

in this case (can pass literal 'all' or leave name out). Currently implemented
for delete subcommands.

• Return bool from rendering legend if color map not found - fixes crash
• Delete DataSets? after graphics objects, since they hold pointers to their

DataSet?. (TODO: use TR1 shared pointers?)

• Make hash keys (std::string) const reference parameters in methods
• Add some debug traces to destructors
• Fix indentation in CmdProc?.cpp

File:

• trunk/packages/vizservers/vtkvis/RpVtkRendererCmd.cpp (modified) (11 diffs)

trunk/packages/vizservers/vtkvis/RpVtkRendererCmd.cpp

@@ -172 +172 @@
     {"name", 1, AxisNameOp, 4, 4, "axis title"},
     {"units", 1, AxisUnitsOp, 4, 4, "axis units"},
-    {"visible", 1, AxisVisibleOp, 4, 4, "axis bool"},
+    {"visible", 1, AxisVisibleOp, 4, 4, "axis bool"}
 };
 static int nAxisOps = NumCmdSpecs(axisOps);
@@ -298 +298 @@
     {"reset", 2, CameraResetOp, 2, 3, "?all?"},
     {"rotate", 2, CameraRotateOp, 5, 5, "angle angle angle"},
-    {"zoom", 1, CameraZoomOp, 3, 3, "zoomAmount"},
+    {"zoom", 1, CameraZoomOp, 3, 3, "zoomAmount"}
 };
 static int nCameraOps = NumCmdSpecs(cameraOps);
@@ -490 +490 @@
                   Tcl_Obj *const *objv)
 {
-    const char *name = Tcl_GetString(objv[2]);
-    g_renderer->deleteContour2D(name);
+    if (objc == 3) {
+        const char *name = Tcl_GetString(objv[2]);
+        g_renderer->deleteContour2D(name);
+    } else {
+        g_renderer->deleteContour2D("all");
+    }
     return TCL_OK;
 }
@@ -551 +555 @@
 static Rappture::CmdSpec contour2dOps[] = {
     {"add", 1, Contour2DAddOp, 5, 5, "oper value dataSetName"},
-    {"delete", 1, Contour2DDeleteOp, 3, 3, "dataSetName"},
+    {"delete", 1, Contour2DDeleteOp, 2, 3, "?dataSetName?"},
     {"lighting", 3, Contour2DLightingOp, 4, 4, "bool dataSetName"},
     {"linecolor", 5, Contour2DLineColorOp, 6, 6, "r g b dataSetName"},
     {"linewidth", 5, Contour2DLineWidthOp, 4, 4, "width dataSetName"},
-    {"visible", 1, Contour2DVisibleOp, 4, 4, "bool dataSetName"},
+    {"visible", 1, Contour2DVisibleOp, 4, 4, "bool dataSetName"}
 };
 static int nContour2dOps = NumCmdSpecs(contour2dOps);
@@ -627 +631 @@
                 Tcl_Obj *const *objv)
 {
-    const char *name = Tcl_GetString(objv[2]);
-    TRACE("Deleting dataset %s", name);
-    g_renderer->deleteDataSet(name);
+    if (objc == 3) {
+        const char *name = Tcl_GetString(objv[2]);
+        TRACE("Deleting dataset %s", name);
+        g_renderer->deleteDataSet(name);
+    } else {
+        g_renderer->deleteDataSet("all");
+    }
     return TCL_OK;
 }
@@ -736 +744 @@
 static Rappture::CmdSpec dataSetOps[] = {
     {"add", 1, DataSetAddOp, 6, 6, "name data follows nBytes"},
-    {"delete", 1, DataSetDeleteOp, 3, 3, "name"},
+    {"delete", 1, DataSetDeleteOp, 2, 3, "?name?"},
     {"getvalue", 1, DataSetGetValueOp, 6, 7, "oper x y ?z? name"},
     {"opacity", 1, DataSetOpacityOp, 4, 4, "value name"},
@@ -778 +786 @@
         vtkSmartPointer<vtkUnsignedCharArray>::New();
 
-    g_renderer->renderColorMap(name, title, width, height, imgData);
+    if (!g_renderer->renderColorMap(name, title, width, height, imgData)) {
+        Tcl_AppendResult(interp, "Color map \"",
+                name, "\" was not found", (char*)NULL);
+        return TCL_ERROR;
+    }
 
 #ifdef DEBUG
@@ -814 +826 @@
                   Tcl_Obj *const *objv)
 {
-    const char *name = Tcl_GetString(objv[2]);
-    g_renderer->deletePseudoColor(name);
+    if (objc == 3) {
+        const char *name = Tcl_GetString(objv[2]);
+        g_renderer->deletePseudoColor(name);
+    } else {
+        g_renderer->deletePseudoColor("all");
+    }
     return TCL_OK;
 }
@@ -889 +905 @@
     {"add", 1, PseudoColorAddOp, 3, 3, "dataSetName"},
     {"colormap", 1, PseudoColorColorMapOp, 4, 4, "colorMapName dataSetName"},
-    {"delete", 1, PseudoColorDeleteOp, 3, 3, "dataSetName"},
+    {"delete", 1, PseudoColorDeleteOp, 2, 3, "?dataSetName?"},
     {"edges", 1, PseudoColorEdgeVisibilityOp, 4, 4, "bool dataSetName"},
     {"lighting", 3, PseudoColorLightingOp, 4, 4, "bool dataSetName"},
@@ -925 +941 @@
                  Tcl_Obj *const *objv)
 {
-    const char *name = Tcl_GetString(objv[2]);
-    g_renderer->deletePolyData(name);
+    if (objc == 3) {
+        const char *name = Tcl_GetString(objv[2]);
+        g_renderer->deletePolyData(name);
+    } else {
+        g_renderer->deletePolyData("all");
+    }
     return TCL_OK;
 }
@@ -1028 +1048 @@
     {"add", 1, PolyDataAddOp, 3, 3, "dataSetName"},
     {"color", 1, PolyDataColorOp, 6, 6, "r g b dataSetName"},
-    {"delete", 1, PolyDataDeleteOp, 3, 3, "dataSetName"},
+    {"delete", 1, PolyDataDeleteOp, 2, 3, "?dataSetName?"},
     {"edges", 1, PolyDataEdgeVisibilityOp, 4, 4, "bool dataSetName"},
     {"lighting", 3, PolyDataLightingOp, 4, 4, "bool dataSetName"},