diff --git a/Configuration.cpp b/Configuration.cpp index e484772..22a98c0 100644 --- a/Configuration.cpp +++ b/Configuration.cpp @@ -559,8 +559,8 @@ private: QColor next_color_CQ_; QColor color_MyCall_; QColor next_color_MyCall_; - QColor color_TxMsg_; - QColor next_color_TxMsg_; + QColor color_ReceivedMsg_; + QColor next_color_ReceivedMsg_; QColor color_DXCC_; QColor next_color_DXCC_; QColor color_NewCall_; @@ -660,7 +660,7 @@ bool Configuration::use_dynamic_grid() const {return m_->use_dynamic_info_; } QString Configuration::my_callsign () const {return m_->my_callsign_;} QColor Configuration::color_CQ () const {return m_->color_CQ_;} QColor Configuration::color_MyCall () const {return m_->color_MyCall_;} -QColor Configuration::color_TxMsg () const {return m_->color_TxMsg_;} +QColor Configuration::color_ReceivedMsg () const {return m_->color_ReceivedMsg_;} QColor Configuration::color_DXCC () const {return m_->color_DXCC_;} QColor Configuration::color_NewCall () const {return m_->color_NewCall_;} QFont Configuration::text_font () const {return m_->font_;} @@ -1243,7 +1243,7 @@ void Configuration::impl::initialize_models () ui_->use_dynamic_grid->setChecked(use_dynamic_info_); ui_->labCQ->setStyleSheet(QString("background: %1").arg(color_CQ_.name())); ui_->labMyCall->setStyleSheet(QString("background: %1").arg(color_MyCall_.name())); - ui_->labTx->setStyleSheet(QString("background: %1").arg(color_TxMsg_.name())); + ui_->labTx->setStyleSheet(QString("background: %1").arg(color_ReceivedMsg_.name())); ui_->labDXCC->setStyleSheet(QString("background: %1").arg(color_DXCC_.name())); ui_->labNewCall->setStyleSheet(QString("background: %1").arg(color_NewCall_.name())); ui_->CW_id_interval_spin_box->setValue (id_interval_); @@ -1369,7 +1369,7 @@ void Configuration::impl::read_settings () my_qth_ = settings_->value("MyQTH", QString {}).toString(); next_color_CQ_ = color_CQ_ = settings_->value("colorCQ","#66ff66").toString(); next_color_MyCall_ = color_MyCall_ = settings_->value("colorMyCall","#ff6666").toString(); - next_color_TxMsg_ = color_TxMsg_ = settings_->value("colorTxMsg","#ffff00").toString(); + next_color_ReceivedMsg_ = color_ReceivedMsg_ = settings_->value("colorReceivedMsg","#ffeaa7").toString(); next_color_DXCC_ = color_DXCC_ = settings_->value("colorDXCC","#ff00ff").toString(); next_color_NewCall_ = color_NewCall_ = settings_->value("colorNewCall","#ffaaff").toString(); @@ -1562,7 +1562,7 @@ void Configuration::impl::write_settings () settings_->setValue ("ActivityAging", activity_aging_); settings_->setValue("colorCQ",color_CQ_); settings_->setValue("colorMyCall",color_MyCall_); - settings_->setValue("colorTxMsg",color_TxMsg_); + settings_->setValue("colorReceivedMsg",color_ReceivedMsg_); settings_->setValue("colorDXCC",color_DXCC_); settings_->setValue("colorNewCall",color_NewCall_); settings_->setValue ("Font", font_.toString ()); @@ -1928,10 +1928,12 @@ void Configuration::impl::accept () color_CQ_ = next_color_CQ_; color_MyCall_ = next_color_MyCall_; - color_TxMsg_ = next_color_TxMsg_; + color_ReceivedMsg_ = next_color_ReceivedMsg_; color_DXCC_ = next_color_DXCC_; color_NewCall_ = next_color_NewCall_; + Q_EMIT self_->colors_changed(); + rig_params_ = temp_rig_params; // now we can go live with the rig // related configuration parameters rig_is_dummy_ = TransceiverFactory::basic_transceiver_name_ == rig_params_.rig_name; @@ -2145,7 +2147,7 @@ void Configuration::impl::on_font_push_button_clicked () void Configuration::impl::on_pbCQmsg_clicked() { - auto new_color = QColorDialog::getColor(next_color_CQ_, this, "CQ Messages Color"); + auto new_color = QColorDialog::getColor(next_color_CQ_, this, "CQ and BEACON Messages Color"); if (new_color.isValid ()) { next_color_CQ_ = new_color; @@ -2155,7 +2157,7 @@ void Configuration::impl::on_pbCQmsg_clicked() void Configuration::impl::on_pbMyCall_clicked() { - auto new_color = QColorDialog::getColor(next_color_MyCall_, this, "My Call Messages Color"); + auto new_color = QColorDialog::getColor(next_color_MyCall_, this, "Directed Messages Color"); if (new_color.isValid ()) { next_color_MyCall_ = new_color; @@ -2165,11 +2167,11 @@ void Configuration::impl::on_pbMyCall_clicked() void Configuration::impl::on_pbTxMsg_clicked() { - auto new_color = QColorDialog::getColor(next_color_TxMsg_, this, "Tx Messages Color"); + auto new_color = QColorDialog::getColor(next_color_ReceivedMsg_, this, "Received Messages Textarea Color"); if (new_color.isValid ()) { - next_color_TxMsg_ = new_color; - ui_->labTx->setStyleSheet(QString("background: %1").arg(next_color_TxMsg_.name())); + next_color_ReceivedMsg_ = new_color; + ui_->labTx->setStyleSheet(QString("background: %1").arg(next_color_ReceivedMsg_.name())); } } @@ -2196,7 +2198,7 @@ void Configuration::impl::on_pbNewCall_clicked() void Configuration::impl::on_decoded_text_font_push_button_clicked () { next_decoded_text_font_ = QFontDialog::getFont (0, decoded_text_font_ , this - , tr ("WSJT-X Decoded Text Font Chooser") + , tr ("Font Chooser") #if QT_VERSION >= 0x050201 , QFontDialog::MonospacedFonts #endif diff --git a/Configuration.hpp b/Configuration.hpp index b59f02e..79bd714 100644 --- a/Configuration.hpp +++ b/Configuration.hpp @@ -172,7 +172,7 @@ public: Type2MsgGen type_2_msg_gen () const; QColor color_CQ () const; QColor color_MyCall () const; - QColor color_TxMsg () const; + QColor color_ReceivedMsg () const; QColor color_DXCC () const; QColor color_NewCall () const; bool pwrBandTxMemory () const; @@ -267,6 +267,7 @@ public: // Q_SIGNAL void text_font_changed (QFont); Q_SIGNAL void decoded_text_font_changed (QFont); + Q_SIGNAL void colors_changed (); // // This signal is emitted when the UDP server changes diff --git a/Configuration.ui b/Configuration.ui index 2d8700b..efc4043 100644 --- a/Configuration.ui +++ b/Configuration.ui @@ -2453,17 +2453,26 @@ Right click for insert and delete options. 0 0 - 430 - 183 + 671 + 621 - + + + 0 + 0 + + + - - + + - - + + + + true + 80 @@ -2471,7 +2480,7 @@ Right click for insert and delete options. - QLabel{background-color: #66ff66} + QLabel{background-color: #ffeaa7} K1ABC @@ -2481,32 +2490,6 @@ Right click for insert and delete options. - - - - - 140 - 0 - - - - CQ in message - - - - - - - - 140 - 0 - - - - My Call in message - - - @@ -2526,8 +2509,21 @@ Right click for insert and delete options. - - + + + + + 140 + 0 + + + + CQ and BEACON + + + + + false @@ -2537,16 +2533,42 @@ Right click for insert and delete options. 0 + + false + - Transmitted message + New DXCC - - + + - false + true + + Set the font characteristics for the application. + + + UI Font... + + + + + + + + 140 + 0 + + + + Directed Message + + + + + 80 @@ -2554,7 +2576,7 @@ Right click for insert and delete options. - QLabel{background-color: yellow} + QLabel{background-color: #66ff66} K1ABC @@ -2564,7 +2586,67 @@ Right click for insert and delete options. - + + + + false + + + + 80 + 20 + + + + false + + + QLabel{background-color: #66ffff} + + + K1ABC + + + Qt::AlignCenter + + + + + + + true + + + + 140 + 0 + + + + Received Message Textarea + + + + + + + false + + + + 140 + 0 + + + + false + + + New Call + + + + false @@ -2575,6 +2657,9 @@ Right click for insert and delete options. 20 + + false + QLabel{background-color: #ff66ff} @@ -2587,422 +2672,305 @@ Right click for insert and delete options. - - - false + + + Qt::Vertical - + - 140 - 0 + 20 + 40 + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + 0 + 0 + 100 + 30 + + + + false + + + + + + false + + + Miscellaneous + + + + - New Call + Degrade S/N of .wav file: + + + sbDegrade + + + + + + + For offline sensitivity tests + + + dB + + + 1 + + + 1.000000000000000 - - - false - - - - 140 - 0 - - + - New DXCC + Receiver bandwidth: + + + sbBandwidth + + + + + + + For offline sensitivity tests + + + Hz + + + 6000 + + + 100 + + + 2500 + + + + + + + Tx delay: + + + sbTxDelay - + + + Minimum delay between assertion of PTT and start of Tx audio. + + + s + + + 1 + + + 0.000000000000000 + + + 0.500000000000000 + + + 0.100000000000000 + + + + + + + <html><head/><body><p>Generate Tx audio with twice the normal tone spacing. Intended for special LF/MF transmitters that use a divide-by-2 before generating RF.</p></body></html> + + + x 2 Tone Spacing + + + + + false - - - 80 - 20 - - - - QLabel{background-color: #66ffff} + + <html><head/><body><p>Generate Tx audio with four times the normal tone spacing. Intended for special LF/MF transmitters that use a divide-by-4 before generating RF.</p></body></html> - K1ABC - - - Qt::AlignCenter + x 4 Tone Spacing - - - - - Qt::Vertical - - - - 0 - 0 - - - - - - - - Qt::Horizontal - - - - 0 - 0 - - - - - - - - Qt::Vertical - - - - 0 - 0 - - - - - - - - Qt::Horizontal - - - - 0 - 0 - - - - - - - - - - - - true - - - Set the font characteristics for the application. - - - UI Font... - - - - - - - false - - - Set the font characteristics for the Band Activity and Rx Frequency areas. - - - Message Text Font... - - - - - - - Qt::Vertical - - - - 0 - 0 - - - - - - - - - - false - - - - - - false - - - Miscellaneous - - - - - - Degrade S/N of .wav file: - - - sbDegrade - - - - - - - For offline sensitivity tests - - - dB - - - 1 - - - 1.000000000000000 - - - - - - - Receiver bandwidth: - - - sbBandwidth - - - - - - - For offline sensitivity tests - - - Hz - - - 6000 - - - 100 - - - 2500 - - - - - - - Tx delay: - - - sbTxDelay - - - - - - - Minimum delay between assertion of PTT and start of Tx audio. - - - s - - - 1 - - - 0.000000000000000 - - - 0.500000000000000 - - - 0.100000000000000 - - - - - - - <html><head/><body><p>Generate Tx audio with twice the normal tone spacing. Intended for special LF/MF transmitters that use a divide-by-2 before generating RF.</p></body></html> - - - x 2 Tone Spacing - - - - - - - false - - - <html><head/><body><p>Generate Tx audio with four times the normal tone spacing. Intended for special LF/MF transmitters that use a divide-by-4 before generating RF.</p></body></html> - - - x 4 Tone Spacing - - - - - - - - - - false - - - <html><head/><body><p>User-selectable parameters for JT65 VHF/UHF/Microwave decoding.</p></body></html> - - - JT65 VHF/UHF/Microwave decoding parameters - - - - - - Random erasure patterns: - - - sbNtrials - - - - - - - <html><head/><body><p>Maximum number of erasure patterns for stochastic soft-decision Reed Solomon decoder is 10^(n/2).</p></body></html> - - - 0 - - - 12 - - - 6 - - - - - - - Aggressive decoding level: - - - sbAggressive - - - - - - - <html><head/><body><p>Higher levels will increase the probability of decoding, but will also increase probability of a false decode.</p></body></html> - - - 10 - - - - - - - Two-pass decoding - - - true - - - - - - - - - - Qt::Vertical - - - - 0 - 0 - - - - - - - - false - - - - 0 - 50 - - - - FT8 DXpedition mode - - - - - 9 - 10 - 231 - 31 - + + + + + + false + + + <html><head/><body><p>User-selectable parameters for JT65 VHF/UHF/Microwave decoding.</p></body></html> + + + JT65 VHF/UHF/Microwave decoding parameters + + + + + + Random erasure patterns: + + + sbNtrials - - - - - Fox is the DXpedition station - - - Fox - - - - - - - Everybody else is a Hound - - - Hound - - - - - - - - - - + + + + + <html><head/><body><p>Maximum number of erasure patterns for stochastic soft-decision Reed Solomon decoder is 10^(n/2).</p></body></html> + + + 0 + + + 12 + + + 6 + + + + + + + Aggressive decoding level: + + + sbAggressive + + + + + + + <html><head/><body><p>Higher levels will increase the probability of decoding, but will also increase probability of a false decode.</p></body></html> + + + 10 + + + + + + + Two-pass decoding + + + true + + + + + + + + + + Qt::Vertical + + + + 0 + 0 + + + + + + + + false + + + + 0 + 50 + + + + FT8 DXpedition mode + + + + + 9 + 10 + 231 + 31 + + + + + + + Fox is the DXpedition station + + + Fox + + + + + + + Everybody else is a Hound + + + Hound + + + + + + + + + @@ -3035,8 +3003,6 @@ soundcard changes miles_check_box TX_messages_check_box DXCC_check_box - font_push_button - decoded_text_font_push_button monitor_off_check_box monitor_last_used_check_box quick_call_check_box diff --git a/displaytext.cpp b/displaytext.cpp index a31cf9b..992bb09 100644 --- a/displaytext.cpp +++ b/displaytext.cpp @@ -277,7 +277,7 @@ void DisplayText::displayDecodedText(DecodedText const& decodedText, QString con void DisplayText::displayTransmittedText(QString text, QString modeTx, qint32 txFreq, - QColor color_TxMsg, bool bFastMode) + QColor color_ReceivedMsg, bool bFastMode) { QString t1=" @ "; if(modeTx=="FT8") t1=" ~ "; @@ -297,7 +297,7 @@ void DisplayText::displayTransmittedText(QString text, QString modeTx, qint32 tx t = QDateTime::currentDateTimeUtc().toString("hhmm") + \ " Tx " + t2 + t1 + text; } - appendText (t, color_TxMsg); + appendText (t, color_ReceivedMsg); } void DisplayText::displayQSY(QString text) diff --git a/displaytext.h b/displaytext.h index 0f1ef01..1dea811 100644 --- a/displaytext.h +++ b/displaytext.h @@ -26,7 +26,7 @@ public: LogBook const& logBook, QColor color_CQ, QColor color_MyCall, QColor color_DXCC, QColor color_NewCall, bool ppfx, bool bCQonly=false); void displayTransmittedText(QString text, QString modeTx, qint32 txFreq, - QColor color_TxMsg, bool bFastMode); + QColor color_ReceivedMsg, bool bFastMode); void displayQSY(QString text); void displayFoxToBeCalled(QString t, QColor bg); diff --git a/mainwindow.cpp b/mainwindow.cpp index eebaf96..c25bdf2 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -628,6 +628,9 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple, connect (&m_config, &Configuration::decoded_text_font_changed, [this] (QFont const& font) { setDecodedTextFont (font); }); + connect (&m_config, &Configuration::colors_changed, [this](){ + ui->textEditRX->setStyleSheet(QString("background: %1").arg(m_config.color_ReceivedMsg().name())); + }); setWindowTitle (program_title ()); @@ -1599,6 +1602,7 @@ void MainWindow::readSettings() //ui->bandHorizontalWidget->setGeometry( m_settings->value("PanelWaterfallGeometry", ui->bandHorizontalWidget->geometry()).toRect()); //qDebug() << m_settings->value("PanelTopGeometry") << ui->extFreeTextMsg; + ui->textEditRX->setStyleSheet(QString("background: %1").arg(m_config.color_ReceivedMsg().name())); { auto const& coeffs = m_settings->value ("PhaseEqualizationCoefficients" @@ -4186,7 +4190,7 @@ void MainWindow::guiUpdate() write_transmit_entry ("ALL.TXT"); if (m_config.TX_messages ()) { ui->decodedTextBrowser2->displayTransmittedText(m_currentMessage,m_modeTx, - ui->TxFreqSpinBox->value(),m_config.color_TxMsg(),m_bFastMode); + ui->TxFreqSpinBox->value(),m_config.color_ReceivedMsg(),m_bFastMode); } } @@ -4290,7 +4294,7 @@ void MainWindow::guiUpdate() if (m_config.TX_messages () && !m_tune && !m_config.bFox()) { ui->decodedTextBrowser2->displayTransmittedText(current_message, m_modeTx, - ui->TxFreqSpinBox->value(),m_config.color_TxMsg(),m_bFastMode); + ui->TxFreqSpinBox->value(),m_config.color_ReceivedMsg(),m_bFastMode); } switch (m_ntx) @@ -10459,7 +10463,7 @@ void MainWindow::foxGenWaveform(int i,QString fm) QString txModeArg; txModeArg.sprintf("FT8fox %d",i+1); ui->decodedTextBrowser2->displayTransmittedText(fm.trimmed(), txModeArg, - ui->TxFreqSpinBox->value()+60*i,m_config.color_TxMsg(),m_bFastMode); + ui->TxFreqSpinBox->value()+60*i,m_config.color_ReceivedMsg(),m_bFastMode); foxcom_.i3bit[i]=0; if(fm.indexOf("<")>0) foxcom_.i3bit[i]=1; strncpy(&foxcom_.cmsg[i][0],fm.toLatin1(),40); //Copy this message into cmsg[i]