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
b1d0370f
Commit
b1d0370f
authored
Jul 16, 2011
by
lm
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor compile fixes and cleanups
parent
fe3a27c7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
4 deletions
+7
-4
trailitem.cpp
src/libs/opmapcontrol/src/mapwidget/trailitem.cpp
+2
-0
HUD.cc
src/ui/HUD.cc
+5
-3
HUD.h
src/ui/HUD.h
+0
-1
No files found.
src/libs/opmapcontrol/src/mapwidget/trailitem.cpp
View file @
b1d0370f
...
...
@@ -38,6 +38,8 @@ namespace mapcontrol
void
TrailItem
::
paint
(
QPainter
*
painter
,
const
QStyleOptionGraphicsItem
*
option
,
QWidget
*
widget
)
{
Q_UNUSED
(
option
);
Q_UNUSED
(
widget
);
// painter->drawRect(QRectF(-3,-3,6,6));
painter
->
setBrush
(
m_brush
);
painter
->
drawEllipse
(
-
2
,
-
2
,
4
,
4
);
...
...
src/ui/HUD.cc
View file @
b1d0370f
...
...
@@ -75,7 +75,6 @@ inline bool isinf(T value)
*/
HUD
::
HUD
(
int
width
,
int
height
,
QWidget
*
parent
)
:
QGLWidget
(
QGLFormat
(
QGL
::
SampleBuffers
),
parent
),
u
(
NULL
),
uas
(
NULL
),
yawInt
(
0.0
f
),
mode
(
tr
(
"UNKNOWN MODE"
)),
...
...
@@ -309,7 +308,6 @@ void HUD::setActiveUAS(UASInterface* uas)
// Set new UAS
this
->
uas
=
uas
;
this
->
u
=
dynamic_cast
<
UAS
*>
(
this
->
uas
);
}
}
...
...
@@ -1631,5 +1629,9 @@ void HUD::setPixels(int imgid, const unsigned char* imageData, int length, int s
void
HUD
::
copyImage
()
{
qDebug
()
<<
"HUD::copyImage()"
;
this
->
glImage
=
QGLWidget
::
convertToGLFormat
(
this
->
u
->
getImage
());
UAS
*
u
=
dynamic_cast
<
UAS
*>
(
this
->
uas
);
if
(
u
)
{
this
->
glImage
=
QGLWidget
::
convertToGLFormat
(
u
->
getImage
());
}
}
src/ui/HUD.h
View file @
b1d0370f
...
...
@@ -219,7 +219,6 @@ protected:
QAction
*
selectVideoChannelAction
;
void
paintEvent
(
QPaintEvent
*
event
);
bool
imageRequested
;
UAS
*
u
;
};
...
...
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