From 7188d04e0667895208b3a6c02f636a55b70020fb Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Wed, 4 Apr 2018 12:03:58 -0700 Subject: [PATCH] Better debugging support --- src/Terrain/TerrainQuery.cc | 15 +++++++++++++-- src/Terrain/TerrainQuery.h | 1 + 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/Terrain/TerrainQuery.cc b/src/Terrain/TerrainQuery.cc index 23a149d..f8af5ca 100644 --- a/src/Terrain/TerrainQuery.cc +++ b/src/Terrain/TerrainQuery.cc @@ -97,6 +97,17 @@ void TerrainAirMapQuery::_sendQuery(const QString& path, const QUrlQuery& urlQue } connect(networkReply, &QNetworkReply::finished, this, &TerrainAirMapQuery::_requestFinished); + connect(networkReply, QOverload::of(&QNetworkReply::error), this, &TerrainAirMapQuery::_requestError); +} + +void TerrainAirMapQuery::_requestError(QNetworkReply::NetworkError code) +{ + QNetworkReply* reply = qobject_cast(QObject::sender()); + + if (code != QNetworkReply::NoError) { + qCDebug(TerrainQueryLog) << "_requestError error:url:data" << reply->error() << reply->url() << reply->readAll(); + return; + } } void TerrainAirMapQuery::_requestFinished(void) @@ -104,7 +115,7 @@ void TerrainAirMapQuery::_requestFinished(void) QNetworkReply* reply = qobject_cast(QObject::sender()); if (reply->error() != QNetworkReply::NoError) { - qCDebug(TerrainQueryLog) << "_requestFinished error:data" << reply->error() << reply->readAll(); + qCDebug(TerrainQueryLog) << "_requestFinished error:url:data" << reply->error() << reply->url() << reply->readAll(); reply->deleteLater(); _requestFailed(); return; @@ -133,7 +144,7 @@ void TerrainAirMapQuery::_requestFinished(void) // Send back data const QJsonValue& jsonData = rootObject["data"]; - qCDebug(TerrainQueryLog) << "_requestFinished sucess"; + qCDebug(TerrainQueryLog) << "_requestFinished success"; switch (_queryMode) { case QueryModeCoordinates: emit _parseCoordinateData(jsonData); diff --git a/src/Terrain/TerrainQuery.h b/src/Terrain/TerrainQuery.h index 030715a..01ee9ed 100644 --- a/src/Terrain/TerrainQuery.h +++ b/src/Terrain/TerrainQuery.h @@ -64,6 +64,7 @@ public: void requestCarpetHeights(const QGeoCoordinate& swCoord, const QGeoCoordinate& neCoord, bool statsOnly) final; private slots: + void _requestError(QNetworkReply::NetworkError code); void _requestFinished(void); private: