From a7073749b4ddac9ecf7096b28a55316c87a41e8c Mon Sep 17 00:00:00 2001
From: System User <picca@b1460-srv2.sixs.rcl>
Date: Mon, 25 Jan 2010 10:54:03 +0100
Subject: [PATCH] * switch the initialized attribut to the config struct

---
 src/PseudoAxis/PseudoAxis.cpp | 11 +++--------
 src/PseudoAxisAdapter.cpp     | 12 ++++++------
 src/PseudoAxisAdapter.h       |  1 -
 src/TangoHKLAdapter.cpp       |  8 --------
 src/TangoHKLAdapter.h         |  2 --
 5 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/src/PseudoAxis/PseudoAxis.cpp b/src/PseudoAxis/PseudoAxis.cpp
index a339590..7158613 100644
--- a/src/PseudoAxis/PseudoAxis.cpp
+++ b/src/PseudoAxis/PseudoAxis.cpp
@@ -87,8 +87,6 @@ namespace PseudoAxis_ns
 		DEBUG_STREAM << "PseudoAxis::delete_device() entering... " << std::endl;
 
 		DELETE_SCALAR_ATTRIBUTE(attr_position_read);
-		DELETE_SCALAR_ATTRIBUTE(attr_IsInitialised_read);
-		DELETE_SCALAR_ATTRIBUTE(attr_initialized_read);
 		DELETE_SCALAR_ATTRIBUTE(attr_offset_read);
 
 		_buffer = NULL;
@@ -111,8 +109,6 @@ namespace PseudoAxis_ns
 		this->get_device_property();
 
 		CREATE_SCALAR_ATTRIBUTE(attr_position_read);
-		CREATE_SCALAR_ATTRIBUTE(attr_IsInitialised_read);
-		CREATE_SCALAR_ATTRIBUTE(attr_initialized_read);
 		CREATE_SCALAR_ATTRIBUTE(attr_offset_read);
 
 		_buffer = NULL;
@@ -120,6 +116,7 @@ namespace PseudoAxis_ns
 
 		// initialize the config
 		_config.mode = "";
+		_config.initialized = false;
 	}
 
 	//+----------------------------------------------------------------------------
@@ -318,8 +315,7 @@ void PseudoAxis::read_initialized(Tango::Attribute &attr)
 	//      Add your own code here
 
 	if(_buffer)
-		*attr_initialized_read = _buffer->get_initialized();
-	attr.set_value(attr_initialized_read);
+		attr.set_value(&_config.initialized);
 }
 
 //+----------------------------------------------------------------------------
@@ -529,8 +525,7 @@ void PseudoAxis::read_IsInitialised(Tango::Attribute &attr)
 	//      Add your own code here
 
 	if(_buffer)
-		*attr_IsInitialised_read = _buffer->get_initialized();
-	attr.set_value(attr_IsInitialised_read);
+		attr.set_value(&_config.initialized);
 }
 
 //+------------------------------------------------------------------
diff --git a/src/PseudoAxisAdapter.cpp b/src/PseudoAxisAdapter.cpp
index 65b136f..d277a9e 100644
--- a/src/PseudoAxisAdapter.cpp
+++ b/src/PseudoAxisAdapter.cpp
@@ -18,6 +18,7 @@ namespace Diffractometer_ns
 		_ready = false;
 		_config.state = Tango::UNKNOWN;
 		_config.mode = "";
+		_config.initialized = false;
 
 		_axes.clear();
 		len = HKL_LIST_LEN(_pseudo_r->engine->mode->axes_names);
@@ -84,7 +85,11 @@ namespace Diffractometer_ns
 		_config.status += extra_status;
 
 		// update the mode
-		_config.mode = const_cast<Tango::DevString>(this->_pseudo_r->engine->mode->name);		
+		_config.mode = const_cast<Tango::DevString>(this->_pseudo_r->engine->mode->name);
+
+		// initialized part
+		if(this->_pseudo_r->engine->mode->initialize == NULL)
+			_config.initialized = true;
 	}
 
 	PseudoAxisConfig PseudoAxisAdapter::get_config(void)
@@ -133,11 +138,6 @@ namespace Diffractometer_ns
 		_hklAdapter.pseudo_axis_set_mode_parameters(this, argin);
 	}
 
-	Tango::DevBoolean PseudoAxisAdapter::get_initialized(void)
-	{
-		return _hklAdapter.pseudo_axis_get_initialized(this);
-	}
-
 	void PseudoAxisAdapter::set_initialized(Tango::DevBoolean initialized)
 	{
 		_hklAdapter.pseudo_axis_set_initialized(this, initialized);
diff --git a/src/PseudoAxisAdapter.h b/src/PseudoAxisAdapter.h
index fe3a6c5..4d0358b 100644
--- a/src/PseudoAxisAdapter.h
+++ b/src/PseudoAxisAdapter.h
@@ -42,7 +42,6 @@ namespace Diffractometer_ns {
 		bool is_ready(void);
 		Tango::DevString *get_mode(void) const;
 		void set_mode(Tango::DevString const & mode);
-		Tango::DevBoolean get_initialized(void);
 		void set_initialized(Tango::DevBoolean initialized);
 		void on(void);
 	private:
diff --git a/src/TangoHKLAdapter.cpp b/src/TangoHKLAdapter.cpp
index ba58bfb..0fc1e3b 100644
--- a/src/TangoHKLAdapter.cpp
+++ b/src/TangoHKLAdapter.cpp
@@ -1438,14 +1438,6 @@ namespace Diffractometer_ns
 		return buffer;
 	}
 
-	Tango::DevBoolean TangoHKLAdapter::pseudo_axis_get_initialized(PseudoAxisAdapter *buffer)
-	{
-		omni_mutex_lock lock(_lock);
-
-		if(!buffer->_pseudo_r->engine->mode->initialize)
-			return true;
-	}
-
 	void TangoHKLAdapter::pseudo_axis_set_initialized(PseudoAxisAdapter *buffer,
 							  Tango::DevBoolean initialized)
 	{
diff --git a/src/TangoHKLAdapter.h b/src/TangoHKLAdapter.h
index 78f24db..8898111 100644
--- a/src/TangoHKLAdapter.h
+++ b/src/TangoHKLAdapter.h
@@ -201,8 +201,6 @@ namespace Diffractometer_ns {
 
 		void pseudo_axis_set_mode_parameters(PseudoAxisAdapter *buffer, const Tango::DevVarDoubleStringArray *argin);
 
-		Tango::DevBoolean pseudo_axis_get_initialized(PseudoAxisAdapter *buffer);
-
 		void pseudo_axis_set_initialized(PseudoAxisAdapter *buffer, Tango::DevBoolean initialized);
 
 		void pseudo_axis_on(PseudoAxisAdapter *buffer);
-- 
2.11.4.GIT