Changeset 24

Timestamp:

Jul 17, 2005 11:14:06 PM (19 years ago)

Author:

mmc

Message:

Fixed the device viewer to resize itself properly based on its
contents. The device layout takes into account the size of any
icon for a material layer, so a picture of a device can be embedded
by creating a single layer with an icon.

Fixed the Gauge to resize its icon area properly when the -spectrum
is configured later on.

Location:

trunk/gui/scripts

Files:

• deviceEditor.tcl (modified) (2 diffs)
• deviceLayout1D.tcl (modified) (10 diffs)
• deviceViewer1D.tcl (modified) (7 diffs)
• gauge.tcl (modified) (2 diffs)
• moleculeViewer.tcl (modified) (1 diff)
• pager.tcl (modified) (1 diff)

trunk/gui/scripts/deviceEditor.tcl

@@ -13 +13 @@
 package require Itk
 
-option add *DeviceEditor.width 5i widgetDefault
-option add *DeviceEditor.height 5i widgetDefault
 option add *DeviceEditor.autoCleanUp yes widgetDefault
 
@@ -41 +39 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::DeviceEditor::constructor {owner args} {
-    itk_option add hull.width hull.height
-    pack propagate $itk_component(hull) no
-
     itk_component add top {
         frame $itk_interior.top

trunk/gui/scripts/deviceLayout1D.tcl

@@ -90 +90 @@
         ignore -highlightthickness -highlightbackground -highlightcolor
     }
-    pack $itk_component(area) -fill both
+    pack $itk_component(area) -expand yes -fill both
     bind $itk_component(area) <Configure> \
         [list $_dispatcher event -idle !redraw]
 
     eval itk_initialize $args
+
+    set _sizes(header) 1
+    set _sizes(bararea) 1
 }
 
