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
68886a1a
Commit
68886a1a
authored
Dec 31, 2016
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix passed in property mechanism
qgcView was coming through null causing widget dialog to not pop up
parent
01806fae
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
13 deletions
+14
-13
FlightDisplayView.qml
src/FlightDisplay/FlightDisplayView.qml
+8
-9
FlightDisplayViewWidgets.qml
src/FlightDisplay/FlightDisplayViewWidgets.qml
+6
-4
No files found.
src/FlightDisplay/FlightDisplayView.qml
View file @
68886a1a
...
...
@@ -219,15 +219,14 @@ QGCView {
}
FlightDisplayViewWidgets
{
id
:
flightDisplayViewWidgets
z
:
_panel
.
z
+
4
height
:
ScreenTools
.
availableHeight
anchors.left
:
parent
.
left
anchors.right
:
parent
.
right
anchors.bottom
:
parent
.
bottom
property
bool
isBackgroundDark
:
root
.
isBackgroundDark
property
var
qgcView
:
root
id
:
flightDisplayViewWidgets
z
:
_panel
.
z
+
4
height
:
ScreenTools
.
availableHeight
anchors.left
:
parent
.
left
anchors.right
:
parent
.
right
anchors.bottom
:
parent
.
bottom
qgcView
:
root
isBackgroundDark
:
root
.
isBackgroundDark
}
//-- Virtual Joystick
...
...
src/FlightDisplay/FlightDisplayViewWidgets.qml
View file @
68886a1a
...
...
@@ -25,8 +25,10 @@ import QGroundControl.FlightMap 1.0
Item
{
id
:
_root
property
alias
guidedModeBar
:
_guidedModeBar
property
bool
gotoEnabled
:
_activeVehicle
&&
_activeVehicle
.
guidedMode
&&
_activeVehicle
.
flying
property
alias
guidedModeBar
:
_guidedModeBar
property
bool
gotoEnabled
:
_activeVehicle
&&
_activeVehicle
.
guidedMode
&&
_activeVehicle
.
flying
property
var
qgcView
property
bool
isBackgroundDark
property
var
_activeVehicle
:
QGroundControl
.
multiVehicleManager
.
activeVehicle
property
bool
_isSatellite
:
_mainIsMap
?
(
_flightMap
?
_flightMap
.
isSatelliteMap
:
true
)
:
true
...
...
@@ -87,7 +89,7 @@ Item {
airSpeedFact
:
_airSpeedFact
lightBorders
:
_lightWidgetBorders
z
:
QGroundControl
.
zOrderWidgets
qgcView
:
parent
.
paren
t
.
qgcView
qgcView
:
_roo
t
.
qgcView
maxHeight
:
parent
.
height
-
(
anchors
.
margins
*
2
)
}
...
...
@@ -113,7 +115,7 @@ Item {
anchors.top
:
instrumentGadgetAlternate
.
bottom
anchors.horizontalCenter
:
instrumentGadgetAlternate
.
horizontalCenter
width
:
getGadgetWidth
()
qgcView
:
parent
.
paren
t
.
qgcView
qgcView
:
_roo
t
.
qgcView
textColor
:
_isSatellite
?
"
white
"
:
"
black
"
visible
:
_useAlternateInstruments
maxHeight
:
virtualJoystickMultiTouch
.
visible
?
virtualJoystickMultiTouch
.
y
-
y
:
parent
.
height
-
anchors
.
margins
-
y
...
...
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