Changeset 238 for trunk/expgui

Timestamp:

Dec 4, 2009 5:02:42 PM (13 years ago)

Author:

toby

Message:

# on 2000/07/20 22:13:40, toby did:
use file join on notebook.tcl
move source atomcons.tcl to be done when pane is initialized
create UpdateCurrentPage? to update all displayed panes
put UpdateCurrentPage? into sethistlist; atoms are now updated after a reload
use array element for notebook panes [expgui(notebookpagelist)]

File:

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

trunk/expgui

@@ -102 +102 @@
 }
 # get the notebook widget if not using BWidgets
-if {!$expgui(haveBW)} {source $expgui(scriptdir)/notebook.tcl}
+if {!$expgui(haveBW)} {source [file join $expgui(scriptdir) notebook.tcl]}
 #----------------------------------------------------------------
 if [file exists [file join $expgui(scriptdir) opts.tcl]] {
@@ -115 +115 @@
 # commands for adding phases, histograms & atoms
 source [file join $expgui(scriptdir) addcmds.tcl]
-# commands for constraints
-source [file join $expgui(scriptdir) atomcons.tcl]
 # commands for preferred orientation
 source [file join $expgui(scriptdir) orient.tcl]
@@ -261 +259 @@
     SetupExtractHist
 
-    # update the histogram list & the page, if shown
+    # update the histogram list & update the page
     sethistlist
-
-    # update the atoms display
-#    DisplayAllAtoms noreset
-    SelectOnePhase $expgui(curPhase)
 
     # start checking for external changes
@@ -688 +682 @@
     foreach n $expmap(phaselist) type $expmap(phasetype) {
         if {$n == $num && $type <= 3} {
-            $expgui(phaseFrame).top.ps.$num config -relief sunken
+            catch {$expgui(phaseFrame).top.ps.$num config -relief sunken}
             set crsPhase $num
             if {$type == 3} {
@@ -701 +695 @@
             }
         } else { 
-            $expgui(phaseFrame).top.ps.$n config -relief raised
+            catch {$expgui(phaseFrame).top.ps.$n config -relief raised}
         }
     }
@@ -1240 +1234 @@
         }
     }
+    UpdateCurrentPage
+}
+
+proc UpdateCurrentPage {} {
+    global expgui
     foreach set $expgui(frameactionlist) {
-        if {$expgui(pagenow) == [lindex $set 0]} [lindex $set 1]
+        if {$expgui(pagenow) == [lindex $set 0]} {catch [lindex $set 1]}
     }
 }
@@ -2443 +2442 @@
 # Creating the notebook with 5 panes: Phase, Histogram, Scaling, Profile
 # & LS controls
+# 0 name, 
+# 1 title
+# 2 create command
+# 3 raise command
+# 4 disable page in global mode (0/1)
+
 if $expgui(haveBW) {
     pack [NoteBook .n -bd 2] -expand yes -fill both
-    set expgui(lsFrame) [\
-            .n insert end lsFrame -text "LS Controls" \
-            -raisecmd "set expgui(pagenow) lsFrame; SetupExtractHist"]
-    lappend expgui(frameactionlist) "lsFrame SetupExtractHist"
-    set expgui(phaseFrame) [\
-            .n insert end phasePane -text "Phase" \
-            -raisecmd "set expgui(pagenow) phaseFrame; \
-            DisplayAllAtoms noreset"]
-#    lappend expgui(frameactionlist) "phaseFrame {DisplayAllAtoms noreset}"
-    set expgui(histFrame) [\
-            .n insert end histPane -text "Histogram" \
-            -raisecmd "set expgui(pagenow) histFrame; DisplayHistogram" \
-            -createcmd MakeHistPane]
-    lappend expgui(frameactionlist) "histFrame DisplayHistogram"
-    lappend expgui(GlobalModeAllDisable) "histFrame {.n itemconfigure histPane}"
-    set expgui(fracFrame) [\
-            .n insert end fracPane -text "Scaling" \
-            -raisecmd "set expgui(pagenow) fracFrame; DisplayFrac" \
-            -createcmd MakeScalingPane]
-    lappend expgui(frameactionlist) "fracFrame DisplayFrac"
-    set expgui(profFrame) [\
-            .n insert end profPane -text Profile \
-            -raisecmd "set expgui(pagenow) profFrame; DisplayProfile"\
-            -createcmd MakeProfilePane]
-    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"
-
-    set expgui(orientFrame) [\
-            .n insert end prefPane -text "MD Pref Orient" \
-            -raisecmd "set expgui(pagenow) orientFrame; DisplayOrient"\
-            -createcmd MakeOrientPane]
-    lappend expgui(frameactionlist) "orientFrame DisplayOrient"
+    # create an array element describing each notebook page
+    # element 0 -- pane name
+    #         1 -- Label on frame
+    #         2 -- initialization command
+    #         3 -- update command
+    #         4 -- 0/1 Use 1 if pane should be disabled in when all histograms 
+    #                are selected in global mode, 0 otherwise
+    set expgui(notebookpagelist) {
+        {lsFrame     "LS Controls" \
+                "" \
+                SetupExtractHist \
+                0}
+        {phaseFrame   Phase        \
+                "" \
+                "SelectOnePhase \$expgui(curPhase); DisplayAllAtoms noreset" \
+                0}
+        {histFrame    Histogram \
+                MakeHistPane \
+                DisplayHistogram \
+                1}
+        {fracFrame    Scaling \
+                MakeScalingPane \
+                DisplayFrac \
+                0}
+        {profFrame    Profile \
+                MakeProfilePane \
+                DisplayProfile \
+                1}
+        {consFrame    Constraints \
+                "source [file join $expgui(scriptdir) atomcons.tcl]; MakeConstraintsPane" \
+                DisplayConstraintsPane \
+                0}
+        {orientFrame  "MD Pref Orient" \
+                MakeOrientPane \
+                DisplayOrient \
+                0}
+        {odfFrame  "SH Pref Orient" \
+                "source [file join $expgui(scriptdir) odf.tcl]; MakeODFPane" \
+                DisplayODFPane \
+                0}
+    }
+    foreach item $expgui(notebookpagelist) {
+        set frm [lindex $item 0]
+        set expgui($frm) [\
+            .n insert end $frm -text [lindex $item 1] \
+            -createcmd [lindex $item 2] \
+            -raisecmd "set expgui(pagenow) $frm; [lindex $item 3]"]
+
+        # at this time expgui(frameactionlist) is generated 
+        # from expgui(notebookpagelist), but in the future it might 
+        # make sense to use expgui(notebookpagelist) directly
+        lappend expgui(frameactionlist) "$frm [list [lindex $item 3]]"
+
+        # panes to disable in global "all" mode
+        if {[lindex $item 4]} {
+            lappend expgui(GlobalModeAllDisable) \
+                    "$frm \{.n itemconfigure $frm\}"
+        }
+    }
 } else {
-    Notebook:create .n -pages {lsFrame phaseFrame histFrame fracFrame profFrame}
+    Notebook:create .n \
+            -pages {lsFrame phaseFrame histFrame fracFrame profFrame}
     pack .n -anchor w -fill both -expand yes
     foreach item {lsFrame phaseFrame histFrame fracFrame profFrame \
@@ -2519 +2547 @@
     global expgui
     set expgui(pagenow) $nextpage
-    foreach set $expgui(frameactionlist) {
-        # don't worry about errors
-        catch {
-            if {$expgui(pagenow) == [lindex $set 0]} [lindex $set 1]
-        }
-    }
+    UpdateCurrentPage
 }
 # resize the notebook to fit all the tabs and the largest page