Changeset 3550

Timestamp:

Mar 22, 2013, 11:57:29 AM (12 years ago)

Author:

ldelgass

Message:

Reset camera *after* orienting, so zoom reset can use the correct view direction

Location:

trunk/gui/scripts

Files:

• vtkheightmapviewer.tcl (modified) (5 diffs)
• vtkisosurfaceviewer.tcl (modified) (1 diff)
• vtkstreamlinesviewer.tcl (modified) (2 diffs)
• vtkviewer.tcl (modified) (2 diffs)

trunk/gui/scripts/vtkheightmapviewer.tcl

@@ -910 +910 @@
         set q [list $_view(qw) $_view(qx) $_view(qy) $_view(qz)]
         $_arcball quaternion $q 
-        if {$_settings(isHeightmap) } {
-            if { $_view(ortho)} {
-                SendCmd "camera mode ortho"
-            } else {
-                SendCmd "camera mode persp"
-            }
-            SendCmd "camera reset"
+        if {$_settings(isHeightmap) } {
+            if { $_view(ortho)} {
+                SendCmd "camera mode ortho"
+            } else {
+                SendCmd "camera mode persp"
+            }
             DoRotate
-        }           
+            SendCmd "camera reset"
+        }
         PanCamera
         StopBufferingCommands
@@ -1044 +1044 @@
         set q [list $_view(qw) $_view(qx) $_view(qy) $_view(qz)]
         $_arcball quaternion $q 
-        if {$_settings(isHeightmap) } {
-            if { $_view(ortho)} {
-                SendCmd "camera mode ortho"
-            } else {
-                SendCmd "camera mode persp"
-            }
-            SendCmd "camera reset"
+        if {$_settings(isHeightmap) } {
+            if { $_view(ortho)} {
+                SendCmd "camera mode ortho"
+            } else {
+                SendCmd "camera mode persp"
+            }
             DoRotate
-        }
+            SendCmd "camera reset"
+        }
         PanCamera
         InitSettings axisXGrid axisYGrid axisZGrid \
@@ -1154 +1154 @@
             set q [list $_view(qw) $_view(qx) $_view(qy) $_view(qz)]
             $_arcball quaternion $q
-            SendCmd "camera reset"
             if {$_settings(isHeightmap) } {
                 DoRotate
             }
+            SendCmd "camera reset"
         }
     }
@@ -1504 +1504 @@
             }
             ResetAxes
-            SendCmd "camera reset"
             if { $bool } {
                 set q [list $_view(qw) $_view(qx) $_view(qy) $_view(qz)]
@@ -1514 +1513 @@
                 bind $c <ButtonRelease-1> {}
             }
+            SendCmd "camera reset"
             # Fix the mouse bindings for rotation/panning and the 
             # camera mode. Ideally we'd create a bindtag for these.

trunk/gui/scripts/vtkisosurfaceviewer.tcl

@@ -1157 +1157 @@
             set q [list $_view(qw) $_view(qx) $_view(qy) $_view(qz)]
             $_arcball quaternion $q
+            DoRotate
             SendCmd "camera reset"
-            DoRotate
         }
     }

trunk/gui/scripts/vtkstreamlinesviewer.tcl

@@ -1184 +1184 @@
                 ypan    0
             }
-            SendCmd "camera reset all"
             if { $_first != "" } {
                 set location [$_first hints camera]
@@ -1194 +1193 @@
             $_arcball quaternion $q
             DoRotate
+            SendCmd "camera reset"
         }
     }

trunk/gui/scripts/vtkviewer.tcl

@@ -1033 +1033 @@
                 ypan    0
             }
-            SendCmd "camera reset all"
             if { $_first != "" } {
                 set location [$_first hints camera]
@@ -1043 +1042 @@
             $_arcball quaternion $q
             DoRotate
+            SendCmd "camera reset"
         }
     }