Changeset 923

Timestamp:

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

Author:

toby

Message:

# on 2008/07/14 01:15:07, toby did:
fix "crazy line" bug due to tick mark numbers
make msg boxes a child of excl plot window
eliminate bind of <Configure> for windows, since it prevents the window
from changing size

File:

• trunk/excledt.tcl (modified) (5 diffs, 3 props)

trunk/excledt.tcl

@@ -66 +66 @@
                 set Ispec 0
                 set X -999
-                scan [string range $line 8 end] %e%e%e%e \
+                scan [string range $line 9 end] %e%e%e%e \
                         X Iobs Icalc Ispec
-                #puts $line
-                lappend allxlist $X
                 # eliminate excluded points
                 if {$Ispec > 0.0 && $X >= 0} {
+                    lappend allxlist $X
                     lappend xlist $X
                     lappend obslist $Iobs
                     lappend calclist $Icalc
                 } elseif {$X != -999} {
+                    lappend allxlist $X
                     lappend exclistx $X
                     lappend exclistobs $Iobs
@@ -340 +340 @@
 }
 
-proc GetSymbolOpts {"sym obs" {parent ""} {
+proc GetSymbolOpts {"sym obs" {parent ""}} {
     global expgui peakinfo
     set box $parent.out
@@ -1316 +1316 @@
         set graph(plot) [graph $graph(exclbox).g -plotbackground white]
     } errmsg] {
+        set msg "BLT Setup Error: could not create a graph" 
+        append msg "\n(error msg: $errmsg)."
+        append msg "\nThere is a problem with the setup of BLT on your system."
+        append msg "\nSee the expgui.html file for more info."
         MyMessageBox -parent $graph(exclbox) -title "BLT Error" \
-                -message "BLT Setup Error: could not create a graph \
-(error msg: $errmsg). \
-There is a problem with the setup of BLT on your system. \
-See the expgui.html file for more info." \
-        -helplink "expgui.html blt" \
+            -message $msg \
+            -helplink "expgui.html blt" \
         -icon warning -type Skip -default "skip" 
         destroy $graph(exclbox)
@@ -1329 +1330 @@
         Blt_ZoomStack $graph(plot)
     } errmsg] {
+        set msg "BLT Setup Error: could not access a Blt_ routine"
+        append msg "\nBLT Setup Error: "
+        append msg "\n(error msg: $errmsg)."
+        append msg "\nSee the expgui.html file for more info."
+        append msg "\nThe pkgIndex.tcl is probably not loading bltGraph.tcl."
+        append msg "\nSee the expgui.html file for more info."
         MyMessageBox -parent $graph(exclbox) -title "BLT Error" \
-                -message "BLT Setup Error: could not access a Blt_ routine \
-(msg: $errmsg). \
-The pkgIndex.tcl is probably not loading bltGraph.tcl.
-See the expgui.html file for more info." \
-        -helplink "expgui.html blt" \
-        -icon warning -type {"Limp Ahead"} -default "limp Ahead" 
+            -message $msg \
+            -helplink "expgui.html blt" \
+            -icon warning -type {"Limp Ahead"} -default "limp Ahead" 
     }
     $graph(plot) element create 3 -color black -linewidth 0 -label Obs \
@@ -1554 +1558 @@
     # catch exits -- launch POWPREF; if changes non-zero
     wm protocol $graph(exclbox) WM_DELETE_WINDOW "CheckChanges $startchanges;destroy $graph(exclbox)"
-    # respond to resize events
-    bind $graph(exclbox) <Configure> scheduleFillExclRegionBox
-    bind all <Control-KeyPress-c> "CheckChanges $startchanges;destroy $graph(exclbox)"
+    # respond to resize events & control C (except on Windows)
+    if {$::tcl_platform(platform) != "windows"} {
+        bind $graph(exclbox) <Configure> scheduleFillExclRegionBox
+        bind all <Control-KeyPress-c> "CheckChanges $startchanges;destroy $graph(exclbox)"
+    }
     #putontop $graph(exclbox)
-    wm deiconify $graph(exclbox)
+    #wm deiconify $graph(exclbox)
     wm iconify .
     update