@@ -163 +166 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::DeviceLayout1D::_layout {} {
-    # first, recompute the overall height of this widget
-    set h [expr {$_sizes(bar)+$_sizes(bar45)+2}]
+    #
+    # First, recompute the overall height of this widget...
+    #
+    # size of an ordinary material bar:
+    set hmax [expr {$_sizes(bar)+$_sizes(bar45)+2}]
+
+    # add the maximum size of any embedded icons:
+    if {$_device != ""} {
+        foreach nn [$_device children components] {
+            set icon [$_device get components.$nn.about.icon]
+            if {"" != $icon} {
+                if {[info exists _icons($icon)]} {
+                    set imh $_icons($icon)
+                } else {
+                    set imh [image create photo -data $icon]
+                    set _icons($icon) $imh
+                }
+
+                set h [image height $_icons($icon)]
+                if {$h > $hmax} {
+                    set hmax $h
+                }
+            }
+        }
+    }
+    set _sizes(bararea) $hmax
 
     set fnt $itk_option(-font)
@@ -171 +198 @@
         if {"" != $m} {
             set extra [expr {1.5*[font metrics $fnt -linespace]}] 
-            set h [expr {$h+$extra}]
+            set hmax [expr {$hmax+$extra}]
             break
         }
@@ -181 +208 @@
             if {"" != [$_device get components.$nn.about.label]} {
                 set extra [expr {1.2*[font metrics $fnt -linespace]}] 
-                set h [expr {$h+$extra}]
+                set hmax [expr {$hmax+$extra}]
                 break
             }
@@ -188 +215 @@
 
     set oldh [component hull cget -height]
-    if {$h != $oldh} {
-        component hull configure -height $h
+    if {$hmax != $oldh} {
+        component hull configure -height $hmax
         $_dispatcher event -idle !redraw
     }
+    set _sizes(header) [expr {$hmax - $_sizes(bararea)}]
 
     # next, scan through the device and compute layer positions
@@ -314 +342 @@
 itcl::body Rappture::DeviceLayout1D::_drawLayer {index x0 x1} {
     set c $itk_component(area)
-    set h [expr {[winfo height $c]-1}]
-
-    set y0 $h
+    set h [expr {$_sizes(header) + $_sizes(bararea) - 1}]
+
+    set bsize [expr {$_sizes(bar)+$_sizes(bar45)+2}]
+    set y0 [expr {$h - 0.5*$_sizes(bararea) + 0.5*$bsize}]
     set y0p [expr {$y0-$_sizes(bar45)}]
     set y1p [expr {$y0-$_sizes(bar)}]
@@ -361 +390 @@
 itcl::body Rappture::DeviceLayout1D::_drawIcon {index x0 x1 imh} {
     set c $itk_component(area)
-    set h [expr {[winfo height $c]-1}]
-
-    set y0 $h
+    set h [expr {$_sizes(header) + $_sizes(bararea) - 1}]
+
+    set bsize [expr {$_sizes(bar)+$_sizes(bar45)+2}]
+    set y0 [expr {$h - 0.5*$_sizes(bararea) + 0.5*$bsize}]
     set y0p [expr {$y0-$_sizes(bar45)}]
     set y1p [expr {$y0-$_sizes(bar)}]
@@ -374 +404 @@
     set y [expr {0.5*($y0+$y0p) + 0.5*($y1-$y0p)}]
 
-    ##set lcolor $itk_option(-deviceoutline)
-    ##$c create line $xx0 $y $xx1 $y -width 3
-
     $c create image [expr {0.5*($xx0+$xx1)}] $y -anchor c -image $imh
 }
@@ -389 +416 @@
 itcl::body Rappture::DeviceLayout1D::_drawAnnotation {index x0 x1} {
     set c $itk_component(area)
-    set h [expr {[winfo height $c]-1}]
-
-    set y0 $h
-    set y1 [expr {$y0-$_sizes(bar)-$_sizes(bar45)}]
-
+
+    set ytop [expr {$_sizes(header)+1}]
     set x0p [expr {$x0+$_sizes(bar45)}]
     set x1p [expr {$x1+$_sizes(bar45)}]
@@ -400 +424 @@
     set fnt $itk_option(-font)
     set lh [font metrics $fnt -linespace]
-    set ymid [expr {$y1-2-0.5*$lh}]
-    set y [expr {$y1-4}]
+    set ymid [expr {$ytop-2-0.5*$lh}]
+    set y [expr {$ytop-4}]
 
     #

trunk/gui/scripts/deviceViewer1D.tcl

@@ -16 +16 @@
 package require BLT
 
-option add *DeviceViewer1D.width 4i widgetDefault
-option add *DeviceViewer1D.height 4i widgetDefault
 option add *DeviceViewer1D.padding 4 widgetDefault
 option add *DeviceViewer1D.deviceSize 0.25i widgetDefault
@@ -34 +32 @@
     protected method _loadDevice {}
     protected method _changeTabs {}
+    protected method _fixSize {}
     protected method _fixAxes {}
     protected method _align {}
@@ -60 +59 @@
     set _owner $owner
 
-    itk_option add hull.width hull.height
     pack propagate $itk_component(hull) no
 
@@ -95 +93 @@
         blt::graph $itk_component(inner).graph \
             -highlightthickness 0 -plotpadx 0 -plotpady 0 \
-            -width 3i -height 3i
+            -width 4i -height 2i
     } {
         keep -background -foreground -cursor -font
@@ -120 +118 @@
 
     eval itk_initialize $args
+
+    _fixSize
 }
 
@@ -294 +294 @@
     $itk_component(graph) configure \
         -rightmargin [$itk_component(layout) extents bar3D]
+
+    _fixSize
 }
 
@@ -408 +410 @@
     after cancel [itcl::code $this _fixAxes]
     after 100 [itcl::code $this _fixAxes]
+}
+
+# ----------------------------------------------------------------------
+# USAGE: _fixSize
+#
+# Used internally to fix the overall size of this widget based on
+# the various parts inside.  Sets the requested width/height of the
+# widget so that it is big enough to display the device and its
+# fields.
+# ----------------------------------------------------------------------
+itcl::body Rappture::DeviceViewer1D::_fixSize {} {
+    update idletasks
+    set w [winfo reqwidth $itk_component(tabs)]
+    set h [winfo reqheight $itk_component(tabs)]
+    component hull configure -width $w -height $h
 }
 

trunk/gui/scripts/gauge.tcl

@@ -82 +82 @@
 itcl::body Rappture::Gauge::constructor {args} {
     itk_component add icon {
-        canvas $itk_interior.icon -borderwidth 0 -highlightthickness 0
+        canvas $itk_interior.icon -width 1 -height 1 \
+            -borderwidth 0 -highlightthickness 0
     } {
         usual
@@ -542 +543 @@
         error "bad option \"$itk_option(-spectrum)\": should be Rappture::Spectrum object"
     }
+    _resize
     _layout
     _redraw

trunk/gui/scripts/moleculeViewer.tcl

@@ -15 +15 @@
 package require BLT
 
-option add *MoleculeViewer.width 4i widgetDefault
-option add *MoleculeViewer.height 4i widgetDefault
+option add *MoleculeViewer.width 5i widgetDefault
+option add *MoleculeViewer.height 5i widgetDefault
 option add *MoleculeViewer.backdrop black widgetDefault
 

trunk/gui/scripts/pager.tcl

@@ -166 +166 @@
     set _pages [linsert $_pages $pos $params(-name)]
 
-    #bind $win <Configure> \
-    #    [itcl::code $_dispatcher event -idle !fixsize]
+    bind $win <Configure> \
+        [itcl::code $_dispatcher event -idle !fixsize]
 
     # the number of pages affects the arrangment -- force an update