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
94abe381
Commit
94abe381
authored
Jun 17, 2016
by
Nate Weibley
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Defer loading and binding of mission editing QML components, fix editor view syncs
parent
cfc67361
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
102 additions
and
115 deletions
+102
-115
MissionEditor.qml
src/MissionEditor/MissionEditor.qml
+4
-11
MissionItemStatus.qml
src/MissionEditor/MissionItemStatus.qml
+1
-10
SimpleItemEditor.qml
src/MissionEditor/SimpleItemEditor.qml
+97
-94
No files found.
src/MissionEditor/MissionEditor.qml
View file @
94abe381
...
@@ -48,6 +48,7 @@ QGCView {
...
@@ -48,6 +48,7 @@ QGCView {
property
var
_visualItems
:
controller
.
visualItems
property
var
_visualItems
:
controller
.
visualItems
property
var
_currentMissionItem
property
var
_currentMissionItem
property
int
_currentMissionIndex
:
0
property
bool
_firstVehiclePosition
:
true
property
bool
_firstVehiclePosition
:
true
property
var
activeVehiclePosition
:
_activeVehicle
?
_activeVehicle
.
coordinate
:
QtPositioning
.
coordinate
()
property
var
activeVehiclePosition
:
_activeVehicle
?
_activeVehicle
.
coordinate
:
QtPositioning
.
coordinate
()
property
bool
_lightWidgetBorders
:
editorMap
.
isSatelliteMap
property
bool
_lightWidgetBorders
:
editorMap
.
isSatelliteMap
...
@@ -168,6 +169,7 @@ QGCView {
...
@@ -168,6 +169,7 @@ QGCView {
if
(
visualItem
.
sequenceNumber
==
sequenceNumber
)
{
if
(
visualItem
.
sequenceNumber
==
sequenceNumber
)
{
_currentMissionItem
=
visualItem
_currentMissionItem
=
visualItem
_currentMissionItem
.
isCurrentItem
=
true
_currentMissionItem
.
isCurrentItem
=
true
_currentMissionIndex
=
i
}
else
{
}
else
{
visualItem
.
isCurrentItem
=
false
visualItem
.
isCurrentItem
=
false
}
}
...
@@ -485,6 +487,7 @@ QGCView {
...
@@ -485,6 +487,7 @@ QGCView {
model
:
controller
.
visualItems
model
:
controller
.
visualItems
cacheBuffer
:
height
*
2
cacheBuffer
:
height
*
2
clip
:
true
clip
:
true
currentIndex
:
_currentMissionIndex
highlightMoveDuration
:
250
highlightMoveDuration
:
250
delegate
:
MissionItemEditor
{
delegate
:
MissionItemEditor
{
...
@@ -506,16 +509,6 @@ QGCView {
...
@@ -506,16 +509,6 @@ QGCView {
}
}
onMoveHomeToMapCenter
:
controller
.
visualItems
.
get
(
0
).
coordinate
=
editorMap
.
center
onMoveHomeToMapCenter
:
controller
.
visualItems
.
get
(
0
).
coordinate
=
editorMap
.
center
Connections
{
target
:
object
onIsCurrentItemChanged
:
{
if
(
object
.
isCurrentItem
)
{
editorListView
.
currentIndex
=
index
}
}
}
}
}
}
// ListView
}
// ListView
}
// Item - Mission Item editor
}
// Item - Mission Item editor
...
...
src/MissionEditor/MissionItemStatus.qml
View file @
94abe381
...
@@ -87,6 +87,7 @@ Rectangle {
...
@@ -87,6 +87,7 @@ Rectangle {
visible
:
_expanded
visible
:
_expanded
width
:
parent
.
width
-
valueGrid
.
width
-
(
_margins
*
2
)
width
:
parent
.
width
-
valueGrid
.
width
-
(
_margins
*
2
)
clip
:
true
clip
:
true
currentIndex
:
_currentMissionIndex
delegate
:
Item
{
delegate
:
Item
{
height
:
statusListView
.
height
height
:
statusListView
.
height
...
@@ -107,16 +108,6 @@ Rectangle {
...
@@ -107,16 +108,6 @@ Rectangle {
label
:
object
.
abbreviation
label
:
object
.
abbreviation
visible
:
object
.
relativeAltitude
?
true
:
(
object
.
homePosition
||
graphAbsolute
)
visible
:
object
.
relativeAltitude
?
true
:
(
object
.
homePosition
||
graphAbsolute
)
}
}
Connections
{
target
:
object
onIsCurrentItemChanged
:
{
if
(
object
.
isCurrentItem
)
{
statusListView
.
currentIndex
=
index
}
}
}
}
}
}
}
}
}
...
...
src/MissionEditor/SimpleItemEditor.qml
View file @
94abe381
import
QtQuick
2.
2
import
QtQuick
2.
5
import
QtQuick
.
Controls
1.2
import
QtQuick
.
Controls
1.2
import
QtQuick
.
Controls
.
Styles
1.2
import
QtQuick
.
Controls
.
Styles
1.2
import
QtQuick
.
Dialogs
1.2
import
QtQuick
.
Dialogs
1.2
...
@@ -13,21 +13,22 @@ import QGroundControl.Palette 1.0
...
@@ -13,21 +13,22 @@ import QGroundControl.Palette 1.0
Rectangle
{
Rectangle
{
id
:
valuesRect
id
:
valuesRect
width
:
availableWidth
width
:
availableWidth
height
:
visible
?
valuesItem
.
height
:
0
height
:
deferedload
.
status
==
Loader
.
Ready
?
(
visible
?
deferedload
.
item
.
height
:
0
)
:
0
color
:
qgcPal
.
windowShadeDark
color
:
qgcPal
.
windowShadeDark
visible
:
missionItem
.
isCurrentItem
visible
:
missionItem
.
isCurrentItem
radius
:
_radius
radius
:
_radius
// The following properties must be available up the hierachy chain
Loader
{
//property real availableWidth ///< Width for control
id
:
deferedload
//property var missionItem ///< Mission Item for editor
active
:
valuesRect
.
visible
asynchronous
:
true
anchors.margins
:
_margin
anchors.left
:
valuesRect
.
left
anchors.right
:
valuesRect
.
right
anchors.top
:
valuesRect
.
top
sourceComponent
:
Component
{
Item
{
Item
{
id
:
valuesItem
id
:
valuesItem
anchors.margins
:
_margin
anchors.left
:
parent
.
left
anchors.right
:
parent
.
right
anchors.top
:
parent
.
top
height
:
valuesColumn
.
height
+
(
_margin
*
2
)
height
:
valuesColumn
.
height
+
(
_margin
*
2
)
Column
{
Column
{
...
@@ -121,4 +122,6 @@ Rectangle {
...
@@ -121,4 +122,6 @@ Rectangle {
}
}
}
// Column
}
// Column
}
// Item
}
// Item
}
// Component
}
// Loader
}
// Rectangle
}
// Rectangle
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