Changeset 2497

Timestamp:

Sep 8, 2011 8:59:43 PM (13 years ago)

Author:

gah

Message:

 

File:

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

trunk/gui/scripts/vtkviewer.tcl

@@ -185 +185 @@
     # Initialize the view to some default parameters.
     array set _view {
+        qw              1
         qx              0
         qy              0
         qz              0
-        qw              1
         zoom            1.0 
         pan-x           0
@@ -206 +206 @@
         grid-z          0
         visible         1
+        labels          1
     }]
     array set _volume [subst {
@@ -417 +418 @@
     set q [list $_view(qw) $_view(qx) $_view(qy) $_view(qz)]
     SendCmd "camera orient $q" 
-
-    #SendCmd "ppmflush"
-
+    puts stderr "q=$q"
     set _rotatePending 0
 }
@@ -878 +877 @@
         SendCmd "camera mode persp"
     }
-    SendCmd "camera orient $q" 
+    DoRotate
     PanCamera
+    set _first [lindex [get -objects] 0] 
     if { $_reset || $_first == "" } {
         Zoom reset
         set _reset 0
     }
-    FixSettings axis-grid-x axis-grid-y axis-grid-z axis-mode axis-visible \
+    FixSettings axis-grid-x axis-grid-y axis-grid-z axis-mode \
+        axis-visible axis-labels \
         streamlines-seeds streamlines-visible streamlines-opacity \
         volume-edges volume-lighting volume-opacity volume-visible \
@@ -920 +921 @@
         }
     }
-
     if { !$_haveStreams } {
         $itk_component(main) disable "Streams Settings" 
@@ -930 +930 @@
         }
     }
-
+    foreach axis { x y z } {
+        set label [$_first hints ${axis}label]
+        if { $label != "" } {
+            SendCmd "axis name $axis $label"
+        }
+        set units [$_first hints ${axis}units]
+        if { $units != "" } {
+            SendCmd "axis units $axis $units"
+        }
+    }
+        
     set _buffering 0;                        # Turn off buffering.
 
@@ -1006 +1016 @@
         "reset" {
             array set _view {
-                qx      0
-                qy      0
-                qz      0
-                qw      1
+                qw      1
+                qx      0
+                qy      0
+                qz      0
                 zoom    1.0
                 pan-x   0
@@ -1023 +1033 @@
             set q [list $_view(qw) $_view(qx) $_view(qy) $_view(qz)]
             $_arcball quaternion $q
+            DoRotate
         }
     }
@@ -1206 +1217 @@
             set bool $_axis(visible)
             SendCmd "axis visible all $bool"
+        }
+        "axis-labels" {
+            set bool $_axis(labels)
+            #SendCmd "axis labels all $bool"
         }
         "axis-grid-x" {
@@ -1581 +1596 @@
         -font "Arial 9"
 
+    checkbutton $inner.labels \
+        -text "Show Axis Labels" \
+        -variable [itcl::scope _axis(labels)] \
+        -command [itcl::code $this AdjustSetting axis-labels] \
+        -font "Arial 9"
+
     checkbutton $inner.gridx \
         -text "Show X Grid" \
@@ -1607 +1628 @@
         "furthest_triad"  "furthest" \
         "outer_edges"     "outer"         
-    $itk_component(axismode) value "outer"
+    $itk_component(axismode) value "static"
     bind $inner.mode <<Value>> [itcl::code $this AdjustSetting axis-mode]
 
     blt::table $inner \
         0,0 $inner.visible -anchor w -pady 2 -cspan 2 \
-        1,0 $inner.gridx   -anchor w -pady 2 -cspan 2 \
-        2,0 $inner.gridy   -anchor w -pady 2 -cspan 2 \
-        3,0 $inner.gridz   -anchor w -pady 2 -cspan 2 \
-        4,0 $inner.mode_l  -anchor w -pady 2 \
-        4,1 $inner.mode    -fill x   -pady 2
+        1,0 $inner.labels  -anchor w -pady 2 -cspan 2 \
+        2,0 $inner.gridx   -anchor w -pady 2 -cspan 2 \
+        3,0 $inner.gridy   -anchor w -pady 2 -cspan 2 \
+        4,0 $inner.gridz   -anchor w -pady 2 -cspan 2 \
+        5,0 $inner.mode_l  -anchor w -pady 2 \
+        5,1 $inner.mode    -fill x   -pady 2
 
     blt::table configure $inner r* c* -resize none
-    blt::table configure $inner r5 c2 -resize expand
+    blt::table configure $inner r6 c1 -resize expand
 }
 
@@ -1820 +1842 @@
         array set settings $style
         SendCmd "glyphs add sphere $tag"
+        SendCmd "glyphs shape sphere $tag"
         SendCmd "glyphs gscale $settings(-gscale) $tag"
-        #SendCmd "glyphs wireframe $settings(-wireframe) $tag"
+        SendCmd "glyphs wireframe $settings(-wireframe) $tag"
         #SendCmd "glyphs ccolor [Color2RGB $settings(-color)] $tag"
         #SendCmd "glyphs colormode ccolor $tag"
         SendCmd "glyphs smode vcomp $tag"
-        #SendCmd "glyphs opacity $settings(-opacity) $tag"
+        SendCmd "glyphs opacity $settings(-opacity) $tag"
         SendCmd "glyphs visible $settings(-visible) $tag"
         set _haveSpheres 1
@@ -1840 +1863 @@
         }
         array set settings $style
-        parray settings
         SendCmd "polydata add $tag"
         SendCmd "polydata visible $settings(-visible) $tag"