Changeset 912

Timestamp:

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

Author:

toby

Message:

# on 2008/04/15 17:24:40, toby did:
new button to import diffractometer constants in instedit

File:

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

trunk/instedit.tcl

@@ -170 +170 @@
             -column 0 -row 2 -sticky e
     grid [entry $bnkfr.e3 -textvariable instdat(name$b) -width 30] \
-            -column 1 -row 2 -sticky w -columnspan 99
+            -column 1 -row 2 -sticky w -columnspan 3
+    grid [checkbutton $bnkfr.import -text "Import Diffractometer Constants"\
+              -variable instparms(ImportDiffConst)] \
+        -column 4 -row 2 -sticky e -columnspan 3
 
     if {$instparms(banklabel) == "TOF"} {
@@ -523 +526 @@
         set instdat(prof${b}_${j}_$i) $val
     }
-    # TOF grab Difc, difA & zero
-    if {$T == "T"} {
+    # grab Diffractometer constants
+    if {$instparms(ImportDiffConst)} {
         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]
+        if {[string range $instdat(banktype) 2 2] == "T"} {
+            # TOF grab Difc, difA & zero
+            set instdat(difc$b) [lindex $difcons 0]
+            set instdat(difa$b) [lindex $difcons 1]
+            set instdat(zero$b) [lindex $difcons 2]
+        } elseif {[string range $instdat(banktype) 2 2] == "E"} {
+            set instdat(difc$b) [lindex $difcons 0]
+            set instdat(pola$b) [lindex $difcons 4]
+        } else {
+            set instdat(difc$b) [lindex $difcons 0]
+            set instdat(difa$b) [lindex $difcons 1]
+            set instdat(zero$b) [lindex $difcons 2]
+            set instdat(ipola$b) [lindex $difcons 3]
+            set instdat(pola$b) [lindex $difcons 4]
+            set box $instparms(top).b1
+            set topfr $box.a
+            set bnkfr $box.b
+            if { [lindex $difcons 1] == 0.0} {
+                $bnkfr.c4a invoke
+            } else {
+                $bnkfr.c4b invoke
+            }
+        }
     }
     ShowInstProfile $b