rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-30 08:24:11 +01:00
Code Issues Releases Activity

OP-52 Ground/GPS Display: More tweaks

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@1533 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
sambas 2010-09-05 06:28:30 +00:00 committed by sambas
parent d457781173
commit 2283e2e9ad
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ground/src/plugins/gpsdisplay/gpsdisplaywidget.cpp
View File

@ -72,12 +72,15 @@ void GpsDisplayWidget::setSpeedHeading(double speed, double heading)
void GpsDisplayWidget::setDateTime(double date, double time) void GpsDisplayWidget::setDateTime(double date, double time)
{ {
QString dstring = QString::number(date,'g',10); // QString dstring = QString::number(date,'g',10);
dstring.insert(6,"."); QString dstring;
dstring.insert(4,"."); dstring.sprintf("%06.0f",date);
dstring.insert(dstring.length()-2,".");
dstring.insert(dstring.length()-5,".");
gdate_value->setText(dstring); gdate_value->setText(dstring);
gdate_value->adjustSize(); gdate_value->adjustSize();
dstring = QString::number(time,'g',10); //dstring = QString::number(time,'g',10);
dstring.sprintf("%06.0f",time);
dstring.insert(dstring.length()-2,":"); dstring.insert(dstring.length()-2,":");
dstring.insert(dstring.length()-5,":"); dstring.insert(dstring.length()-5,":");
gtime_value->setText(dstring + " GMT"); gtime_value->setText(dstring + " GMT");
@ -105,8 +108,6 @@ void GpsDisplayWidget::setSVs(int sv)
void GpsDisplayWidget::setPosition(double lat, double lon, double alt) void GpsDisplayWidget::setPosition(double lat, double lon, double alt)
{ {
//lat *= 1E-7;
//lon *= 1E-7;
double deg = (lat>0) ? floor(lat):ceil(lat); double deg = (lat>0) ? floor(lat):ceil(lat);
double min = fabs(lat-deg)*60; double min = fabs(lat-deg)*60;
QString str; QString str;

2
ground/src/plugins/gpsdisplay/telemetryparser.cpp
View File

@ -73,6 +73,8 @@ void TelemetryParser::updateGPS( UAVObject* object1) {
double lat = object1->getField(QString("Latitude"))->getDouble(); double lat = object1->getField(QString("Latitude"))->getDouble();
double lon = object1->getField(QString("Longitude"))->getDouble(); double lon = object1->getField(QString("Longitude"))->getDouble();
double alt = object1->getField(QString("Altitude"))->getDouble(); double alt = object1->getField(QString("Altitude"))->getDouble();
lat *= 1E-7;
lon *= 1E-7;
emit position(lat,lon,alt); emit position(lat,lon,alt);
double hdg = object1->getField(QString("Heading"))->getDouble(); double hdg = object1->getField(QString("Heading"))->getDouble();