Changeset 232

Timestamp:

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

Author:

toby

Message:

# on 2000/07/06 21:31:38, toby did:
use short DOS names for adding histograms in Windows
Tell RAWPLOT users todo same (in RunRawplot?)

File:

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

trunk/addcmds.tcl

@@ -224 +224 @@
             -command "destroy $np"] -column 1 -row 0
 
-    grid [button $np.f6a -text "Run\nRAWPLOT" \
-            -command "runGSASwEXP rawplot 1" \
-            ] -column 4 -row 5 -rowspan 2
-
+    grid [button $np.f6a -text "Run\nRAWPLOT" -command RunRawplot] \
+            -column 4 -row 5 -rowspan 2
+    
     grid columnconfigure $np 3 -weight 1
-
+    
     wm title $np "add new histogram"
 
@@ -545 +544 @@
 
 proc addhist {np} {
-    global expgui newhist
+    global expgui newhist tcl_platform
     # validate the input
     set err {}
@@ -583 +582 @@
     set fp [open exptool.in w]
     puts $fp "H"
-    puts $fp $newhist(rawfile)
-    puts $fp $newhist(instfile)
+    if {$tcl_platform(platform) == "windows"} {
+        puts $fp [file attributes $newhist(rawfile) -shortname]
+        puts $fp [file attributes $newhist(instfile) -shortname]
+    } else {
+        puts $fp $newhist(rawfile)
+        puts $fp $newhist(instfile)
+    }
     puts $fp $newhist(banknum)
     puts $fp $newhist(setnum)
@@ -630 +634 @@
 }
 
+proc RunRawplot {} {
+    global newhist tcl_platform
+    # for Windows put a message on top, in case file names must be shortened
+    if {$tcl_platform(platform) == "windows"} {
+        set f1 {}
+        catch {set f1 [file nativename \
+                    [file attributes $newhist(rawfile) -shortname]]}
+        set f2 {}
+        catch {set f2 [file nativename \
+                [file attributes $newhist(instfile) -shortname]]}
+        if {$f1 != "" || $f2 != ""} {
+            set msg "Note: input to RAWPLOT\n"
+            if {$f1 != ""} {append msg "data file: $f1\n"}
+            if {$f2 != ""} {append msg "instrument file: $f2"}
+            MyMessageBox -icon info -message $msg -parent .
+        }
+    }
+    # start RAWPLOT
+    runGSASwEXP rawplot 1
+}
+
 proc MakeAddAtomsBox {phase} {
     global expmap