From b9b2bb5c6147c3a15de0dde31023d25274b2ac49 Mon Sep 17 00:00:00 2001 From: System User Date: Fri, 22 Jan 2010 11:52:35 +0100 Subject: [PATCH] * POGO to create a clone of isInitialised named initialized. --- src/PseudoAxis/PseudoAxis.cpp | 25 +++++++++++++++++++++++++ src/PseudoAxis/PseudoAxis.h | 30 ++++++++++++++++++++++-------- src/PseudoAxis/PseudoAxisClass.cpp | 22 +++++++++++++++------- src/PseudoAxis/PseudoAxisClass.h | 26 ++++++++++++++++++++------ src/PseudoAxis/PseudoAxisStateMachine.cpp | 14 ++++++++++++++ 5 files changed, 96 insertions(+), 21 deletions(-) diff --git a/src/PseudoAxis/PseudoAxis.cpp b/src/PseudoAxis/PseudoAxis.cpp index 98e9ebd..375420a 100644 --- a/src/PseudoAxis/PseudoAxis.cpp +++ b/src/PseudoAxis/PseudoAxis.cpp @@ -301,6 +301,30 @@ void PseudoAxis::read_attr_hardware(vector &attr_list) } //+---------------------------------------------------------------------------- // +// method : PseudoAxis::read_initialized +// +// description : Extract real attribute values for initialized acquisition result. +// +//----------------------------------------------------------------------------- +void PseudoAxis::read_initialized(Tango::Attribute &attr) +{ + DEBUG_STREAM << "PseudoAxis::read_initialized(Tango::Attribute &attr) entering... "<< endl; +} + +//+---------------------------------------------------------------------------- +// +// method : PseudoAxis::write_initialized +// +// description : Write initialized attribute values to hardware. +// +//----------------------------------------------------------------------------- +void PseudoAxis::write_initialized(Tango::WAttribute &attr) +{ + DEBUG_STREAM << "PseudoAxis::write_initialized(Tango::WAttribute &attr) entering... "<< endl; +} + +//+---------------------------------------------------------------------------- +// // method : PseudoAxis::read_mode // // description : Extract real attribute values for mode acquisition result. @@ -718,4 +742,5 @@ void PseudoAxis::set_mode_parameters(const Tango::DevVarDoubleStringArray *argin } + } // namespace diff --git a/src/PseudoAxis/PseudoAxis.h b/src/PseudoAxis/PseudoAxis.h index 12b508a..e32ef53 100644 --- a/src/PseudoAxis/PseudoAxis.h +++ b/src/PseudoAxis/PseudoAxis.h @@ -47,11 +47,13 @@ namespace PseudoAxis_ns Tango::DevDouble attr_position_write; Tango::DevDouble *attr_offset_read; Tango::DevDouble attr_offset_write; - Tango::DevBoolean *attr_IsInitialised_read; - Tango::DevBoolean attr_IsInitialised_write; + Tango::DevBoolean *attr_initialized_read; + Tango::DevBoolean attr_initialized_write; Tango::DevDouble attr_relativeMove_write; Tango::DevString *attr_mode_read; Tango::DevString attr_mode_write; + Tango::DevBoolean *attr_IsInitialised_read; + Tango::DevBoolean attr_IsInitialised_write; Tango::DevString *attr_modeNames_read; //@} @@ -153,13 +155,13 @@ namespace PseudoAxis_ns */ virtual void write_offset(Tango::WAttribute &attr); /** - * Extract real attribute values for IsInitialised acquisition result. + * Extract real attribute values for initialized acquisition result. */ - virtual void read_IsInitialised(Tango::Attribute &attr); + virtual void read_initialized(Tango::Attribute &attr); /** - * Write IsInitialised attribute values to hardware. + * Write initialized attribute values to hardware. */ - virtual void write_IsInitialised(Tango::WAttribute &attr); + virtual void write_initialized(Tango::WAttribute &attr); /** * Extract real attribute values for relativeMove acquisition result. */ @@ -177,6 +179,14 @@ namespace PseudoAxis_ns */ virtual void write_mode(Tango::WAttribute &attr); /** + * Extract real attribute values for IsInitialised acquisition result. + */ + virtual void read_IsInitialised(Tango::Attribute &attr); +/** + * Write IsInitialised attribute values to hardware. + */ + virtual void write_IsInitialised(Tango::WAttribute &attr); +/** * Extract real attribute values for modeNames acquisition result. */ virtual void read_modeNames(Tango::Attribute &attr); @@ -189,9 +199,9 @@ namespace PseudoAxis_ns */ virtual bool is_offset_allowed(Tango::AttReqType type); /** - * Read/Write allowed for IsInitialised attribute. + * Read/Write allowed for initialized attribute. */ - virtual bool is_IsInitialised_allowed(Tango::AttReqType type); + virtual bool is_initialized_allowed(Tango::AttReqType type); /** * Read/Write allowed for relativeMove attribute. */ @@ -201,6 +211,10 @@ namespace PseudoAxis_ns */ virtual bool is_mode_allowed(Tango::AttReqType type); /** + * Read/Write allowed for IsInitialised attribute. + */ + virtual bool is_IsInitialised_allowed(Tango::AttReqType type); +/** * Read/Write allowed for modeNames attribute. */ virtual bool is_modeNames_allowed(Tango::AttReqType type); diff --git a/src/PseudoAxis/PseudoAxisClass.cpp b/src/PseudoAxis/PseudoAxisClass.cpp index 6a6574e..e00bf04 100644 --- a/src/PseudoAxis/PseudoAxisClass.cpp +++ b/src/PseudoAxis/PseudoAxisClass.cpp @@ -576,13 +576,13 @@ void PseudoAxisClass::attribute_factory(vector &att_list) offset->set_memorized_init(true); att_list.push_back(offset); - // Attribute : IsInitialised - IsInitialisedAttrib *is_initialised = new IsInitialisedAttrib(); - Tango::UserDefaultAttrProp is_initialised_prop; - is_initialised_prop.set_label("IsInitialised"); - is_initialised_prop.set_description("toggle the axis initialization. this attribut is non relevant on\nsome pseudoaxis."); - is_initialised->set_default_properties(is_initialised_prop); - att_list.push_back(is_initialised); + // Attribute : initialized + initializedAttrib *initialized = new initializedAttrib(); + Tango::UserDefaultAttrProp initialized_prop; + initialized_prop.set_label("IsInitialised"); + initialized_prop.set_description("toggle the axis initialization. this attribut is non relevant on\nsome pseudoaxis."); + initialized->set_default_properties(initialized_prop); + att_list.push_back(initialized); // Attribute : relativeMove relativeMoveAttrib *relative_move = new relativeMoveAttrib(); @@ -595,6 +595,14 @@ void PseudoAxisClass::attribute_factory(vector &att_list) modeAttrib *mode = new modeAttrib(); att_list.push_back(mode); + // Attribute : IsInitialised + IsInitialisedAttrib *is_initialised = new IsInitialisedAttrib(); + Tango::UserDefaultAttrProp is_initialised_prop; + is_initialised_prop.set_label("IsInitialised"); + is_initialised_prop.set_description("DEPRECATED"); + is_initialised->set_default_properties(is_initialised_prop); + att_list.push_back(is_initialised); + // Attribute : modeNames modeNamesAttrib *mode_names = new modeNamesAttrib(); att_list.push_back(mode_names); diff --git a/src/PseudoAxis/PseudoAxisClass.h b/src/PseudoAxis/PseudoAxisClass.h index 75dd6c6..8477692 100644 --- a/src/PseudoAxis/PseudoAxisClass.h +++ b/src/PseudoAxis/PseudoAxisClass.h @@ -79,6 +79,20 @@ public: {return (static_cast(dev))->is_modeNames_allowed(ty);} }; +class IsInitialisedAttrib: public Tango::Attr +{ +public: + IsInitialisedAttrib():Attr("IsInitialised", Tango::DEV_BOOLEAN, Tango::READ_WRITE) {}; + ~IsInitialisedAttrib() {}; + + virtual void read(Tango::DeviceImpl *dev,Tango::Attribute &att) + {(static_cast(dev))->read_IsInitialised(att);} + virtual void write(Tango::DeviceImpl *dev,Tango::WAttribute &att) + {(static_cast(dev))->write_IsInitialised(att);} + virtual bool is_allowed(Tango::DeviceImpl *dev,Tango::AttReqType ty) + {return (static_cast(dev))->is_IsInitialised_allowed(ty);} +}; + class modeAttrib: public Tango::Attr { public: @@ -107,18 +121,18 @@ public: {return (static_cast(dev))->is_relativeMove_allowed(ty);} }; -class IsInitialisedAttrib: public Tango::Attr +class initializedAttrib: public Tango::Attr { public: - IsInitialisedAttrib():Attr("IsInitialised", Tango::DEV_BOOLEAN, Tango::READ_WRITE) {}; - ~IsInitialisedAttrib() {}; + initializedAttrib():Attr("initialized", Tango::DEV_BOOLEAN, Tango::READ_WRITE) {}; + ~initializedAttrib() {}; virtual void read(Tango::DeviceImpl *dev,Tango::Attribute &att) - {(static_cast(dev))->read_IsInitialised(att);} + {(static_cast(dev))->read_initialized(att);} virtual void write(Tango::DeviceImpl *dev,Tango::WAttribute &att) - {(static_cast(dev))->write_IsInitialised(att);} + {(static_cast(dev))->write_initialized(att);} virtual bool is_allowed(Tango::DeviceImpl *dev,Tango::AttReqType ty) - {return (static_cast(dev))->is_IsInitialised_allowed(ty);} + {return (static_cast(dev))->is_initialized_allowed(ty);} }; class offsetAttrib: public Tango::Attr diff --git a/src/PseudoAxis/PseudoAxisStateMachine.cpp b/src/PseudoAxis/PseudoAxisStateMachine.cpp index 379533b..6c0566d 100644 --- a/src/PseudoAxis/PseudoAxisStateMachine.cpp +++ b/src/PseudoAxis/PseudoAxisStateMachine.cpp @@ -185,6 +185,20 @@ bool PseudoAxis::is_modeNames_allowed(Tango::AttReqType type) // Re-Start of Generated Code return true; } +//+---------------------------------------------------------------------------- +// +// method : PseudoAxis::is_initialized_allowed +// +// description : Read/Write allowed for initialized attribute. +// +//----------------------------------------------------------------------------- +bool PseudoAxis::is_initialized_allowed(Tango::AttReqType type) +{ + // End of Generated Code + + // Re-Start of Generated Code + return true; +} //================================================= // Commands Allowed Methods -- 2.11.4.GIT