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
8b379ecb
Commit
8b379ecb
authored
Jan 30, 2017
by
Don Gagne
Committed by
GitHub
Jan 30, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4472 from dagar/reboot
reboot vehicle from param menu
parents
05c75c1f
3b802c0c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
5 deletions
+27
-5
ParameterEditor.qml
src/QmlControls/ParameterEditor.qml
+22
-0
ParameterEditorController.h
src/QmlControls/ParameterEditorController.h
+5
-5
No files found.
src/QmlControls/ParameterEditor.qml
View file @
8b379ecb
...
@@ -118,6 +118,11 @@ QGCView {
...
@@ -118,6 +118,11 @@ QGCView {
onTriggered
:
controller
.
clearRCToParam
()
onTriggered
:
controller
.
clearRCToParam
()
visible
:
_showRCToParam
visible
:
_showRCToParam
}
}
MenuSeparator
{
}
MenuItem
{
text
:
qsTr
(
"
Reboot Vehicle
"
)
onTriggered
:
showDialog
(
rebootVehicleConfirmComponent
,
qsTr
(
"
Reboot Vehicle
"
),
qgcView
.
showDialogDefaultWidth
,
StandardButton
.
Cancel
|
StandardButton
.
Ok
)
}
}
}
}
}
...
@@ -294,4 +299,21 @@ QGCView {
...
@@ -294,4 +299,21 @@ QGCView {
}
}
}
}
}
}
Component
{
id
:
rebootVehicleConfirmComponent
QGCViewDialog
{
function
accept
()
{
QGroundControl
.
multiVehicleManager
.
activeVehicle
.
rebootVehicle
()
hideDialog
()
}
QGCLabel
{
width
:
parent
.
width
wrapMode
:
Text
.
WordWrap
text
:
qsTr
(
"
Select Ok to reboot vehicle.
"
)
}
}
}
}
// QGCView
}
// QGCView
src/QmlControls/ParameterEditorController.h
View file @
8b379ecb
...
@@ -36,20 +36,20 @@ public:
...
@@ -36,20 +36,20 @@ public:
Q_PROPERTY
(
QmlObjectListModel
*
parameters
MEMBER
_parameters
CONSTANT
)
Q_PROPERTY
(
QmlObjectListModel
*
parameters
MEMBER
_parameters
CONSTANT
)
Q_PROPERTY
(
QVariantList
componentIds
MEMBER
_componentIds
CONSTANT
)
Q_PROPERTY
(
QVariantList
componentIds
MEMBER
_componentIds
CONSTANT
)
Q_INVOKABLE
QStringList
getGroupsForComponent
(
int
componentId
);
Q_INVOKABLE
QStringList
getGroupsForComponent
(
int
componentId
);
Q_INVOKABLE
QStringList
getParametersForGroup
(
int
componentId
,
QString
group
);
Q_INVOKABLE
QStringList
getParametersForGroup
(
int
componentId
,
QString
group
);
Q_INVOKABLE
QStringList
searchParametersForComponent
(
int
componentId
,
const
QString
&
searchText
,
bool
searchInName
=
true
,
bool
searchInDescriptions
=
true
);
Q_INVOKABLE
QStringList
searchParametersForComponent
(
int
componentId
,
const
QString
&
searchText
,
bool
searchInName
=
true
,
bool
searchInDescriptions
=
true
);
Q_INVOKABLE
void
clearRCToParam
(
void
);
Q_INVOKABLE
void
clearRCToParam
(
void
);
Q_INVOKABLE
void
saveToFilePicker
(
void
);
Q_INVOKABLE
void
saveToFilePicker
(
void
);
Q_INVOKABLE
void
loadFromFilePicker
(
void
);
Q_INVOKABLE
void
loadFromFilePicker
(
void
);
Q_INVOKABLE
void
saveToFile
(
const
QString
&
filename
);
Q_INVOKABLE
void
saveToFile
(
const
QString
&
filename
);
Q_INVOKABLE
void
loadFromFile
(
const
QString
&
filename
);
Q_INVOKABLE
void
loadFromFile
(
const
QString
&
filename
);
Q_INVOKABLE
void
refresh
(
void
);
Q_INVOKABLE
void
refresh
(
void
);
Q_INVOKABLE
void
resetAllToDefaults
(
void
);
Q_INVOKABLE
void
resetAllToDefaults
(
void
);
Q_INVOKABLE
void
setRCToParam
(
const
QString
&
paramName
);
Q_INVOKABLE
void
setRCToParam
(
const
QString
&
paramName
);
QList
<
QObject
*>
model
(
void
);
QList
<
QObject
*>
model
(
void
);
signals:
signals:
void
searchTextChanged
(
QString
searchText
);
void
searchTextChanged
(
QString
searchText
);
...
...
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