Changeset 3696 for trunk/packages/vizservers/vtkvis/RendererCmd.cpp

Timestamp:

Jun 17, 2013, 1:48:27 AM (11 years ago)

Author:

ldelgass

Message:

Use imroved Arc API (arc can only represent a circular section, and setting
two endpoints could cause problems with endpts and center colinear and radii
from center to two endpoints differing). New API uses a center, start point,
normal and sweep angle. Also change Line to support polylines: protocol is
changed to require a Tcl list for point coordinates instead of a fixed 2
endpoints.

File:

• trunk/packages/vizservers/vtkvis/RendererCmd.cpp (modified) (7 diffs)

trunk/packages/vizservers/vtkvis/RendererCmd.cpp

@@ -13 +13 @@
 #include <string>
 #include <sstream>
+#include <vector>
 #include <unistd.h>
 #include <sys/select.h>
@@ -131 +132 @@
          Tcl_Obj *const *objv)
 {
-    double center[3], pt1[3], pt2[3];
+    double center[3], pt1[3], norm[3], angle;
     if (Tcl_GetDoubleFromObj(interp, objv[2], &center[0]) != TCL_OK ||
         Tcl_GetDoubleFromObj(interp, objv[3], &center[1]) != TCL_OK ||
@@ -138 +139 @@
         Tcl_GetDoubleFromObj(interp, objv[6], &pt1[1]) != TCL_OK ||
         Tcl_GetDoubleFromObj(interp, objv[7], &pt1[2]) != TCL_OK ||
-        Tcl_GetDoubleFromObj(interp, objv[8], &pt2[0]) != TCL_OK ||
-        Tcl_GetDoubleFromObj(interp, objv[9], &pt2[1]) != TCL_OK ||
-        Tcl_GetDoubleFromObj(interp, objv[10], &pt2[2]) != TCL_OK) {
-        return TCL_ERROR;
-    }
-    const char *name = Tcl_GetString(objv[11]);
-    if (!g_renderer->addArc(name, center, pt1, pt2)) {
+        Tcl_GetDoubleFromObj(interp, objv[8], &norm[0]) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[9], &norm[1]) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[10], &norm[2]) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[11], &angle) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    const char *name = Tcl_GetString(objv[12]);
+    if (!g_renderer->addArc(name, center, pt1, norm, angle)) {
         Tcl_AppendResult(interp, "Failed to create arc", (char*)NULL);
         return TCL_ERROR;
@@ -329 +331 @@
 
 static Rappture::CmdSpec arcOps[] = {
-    {"add",       1, ArcAddOp, 12, 12, "centerX centerY centerZ x1 y1 z1 x2 y2 z2 name"},
+    {"add",       1, ArcAddOp, 13, 13, "centerX centerY centerZ startX startY startZ normX normY normZ angle name"},
     {"color",     1, ArcColorOp, 5, 6, "r g b ?name?"},
     {"delete",    1, ArcDeleteOp, 2, 3, "?name?"},
@@ -721 +723 @@
     {"orient",    4, ArrowOrientOp, 6, 7, "qw qx qy qz ?name?"},
     {"origin",    4, ArrowOriginOp, 5, 6, "x y z ?name?"},
-    {"pos",       2, ArrowPositionOp, 5, 6, "x y z ?name?"},
+    {"pos",       1, ArrowPositionOp, 5, 6, "x y z ?name?"},
     {"resolution",1, ArrowResolutionOp, 4, 5, "tipRes shaftRes ?name?"},
     {"scale",     2, ArrowScaleOp, 5, 6, "sx sy sz ?name?"},
@@ -7075 +7077 @@
           Tcl_Obj *const *objv)
 {
-    double pt1[3];
-    double pt2[3];
-    if (Tcl_GetDoubleFromObj(interp, objv[2], &pt1[0]) != TCL_OK ||
-        Tcl_GetDoubleFromObj(interp, objv[3], &pt1[1]) != TCL_OK ||
-        Tcl_GetDoubleFromObj(interp, objv[4], &pt1[2]) != TCL_OK ||
-        Tcl_GetDoubleFromObj(interp, objv[5], &pt2[0]) != TCL_OK ||
-        Tcl_GetDoubleFromObj(interp, objv[6], &pt2[1]) != TCL_OK ||
-        Tcl_GetDoubleFromObj(interp, objv[7], &pt2[2]) != TCL_OK) {
-        return TCL_ERROR;
-    }
-    const char *name = Tcl_GetString(objv[8]);
-    if (!g_renderer->addLine(name, pt1, pt2)) {
+    std::vector<double> points;
+    int ptlistc;
+    Tcl_Obj **ptlistv;
+    if (Tcl_ListObjGetElements(interp, objv[2], &ptlistc, &ptlistv) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (ptlistc < 6 || ptlistc % 3 != 0) {
+        Tcl_AppendResult(interp, "Points list size must be 6 or more and a multiple of 3", (char*)NULL);
+        return TCL_ERROR;
+    }
+    for (int i = 0; i < ptlistc; i++) {
+        double val;
+        if (Tcl_GetDoubleFromObj(interp, ptlistv[i], &val) != TCL_OK) {
+            return TCL_ERROR;
+        }
+        points.push_back(val);
+    }
+    const char *name = Tcl_GetString(objv[3]);
+    if (!g_renderer->addLine(name, points)) {
         Tcl_AppendResult(interp, "Failed to create line", (char*)NULL);
         return TCL_ERROR;
@@ -7254 +7263 @@
 
 static Rappture::CmdSpec lineOps[] = {
-    {"add",       1, LineAddOp, 9, 9, "x1 y1 z1 x2 y2 z2 name"},
+    {"add",       1, LineAddOp, 4, 4, "points name"},
     {"color",     1, LineColorOp, 5, 6, "r g b ?name?"},
     {"delete",    1, LineDeleteOp, 2, 3, "?name?"},