Changeset 3492 for trunk/gui/scripts

Timestamp:

Mar 13, 2013, 9:57:03 AM (12 years ago)

Author:

ldelgass

Message:

Fix camera reset for nanovis. Includes refactoring of vector/matrix classes
in nanovis to consolidate into vrmath library. Also add preliminary canonical
view control to clients for testing.

Location:

trunk/gui/scripts

Files:

• flowvisviewer.tcl (modified) (9 diffs)
• nanovisviewer.tcl (modified) (7 diffs)

trunk/gui/scripts/flowvisviewer.tcl

@@ -123 +123 @@
     private method streams { tag name } 
     private method arrows { tag name } 
+    private method SetOrientation {}
 
     private variable _arcball ""
@@ -318 +319 @@
     pack $itk_component(volume) -padx 2 -pady 2
 
-    BuildViewTab
-    BuildVolumeTab
-    BuildCutplanesTab
-    BuildCameraTab
+    if { [catch {
+        BuildViewTab
+        BuildVolumeTab
+        BuildCutplanesTab
+        BuildCameraTab
+    } errs] != 0 } {
+        global errorInfo
+        puts stderr "errs=$errs errorInfo=$errorInfo"
+    }
 
     bind $itk_component(3dview) <Configure> \
@@ -959 +965 @@
         $_arcball quaternion $q
         SendCmd "camera orient $q"
-        #SendCmd "camera reset"
+        SendCmd "camera reset"
         PanCamera
         SendCmd "camera zoom $_view(zoom)"
@@ -1257 +1263 @@
     $_arcball quaternion $q
     SendCmd "camera orient $q"
-    #SendCmd "camera reset"
+    SendCmd "camera reset"
     PanCamera
     SendCmd "camera zoom $_view(zoom)"
@@ -1367 +1373 @@
             $_arcball quaternion $q
             SendCmd "camera orient $q"
-            #SendCmd "camera reset"
-            SendCmd "camera zoom $_view(zoom)"
+            SendCmd "camera reset"
             set _settings($this-qw)    $_view(qw)
             set _settings($this-qx)    $_view(qx)
@@ -1376 +1381 @@
             set _settings($this-pan-y) $_view(pan-y)
             set _settings($this-zoom)  $_view(zoom)
+            $itk_component(orientation) value "default" 
         }
     }
@@ -2387 +2393 @@
     $inner configure -borderwidth 4
 
+    set row 0
+    label $inner.orientation_l -text "View" -font "Arial 9" 
+    itk_component add orientation { 
+        Rappture::Combobox $inner.orientation -width 10 -editable no 
+    }
+    $inner.orientation choices insert end \
+        "1 0 0 0" "front" \
+        "0 0 1 0" "back" \
+        "0.707107 -0.707107 0 0" "top" \
+        "0.707107 0.707107 0 0" "bottom" \
+        "0.707107 0 -0.707107 0" "left" \
+        "0.707107 0 0.707107 0" "right" \
+        "0.853553 -0.353553 0.353553 0.146447" "default"
+    $itk_component(orientation) value "default" 
+    bind $inner.orientation <<Value>> [itcl::code $this SetOrientation]
+    if 1 {
+    blt::table $inner \
+            $row,0 $inner.orientation_l -anchor e -pady 2 \
+            $row,1 $inner.orientation -anchor w -pady 2 -fill x 
+    blt::table configure $inner r$row -resize none
+    incr row
+    }
+
     set labels { qw qx qy qz pan-x pan-y zoom }
-    set row 0
     foreach tag $labels {
         label $inner.${tag}label -text $tag -font "Arial 9"
@@ -2611 +2639 @@
                 }
                 "qx" - "qy" - "qz" - "qw" {
+                    set _view($who) $_settings($this-$who)
                     set q [list $_view(qw) $_view(qx) $_view(qy) $_view(qz)]
                     $_arcball quaternion $q
@@ -2986 +3015 @@
 }
 
