Changes in trunk/gui/scripts/deviceLayout1D.tcl [11:24]

File:

• trunk/gui/scripts/deviceLayout1D.tcl (modified) (12 diffs)

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
@@ -203 +231 @@
         # get the default system of units
         set units [set defunits [$_device get units]]
-        if {$units == "arbitrary"} {
+        if {$units == "arbitrary" || $units == ""} {
             set defunits "m"
             set units "um"
@@ -212 +240 @@
                 box* {
                     # get x-coord for each corner
-                    set c0 [lindex [$_device get components.$nn.corner0] 0]
+                    set c0 [$_device get components.$nn.corner0]
+                    regsub -all , $c0 { } c0
+                    set c0 [lindex $c0 0]
                     set c0 [Rappture::Units::convert $c0 \
                         -context $defunits -to $units -units off]
 
-                    set c1 [lindex [$_device get components.$nn.corner1] 0]
+                    set c1 [$_device get components.$nn.corner1]
+                    regsub -all , $c1 { } c1
+                    set c1 [lindex $c1 0]
                     set c1 [Rappture::Units::convert $c1 \
                         -context $defunits -to $units -units off]
@@ -310 +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)}]
@@ -357 +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)}]
@@ -370 +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
 }
@@ -385 +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)}]
@@ -396 +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}]
 
     #