Changeset 3969 for trunk/gui

Timestamp:

Oct 1, 2013 5:36:54 PM (11 years ago)

Author:

gah

Message:

add orthogonal views to camera tab.

Location:

trunk/gui/scripts

Files:

• field.tcl (modified) (1 diff)
• vtkvolumeviewer.tcl (modified) (10 diffs)

trunk/gui/scripts/field.tcl

@@ -1806 +1806 @@
     set _comp2limits($cname) $limits
 
-    set tmpfile $cname[pid].vtk
+    set tmpfile $this-$cname.vtk
     set writer $this-datasetwriter
     vtkDataSetWriter $writer

trunk/gui/scripts/vtkvolumeviewer.tcl

@@ -64 +64 @@
     public method updateTransferFunctions {}
 
+    private method SetOrientation { side }
     private method HideAllMarkers {} 
     private method GetColormap { cname color } 
@@ -1555 +1556 @@
     set h [winfo height $c]
     set h [expr {$h-$lineht-20}]
-    puts stderr "legend w=$w h=$h"
+    set w [expr {$w-20}]
     # Set the legend on the first volume dataset.
     foreach dataset [CurrentDatasets -visible $_first] {
@@ -1777 +1778 @@
         [itcl::code $this AdjustSetting volumeColormap]
 
-    label $inner.blendmode_l -text "Blend Mode" -font "Arial 9" 
+    label $inner.blendmode_l -text "Blend Mode" -font $font
     itk_component add blendmode {
         Rappture::Combobox $inner.blendmode -editable no
@@ -1795 +1796 @@
         1,0 $inner.field_l   -anchor e -cspan 2  \
         1,2 $inner.field               -cspan 3 -fill x \
-        2,1 $inner.lighting_l -anchor w -cspan 4 \
+        2,0 $inner.lighting_l -anchor w -cspan 4 \
         3,1 $inner.lighting   -anchor w -cspan 3 \
         4,1 $inner.ambient_l       -anchor e -pady 2 \
@@ -1808 +1809 @@
         9,1 $inner.quality_l -anchor e -pady 2 \
         9,2 $inner.quality                     -cspan 3 -fill x \
-        10,1 $inner.transferfunction_l -anchor w              -cspan 4 \
+        10,0 $inner.transferfunction_l -anchor w              -cspan 4 \
         11,1 $inner.opacity_l -anchor e -pady 2 \
         11,2 $inner.opacity                    -cspan 3 -fill x \
@@ -1896 +1897 @@
     $inner configure -borderwidth 4
 
+    label $inner.view_l -text "view" -font "Arial 9"
+    set f [frame $inner.view]
+    foreach side { front back left right top bottom } {
+        button $f.$side  -image [Rappture::icon view$side] \
+            -command [itcl::code $this SetOrientation $side]
+        Rappture::Tooltip::for $f.$side "Change the view to $side"
+        pack $f.$side -side left
+    }
+    blt::table $inner \
+        0,0 $inner.view_l -anchor e -pady 2 \
+        0,1 $inner.view -anchor w -pady 2
+
+    set row 1
+
     set labels { qx qy qz qw xpan ypan zoom }
-    set row 0
     foreach tag $labels {
         label $inner.${tag}label -text $tag -font "Arial 9"
@@ -1920 +1934 @@
     incr row
 
-    blt::table configure $inner c0 c1 -resize none
+    blt::table configure $inner r* c0 c1 -resize none
     blt::table configure $inner c2 -resize expand
     blt::table configure $inner r$row -resize expand
@@ -2221 +2235 @@
         }
         $_image(legend) configure -data $bytes
-        puts stderr "read $size bytes for [image width $_image(legend)]x[image height $_image(legend)] legend>"
+        #puts stderr "read $size bytes for [image width $_image(legend)]x[image height $_image(legend)] legend>"
         if { [catch {DrawLegend} errs] != 0 } {
             puts stderr errs=$errs
@@ -2634 +2648 @@
     set _cname2transferFunction($cname) [list $cmap $wmap]
     SendCmd [list colormap add $cname $cmap $wmap]
-    DrawLegend
+    EventuallyRequestLegend
 }
 
@@ -2648 +2662 @@
         ComputeTransferFunction $cname
     }
-    DrawLegend
+    EventuallyRequestLegend
+}
+
+itcl::body Rappture::VtkVolumeViewer::SetOrientation { side } { 
+    array set positions {
+        front "1 0 0 0"
+        back  "0 0 1 0"
+        left  "0.707107 0 -0.707107 0"
+        right "0.707107 0 0.707107 0"
+        top   "0.707107 -0.707107 0 0"
+        bottom "0.707107 0.707107 0 0"
+    }
+    foreach name { qw qx qy qz } value $positions($side) {
+        set _view($name) $value
+    } 
+    set q [list $_view(qw) $_view(qx) $_view(qy) $_view(qz)]
+    $_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)
 }