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
a5e07a7d
Commit
a5e07a7d
authored
Nov 07, 2010
by
Mariano Lizarraga
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Corrected minor bugs in Map Control
parent
71a63d00
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
9 deletions
+23
-9
SlugsMAV.cc
src/uas/SlugsMAV.cc
+1
-1
MapWidget.cc
src/ui/MapWidget.cc
+17
-5
MapWidget.h
src/ui/MapWidget.h
+5
-3
No files found.
src/uas/SlugsMAV.cc
View file @
a5e07a7d
...
@@ -67,7 +67,7 @@ void SlugsMAV::receiveMessage(LinkInterface* link, mavlink_message_t message)
...
@@ -67,7 +67,7 @@ void SlugsMAV::receiveMessage(LinkInterface* link, mavlink_message_t message)
emit
valueChanged
(
uasId
,
tr
(
"ControlDSC Load"
),
cpu_load
.
ctrlLoad
,
time
);
emit
valueChanged
(
uasId
,
tr
(
"ControlDSC Load"
),
cpu_load
.
ctrlLoad
,
time
);
emit
valueChanged
(
uasId
,
tr
(
"Battery Volt"
),
cpu_load
.
batVolt
,
time
);
emit
valueChanged
(
uasId
,
tr
(
"Battery Volt"
),
cpu_load
.
batVolt
,
time
);
emit
newCpuLoad
(
uasId
,
&
cpu_load
);
//
emit newCpuLoad (uasId, &cpu_load);
break
;
break
;
}
}
...
...
src/ui/MapWidget.cc
View file @
a5e07a7d
...
@@ -340,10 +340,19 @@ void MapWidget::createPathButtonClicked(bool checked)
...
@@ -340,10 +340,19 @@ void MapWidget::createPathButtonClicked(bool checked)
}
}
/**
* Captures a click on the map and if in create WP path mode, it adds the WP on MouseButtonRelease
*
* @param event The mouse event
* @param coordinate The coordinate in which it occured the mouse event
* @note This slot is connected to the mouseEventCoordinate of the QMapControl object
*/
void
MapWidget
::
captureMapClick
(
const
QMouseEvent
*
event
,
const
QPointF
coordinate
)
void
MapWidget
::
captureMapClick
(
const
QMouseEvent
*
event
,
const
QPointF
coordinate
)
{
{
qDebug
()
<<
mc
->
mouseMode
();
if
(
QEvent
::
MouseButtonRelease
==
event
->
type
()
&&
createPath
->
isChecked
())
if
(
QEvent
::
MouseButtonRelease
==
event
->
type
()
&&
createPath
->
isChecked
())
{
{
// Create waypoint name
// Create waypoint name
...
@@ -403,6 +412,7 @@ void MapWidget::createWaypointGraphAtMap(const QPointF coordinate)
...
@@ -403,6 +412,7 @@ void MapWidget::createWaypointGraphAtMap(const QPointF coordinate)
// emit captureMapCoordinateClick(coordinate);
// emit captureMapCoordinateClick(coordinate);
}
}
void
MapWidget
::
captureGeometryClick
(
Geometry
*
geom
,
QPoint
point
)
void
MapWidget
::
captureGeometryClick
(
Geometry
*
geom
,
QPoint
point
)
{
{
Q_UNUSED
(
geom
);
Q_UNUSED
(
geom
);
...
@@ -414,7 +424,7 @@ void MapWidget::captureGeometryClick(Geometry* geom, QPoint point)
...
@@ -414,7 +424,7 @@ void MapWidget::captureGeometryClick(Geometry* geom, QPoint point)
void
MapWidget
::
captureGeometryDrag
(
Geometry
*
geom
,
QPointF
coordinate
)
void
MapWidget
::
captureGeometryDrag
(
Geometry
*
geom
,
QPointF
coordinate
)
{
{
Q_UNUSED
(
coordinate
);
waypointIsDrag
=
true
;
waypointIsDrag
=
true
;
...
@@ -445,13 +455,15 @@ void MapWidget::captureGeometryDrag(Geometry* geom, QPointF coordinate)
...
@@ -445,13 +455,15 @@ void MapWidget::captureGeometryDrag(Geometry* geom, QPointF coordinate)
void
MapWidget
::
captureGeometryEndDrag
(
Geometry
*
geom
,
QPointF
coordinate
)
void
MapWidget
::
captureGeometryEndDrag
(
Geometry
*
geom
,
QPointF
coordinate
)
{
{
waypointIsDrag
=
false
;
// TODO: Investigate why when creating the waypoint path this slot is being called
// Only change the mouse mode back to panning when not creating a WP path
if
(
!
createPath
->
isChecked
()){
waypointIsDrag
=
false
;
mc
->
setMouseMode
(
qmapcontrol
::
MapControl
::
Panning
);
mc
->
setMouseMode
(
qmapcontrol
::
MapControl
::
Panning
);
}
// qDebug() << geom->name();
// qDebug() << geom->GeometryType;
// qDebug() << point;
}
}
MapWidget
::~
MapWidget
()
MapWidget
::~
MapWidget
()
...
...
src/ui/MapWidget.h
View file @
a5e07a7d
...
@@ -107,13 +107,15 @@ protected:
...
@@ -107,13 +107,15 @@ protected:
protected
slots
:
protected
slots
:
void
captureMapClick
(
const
QMouseEvent
*
event
,
const
QPointF
coordinate
);
void
captureMapClick
(
const
QMouseEvent
*
event
,
const
QPointF
coordinate
);
void
createWaypointGraphAtMap
(
const
QPointF
coordinate
);
void
createPathButtonClicked
(
bool
checked
);
void
captureGeometryClick
(
Geometry
*
,
QPoint
);
void
captureGeometryClick
(
Geometry
*
,
QPoint
);
void
mapproviderSelected
(
QAction
*
action
);
void
captureGeometryDrag
(
Geometry
*
geom
,
QPointF
coordinate
);
void
captureGeometryDrag
(
Geometry
*
geom
,
QPointF
coordinate
);
void
captureGeometryEndDrag
(
Geometry
*
geom
,
QPointF
coordinate
);
void
captureGeometryEndDrag
(
Geometry
*
geom
,
QPointF
coordinate
);
void
createPathButtonClicked
(
bool
checked
);
void
createWaypointGraphAtMap
(
const
QPointF
coordinate
);
void
mapproviderSelected
(
QAction
*
action
);
...
...
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