w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-12-24 11:40:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

Patch from W9MDB: fixes QSO start times in certain situations.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7804 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2017-07-07 13:13:22 +00:00
parent 51f42eee6c
commit d77ce86ddb
2 changed files with 63 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
mainwindow.cpp
View File

@ -1657,6 +1657,7 @@ void MainWindow::on_autoButton_clicked (bool checked)
} }
ui->sbTxPercent->setPalette(palette); ui->sbTxPercent->setPalette(palette);
} }
set_dateTimeQSO(-1);
} }
void MainWindow::auto_tx_mode (bool state) void MainWindow::auto_tx_mode (bool state)
@ -3433,67 +3434,95 @@ void MainWindow::on_txrb1_toggled(bool status)
// if Tx 1 is clicked we won't use it so reset to default // if Tx 1 is clicked we won't use it so reset to default
// We may hang on this message for quite a while trying // We may hang on this message for quite a while trying
// to get a response perhaps when another QSO is going on // to get a response perhaps when another QSO is going on
if (status) set_dateTimeQSO(-1); if (status) {
m_ntx=1;
}
} }
void MainWindow::on_txrb2_toggled(bool status) void MainWindow::on_txrb2_toggled(bool status)
{ {
// Tx 2 means we already have CQ'd so good reference // Tx 2 means we already have CQ'd so good reference
if (status) set_dateTimeQSO(m_ntx); if (status) {
m_ntx=2;
set_dateTimeQSO(m_ntx);
}
} }
void MainWindow::on_txrb3_toggled(bool status) void MainWindow::on_txrb3_toggled(bool status)
{ {
// Tx 3 means we should havel already have done Tx 1 so good reference // Tx 3 means we should havel already have done Tx 1 so good reference
if (status) set_dateTimeQSO(m_ntx); if (status) {
m_ntx=3;
set_dateTimeQSO(m_ntx);
}
} }
void MainWindow::on_txb1_clicked() //txb1 void MainWindow::on_txrb4_toggled(bool status)
{ {
m_ntx=1; if (status) {
ui->txrb1->setChecked(true); m_ntx=4;
if (m_transmitting) m_restart=true; }
} }
void MainWindow::on_txb2_clicked() //txb2 void MainWindow::on_txrb5_toggled(bool status)
{ {
m_ntx=2; if (status) {
ui->txrb2->setChecked(true); m_ntx=5;
if (m_transmitting) m_restart=true; }
} }
void MainWindow::on_txb3_clicked() //txb3 void MainWindow::on_txrb6_toggled(bool status)
{ {
m_ntx=3; if (status) {
ui->txrb3->setChecked(true); m_ntx=6;
if (m_transmitting) m_restart=true; if (ui->txrb6->text().contains("CQ ")) set_dateTimeQSO(-1);
}
} }
void MainWindow::on_txb4_clicked() //txb4 void MainWindow::on_txb1_clicked()
{ {
m_ntx=4; m_ntx=1;
ui->txrb4->setChecked(true); ui->txrb1->setChecked(true);
if (m_transmitting) m_restart=true; if (m_transmitting) m_restart=true;
} }
void MainWindow::on_txb5_clicked() //txb5 void MainWindow::on_txb2_clicked()
{ {
m_ntx=5; m_ntx=2;
ui->txrb5->setChecked(true); ui->txrb2->setChecked(true);
if (m_transmitting) m_restart=true; if (m_transmitting) m_restart=true;
} }
void MainWindow::on_txb6_clicked() //txb6 void MainWindow::on_txb3_clicked()
{ {
m_ntx=6; m_ntx=3;
ui->txrb6->setChecked(true); ui->txrb3->setChecked(true);
if (m_transmitting) m_restart=true; if (m_transmitting) m_restart=true;
if (ui->txrb6->text().contains("CQ")) set_dateTimeQSO(-1); }
void MainWindow::on_txb4_clicked()
{
m_ntx=4;
ui->txrb4->setChecked(true);
if (m_transmitting) m_restart=true;
}
void MainWindow::on_txb5_clicked()
{
m_ntx=5;
ui->txrb5->setChecked(true);
if (m_transmitting) m_restart=true;
}
void MainWindow::on_txb6_clicked()
{
m_ntx=6;
ui->txrb6->setChecked(true);
if (m_transmitting) m_restart=true;
} }
void MainWindow::doubleClickOnCall2(bool shift, bool ctrl) void MainWindow::doubleClickOnCall2(bool shift, bool ctrl)
{ {
set_dateTimeQSO(-1); // reset our QSO start time
m_decodedText2=true; m_decodedText2=true;
doubleClickOnCall(shift,ctrl); doubleClickOnCall(shift,ctrl);
m_decodedText2=false; m_decodedText2=false;
@ -4256,7 +4285,7 @@ void MainWindow::acceptQSO2(QDateTime const& QSO_date_off, QString const& call,
, QString const& tx_power, QString const& comments , QString const& tx_power, QString const& comments
, QString const& name, QDateTime const& QSO_date_on) , QString const& name, QDateTime const& QSO_date_on)
{ {
QString date = m_dateTimeQSOOn.toString("yyyyMMdd"); QString date = QSO_date_on.toString("yyyyMMdd");
m_logBook.addAsWorked (m_hisCall, m_config.bands ()->find (m_freqNominal), m_modeTx, date); m_logBook.addAsWorked (m_hisCall, m_config.bands ()->find (m_freqNominal), m_modeTx, date);
m_messageClient->qso_logged (QSO_date_off, call, grid, dial_freq, mode, rpt_sent, rpt_received, tx_power, comments, name, QSO_date_on); m_messageClient->qso_logged (QSO_date_off, call, grid, dial_freq, mode, rpt_sent, rpt_received, tx_power, comments, name, QSO_date_on);

5
mainwindow.h
View File

@ -152,13 +152,16 @@ private slots:
void decode(); void decode();
void decodeBusy(bool b); void decodeBusy(bool b);
void on_EraseButton_clicked(); void on_EraseButton_clicked();
void on_txb1_clicked();
void on_txFirstCheckBox_stateChanged(int arg1); void on_txFirstCheckBox_stateChanged(int arg1);
void set_dateTimeQSO(int m_ntx); void set_dateTimeQSO(int m_ntx);
void set_ntx(int n); void set_ntx(int n);
void on_txrb1_toggled(bool status); void on_txrb1_toggled(bool status);
void on_txrb2_toggled(bool status); void on_txrb2_toggled(bool status);
void on_txrb3_toggled(bool status); void on_txrb3_toggled(bool status);
void on_txrb4_toggled(bool status);
void on_txrb5_toggled(bool status);
void on_txrb6_toggled(bool status);
void on_txb1_clicked();
void on_txb2_clicked(); void on_txb2_clicked();
void on_txb3_clicked(); void on_txb3_clicked();
void on_txb4_clicked(); void on_txb4_clicked();