Changeset 782

Timestamp:

Jul 13, 2007, 6:44:44 PM (17 years ago)

Author:

mmc

Message:

Fixed the layout of controls so that large items like <note> and
<structure> will take up as much space as possible.

Added "package require Img" to device viewer, so it can recognize
embedded images in formats like png that are not usually supported
in Tcl/Tk?.

Location:

trunk/gui/scripts

Files:

• controls.tcl (modified) (3 diffs)
• deviceViewer1D.tcl (modified) (1 diff)

trunk/gui/scripts/controls.tcl

@@ -517 +517 @@
         set row 0
         foreach name $showing {
+            set expand 0  ;# most controls float to top
+
             set wl $_name2info($name-label)
             if {$wl != "" && [winfo exists $wl]} {
@@ -539 +541 @@
                             grid rowconfigure $_frame $row -weight 1
                             grid columnconfigure $_frame 1 -weight 1
+                            set expand 1
                         }
                     }
                     GroupEntry {
                         $wv configure -heading yes
+
+                        #
+                        # Scan through all children in this group
+                        # and see if any demand more space.  If the
+                        # group contains a structure or a note, then
+                        # make sure that the group itself is set to
+                        # expand/fill.
+                        #
+                        set queue [winfo children $wv]
+                        while {[llength $queue] > 0} {
+                            set w [lindex $queue 0]
+                            set queue [lrange $queue 1 end]
+                            set c [winfo class $w]
+                            if {[lsearch {DeviceEditor Note} $c] >= 0} {
+                                set expand 1
+                                break
+                            }
+                            eval lappend queue [winfo children $w]
+                        }
+                        if {$expand} {
+                            grid $wv -sticky nsew
+                            grid rowconfigure $_frame $row -weight 1
+                        }
                     }
                     Note {
                         grid $wv -sticky nsew
                         grid rowconfigure $_frame $row -weight 1
+                        set expand 1
                     }
                 }
@@ -566 +593 @@
         # hidden items come and go.
         #
-        if {[llength $hidden] > 0} {
+        if {[llength $hidden] > 0 && !$expand} {
             grid rowconfigure $_frame 99 -weight 1
         } else {

trunk/gui/scripts/deviceViewer1D.tcl

@@ -16 +16 @@
 # ======================================================================
 package require Itk
+package require Img
 package require BLT