Changeset 168 for trunk/gui/scripts/deviceEditor.tcl

Timestamp:

Feb 8, 2006, 5:18:56 PM (18 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.

File:

• trunk/gui/scripts/deviceEditor.tcl (modified) (2 diffs)

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
         }
     }