Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Accelerators
Generic
AttributeCombiner
Commits
95b87c98
Commit
95b87c98
authored
Aug 07, 2019
by
Nicolas Tappret
Browse files
remove some reference to BLM
parent
d1ad43e4
Changes
2
Hide whitespace changes
Inline
Side-by-side
AttributeCombiner.cpp
View file @
95b87c98
...
@@ -169,7 +169,7 @@ void AttributeCombiner::init_device()
...
@@ -169,7 +169,7 @@ void AttributeCombiner::init_device()
set_state
(
Tango
::
ON
);
set_state
(
Tango
::
ON
);
set_status
(
"ON"
);
set_status
(
"ON"
);
// Create
BLM
group
// Create
devices
group
deviceGroup
=
new
Tango
::
Group
(
"DEVGROUP"
);
deviceGroup
=
new
Tango
::
Group
(
"DEVGROUP"
);
errorStack
.
clear
();
errorStack
.
clear
();
...
@@ -181,14 +181,10 @@ void AttributeCombiner::init_device()
...
@@ -181,14 +181,10 @@ void AttributeCombiner::init_device()
deviceGroup
->
add
(
deviceList
);
deviceGroup
->
add
(
deviceList
);
deviceGroup
->
set_timeout_millis
(
timeout
);
deviceGroup
->
set_timeout_millis
(
timeout
);
//TangoSys_OMemStream ss;
//blmGroup->dump(ss);
//cout << ss.str() << endl;
Tango
::
GroupReply
::
enable_exception
(
false
);
Tango
::
GroupReply
::
enable_exception
(
false
);
self
=
new
Tango
::
DeviceProxy
(
device_name
);
self
=
new
Tango
::
DeviceProxy
(
device_name
);
// Read disabled
BLM
// Read disabled
Devices
Tango
::
DbData
dbd
;
Tango
::
DbData
dbd
;
dbd
.
push_back
(
Tango
::
DbDatum
(
"DisabledDevices"
));
dbd
.
push_back
(
Tango
::
DbDatum
(
"DisabledDevices"
));
get_db_device
()
->
get_property
(
dbd
);
get_db_device
()
->
get_property
(
dbd
);
...
@@ -467,7 +463,7 @@ void AttributeCombiner::add_dynamic_attributes()
...
@@ -467,7 +463,7 @@ void AttributeCombiner::add_dynamic_attributes()
exit
(
0
);
exit
(
0
);
}
}
// We group all
blm
attribute in only one (for scalar only)
// We group all
Devices
attribute in only one (for scalar only)
DynAttribute
*
att
=
new
DynAttribute
(
name
.
c_str
(),
type
,
rwType
,
expert
);
DynAttribute
*
att
=
new
DynAttribute
(
name
.
c_str
(),
type
,
rwType
,
expert
);
add_attribute
(
att
);
add_attribute
(
att
);
...
@@ -667,7 +663,7 @@ void AttributeCombiner::enable_device(Tango::DevShort argin)
...
@@ -667,7 +663,7 @@ void AttributeCombiner::enable_device(Tango::DevShort argin)
}
}
deviceGroup
->
enable
(
deviceList
[
argin
]);
deviceGroup
->
enable
(
deviceList
[
argin
]);
saveDisabled
BLM
();
saveDisabled
();
/*----- PROTECTED REGION END -----*/
// AttributeCombiner::enable_device
/*----- PROTECTED REGION END -----*/
// AttributeCombiner::enable_device
}
}
...
@@ -692,7 +688,7 @@ void AttributeCombiner::disable_device(Tango::DevShort argin)
...
@@ -692,7 +688,7 @@ void AttributeCombiner::disable_device(Tango::DevShort argin)
}
}
deviceGroup
->
disable
(
deviceList
[
argin
]);
deviceGroup
->
disable
(
deviceList
[
argin
]);
saveDisabled
BLM
();
saveDisabled
();
/*----- PROTECTED REGION END -----*/
// AttributeCombiner::disable_device
/*----- PROTECTED REGION END -----*/
// AttributeCombiner::disable_device
}
}
...
@@ -769,7 +765,7 @@ void AttributeCombiner::disable_all()
...
@@ -769,7 +765,7 @@ void AttributeCombiner::disable_all()
for
(
int
i
=
0
;
i
<
(
int
)
deviceList
.
size
();
i
++
)
for
(
int
i
=
0
;
i
<
(
int
)
deviceList
.
size
();
i
++
)
deviceGroup
->
disable
(
deviceList
[
i
]);
deviceGroup
->
disable
(
deviceList
[
i
]);
saveDisabled
BLM
();
saveDisabled
();
/*----- PROTECTED REGION END -----*/
// AttributeCombiner::disable_all
/*----- PROTECTED REGION END -----*/
// AttributeCombiner::disable_all
...
@@ -788,7 +784,7 @@ void AttributeCombiner::enable_all()
...
@@ -788,7 +784,7 @@ void AttributeCombiner::enable_all()
for
(
int
i
=
0
;
i
<
(
int
)
deviceList
.
size
();
i
++
)
for
(
int
i
=
0
;
i
<
(
int
)
deviceList
.
size
();
i
++
)
deviceGroup
->
enable
(
deviceList
[
i
]);
deviceGroup
->
enable
(
deviceList
[
i
]);
saveDisabled
BLM
();
saveDisabled
();
/*----- PROTECTED REGION END -----*/
// AttributeCombiner::enable_all
/*----- PROTECTED REGION END -----*/
// AttributeCombiner::enable_all
}
}
...
@@ -945,9 +941,9 @@ void AttributeCombiner::add_dynamic_commands()
...
@@ -945,9 +941,9 @@ void AttributeCombiner::add_dynamic_commands()
ATTITEM
*
item
=
attMap
.
get
(
attName
);
ATTITEM
*
item
=
attMap
.
get
(
attName
);
if
(
item
==
NULL
)
{
if
(
item
==
NULL
)
{
Tango
::
Except
::
throw_exception
(
Tango
::
Except
::
throw_exception
(
(
const
char
*
)
"
BLMAll
::error_read"
,
(
const
char
*
)
"
AttributeCombiner
::error_read"
,
(
const
char
*
)
"Unknown attribute"
,
(
const
char
*
)
"Unknown attribute"
,
(
const
char
*
)
"
BLMAll
::read_dyn_attributes"
);
(
const
char
*
)
"
AttributeCombiner
::read_dyn_attributes"
);
}
}
// Read all values
// Read all values
...
@@ -1619,7 +1615,7 @@ void AttributeCombiner::add_dynamic_commands()
...
@@ -1619,7 +1615,7 @@ void AttributeCombiner::add_dynamic_commands()
return
dev_attr
->
get_w_attr_by_name
(
name
.
c_str
());
return
dev_attr
->
get_w_attr_by_name
(
name
.
c_str
());
}
}
void
AttributeCombiner
::
saveDisabled
BLM
()
{
void
AttributeCombiner
::
saveDisabled
()
{
Tango
::
DbData
dbd
;
Tango
::
DbData
dbd
;
Tango
::
DbDatum
dbt
(
"DisabledDevices"
);
Tango
::
DbDatum
dbt
(
"DisabledDevices"
);
...
...
AttributeCombiner.h
View file @
95b87c98
...
@@ -107,7 +107,7 @@ public:
...
@@ -107,7 +107,7 @@ public:
void
addError
(
int
devIndex
,
Tango
::
GroupAttrReply
&
reply
);
void
addError
(
int
devIndex
,
Tango
::
GroupAttrReply
&
reply
);
Tango
::
WAttribute
&
getAtt
(
string
name
);
Tango
::
WAttribute
&
getAtt
(
string
name
);
bool
isNumber
(
std
::
string
value
);
bool
isNumber
(
std
::
string
value
);
void
saveDisabled
BLM
();
void
saveDisabled
();
bool
isDisabled
(
int
idx
);
bool
isDisabled
(
int
idx
);
/*----- PROTECTED REGION END -----*/
// AttributeCombiner::Data Members
/*----- PROTECTED REGION END -----*/
// AttributeCombiner::Data Members
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment