Changeset 117 for sans/utils/bt5/prepare

Timestamp:

Jun 1, 2007 1:50:35 PM (16 years ago)

Author:

ajj

Message:

Modifications to prepare for BT-5:

• Motors now given user friendly labels
• Defaults to Simple Mode which only allows control of A2 and A5
• Put previous edits (buffer display and labels etc) into conditional clauses so that they can be incorporated into the canonical source

File:

• sans/utils/bt5/prepare/prepare (modified) (9 diffs)

sans/utils/bt5/prepare/prepare

@@ -293 +293 @@
             set config(pola_state) disabled
             set config(mono_list)  {Si220}
+            set config(mode) 0
+            set config(motlbls) {Monochromator Analyzer "Detector Slide" "Analyzer Table" Sample Unused} 
         }
         7 {
@@ -513 +515 @@
     set row 1
     foreach i $config(ibuf_mots) {
+        if { $config(nsta) == 5 } {
+        set motname [lindex $config(motlbls) [expr $i-1]]
+        label $parent.a${i}beglabel -text "$motname (A${i}) Beg:"
+        entry $parent.a${i}beg -width $width -textvariable ibufdisp(a${i}beg)
+        label $parent.a${i}inclabel -text "Inc:"
+        entry $parent.a${i}inc -width $width -textvariable ibufdisp(a${i}inc)
+        label $parent.a${i}endlabel -text "End:"
+        entry $parent.a${i}end -width $width -textvariable ibufdisp(a${i}end)
+        
+
+        } else {
         label $parent.a${i}beglabel -text "A${i}-beg:"
         entry $parent.a${i}beg -width $width -textvariable ibufdisp(a${i}beg)
@@ -519 +532 @@
         label $parent.a${i}endlabel -text "A${i}-end:"
         entry $parent.a${i}end -width $width -textvariable ibufdisp(a${i}end)
-        if $text_only {
+        } 
+       if $text_only {
            grid $parent.a${i}beglabel -row $row -column 1 -ipadx 1 -sticky w
            grid $parent.a${i}beg -row $row -column 2 -ipadx 1 -sticky w
@@ -527 +541 @@
            grid $parent.a${i}end -row $row -column 6 -ipadx 1 -sticky w
         } else {
-           grid $parent.a${i}beglabel -row $row -column 1
+           grid $parent.a${i}beglabel -row $row -column 1 -sticky e
            grid $parent.a${i}beg -row $row -column 2
            grid $parent.a${i}inclabel -row $row -column 3
@@ -697 +711 @@
     if {$config(nsta) == 1} {
         foreach i $config(ibuf_mots) {
+            foreach l "a${i}beglabel a${i}inclabel a${i}endlabel" {
+                $parent.$l config -fg $color
+            }
+            foreach e "a${i}beg a${i}inc a${i}end" {
+                $parent.$e config -state $state -fg $color
+            }
+        } 
+        $parent.pts.label config -fg $color
+        $parent.pts.val config -state $state -fg $color
+    }
+    if { $config(nsta) == 5} {
+        foreach i {1 3 4 6} {
             foreach l "a${i}beglabel a${i}inclabel a${i}endlabel" {
                 $parent.$l config -fg $color
@@ -862 +888 @@
 
 proc IBufList { } {
-    global text_only
+    global text_only config
     # Clear out our list if it contains anything.
     set lbox .l.list
     set start [expr int([lindex [$lbox yview] 0] * [$lbox index end])]
     $lbox delete 0 end
-    $lbox configure -font {-family courier -size 12}
+    if { $config(nsta) == 5} { 
+        $lbox configure -font {-family courier -size 12} 
+    } else {    
+        $lbox configure -font fixed
+    }
     for {set i 0} {$i < 30} {incr i} {
         $lbox insert end [IBufFormatRec $i]
@@ -883 +913 @@
 
 proc IBufFormatRec { recno } {
-    global ibuf
+    global ibuf config
+
+    if { $config(nsta) == 5 } {
+
     set output [format "%-3d " [expr $recno + 1]]
     append output [binary format A20 $ibuf($recno,comment)]
@@ -898 +931 @@
     append output [format "%4.0f"   $ibuf($recno,th0)]
  
+    } else {
+
+    set output [format "%2d " [expr $recno + 1]]
+    append output [binary format A20 $ibuf($recno,comment)]
+    append output [format " %6.2f "  $ibuf($recno,a4beg)]
+    append output [format "%6.2f "   $ibuf($recno,a4end)]
+    append output [format "%5.2f "   $ibuf($recno,a4inc)]
+    append output [format "%2.0f\* " $ibuf($recno,mpf)]
+    append output [format "%6.0f "   $ibuf($recno,mon)]
+    append output [binary format A4  $ibuf($recno,mt)]
+    append output [format " %6.1f"   $ibuf($recno,t0)]
+    append output [format "%4.0f "   $ibuf($recno,th0)]
+ 
+    }
     return $output
 }
@@ -5430 +5477 @@
 
 proc SwitchBuf { which } {
-    global mode changed
+    global mode changed config
     switch $which {
         increment {
+           if { $config(nsta) == 5 } {
             .l.title configure -text \
                     "#  Comment *I-Buf*         A2-beg  A2-end  A2-Inc  A5-beg  A5-end  A5-Inc Monitor         Temp  Hold"\
                     -font {-family courier -size 11}
+            } else {
+            .l.title configure -text \
+                    "No Comment *I-Buffer*   A4-beg A4-end  Inc    Monitor        Temp Hold"
+            }
             IBufReadFile ;# Make sure we get the latest data from disk
             IBufList