Changeset 924

Timestamp:

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

Author:

toby

Message:

# on 2008/07/14 01:19:02, toby did:
change Set to Continue for getstring (so that initial window has Continue)
use variable to hold disagl window name
add code to export a phase to clipboard for Andrew Will's VaList? program

File:

• trunk/gsascmds.tcl (modified) (6 diffs, 3 props)

trunk/gsascmds.tcl

@@ -485 +485 @@
     set expgui(temp) $initvalue
     pack [frame $w.b -bg beige] -side top -fill x -expand yes
-    pack [button $w.b.2 -text Set -command "destroy $w"] -side left
+    pack [button $w.b.2 -text Continue -command "destroy $w"] -side left
     if $quit {
         pack [button $w.b.3 -text Quit \
@@ -1506 +1506 @@
         # open a new window
         catch {toplevel .disagl}
+        eval destroy [winfo child .disagl]
+        set txt .disagl.txt
         catch {eval grid forget [grid slaves .disagl]}
-        text .disagl.txt -width 100 -wrap none \
+        text $txt -width 100 -wrap none \
                 -yscrollcommand ".disagl.yscroll set" \
                 -xscrollcommand ".disagl.xscroll set" 
-        scrollbar .disagl.yscroll -command ".disagl.txt yview"
-        scrollbar .disagl.xscroll -command ".disagl.txt xview" -orient horizontal
+        scrollbar .disagl.yscroll -command "$txt yview"
+        scrollbar .disagl.xscroll -command "$txt xview" -orient horizontal
         grid .disagl.xscroll -column 0 -row 2 -sticky ew
-        grid .disagl.txt -column 0 -row 1 -sticky nsew
+        grid $txt -column 0 -row 1 -sticky nsew
         grid .disagl.yscroll -column 1 -row 1 -sticky ns
         grid [frame .disagl.f] -column 0 -columnspan 2 -row 3 -sticky ew
@@ -1526 +1528 @@
         # allow font changes on the fly
         if {$tcl_version >= 8.0} {
-            .disagl.txt config -font $txtvw(font)
+            $txt config -font $txtvw(font)
             set fontbut [tk_optionMenu .disagl.f.font txtvw(font) ""]
             grid .disagl.f.font -column 1 -row 0 -sticky w
@@ -1534 +1536 @@
                 $fontbut add command -label "Courier $f" -font "Courier $f"\
                         -command "set txtvw(font) \"Courier $f\"; \
-                        .disagl.txt config -font \$txtvw(font)"
+                        $txt config -font \$txtvw(font)"
             }
         }
@@ -1543 +1545 @@
         wm iconname .disagl "DISAGL $root"
         set in [open $root.tmp r]
-        .disagl.txt insert end [read $in]
+        $txt insert end [read $in]
         close $in
         bind all  {destroy .disagl}
-        bind .disagl  ".disagl.txt yview scroll -1 page"
-        bind .disagl  ".disagl.txt yview scroll 1 page"
-        bind .disagl  ".disagl.txt xview scroll 1 unit"
-        bind .disagl  ".disagl.txt xview scroll -1 unit"
-        bind .disagl  ".disagl.txt yview scroll -1 unit"
-        bind .disagl  ".disagl.txt yview scroll 1 unit"
-        bind .disagl  ".disagl.txt yview 0"
-        bind .disagl  ".disagl.txt yview end"
+        bind .disagl  "$txt yview scroll -1 page"
+        bind .disagl  "$txt yview scroll 1 page"
+        bind .disagl  "$txt xview scroll 1 unit"
+        bind .disagl  "$txt xview scroll -1 unit"
+        bind .disagl  "$txt yview scroll -1 unit"
+        bind .disagl  "$txt yview scroll 1 unit"
+        bind .disagl  "$txt yview 0"
+        bind .disagl  "$txt yview end"
         # don't disable in Win as this prevents the highlighting of selected text
         if {$tcl_platform(platform) != "windows"} {
-            .disagl.txt config -state disabled
+            $txt config -state disabled
         }
+        # find the beginning of the disagl text
+
+        set pos 1.0
+        set nph 0
+        while {[set loc [$txt search "Program DISAGL Version" $pos end]] != ""} {
+            set pos [expr {$loc + 1}]
+            incr nph
+        }
+        #puts "Found $nph DISAGL run(s)"
+        # count phases
+        set l {}
+        while {[set loc [$txt search "Lattice constants are" $pos end]] != ""} {
+            lappend l $loc
+            set pos [expr {$loc + 1}]
+}
+        catch {unset phaseloc}
+        
+        set j 0
+        foreach pos $l {
+            if {$j == 0} {
+                set prev $pos
+                incr j
+                continue
+            }
+            set phaseloc($j) [list $prev $pos]
+            incr j
+        }
+        set phaseloc($j) [list $pos end]
+        if {$nph >= 1 && $j >= 2} {
+            grid [menubutton .disagl.f.copy \
+                      -menu .disagl.f.copy.menu \
+                      -text "Copy phase..." -bd 2 -relief raised] \
+                -column 2 -row 0 -sticky nse
+            menu .disagl.f.copy.menu
+            for {set i 1} {$i <= $j} {incr i} {
+                .disagl.f.copy.menu add command \
+                    -command "seldisaglphase $txt [list $phaseloc($i)]" \
+                    -label "Copy phase $i to clipboard"
+            }
+        } elseif {$nph >= 1} {
+            grid [button .disagl.f.copy \
+                      -command "seldisaglphase $txt [list $phaseloc($j)]" \
+                -text "Copy phase $j to clipboard"] \
+                -column 2 -row 0 -sticky e
+        }
     } else {
         runGSASwEXP disagl
@@ -1563 +1610 @@
 }
 
+proc seldisaglphase {txt phaselist} {
+    # clear selection
+    $txt tag remove sel 1.1 end
+    eval $txt tag add sel $phaselist
+    clipboard clear
+    clipboard append "               |         Program DISAGL Version MacOSX        |\n"
+    clipboard append [eval $txt get [$txt tag ranges sel]]
+} 
 #------------------------------------------------------------------------------
 # file conversions