Changeset 118

Timestamp:

Dec 4, 2009 5:00:42 PM (14 years ago)

Author:

toby

Message:

# on 1999/11/16 15:59:22, toby did:
Switch over to use of pure Tk notebook widget when Tix is not present
define expgui(initstring) for user-defined initializations

File:

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

trunk/expgui

@@ -7 +7 @@
 # need to change heading and button label depending on where getExpFileName
 # is called from
-#
-# fixup documentation and you are done!
 #
 # global background editing & profile work differently: should both 
@@ -74 +72 @@
 set liveplot(legend) 1
 set expgui(filesort) 1
+set expgui(initstring) {}
 #=============================================================================
 # Store names of profile terms.
@@ -125 +124 @@
 # commands for adding phases, histograms & atoms
 source [file join $expgui(scriptdir) addcmds.tcl]
+# get the notebook widget if not using Tix
+if {!$expgui(havetix)} {source $expgui(scriptdir)/notebook.tcl}
 #---------------------------------------------------------------------------
 # override options with locally defined values
@@ -319 +320 @@
         set expgui(curhist) {}
     }
-    if !$expgui(havetix) {
-        RaisePage lsFrame
-    } else {
-        .n raise lsPane
-        set expgui(pagenow) lsFrame
-    }
+    RaisePage lsFrame
     if {[CountHistory] > 100} {
         DeleteHistoryRecords "This .EXP file has [CountHistory] history records\nErasing most will speed EXPGUI"
@@ -980 +976 @@
         foreach pair $expgui(GlobalModeAllDisable) {
             if {$expgui(pagenow) == [lindex $pair 0]} {
-                if !$expgui(havetix) {
-                    RaisePage lsFrame
-                } else {
-                    .n raise lsPane
-                    set expgui(pagenow) lsFrame
-                }
+                RaisePage lsFrame
             }
             eval [lindex $pair 1] -state disabled
@@ -2279 +2270 @@
 if $expgui(havetix) {
     pack [tixNoteBook .n] -expand yes -fill both
-    .n add lsPane -label "LS Controls" -underline 0
-    .n pageconfigure lsPane -raisecmd \
+    .n add lsFrame -label "LS Controls" 
+    .n pageconfigure lsFrame -raisecmd \
                 "set expgui(pagenow) lsFrame; SetupExtractHist"
     lappend expgui(frameactionlist) "lsFrame SetupExtractHist"
-    .n add phasePane -label "Phase" -underline 0
+    .n add phasePane -label "Phase" 
     .n pageconfigure phasePane -raisecmd \
                 "set expgui(pagenow) phaseFrame; DisplayAllAtoms noreset"
 #    lappend expgui(frameactionlist) "phaseFrame {DisplayAllAtoms noreset}"
-    .n add histPane -label "Histogram" -underline 0
+    .n add histPane -label "Histogram" 
     .n pageconfigure histPane -raisecmd \
                 "set expgui(pagenow) histFrame; DisplayHistogram"
     lappend expgui(frameactionlist) "histFrame DisplayHistogram"
     lappend expgui(GlobalModeAllDisable) "histFrame {.n pageconfigure histPane}"
-    .n add fracPane -label "Scaling" -underline 6
+    .n add fracPane -label "Scaling" 
     .n pageconfigure fracPane -raisecmd \
                 "set expgui(pagenow) fracFrame; DisplayFrac"
     lappend expgui(frameactionlist) "fracFrame DisplayFrac"
-    .n add profPane -label Profile -underline 1
+    .n add profPane -label Profile 
     .n pageconfigure profPane -raisecmd \
                 "set expgui(pagenow) profFrame; DisplayProfile"
@@ -2306 +2297 @@
     set expgui(fracFrame) [.n subwidget fracPane]
     set expgui(profFrame) [.n subwidget profPane]
-    set expgui(lsFrame) [.n subwidget lsPane]
+    set expgui(lsFrame) [.n subwidget lsFrame]
 } else {
-    pack [frame .frmbar] -side top -anchor w
-    pack [frame .n] -anchor w -fill both -expand yes
+    Notebook:create .n -pages {lsFrame phaseFrame histFrame fracFrame profFrame}
+    pack .n -anchor w -fill both -expand yes
     foreach item {lsFrame phaseFrame histFrame fracFrame profFrame} \
             page {"LS Controls" Phase Histogram Scaling Profile } {
-        pack [button .frmbar.$item -text $page -bd 2 \
-                    -command "RaisePage $item"] -side left
-        set expgui($item) [frame .n.$item -relief flat]
+        set expgui($item) [Notebook:frame .n $item]
+        Notebook:pageconfig .n $item -command "InitPage $item" -title $page
     }
     lappend expgui(frameactionlist) "lsFrame SetupExtractHist"
@@ -2321 +2311 @@
     lappend expgui(frameactionlist) "fracFrame DisplayFrac"
     lappend expgui(frameactionlist) "profFrame DisplayProfile"
-    lappend expgui(GlobalModeAllDisable) "histFrame {.frmbar.histFrame config}"
-    lappend expgui(GlobalModeAllDisable) "profFrame {.frmbar.profFrame config}"
-}
-
-# this is used in the non-tix notebook to bring up the selected frame
+    set expgui(GlobalModeAllDisable) {}
+    lappend expgui(GlobalModeAllDisable) "histFrame {Notebook:pageconfig .n histFrame}"
+    lappend expgui(GlobalModeAllDisable) "profFrame {Notebook:pageconfig .n profFrame}"
+}
+
+# this is used to bring up the selected frame
 proc RaisePage {nextpage} {
     global expgui
+    if $expgui(havetix) {
+        .n raise $nextpage
+        set expgui(pagenow) $nextpage
+    } else {
+        Notebook:raise .n $nextpage
+        InitPage $nextpage
+    }
+}
+# this is only called when Tix is not present
+proc InitPage {nextpage} {
+    global expgui
     set expgui(pagenow) $nextpage
-    foreach item {phaseFrame histFrame fracFrame profFrame lsFrame} {
-        if {$item == $nextpage} { 
-            .frmbar.$item config -relief flat
-        } else {
-            .frmbar.$item config -relief raised
-        }
-    }
-    # forget all other pages
-    foreach child [pack slaves .n] {
-        pack forget $child
-    }
-    pack .n.$nextpage -anchor w -fill both -expand yes
     foreach set $expgui(frameactionlist) {
         if {$expgui(pagenow) == [lindex $set 0]} [lindex $set 1]
     }
 }
+
 #----------------------------------------------------------------------------
 #\/ \/ \/ \/ \/ \/ \/ BEGINNING OF PHASE PANE CODE \/ \/ \/ \/ \/ \/ \/ \/ \/
@@ -3030 +3021 @@
 }
 
-if !$expgui(havetix) {
-    RaisePage lsFrame
-} else {
-    .n raise lsPane
-    set expgui(pagenow) lsFrame
-}
+# execute any local commands for final initialization
+eval $expgui(initstring)
+
+# resize the notebook to fit all the tabs and the largest page
+if {!$expgui(havetix)} {
+    Notebook:resize .n
+}
+RaisePage lsFrame
 if {[CountHistory] > 100} {
     DeleteHistoryRecords "This .EXP file has [CountHistory] history records\nErasing most will speed EXPGUI"