From 9c2b87231edb5f2384b9c1844ef9e3a4c72d1765 Mon Sep 17 00:00:00 2001 From: System User Date: Tue, 26 Jan 2010 13:15:43 +0100 Subject: [PATCH] * move the PseudoAxesAdapter update code in the PseudoAxesAdapter class. It was before in the TangoHKLAdapter code. that way it is easier to understand who does what. --- src/PseudoAxesAdapter.cpp | 11 +++++++++-- src/TangoHKLAdapter.cpp | 19 ++----------------- 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/src/PseudoAxesAdapter.cpp b/src/PseudoAxesAdapter.cpp index ec4411e..f4afc79 100644 --- a/src/PseudoAxesAdapter.cpp +++ b/src/PseudoAxesAdapter.cpp @@ -166,16 +166,23 @@ namespace Diffractometer_ns void PseudoAxesAdapter::update(void) { + size_t i, len; std::string status_extra; + // update the read part. + len = HKL_LIST_LEN(_engine_r->pseudoAxes); + for(i=0; ipseudoAxes[i]); + _write.data[i] = hkl_parameter_get_value_unit((HklParameter *)_engine_w->pseudoAxes[i]); + + } + _status = "PseudoAxes status: "; // now compute the state and status if(!_hklAdapter->_auto_update_from_proxies) _state = Tango::STANDBY; else{ - size_t i; - _state = Tango::STANDBY; for(i=0;i<_axes.size();++i) { AxisAdapter const * axis = _axes[i]; diff --git a/src/TangoHKLAdapter.cpp b/src/TangoHKLAdapter.cpp index c0350f6..027180c 100644 --- a/src/TangoHKLAdapter.cpp +++ b/src/TangoHKLAdapter.cpp @@ -465,23 +465,8 @@ namespace Diffractometer_ns void TangoHKLAdapter::update_pseudo_axes_adapters_from_hkl(void) { - size_t i, j, len; - HklPseudoAxisEngine *engine_r, *engine_w; - - for(i=0; i<_pseudoAxesAdapters.size(); ++i){ - PseudoAxesAdapter *adapter; - - adapter = _pseudoAxesAdapters[i]; - engine_r = _diffractometer->engines_r->engines[i]; - engine_w = _diffractometer->engines_w->engines[i]; - len = HKL_LIST_LEN(engine_r->pseudoAxes); - for(j=0; j_read.data[j] = hkl_parameter_get_value_unit((HklParameter *)engine_r->pseudoAxes[j]); - adapter->_write.data[j] = hkl_parameter_get_value_unit((HklParameter *)engine_w->pseudoAxes[j]); - - } - adapter->update(); - } + for(size_t i=0; i<_pseudoAxesAdapters.size(); ++i) + _pseudoAxesAdapters[i]->update(); } void TangoHKLAdapter::update_state_and_status(void) -- 2.11.4.GIT