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
9acd7ff0
Commit
9acd7ff0
authored
Jul 11, 2010
by
pixhawk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed a small bug in the HSI widget leading to wrong compass drawing
parent
ce2219ac
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
4 deletions
+10
-4
HSIDisplay.cc
src/ui/HSIDisplay.cc
+3
-3
WatchdogControl.cc
src/ui/watchdog/WatchdogControl.cc
+4
-1
WatchdogControl.h
src/ui/watchdog/WatchdogControl.h
+3
-0
No files found.
src/ui/HSIDisplay.cc
View file @
9acd7ff0
...
...
@@ -155,12 +155,12 @@ void HSIDisplay::paintDisplay()
// Draw orientation labels
// Translate and rotate coordinate frame
painter
.
translate
((
xCenterPos
)
*
scalingFactor
,
(
yCenterPos
)
*
scalingFactor
);
painter
.
rotate
((
-
yaw
/
(
M_PI
))
*
180.0
f
);
painter
.
rotate
((
yaw
/
(
M_PI
))
*
180.0
f
);
paintText
(
tr
(
"N"
),
ringColor
,
3.5
f
,
-
1.0
f
,
-
baseRadius
-
5.5
f
,
&
painter
);
paintText
(
tr
(
"S"
),
ringColor
,
3.5
f
,
-
1.0
f
,
+
baseRadius
+
1.5
f
,
&
painter
);
paintText
(
tr
(
"E"
),
ringColor
,
3.5
f
,
+
baseRadius
+
2.0
f
,
-
1.75
f
,
&
painter
);
paintText
(
tr
(
"W"
),
ringColor
,
3.5
f
,
-
baseRadius
-
5.5
f
,
-
1.75
f
,
&
painter
);
painter
.
rotate
((
yaw
/
(
M_PI
))
*
180.0
f
);
painter
.
rotate
((
-
yaw
/
(
M_PI
))
*
180.0
f
);
painter
.
translate
(
-
(
xCenterPos
)
*
scalingFactor
,
-
(
yCenterPos
)
*
scalingFactor
);
// Draw center indicator
...
...
@@ -677,7 +677,7 @@ void HSIDisplay::drawWaypoints(QPainter& painter)
pen
.
setColor
(
color
);
painter
.
setPen
(
pen
);
float
radius
=
(
waypointSize
/
2.0
f
)
*
0.8
*
(
1
/
sqrt
(
2.0
f
));
drawLine
(
p
.
x
(),
p
.
y
(),
p
.
x
()
+
sin
(
yaw
)
*
radius
,
p
.
y
()
-
cos
(
yaw
)
*
radius
,
refLineWidthToPen
(
0.4
f
),
color
,
&
painter
);
drawLine
(
p
.
x
(),
p
.
y
(),
p
.
x
()
+
sin
(
list
.
at
(
i
)
->
getYaw
()
+
yaw
)
*
radius
,
p
.
y
()
-
cos
(
list
.
at
(
i
)
->
getYaw
()
+
yaw
)
*
radius
,
refLineWidthToPen
(
0.4
f
),
color
,
&
painter
);
drawPolygon
(
poly
,
&
painter
);
// DRAW CONNECTING LINE
...
...
src/ui/watchdog/WatchdogControl.cc
View file @
9acd7ff0
#include "WatchdogControl.h"
#include "WatchdogView.h"
#include "WatchdogProcessView.h"
#include "ui_WatchdogControl.h"
#include "PxQuadMAV.h"
...
...
@@ -52,7 +54,8 @@ void WatchdogControl::updateWatchdog(int systemId, int watchdogId, unsigned int
{
watchdog
.
processes_
=
std
::
vector
<
ProcessInfo
>
(
processCount
);
// Create new UI widget
//WatchdogView* view = new Watch
//WatchdogView* view = new WatchdogView(this);
}
// start the timeout timer
...
...
src/ui/watchdog/WatchdogControl.h
View file @
9acd7ff0
...
...
@@ -11,6 +11,8 @@
#include <string>
#include <sstream>
#include "WatchdogView.h"
#include "UASInterface.h"
namespace
Ui
{
...
...
@@ -128,6 +130,7 @@ private:
WatchdogInfo
&
getWatchdog
(
uint8_t
system_id
,
uint16_t
watchdog_id
);
std
::
map
<
WatchdogID
,
WatchdogInfo
>
watchdogs_
;
///< A map containing all watchdogs which are currently active
std
::
map
<
WatchdogID
,
WatchdogView
>
views
;
QTimer
updateTimer_
;
};
...
...
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