Changeset 878 for trunk

Timestamp:

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

Author:

toby

Message:

# on 2006/03/29 03:54:37, toby did:
support profile editing (& grab from .EXP) in instedit (IPNS request)
don't hard-code profile names here (grab from gsascmds.tcl)

File:

• trunk/instedit.tcl (modified) (10 diffs, 3 props)

trunk/instedit.tcl

@@ -131 +131 @@
 proc instNewBank {box} {
     global instdat instparms
+    # don't allow this for TOF
     set i [incr instdat(lastbank)]
     instMakeBankSel $box
@@ -149 +150 @@
 proc instShowBank {box} {
     global instdat instparms
+    set topfr $box.a
     if {$instparms(bank) == 0} return
     switch [string range $instdat(banktype) 0 2] {
@@ -170 +172 @@
             -column 1 -row 2 -sticky w -columnspan 99
 
-    if {$instparms(banklabel) == "TOF"} return
-    if {$instparms(banklabel) == "ED X-ray"} return
-
+    if {$instparms(banklabel) == "TOF"} {
+        $topfr.n config -state disabled
+        set col 0
+        grid [label $bnkfr.l4 -text "DIFC:"] \
+            -column [incr col] -row 4 -sticky e -rowspan 2
+        grid [entry $bnkfr.e4d -textvariable instdat(difc$b) -width 10] \
+            -column [incr col] -row 4 -sticky ew 
+        grid [label $bnkfr.l5 -text "DIFA:"] \
+            -column [incr col] -row 4 -sticky e -rowspan 2
+        grid [entry $bnkfr.e4e -textvariable instdat(difa$b) -width 10] \
+            -column [incr col] -row 4 -sticky ew 
+        grid [label $bnkfr.l6 -text "Zero\nCorrection:" \
+                  -anchor e -justify r] \
+            -column [incr col] -row 4 -sticky e
+        grid [entry $bnkfr.e6 -textvariable instdat(zero$b) -width 10] \
+            -column [incr col] -row 4 -sticky ew
+
+        grid [frame [set prfrm $bnkfr.prof] -bd 2 -relief groove] \
+            -column 0 -columnspan 99 -row 8
+        grid [label $prfrm.l1 -text "Select profile: "] -column 0 -row 0
+        grid [frame $prfrm.fr] -column 1 -columnspan 99 -row 0 -sticky w
+        grid [frame $prfrm.fr1] -column 0 -columnspan 99 -row 2
+        set instparms(profileframe) $prfrm.fr1
+        for {set j 1} {$j <= $instparms(proftypes${b})} {incr j} {
+            grid [radiobutton $prfrm.fr.$j -text $j -value $j \
+                -command "ShowInstProfile $b" \
+                -variable instparms(profilenum)] -row 1 -column $j
+        }
+        grid [button $prfrm.fr.a -text "Add profile" \
+            -command "AddInstProfile $box $b"] -row 1 -column 98
+        grid [button $prfrm.fr.n -text "Import profile" \
+            -command "ImportInstProfile $box $prfrm.fr1 $b"] -row 1 -column 99
+        set instparms(profilenum) 1
+        ShowInstProfile $b
+        return
+    }
+    if {$instparms(banklabel) == "ED X-ray"} {
+        $topfr.n config -state disabled
+        set col 0
+        grid [label $bnkfr.l4 -text "2Theta:"] \
+            -column [incr col] -row 4 -sticky e -rowspan 2
+        grid [entry $bnkfr.e4d -textvariable instdat(difc$b) -width 10] \
+            -column [incr col] -row 4 -sticky ew 
+        grid [label $bnkfr.l5 -text "POLA:"] \
+            -column [incr col] -row 4 -sticky e -rowspan 2
+        grid [entry $bnkfr.e4e -textvariable instdat(pola$b) -width 10] \
+            -column [incr col] -row 4 -sticky ew 
+
+        grid [frame [set prfrm $bnkfr.prof] -bd 2 -relief groove] \
+            -column 0 -columnspan 99 -row 8
+        grid [label $prfrm.l1 -text "Select profile: "] -column 0 -row 0
+        grid [frame $prfrm.fr] -column 1 -columnspan 99 -row 0 -sticky w
+        grid [frame $prfrm.fr1] -column 0 -columnspan 99 -row 2
+        set instparms(profileframe) $prfrm.fr1
+        for {set j 1} {$j <= $instparms(proftypes${b})} {incr j} {
+            grid [radiobutton $prfrm.fr.$j -text $j -value $j \
+                -command "ShowInstProfile $b" \
+                -variable instparms(profilenum)] -row 1 -column $j
+        }
+        grid [button $prfrm.fr.a -text "Add profile" \
+            -command "AddInstProfile $box $b"] -row 1 -column 98
+        #grid [button $prfrm.fr.n -text "Import profile" \
+        #    -command "ImportInstProfile $box $prfrm.fr1 $b"] -row 1 -column 99
+        set instparms(profilenum) 1
+        ShowInstProfile $b
+        return
+    }
+
+    $topfr.n config -state normal
     set col 0
     grid [label $bnkfr.l4a -text "Radiation\ntype:" -anchor e -justify r] \
@@ -287 +355 @@
         set result [exec $wishshell \
                 [file join $expgui(scriptdir) dumpprof.tcl] $filename]
-    }
+    } errmsg
     if {[set nhist [llength $result]] == 0} {
         set msg "No profile information was read from file $filename"
@@ -301 +369 @@
         incr i
         set h [lindex $histrec 0]
-        set type [lindex $histrec 1]
+        set type [string range [lindex $histrec 1] 0 3]
+        # instrument parameters
+        set instparms(hstcons$h) [string range [lindex $histrec 1] 4 end]
         if {[string range $type 0 2] == \
                 [string range $instdat(banktype) 0 2]} {
@@ -395 +465 @@
 
 proc instSelectPhase {proflist} {
-    global instparms instdat
+    global instparms instdat expgui
     set top $instparms(top).sel
     eval destroy [winfo children [set frame $top.prof]]
@@ -401 +471 @@
     set col 0
     set num [lindex $proflist 1]
-    set lbl [lindex \
-            {"" "1: Gaussian only" "2: Pseudo-Voigt" \
-            "3: Pseudo-Voigt/FCJ Asym" "4: P-V/FCJ/Stephens Aniso Brdg"} $num]
+    set T [string range $instdat(banktype) 2 2]
+    set lbllst ""
+    catch {set lbllst $expgui(prof-${T}-names)}
+    set lbl [lindex "{} $lbllst" $num]
     grid [label $frame.${col}_$row -justify left -anchor w \
-            -text "Profile type $lbl"] \
+            -text "Profile type $num: $lbl"] \
             -column $col -row $row -columnspan 99 -sticky w
     incr row
@@ -452 +523 @@
         set instdat(prof${b}_${j}_$i) $val
     }
+    # TOF grab Difc, difA & zero
+    if {$T == "T"} {
+        set h $instparms(histimport)
+        set difcons [lindex $instparms(hstcons$h) 0]
+        set instdat(difc$b) [lindex $difcons 0]
+        set instdat(difa$b) [lindex $difcons 1]
+        set instdat(zero$b) [lindex $difcons 2]
+    }
     ShowInstProfile $b
 }
@@ -466 +545 @@
 
 proc ShowInstProfile {b} {
-    global instparms instdat
+    global instparms instdat expgui
     set frame $instparms(profileframe)
+    if {![winfo exists $frame]} return
     set j $instparms(profilenum)
     eval destroy [winfo children $frame]
@@ -478 +558 @@
     grid $frame.${col}_$row -column $col -row $row -sticky ew
     $menu delete 0 end
-    foreach val { 1  2  3  4} \
-            lbl {"1) Gaussian only" "2) Pseudo-Voigt" \
-            "3) Pseudo-Voigt/FCJ Asym" "4) P-V/FCJ/Stephens Aniso Brdg"} {
-        $menu add radiobutton -value $val -label $lbl \
+    set T [string range $instdat(banktype) 2 2]
+    set lbllst ""
+    catch {set lbllst $expgui(prof-${T}-names)}
+    set val 0
+    foreach lbl $lbllst {
+        incr val
+        $menu add radiobutton -value $val -label "$val) $lbl" \
                 -command "instInitProf; ShowInstProfile $b" \
                 -variable instdat(proftype${b}_$j)