Changeset 1237 for trunk

Timestamp:

Nov 25, 2008, 10:01:15 AM (16 years ago)

Author:

gah

Message:

 

Location:

trunk

Files:

• gui/scripts/nanovisviewer.tcl (modified) (4 diffs)
• packages/vizservers/nanovis/Command.cpp (modified) (1 diff)
• packages/vizservers/nanovis/nanovis.cpp (modified) (2 diffs)

trunk/gui/scripts/nanovisviewer.tcl

@@ -167 +167 @@
         psi     0
         zoom    1.0
-        x       0
-        y       0
-        z       0
+        dx      0
+        dy      0
     }
     set _obj2id(count) 0
@@ -1172 +1171 @@
                 psi 0
                 zoom 1.0
+                dx 0
+                dy 0
             }
             set xyz [Euler2XYZ $view_(theta) $view_(phi) $view_(psi)]
             _send "camera angle $xyz"
+            _send "camera pan $view_(dx) $view_(dy)"
         }
     }
@@ -1272 +1274 @@
     # Experimental stuff
     if { $option == "set" } {
-        set view_(x) $x
-        set view_(y) $y
-        _send "camera pan $view_(x) $view_(y)"
+        set view_(dx) $x
+        set view_(dy) $y
+        _send "camera pan $view_(dx) $view_(dy)"
         return
     }
@@ -1281 +1283 @@
     }
     if { $option == "drag" || $option == "release" } {
-        set view_(x) [expr $view_(x) + $x]
-        set view_(y) [expr $view_(y) + $y]
-        _send "camera pan $view_(x) $view_(y)"
+        set view_(dx) [expr $view_(dx) + $x]
+        set view_(dy) [expr $view_(dy) + $y]
+        _send "camera pan $view_(dx) $view_(dy)"
     }
     if { $option == "release" } {

trunk/packages/vizservers/nanovis/Command.cpp

@@ -727 +727 @@
              Tcl_Obj *const *objv)
 {
-    float x, y;
-    if ((GetFloatFromObj(interp, objv[2], &x) != TCL_OK) ||
-        (GetFloatFromObj(interp, objv[3], &y) != TCL_OK)) {
+    int x, y;
+    if ((Tcl_GetIntFromObj(interp, objv[2], &x) != TCL_OK) ||
+        (Tcl_GetIntFromObj(interp, objv[3], &y) != TCL_OK)) {
         return TCL_ERROR;
     }

trunk/packages/vizservers/nanovis/nanovis.cpp

@@ -444 +444 @@
 
 static void
-NanoVis::pan(int dx, int dy)
+NanoVis::pan(int x, int y)
 {
     float x, y;
@@ -456 +456 @@
     fprintf(stderr, "x=%f, y=%f\n", x, y);
     
-    cam->x(cam->x() + x);
-    cam->y(cam->y() + y);
+    cam->x(def_eye_x + x);
+    cam->y(def_eye_y + y);
     fprintf(stderr, "set eye to %f %f\n", cam->x(), cam->y());
 
-    cam->xAim(cam->xAim() + x);
-    cam->yAim(cam->yAim() + y);
+    cam->xAim(def_target_x + x);
+    cam->yAim(def_target_y + y);
     fprintf(stderr, "set aim to %f %f\n", cam->xAim(), cam->yAim());
 }