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
bd3f692e
Commit
bd3f692e
authored
Jan 10, 2016
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
RCToParam is PX4 stack specific
parent
2c1e6a37
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
30 deletions
+12
-30
ParameterEditor.qml
src/QmlControls/ParameterEditor.qml
+10
-29
ParameterEditorDialog.qml
src/QmlControls/ParameterEditorDialog.qml
+2
-1
No files found.
src/QmlControls/ParameterEditor.qml
View file @
bd3f692e
...
@@ -42,12 +42,13 @@ QGCView {
...
@@ -42,12 +42,13 @@ QGCView {
QGCPalette
{
id
:
__qgcPal
;
colorGroupEnabled
:
true
}
QGCPalette
{
id
:
__qgcPal
;
colorGroupEnabled
:
true
}
property
Fact
_
_
editorDialogFact
:
Fact
{
}
property
Fact
_editorDialogFact
:
Fact
{
}
property
int
_rowHeight
:
ScreenTools
.
defaultFontPixelHeight
*
2
property
int
_rowHeight
:
ScreenTools
.
defaultFontPixelHeight
*
2
property
int
_rowWidth
:
10
// Dynamic adjusted at runtime
property
int
_rowWidth
:
10
// Dynamic adjusted at runtime
property
bool
_searchFilter
:
false
///< true: showing results of search
property
bool
_searchFilter
:
false
///< true: showing results of search
property
var
_searchResults
///< List of parameter names from search results
property
var
_searchResults
///< List of parameter names from search results
property
string
_currentGroup
:
""
property
string
_currentGroup
:
""
property
bool
_showRCToParam
:
!
ScreenTools
.
isMobile
&&
multiVehicleManager
.
activeVehicle
.
px4Firmware
ParameterEditorController
{
ParameterEditorController
{
id
:
controller
;
id
:
controller
;
...
@@ -133,11 +134,11 @@ QGCView {
...
@@ -133,11 +134,11 @@ QGCView {
onTriggered
:
controller
.
saveToFile
()
onTriggered
:
controller
.
saveToFile
()
visible
:
!
ScreenTools
.
isMobile
visible
:
!
ScreenTools
.
isMobile
}
}
MenuSeparator
{
visible
:
!
ScreenTools
.
isMobile
}
MenuSeparator
{
visible
:
_showRCToParam
}
MenuItem
{
MenuItem
{
text
:
"
Clear RC to Param
"
text
:
"
Clear RC to Param
"
onTriggered
:
controller
.
clearRCToParam
()
onTriggered
:
controller
.
clearRCToParam
()
visible
:
!
ScreenTools
.
isMobile
visible
:
_showRCToParam
}
}
}
}
}
}
...
@@ -314,7 +315,7 @@ QGCView {
...
@@ -314,7 +315,7 @@ QGCView {
anchors.fill
:
parent
anchors.fill
:
parent
acceptedButtons
:
Qt
.
LeftButton
acceptedButtons
:
Qt
.
LeftButton
onClicked
:
{
onClicked
:
{
_
_
editorDialogFact
=
factRow
.
modelFact
_editorDialogFact
=
factRow
.
modelFact
showDialog
(
editorDialogComponent
,
"
Parameter Editor
"
,
qgcView
.
showDialogDefaultWidth
,
StandardButton
.
Cancel
|
StandardButton
.
Save
)
showDialog
(
editorDialogComponent
,
"
Parameter Editor
"
,
qgcView
.
showDialogDefaultWidth
,
StandardButton
.
Cancel
|
StandardButton
.
Save
)
}
}
}
}
...
@@ -325,7 +326,11 @@ QGCView {
...
@@ -325,7 +326,11 @@ QGCView {
Component
{
Component
{
id
:
editorDialogComponent
id
:
editorDialogComponent
ParameterEditorDialog
{
fact
:
__editorDialogFact
}
ParameterEditorDialog
{
fact
:
_editorDialogFact
showRCToParam
:
_showRCToParam
}
}
}
Component
{
Component
{
...
@@ -356,30 +361,6 @@ QGCView {
...
@@ -356,30 +361,6 @@ QGCView {
width
:
ScreenTools
.
defaultFontPixelWidth
*
20
width
:
ScreenTools
.
defaultFontPixelWidth
*
20
}
}
/*
// Leaving in for possible future use. We'll see if needed from user comments.
QGCLabel {
id: searchInLabel
anchors.topMargin: defaultTextHeight
anchors.top: searchFor.bottom
text: "Search in:"
}
QGCCheckBox {
id: searchInName
anchors.topMargin: defaultTextHeight / 3
anchors.top: searchInLabel.bottom
text: "Name"
}
QGCCheckBox {
id: searchInDescriptions
anchors.topMargin: defaultTextHeight / 3
anchors.top: searchInName.bottom
text: "Descriptions"
}
*/
QGCLabel
{
QGCLabel
{
anchors.topMargin
:
defaultTextHeight
anchors.topMargin
:
defaultTextHeight
anchors.top
:
searchFor
.
bottom
anchors.top
:
searchFor
.
bottom
...
...
src/QmlControls/ParameterEditorDialog.qml
View file @
bd3f692e
...
@@ -38,6 +38,7 @@ QGCViewDialog {
...
@@ -38,6 +38,7 @@ QGCViewDialog {
id
:
root
id
:
root
property
Fact
fact
property
Fact
fact
property
bool
showRCToParam
:
false
property
bool
validate
:
false
property
bool
validate
:
false
property
string
validateValue
property
string
validateValue
...
@@ -185,7 +186,7 @@ QGCViewDialog {
...
@@ -185,7 +186,7 @@ QGCViewDialog {
anchors.right
:
parent
.
right
anchors.right
:
parent
.
right
anchors.bottom
:
parent
.
bottom
anchors.bottom
:
parent
.
bottom
text
:
"
Set RC to Param...
"
text
:
"
Set RC to Param...
"
visible
:
!
validate
&&
!
ScreenTools
.
isMobile
visible
:
!
validate
&&
showRCToParam
onClicked
:
controller
.
setRCToParam
(
fact
.
name
)
onClicked
:
controller
.
setRCToParam
(
fact
.
name
)
}
}
}
// QGCViewDialog
}
// QGCViewDialog
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