Changeset 1252 for trunk

Timestamp:

Dec 2, 2008 5:24:57 PM (15 years ago)

Author:

gah

Message:

Added drawer for xyresult legend

Location:

trunk/gui/scripts

Files:

• xylegend.tcl (modified) (1 diff)
• xyresult.tcl (modified) (6 diffs)

trunk/gui/scripts/xylegend.tcl

@@ -108 +108 @@
 itcl::body Rappture::XyLegend::constructor { graph args } {
     option add hull.width hull.height
+    pack propagate $itk_component(hull) no
     itk_component add scrollbars {
         Rappture::Scroller $itk_interior.scrl \
-            -xscrollmode auto -yscrollmode auto 
+            -xscrollmode auto -yscrollmode auto \
+            -width 200 -height 100
     }
     set tree_ [blt::tree create]
     itk_component add legend {
         blt::treeview $itk_component(scrollbars).legend -linewidth 0 \
-            -bg white -selectmode multiple -width 0 \
+            -bg white -selectmode multiple \
             -highlightthickness 0 \
             -tree $tree_ \

trunk/gui/scripts/xyresult.tcl

@@ -100 +100 @@
 
     private variable _dispatcher "" ;# dispatcher for !events
-
     private variable _clist ""     ;# list of curve objects
     private variable _curve2color  ;# maps curve => plotting color
@@ -118 +117 @@
     private variable _markers
     private variable cur_ ""
+    private variable initialized_ 0
 }
                                                                                 
 itk::usual XyResult {
     keep -background -foreground -cursor -font
+}
+
+itk::usual Panedwindow {
+    keep -background -cursor
 }
 
@@ -159 +163 @@
     pack $itk_component(reset) -padx 4 -pady 2 -anchor e
     Rappture::Tooltip::for $itk_component(reset) "Reset the view to the default zoom level"
-
+    itk_component add drawer {
+        panedwindow $itk_interior.drawer \
+            -orient horizontal -opaqueresize 1 -handlepad 0 \
+            -handlesize 1 -sashwidth 2     
+    }
+    pack $itk_component(drawer) -expand yes -fill both
     itk_component add plot {
-        blt::graph $itk_interior.plot \
+        blt::graph $itk_component(drawer).plot \
             -highlightthickness 0 -plotpadx 0 -plotpady 0 \
             -rightmargin 10
@@ -167 +176 @@
         keep -background -foreground -cursor -font
     }
-    pack $itk_component(plot) -expand yes -fill both
+    $itk_component(drawer) add $itk_component(plot) -sticky nsew
     $itk_component(plot) pen configure activeLine \
         -symbol square -pixels 3 -linewidth 2 \
@@ -251 +260 @@
     
     itk_component add legend {
-        Rappture::XyLegend $itk_component(controls).legend $itk_component(plot)
+        Rappture::XyLegend $itk_component(drawer).legend $itk_component(plot)
     }
     after idle [subst {
@@ -1577 +1586 @@
     switch -- ${what} {
         "activate" {
-            pack $itk_component(legend) -expand yes -fill both 
+            $itk_component(drawer) add $itk_component(legend) -sticky nsew
             after idle [list focus $itk_component(legend)]
+            if { !$initialized_ } {
+                set w [winfo width $itk_component(drawer)]
+                set x [expr $w - 100]
+                $itk_component(drawer) sash place 0 $x 0
+                set initialized_ 1
+            }
         }
         "deactivate" {
-            pack forget $itk_component(legend) 
+            $itk_component(drawer) forget $itk_component(legend)
         }
         "toggle" {
-            set slaves [pack slave $itk_component(controls)]
+            set slaves [$itk_component(drawer) panes]
             if { [lsearch $slaves $itk_component(legend)] >= 0 } {
                 legend deactivate