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
e993561f
Commit
e993561f
authored
Aug 22, 2014
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix override of QWidget update signal
parent
d18e0394
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
Pixhawk3DWidget.cc
src/ui/map3D/Pixhawk3DWidget.cc
+2
-2
Pixhawk3DWidget.h
src/ui/map3D/Pixhawk3DWidget.h
+1
-1
Q3DWidget.h
src/ui/map3D/Q3DWidget.h
+1
-1
No files found.
src/ui/map3D/Pixhawk3DWidget.cc
View file @
e993561f
...
...
@@ -66,7 +66,7 @@ Pixhawk3DWidget::Pixhawk3DWidget(QWidget* parent)
,
mViewParamWidget
(
new
ViewParamWidget
(
mGlobalViewParams
,
mSystemViewParamMap
,
this
,
parent
))
{
connect
(
m3DWidget
,
SIGNAL
(
sizeChanged
(
int
,
int
)),
this
,
SLOT
(
sizeChanged
(
int
,
int
)));
connect
(
m3DWidget
,
SIGNAL
(
update
()),
this
,
SLOT
(
update
()));
connect
(
m3DWidget
,
SIGNAL
(
update
Widget
()),
this
,
SLOT
(
updateWidget
()));
m3DWidget
->
setCameraParams
(
2.0
f
,
30.0
f
,
0.01
f
,
10000.0
f
);
m3DWidget
->
init
(
15.0
f
);
...
...
@@ -1078,7 +1078,7 @@ Pixhawk3DWidget::sizeChanged(int width, int height)
}
void
Pixhawk3DWidget
::
update
(
void
)
Pixhawk3DWidget
::
update
Widget
(
void
)
{
MAV_FRAME
frame
=
mGlobalViewParams
->
frame
();
...
...
src/ui/map3D/Pixhawk3DWidget.h
View file @
e993561f
...
...
@@ -97,7 +97,7 @@ private slots:
void
rotateTerrain
(
void
);
void
sizeChanged
(
int
width
,
int
height
);
void
update
(
void
);
void
update
Widget
(
void
);
protected:
void
addModels
(
QVector
<
osg
::
ref_ptr
<
osg
::
Node
>
>&
models
,
...
...
src/ui/map3D/Q3DWidget.h
View file @
e993561f
...
...
@@ -176,7 +176,7 @@ protected slots:
signals:
void
sizeChanged
(
int
width
,
int
height
);
void
update
(
void
);
void
update
Widget
(
void
);
protected:
/**
...
...
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