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

More tweaks to GUI for FT8.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7740 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2017-06-27 13:36:10 +00:00
parent 023fceb620
commit 7e62880e2a
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
displaytext.cpp
View File

@ -183,13 +183,14 @@ void DisplayText::displayTransmittedText(QString text, QString modeTx, qint32 tx
{ {
QString bg=color_TxMsg.name(); QString bg=color_TxMsg.name();
QString t1=" @ "; QString t1=" @ ";
if(modeTx=="FT8") t1=" ~ ";
if(modeTx=="JT4") t1=" $ "; if(modeTx=="JT4") t1=" $ ";
if(modeTx=="JT65") t1=" # "; if(modeTx=="JT65") t1=" # ";
if(modeTx=="MSK144") t1=" & "; if(modeTx=="MSK144") t1=" & ";
QString t2; QString t2;
t2.sprintf("%4d",txFreq); t2.sprintf("%4d",txFreq);
QString t; QString t;
if(bFastMode) { if(bFastMode or modeTx=="FT8") {
t = QDateTime::currentDateTimeUtc().toString("hhmmss") + \ t = QDateTime::currentDateTimeUtc().toString("hhmmss") + \
" Tx " + t2 + t1 + text; " Tx " + t2 + t1 + text;
} else { } else {

12
mainwindow.cpp
View File

@ -3576,7 +3576,7 @@ void MainWindow::processMessage(QString const& messages, int position, bool ctrl
QString firstcall = decodedtext.call(); QString firstcall = decodedtext.call();
if(!m_bFastMode and !m_config.enable_VHF_features() and m_mode!="FT8") { if(!m_bFastMode and (!m_config.enable_VHF_features() or m_mode=="FT8")) {
// Don't change Tx freq if in a fast mode, or VHF features enabled; also not if a // Don't change Tx freq if in a fast mode, or VHF features enabled; also not if a
// station is calling me, unless m_lockTxFreq is true or CTRL is held down. // station is calling me, unless m_lockTxFreq is true or CTRL is held down.
if ((firstcall!=m_config.my_callsign () and firstcall != m_baseCall) or if ((firstcall!=m_config.my_callsign () and firstcall != m_baseCall) or
@ -4280,12 +4280,8 @@ void MainWindow::displayWidgets(int n)
void MainWindow::on_actionFT8_triggered() void MainWindow::on_actionFT8_triggered()
{ {
m_mode="FT8"; m_mode="FT8";
bool bVHF=m_config.enable_VHF_features(); bool bVHF=false;
if(bVHF) {
displayWidgets(nWidgets("111110101100111110010000"));
} else {
displayWidgets(nWidgets("111010000000111000010000")); displayWidgets(nWidgets("111010000000111000010000"));
}
m_bFast9=false; m_bFast9=false;
m_bFastMode=false; m_bFastMode=false;
WSPR_config(false); WSPR_config(false);
@ -4941,10 +4937,10 @@ void MainWindow::band_changed (Frequency f)
auto_tx_mode (false); // disable auto Tx auto_tx_mode (false); // disable auto Tx
} }
else { else {
// adjust DF:s // adjust DF's
int shift = f - m_freqNominal; int shift = f - m_freqNominal;
ui->RxFreqSpinBox->setValue (ui->RxFreqSpinBox->value () - shift); ui->RxFreqSpinBox->setValue (ui->RxFreqSpinBox->value () - shift);
if (!m_config.enable_VHF_features ()) // for VHF & up we fix the Tx DF if (!m_config.enable_VHF_features ()) // for VHF & up, don't change the Tx DF
{ {
ui->TxFreqSpinBox->setValue (ui->TxFreqSpinBox->value () - shift); ui->TxFreqSpinBox->setValue (ui->TxFreqSpinBox->value () - shift);
} }