Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Accelerators
Generic
AttributeCombiner
Commits
35044f0f
Commit
35044f0f
authored
Apr 02, 2019
by
Jean-Luc Pons
Browse files
Fix for Enum and typo
parent
3f8b2a54
Changes
2
Hide whitespace changes
Inline
Side-by-side
AttributeCombiner.cpp
View file @
35044f0f
...
...
@@ -881,6 +881,10 @@ void AttributeCombiner::write_dyn_attributes(Tango::WAttribute &attr, DynAttribu
WRITEG
<
Tango
::
DevShort
>
(
attr
,
item
,
arl
);
break
;
case
Tango
::
DEV_ENUM
:
WRITEG
<
Tango
::
DevEnum
>
(
attr
,
item
,
arl
);
break
;
case
Tango
::
DEV_LONG
:
WRITEG
<
Tango
::
DevLong
>
(
attr
,
item
,
arl
);
break
;
...
...
@@ -1288,7 +1292,7 @@ bool AttributeCombiner::isNumber(std::string value) {
}
bool
AttributeCombiner
::
isDisa
l
bed
(
int
idx
)
{
bool
AttributeCombiner
::
isDisab
l
ed
(
int
idx
)
{
return
!
deviceGroup
->
is_enabled
(
deviceList
[
idx
]);
...
...
AttributeCombiner.h
View file @
35044f0f
...
...
@@ -105,7 +105,7 @@ public:
Tango
::
WAttribute
&
getAtt
(
string
name
);
bool
isNumber
(
std
::
string
value
);
void
saveDisabledBLM
();
bool
isDisa
l
bed
(
int
idx
);
bool
isDisab
l
ed
(
int
idx
);
/*----- PROTECTED REGION END -----*/
// AttributeCombiner::Data Members
...
...
Write
Preview
Supports
Markdown
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