Changeset 152 for trunk

Timestamp:

Dec 4, 2009 5:01:16 PM (14 years ago)

Author:

toby

Message:

# on 2000/05/18 15:58:18, toby did:
Add constraints support
move to 1st page before loading a new .EXP file in readnewexp
hange from grid/pack slaves to winfo children

File:

• trunk/expgui (modified) (11 diffs, 3 props)

trunk/expgui

@@ -128 +128 @@
 # commands for adding phases, histograms & atoms
 source [file join $expgui(scriptdir) addcmds.tcl]
+# commands for constraints
+source [file join $expgui(scriptdir) atomcons.tcl]
 #---------------------------------------------------------------------------
 # override options with locally defined values
@@ -326 +328 @@
     if {$newexpfile == ""} return 
 
+    # switch to the 1st page
+    RaisePage lsFrame
+
     if ![file exists $newexpfile] {
         # you've been warned this .EXP does not exist!
@@ -345 +350 @@
         set expgui(curhist) {}
     }
-    RaisePage lsFrame
     if {[CountHistory] > 100} {
         DeleteHistoryRecords "This .EXP file has [CountHistory] history records\nErasing most will speed EXPGUI"
@@ -674 +678 @@
 proc setphases {} {
     global expgui expmap
-    eval destroy [pack slaves $expgui(phaseFrame).top.ps]
+    eval destroy [winfo children $expgui(phaseFrame).top.ps]
     foreach num $expmap(phaselist) type $expmap(phasetype) {
         pack [button $expgui(phaseFrame).top.ps.$num -text $num \
@@ -1219 +1223 @@
         grid $expgui(histFrame).top -column 1 -row 0 -sticky nsew       
         set expgui(bkglbl) ""
-        eval destroy [grid slaves $expgui(diffBox)]
+        eval destroy [winfo children $expgui(diffBox)]
         set entrycmd(trace) 1
         return
@@ -1259 +1263 @@
     }
 
-    eval destroy [grid slaves $expgui(diffBox)]
+    eval destroy [winfo children $expgui(diffBox)]
     if {$expgui(globalmode) == 0} {
         if {[string range $expmap(htype_$hist) 2 2] == "T"} {
@@ -1595 +1599 @@
         # destroy the contents of the frame
         set phaseFractf1 $expgui(FracBox).f
-        eval destroy [grid slaves $phaseFractf1]
+        eval destroy [winfo children $phaseFractf1]
         # reenable traces on entryvar
         set entrycmd(trace) 1
@@ -1632 +1636 @@
     set phaseFractf1 $expgui(FracBox).f
     # destroy the contents of the frame
-    eval destroy [grid slaves $phaseFractf1]
+    eval destroy [winfo children $phaseFractf1]
     if {$expgui(globalmode) != 0} {
         set txt "Phase Fractions for Histograms: [CompressList $histlist]"
@@ -1712 +1716 @@
 
     # destroy the contents of the frame
-    eval destroy [grid slaves  $expgui(ProfileBox).f]
+    eval destroy [winfo children $expgui(ProfileBox).f]
 
     if {$expgui(globalmode) == 0} {
@@ -2183 +2187 @@
     global expgui expmap
     # destroy the contents of the frame
-    eval destroy [grid slaves  $w]
+    eval destroy [winfo children $w]
     set histlist {}
     foreach n $expgui(curhist) {
@@ -2437 +2441 @@
     lappend expgui(frameactionlist) "profFrame DisplayProfile"
     lappend expgui(GlobalModeAllDisable) "profFrame {.n itemconfigure profPane}"
+    set expgui(consFrame) [\
+            .n insert end consPane -text Constraints \
+            -raisecmd "set expgui(pagenow) consFrame; DisplayConstraintsPane"\
+            -createcmd MakeConstraintsPane]
+    lappend expgui(frameactionlist) "consFrame DisplayConstraintsPane"
 } else {
     Notebook:create .n -pages {lsFrame phaseFrame histFrame fracFrame profFrame}