Changeset 3536 for trunk/gui/scripts

Timestamp:

Mar 19, 2013 1:20:00 AM (11 years ago)

Author:

ldelgass

Message:

Finish up changes from rev. 3534 to reset pan/zoom on canonical view button
click to match other viewers.

Location:

trunk/gui/scripts

Files:

• vtkheightmapviewer.tcl (modified) (2 diffs)
• vtkisosurfaceviewer.tcl (modified) (4 diffs)

trunk/gui/scripts/vtkheightmapviewer.tcl

@@ -2046 +2046 @@
 
     blt::table $inner \
-            0,0 $inner.view_l -anchor e -pady 2 \
-            0,1 $inner.view -anchor w -pady 2
+        0,0 $inner.view_l -anchor e -pady 2 \
+        0,1 $inner.view -anchor w -pady 2
 
     set labels { qx qy qz qw xpan ypan zoom }
@@ -2546 +2546 @@
     set q [list $_view(qw) $_view(qx) $_view(qy) $_view(qz)]
     $_arcball quaternion $q
-    SendCmd "camera orient $q" 
-}
-
-
-
-
+    SendCmd "camera orient $q"
+    SendCmd "camera reset"
+    set _view(xpan) 0
+    set _view(ypan) 0
+    set _view(zoom) 1.0
+}

trunk/gui/scripts/vtkisosurfaceviewer.tcl

@@ -1147 +1147 @@
         "reset" {
             array set _view {
-                qw              0.853553
-                qx              -0.353553
-                qy              0.353553
-                qz              0.146447
-                zoom    1.0
+                qw     0.853553
+                qx     -0.353553
+                qy     0.353553
+                qz     0.146447
+                zoom   1.0
                 xpan   0
                 ypan   0
@@ -1812 +1812 @@
 
     blt::table $inner \
-            0,0 $inner.view_l -anchor e -pady 2 \
-            0,1 $inner.view -anchor w -pady 2
+        0,0 $inner.view_l -anchor e -pady 2 \
+        0,1 $inner.view -anchor w -pady 2
 
     set labels { qx qy qz qw xpan ypan zoom }
@@ -1879 +1879 @@
 
     checkbutton $inner.preinterp \
-        -text "Interpolate" \
+        -text "Interpolate Scalars" \
         -variable [itcl::scope _settings(cutplanePreinterp)] \
         -command [itcl::code $this AdjustSetting cutplanePreinterp] \
@@ -2541 +2541 @@
     set q [list $_view(qw) $_view(qx) $_view(qy) $_view(qz)]
     $_arcball quaternion $q
-    SendCmd "camera orient $q" 
-}
+    SendCmd "camera orient $q"
+    SendCmd "camera reset"
+    set _view(xpan) 0
+    set _view(ypan) 0
+    set _view(zoom) 1.0
+}