Changeset 4055 for trunk

Timestamp:

Nov 14, 2013, 3:44:32 PM (11 years ago)

Author:

ldelgass

Message:

Reset zoom when changing aspect (stretch mode) setting. Also, make Zoom reset
only reset zoom/pan (not rotation) and add CameraReset? method to reset all
camera settings.

File:

• trunk/gui/scripts/vtkheightmapviewer.tcl (modified) (7 diffs)

trunk/gui/scripts/vtkheightmapviewer.tcl

@@ -64 +64 @@
     public method scale {args}
 
+    protected method CameraReset {}
     protected method Connect {}
     protected method CurrentDatasets {args}
@@ -288 +289 @@
             -highlightthickness 0 \
             -image [Rappture::icon reset-view] \
-            -command [itcl::code $this Zoom reset]
+            -command [itcl::code $this CameraReset]
     } {
         usual
@@ -1150 +1151 @@
 }
 
+itcl::body Rappture::VtkHeightmapViewer::CameraReset {} {
+    array set _view {
+        qw      0.36
+        qx      0.25
+        qy      0.50
+        qz      0.70
+        zoom    1.0
+        xpan    0
+        ypan    0 
+    }
+    if { $_first != "" } {
+        set location [$_first hints camera]
+        if { $location != "" } {
+            array set _view $location
+        }
+    }
+    set q [list $_view(qw) $_view(qx) $_view(qy) $_view(qz)]
+    $_arcball quaternion $q
+    if {$_settings(isHeightmap) } {
+        DoRotate
+    }
+    SendCmd "camera reset"
+}
+
 # ----------------------------------------------------------------------
 # USAGE: Zoom in
@@ -1170 +1195 @@
         "reset" {
             array set _view {
-                qw      0.36
-                qx      0.25
-                qy      0.50
-                qz      0.70
                 zoom    1.0
                 xpan    0
                 ypan    0 
-            }
-            if { $_first != "" } {
-                set location [$_first hints camera]
-                if { $location != "" } {
-                    array set _view $location
-                }
-            }
-            set q [list $_view(qw) $_view(qx) $_view(qy) $_view(qz)]
-            $_arcball quaternion $q
-            if {$_settings(isHeightmap) } {
-                DoRotate
             }
             SendCmd "camera reset"
@@ -1469 +1479 @@
             SendCmd "dataset scalar $_curFldName"
             SendCmd "heightmap colormode scalar $_curFldName"
-            SendCmd "camera reset"
+            Zoom reset
             UpdateContourList
             DrawLegend
@@ -1549 +1559 @@
                 bind $c <ButtonRelease-1> {}
             }
-            SendCmd "camera reset"
+            Zoom reset
             # Fix the mouse bindings for rotation/panning and the 
             # camera mode. Ideally we'd create a bindtag for these.
@@ -1645 +1655 @@
                 SendCmd "camera aspect native"
             }
+            Zoom reset
         }
         "wireframe" {