Error display

src/ADSB/ADSBVehicleManager.cc

@@ -31,7 +31,8 @@ void ADSBVehicleManager::setToolbox(QGCToolbox* toolbox)
     ADSBVehicleManagerSettings* settings = qgcApp()->toolbox()->settingsManager()->adsbVehicleManagerSettings();
     if (settings->adsbServerConnectEnabled()->rawValue().toBool()) {
         _tcpLink = new ADSBTCPLink(settings->adsbServerHostAddress()->rawValue().toString(), settings->adsbServerPort()->rawValue().toInt(), this);
-        connect(_tcpLink, &ADSBTCPLink::adsbVehicleUpdate, this, &ADSBVehicleManager::adsbVehicleUpdate, Qt::QueuedConnection);
+        connect(_tcpLink, &ADSBTCPLink::adsbVehicleUpdate,  this, &ADSBVehicleManager::adsbVehicleUpdate,   Qt::QueuedConnection);
+        connect(_tcpLink, &ADSBTCPLink::error,              this, &ADSBVehicleManager::_tcpError,           Qt::QueuedConnection);
     }
 }
 
@@ -63,6 +64,12 @@ void ADSBVehicleManager::adsbVehicleUpdate(const ADSBVehicle::VehicleInfo_t vehi
     }
 }
 
+void ADSBVehicleManager::_tcpError(const QString errorMsg)
+{
+    qgcApp()->showMessage(tr("ADSB Server Error: %1").arg(errorMsg));
+}
+
+
 ADSBTCPLink::ADSBTCPLink(const QString& hostAddress, int port, QObject* parent)
     : QThread       (parent)
     , _hostAddress  (hostAddress)
@@ -95,11 +102,12 @@ void ADSBTCPLink::_hardwareConnect()
 
     QObject::connect(_socket, &QTcpSocket::readyRead, this, &ADSBTCPLink::_readBytes);
 
-    _socket->connectToHost(_hostAddress, _port);
+    _socket->connectToHost(_hostAddress, static_cast<quint16>(_port));
 
     // Give the socket a second to connect to the other side otherwise error out
     if (!_socket->waitForConnected(1000)) {
         qCDebug(ADSBVehicleManagerLog) << "ADSB Socket failed to connect";
+        emit error(_socket->errorString());
         delete _socket;
         _socket = nullptr;
         return;
@@ -116,13 +124,6 @@ void ADSBTCPLink::_readBytes(void)
     }
 }
 
-void ADSBTCPLink::_socketError(QAbstractSocket::SocketError socketError)
-{
-    QString error = _socket->errorString();
-    qDebug() << _socket->errorString();
-}
-
-
 void ADSBTCPLink::_parseLine(const QString& line)
 {
     if (line.startsWith(QStringLiteral("MSG"))) {

src/ADSB/ADSBVehicleManager.h

@@ -30,13 +30,13 @@ public:
 
 signals:
     void adsbVehicleUpdate(const ADSBVehicle::VehicleInfo_t vehicleInfo);
+    void error(const QString errorMsg);
 
 protected:
     void run(void) final;
 
 private slots:
     void _readBytes(void);
-    void _socketError(QAbstractSocket::SocketError socketError);
 
 private:
     void _hardwareConnect(void);
@@ -61,7 +61,8 @@ public:
     void setToolbox(QGCToolbox* toolbox) final;
 
 public slots:
-    void adsbVehicleUpdate(const ADSBVehicle::VehicleInfo_t vehicleInfo);
+    void adsbVehicleUpdate  (const ADSBVehicle::VehicleInfo_t vehicleInfo);
+    void _tcpError          (const QString errorMsg);
 
 private slots:
     void _cleanupStaleVehicles(void);