Skip to content
Snippets Groups Projects
Commit 214058d0 authored by Xavier ELATTAOUI's avatar Xavier ELATTAOUI
Browse files

Release Preparation : labelList attribute fixed and tested.

parent 645b292b
No related branches found
No related tags found
No related merge requests found
......@@ -9,7 +9,7 @@
<groupId>fr.soleil.device</groupId>
<artifactId>HexapodFMBO-${aol}-${mode}</artifactId>
<version>1.2.12-SNAPSHOT</version>
<version>1.2.12</version>
<packaging>nar</packaging>
......
......@@ -166,6 +166,7 @@ void FixedPositions::init_device()
this->status_str = "beginning initialization of the device\n";
attr_labelList_read = new Tango::DevString[kSpecLen];
_labelList_size = 0;
size_t s = 0;
for (s = 0; s < kSpecLen; s++)
......@@ -462,7 +463,9 @@ void FixedPositions::read_labelList(Tango::Attribute &attr)
{
DEBUG_STREAM << "FixedPositions::read_labelList(Tango::Attribute &attr) entering... "<< endl;
attr.set_value(attr_labelList_read, kSpecLen);
if ( _labelList_size > kSpecLen )
_labelList_size = kSpecLen;
attr.set_value(attr_labelList_read, _labelList_size);
}
......@@ -540,6 +543,9 @@ bool FixedPositions::parse()
{
PositionsData * pos_dat_tmp = new PositionsData;
//- update label list size
_labelList_size++;
//- wrong number of lines
if ((fixedPositionsProp.size () - i) < 6)
{
......
......@@ -322,6 +322,8 @@ protected :
PositionsData current_pos;
std::size_t _labelList_size;
void goto_fixed (PositionsData & fixed);
//- the fixed positions coordinates
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment