Changeset 2649 for trunk

Timestamp:

Oct 26, 2011, 8:44:43 AM (13 years ago)

Author:

gah

Message:

add menu for additional fields in streamlines widget

File:

• trunk/gui/scripts/vtkstreamlinesviewer.tcl (modified) (10 diffs)

trunk/gui/scripts/vtkstreamlinesviewer.tcl

@@ -93 +93 @@
     private method ConvertToVtkData { dataobj comp } 
     private method DrawLegend { title }
+    private method Combo { option }
     private method EnterLegend { x y } 
     private method EventuallyResize { w h } 
@@ -152 +153 @@
     private variable _fields 
     private variable _currentField ""
+    private variable _field      ""
     private variable _numSeeds 200
     private variable _colorMode "vmag";#  Mode of colormap (vmag or scalar)
@@ -273 +275 @@
     }
 
+    itk_component add fieldmenu {
+        menu $itk_component(plotarea).menu -bg black -fg white -relief flat \
+            -tearoff no 
+    } {
+        usual
+        ignore -background -foreground -relief -tearoff
+    }
     set c $itk_component(view)
     bind $c <Configure> [itcl::code $this EventuallyResize %w %h]
@@ -1037 +1046 @@
         set _currentField [$_first hints default]
         $itk_component(field) choices delete 0 end
+        $itk_component(fieldmenu) delete 0 end
         array unset _fields
         foreach { name title units } [$_first hints vectors] {
             set _vectorFields($title) $name
             $itk_component(field) choices insert end "$name" "$title"
+            $itk_component(fieldmenu) add radiobutton -label "$title" \
+                -value $title -variable [itcl::scope _currentField] \
+                -selectcolor red \
+                -activebackground black \
+                -activeforeground white \
+                -font "Arial 8" \
+                -command [itcl::code $this Combo invoke]
             set _fields($name) [list $title $units]
         }
@@ -1046 +1063 @@
             set _scalarFields($title) $name
             $itk_component(field) choices insert end "$name" "$title"
+            $itk_component(fieldmenu) add radiobutton -label "$title" \
+                -value $title -variable [itcl::scope _currentField] \
+                -selectcolor red \
+                -activebackground black \
+                -activeforeground white \
+                -font "Arial 8" \
+                -command [itcl::code $this Combo invoke]
             set _fields($name) [list $title $units]
         }
@@ -1497 +1521 @@
             }
             foreach dataset [CurrentDatasets -visible] {
+                puts stderr "streamlines colormode $_colorMode ${name} $dataset"
+                puts stderr "cutplane colormode $_colorMode ${name} $dataset"
                 SendCmd "streamlines colormode $_colorMode ${name} $dataset"
                 SendCmd "cutplane colormode $_colorMode ${name} $dataset"
@@ -2513 +2539 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::VtkStreamlinesViewer::ReceiveLegend { colormap title vmin vmax size } {
-    #puts stderr "ReceiveLegend colormap=$colormap title=$title range=$vmin,$vmax size=$size"
+    puts stderr "ReceiveLegend colormap=$colormap title=$title range=$vmin,$vmax size=$size"
     set _limits(vmin) $vmin
     set _limits(vmax) $vmax
@@ -2525 +2551 @@
         $_image(legend) configure -data $bytes
         #puts stderr "read $size bytes for [image width $_image(legend)]x[image height $_image(legend)] legend>"
-        DrawLegend $_title
+        if { [catch {DrawLegend $_title} errs] != 0 } {
+            puts stderr errs=$errs
+        }
     }
 }
@@ -2575 +2603 @@
             $c bind colormap <Motion> [itcl::code $this MotionLegend %x %y]
         }
+        $c bind title <ButtonPress> [itcl::code $this Combo post]
+        $c bind title <Enter> [itcl::code $this Combo activate]
+        $c bind title <Leave> [itcl::code $this Combo deactivate]
         # Reset the item coordinates according the current size of the plot.
         $c itemconfigure title -text $title
@@ -2697 +2728 @@
     }
 }
+
+
+# ----------------------------------------------------------------------
+# USAGE: _dropdown post
+# USAGE: _dropdown unpost
+# USAGE: _dropdown select
+#
+# Used internally to handle the dropdown list for this combobox.  The
+# post/unpost options are invoked when the list is posted or unposted
+# to manage the relief of the controlling button.  The select option
+# is invoked whenever there is a selection from the list, to assign
+# the value back to the gauge.
+# ----------------------------------------------------------------------
+itcl::body Rappture::VtkStreamlinesViewer::Combo {option} {
+    set c $itk_component(view) 
+    switch -- $option {
+        post {
+            foreach { x1 y1 x2 y2 } [$c bbox title] break
+            set x1 [expr [winfo width $itk_component(view)] - [winfo reqwidth $itk_component(fieldmenu)]]
+            set x [expr $x1 + [winfo rootx $itk_component(view)]]
+            set y [expr $y2 + [winfo rooty $itk_component(view)]]
+            puts stderr "combo x=$x y=$y"
+            $itk_component(fieldmenu) post $x $y
+        }
+        activate {
+            $c itemconfigure title -fill red
+        }
+        deactivate {
+            $c itemconfigure title -fill white 
+        }
+        invoke {
+            $itk_component(field) value $_currentField
+            AdjustSetting streamlines-field
+        }
+        default {
+            error "bad option \"$option\": should be post, unpost, select"
+        }
+    }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+