Compare revisions

09ec0325 · 09ec0325 · 09ec0325 · 09ec0325 · 09ec0325 · 09ec0325
--- a/src/AlarmHandler.xmi
+++ b/src/AlarmHandler.xmi
--- a/src/AlarmHandlerClass.cpp
+++ b/src/AlarmHandlerClass.cpp
--- a/src/AlarmHandlerClass.h
+++ b/src/AlarmHandlerClass.h
--- a/src/AlarmHandlerDynAttrUtils.cpp
+++ b/src/AlarmHandlerDynAttrUtils.cpp
@@ -128,7 +128,7 @@ void AlarmHandler::add_AlarmState_dynamic_attribute(string attname)
 //--------------------------------------------------------
 void AlarmHandler::remove_AlarmState_dynamic_attribute(string attname)
 {
-	remove_attribute(attname, true);
+	remove_attribute(attname, true, Tango::Util::instance()->_UseDb);
 	map<string,Tango::DevEnum>::iterator ite;
    if ((ite=AlarmState_data.find(attname))!=AlarmState_data.end())
    {
@@ -173,8 +173,8 @@ void AlarmHandler::add_AlarmFormula_dynamic_attribute(string attname)
 	//	Not Polled
 	alarmformula->set_disp_level(Tango::OPERATOR);
 	//	Not Memorized
-	alarmformula->set_change_event(true, false);
-	alarmformula->set_archive_event(true, false);
+	alarmformula->set_change_event(true, true);
+	alarmformula->set_archive_event(true, true);
 	char array[1];
 	array[0] = '\0';
 	AlarmFormula_data.insert(make_pair(attname, array));
@@ -189,7 +189,7 @@ void AlarmHandler::add_AlarmFormula_dynamic_attribute(string attname)
 //--------------------------------------------------------
 void AlarmHandler::remove_AlarmFormula_dynamic_attribute(string attname)
 {
-	remove_attribute(attname, true);
+	remove_attribute(attname, true, Tango::Util::instance()->_UseDb);
 	map<string,Tango::DevString>::iterator ite;
    if ((ite=AlarmFormula_data.find(attname))!=AlarmFormula_data.end())
    {

--- a/src/AlarmHandlerStateMachine.cpp
+++ b/src/AlarmHandlerStateMachine.cpp
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
--- a/src/ClassFactory.cpp
+++ b/src/ClassFactory.cpp
@@ -32,7 +32,7 @@
 //        (Program Obviously used to Generate tango Object)
 //=============================================================================

-#include <tango.h>
+#include <tango/tango.h>
 #include <AlarmHandlerClass.h>

 //	Add class header files if needed

--- a/src/SubscribeThread.cpp
+++ b/src/SubscribeThread.cpp
--- a/src/SubscribeThread.h
+++ b/src/SubscribeThread.h
--- a/src/alarm-thread.cpp
+++ b/src/alarm-thread.cpp
--- a/src/alarm-thread.h
+++ b/src/alarm-thread.h
--- a/src/alarm_grammar.h
+++ b/src/alarm_grammar.h
--- a/src/alarm_table.cpp
+++ b/src/alarm_table.cpp
--- a/src/alarm_table.h
+++ b/src/alarm_table.h
--- a/src/cmd_thread.cpp
+++ b/src/cmd_thread.cpp
--- a/src/cmd_thread.h
+++ b/src/cmd_thread.h
--- a/src/event_table.cpp
+++ b/src/event_table.cpp
--- a/src/event_table.h
+++ b/src/event_table.h
--- a/src/formula_grammar.h
+++ b/src/formula_grammar.h
--- a/src/main.cpp
+++ b/src/main.cpp
No results found