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
eb2a01d9
Commit
eb2a01d9
authored
Jan 27, 2011
by
pixhawk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed google earth runtime issues
parent
6540c223
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
28 deletions
+2
-28
earth.html
images/earth.html
+1
-8
QGCGoogleEarthView.cc
src/ui/map3D/QGCGoogleEarthView.cc
+1
-18
QGCGoogleEarthView.h
src/ui/map3D/QGCGoogleEarthView.h
+0
-2
No files found.
images/earth.html
View file @
eb2a01d9
...
@@ -142,8 +142,7 @@ function createAircraft(id, type, color)
...
@@ -142,8 +142,7 @@ function createAircraft(id, type, color)
aircraft
[
id
]
=
planePlacemark
;
aircraft
[
id
]
=
planePlacemark
;
attitudes
[
id
]
=
planeOrient
;
attitudes
[
id
]
=
planeOrient
;
aircraftLocations
[
id
]
=
planeLoc
;
aircraftLocations
[
id
]
=
planeLoc
;
aircraftLastLocations
[
id
]
=
ge
.
createLocation
(
''
);
aircraftLastLocations
[
id
]
=
ge
.
createLocation
(
''
);
aircraftColors
[
id
]
=
color
;
//planeColor = color;
//planeColor = color;
createTrail
(
id
,
color
);
createTrail
(
id
,
color
);
...
@@ -190,12 +189,6 @@ function showTrail(id)
...
@@ -190,12 +189,6 @@ function showTrail(id)
trailsVisible
[
id
]
=
true
;
trailsVisible
[
id
]
=
true
;
}
}
function
startTrail
(
id
)
{
createTrail
(
id
,
trailColors
[
id
]);
trailsVisible
[
id
]
=
true
;
}
function
setViewRange
(
dist
)
function
setViewRange
(
dist
)
{
{
currViewRange
=
dist
;
currViewRange
=
dist
;
...
...
src/ui/map3D/QGCGoogleEarthView.cc
View file @
eb2a01d9
...
@@ -151,20 +151,6 @@ void QGCGoogleEarthView::updateGlobalPosition(UASInterface* uas, double lon, dou
...
@@ -151,20 +151,6 @@ void QGCGoogleEarthView::updateGlobalPosition(UASInterface* uas, double lon, dou
//qDebug() << QString("addTrailPosition(%1, %2, %3, %4);").arg(uas->getUASID()).arg(lat, 0, 'f', 15).arg(lon, 0, 'f', 15).arg(alt, 0, 'f', 15);
//qDebug() << QString("addTrailPosition(%1, %2, %3, %4);").arg(uas->getUASID()).arg(lat, 0, 'f', 15).arg(lon, 0, 'f', 15).arg(alt, 0, 'f', 15);
}
}
void
QGCGoogleEarthView
::
clearTrail
()
{
// Check if the current trail has to be hidden
if
(
trailEnabled
&&
!
state
)
{
QList
<
UASInterface
*>
mavs
=
UASManager
::
instance
()
->
getUASList
();
foreach
(
UASInterface
*
currMav
,
mavs
)
{
javaScript
(
QString
(
"clearTrail(%1);"
).
arg
(
currMav
->
getUASID
()));
javaScript
(
QString
(
"startTrail(%1);"
).
arg
(
currMav
->
getUASID
()));
}
}
}
void
QGCGoogleEarthView
::
showTrail
(
bool
state
)
void
QGCGoogleEarthView
::
showTrail
(
bool
state
)
{
{
// Check if the current trail has to be hidden
// Check if the current trail has to be hidden
...
@@ -173,7 +159,7 @@ void QGCGoogleEarthView::showTrail(bool state)
...
@@ -173,7 +159,7 @@ void QGCGoogleEarthView::showTrail(bool state)
QList
<
UASInterface
*>
mavs
=
UASManager
::
instance
()
->
getUASList
();
QList
<
UASInterface
*>
mavs
=
UASManager
::
instance
()
->
getUASList
();
foreach
(
UASInterface
*
currMav
,
mavs
)
foreach
(
UASInterface
*
currMav
,
mavs
)
{
{
javaScript
(
QString
(
"
clear
Trail(%1);"
).
arg
(
currMav
->
getUASID
()));
javaScript
(
QString
(
"
hide
Trail(%1);"
).
arg
(
currMav
->
getUASID
()));
}
}
}
}
...
@@ -358,9 +344,6 @@ void QGCGoogleEarthView::initializeGoogleEarth()
...
@@ -358,9 +344,6 @@ void QGCGoogleEarthView::initializeGoogleEarth()
ui
->
trailCheckbox
->
setChecked
(
trailEnabled
);
ui
->
trailCheckbox
->
setChecked
(
trailEnabled
);
connect
(
ui
->
trailCheckbox
,
SIGNAL
(
toggled
(
bool
)),
this
,
SLOT
(
showTrail
(
bool
)));
connect
(
ui
->
trailCheckbox
,
SIGNAL
(
toggled
(
bool
)),
this
,
SLOT
(
showTrail
(
bool
)));
// Clear trail button
connect
(
ui
->
clearTrailButton
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
clearTrail
()));
// Go home
// Go home
connect
(
ui
->
goHomeButton
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
goHome
()));
connect
(
ui
->
goHomeButton
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
goHome
()));
...
...
src/ui/map3D/QGCGoogleEarthView.h
View file @
eb2a01d9
...
@@ -82,8 +82,6 @@ public slots:
...
@@ -82,8 +82,6 @@ public slots:
void
setActiveUAS
(
UASInterface
*
uas
);
void
setActiveUAS
(
UASInterface
*
uas
);
/** @brief Update the global position */
/** @brief Update the global position */
void
updateGlobalPosition
(
UASInterface
*
uas
,
double
lon
,
double
lat
,
double
alt
,
quint64
usec
);
void
updateGlobalPosition
(
UASInterface
*
uas
,
double
lon
,
double
lat
,
double
alt
,
quint64
usec
);
/** @brief Clear the existing vehicle trails */
void
clearTrail
();
/** @brief Show the vehicle trail */
/** @brief Show the vehicle trail */
void
showTrail
(
bool
state
);
void
showTrail
(
bool
state
);
/** @brief Show the waypoints */
/** @brief Show the waypoints */
...
...
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