chris/js8call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added azimuth to the distance column

Browse Source
This commit is contained in:
Jordan Sherer 2018-11-06 17:28:21 -05:00
parent db704858e2
commit b2fb3f31ac
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mainwindow.cpp
View File

@ -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(); QString grid = value.trimmed();
if(grid.isEmpty() || grid.length() < 4){ if(grid.isEmpty() || grid.length() < 4){
@ -5665,13 +5665,15 @@ QString MainWindow::calculateDistance(QString const& value, int *pDistance)
const_cast <char *> ((grid + " ").left (6).toLatin1().constData()),&utch, const_cast <char *> ((grid + " ").left (6).toLatin1().constData()),&utch,
&nAz,&nEl,&nDmiles,&nDkm,&nHotAz,&nHotABetter,6,6); &nAz,&nEl,&nDmiles,&nDkm,&nHotAz,&nHotABetter,6,6);
if(pAzimuth) *pAzimuth = nAz;
if(m_config.miles()){ if(m_config.miles()){
if(pDistance) *pDistance = nDmiles; if(pDistance) *pDistance = nDmiles;
return QString("%1 mi").arg(nDmiles); return QString("%1 mi / %2°").arg(nDmiles).arg(nAz);
} }
if(pDistance) *pDistance = nDkm; 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 // this function is called by auto_tx_mode, which is called by autoButton.clicked

2
mainwindow.h
View File

@ -307,7 +307,7 @@ private slots:
void unpauseHeartbeat(); void unpauseHeartbeat();
void checkHeartbeat(); void checkHeartbeat();
void prepareHeartbeat(); 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_driftSpinBox_valueChanged(int n);
void on_driftSyncButton_clicked(); void on_driftSyncButton_clicked();
void on_driftSyncEndButton_clicked(); void on_driftSyncEndButton_clicked();