Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
97c7f726
Commit
97c7f726
authored
Oct 04, 2010
by
lm
Browse files
Removed map widget signal-slot error, removed Q3DWidget compile error
parent
3ce833b4
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/ui/MapWidget.cc
View file @
97c7f726
...
...
@@ -198,6 +198,7 @@ MapWidget::MapWidget(QWidget *parent) :
connect
(
createPath
,
SIGNAL
(
clicked
(
bool
)),
this
,
SLOT
(
createPathButtonClicked
(
bool
)));
connect
(
geomLayer
,
SIGNAL
(
geometryClicked
(
Geometry
*
,
QPoint
)),
this
,
SLOT
(
captureGeometryClick
(
Geometry
*
,
QPoint
)));
...
...
@@ -372,7 +373,7 @@ void MapWidget::captureMapClick(const QMouseEvent* event, const QPointF coordina
}
}
void
MapWidget
::
captureGeometryClick
(
qmapcontrol
::
Geometry
*
geom
,
QPoint
point
){
void
MapWidget
::
captureGeometryClick
(
Geometry
*
geom
,
QPoint
point
){
Q_UNUSED
(
geom
);
Q_UNUSED
(
point
);
...
...
@@ -381,7 +382,7 @@ void MapWidget::captureGeometryClick(qmapcontrol::Geometry* geom, QPoint point){
}
void
MapWidget
::
captureGeometryDrag
(
qmapcontrol
::
Geometry
*
geom
,
QPointF
coordinate
){
void
MapWidget
::
captureGeometryDrag
(
Geometry
*
geom
,
QPointF
coordinate
){
Q_UNUSED
(
coordinate
);
// Refresh the screen
...
...
@@ -409,7 +410,7 @@ void MapWidget::captureGeometryDrag(qmapcontrol::Geometry* geom, QPointF coordin
}
void
MapWidget
::
captureGeometryEndDrag
(
qmapcontrol
::
Geometry
*
geom
,
QPointF
coordinate
)
void
MapWidget
::
captureGeometryEndDrag
(
Geometry
*
geom
,
QPointF
coordinate
)
{
mc
->
setMouseMode
(
qmapcontrol
::
MapControl
::
Panning
);
...
...
src/ui/MapWidget.h
View file @
97c7f726
...
...
@@ -44,6 +44,8 @@ namespace Ui {
class
MapWidget
;
}
using
namespace
qmapcontrol
;
/**
* @brief 2D Moving map
*
...
...
@@ -105,10 +107,10 @@ protected:
protected
slots
:
void
captureMapClick
(
const
QMouseEvent
*
event
,
const
QPointF
coordinate
);
void
createPathButtonClicked
(
bool
checked
);
void
captureGeometryClick
(
qmapcontrol
::
Geometry
*
,
QPoint
);
void
captureGeometryClick
(
Geometry
*
,
QPoint
);
void
mapproviderSelected
(
QAction
*
action
);
void
captureGeometryDrag
(
qmapcontrol
::
Geometry
*
geom
,
QPointF
coordinate
);
void
captureGeometryEndDrag
(
qmapcontrol
::
Geometry
*
geom
,
QPointF
coordinate
);
void
captureGeometryDrag
(
Geometry
*
geom
,
QPointF
coordinate
);
void
captureGeometryEndDrag
(
Geometry
*
geom
,
QPointF
coordinate
);
...
...
src/ui/map3D/Q3DWidget.h
View file @
97c7f726
...
...
@@ -165,7 +165,7 @@ protected:
float
r2d
(
float
angle
);
float
d2r
(
float
angle
);
void
Q3DWidget
::
wireSphere
(
double
radius
,
int
slices
,
int
stacks
);
void
wireSphere
(
double
radius
,
int
slices
,
int
stacks
);
void
solidSphere
(
double
radius
,
int
slices
,
int
stacks
);
void
wireCone
(
double
base
,
double
height
,
int
slices
,
int
stacks
);
void
solidCone
(
double
base
,
double
height
,
int
slices
,
int
stacks
);
...
...
src/ui/map3D/QMap3DWidget.cc
View file @
97c7f726
...
...
@@ -54,9 +54,6 @@ QMap3DWidget::QMap3DWidget(QWidget* parent)
initialize
(
10
,
10
,
1000
,
900
,
15.0
f
);
setCameraParams
(
0.05
f
,
0.5
f
,
0.01
f
,
0.5
f
,
30.0
f
,
0.01
f
,
400.0
f
);
int32_t
argc
=
0
;
//glutInit(&argc, NULL);
setDisplayFunc
(
display
,
this
);
setMouseFunc
(
mouse
,
this
);
addTimerFunc
(
100
,
timer
,
this
);
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment