diff --git a/logqso.cpp b/logqso.cpp index e213ba0c8..67946daec 100644 --- a/logqso.cpp +++ b/logqso.cpp @@ -23,6 +23,10 @@ void LogQSO::initLogQSO(QString hisCall, QString hisGrid, QString mode, { ui->call->setText(hisCall); ui->grid->setText(hisGrid); + ui->txPower->setText(""); + ui->comments->setText(""); + if(m_saveTxPower) ui->txPower->setText(m_txPower); + if(m_saveComments) ui->comments->setText(m_comments); if(dBtoComments) { QString t=mode; if(rptSent!="") t+=" Sent: " + rptSent; @@ -70,6 +74,8 @@ void LogQSO::initLogQSO(QString hisCall, QString hisGrid, QString mode, if(dialFreq>47000.0 and dialFreq<47200.0) band="6mm"; if(dialFreq>75500.0 and dialFreq<81000.0) band="4mm"; ui->band->setText(band); + ui->cbTxPower->setChecked(m_saveTxPower); + ui->cbComments->setChecked(m_saveComments); } void LogQSO::accept() @@ -87,10 +93,12 @@ void LogQSO::accept() time=ui->time->text(); band=ui->band->text(); name=ui->name->text(); + m_txPower=ui->txPower->text(); comments=ui->comments->text(); + m_comments=comments; QString strDialFreq(QString::number(m_dialFreq,'f',6)); -//Log this QSO to file wsjtx_log.adi +//Log this QSO to file "wsjtx_log.adi" QFile f2("wsjtx_log.adi"); if(!f2.open(QIODevice::Text | QIODevice::Append)) { QMessageBox m; @@ -114,6 +122,8 @@ void LogQSO::accept() m_myCall; t+=" " + m_myGrid; + if(m_txPower!="") t+= " " + m_txPower; if(comments!="") t+=" " + comments; if(name!="") t+=" 0 0 - 424 - 283 + 372 + 305 + + + 16777215 + 16777215 + + Log QSO - - - - 30 - 240 - 341 - 32 - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - 10 - 0 - 401 - 231 - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - 10 - - - - Click OK to confirm the following QSO: - - - - - - - Qt::Vertical - - - - 20 - 20 - - - - - - - - - - - 0 - 0 - - - - - 70 - 0 - - - - - 70 - 16777215 - - - - - 10 - - - - Call - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 100 - 0 - - - - - 100 - 16777215 - - - - - 10 - - - - Date - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 50 - 0 - - - - - 50 - 16777215 - - - - - 10 - - - - Time - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 50 - 0 - - - - - 50 - 16777215 - - - - - 10 - - - - Mode - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 50 - 0 - - - - - 50 - 16777215 - - - - - 10 - - - - Band - - - Qt::AlignCenter - - - - - - - - - - - - 0 - 0 - - - - - 70 - 0 - - - - - 70 - 16777215 - - - - - - - - - 0 - 0 - - - - - 100 - 0 - - - - - 100 - 16777215 - - - - - - - - - 50 - 0 - - - - - 50 - 16777215 - - - - - - - - - 0 - 0 - - - - - 50 - 0 - - - - - 50 - 16777215 - - - - - - - - - 0 - 0 - - - - - 50 - 0 - - - - - 50 - 16777215 - - - - - - - - - - Qt::Vertical - - - - 20 - 20 - - - - - - - - - - - 0 - 0 - - - - - 50 - 0 - - - - - 50 - 16777215 - - - - - 10 - - - - Rpt Sent - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 50 - 0 - - - - - 50 - 16777215 - - - - - 10 - - - - Rpt Rcvd - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - - 50 - 0 - - - - - 50 - 16777215 - - - - - 10 - - - - Grid - - - Qt::AlignCenter - - - - - - - true - - - - 0 - 0 - - - - - 100 - 0 - - - - - 100 - 16777215 - - - - - 10 - - - - Name - - - Qt::AlignCenter - - - - - - - - - - - - 0 - 0 - - - - - 50 - 0 - - - - - 50 - 16777215 - - - - - - - - - 0 - 0 - - - - - 50 - 0 - - - - - 50 - 16777215 - - - - - - - - - 0 - 0 - - - - - 50 - 0 - - - - - 50 - 16777215 - - - - - - - - true - - - - 0 - 0 - - - - - 100 - 0 - - - - - 100 - 16777215 - - - - - - - - - - Qt::Vertical - - - - 20 - 20 - - - - - - - - - - true - - - - 10 - - - - Comments - - - - - - - true - - - - - - - + + + + + + + Qt::Vertical + + + QSizePolicy::MinimumExpanding + + + + 20 + 10 + + + + + + + + + 10 + + + + Click OK to confirm the following QSO: + + + + + + + Qt::Vertical + + + QSizePolicy::MinimumExpanding + + + + 20 + 10 + + + + + + + + + + + 0 + 0 + + + + + 70 + 0 + + + + + 70 + 16777215 + + + + + 10 + + + + Call + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 100 + 0 + + + + + 100 + 16777215 + + + + + 10 + + + + Date + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 50 + 0 + + + + + 50 + 16777215 + + + + + 10 + + + + Time + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 50 + 0 + + + + + 50 + 16777215 + + + + + 10 + + + + Mode + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 50 + 0 + + + + + 50 + 16777215 + + + + + 10 + + + + Band + + + Qt::AlignCenter + + + + + + + + + + + + 0 + 0 + + + + + 70 + 0 + + + + + 70 + 16777215 + + + + + + + + + 0 + 0 + + + + + 100 + 0 + + + + + 100 + 16777215 + + + + + + + + + 50 + 0 + + + + + 50 + 16777215 + + + + + + + + + 0 + 0 + + + + + 50 + 0 + + + + + 50 + 16777215 + + + + + + + + + 0 + 0 + + + + + 50 + 0 + + + + + 50 + 16777215 + + + + + + + + + + Qt::Vertical + + + QSizePolicy::MinimumExpanding + + + + 20 + 10 + + + + + + + + + + + 0 + 0 + + + + + 50 + 0 + + + + + 50 + 16777215 + + + + + 10 + + + + Rpt Sent + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 50 + 0 + + + + + 50 + 16777215 + + + + + 10 + + + + Rpt Rcvd + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + + 50 + 0 + + + + + 50 + 16777215 + + + + + 10 + + + + Grid + + + Qt::AlignCenter + + + + + + + true + + + + 0 + 0 + + + + + 100 + 0 + + + + + 100 + 16777215 + + + + + 10 + + + + Name + + + Qt::AlignCenter + + + + + + + + + + + + 0 + 0 + + + + + 50 + 0 + + + + + 50 + 16777215 + + + + + + + + + 0 + 0 + + + + + 50 + 0 + + + + + 50 + 16777215 + + + + + + + + + 0 + 0 + + + + + 50 + 0 + + + + + 50 + 16777215 + + + + + + + + true + + + + 0 + 0 + + + + + 100 + 0 + + + + + 100 + 16777215 + + + + + + + + + + Qt::Vertical + + + QSizePolicy::MinimumExpanding + + + + 20 + 10 + + + + + + + + + + + 65 + 0 + + + + Tx power + + + + + + + + + + Retain + + + + + + + + + Qt::Vertical + + + QSizePolicy::MinimumExpanding + + + + 20 + 10 + + + + + + + + + + true + + + + 65 + 0 + + + + + 10 + + + + Comments + + + + + + + true + + + + + + + Retain + + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + diff --git a/mainwindow.cpp b/mainwindow.cpp index 0d28e530e..ff8fda987 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,4 +1,4 @@ -//--------------------------------------------------------------- MainWindow +//-------------------------------------------------------------- MainWindow #include "mainwindow.h" #include "ui_mainwindow.h" #include "devsetup.h" @@ -418,6 +418,10 @@ void MainWindow::writeSettings() settings.setValue("Polling",m_poll); settings.setValue("OutBufSize",outBufSize); settings.setValue("LockTxFreq",m_lockTxFreq); + settings.setValue("SaveTxPower",m_saveTxPower); + settings.setValue("SaveComments",m_saveComments); + settings.setValue("TxPower",m_txPower); + settings.value("LogComments",m_logComments); settings.endGroup(); } @@ -543,6 +547,10 @@ void MainWindow::readSettings() outBufSize=settings.value("OutBufSize",4096).toInt(); m_lockTxFreq=settings.value("LockTxFreq",false).toBool(); ui->actionLockTxFreq->setChecked(m_lockTxFreq); + m_saveTxPower=settings.value("SaveTxPower",false).toBool(); + m_saveComments=settings.value("SaveComments",false).toBool(); + m_txPower=settings.value("TxPower","").toString(); + m_logComments=settings.value("LogComments","").toString(); settings.endGroup(); if(!ui->actionLinrad->isChecked() && !ui->actionCuteSDR->isChecked() && @@ -2342,6 +2350,10 @@ void MainWindow::on_logQSOButton_clicked() //Log QSO button m_dateTimeQSO=QDateTime::currentDateTimeUtc(); logDlg = new LogQSO(0); + logDlg->m_saveTxPower=m_saveTxPower; + logDlg->m_saveComments=m_saveComments; + logDlg->m_txPower=m_txPower; + logDlg->m_comments=m_logComments; logDlg->initLogQSO(m_hisCall,m_hisGrid,m_mode,m_rptSent,m_rptRcvd, m_dateTimeQSO,m_dialFreq,m_myCall,m_myGrid, m_noSuffix,m_toRTTY,m_dBtoComments); @@ -2354,6 +2366,10 @@ void MainWindow::acceptQSO2(bool accepted) { if(accepted) { m_logQSOgeom=logDlg->geometry(); + m_saveTxPower=logDlg->m_saveTxPower; + m_saveComments=logDlg->m_saveComments; + m_txPower=logDlg->m_txPower; + m_logComments=logDlg->m_comments; if(m_clearCallGrid) { m_hisCall=""; ui->dxCallEntry->setText(""); diff --git a/mainwindow.h b/mainwindow.h index 12d752ddb..49a50a237 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -258,6 +258,8 @@ private: bool m_pttData; bool m_dontReadFreq; bool m_lockTxFreq; + bool m_saveTxPower; + bool m_saveComments; char m_decoded[80]; @@ -318,6 +320,8 @@ private: QString m_msgSent0; QString m_fileToSave; QString m_QSOmsg; + QString m_txPower; + QString m_logComments; QStringList m_macro; QStringList m_dFreq;