Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
f3509481
Commit
f3509481
authored
Dec 15, 2015
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
If enum value unknown, add to list
parent
cfa2fc36
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
6 deletions
+16
-6
Fact.cc
src/FactSystem/Fact.cc
+9
-2
Fact.h
src/FactSystem/Fact.h
+7
-4
No files found.
src/FactSystem/Fact.cc
View file @
f3509481
...
...
@@ -165,7 +165,7 @@ QVariant Fact::cookedValue(void) const
}
}
QString
Fact
::
enumStringValue
(
void
)
const
QString
Fact
::
enumStringValue
(
void
)
{
if
(
_metaData
)
{
int
enumIndex
=
this
->
enumIndex
();
...
...
@@ -179,16 +179,23 @@ QString Fact::enumStringValue(void) const
return
QString
();
}
int
Fact
::
enumIndex
(
void
)
const
int
Fact
::
enumIndex
(
void
)
{
if
(
_metaData
)
{
int
index
=
0
;
foreach
(
QVariant
enumValue
,
_metaData
->
enumValues
())
{
if
(
enumValue
==
rawValue
())
{
return
index
;
}
index
++
;
}
// Current value is not in list, add it manually
_metaData
->
addEnumInfo
(
QString
(
"Unknown: %1"
).
arg
(
rawValue
().
toString
()),
rawValue
());
emit
enumStringsChanged
();
emit
enumValuesChanged
();
return
index
;
}
else
{
qWarning
()
<<
"Meta data pointer missing"
;
}
...
...
src/FactSystem/Fact.h
View file @
f3509481
...
...
@@ -52,9 +52,9 @@ public:
Q_PROPERTY
(
QString
defaultValueString
READ
defaultValueString
CONSTANT
)
Q_PROPERTY
(
bool
defaultValueAvailable
READ
defaultValueAvailable
CONSTANT
)
Q_PROPERTY
(
int
enumIndex
READ
enumIndex
WRITE
setEnumIndex
NOTIFY
valueChanged
)
Q_PROPERTY
(
QStringList
enumStrings
READ
enumStrings
CONSTANT
)
Q_PROPERTY
(
QStringList
enumStrings
READ
enumStrings
NOTIFY
enumStringsChanged
)
Q_PROPERTY
(
QString
enumStringValue
READ
enumStringValue
WRITE
setEnumStringValue
NOTIFY
valueChanged
)
Q_PROPERTY
(
QVariantList
enumValues
READ
enumValues
CONSTANT
)
Q_PROPERTY
(
QVariantList
enumValues
READ
enumValues
NOTIFY
enumValuesChanged
)
Q_PROPERTY
(
QString
group
READ
group
CONSTANT
)
Q_PROPERTY
(
QString
longDescription
READ
longDescription
CONSTANT
)
Q_PROPERTY
(
QVariant
max
READ
max
CONSTANT
)
...
...
@@ -81,9 +81,9 @@ public:
QVariant
defaultValue
(
void
)
const
;
bool
defaultValueAvailable
(
void
)
const
;
QString
defaultValueString
(
void
)
const
;
int
enumIndex
(
void
)
const
;
int
enumIndex
(
void
)
;
// This is not const, since an unknown value can modify the enum lists
QStringList
enumStrings
(
void
)
const
;
QString
enumStringValue
(
void
)
const
;
QString
enumStringValue
(
void
)
;
// This is not const, since an unknown value can modify the enum lists
QVariantList
enumValues
(
void
)
const
;
QString
group
(
void
)
const
;
QString
longDescription
(
void
)
const
;
...
...
@@ -120,6 +120,9 @@ public:
void
_setName
(
const
QString
&
name
)
{
_name
=
name
;
}
signals:
void
enumStringsChanged
(
void
);
void
enumValuesChanged
(
void
);
/// QObject Property System signal for value property changes
///
/// This signal is only meant for use by the QT property system. It should not be connected to by client code.
...
...
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