Changeset 11 for trunk/gui/scripts/scroller.tcl

Timestamp:

May 30, 2005, 9:33:49 PM (19 years ago)

Author:

mmc

Message:

Major reorganization of the entire package. The config.xml file
is now irrelevant. All the action is in the tool.xml file. The
main program now organizes all input into 1) side-by-side pages,
2) input/result (wizard-style) pages, or 3) a series of wizard-
style pages. The <input> can have <phase> parts representing
the various pages.

Added a new ContourResult? widget based on Swaroop's vtk plotting
code.

Also, added easymesh and showmesh to the "tools" directory.
We need these for Eric Polizzi's code.

File:

• trunk/gui/scripts/scroller.tcl (modified) (9 diffs)

trunk/gui/scripts/scroller.tcl

@@ -9 +9 @@
 # ======================================================================
 #  AUTHOR:  Michael McLennan, Purdue University
-#  Copyright (c) 2004  Purdue Research Foundation, West Lafayette, IN
+#  Copyright (c) 2004-2005
+#  Purdue Research Foundation, West Lafayette, IN
 # ======================================================================
 package require Itk
@@ -32 +33 @@
     protected method _widget2sbar {which args}
     protected method _fixsbar {which {state ""}}
-    protected method _fixframe {}
+    protected method _fixframe {which}
     protected method _lock {option}
 
@@ -100 +101 @@
     if {$widget == "frame"} {
         if {$_frame == ""} {
-            set _frame [canvas $itk_component(hull).ifr]
-            bind $_frame <Configure> [itcl::code $this _resizeframe]
+            set _frame [canvas $itk_component(hull).ifr -highlightthickness 0]
+            frame $_frame.f
+            $_frame create window 0 0 -anchor nw -window $_frame.f -tags frame
+            bind $_frame.f <Configure> [itcl::code $this _fixframe inner]
+            bind $_frame <Configure> [itcl::code $this _fixframe outer]
         }
         set widget $_frame
@@ -119 +123 @@
     set _contents $widget
 
+    if {$widget == $_frame} {
+        return $_frame.f
+    }
     return $widget
 }
@@ -149 +156 @@
 itcl::body Rappture::Scroller::_fixsbar {which {state ""}} {
     if {$state == ""} {
-        switch -- $itk_option(-${which}scrollmode) {
+        switch -- [string tolower $itk_option(-${which}scrollmode)] {
             on - 1 - true - yes  { set state 1 }
             off - 0 - false - no { set state 0 }
@@ -161 +168 @@
                 }
             }
+            default {
+                set state 0
+            }
         }
     }
@@ -187 +197 @@
 
 # ----------------------------------------------------------------------
-# USAGE: _fixframe
+# USAGE: _fixframe <which>
 #
 # Invoked automatically whenever the canvas representing the "frame"
@@ -193 +203 @@
 # to the new size.
 # ----------------------------------------------------------------------
-itcl::body Rappture::Scroller::_fixframe {} {
-    $_frame configure -scrollregion [$_frame bbox all]
+itcl::body Rappture::Scroller::_fixframe {which} {
+    switch -- $which {
+        inner {
+            $_frame configure -scrollregion [$_frame bbox all]
+        }
+        outer {
+            $_frame itemconfigure frame -width [winfo width $_frame]
+        }
+    }
 }
 
@@ -248 +265 @@
 itcl::configbody Rappture::Scroller::width {
     if {$itk_option(-width) == "0"} {
+        if {$itk_option(-height) == "0"} {
+            grid propagate $itk_component(hull) yes
+        } else {
+            component hull configure -width 1i
+        }
+    } else {
+        grid propagate $itk_component(hull) no
+        component hull configure -width $itk_option(-width)
+    }
+}
+
+# ----------------------------------------------------------------------
+# OPTION: -height
+# ----------------------------------------------------------------------
+itcl::configbody Rappture::Scroller::height {
+    if {$itk_option(-height) == "0"} {
         if {$itk_option(-width) == "0"} {
             grid propagate $itk_component(hull) yes
         } else {
-            component hull configure -width 1i
-        }
-    } else {
-        grid propagate $itk_component(hull) no
-        component hull configure -width $itk_option(-width)
-    }
-}
-
-# ----------------------------------------------------------------------
-# OPTION: -height
-# ----------------------------------------------------------------------
-itcl::configbody Rappture::Scroller::height {
-    if {$itk_option(-height) == "0"} {
-        if {$itk_option(-height) == "0"} {
-            grid propagate $itk_component(hull) yes
-        } else {
             component hull configure -height 1i
         }