root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-11-24 11:45:53 +01:00
Code Issues Projects Releases Activity

Improved error handling

Browse Source
This commit is contained in:
Martin Tůma 2018-01-21 01:01:58 +01:00
parent 6ffc71fd36
commit da220c4b62
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/map/pcs.cpp
View File

@ -65,22 +65,28 @@ static bool parameter(int key, double val, int units, Projection::Setup &setup)
setup.setStandardParallel2(au.toDegrees(val));}
return true;
default:
return true;
return false;
}
}
static int projectionSetup(const QList<QByteArray> &list,
Projection::Setup &setup)
{
bool res;
bool r1, r2, r3;
for (int i = 6; i < 27; i += 3) {
int key = list[i].trimmed().toInt(&res);
double val = list[i+1].trimmed().toDouble(&res);
int un = list[i+2].trimmed().toInt(&res);
QString ks = list[i].trimmed();
if (ks.isEmpty())
break;
int key = ks.toInt(&r1);
double val = list[i+1].trimmed().toDouble(&r2);
int un = list[i+2].trimmed().toInt(&r3);
if (!r1 || !r2 || !r3)
return (i - 6)/3 + 1;
if (!parameter(key, val, un, setup))
return (i - 6)/3;
return (i - 6)/3 + 1;
}
return 0;