Changeset 795

Timestamp:

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

Author:

toby

Message:

# on 2004/05/13 23:44:04, toby did:
add open console
deal with starkit problems
ignore bad element attributes (colors, marker types, sizes...)
update binding stuff (yet again!)
avoid bug on fit with no points (bkgfit)

File:

• trunk/liveplot (modified) (10 diffs, 3 props)

trunk/liveplot

@@ -20 +20 @@
 }
 
+# get name of script
+set expgui(script) [info script]
+# what are we running here?
 set program [file tail $argv0]
+# fix up problem with starkit tcl
+if {$program != "liveplot" && $program != "bkgedit"} {
+        set program [file tail $expgui(script)]
+}
+# for debug
 #set program bkgedit
 
@@ -137 +145 @@
 
 #----------------------------------------------------------------
-# where are we?
-set expgui(script) [info script]
-# translate links -- go six levels deep
+# find location of other files relative to the current script
+# 1st, translate links -- go six levels deep
 foreach i {1 2 3 4 5 6} {
     if {[file type $expgui(script)] == "link"} {
@@ -574 +581 @@
     setlegend $box $graph(legend)
     # reconfigure the data
-    $box element configure 3 \
-            -symbol $peakinfo(obssym) -color $graph(color_obs) \
-            -pixels [expr 0.125 * $peakinfo(obssize)]i
+    catch {$box element configure 3 -symbol $peakinfo(obssym)}
+    catch {$box element configure 3 -color $graph(color_obs)}
+    catch {$box element configure 3 -pixels [expr 0.125 * $peakinfo(obssize)]i}
     if $graph(chi2) {
-        $box element config 0 -dash 0 -line 3 -color $graph(color_chi2) 
+        $box element config 0 -dash 0 -line 3
+        catch {$box element config 0 -color $graph(color_chi2)}
     } else {
-        $box element config 0 -dash 4 -line 2 -color $graph(color_OmCoS)
-    }
-    $box element config 1 -color $graph(color_bkg)
-    $box element config 2 -color $graph(color_calc)
-    $box element config 4 -color $graph(color_diff)
+        $box element config 0 -dash 4 -line 2
+        catch {$box element config 0 -color $graph(color_OmCoS)}
+    }
+    catch {$box element config 1 -color $graph(color_bkg)}
+    catch {$box element config 2 -color $graph(color_calc)}
+    catch {$box element config 4 -color $graph(color_diff)}
     global program
     if {$program == "bkgedit"}  {
-        $box element config 12 -color $graph(color_input) \
-                -pixels [expr 0.125 * $peakinfo(inpsize)]i \
-                -symbol $peakinfo(inpsym)
-        $box element config 11 -color $graph(color_fit)
+        catch {$box element config 12 -color $graph(color_input)}
+        catch {$box element config 12 
+            -pixels [expr 0.125 * $peakinfo(inpsize)]i}
+        catch {$box element config 12 -symbol $peakinfo(inpsym)}
+        catch {$box element config 11 -color $graph(color_fit)}
     }
     xvec notify now
@@ -1122 +1132 @@
 # change the binding of the mouse, based on the selected mode
 proc bkgEditMode {b} {
-    global zoomcommand box
-    # get binding
-    set bindtag $box
-    catch {
-        if {[bind bltZoomGraph] != ""} {
-            set bindtag bltZoomGraph
-        }
-    }
+    global zoomcommand graph box
     # save the zoom command
     if [catch {set zoomcommand}] {
-        set zoomcommand [bind $bindtag <1>]
+        set zoomcommand [bind $graph(bindtag) <1>]
         .bkg.f.fit1 config -state disabled
         .bkg.f.terms config -state disabled
@@ -1153 +1156 @@
     }
     if {$b == 2} {
-        bind $bindtag <1> "bkgAddPoint %x %y"
+        bind $graph(bindtag) <1> "bkgAddPoint %x %y"
         .g config -cursor arrow
     } elseif {$b == 3} {
-        bind $bindtag <1> "bkgDelPoint %x %y"
+        bind $graph(bindtag) <1> "bkgDelPoint %x %y"
         .g config -cursor circle
     } else {
-        bind $bindtag <1> $zoomcommand
+        bind $graph(bindtag) <1> $zoomcommand
         .g config -cursor crosshair
     }
@@ -1279 +1282 @@
 proc bkgFit {button} {
     global bkglist termlist expgui
+    # if there <3 points, a fit is not possible
+    if {[llength $bkglist] < 3} {
+        bell
+        return
+    }
     # keep the button down while working
     $button config -relief sunken
@@ -1988 +1996 @@
     proc blt::PushZoom {graph} $b1
 }
-
-$box element create 0 -xdata xvec -ydata wifdvec -color $graph(color_chi2) \
+# get binding for zoom
+set graph(bindtag) $box
+catch {
+    if {[bind zoom-$box] != ""} {
+        # blt2.4z
+        set graph(bindtag) zoom-$box
+    } elseif {[bind bltZoomGraph] != ""} {
+        # blt2.4?
+        set graph(bindtag) bltZoomGraph
+    }
+}
+
+$box element create 0 -xdata xvec -ydata wifdvec \
         -line 3 -symbol none -label "Chi2" -mapy y2
+catch {$box element config 0 -color $graph(color_chi2)}
+
 $box element create 1 -label bckgr -symbol none  
-$box element config 1 -xdata xvec -ydata bckvec -color $graph(color_bkg)
-$box element create 3 -color $graph(color_obs) -linewidth 0 -label Obs \
-        -symbol $peakinfo(obssym) \
-        -pixels [expr 0.125 * $peakinfo(obssize)]i
-$box element create 2 -label Calc -color $graph(color_calc) -symbol none  
-$box element create 4 -label diff -color $graph(color_diff) -symbol none  
+$box element config 1 -xdata xvec -ydata bckvec
+catch {$box element config 1 -color $graph(color_bkg)}
+$box element create 3 -linewidth 0 -label Obs
+catch {$box element configure 3 -symbol $peakinfo(obssym)}
+catch {$box element configure 3 -color $graph(color_obs)}
+catch {$box element configure 3 -pixels [expr 0.125 * $peakinfo(obssize)]i}
+$box element create 2 -label Calc -symbol none  
+catch {$box element config 2 -color $graph(color_calc)}
+$box element create 4 -label diff -symbol none  
+catch {$box element config 4 -color $graph(color_diff)}
 
 if {$program == "liveplot"} {
@@ -2012 +2037 @@
     $box element create 11
     $box element create 12
-    $box element configure 12  -color $graph(color_input) \
-            -pixels [expr 0.125 * $peakinfo(inpsize)]i \
-            -line 0 -symbol $peakinfo(inpsym) -label "bkg pts"
-    $box element configure 11 -color $graph(color_fit) \
-            -symbol none -label "bkg fit" -dashes 5 -line 2
+    $box element configure 12 -line 0 -label "bkg pts"
+    catch {$box element config 12 -color $graph(color_input)}
+    catch {$box element config 12 -pixels [expr 0.125 * $peakinfo(inpsize)]i}
+    catch {$box element config 12 -symbol $peakinfo(inpsym)}
+    $box element configure 11 -symbol none -label "bkg fit" -dashes 5 -line 2
+    catch {$box element config 11 -color $graph(color_fit)}
     $box element show "3 2 11 12"
 }
@@ -2030 +2056 @@
     bind . <Key-d> "delallhkllbl $box"
     bind . <Key-D> "delallhkllbl $box"
-    if {[bind bltZoomGraph] != ""} {
-        bind bltZoomGraph <Shift-Button-1> "lblhkl $box %x"
-        bind bltZoomGraph <Shift-Button-3> "delallhkllbl %W"
-    } else {
-        bind $box <Shift-Button-1> "lblhkl $box %x"
-        bind $box <Shift-Button-3> "delallhkllbl %W"
-    }
+    bind $graph(bindtag) <Shift-Button-1> "lblhkl $box %x"
+    bind $graph(bindtag) <Shift-Button-3> "delallhkllbl %W"
 } else {
     $box element config 1 -label ""
@@ -2255 +2276 @@
             -label "Web page"
 }
+if {![catch {package require tkcon} errmsg]} {
+    .a.help.menu add command -label "Open console" -command {tkcon show}
+} elseif {$tcl_platform(platform) == "windows"} {
+    .a.help.menu add command -label "Open console" -command {console show}
+}
 .a.help.menu add command -command aboutliveplot -label About