Changeset 71

Timestamp:

Dec 4, 2009 4:59:55 PM (14 years ago)

Author:

toby

Message:

# on 1999/03/19 17:07:59, toby did:
bug fixes for reading new .EXP files

File:

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

trunk/expgui

@@ -235 +235 @@
 }
 
-proc CreateNewExp {} {
-    global expgui
-    set newexpfile [newexp]
-    if {$newexpfile == ""} return 
-    # create an "empty" exp file
-    createexp $newexpfile \
-                [getstring "title for experiment $newexpfile" 60 0]
-    set expgui(expfile) $newexpfile
-    catch {cd [string trim [file dirname $expgui(expfile)]]}
-    loadexp $expgui(expfile)
-}
-
 proc SaveAsFile {} {
     global expgui
     set newexpfile [getExpFileName new]
     if {$newexpfile == ""} return 
+    expwrite $newexpfile
     set expgui(expfile) $newexpfile
     catch {cd [string trim [file dirname $expgui(expfile)]]}
-    expwrite $expgui(expfile)
     set expgui(changed) 0
     set expgui(expModifiedLast) [file mtime $expgui(expfile)]
@@ -278 +266 @@
     set newexpfile [getExpFileName old]
     if {$newexpfile == ""} return 
+
+    if ![file exists $newexpfile] {
+        # you've been warned this .EXP does not exist!
+        # create an "empty" exp file
+        createexp $newexpfile \
+                [getstring "title for experiment $newexpfile" 60 0]
+    }
     set expgui(expfile) $newexpfile
     catch {cd [string trim [file dirname $expgui(expfile)]]}
@@ -285 +280 @@
     SelectOnePhase [lindex $expmap(phaselist) 0]
     # select the first histogram in the list by default (if there are any)
-    if {[llength $expmap(histlistboxcontents)] > 0} {set expgui(curhist) 0}
+    if {[llength $expmap(histlistboxcontents)] > 0} {
+        set expgui(curhist) 0
+    } else {
+        set expgui(curhist) {}
+    }
     if !$expgui(havetix) {
         RaisePage lsFrame
@@ -563 +562 @@
     set crsPhase $num
     # no phase is selected
-    if {$crsPhase == ""} {
+    if {$crsPhase == "" || [llength $expmap(phaselist)] == 0} {
         # disable traces on entryvar
         set entrycmd(trace) 0
@@ -572 +571 @@
             set entryvar($ent) ""
         }
+        set expgui(curPhase) {}
         # enable traces on entryvar 
         set entrycmd(trace) 1
@@ -1237 +1237 @@
             grid [ entry $expgui(diffBox).eDCipola -width 2 \
                     -textvariable entryvar(ipola)] -column 6 -row 4
-                    -variable entryvar(zref) ] -column 2 -row 3
         } elseif {[string range $expmap(htype_$hist) 1 2] == "XE"} {
         #-------------
@@ -1587 +1586 @@
             set row 1
             set nterms [hapinfo $hist $i profterms]
-            set lbls $expgui(prof-$htype-$ptype)
+            set lbls {}
+            catch {set lbls $expgui(prof-$htype-$ptype)}
             # for type 4, add extra terms depending on the cell type
             if {$ptype == 4} {set lbls [type4lbls $lbls $nterms $i]}
@@ -2999 +2999 @@
 SelectOnePhase [lindex $expmap(phaselist) 0]
 # select the first histogram in the list by default (if there are any)
-if {[llength $expmap(histlistboxcontents)] > 0} {set expgui(curhist) 0}
+if {[llength $expmap(histlistboxcontents)] > 0} {
+    set expgui(curhist) 0
+} else {
+    set expgui(curhist) {}
+}
 
 if !$expgui(havetix) {