root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-05-04 10:27:44 +02:00
Code Issues Projects Releases Activity

Improved error reporting

Browse Source
This commit is contained in:
Martin Tůma 2025-04-30 23:05:04 +02:00
parent ba50e67380
commit ed4c18b773
5 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/map/ENC/iso8211.cpp
View File

@ -259,13 +259,9 @@ bool ISO8211::readUDA(quint64 pos, const FieldDefinition &def,
bool ISO8211::readRecord(Record &record)
{
if (_file.atEnd())
return false;
QVector<FieldDefinition> fields;
qint64 pos = _file.pos();
if (readDR(fields) < 0) {
_errorString = "Error reading DR";
return false;

1
src/map/ENC/iso8211.h
View File

@ -35,6 +35,7 @@ public:
ISO8211(const QString &path) : _file(path) {}
bool readDDR();
bool readRecord(Record &record);
bool atEnd() const {return _file.atEnd();}
const QString &errorString() const {return _errorString;}
static constexpr quint32 NAME(const char str[4])

10
src/map/ENC/mapdata.cpp
View File

@ -829,9 +829,15 @@ MapData::MapData(const QString &path)
if (!ddf.readDDR())
return;
while (ddf.readRecord(record))
while (!ddf.atEnd()) {
if (!ddf.readRecord(record)) {
qWarning("%s: %s", qUtf8Printable(path),
qUtf8Printable(ddf.errorString()));
break;
}
if (!processRecord(record, fe, vi, vc, ve, comf, somf, huni))
qWarning("Invalid S-57 record");
qWarning("%s: Invalid S-57 record", qUtf8Printable(path));
}
for (int i = 0; i < fe.size(); i++) {
const ISO8211::Record &r = fe.at(i);

10
src/map/encatlas.cpp
View File

@ -127,14 +127,14 @@ ENCAtlas::ENCAtlas(const QString &fileName, QObject *parent)
_errorString = ddf.errorString();
return;
}
while (ddf.readRecord(record)) {
if (processRecord(record, file, bounds))
addMap(dir, file, bounds);
}
if (!ddf.errorString().isNull()) {
while (!ddf.atEnd()) {
if (!ddf.readRecord(record)) {
_errorString = ddf.errorString();
return;
}
if (processRecord(record, file, bounds))
addMap(dir, file, bounds);
}
if (_data.isEmpty()) {
_errorString = "No usable ENC map found";

10
src/map/encmap.cpp
View File

@ -143,16 +143,16 @@ ENCMap::ENCMap(const QString &fileName, QObject *parent)
_errorString = ddf.errorString();
return;
}
while (ddf.readRecord(record)) {
while (!ddf.atEnd()) {
if (!ddf.readRecord(record)) {
_errorString = ddf.errorString();
return;
}
if (!processRecord(record, gv, comf, dsnm)) {
_errorString = "Invalid S-57 record";
return;
}
}
if (!ddf.errorString().isNull()) {
_errorString = ddf.errorString();
return;
}
_name = dsnm;