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
0ca9e0a1
Commit
0ca9e0a1
authored
Mar 21, 2019
by
Valentin Platzgummer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fly area working
parent
ddf64f6f
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
23 additions
and
15 deletions
+23
-15
QGCMapPolygonVisuals.qml
src/MissionManager/QGCMapPolygonVisuals.qml
+1
-1
WimaController.h
src/MissionManager/WimaController.h
+0
-1
WimaFlyArea.cc
src/MissionManager/WimaFlyArea.cc
+6
-0
WimaFlyArea.h
src/MissionManager/WimaFlyArea.h
+2
-1
FlyAreaPolygonMapVisual.qml
src/WimaView/FlyAreaPolygonMapVisual.qml
+0
-1
WimaView.qml
src/WimaView/WimaView.qml
+14
-11
No files found.
src/MissionManager/QGCMapPolygonVisuals.qml
View file @
0ca9e0a1
/****************************************************************************
/****************************************************************************
*
*
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
*
*
...
...
src/MissionManager/WimaController.h
View file @
0ca9e0a1
...
@@ -20,7 +20,6 @@ public:
...
@@ -20,7 +20,6 @@ public:
//Property Accessors
//Property Accessors
WimaFlyArea
*
flyArea
(
void
)
{
return
_flyArea
;
}
WimaFlyArea
*
flyArea
(
void
)
{
return
_flyArea
;
}
//QmlObjectListModel* visualItems (void) { return _visualItems; }
//QmlObjectListModel* visualItems (void) { return _visualItems; }
QString
QMLView
Q_INVOKABLE
void
start
(
void
);
Q_INVOKABLE
void
start
(
void
);
...
...
src/MissionManager/WimaFlyArea.cc
View file @
0ca9e0a1
...
@@ -25,6 +25,12 @@ void WimaFlyArea::_init()
...
@@ -25,6 +25,12 @@ void WimaFlyArea::_init()
void
WimaFlyArea
::
append_WimaFlyArea
()
void
WimaFlyArea
::
append_WimaFlyArea
()
{
{
QGCMapPolygon
*
newPolygon
=
new
QGCMapPolygon
();
QGCMapPolygon
*
newPolygon
=
new
QGCMapPolygon
();
newPolygon
->
setInteractive
(
true
);
for
(
int
i
=
0
;
i
<
_polygons
->
count
();
i
++
)
{
QGCMapPolygon
*
polygon
=
qobject_cast
<
QGCMapPolygon
*>
(
_polygons
->
get
(
i
));
polygon
->
setInteractive
(
false
);
}
_polygons
->
append
(
newPolygon
);
_polygons
->
append
(
newPolygon
);
...
...
src/MissionManager/WimaFlyArea.h
View file @
0ca9e0a1
...
@@ -34,7 +34,8 @@ signals:
...
@@ -34,7 +34,8 @@ signals:
public
slots
:
public
slots
:
private:
private:
QmlObjectListModel
*
_polygons
;
QmlObjectListModel
*
_polygons
;
QGCMapPolygon
*
_isCurrentPolygon
;
};
};
...
...
src/WimaView/FlyAreaPolygonMapVisual.qml
View file @
0ca9e0a1
...
@@ -69,7 +69,6 @@ Item {
...
@@ -69,7 +69,6 @@ Item {
qgcView
:
_root
.
qgcView
qgcView
:
_root
.
qgcView
mapControl
:
map
mapControl
:
map
mapPolygon
:
_flyAreaPolygon
mapPolygon
:
_flyAreaPolygon
interactive
:
true
borderWidth
:
1
borderWidth
:
1
borderColor
:
"
black
"
borderColor
:
"
black
"
interiorColor
:
"
green
"
interiorColor
:
"
green
"
...
...
src/WimaView/WimaView.qml
View file @
0ca9e0a1
...
@@ -112,8 +112,6 @@ QGCView {
...
@@ -112,8 +112,6 @@ QGCView {
property
bool
_firstRallyLoadComplete
:
false
property
bool
_firstRallyLoadComplete
:
false
property
bool
_firstLoadComplete
:
false
property
bool
_firstLoadComplete
:
false
MapFitFunctions
{
MapFitFunctions
{
id
:
mapFitFunctions
// The name for this id cannot be changed without breaking references outside of this code. Beware!
id
:
mapFitFunctions
// The name for this id cannot be changed without breaking references outside of this code. Beware!
map
:
editorMap
map
:
editorMap
...
@@ -1201,7 +1199,7 @@ QGCView {
...
@@ -1201,7 +1199,7 @@ QGCView {
height
:
150
height
:
150
radius
:
10
radius
:
10
border.color
:
"
black
"
border.color
:
"
black
"
border.width
:
3
border.width
:
2
color
:
"
green
"
color
:
"
green
"
z
:
100
z
:
100
...
@@ -1213,15 +1211,20 @@ QGCView {
...
@@ -1213,15 +1211,20 @@ QGCView {
text
:
qsTr
(
"
Debug Messages
"
)
text
:
qsTr
(
"
Debug Messages
"
)
}
}
Text
{
Column
{
id
:
debugText
id
:
debugMessageText
anchors.bottom
:
parent
.
bottom
Repeater
{
x
:
(
parent
.
width
-
width
)
/
2
model
:
_flyArea
.
polygons
width
:
parent
.
width
*
0.95
delegate
:
Rectangle
{
height
:
parent
.
height
-
debugTextTitle
.
height
color
:
"
lightsteelblue
"
text
:
"
Polygon count:
"
+
wimaController
.
flyArea
.
polygons
.
dirty
;
radius
:
5
Text
{
text
:
object
.
interactive
}
}
}
}
}
}
}
}
// QGCVIew
}
// QGCVIew
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