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
861b363c
Commit
861b363c
authored
Aug 13, 2013
by
David Goodman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed obtaining position. Fixed message box text.
parent
f83821e5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
29 additions
and
5 deletions
+29
-5
UAS.cc
src/uas/UAS.cc
+5
-1
QGCMapWidget.cc
src/ui/map/QGCMapWidget.cc
+21
-4
QGCMapWidget.h
src/ui/map/QGCMapWidget.h
+3
-0
No files found.
src/uas/UAS.cc
View file @
861b363c
...
...
@@ -1651,9 +1651,13 @@ void UAS::setHomePosition(double lat, double lon, double alt)
if
(
blockHomePositionChanges
)
return
;
QString
uasName
=
(
getUASName
()
==
""
)
?
tr
(
"UAS"
)
+
QString
::
number
(
getUASID
())
:
getUASName
();
QMessageBox
msgBox
;
msgBox
.
setIcon
(
QMessageBox
::
Warning
);
msgBox
.
setText
(
tr
(
"Set a new home position for vehicle %
s"
).
arg
(
getUASName
()
));
msgBox
.
setText
(
tr
(
"Set a new home position for vehicle %
1"
).
arg
(
uasName
));
msgBox
.
setInformativeText
(
"Do you want to set a new origin? Waypoints defined in the local frame will be shifted in their physical location"
);
msgBox
.
setStandardButtons
(
QMessageBox
::
Yes
|
QMessageBox
::
Cancel
);
msgBox
.
setDefaultButton
(
QMessageBox
::
Cancel
);
...
...
src/ui/map/QGCMapWidget.cc
View file @
861b363c
...
...
@@ -38,7 +38,7 @@ QGCMapWidget::QGCMapWidget(QWidget *parent) :
this
->
setContextMenuPolicy
(
Qt
::
ActionsContextMenu
);
// Go
t
to options
// Go to options
QAction
*
guidedaction
=
new
QAction
(
this
);
guidedaction
->
setText
(
"Go To Here (Guided Mode)"
);
connect
(
guidedaction
,
SIGNAL
(
triggered
()),
this
,
SLOT
(
guidedActionTriggered
()));
...
...
@@ -133,12 +133,12 @@ bool QGCMapWidget::setHomeActionTriggered()
// Enter an altitude
bool
ok
=
false
;
int
alt
=
QInputDialog
::
getInt
(
this
,
"Altitude"
,
"Enter default altitude (in meters) of destination point for guided mode"
,
100
,
0
,
30000
,
1
,
&
ok
);
double
alt
=
QInputDialog
::
getDouble
(
this
,
"Home Altitude"
,
"Enter altitude (in meters) of new home location"
,
0.0
,
0.0
,
30000.0
,
2
,
&
ok
);
if
(
!
ok
)
return
false
;
//Use has chosen cancel. Do not send the waypoint
// Create new waypoint and send it to the WPManager to send out.
internals
::
PointLatLng
pos
=
map
->
FromLocalToLatLng
(
mousePressPos
.
x
(),
m
ousePressPos
.
y
());
qDebug
(
)
<<
"Set home location sent. Lat:"
<<
pos
.
Lat
()
<<
", Lon:"
<<
pos
.
Lng
()
<<
", Alt: "
<<
alt
;
internals
::
PointLatLng
pos
=
map
->
FromLocalToLatLng
(
contextMousePressPos
.
x
(),
contextM
ousePressPos
.
y
());
qDebug
(
"Set home location sent. Lat: %f, Lon: %f, Alt: %f."
,
pos
.
Lat
(),
pos
.
Lng
(),
alt
)
;
bool
success
=
uasManager
->
setHomePositionAndNotify
(
pos
.
Lat
(),
pos
.
Lng
(),
alt
);
...
...
@@ -149,6 +149,13 @@ bool QGCMapWidget::setHomeActionTriggered()
void
QGCMapWidget
::
mousePressEvent
(
QMouseEvent
*
event
)
{
// Store right-click event presses separate for context menu
// TODO add check if click was on map, or popup box.
if
(
event
->
button
()
==
Qt
::
RightButton
)
{
contextMousePressPos
=
event
->
pos
();
}
mapcontrol
::
OPMapWidget
::
mousePressEvent
(
event
);
}
...
...
@@ -158,6 +165,15 @@ void QGCMapWidget::mouseReleaseEvent(QMouseEvent *event)
mapcontrol
::
OPMapWidget
::
mouseReleaseEvent
(
event
);
}
/*
void QGCMapWidget::contextMenuEvent(QContextMenuEvent *event)
{
// TODO Remove this method
qDebug() << "Context menu event triggered.";
mapcontrol::OPMapWidget::contextMenuEvent(event);
}
*/
QGCMapWidget
::~
QGCMapWidget
()
{
SetShowHome
(
false
);
// doing this appears to stop the map lib crashing on exit
...
...
@@ -556,6 +572,7 @@ void QGCMapWidget::updateHomePosition(double latitude, double longitude, double
Home
->
SetAltitude
(
altitude
);
homeAltitude
=
altitude
;
SetShowHome
(
true
);
// display the HOME position on the map
Home
->
RefreshPos
();
}
void
QGCMapWidget
::
goHome
()
...
...
src/ui/map/QGCMapWidget.h
View file @
861b363c
...
...
@@ -138,6 +138,8 @@ protected:
void
mouseReleaseEvent
(
QMouseEvent
*
event
);
void
mouseDoubleClickEvent
(
QMouseEvent
*
event
);
//void contextMenuEvent(QContextMenuEvent *);
UASWaypointManager
*
currWPManager
;
///< The current waypoint manager
bool
offlineMode
;
QMap
<
Waypoint
*
,
mapcontrol
::
WayPointItem
*>
waypointsToIcons
;
...
...
@@ -162,6 +164,7 @@ protected:
bool
mapInitialized
;
///< Map initialized?
float
homeAltitude
;
///< Home altitude
QPoint
mousePressPos
;
///< Mouse position when the button is released.
QPoint
contextMousePressPos
;
///< Mouse position when context menu activated.
int
defaultGuidedAlt
;
///< Default altitude for guided mode
UASInterface
*
uas
;
///< Currently selected UAS.
...
...
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