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
e547004f
Commit
e547004f
authored
Jan 07, 2014
by
Lorenz Meier
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #441 from thomasgubler/params_alphabetical
display parameters in alphabetical order
parents
45fc023c
7af96b27
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
43 additions
and
3 deletions
+43
-3
QGCParamWidget.cc
src/ui/QGCParamWidget.cc
+40
-2
QGCParamWidget.h
src/ui/QGCParamWidget.h
+3
-1
No files found.
src/ui/QGCParamWidget.cc
View file @
e547004f
...
...
@@ -311,6 +311,39 @@ QTreeWidgetItem* QGCParamWidget::getParentWidgetItemForParam(int compId, const Q
return
parentItem
;
}
void
QGCParamWidget
::
insertParamAlphabetical
(
int
indexLowerBound
,
int
indexUpperBound
,
QTreeWidgetItem
*
parentItem
,
QTreeWidgetItem
*
paramItem
)
{
if
(
indexLowerBound
>=
indexUpperBound
)
{
if
(
paramItem
->
text
(
0
).
compare
(
parentItem
->
child
(
indexLowerBound
)
->
text
(
0
))
<
0
)
{
parentItem
->
insertChild
(
indexLowerBound
,
paramItem
);
}
else
{
if
(
indexLowerBound
<
parentItem
->
childCount
()
-
1
)
{
parentItem
->
insertChild
(
indexLowerBound
+
1
,
paramItem
);
}
else
{
parentItem
->
addChild
(
paramItem
);
}
}
}
else
{
int
midpoint
=
indexLowerBound
+
floor
(
indexUpperBound
-
indexLowerBound
)
/
2
;
if
(
paramItem
->
text
(
0
).
compare
(
parentItem
->
child
(
midpoint
)
->
text
(
0
))
<
0
)
{
insertParamAlphabetical
(
indexLowerBound
,
midpoint
-
1
,
parentItem
,
paramItem
);
}
else
{
insertParamAlphabetical
(
midpoint
+
1
,
indexUpperBound
,
parentItem
,
paramItem
);
}
}
}
QTreeWidgetItem
*
QGCParamWidget
::
updateParameterDisplay
(
int
compId
,
QString
parameterName
,
QVariant
value
)
{
//qDebug() << "QGCParamWidget::updateParameterDisplay" << parameterName;
...
...
@@ -343,8 +376,13 @@ QTreeWidgetItem* QGCParamWidget::updateParameterDisplay(int compId, QString para
}
paramItem
->
setFlags
(
paramItem
->
flags
()
|
Qt
::
ItemIsEditable
);
//TODO insert alphabetically
parentItem
->
addChild
(
paramItem
);
//Insert alphabetically
if
(
parentItem
->
childCount
()
>
0
)
{
insertParamAlphabetical
(
0
,
parentItem
->
childCount
()
-
1
,
parentItem
,
paramItem
);
}
else
{
parentItem
->
addChild
(
paramItem
);
}
//only add the tooltip when the parameter item is first added
QString
paramDesc
=
paramMgr
->
dataModel
()
->
getParamDescription
(
parameterName
);
...
...
src/ui/QGCParamWidget.h
View file @
e547004f
...
...
@@ -83,10 +83,12 @@ public slots:
virtual
void
clearOnboardParamDisplay
();
virtual
void
clearPendingParamDisplay
();
/** @brief Adds parameter at the correct location by a alphapetical comparison of the parameter names */
void
insertParamAlphabetical
(
int
indexLowerBound
,
int
indexUpperBound
,
QTreeWidgetItem
*
parentItem
,
QTreeWidgetItem
*
paramItem
);
/** @brief Ensure that view of parameter matches data in the model */
QTreeWidgetItem
*
updateParameterDisplay
(
int
component
,
QString
parameterName
,
QVariant
value
);
/** @brief Update when user changes parameters */
void
parameterItemChanged
(
QTreeWidgetItem
*
prev
,
int
column
);
...
...
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