+itcl::body Rappture::FlowvisViewer::SetOrientation {} { 
+    set quat [$itk_component(orientation) value]
+    set quat [$itk_component(orientation) translate $quat]
+    foreach name { qw qx qy qz } comp $quat {
+        set _view($name) $comp
+        set _settings($this-$name) $comp
+    } 
+    set q [list $_view(qw) $_view(qx) $_view(qy) $_view(qz)]
+    $_arcball quaternion $q
+    SendCmd "camera orient $q" 
+    SendCmd "camera reset"
+    set $_view(pan-x) 0.0
+    set $_view(pan-y) 0.0
+    set $_view(zoom) 1.0
+    set _settings($this-pan-x) $_view(pan-x)
+    set _settings($this-pan-y) $_view(pan-y)
+    set _settings($this-zoom)  $_view(zoom)
+}

trunk/gui/scripts/nanovisviewer.tcl

@@ -286 +286 @@
     pack $itk_component(volume) -padx 2 -pady 2
 
-    BuildViewTab
-    BuildVolumeTab
-    BuildCutplanesTab
-    BuildCameraTab
+    if { [catch {
+        BuildViewTab
+        BuildVolumeTab
+        BuildCutplanesTab
+        BuildCameraTab
+    } errs] != 0 } {
+        global errorInfo
+        puts stderr "errs=$errs errorInfo=$errorInfo"
+    }
 
     # Legend
@@ -913 +918 @@
         $_arcball quaternion $q
         SendCmd "camera orient $q"
-        #SendCmd "camera reset"
+        SendCmd "camera reset"
         PanCamera
         SendCmd "camera zoom $_view(zoom)"
@@ -1023 +1028 @@
             $_arcball quaternion $q
             SendCmd "camera orient $q"
-            #SendCmd "camera reset"
-            SendCmd "camera zoom $_view(zoom)"
+            SendCmd "camera reset"
             set _settings($this-qw)    $_view(qw)
             set _settings($this-qx)    $_view(qx)
@@ -1032 +1036 @@
             set _settings($this-pan-y) $_view(pan-y)
             set _settings($this-zoom)  $_view(zoom)
+            $itk_component(orientation) value "default" 
         }
     }
@@ -1892 +1897 @@
     $inner configure -borderwidth 4
 
+    set row 0
+    label $inner.orientation_l -text "View" -font "Arial 9" 
+    itk_component add orientation { 
+        Rappture::Combobox $inner.orientation -width 10 -editable no 
+    }
+    $inner.orientation choices insert end \
+        "1 0 0 0" "front" \
+        "0 0 1 0" "back" \
+        "0.707107 -0.707107 0 0" "top" \
+        "0.707107 0.707107 0 0" "bottom" \
+        "0.707107 0 -0.707107 0" "left" \
+        "0.707107 0 0.707107 0" "right" \
+        "0.853553 -0.353553 0.353553 0.146447" "default"
+    $itk_component(orientation) value "default" 
+    bind $inner.orientation <<Value>> [itcl::code $this SetOrientation]
+    if 1 {
+    blt::table $inner \
+            $row,0 $inner.orientation_l -anchor e -pady 2 \
+            $row,1 $inner.orientation -anchor w -pady 2 -fill x 
+    blt::table configure $inner r$row -resize none
+    incr row
+    }
+
     set labels { qw qx qy qz pan-x pan-y zoom }
-    set row 0
     foreach tag $labels {
         label $inner.${tag}label -text $tag -font "Arial 9"
@@ -2001 +2028 @@
                 }
                 "qx" - "qy" - "qz" - "qw" {
+                    set _view($who) $_settings($this-$who)
                     set q [list $_view(qw) $_view(qx) $_view(qy) $_view(qz)]
                     $_arcball quaternion $q
@@ -2072 +2100 @@
     SendCmd "volume statue $bool $name"
 }
+
+itcl::body Rappture::NanovisViewer::SetOrientation {} { 
+    set quat [$itk_component(orientation) value]
+    set quat [$itk_component(orientation) translate $quat]
+    foreach name { qw qx qy qz } comp $quat {
+        set _view($name) $comp
+        set _settings($this-$name) $comp
+    } 
+    set q [list $_view(qw) $_view(qx) $_view(qy) $_view(qz)]
+    $_arcball quaternion $q
+    SendCmd "camera orient $q" 
+    SendCmd "camera reset"
+    set $_view(pan-x) 0.0
+    set $_view(pan-y) 0.0
+    set $_view(zoom) 1.0
+    set _settings($this-pan-x) $_view(pan-x)
+    set _settings($this-pan-y) $_view(pan-y)
+    set _settings($this-zoom)  $_view(zoom)
+}