From 4568b365a6495c717f21f39bd485433b3b1a4eb5 Mon Sep 17 00:00:00 2001 From: Ferdi Franceschini Date: Sat, 24 Mar 2007 14:44:03 +1100 Subject: [PATCH] Make bmonscan graphics view info independent of the bmonscan feedback. r1715 | ffr | 2007-03-24 14:44:03 +1100 (Sat, 24 Mar 2007) | 2 lines --- .../instrument/config/scan/scan_common_1.tcl | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/site_ansto/instrument/config/scan/scan_common_1.tcl b/site_ansto/instrument/config/scan/scan_common_1.tcl index 88acc78a..93ccd1da 100644 --- a/site_ansto/instrument/config/scan/scan_common_1.tcl +++ b/site_ansto/instrument/config/scan/scan_common_1.tcl @@ -14,6 +14,7 @@ variable bmonscanvar_axis_hpath # we use this to get auto-notification on update of bmonscancounts_array_hpath variable bmonscancounts_array_hpath +# bmonscan setup parameters and feedback variables. VarMake bmonscan_var_name Text User VarMake bmonscan_var_value Float User VarMake bmonscan_var_start Float User @@ -26,6 +27,11 @@ VarMake bmonscan_counts Int User VarMake bmonscan_numchannels Int User VarMake bmonscan_channel Int User +# bmonscan graphdata variables. +VarMake bmonscan_np_graphics_target Int User +VarMake bmonscan_point_graphics_current Int User +VarMake bmonscan_var_graphics_value Float User + VarMake hmscan_var_name Text User VarMake hmscan_var_value Float User VarMake hmscan_var_start Float User @@ -102,11 +108,13 @@ variable scanVariable scan_var scanVarStart 0 scanVarStep 1 proc bm_writepoint {sobj uobj pt} { variable bmoncounts_array - set counts [SplitReply [bm getcounts]] - bmonscan_counts $counts -# lappend bmoncounts_array $counts set bmoncounts_array [string map {\{ "" \} ""} [SplitReply [bmonscan getcounts]]]; write_nxentry bm_addnxscanentry $pt; + + bmonscan_counts [SplitReply [bm getcounts]] + bmonscan_np_graphics_target [SplitReply [bmonscan_np_target]] + bmonscan_point_graphics_current [SplitReply [bmonscan_point_current]] + bmonscan_var_graphics_value [SplitReply [bmonscan_var_value]] } #TODO Feedback for Histogram memory scan @@ -234,9 +242,9 @@ variable scanVariable scan_var scanVarStart 0 scanVarStep 1 hsetprop $parent/beam_monitor_scan type graphdata; hsetprop $parent/beam_monitor_scan viewer default; hsetprop $parent/beam_monitor_scan rank 1; - hattach $parent/beam_monitor_scan bmonscan_np_target dim; - hattach $parent/beam_monitor_scan bmonscan_point_current point; - hattach $parent/beam_monitor_scan bmonscan_var_value lastaxis + hattach $parent/beam_monitor_scan bmonscan_np_graphics_target dim; + hattach $parent/beam_monitor_scan bmonscan_point_graphics_current point; + hattach $parent/beam_monitor_scan bmonscan_var_graphics_value lastaxis hattach $parent/beam_monitor_scan bmonscan_counts lastdata hmakescript $bmonscanvar_axis_hpath "set ::scancommand::bmoncounts_axis" hdbReadOnly floatvarar $defdim hsetprop $bmonscanvar_axis_hpath type axis