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
1386aaa0
Commit
1386aaa0
authored
Oct 14, 2016
by
Rustom Jehangir
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update lightsComponent to new SetupPage structure.
parent
66adea1a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
151 additions
and
158 deletions
+151
-158
APMLightsComponent.cc
src/AutoPilotPlugins/APM/APMLightsComponent.cc
+1
-1
APMLightsComponent.qml
src/AutoPilotPlugins/APM/APMLightsComponent.qml
+150
-157
No files found.
src/AutoPilotPlugins/APM/APMLightsComponent.cc
View file @
1386aaa0
...
...
@@ -30,7 +30,7 @@ QString APMLightsComponent::name(void) const
QString
APMLightsComponent
::
description
(
void
)
const
{
return
tr
(
"
The Lights Component is used to setup lights setting
s."
);
return
tr
(
"
Lights setup is used to adjust light output channel
s."
);
}
QString
APMLightsComponent
::
iconResource
(
void
)
const
...
...
src/AutoPilotPlugins/APM/APMLightsComponent.qml
View file @
1386aaa0
...
...
@@ -17,14 +17,20 @@ import QGroundControl.Palette 1.0
import
QGroundControl
.
Controls
1.0
import
QGroundControl
.
ScreenTools
1.0
QGCView
{
id
:
_lightsView
viewPanel
:
panel
anchors.fill
:
parent
SetupPage
{
id
:
lightsPage
pageComponent
:
lightsPageComponent
FactPanelController
{
id
:
controller
;
factPanel
:
panel
}
Component
{
id
:
lightsPageComponent
Column
{
spacing
:
_margins
width
:
availableWidth
QGCPalette
{
id
:
palette
;
colorGroupEnabled
:
enabled
}
FactPanelController
{
id
:
controller
;
factPanel
:
lightsPage
.
viewPanel
}
QGCPalette
{
id
:
palette
;
colorGroupEnabled
:
true
}
property
Fact
_rc5Function
:
controller
.
getParameterFact
(
-
1
,
"
RC5_FUNCTION
"
)
property
Fact
_rc6Function
:
controller
.
getParameterFact
(
-
1
,
"
RC6_FUNCTION
"
)
...
...
@@ -170,28 +176,15 @@ QGCView {
}
// Item
}
// Component - lightSettings
QGCViewPanel
{
id
:
panel
anchors.fill
:
parent
QGCFlickable
{
clip
:
true
anchors.fill
:
parent
contentWidth
:
lightsLoader
.
x
+
lightsLoader
.
width
contentHeight
:
lightsLoader
.
y
+
lightsLoader
.
height
Loader
{
id
:
lightsLoader
sourceComponent
:
lightSettings
anchors.margins
:
_margins
anchors.top
:
parent
.
top
property
int
lights1OutIndex
:
0
property
int
lights2OutIndex
:
0
property
int
lights1Function
:
_rcFunctionRCIN9
property
int
lights2Function
:
_rcFunctionRCIN10
}
}
//
Flickable
}
//
QGCViewPanel
}
//
QGCView
}
//
Column
}
//
Component
}
//
SetupPage
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