Added distance to the calls list

This commit is contained in:
Jordan Sherer 2018-07-07 22:02:11 -04:00
parent 50094fd8a9
commit 7255728049
4 changed files with 32 additions and 6 deletions

View File

@ -225,7 +225,7 @@
<item row="1" column="0"> <item row="1" column="0">
<widget class="QCheckBox" name="miles_check_box"> <widget class="QCheckBox" name="miles_check_box">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>true</bool>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Show distance to DX station in miles rather than kilometers.</string> <string>Show distance to DX station in miles rather than kilometers.</string>

View File

@ -199,16 +199,16 @@ namespace
int days = delta; int days = delta;
if(days){ if(days){
return QString("%1 d").arg(days); return QString("%1d").arg(days);
} }
if(hours){ if(hours){
return QString("%1 h").arg(hours); return QString("%1h").arg(hours);
} }
if(minutes){ if(minutes){
return QString("%1 m").arg(minutes); return QString("%1m").arg(minutes);
} }
if(seconds){ if(seconds){
return QString("%1 s").arg(seconds - seconds%15); return QString("%1s").arg(seconds - seconds%15);
} }
return QString {}; return QString {};
@ -5443,6 +5443,23 @@ void MainWindow::prepareBeacon(){
scheduleBeacon(); scheduleBeacon();
} }
QString MainWindow::calculateDistance(QString const& grid)
{
qint64 nsec = (QDateTime::currentMSecsSinceEpoch()/1000) % 86400;
double utch=nsec/3600.0;
int nAz,nEl,nDmiles,nDkm,nHotAz,nHotABetter;
azdist_(const_cast <char *> ((m_config.my_grid () + " ").left (6).toLatin1().constData()),
const_cast <char *> ((grid + " ").left (6).toLatin1().constData()),&utch,
&nAz,&nEl,&nDmiles,&nDkm,&nHotAz,&nHotABetter,6,6);
if(m_config.miles()){
return QString("%1 mi").arg(nDmiles);
}
return QString("%1 km").arg(nDkm);
}
// 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
void MainWindow::on_startTxButton_toggled(bool checked) void MainWindow::on_startTxButton_toggled(bool checked)
{ {
@ -7652,7 +7669,10 @@ void MainWindow::postDecode (bool is_new, QString const& message)
ui->tableWidgetCalls->insertRow(ui->tableWidgetCalls->rowCount()); ui->tableWidgetCalls->insertRow(ui->tableWidgetCalls->rowCount());
ui->tableWidgetCalls->setItem(ui->tableWidgetCalls->rowCount() - 1, 0, new QTableWidgetItem(call)); ui->tableWidgetCalls->setItem(ui->tableWidgetCalls->rowCount() - 1, 0, new QTableWidgetItem(call));
ui->tableWidgetCalls->setItem(ui->tableWidgetCalls->rowCount() - 1, 1, new QTableWidgetItem(QString("(%1)").arg(since(d.utcTimestamp)))); ui->tableWidgetCalls->setItem(ui->tableWidgetCalls->rowCount() - 1, 1, new QTableWidgetItem(QString("(%1)").arg(since(d.utcTimestamp))));
//ui->tableWidgetCalls->setItem(ui->tableWidgetCalls->rowCount() - 1, 1, new QTableWidgetItem(d.grid));
auto distanceItem = new QTableWidgetItem(calculateDistance(d.grid));
distanceItem->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
ui->tableWidgetCalls->setItem(ui->tableWidgetCalls->rowCount() - 1, 2, distanceItem);
if(call == selectedCall){ if(call == selectedCall){
ui->tableWidgetCalls->selectRow(ui->tableWidgetCalls->rowCount() - 1); ui->tableWidgetCalls->selectRow(ui->tableWidgetCalls->rowCount() - 1);

View File

@ -255,6 +255,7 @@ private slots:
int findFreeFreqOffset(int fmin, int fmax, int bw); int findFreeFreqOffset(int fmin, int fmax, int bw);
void scheduleBeacon(bool first=false); void scheduleBeacon(bool first=false);
void prepareBeacon(); void prepareBeacon();
QString calculateDistance(QString const& grid);
void on_rptSpinBox_valueChanged(int n); void on_rptSpinBox_valueChanged(int n);
void killFile(); void killFile();
void on_tuneButton_clicked (bool); void on_tuneButton_clicked (bool);

View File

@ -936,6 +936,11 @@ QTextEdit[readOnly=&quot;true&quot;] {
<string>Age</string> <string>Age</string>
</property> </property>
</column> </column>
<column>
<property name="text">
<string>Distance</string>
</property>
</column>
</widget> </widget>
</widget> </widget>
<widget class="QWidget" name="macroHorizonalWidget" native="true"> <widget class="QWidget" name="macroHorizonalWidget" native="true">