Changeset 183 for trunk/3DEES/UserInterface.tcl

Timestamp:

Jan 24, 2014, 3:33:37 PM (11 years ago)

Author:

demin

Message:

fix classifier and add bin number to osc mux

File:

• trunk/3DEES/UserInterface.tcl (modified) (8 diffs)

trunk/3DEES/UserInterface.tcl

@@ -96 +96 @@
     variable inpCodes
     array set inpCodes {
-        0 {r}
-        1 {c}
-        2 {a}
-        3 {f}
+        0 {rs}
+        1 {cs}
+        2 {av}
+        3 {af}
+        4 {bn}
     }
 
@@ -504 +505 @@
         trace add variable [myvar polar] write [myproc polar_update]
 
-        $config(1).chan_0_1 select
-        $config(2).chan_0_2 select
-        $config(3).chan_0_3 select
-        $config(4).chan_0_4 select
-        $config(5).chan_0_5 select
-        $config(6).chan_2_1 select
+        $config(1).chan_1_1 select
+        $config(2).chan_1_2 select
+        $config(3).chan_1_3 select
+        $config(4).chan_1_4 select
+        $config(5).chan_1_5 select
+        $config(6).chan_2_4 select
 
         foreach {ch dummy} [array get adcCodes] {
@@ -536 +537 @@
         foreach {osc title} $oscList {
             set config($osc) [labelframe ${mux}.$osc -borderwidth 1 -relief sunken -text $title]
-            set column 1
             foreach {code input} $inpList {
+                set column [expr {$code + 1}]
                 label $config($osc).input_${input} -text " ${input}"
                 grid $config($osc).input_${input} -row 0 -column ${column} -sticky w
-                incr column
             }
             foreach {ch id} $adcList {
@@ -552 +552 @@
                 }
             }
-            set column [expr {($osc - 1) % 6}]
-            set row [expr {($osc - 1) / 6}]
+            set column [expr {($osc - 1) % 3}]
+            set row [expr {($osc - 1) / 3}]
             grid $config($osc) -row ${row} -column ${column} -sticky news -padx 10
         }
@@ -559 +559 @@
         set config(key) [labelframe ${key}.frame -borderwidth 1 -relief sunken -text {legend}]
 
-        label $config(key).r -text "r - raw signal"
-        grid $config(key).r -row 0 -column 0 -sticky news
-
-        label $config(key).f -text "c - filtered and clipped signal"
-        grid $config(key).f -row 0 -column 1 -sticky news
-
-        label $config(key).d -text "a - amplitude"
-        grid $config(key).d -row 0 -column 2 -sticky news
-
-        label $config(key).c -text "f - amplitude flag"
-        grid $config(key).c -row 0 -column 3 -sticky news
+        label $config(key).rs -text "rs - raw signal"
+        grid $config(key).rs -row 0 -column 0 -sticky news
+
+        label $config(key).cs -text "cs - filtered and clipped signal"
+        grid $config(key).cs -row 0 -column 1 -sticky news
+
+        label $config(key).av -text "av - amplitude value"
+        grid $config(key).av -row 0 -column 2 -sticky news
+
+        label $config(key).af -text "af - amplitude flag"
+        grid $config(key).af -row 0 -column 3 -sticky news
+
+        label $config(key).bn -text "bn - bin number"
+        grid $config(key).bn -row 0 -column 4 -sticky news
+
+        label $config(key).bf -text "bf - bin flag"
+        grid $config(key).bf -row 0 -column 5 -sticky news
 
         grid $config(key) -row 0 -column 0 -sticky news -padx 10
@@ -603 +609 @@
         grid columnconfigure $config(key) 2 -weight 1
         grid columnconfigure $config(key) 3 -weight 1
+        grid columnconfigure $config(key) 4 -weight 1
+        grid columnconfigure $config(key) 5 -weight 1
 
 
@@ -608 +616 @@
         grid columnconfigure ${mux} 1 -weight 1
         grid columnconfigure ${mux} 2 -weight 1
-        grid columnconfigure ${mux} 3 -weight 1
-        grid columnconfigure ${mux} 4 -weight 1
-        grid columnconfigure ${mux} 5 -weight 1
     }
 
@@ -981 +986 @@
 
         ${config}.thrs_check select
-        ${config}.thrs_field set 30
+        ${config}.thrs_field set 60
     }