Changeset 2234 for trunk/gui

Timestamp:

Apr 28, 2011, 10:53:33 AM (13 years ago)

Author:

gah

Message:

Fix user view controls

File:

• trunk/gui/scripts/vtkviewer2.tcl (modified) (13 diffs)

trunk/gui/scripts/vtkviewer2.tcl

@@ -160 +160 @@
         y2 -1
     }
-    set _arcball [blt::arcball create 100 100]
-    $_arcball matrix { 1.0 0.0 0.0 0.0 1.0 0.0 0.0 0.0 1.0 }
-
     # Initialize the view to some default parameters.
     array set _view {
-        theta           45
-        phi             45
-        psi             0 
+        qx              0
+        qy              0
+        qz              0
+        qw              1
         zoom            1.0 
         pan-x           0
@@ -174 +172 @@
         zoom-y          1.0
     }
+    set _arcball [blt::arcball create 100 100]
+    set q [list $_view(qw) $_view(qx) $_view(qy) $_view(qz)]
+    $_arcball quaternion $q
+
     set _limits(vmin) 0.0
     set _limits(vmax) 1.0
@@ -182 +184 @@
         $this-lighting          1
         $this-opacity           1
-        $this-pan-x             $_view(pan-x)
-        $this-pan-y             $_view(pan-y)
-        $this-phi               $_view(phi)
-        $this-psi               $_view(psi)
-        $this-theta             $_view(theta)
         $this-volume            1
         $this-wireframe         0
@@ -192 +189 @@
         $this-grid-y            0
         $this-grid-z            0
-        $this-zoom              $_view(zoom)
     }]
 
@@ -786 +782 @@
     # Reset the camera and other view parameters
     #
-
-    set _settings($this-theta) $_view(theta)
-    set _settings($this-phi)   $_view(phi)
-    set _settings($this-psi)   $_view(psi)
-    set _settings($this-pan-x) $_view(pan-x)
-    set _settings($this-pan-y) $_view(pan-y)
-    set _settings($this-zoom)  $_view(zoom)
-
-    set xyz [Euler2XYZ $_view(theta) $_view(phi) $_view(psi)]
-    #SendCmd "camera rotate $xyz"
+    set q [list $_view(qw) $_view(qx) $_view(qy) $_view(qz)]
+    $_arcball quaternion $q
+    SendCmd "camera orient $q" 
     PanCamera
     SendCmd "camera mode persp"
-    #SendCmd "camera zoom $_view(zoom)"
+    Zoom reset
+
     FixSettings opacity
     FixSettings grid-x
@@ -883 +873 @@
         "in" {
             set _view(zoom) [expr {$_view(zoom)*1.25}]
-            set _settings($this-zoom) $_view(zoom)
             SendCmd "camera zoom $_view(zoom)"
         }
         "out" {
             set _view(zoom) [expr {$_view(zoom)*0.8}]
-            set _settings($this-zoom) $_view(zoom)
             SendCmd "camera zoom $_view(zoom)"
         }
         "reset" {
             array set _view {
-                theta   45
-                phi     45
-                psi     0
+                qx      0
+                qy      0
+                qz      0
+                qw      1
                 zoom    1.0
                 pan-x   0
@@ -902 +891 @@
                 zoom-y  1.0
             }
+            SendCmd "camera reset all"
             if { $_first != "" } {
                 set location [$_first hints camera]
                 if { $location != "" } {
                     array set _view $location
+                    parray _view
                 }
             }
-            set xyz [Euler2XYZ $_view(theta) $_view(phi) $_view(psi)]
-            #SendCmd "camera rotate $xyz"
+            set q [list $_view(qw) $_view(qx) $_view(qy) $_view(qz)]
+            $_arcball quaternion $q
+            SendCmd "camera orient $q" 
             PanCamera
-            set _settings($this-theta) $_view(theta)
-            set _settings($this-phi)   $_view(phi)
-            set _settings($this-psi)   $_view(psi)
-            set _settings($this-pan-x) $_view(pan-x)
-            set _settings($this-pan-y) $_view(pan-y)
-            set _settings($this-zoom)  $_view(zoom)
-            SendCmd "camera reset all"
-            $_arcball reset
         }
     }
@@ -950 +934 @@
             set _click(x) $x
             set _click(y) $y
-            set _click(theta) $_view(theta)
-            set _click(phi) $_view(phi)
         }
         "drag" {
@@ -974 +956 @@
                 }
                 set q [$_arcball rotate $x $y $_click(x) $_click(y)]
+                foreach { _view(qw) _view(qx) _view(qy) _view(qz) } $q break
                 SendCmd "camera orient $q" 
                 set _click(x) $x
@@ -1008 +991 @@
             set _view(pan-y) [expr $_view(pan-y) + $y]
             PanCamera
-            set _settings($this-pan-x) $_view(pan-x)
-            set _settings($this-pan-y) $_view(pan-y)
             return
         }
@@ -1027 +1008 @@
             set _view(pan-y) [expr $_view(pan-y) - $dy]
             PanCamera
-            set _settings($this-pan-x) $_view(pan-x)
-            set _settings($this-pan-y) $_view(pan-y)
         }
         "release" {
@@ -1339 +1318 @@
     $inner configure -borderwidth 4
 
-    set labels { phi theta psi pan-x pan-y zoom }
+    set labels { qx qy qz qw pan-x pan-y zoom }
     set row 0
     foreach tag $labels {
         label $inner.${tag}label -text $tag -font "Arial 9"
         entry $inner.${tag} -font "Arial 9"  -bg white \
-            -textvariable [itcl::scope _settings($this-$tag)]
+            -textvariable [itcl::scope _view($tag)]
         bind $inner.${tag} <KeyPress-Return> \
             [itcl::code $this camera set ${tag}]
@@ -1369 +1348 @@
         "set" {
             set who [lindex $args 0]
-            set x $_settings($this-$who)
+            set x $_view($who)
             set code [catch { string is double $x } result]
             if { $code != 0 || !$result } {
-                set _settings($this-$who) $_view($who)
+                set x _view($who)
                 return
             }
             switch -- $who {
                 "pan-x" - "pan-y" {
-                    set _view($who) $_settings($this-$who)
                     PanCamera
                 }
-                "phi" - "theta" - "psi" {
-                    set _view($who) $_settings($this-$who)
-                    set xyz [Euler2XYZ $_view(theta) $_view(phi) $_view(psi)]
-                    #SendCmd "camera rotate $xyz"
+                "qx" - "qy" - "qz" - "qw" {
+                    set q [list $_view(qw) $_view(qx) $_view(qy) $_view(qz)]
+                    $_arcball quaternion $q
+                    SendCmd "camera orient $q"
                 }
                 "zoom" {
-                    set _view($who) $_settings($this-$who)
                     SendCmd "camera zoom $_view(zoom)"
                 }