Changeset 1182 for branches

Timestamp:

Dec 6, 2011 2:40:30 PM (11 years ago)

Author:

toby

Message:

bug fixes: dummy hist: disable CIF read; remove default phase when loading from a EXP; fix bug where .EXP files were read twice after an update; ShowCallStack?: new routine for debug; liveplot: new option to set title from histogram file name (requested by Ling Yang)

Location:

branches/sandbox

Files:

• addcmds.tcl (modified) (2 diffs)
• dumpexp.tcl (modified) (1 diff)
• expgui (modified) (3 diffs)
• gsascmds.tcl (modified) (2 diffs)
• liveplot (modified) (2 diffs)

branches/sandbox/addcmds.tcl

@@ -1056 +1056 @@
         $np.d1.m2 config -text {}
         $np.b1 config -state disabled
+        $np.b1a config -state disabled
         grid forget $np.l3 $np.e3 $np.cb3 $np.cb4 $np.cb5 $np.bank $np.f6a
         grid $np.dl1 -column 0 -row 18
@@ -1097 +1098 @@
         }
         $np.b1 config -state normal
+        $np.b1a config -state normal
         grid $np.bank -column 2 -row 3 -columnspan 7 -sticky ew
         grid $np.f6a -column 4 -row 18 -rowspan 3

branches/sandbox/dumpexp.tcl

@@ -121 +121 @@
         grab .
         focus .
+        set phase {}
         tkwait variable phase
     }

branches/sandbox/expgui

@@ -541 +541 @@
     loadexp $newexpfile
 
-    # switch to the appropriate 1st page
-    #StageTabUse
-    SetStartPanel
-
     # reset the phase selection
     set expgui(curPhase) {}
@@ -554 +550 @@
         set expgui(curhist) {}
     }
-#    if {[CountHistory] > 100} {
-#       DeleteHistoryRecords "This .EXP file has [CountHistory] history records\nErasing most will speed EXPGUI"
-#    }
+    # switch to the appropriate 1st page
+    #StageTabUse
+    SetStartPanel
 }
 
@@ -841 +837 @@
         }
         set ans [ReloadExpMsg [file tail $expgui(expfile)] $expgui(changed)]
-
+        # did a load already occur while we were waiting for an answer?
+        if {[file mtime $expgui(expfile)] == $expgui(expModifiedLast)} {
+            return
+        }
         if {$ans == 0} {
             loadexp $expgui(expfile)

branches/sandbox/gsascmds.tcl

@@ -604 +604 @@
 }
 
+# for use in debugging -- how did I get here!
+proc ShowCallStack {} {
+    puts "\n================== ShowCallStack ==============="
+    set n [info level]
+    incr n -1
+    while {$n > 0} {
+        puts "level $n: [info level $n]"
+        incr n -1
+    }
+}
 #------------------------------------------------------------------------------
 # profile/symmetry routines
@@ -2787 +2797 @@
 
 proc ExplainEXPerror {parent message file} {
+    #ShowCallStack
     if {$parent == "."} {
         set w .experr

branches/sandbox/liveplot

@@ -626 +626 @@
     tkwait window $bx
     afterputontop
+    plotdata
+}
+
+proc SetHistTitle {} {
+    set ::plot_title [histinfo $::hst file]
     plotdata
 }
@@ -2338 +2343 @@
 .a.file.menu add command -label "Set Plot Title" \
         -command SetTitle
+.a.file.menu add command -label "Set Plot Title to data file" \
+        -command SetHistTitle
 .a.file.menu add cascade -label "Export plot" -menu .a.file.menu.export
 menu .a.file.menu.export