diff --git a/mainwindow.cpp b/mainwindow.cpp index 2ceb79d..e4f13f0 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -5651,7 +5651,7 @@ void MainWindow::prepareHeartbeat(){ -QString MainWindow::calculateDistance(QString const& value, int *pDistance) +QString MainWindow::calculateDistance(QString const& value, int *pDistance, int *pAzimuth) { QString grid = value.trimmed(); if(grid.isEmpty() || grid.length() < 4){ @@ -5665,13 +5665,15 @@ QString MainWindow::calculateDistance(QString const& value, int *pDistance) const_cast ((grid + " ").left (6).toLatin1().constData()),&utch, &nAz,&nEl,&nDmiles,&nDkm,&nHotAz,&nHotABetter,6,6); + if(pAzimuth) *pAzimuth = nAz; + if(m_config.miles()){ if(pDistance) *pDistance = nDmiles; - return QString("%1 mi").arg(nDmiles); + return QString("%1 mi / %2°").arg(nDmiles).arg(nAz); } if(pDistance) *pDistance = nDkm; - return QString("%1 km").arg(nDkm); + return QString("%1 km / %2°").arg(nDkm).arg(nAz); } // this function is called by auto_tx_mode, which is called by autoButton.clicked diff --git a/mainwindow.h b/mainwindow.h index be9e53e..1e796c0 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -307,7 +307,7 @@ private slots: void unpauseHeartbeat(); void checkHeartbeat(); void prepareHeartbeat(); - QString calculateDistance(QString const& grid, int *pDistance=nullptr); + QString calculateDistance(QString const& grid, int *pDistance=nullptr, int *pAzimuth=nullptr); void on_driftSpinBox_valueChanged(int n); void on_driftSyncButton_clicked(); void on_driftSyncEndButton_clicked();