Changeset 167

Timestamp:

Feb 23, 2012, 2:01:29 PM (13 years ago)

Author:

demin

Message:

multiple GUI fixes

File:

• trunk/MultiChannelUSB/UserInterface.tcl (modified) (12 diffs)

trunk/MultiChannelUSB/UserInterface.tcl

@@ -438 +438 @@
         my set rate_val(inst) 0.0
         my set rate_val(mean) 0.0
+        
+        ${config}.chan_frame.entr_value configure -text 0.0
+
+        ${config}.chan_frame.axisy_value configure -text 0.0
+        ${config}.chan_frame.axisx_value configure -text 0.0
 
 #        my cntr_reset
@@ -455 +460 @@
         $graph grid configure -hide no
         $graph legend configure -hide yes
-        $graph axis configure x -min 0 -max 4096
 
         set config [frame ${master}.config -width 170]
@@ -540 +544 @@
         grid columnconfigure ${config}.chan_frame 1 -weight 1
 
-        # enable zooming
-        Blt_ZoomStack $graph
-
         my crosshairs $graph
 
@@ -582 +583 @@
     HstDisplay instproc axis_update args {
         my instvar axis graph
+        $graph axis configure x -min 0 -max 4096
+        Blt_ZoomStack $graph
         if {$axis} {
             $graph axis configure y -min 1 -max 1E10 -logscale yes
@@ -657 +660 @@
 
     HstDisplay instproc cntr_reset {} {
-        my instvar controller number after_handle
-        my instvar cntr_val cntr_bak cntr_old yvec_bak yvec_old
+        my instvar controller config number after_handle
+        my instvar cntr_val cntr_bak cntr_old yvec_bak yvec_old rate_val
 
         my cntr_stop
@@ -672 +675 @@
         set yvec_old 0.0
         
+        set rate_val(inst) 0.0
+        set rate_val(mean) 0.0
+        ${config}.chan_frame.entr_value configure -text 0.0
+
         my acquire
 
@@ -924 +931 @@
         my set recs_val 100
         my set recs_bak 100
+        
+        ${config}.chan_frame.mean_value configure -text [format {%.2e} 0.0]
+        ${config}.chan_frame.entr_value configure -text 0.0
+        
+        ${config}.chan_frame.axisy_value configure -text 0.0
+        ${config}.chan_frame.axisx_value configure -text 0.0
 
 #        my cntr_reset
@@ -941 +954 @@
         $graph grid configure -hide no
         $graph legend configure -hide yes
-        $graph axis configure x -min 0 -max 10000
 
         set config [frame ${master}.config -width 170]
@@ -1017 +1029 @@
         grid columnconfigure ${config}.chan_frame 1 -weight 1
 
-        # enable zooming
-        Blt_ZoomStack $graph
-
         my crosshairs $graph
 
@@ -1159 +1168 @@
         ${config}.reset configure -state active
 
-        ${config}.start configure -state active
         ${config}.cntr_field configure -state normal
         ${config}.recs_field configure -state normal
@@ -1253 +1261 @@
     CntDisplay instproc axis_update args {
         my instvar axis graph
+        $graph axis configure x -min 0 -max 10000
+        Blt_ZoomStack $graph
         if {$axis} {
             $graph axis configure y -min 1 -max 1E5 -logscale yes
@@ -1386 +1396 @@
         trace add variable [myvar last] write [myproc last_update]
 
-        ${config}.chan_frame.chan1_check select
-        ${config}.chan_frame.chan2_check select
-        ${config}.chan_frame.chan3_check select
-        ${config}.chan_frame.chan4_check select
-        ${config}.chan_frame.chan5_check select
-        ${config}.chan_frame.chan6_check select
+        for {set i 1} {$i <= 6} {incr i} {
+            ${config}.chan_frame.chan${i}_check select
+            ${config}.chan_frame.chan${i}_value configure -text 0.0
+        }
+        ${config}.chan_frame.axisx_value configure -text 0.0
 
         ${config}.thrs_check select