From 1d1ac999b785f86db70e583a905ccdcd29c64d16 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= Date: Thu, 11 Jun 2009 16:30:23 +0200 Subject: [PATCH] * use the proxy_name instead of computing the proxy name in the create and start method --- src/PseudoAxesAdapter.h | 1 + src/TangoHKLAdapter.cpp | 6 +----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/PseudoAxesAdapter.h b/src/PseudoAxesAdapter.h index d3293c5..1844ea7 100644 --- a/src/PseudoAxesAdapter.h +++ b/src/PseudoAxesAdapter.h @@ -17,6 +17,7 @@ namespace Diffractometer_ns { Matrix const & get_read(void) const {return _read;} Matrix const & get_write(void) const {return _write;} Matrix const & get_pseudo_axis_names(void) const {return _pseudo_axis_names;} + std::string const & get_proxy_name(void) const {return _proxy_name;} char const * get_name(void) const; void write(Matrix const & write); diff --git a/src/TangoHKLAdapter.cpp b/src/TangoHKLAdapter.cpp index b186515..b96bf82 100644 --- a/src/TangoHKLAdapter.cpp +++ b/src/TangoHKLAdapter.cpp @@ -1752,14 +1752,10 @@ namespace Diffractometer_ns Tango::Util *tg = Tango::Util::instance(); Tango::Database *db = tg->get_database(); for(i=0; i<_pseudoAxesAdapters.size(); ++i){ - std::string dev_name; + std::string dev_name = _pseudoAxesAdapters[i].get_proxy_name(); Tango::DbDevInfo my_device_info; // add the device to the database - dev_name = _device->name(); - dev_name += "-"; - dev_name += _pseudoAxesAdapters[i].get_name(); - my_device_info.name = dev_name.c_str(); my_device_info._class = "PseudoAxes"; my_device_info.server = tg->get_ds_name().c_str(); -- 2.11.4.GIT