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
10bff855
Commit
10bff855
authored
Sep 08, 2015
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use new yawRadians method
parent
683cdd44
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
HSIDisplay.cc
src/ui/HSIDisplay.cc
+1
-1
QGCMapWidget.cc
src/ui/map/QGCMapWidget.cc
+1
-1
Waypoint2DIcon.cc
src/ui/map/Waypoint2DIcon.cc
+2
-2
No files found.
src/ui/HSIDisplay.cc
View file @
10bff855
...
...
@@ -1313,7 +1313,7 @@ void HSIDisplay::drawWaypoint(QPainter& painter, const QColor& color, float widt
float
radius
=
(
waypointSize
/
2.0
f
)
*
0.8
*
(
1
/
sqrt
(
2.0
f
));
float
acceptRadius
=
w
->
getAcceptanceRadius
();
double
yawDiff
=
w
->
yaw
()
/
180.0
*
M_PI
-
yaw
;
double
yawDiff
=
w
->
yaw
Radians
()
/
180.0
*
M_PI
-
yaw
;
// Draw background
pen
.
setColor
(
Qt
::
black
);
...
...
src/ui/map/QGCMapWidget.cc
View file @
10bff855
...
...
@@ -750,7 +750,7 @@ void QGCMapWidget::updateWaypoint(int uas, MissionItem* wp)
// Use safe standard interfaces for non MissionItem-class based wps
icon
->
SetCoord
(
internals
::
PointLatLng
(
wp
->
latitude
(),
wp
->
longitude
()));
icon
->
SetAltitude
(
wp
->
altitude
());
icon
->
SetHeading
(
wp
->
yaw
());
icon
->
SetHeading
(
wp
->
yaw
Radians
());
icon
->
SetNumber
(
wpindex
);
}
// Re-enable signals again
...
...
src/ui/map/Waypoint2DIcon.cc
View file @
10bff855
...
...
@@ -33,7 +33,7 @@ Waypoint2DIcon::Waypoint2DIcon(mapcontrol::MapGraphicItem* map, mapcontrol::OPMa
showOrbit
(
false
),
color
(
color
)
{
SetHeading
(
wp
->
yaw
());
SetHeading
(
wp
->
yaw
Radians
());
SetNumber
(
listindex
);
this
->
setFlag
(
QGraphicsItem
::
ItemIgnoresTransformations
,
true
);
picture
=
QPixmap
(
radius
+
1
,
radius
+
1
);
...
...
@@ -59,7 +59,7 @@ void Waypoint2DIcon::updateWaypoint()
// Store old size
static
QRectF
oldSize
;
SetHeading
(
waypoint
->
yaw
());
SetHeading
(
waypoint
->
yaw
Radians
());
SetCoord
(
internals
::
PointLatLng
(
waypoint
->
latitude
(),
waypoint
->
longitude
()));
// qDebug() << "UPDATING WP:" << waypoint->sequenceNumber() << "LAT:" << waypoint->latitude() << "LON:" << waypoint->longitude();
...
...
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