Changeset 4766 for branches/1.3/gui/scripts/vtkisosurfaceviewer.tcl

Timestamp:

Nov 23, 2014, 1:12:25 AM (10 years ago)

Author:

ldelgass

Message:

merge r4765 from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• gui/scripts/vtkisosurfaceviewer.tcl (modified) (9 diffs)

branches/1.3/gui/scripts/vtkisosurfaceviewer.tcl

@@ -95 +95 @@
     private method PanCamera {}
     private method Pick {x y}
+    private method QuaternionToView { q } { 
+        foreach { _view(-qw) _view(-qx) _view(-qy) _view(-qz) } $q break
+    }
     private method Rebuild {}
     private method ReceiveDataset { args }
@@ -107 +110 @@
     private method SetOrientation { side }
     private method Slice {option args}
-    private method Zoom {option}
     private method ViewToQuaternion {} { 
         return [list $_view(-qw) $_view(-qx) $_view(-qy) $_view(-qz)]
     }
+    private method Zoom {option}
 
     private variable _arcball ""
@@ -464 +467 @@
     EnableWaitDialog 500
     Connect
+    # FIXME: Removing this update breaks wizard mode (see examples/3D)
+    # However, it also allows an error in the initialization order
+    # where FieldResult::add is called from ResultViewer before this
+    # constructor is completed.
+    #update
 }
 
@@ -523 +531 @@
 
 itcl::body Rappture::VtkIsosurfaceViewer::EventuallyRotate { q } {
-    foreach { _view(-qw) _view(-qx) _view(-qy) _view(-qz) } $q break
+    QuaternionToView $q
     if { !$_rotatePending } {
         set _rotatePending 1
@@ -1151 +1159 @@
         "reset" {
             array set _view {
-                -qw     0.853553
-                -qx     -0.353553
-                -qy     0.353553
-                -qz     0.146447
-                -xpan   0
-                -ypan   0
-                -zoom   1.0
+                -qw      0.853553
+                -qx      -0.353553
+                -qy      0.353553
+                -qz      0.146447
+                -xpan    0
+                -ypan    0
+                -zoom    1.0
             }
             if { $_first != "" } {
@@ -1233 +1241 @@
 itcl::body Rappture::VtkIsosurfaceViewer::Pick {x y} {
     foreach tag [CurrentDatasets -visible] {
-        SendCmdNoSplash "dataset getscalar pixel $x $y $tag"
+        SendCmd "dataset getscalar pixel $x $y $tag"
     } 
 }
@@ -2021 +2029 @@
 }
 
-
-
 #
 #  camera -- 
@@ -2055 +2061 @@
                 }
                 "-zoom" {
-                    SendCmd "camera zoom $_view(-zoom)"
+                    SendCmd "camera zoom $_view($what)"
                 }
              }
@@ -2566 +2572 @@
     foreach name { -qw -qx -qy -qz } value $positions($side) {
         set _view($name) $value
-    } 
+    }
     set q [ViewToQuaternion]
     $_arcball quaternion $q