Changeset 132 for trunk/addcmds.tcl

Timestamp:

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

Author:

toby

Message:

# on 2000/05/17 16:14:23, toby did:
cleanup adding histograms to be prettier and to avoid paths for files
in the same directory as the .EXP (better portability)

File:

• trunk/addcmds.tcl (modified) (4 diffs, 3 props)

trunk/addcmds.tcl

@@ -190 +190 @@
             -column 0 -row 0 -sticky ew -columnspan 7
     grid [label $np.l1 -text "Data file:"] -column 0 -row 1 
-    grid [label $np.t1 -textvariable newhist(rawfile)] \
-            -column 1 -row 1 -columnspan 3
+    grid [label $np.t1 -textvariable newhist(rawfile) -bd 2 -relief ridge] \
+            -column 1 -row 1 -columnspan 3 -sticky ew
     grid [button $np.b1 -text "Select File" \
             -command "getrawfile $np" \
@@ -200 +200 @@
 
     grid [label $np.l2 -text "Instrument\nParameter file:"] -column 0 -row 3
-    grid [label $np.t2 -textvariable newhist(instfile)] \
-            -column 1 -row 3 -columnspan 3
+    grid [label $np.t2 -textvariable newhist(instfile) -bd 2 -relief ridge] \
+            -column 1 -row 3 -columnspan 3 -sticky ew
     grid [button $np.b2 -text "Select File" \
             -command "getinstfile $np" \
@@ -416 +416 @@
         return
     }
-    set newhist(rawfile) $inp
+    # don't use a full path unless needed
+    if {[pwd] == [file dirname $inp]} {
+        set newhist(rawfile) [file tail $inp]
+    } else {
+        set newhist(rawfile) $inp
+    }
     foreach i $newhist(banklist) {
-#       pack [checkbutton $np.bank.$i -text $i \
-#               -variable newhist(bank$i)] -side left
         pack [radiobutton $np.bank.$i -text $i \
                 -variable newhist(banknum) -value $i] -side left
+        # only 1 choice, so set it
+        if {[llength $newhist(banklist)] == 1} {set newhist(banknum) $i}
     }
 }
@@ -522 +527 @@
         return
     }
-    set newhist(instfile) $inp
+    # don't use a full path unless needed
+    if {[pwd] == [file dirname $inp]} {
+        set newhist(instfile) [file tail $inp]
+    } else {
+        set newhist(instfile) $inp
+    }
     for {set i 1} {$i <= $newhist(instbanks)} {incr i} {
-#       pack [checkbutton $np.set.$i -text $i \
-#               -variable newhist(set$i)] -side left
         pack [radiobutton $np.set.$i -text $i \
                 -variable newhist(setnum) -value $i] -side left
+        if {$newhist(instbanks) == 1} {set newhist(setnum) $i}
     }
 }