Changeset 3533 for trunk/gui/scripts/nanovisviewer.tcl

Timestamp:

Mar 19, 2013 12:53:20 AM (11 years ago)

Author:

ldelgass

Message:

Fix camera reset in nanovisviewer (leftover reference to orientation dropdown),
was causing a Tcl error. Bring flowvisviewer in line with nanovisviewer
changes.

File:

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

trunk/gui/scripts/nanovisviewer.tcl

@@ -200 +200 @@
         qz      0.146447
         zoom    1.0
-        xpan   0
-        ypan   0
+        xpan    0
+        ypan    0
     }
     set _arcball [blt::arcball create 100 100]
@@ -217 +217 @@
         $this-qz                $_view(qz)
         $this-zoom              $_view(zoom)    
-        $this-xpan             $_view(xpan)
-        $this-ypan             $_view(ypan)
+        $this-xpan              $_view(xpan)
+        $this-ypan              $_view(ypan)
         $this-volume            1
         $this-xcutplane         0
@@ -816 +816 @@
         SendCmd "volume state 1 $tag"
     }
-    set _limits($tag-min) $info(min);  # Minimum value of the volume.
-    set _limits($tag-max) $info(max);  # Maximum value of the volume.
+    set _limits($tag-min)  $info(min);  # Minimum value of the volume.
+    set _limits($tag-max)  $info(max);  # Maximum value of the volume.
     set _limits(vmin)      $info(vmin); # Overall minimum value.
     set _limits(vmax)      $info(vmax); # Overall maximum value.
@@ -924 +924 @@
         set _settings($this-qy)    $_view(qy)
         set _settings($this-qz)    $_view(qz)
-        set _settings($this-xpan) $_view(xpan)
-        set _settings($this-ypan) $_view(ypan)
+        set _settings($this-xpan)  $_view(xpan)
+        set _settings($this-ypan)  $_view(ypan)
         set _settings($this-zoom)  $_view(zoom)
 
@@ -1046 +1046 @@
             set _settings($this-qy)    $_view(qy)
             set _settings($this-qz)    $_view(qz)
-            set _settings($this-xpan) $_view(xpan)
-            set _settings($this-ypan) $_view(ypan)
+            set _settings($this-xpan)  $_view(xpan)
+            set _settings($this-ypan)  $_view(ypan)
             set _settings($this-zoom)  $_view(zoom)
-            $itk_component(orientation) value "default" 
         }
     }
@@ -1920 +1919 @@
 
     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 row 1
@@ -2120 +2119 @@
     $_arcball quaternion $q
     SendCmd "camera orient $q" 
-}
-
+    SendCmd "camera reset"
+    set _view(xpan) 0
+    set _view(ypan) 0
+    set _view(zoom) 1.0
+    set _settings($this-xpan) $_view(xpan)
+    set _settings($this-ypan) $_view(ypan)
+    set _settings($this-zoom) $_view(zoom)
+}
+