Changeset 168 for trunk/gui/scripts

Timestamp:

Feb 8, 2006, 5:18:56 PM (19 years ago)

Author:

mmc

Message:

• Fixed the license terms to comply with the official open source license from Purdue's OTC office.

• Fixed the scroller to handle scrollbars properly. They weren't always popping up when needed. Sometimes you had to scroll a little first. Better now.

• Fixed the DeviceEditor? to pack its internal widgets better, so images within a DeviceViewer1D structure can change size and will show up properly.

• Fixed the analyzer to take down the progress bar properly when there's an error during execution.

• Fixed the Rappture::exec command to initialize execctl properly, in case there's an error during execution.

Location:

trunk/gui/scripts

Files:

• analyzer.tcl (modified) (2 diffs)
• deviceEditor.tcl (modified) (2 diffs)
• exec.tcl (modified) (1 diff)
• scroller.tcl (modified) (2 diffs)

trunk/gui/scripts/analyzer.tcl

@@ -156 +156 @@
     pack $itk_component(abort) -side left -expand yes -padx 4 -pady 4
 
-    Rappture::Scroller $w.info -xscrollmode off -yscrollmode auto
+    Rappture::Scroller $w.info -xscrollmode auto -yscrollmode auto
     pack $w.info -expand yes -fill both -padx 4 -pady 4
     itk_component add runinfo {
@@ -348 +348 @@
         $itk_component(notebook) current analyze
     }
+
+    # do this last -- after _simOutput above
+    pack forget $itk_component(progress)
 }
 

trunk/gui/scripts/deviceEditor.tcl

@@ -45 +45 @@
     }
     pack $itk_component(top) -fill x
-
-    itk_component add editors {
-        Rappture::Notebook $itk_interior.editors
-    }
-    pack $itk_component(editors) -expand yes -fill both
 
     eval itk_initialize $args
@@ -117 +112 @@
     switch -- [_type $_xmlobj] {
         molecule {
-            if {[catch {$itk_component(editors) page molecule} p]} {
-                set p [$itk_component(editors) insert end molecule]
-                Rappture::MoleculeViewer $p.mol $this
-                pack $p.mol -expand yes -fill both
+            if {![winfo exists $itk_component(hull).mol]} {
+                catch {destroy $itk_component(hull).dev}
+                Rappture::MoleculeViewer $itk_component(hull).mol $this
+                pack $itk_component(hull).mol -expand yes -fill both
             }
-            $p.mol configure -device $_xmlobj
-            $itk_component(editors) current molecule
+            $itk_component(hull).mol configure -device $_xmlobj
 
-            set _current $p.mol
+            set _current $itk_component(hull).mol
         }
         device1D {
-            if {[catch {$itk_component(editors) page device1D} p]} {
-                set p [$itk_component(editors) insert end device1D]
-                Rappture::DeviceViewer1D $p.dev $this
-                pack $p.dev -expand yes -fill both
+            if {![winfo exists $itk_component(hull).dev]} {
+                catch {destroy $itk_component(hull).mol}
+                Rappture::DeviceViewer1D $itk_component(hull).dev $this
+                pack $itk_component(hull).dev -expand yes -fill both
             }
-            $p.dev configure -device $_xmlobj
-            $itk_component(editors) current device1D
+            $itk_component(hull).dev configure -device $_xmlobj
 
-            set _current $p.dev
+            set _current $itk_component(hull).dev
         }
     }

trunk/gui/scripts/exec.tcl

@@ -33 +33 @@
     set execout(channel) ""
     set execout(extra) ""
+    set execctl ""
 
     set status [catch {eval blt::bgexec ::Rappture::execctl \

trunk/gui/scripts/scroller.tcl

@@ -78 +78 @@
         scrollbar $itk_interior.ysbar -orient vertical
     }
+
+    # we don't fix scrollbars when window is withdrawn, so
+    # fix them whenever a window pops up
+    bind $itk_component(hull) <Map> "
+        [itcl::code $this _fixsbar x]
+        [itcl::code $this _fixsbar y]
+    "
 
     grid rowconfigure $itk_component(hull) 0 -weight 1
@@ -177 +184 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::Scroller::_fixsbar {which {state ""}} {
+    if {![winfo ismapped $itk_component(hull)]} {
+        #
+        # If we're not on yet screen, bail out!  This keeps bad
+        # numbers (from an empty or partially constructed widget)
+        # from prematurely influencing the scrollbar.
+        #
+        return
+    }
+
     if {$state == ""} {
         switch -- [string tolower $itk_option(-${which}scrollmode)] {