Changeset 24 for trunk/gui/scripts/deviceViewer1D.tcl

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.

File:

• trunk/gui/scripts/deviceViewer1D.tcl (modified) (7 diffs)

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
 }