Changeset 745

Timestamp:

Dec 4, 2009 5:11:18 PM (14 years ago)

Author:

toby

Message:

# on 2003/11/13 16:05:02, toby did:
catch puts output for OSX
Resize window for OSX
revise interface to LOGIC and CMPR

File:

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

trunk/liveplot

@@ -14 +14 @@
 set exitstat 0
 set expnam [lindex $argv 0]
-if {$expnam == ""} {puts "error -- no experiment name"; set exitstat 1}
+if {$expnam == ""} {catch {puts "error -- no experiment name"}; set exitstat 1}
 if $exitstat {
-    puts "usage: $argv0 expnam \[hist #\] \[legend\]"
-    destroy .
-}
+    catch {puts "usage: $argv0 expnam \[hist #\] \[legend\]"}
+    exit
+}
+
 set program [file tail $argv0]
 #set program bkgedit
@@ -44 +45 @@
 
 # default values
+set cmprdir {};     # location for the cmpr package
 set weightlist {}
 set graph(outname) out.ps
@@ -1896 +1898 @@
         -helplink "expguierr.html Customizewarning"
 }
+
 SetTkDefaultOptions $expgui(font)
 
@@ -2034 +2037 @@
         source $file
         .a.file.menu.export add command -label $label -command $action
-    } errmsg] {puts "error = $errmsg"}
+    } errmsg] {catch {puts "source error = $errmsg"}}
 }
 pack [menubutton .a.options -text Options -underline 0 -menu .a.options.menu] \
@@ -2218 +2221 @@
 pack $box -fill both -expand yes
 
-# add the extra options
-set fl [file join $expgui(scriptdir) icddcmd.tcl]
-if [file exists $fl] {source $fl}
-set fl [file join $expgui(scriptdir) cellgen.tcl]
-if [file exists $fl] {source $fl}
+# assume cmpr is in the same location as GSAS 
+lappend cmprdir [file join [file dirname $expgui(scriptdir)] cmpr]
+
+# append to the list a number of other likely places where CMPR might be found
+if {$tcl_platform(platform) == "windows"} {
+    lappend cmprdir c:/cmpr "c:/Program files/cmpr"
+} else {
+    lappend cmprdir /usr/local/cmpr ~/cmpr
+}
+# add the CMPR & LOGIC interface options
+set CMPR_OK 0
+foreach dir $cmprdir {
+    if {[file exists [set file [file join $dir cellgen.tcl]]]} {
+        if {[catch {source $file} errmsg]} {
+            catch {puts "source $file error = $errmsg"}
+        } else {
+            if {$CMPR_OK} {
+                catch {
+                    pack [menubutton .a.peaks -text "Peak Gen" \
+                            -underline 0 -menu .a.peaks.menu] \
+                            -side left    
+                    menu .a.peaks.menu
+                }
+                .a.peaks.menu add command -label "Display a cell" \
+                        -command {cellgen .cell}
+                break
+            }
+        }
+    }
+}
+
+set CMPR_OK 0
+foreach dir $cmprdir {
+    if {[file exists [set file [file join $dir logic icddcmd.tcl]]]} {
+        if {[catch {source $file} errmsg]} {
+            catch {puts "source $file error = $errmsg"}
+        } else {
+            if {$CMPR_OK} {
+                catch {
+                    pack [menubutton .a.peaks -text "Peak Gen" \
+                            -underline 0 -menu .a.peaks.menu] \
+                            -side left    
+                    menu .a.peaks.menu
+                }
+                .a.peaks.menu add command -label "Plot ICDD Entry" \
+                        -command MakeLogicWin
+                break
+            }
+        }
+    }
+}
 
 expload $expnam.EXP
@@ -2282 +2331 @@
             -command plotdata
     if {$program != "bkgedit"}  {
-        bind . <Key-$num> ".a.file.menu.tick invoke $num"
+        bind . <Key-$num> ".a.file.menu.tick invoke [.a.file.menu.tick index end]"
     }
     .a.options.menu.tick add command -label "Phase $num opts" \
@@ -2305 +2354 @@
 bind . <Key-l> {ToggleLiveCursor}
 bind . <Key-L> {ToggleLiveCursor}
+# seems to be needed in OSX
+update
+wm geom . [winfo reqwidth .]x[winfo reqheight .]
+#
 updateifnew
 donewaitmsg