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
97c7f726
Commit
97c7f726
authored
Oct 04, 2010
by
lm
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed map widget signal-slot error, removed Q3DWidget compile error
parent
3ce833b4
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
10 deletions
+10
-10
MapWidget.cc
src/ui/MapWidget.cc
+4
-3
MapWidget.h
src/ui/MapWidget.h
+5
-3
Q3DWidget.h
src/ui/map3D/Q3DWidget.h
+1
-1
QMap3DWidget.cc
src/ui/map3D/QMap3DWidget.cc
+0
-3
No files found.
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
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