Changeset 823 for trunk

Timestamp:

Dec 4, 2009 5:12:39 PM (12 years ago)

Author:

toby

Message:

# on 2004/10/04 16:20:26, toby did:
Require BWidget (remove non-BWidget code)

File:

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

trunk/expgui

@@ -136 +136 @@
 set expgui(docdir) [file join $expgui(scriptdir) doc]
 #----------------------------------------------------------------
+# use EXPGUI directory for packages
 lappend auto_path $expgui(scriptdir)
-set expgui(havetix) 0
-set expgui(haveBW) 1
-# for debugging non-BWidget version set environment variable NOBWIDGET
-catch {if $env(NOBWIDGET) {set expgui(haveBW) 0}}
-if $expgui(haveBW) {
-    if [catch {package require BWidget}] {set expgui(haveBW) 0}
-}
-# get the notebook widget if not using BWidgets
-if {!$expgui(haveBW)} {source [file join $expgui(scriptdir) notebook.tcl]}
 #----------------------------------------------------------------
 source [file join $expgui(scriptdir) opts.tcl]
@@ -177 +169 @@
         -message $msg -icon warning -type Ignore -default ignore \
         -helplink "expguierr.html Customizewarning"
+}
+if [catch {package require BWidget}] {
+    set msg "Error loading the BWidget package: This should not happen if you use the version of Tcl/Tk (tcl84+.exe) distributed with EXPGUI"
+    MyMessageBox -parent . -title "BWidget load error" \
+        -message $msg -icon error -type Error -default error \
+        -helplink "debug_tcltk.html"
+    destroy .
 }
 SetTkDefaultOptions $expgui(font)
@@ -1781 +1780 @@
     }
     # Top box
-    if $expgui(haveBW) {
-        catch {destroy $expgui(histFrame).pflag}
-    }
+    catch {destroy $expgui(histFrame).pflag}
     if {$expgui(globalmode) != 0} {
         $expgui(histFrame).top.txt config \
@@ -1794 +1791 @@
         set expgui(bkglbl) "Edit Background"
         set expgui(abslbl) "Edit Abs./Refl."
-        if {$expgui(haveBW) && [llength $expmap(phaselist)] > 1} {
+        if {[llength $expmap(phaselist)] > 1} {
             TitleFrame $expgui(histFrame).pflag  \
                     -borderwidth 4 -side left -relief groove \
@@ -2242 +2239 @@
         set txt "Phase Fractions"
     }
-    if $expgui(haveBW) {
-        $expgui(fracFrame).f1.phaseFrac configure -text $txt
-    } else {
-        grid [label $phaseFractf1.txt -anchor center -text $txt] \
-                -column 0 -row 0 -sticky news
-    }
+    $expgui(fracFrame).f1.phaseFrac configure -text $txt
     # Create the frame inside the canvas, One frame for each Phase.
     foreach i {1 2 3 4 5 6 7 8 9} {set phasehistlist($i) ""}
@@ -2336 +2328 @@
             # Label Heading for each phase.
             set ptype [string trim [hapinfo $hist $i proftype]]
-            if {$expgui(haveBW)} {
-                grid [TitleFrame $expgui(ProfileBox).f.$i \
-                        -text "Hist $hist -- Phase $i (type $ptype)" \
-                        -relief groove -bd 2] \
-                        -column 0 -row $ind -sticky ew
-                set ProfileFrame [$expgui(ProfileBox).f.$i getframe]
-                grid [frame $ProfileFrame.1] \
-                        -column 0 -row 0 -columnspan 10
-                pack [label $ProfileFrame.1.l  \
-                        -text Damping]\
-                        -side left
-            } else {
-                grid [frame $expgui(ProfileBox).f.$i -relief groove -bd 4] \
-                        -column 0 -row $ind -sticky ew
-                set ProfileFrame $expgui(ProfileBox).f.$i
-                grid [frame $ProfileFrame.1] \
-                        -column 0 -row 0 -columnspan 10 -sticky ew
-                pack [label $ProfileFrame.1.l  \
-                        -text "Phase $i (type $ptype)    Damping"]\
-                        -side left
-            }
+            grid [TitleFrame $expgui(ProfileBox).f.$i \
+                      -text "Hist $hist -- Phase $i (type $ptype)" \
+                      -relief groove -bd 2] \
+                -column 0 -row $ind -sticky ew
+            set ProfileFrame [$expgui(ProfileBox).f.$i getframe]
+            grid [frame $ProfileFrame.1] \
+                -column 0 -row 0 -columnspan 10
+            pack [label $ProfileFrame.1.l  \
+                      -text Damping]\
+                -side left
             tk_optionMenu $ProfileFrame.1.tkOptDamp entryvar(pdamp_$i) \
                     0 1 2 3 4 5 6 7 8 9
@@ -2446 +2427 @@
                 incr i
                 set boxtitle "Phase $p, hist [CompressList $histarray($key)]"
-                if {$expgui(haveBW)} {
-                    grid [TitleFrame $expgui(ProfileBox).f.$i \
-                            -text "(type $ptype)" \
-                            -relief groove -bd 2] \
-                            -column 0 -row $i -sticky ew
-                    set ProfileFrame [$expgui(ProfileBox).f.$i getframe]
-                    grid [frame $ProfileFrame.0] \
-                            -column 0 -row 0 -columnspan 20 -sticky ew
-                } else {
-                    grid [frame $expgui(ProfileBox).f.$i \
-                            -relief groove -bd 4] \
-                            -column 0 -row $i -sticky ew
-                    set ProfileFrame $expgui(ProfileBox).f.$i
-                    grid [frame $ProfileFrame.0] \
-                            -column 0 -row 0 -columnspan 20 -sticky ew
-                    grid [label $ProfileFrame.0.0  \
-                            -text "Profile Type $ptype   "] -row 0 -column 0
-                }
+                grid [TitleFrame $expgui(ProfileBox).f.$i \
+                          -text "(type $ptype)" \
+                          -relief groove -bd 2] \
+                    -column 0 -row $i -sticky ew
+                set ProfileFrame [$expgui(ProfileBox).f.$i getframe]
+                grid [frame $ProfileFrame.0] \
+                    -column 0 -row 0 -columnspan 20 -sticky ew
                 grid [label $ProfileFrame.0.1  \
                         -anchor w] -row 0 -column 1
@@ -3198 +3168 @@
 # Creating the notebook and panes
 
-# create an array element describing each notebook page (used with BW only)
+# create an array element describing each notebook page
 # element 0 -- pane name
 #         1 -- Label on frame
@@ -3242 +3212 @@
 }
 
-if $expgui(haveBW) {
-    pack [NoteBook .n -bd 2] -expand yes -fill both
-    # this should not be needed, but for some reason NoteBook is not 
-    # using the optionDB
-    catch {.n configure -font [option get .n font Canvas]}
-    foreach item $expgui(notebookpagelist) {
-        set frm [lindex $item 0]
-        set expgui($frm) [\
+pack [NoteBook .n -bd 2] -expand yes -fill both
+# this should not be needed, but for some reason NoteBook is not 
+# using the optionDB
+catch {.n configure -font [option get .n font Canvas]}
+foreach item $expgui(notebookpagelist) {
+    set frm [lindex $item 0]
+    set expgui($frm) [\
             .n insert end $frm -text [lindex $item 1] \
             -createcmd "set expgui(pagenow) $frm; [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}
-    pack .n -anchor w -fill both -expand yes
-    foreach item {lsFrame phaseFrame histFrame fracFrame profFrame \
-            orientFrame} \
-            page {"LS Controls" Phase Histogram Scaling Profile \
-            "MD Pref Orient"} {
-        set expgui($item) [Notebook:frame .n $item]
-        Notebook:pageconfig .n $item -command "InitPage $item" -title $page
-    }
-    lappend expgui(frameactionlist) "lsFrame SetupExtractHist"
-    lappend expgui(frameactionlist) "phaseFrame {DisplayAllAtoms $expgui(curPhase) noreset}"
-    lappend expgui(frameactionlist) "histFrame DisplayHistogram"
-    lappend expgui(frameactionlist) "fracFrame DisplayFrac"
-    lappend expgui(frameactionlist) "profFrame DisplayProfile"
-    lappend expgui(frameactionlist) "orientFrame DisplayOrient"
-    set expgui(GlobalModeAllDisable) {}
-    lappend expgui(GlobalModeAllDisable) "histFrame {Notebook:pageconfig .n histFrame}"
-    lappend expgui(GlobalModeAllDisable) "profFrame {Notebook:pageconfig .n profFrame}"
+    # 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\}"
+    }
 }
 
@@ -3290 +3237 @@
 proc RaisePage {nextpage} {
     global expgui
-    if $expgui(haveBW) {
-        set expgui(pagenow) $nextpage
-        .n see $nextpage
-        .n raise $nextpage
-    } else {
-        Notebook:raise .n $nextpage
-        InitPage $nextpage
-    }
-}
-# this is only called when BWidget is not in use
-proc InitPage {nextpage} {
-    global expgui
     set expgui(pagenow) $nextpage
-    UpdateCurrentPage
-}
+    .n see $nextpage
+    .n raise $nextpage
+}
+
 # resize the notebook to fit all the tabs and the largest page
 proc ResizeNotebook {} {
     global expgui
-    if {$expgui(haveBW)} {
-        .n compute_size
-    } else {
-        Notebook:resize .n
-    }
+    .n compute_size
 }
 
@@ -3715 +3648 @@
     frame $expgui(histFrame).top -borderwidth 4 -relief groove
     grid [label $expgui(histFrame).top.txt] -row 0 -column 0
-    if $expgui(haveBW) {
-        foreach item {backBox diffBox absBox} num {2 3 4} \
-                title {Background "Diffractometer Constants" \
-                "Absorption/Reflectivity Correction"} {
-            TitleFrame $expgui(histFrame).$item  \
-                    -borderwidth 4 -side left -relief groove -text $title
-            set expgui($item) [$expgui(histFrame).$item getframe]
-            grid $expgui(histFrame).$item -column 1 -row $num -sticky nsew
-            grid rowconfigure $expgui(histFrame) $num -minsize 100
-        }
-    } else {
-        foreach item {backBox diffBox absBox} num {1 2 3} \
-                title {Background "Diffractometer Constants" \
-                "Absorp./Reflect. Corr"} {
-            frame $expgui(histFrame).$item  -borderwidth 4 -relief groove
-            grid $expgui(histFrame).$item -column 1 -row $num -sticky nsew
-            set expgui($item)  $expgui(histFrame).$item
-            grid [label $expgui(histFrame).$item.title -text $title] \
-                    -row 0 -column 0 -columnspan 10 -sticky nw
-        }
-    }
-
+    foreach item {backBox diffBox absBox} num {2 3 4} title {Background "Diffractometer Constants" "Absorption/Reflectivity Correction"} {
+        TitleFrame $expgui(histFrame).$item  \
+            -borderwidth 4 -side left -relief groove -text $title
+        set expgui($item) [$expgui(histFrame).$item getframe]
+        grid $expgui(histFrame).$item -column 1 -row $num -sticky nsew
+        grid rowconfigure $expgui(histFrame) $num -minsize 100
+    }
     grid [frame $expgui(histFrame).bb] -column 1 -row 6
     if [file executable $expgui(exptool)] {
@@ -3818 +3736 @@
     # Create a large canvas area containing a frame for each phase in the data set.
     # The canvas and vertical scrollbar are inside a frame called f1
-    if $expgui(haveBW) {
-        TitleFrame $expgui(fracFrame).f1.scaleBox \
-                -borderwidth 4 -text "Scale Factor"
-        #           -borderwidth 4 -width 600 -height 100 -label "Scale Factor"
-        grid $expgui(fracFrame).f1.scaleBox -column 0 -row 0 -sticky nsew -columnspan 2
-        set expgui(scaleBox)  [$expgui(fracFrame).f1.scaleBox getframe]
-        grid [label $expgui(scaleBox).histSFLabel -text Scale] \
-                -row 1 -column 0 -sticky nws  -padx 2 -pady 3
-    } else {
-        frame $expgui(fracFrame).f1.scaleBox  -borderwidth 4 -relief groove
-        grid $expgui(fracFrame).f1.scaleBox -column 0 -row 0 -sticky nsew -columnspan 2
-        set expgui(scaleBox)  $expgui(fracFrame).f1.scaleBox
-        grid [label $expgui(scaleBox).histSFLabel -text "Scale Factor"] \
-                -row 1 -column 0 -sticky nws  -padx 2 -pady 3
-    }
+    TitleFrame $expgui(fracFrame).f1.scaleBox \
+        -borderwidth 4 -text "Scale Factor"
+    #       -borderwidth 4 -width 600 -height 100 -label "Scale Factor"
+    grid $expgui(fracFrame).f1.scaleBox -column 0 -row 0 -sticky nsew -columnspan 2
+    set expgui(scaleBox)  [$expgui(fracFrame).f1.scaleBox getframe]
+    grid [label $expgui(scaleBox).histSFLabel -text Scale] \
+        -row 1 -column 0 -sticky nws  -padx 2 -pady 3
     grid [entry $expgui(scaleBox).ent1 -textvariable entryvar(scale) -width 15] \
             -row 1 -column 1 -sticky ew -padx 4 -pady 3
@@ -3851 +3761 @@
     grid columnconfigure $expgui(scaleBox) 6  -weight 1
     
-    if $expgui(haveBW) {
-        grid [TitleFrame $expgui(fracFrame).f1.phaseFrac -bd 4 \
-                -text "Phase Fractions" -relief groove] \
-                -sticky news -row 1 -column 0 -columnspan 2
-        set PhaseFractBox [$expgui(fracFrame).f1.phaseFrac getframe]
-    } else {
-        set PhaseFractBox $expgui(fracFrame).f1
-    }
+    grid [TitleFrame $expgui(fracFrame).f1.phaseFrac -bd 4 \
+              -text "Phase Fractions" -relief groove] \
+        -sticky news -row 1 -column 0 -columnspan 2
+    set PhaseFractBox [$expgui(fracFrame).f1.phaseFrac getframe]
     grid columnconfigure $expgui(fracFrame).f1 0 -weight 1
     grid rowconfigure $expgui(fracFrame).f1 1 -weight 1
@@ -4008 +3914 @@
 
 incr row
-if {$expgui(haveBW)} {
-    grid [TitleFrame $expgui(lsFrame).f1.a -bd 4 -relief groove \
-            -text "Reflection Intensity Extraction" \
-            ] -row $row -column 0 -columnspan 6
-    set expgui(FobsExtractFrame) [$expgui(lsFrame).f1.a getframe]
-} else {
-    grid [frame $expgui(lsFrame).f1.a -bd 4 -relief groove \
-            ] -row $row -column 0 -columnspan 6
-    set expgui(FobsExtractFrame) $expgui(lsFrame).f1.a
-}
+grid [TitleFrame $expgui(lsFrame).f1.a -bd 4 -relief groove \
+          -text "Reflection Intensity Extraction" \
+         ] -row $row -column 0 -columnspan 6
+set expgui(FobsExtractFrame) [$expgui(lsFrame).f1.a getframe]
 
 grid [frame $expgui(FobsExtractFrame).c -bd 4 -relief groove] \
@@ -4334 +4234 @@
 # can be called (in loadexp)
 MakePhasePane
-# and the rest of the windows w/o BWidget
-if {!$expgui(haveBW)} {
-    MakeHistPane
-    MakeScalingPane
-    MakeProfilePane
-}
 
 # handle indirect exits