Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Q
qgroundcontrol
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Valentin Platzgummer
qgroundcontrol
Commits
69f27141
Commit
69f27141
authored
9 years ago
by
Don Gagne
Browse files
Options
Downloads
Patches
Plain Diff
First cut at Mission Editor
- Restructured a number of MissionItem properties as well
parent
ca234ed5
No related branches found
No related tags found
No related merge requests found
Changes
22
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/ui/map/Waypoint2DIcon.cc
+8
-9
8 additions, 9 deletions
src/ui/map/Waypoint2DIcon.cc
src/ui/map/Waypoint2DIcon.h
+1
-1
1 addition, 1 deletion
src/ui/map/Waypoint2DIcon.h
with
9 additions
and
10 deletions
src/ui/map/Waypoint2DIcon.cc
+
8
−
9
View file @
69f27141
...
...
@@ -3,8 +3,8 @@
#include
"opmapcontrol.h"
#include
"QGC.h"
Waypoint2DIcon
::
Waypoint2DIcon
(
mapcontrol
::
MapGraphicItem
*
map
,
mapcontrol
::
OPMapWidget
*
parent
,
qreal
latitude
,
qreal
longitude
,
qreal
altitude
,
int
listindex
,
QString
name
,
QString
description
,
int
radius
)
:
mapcontrol
::
WayPointItem
(
internals
::
PointLatLng
(
latitude
,
longitude
),
altitude
,
description
,
map
),
Waypoint2DIcon
::
Waypoint2DIcon
(
mapcontrol
::
MapGraphicItem
*
map
,
mapcontrol
::
OPMapWidget
*
parent
,
qreal
latitude
,
qreal
longitude
,
qreal
altitude
,
int
listindex
,
QString
name
,
int
radius
)
:
mapcontrol
::
WayPointItem
(
internals
::
PointLatLng
(
latitude
,
longitude
),
altitude
,
QString
()
,
map
),
parent
(
parent
),
waypoint
(),
radius
(
radius
),
...
...
@@ -25,7 +25,7 @@ Waypoint2DIcon::Waypoint2DIcon(mapcontrol::MapGraphicItem* map, mapcontrol::OPMa
}
Waypoint2DIcon
::
Waypoint2DIcon
(
mapcontrol
::
MapGraphicItem
*
map
,
mapcontrol
::
OPMapWidget
*
parent
,
MissionItem
*
wp
,
const
QColor
&
color
,
int
listindex
,
int
radius
)
:
mapcontrol
::
WayPointItem
(
internals
::
PointLatLng
(
wp
->
getL
atitude
(),
wp
->
getL
ongitude
()),
wp
->
getA
ltitude
(),
wp
->
getDescription
(),
map
),
:
mapcontrol
::
WayPointItem
(
internals
::
PointLatLng
(
wp
->
l
atitude
(),
wp
->
l
ongitude
()),
wp
->
a
ltitude
(),
QString
(),
map
),
parent
(
parent
),
waypoint
(
wp
),
radius
(
radius
),
...
...
@@ -33,7 +33,7 @@ Waypoint2DIcon::Waypoint2DIcon(mapcontrol::MapGraphicItem* map, mapcontrol::OPMa
showOrbit
(
false
),
color
(
color
)
{
SetHeading
(
wp
->
getY
aw
());
SetHeading
(
wp
->
y
aw
());
SetNumber
(
listindex
);
this
->
setFlag
(
QGraphicsItem
::
ItemIgnoresTransformations
,
true
);
picture
=
QPixmap
(
radius
+
1
,
radius
+
1
);
...
...
@@ -59,13 +59,12 @@ void Waypoint2DIcon::updateWaypoint()
// Store old size
static
QRectF
oldSize
;
SetHeading
(
waypoint
->
getY
aw
());
SetCoord
(
internals
::
PointLatLng
(
waypoint
->
getL
atitude
(),
waypoint
->
getL
ongitude
()));
SetHeading
(
waypoint
->
y
aw
());
SetCoord
(
internals
::
PointLatLng
(
waypoint
->
l
atitude
(),
waypoint
->
l
ongitude
()));
// qDebug() << "UPDATING WP:" << waypoint->
getId
() << "LAT:" << waypoint->
getL
atitude() << "LON:" << waypoint->
getL
ongitude();
// qDebug() << "UPDATING WP:" << waypoint->
sequenceNumber
() << "LAT:" << waypoint->
l
atitude() << "LON:" << waypoint->
l
ongitude();
SetDescription
(
waypoint
->
getDescription
());
SetAltitude
(
waypoint
->
getAltitude
());
SetAltitude
(
waypoint
->
altitude
());
// FIXME Add SetNumber (currently needs a separate call)
drawIcon
();
QRectF
newSize
=
boundingRect
();
...
...
This diff is collapsed.
Click to expand it.
src/ui/map/Waypoint2DIcon.h
+
1
−
1
View file @
69f27141
...
...
@@ -15,7 +15,7 @@ public:
* @param longitude
* @param name name of the circle point
*/
Waypoint2DIcon
(
mapcontrol
::
MapGraphicItem
*
map
,
mapcontrol
::
OPMapWidget
*
parent
,
qreal
latitude
,
qreal
longitude
,
qreal
altitude
,
int
listindex
,
QString
name
=
QString
(),
QString
description
=
QString
(),
int
radius
=
30
);
Waypoint2DIcon
(
mapcontrol
::
MapGraphicItem
*
map
,
mapcontrol
::
OPMapWidget
*
parent
,
qreal
latitude
,
qreal
longitude
,
qreal
altitude
,
int
listindex
,
QString
name
=
QString
(),
int
radius
=
30
);
/**
*
...
...
This diff is collapsed.
Click to expand it.
Prev
1
2
Next
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment