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

Updated log window to maintain contents if the call selected does not change

Browse Source
This commit is contained in:
Jordan Sherer 2019-06-05 14:19:31 -04:00
parent 4334bffa25
commit 27cdd98cb7
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
logqso.cpp
View File

@ -56,6 +56,10 @@ bool LogQSO::acceptText(QString text){
return true; return true;
} }
QString LogQSO::currentCall(){
return ui->call->text().trimmed();
}
void LogQSO::on_start_now_button_pressed(){ void LogQSO::on_start_now_button_pressed(){
ui->start_date_time->setDateTime(DriftingDateTime::currentDateTimeUtc()); ui->start_date_time->setDateTime(DriftingDateTime::currentDateTimeUtc());
} }
@ -296,6 +300,8 @@ void LogQSO::accept()
} }
//Clean up and finish logging //Clean up and finish logging
ui->call->clear();
Q_EMIT acceptQSO (m_dateTimeOff, hisCall, hisGrid, m_dialFreq, mode, submode, rptSent, rptRcvd, comments, name,m_dateTimeOn, operator_call, m_myCall, m_myGrid, ADIF, additionalFields); Q_EMIT acceptQSO (m_dateTimeOff, hisCall, hisGrid, m_dialFreq, mode, submode, rptSent, rptRcvd, comments, name,m_dateTimeOn, operator_call, m_myCall, m_myGrid, ADIF, additionalFields);
QDialog::accept(); QDialog::accept();

1
logqso.h
View File

@ -38,6 +38,7 @@ public:
public slots: public slots:
void accept(); void accept();
bool acceptText(QString text); bool acceptText(QString text);
QString currentCall();
signals: signals:
void acceptQSO (QDateTime const& QSO_date_off, QString const& call, QString const& grid void acceptQSO (QDateTime const& QSO_date_off, QString const& call, QString const& grid

6
mainwindow.cpp
View File

@ -6627,6 +6627,12 @@ void MainWindow::on_logQSOButton_clicked() //Log QSO button
QString comments = ui->textEditRX->textCursor().selectedText(); QString comments = ui->textEditRX->textCursor().selectedText();
// don't reset the log window if the call hasn't changed.
if(!m_logDlg->currentCall().isEmpty() && call.trimmed() == m_logDlg->currentCall()){
m_logDlg->show();
return;
}
m_logDlg->initLogQSO (call.trimmed(), grid.trimmed(), m_modeTx == "FT8" ? "JS8" : m_modeTx, m_rptSent, m_rptRcvd, m_logDlg->initLogQSO (call.trimmed(), grid.trimmed(), m_modeTx == "FT8" ? "JS8" : m_modeTx, m_rptSent, m_rptRcvd,
m_dateTimeQSOOn, dateTimeQSOOff, m_freqNominal + ui->TxFreqSpinBox->value(), m_dateTimeQSOOn, dateTimeQSOOff, m_freqNominal + ui->TxFreqSpinBox->value(),
m_config.my_callsign(), m_config.my_grid(), m_config.my_callsign(), m_config.my_grid(),