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
87865088
Commit
87865088
authored
Sep 25, 2015
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Parameter search support
parent
3a66b7ce
Changes
8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
210 additions
and
95 deletions
+210
-95
AutoPilotPlugin.cc
src/AutoPilotPlugins/AutoPilotPlugin.cc
+2
-2
AutoPilotPlugin.h
src/AutoPilotPlugins/AutoPilotPlugin.h
+1
-2
ParameterLoader.cc
src/FactSystem/ParameterLoader.cc
+2
-2
ParameterLoader.h
src/FactSystem/ParameterLoader.h
+1
-2
ParameterEditor.qml
src/QmlControls/ParameterEditor.qml
+176
-85
ParameterEditorController.cc
src/QmlControls/ParameterEditorController.cc
+23
-1
ParameterEditorController.h
src/QmlControls/ParameterEditorController.h
+2
-1
QGCView.qml
src/QmlControls/QGCView.qml
+3
-0
No files found.
src/AutoPilotPlugins/AutoPilotPlugin.cc
View file @
87865088
...
...
@@ -157,9 +157,9 @@ Fact* AutoPilotPlugin::getFact(FactSystem::Provider_t provider, int componentId,
return
NULL
;
}
QStringList
AutoPilotPlugin
::
parameterNames
(
voi
d
)
QStringList
AutoPilotPlugin
::
parameterNames
(
int
componentI
d
)
{
return
_getParameterLoader
()
->
parameterNames
();
return
_getParameterLoader
()
->
parameterNames
(
componentId
);
}
const
QMap
<
int
,
QMap
<
QString
,
QStringList
>
>&
AutoPilotPlugin
::
getGroupMap
(
void
)
...
...
src/AutoPilotPlugins/AutoPilotPlugin.h
View file @
87865088
...
...
@@ -81,8 +81,7 @@ public:
Q_INVOKABLE
bool
parameterExists
(
int
componentId
,
const
QString
&
name
);
/// Returns all parameter names
/// FIXME: component id missing, generic to fact
QStringList
parameterNames
(
void
);
QStringList
parameterNames
(
int
componentId
);
/// Returns the specified parameter Fact from the default component
/// WARNING: Returns a default Fact if parameter does not exists. If that possibility exists, check for existince first with
...
...
src/FactSystem/ParameterLoader.cc
View file @
87865088
...
...
@@ -387,11 +387,11 @@ Fact* ParameterLoader::getFact(int componentId, const QString& name)
return
_mapParameterName2Variant
[
componentId
][
name
].
value
<
Fact
*>
();
}
QStringList
ParameterLoader
::
parameterNames
(
voi
d
)
QStringList
ParameterLoader
::
parameterNames
(
int
componentI
d
)
{
QStringList
names
;
foreach
(
QString
paramName
,
_mapParameterName2Variant
[
_
defaultComponentId
].
keys
())
{
foreach
(
QString
paramName
,
_mapParameterName2Variant
[
_
actualComponentId
(
componentId
)
].
keys
())
{
names
<<
paramName
;
}
...
...
src/FactSystem/ParameterLoader.h
View file @
87865088
...
...
@@ -69,8 +69,7 @@ public:
const
QString
&
name
);
///< fact name
/// Returns all parameter names
/// FIXME: component id missing
QStringList
parameterNames
(
void
);
QStringList
parameterNames
(
int
componentId
);
/// Returns the specified Fact.
/// WARNING: Will assert if parameter does not exists. If that possibily exists, check for existince first with
...
...
src/QmlControls/ParameterEditor.qml
View file @
87865088
This diff is collapsed.
Click to expand it.
src/QmlControls/ParameterEditorController.cc
View file @
87865088
...
...
@@ -53,13 +53,35 @@ QStringList ParameterEditorController::getGroupsForComponent(int componentId)
return
groupMap
[
componentId
].
keys
();
}
QStringList
ParameterEditorController
::
get
Fact
sForGroup
(
int
componentId
,
QString
group
)
QStringList
ParameterEditorController
::
get
Parameter
sForGroup
(
int
componentId
,
QString
group
)
{
const
QMap
<
int
,
QMap
<
QString
,
QStringList
>
>&
groupMap
=
_autopilot
->
getGroupMap
();
return
groupMap
[
componentId
][
group
];
}
QStringList
ParameterEditorController
::
searchParametersForComponent
(
int
componentId
,
const
QString
&
searchText
,
bool
searchInName
,
bool
searchInDescriptions
)
{
QStringList
list
;
foreach
(
QString
paramName
,
_autopilot
->
parameterNames
(
componentId
))
{
if
(
searchText
.
isEmpty
())
{
list
+=
paramName
;
}
else
{
Fact
*
fact
=
_autopilot
->
getParameterFact
(
componentId
,
paramName
);
if
(
searchInName
&&
fact
->
name
().
contains
(
searchText
,
Qt
::
CaseInsensitive
))
{
list
+=
paramName
;
}
else
if
(
searchInDescriptions
&&
(
fact
->
shortDescription
().
contains
(
searchText
,
Qt
::
CaseInsensitive
)
||
fact
->
longDescription
().
contains
(
searchText
,
Qt
::
CaseInsensitive
)))
{
list
+=
paramName
;
}
}
}
list
.
sort
();
return
list
;
}
void
ParameterEditorController
::
clearRCToParam
(
void
)
{
Q_ASSERT
(
_uas
);
...
...
src/QmlControls/ParameterEditorController.h
View file @
87865088
...
...
@@ -45,7 +45,8 @@ public:
Q_PROPERTY
(
QStringList
componentIds
MEMBER
_componentIds
CONSTANT
)
Q_INVOKABLE
QStringList
getGroupsForComponent
(
int
componentId
);
Q_INVOKABLE
QStringList
getFactsForGroup
(
int
componentId
,
QString
group
);
Q_INVOKABLE
QStringList
getParametersForGroup
(
int
componentId
,
QString
group
);
Q_INVOKABLE
QStringList
searchParametersForComponent
(
int
componentId
,
const
QString
&
searchText
,
bool
searchInName
,
bool
searchInDescriptions
);
Q_INVOKABLE
void
clearRCToParam
(
void
);
Q_INVOKABLE
void
saveToFile
(
void
);
...
...
src/QmlControls/QGCView.qml
View file @
87865088
...
...
@@ -106,6 +106,9 @@ FactPanel {
}
else
if
(
buttons
&
StandardButton
.
Abort
)
{
__rejectButton
.
text
=
"
Abort
"
__rejectButton
.
visible
=
true
}
else
if
(
buttons
&
StandardButton
.
Reset
)
{
__rejectButton
.
text
=
"
Reset
"
__rejectButton
.
visible
=
true
}
}
...
...
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