Changeset 3263

Timestamp:

Jan 25, 2013, 1:57:09 PM (12 years ago)

Author:

ldelgass

Message:

Implement clientinfo command. For now, just output name/value pairs from Tcl
list into trace log.

Location:

branches/Rappture 1.2

Files:

• gui/scripts/vtkcontourviewer.tcl (modified) (1 diff)
• gui/scripts/vtkheightmapviewer.tcl (modified) (2 diffs)
• gui/scripts/vtkstreamlinesviewer.tcl (modified) (2 diffs)
• gui/scripts/vtkviewer.tcl (modified) (1 diff)
• gui/scripts/vtkvolumeviewer.tcl (modified) (2 diffs)
• packages/vizservers/vtkvis/RpVtkRendererCmd.cpp (modified) (3 diffs)

branches/Rappture 1.2/gui/scripts/vtkcontourviewer.tcl

@@ -924 +924 @@
         }
 
+        if 1 {
+            # Tell the server the name of the tool, the version, and dataset
+            # that we are rendering.  Have to do it here because we don't know
+            # what data objects are using the renderer until be get here.
+            set args ""
+            lappend args tool [$_first hints toolId]
+            lappend args version [$_first hints toolRevision]
+            lappend args dataset [$_first hints label]
+            SendCmd "clientinfo [list $args]"
+        }
+
         foreach axis { x y z } {
             set label [$_first hints ${axis}label]

branches/Rappture 1.2/gui/scripts/vtkheightmapviewer.tcl

@@ -989 +989 @@
         }
 
-        if 0 {
+        if 1 {
             # Tell the server the name of the tool, the version, and dataset
             # that we are rendering.  Have to do it here because we don't know
@@ -997 +997 @@
             lappend args version [$_first hints toolRevision]
             lappend args dataset [$_first hints label]
-            SendCmd "clientinfo $args"
+            SendCmd "clientinfo [list $args]"
         }
 

branches/Rappture 1.2/gui/scripts/vtkstreamlinesviewer.tcl

@@ -1062 +1062 @@
         }
 
-        if 0 {
+        if 1 {
             # Tell the server the name of the tool, the version, and dataset
             # that we are rendering.  Have to do it here because we don't know
@@ -1070 +1070 @@
             lappend args version [$_first hints toolRevision]
             lappend args dataset [$_first hints label]
-            SendCmd "clientinfo $args"
+            SendCmd "clientinfo [list $args]"
         }
 

branches/Rappture 1.2/gui/scripts/vtkviewer.tcl

@@ -940 +940 @@
         if { $location != "" } {
             array set view $location
+        }
+
+        if 1 {
+            # Tell the server the name of the tool, the version, and dataset
+            # that we are rendering.  Have to do it here because we don't know
+            # what data objects are using the renderer until be get here.
+            set args ""
+            lappend args tool [$_first hints toolId]
+            lappend args version [$_first hints toolRevision]
+            lappend args dataset [$_first hints label]
+            SendCmd "clientinfo [list $args]"
         }
 

branches/Rappture 1.2/gui/scripts/vtkvolumeviewer.tcl

@@ -1034 +1034 @@
         }
 
-        if 0 {
+        if 1 {
             # Tell the server the name of the tool, the version, and dataset
             # that we are rendering.  Have to do it here because we don't know
@@ -1042 +1042 @@
             lappend args version [$_first hints toolRevision]
             lappend args dataset [$_first hints label]
-            SendCmd "clientinfo $args"
+            SendCmd "clientinfo [list $args]"
         }
 

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

@@ -2086 +2086 @@
 
 static int
+ClientInfoCmd(ClientData clientData, Tcl_Interp *interp, int objc, 
+              Tcl_Obj *const *objv)
+{
+    int cinfoc;
+    Tcl_Obj **cinfov = NULL;
+    if (Tcl_ListObjGetElements(interp, objv[1], &cinfoc, &cinfov) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if ((cinfoc % 2) != 0) {
+        TRACE("cinfoc: %d", cinfoc);
+        Tcl_AppendResult(interp, "wrong # elements in clientinfo: should be ",
+                         "{name value name value...}", (char*)NULL);
+        return TCL_ERROR;
+    }
+    TRACE("Client Info: %d items", cinfoc/2);
+    for (int i = 0; i < cinfoc; i += 2) {
+        TRACE("%s = %s", Tcl_GetString(cinfov[i]), Tcl_GetString(cinfov[i+1]));
+    }
+    return TCL_OK;
+}
+
+static int
 ColorMapAddOp(ClientData clientData, Tcl_Interp *interp, int objc, 
               Tcl_Obj *const *objv)
@@ -9675 +9697 @@
     Tcl_CreateObjCommand(interp, "box",         BoxCmd,         clientData, NULL);
     Tcl_CreateObjCommand(interp, "camera",      CameraCmd,      clientData, NULL);
+    Tcl_CreateObjCommand(interp, "clientinfo",  ClientInfoCmd,  clientData, NULL);
     Tcl_CreateObjCommand(interp, "colormap",    ColorMapCmd,    clientData, NULL);
     Tcl_CreateObjCommand(interp, "cone",        ConeCmd,        clientData, NULL);
@@ -9711 +9734 @@
     Tcl_DeleteCommand(interp, "box");
     Tcl_DeleteCommand(interp, "camera");
+    Tcl_DeleteCommand(interp, "clientinfo");
     Tcl_DeleteCommand(interp, "colormap");
     Tcl_DeleteCommand(interp, "cone");