This adds support for two more GPS coordinate formats and also fixes a couple of issues with the previous implementation. We used to only support full degrees and decimal minutes. We now also support fully decimal and degrees, minutes and decimal seconds. The previous implementation would color the input field red if either it couldn't parse the string, or if it was able to parse it but it was the same as the previous location. That's misleading. The previous implementation also changed all gps coordinates to the new coordinates in a multi-dive edit - instead of just changing the ones that are the same as the master dive. Fixes #387 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
202 lines
6.4 KiB
C++
202 lines
6.4 KiB
C++
#include "qthelper.h"
|
|
#include "qt-ui/mainwindow.h"
|
|
#include <QRegExp>
|
|
#include <QDebug>
|
|
|
|
#define tr(_arg) mainWindow()->information()->tr(_arg)
|
|
DiveComputerList::DiveComputerList()
|
|
{
|
|
|
|
}
|
|
|
|
DiveComputerList::~DiveComputerList()
|
|
{
|
|
|
|
}
|
|
|
|
bool DiveComputerNode::operator == (const DiveComputerNode &a) const {
|
|
return this->model == a.model &&
|
|
this->deviceId == a.deviceId &&
|
|
this->firmware == a.firmware &&
|
|
this->serialNumber == a.serialNumber &&
|
|
this->nickName == a.nickName;
|
|
}
|
|
|
|
bool DiveComputerNode::operator !=(const DiveComputerNode &a) const {
|
|
return !(*this == a);
|
|
}
|
|
|
|
bool DiveComputerNode::changesValues(const DiveComputerNode &b) const
|
|
{
|
|
if (this->model != b.model || this->deviceId != b.deviceId) {
|
|
qDebug("DiveComputerNodes were not for the same DC");
|
|
return false;
|
|
}
|
|
return (b.firmware != "" && this->firmware != b.firmware) ||
|
|
(b.serialNumber != "" && this->serialNumber != b.serialNumber) ||
|
|
(b.nickName != "" && this->nickName != b.nickName);
|
|
}
|
|
|
|
const DiveComputerNode *DiveComputerList::getExact(QString m, uint32_t d)
|
|
{
|
|
for (QMap<QString,DiveComputerNode>::iterator it = dcMap.find(m); it != dcMap.end() && it.key() == m; ++it)
|
|
if (it->deviceId == d)
|
|
return &*it;
|
|
return NULL;
|
|
}
|
|
|
|
const DiveComputerNode *DiveComputerList::get(QString m)
|
|
{
|
|
QMap<QString,DiveComputerNode>::iterator it = dcMap.find(m);
|
|
if (it != dcMap.end())
|
|
return &*it;
|
|
return NULL;
|
|
}
|
|
|
|
void DiveComputerList::addDC(QString m, uint32_t d, QString n, QString s, QString f)
|
|
{
|
|
if (m == "" || d == 0)
|
|
return;
|
|
const DiveComputerNode *existNode = this->getExact(m, d);
|
|
DiveComputerNode newNode(m, d, s, f, n);
|
|
if (existNode) {
|
|
if (newNode.changesValues(*existNode)) {
|
|
if (n != "" && existNode->nickName != n)
|
|
qDebug("new nickname %s for DC model %s deviceId 0x%x", n.toUtf8().data(), m.toUtf8().data(), d);
|
|
if (f != "" && existNode->firmware != f)
|
|
qDebug("new firmware version %s for DC model %s deviceId 0x%x", f.toUtf8().data(), m.toUtf8().data(), d);
|
|
if (s != "" && existNode->serialNumber != s)
|
|
qDebug("new serial number %s for DC model %s deviceId 0x%x", s.toUtf8().data(), m.toUtf8().data(), d);
|
|
} else {
|
|
return;
|
|
}
|
|
dcMap.remove(m, *existNode);
|
|
}
|
|
dcMap.insert(m, newNode);
|
|
}
|
|
|
|
void DiveComputerList::rmDC(QString m, uint32_t d)
|
|
{
|
|
const DiveComputerNode *existNode = this->getExact(m, d);
|
|
dcMap.remove(m, *existNode);
|
|
}
|
|
|
|
QString weight_string(int weight_in_grams)
|
|
{
|
|
QString str;
|
|
if (get_units()->weight == units::KG) {
|
|
int gr = weight_in_grams % 1000;
|
|
int kg = weight_in_grams / 1000;
|
|
if (kg >= 20.0) {
|
|
str = QString("0");
|
|
} else {
|
|
str = QString("%1.%2").arg(kg).arg((unsigned)(gr) / 100);
|
|
}
|
|
} else {
|
|
double lbs = grams_to_lbs(weight_in_grams);
|
|
str = QString("%1").arg(lbs, 0, 'f', lbs >= 40.0 ? 0 : 1 );
|
|
}
|
|
return (str);
|
|
}
|
|
|
|
bool parseGpsText(const QString& gps_text, double *latitude, double *longitude)
|
|
{
|
|
enum { SECONDS, MINUTES, DECIMAL } gpsStyle = DECIMAL;
|
|
int eastWest = 4;
|
|
QString regExp;
|
|
/* an empty string is interpreted as 0.0,0.0 and therefore "no gps location" */
|
|
if (gps_text.trimmed() == "") {
|
|
*latitude = 0.0;
|
|
*longitude = 0.0;
|
|
return true;
|
|
}
|
|
// trying to parse all formats in one regexp might be possible, but it seems insane
|
|
// so handle the three formats we understand separately
|
|
if (gps_text.count(QChar('"')) == 2) {
|
|
gpsStyle = SECONDS;
|
|
regExp = QString("\\s*([NS%1%2])\\s*(\\d+)[" UTF8_DEGREE "\\s]+(\\d+)[\'\\s]+(\\d+)\\.(\\d+)[^EW%3%4]*"
|
|
"([EW%6%7])\\s*(\\d+)[" UTF8_DEGREE "\\s]+(\\d+)[\'\\s]+(\\d+)\\.(\\d+)")
|
|
.arg(tr("N")).arg(tr("S")).arg(tr("E")).arg(tr("W")).arg(tr("E")).arg(tr("W"));
|
|
} else if (gps_text.count(QChar('\'')) == 2) {
|
|
gpsStyle = MINUTES;
|
|
regExp = QString("\\s*([NS%1%2])\\s*(\\d+)[" UTF8_DEGREE "\\s]+(\\d+)\\.(\\d+)[^EW%3%4]*"
|
|
"([EW%6%7])\\s*(\\d+)[" UTF8_DEGREE "\\s]+(\\d+)\\.(\\d+)")
|
|
.arg(tr("N")).arg(tr("S")).arg(tr("E")).arg(tr("W")).arg(tr("E")).arg(tr("W"));
|
|
} else {
|
|
regExp = QString("\\s*([-NS%1%2]?)\\s*(\\d+)\\.(\\d+)[^-EW%3%4\\d]*([-EW%5%6]?)\\s*(\\d+)\\.(\\d+)")
|
|
.arg(tr("N")).arg(tr("S")).arg(tr("E")).arg(tr("W")).arg(tr("E")).arg(tr("W"));
|
|
}
|
|
QRegExp r(regExp);
|
|
if (r.indexIn(gps_text) != -1) {
|
|
// qDebug() << "Hemisphere" << r.cap(1) << "deg" << r.cap(2) << "min" << r.cap(3) << "decimal" << r.cap(4);
|
|
// qDebug() << "Hemisphere" << r.cap(5) << "deg" << r.cap(6) << "min" << r.cap(7) << "decimal" << r.cap(8);
|
|
switch(gpsStyle) {
|
|
case SECONDS:
|
|
*latitude = r.cap(2).toInt() + r.cap(3).toInt() / 60.0 +
|
|
(r.cap(4) + QString(".") + r.cap(5)).toDouble() / 3600.0;
|
|
*longitude = r.cap(7).toInt() + r.cap(8).toInt() / 60.0 +
|
|
(r.cap(9) + QString(".") + r.cap(10)).toDouble() / 3600.0;
|
|
eastWest = 6;
|
|
break;
|
|
case MINUTES:
|
|
*latitude = r.cap(2).toInt() + (r.cap(3) + QString(".") + r.cap(4)).toDouble() / 60.0;
|
|
*longitude = r.cap(6).toInt() + (r.cap(7) + QString(".") + r.cap(8)).toDouble() / 60.0;
|
|
eastWest = 5;
|
|
break;
|
|
case DECIMAL:
|
|
default:
|
|
*latitude = (r.cap(2) + QString(".") + r.cap(3)).toDouble();
|
|
*longitude = (r.cap(5) + QString(".") + r.cap(6)).toDouble();
|
|
eastWest = 4;
|
|
break;
|
|
}
|
|
if (r.cap(1) == "S" || r.cap(1) == tr("S") || r.cap(1) == "-")
|
|
*latitude *= -1.0;
|
|
if (r.cap(eastWest) == "W" || r.cap(5) == tr("W") || r.cap(5) == "-")
|
|
*longitude *= -1.0;
|
|
// qDebug("%s -> %8.5f / %8.5f", gps_text.toLocal8Bit().data(), *latitude, *longitude);
|
|
return true;
|
|
}
|
|
qDebug() << "rejected";
|
|
return false;
|
|
}
|
|
|
|
bool gpsHasChanged(struct dive *dive, struct dive *master, const QString& gps_text, bool *parsed)
|
|
{
|
|
double latitude, longitude;
|
|
int latudeg, longudeg;
|
|
|
|
/* if we have a master and the dive's gps address is different from it,
|
|
* don't change the dive */
|
|
if (master && (master->latitude.udeg != dive->latitude.udeg ||
|
|
master->longitude.udeg != dive->longitude.udeg))
|
|
return false;
|
|
|
|
if (!(*parsed = parseGpsText(gps_text, &latitude, &longitude)))
|
|
return false;
|
|
|
|
latudeg = rint(1000000 * latitude);
|
|
longudeg = rint(1000000 * longitude);
|
|
|
|
/* if dive gps didn't change, nothing changed */
|
|
if (dive->latitude.udeg == latudeg && dive->longitude.udeg == longudeg)
|
|
return false;
|
|
/* ok, update the dive and mark things changed */
|
|
dive->latitude.udeg = latudeg;
|
|
dive->longitude.udeg = longudeg;
|
|
return true;
|
|
}
|
|
|
|
QList< int > getDivesInTrip ( dive_trip_t* trip )
|
|
{
|
|
QList<int> ret;
|
|
for(int i = 0; i < dive_table.nr; i++){
|
|
struct dive *d = get_dive(i);
|
|
if (d->divetrip == trip){
|
|
ret.push_back(get_divenr(d));
|
|
}
|
|
}
|
|
return ret;
|
|
}
|
|
|