w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-09-05 22:57:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rationalize the switching among ActiveStations configurations.

Browse Source
This commit is contained in:
Joe Taylor 2023-03-08 11:09:15 -05:00
parent df3e922ed8
commit 40ae967fa6
2 changed files with 19 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
widgets/mainwindow.cpp
View File

@ -1415,17 +1415,7 @@ void MainWindow::readSettings()
if(displayMsgAvg) on_actionMessage_averaging_triggered(); if(displayMsgAvg) on_actionMessage_averaging_triggered();
if (displayFoxLog) on_fox_log_action_triggered (); if (displayFoxLog) on_fox_log_action_triggered ();
if (displayContestLog) on_contest_log_action_triggered (); if (displayContestLog) on_contest_log_action_triggered ();
if(displayActiveStations) { if(displayActiveStations) on_actionActiveStations_triggered();
on_actionActiveStations_triggered();
if(m_mode=="Q65") {
QString t{""};
if(m_specOp==SpecOp::Q65_PILEUP) {
m_ActiveStationsWidget->displayRecentStations("Q65-pileup",t);
} else {
m_ActiveStationsWidget->displayRecentStations("Q65",t);
}
}
}
} }
void MainWindow::checkMSK144ContestType() void MainWindow::checkMSK144ContestType()
@ -2086,13 +2076,7 @@ void MainWindow::on_actionSettings_triggered() //Setup Dialog
} }
ui->labDXped->setVisible(SpecOp::NONE != m_specOp); ui->labDXped->setVisible(SpecOp::NONE != m_specOp);
set_mode(m_mode); set_mode(m_mode);
if(m_ActiveStationsWidget!=NULL and m_mode=="Q65") { configActiveStations();
if(m_specOp==SpecOp::Q65_PILEUP) {
m_ActiveStationsWidget->displayRecentStations("Q65-pileup","");
} else {
m_ActiveStationsWidget->displayRecentStations("Q65","");
}
}
} }
} }
@ -2980,6 +2964,7 @@ void MainWindow::on_actionActiveStations_triggered()
m_ActiveStationsWidget->showNormal(); m_ActiveStationsWidget->showNormal();
m_ActiveStationsWidget->raise(); m_ActiveStationsWidget->raise();
m_ActiveStationsWidget->activateWindow(); m_ActiveStationsWidget->activateWindow();
configActiveStations();
connect(m_ActiveStationsWidget.data(), SIGNAL(callSandP(int)),this,SLOT(callSandP2(int))); connect(m_ActiveStationsWidget.data(), SIGNAL(callSandP(int)),this,SLOT(callSandP2(int)));
connect(m_ActiveStationsWidget.data(), SIGNAL(activeStationsDisplay()),this,SLOT(ARRL_Digi_Display())); connect(m_ActiveStationsWidget.data(), SIGNAL(activeStationsDisplay()),this,SLOT(ARRL_Digi_Display()));
m_ActiveStationsWidget->setScore(m_score); m_ActiveStationsWidget->setScore(m_score);
@ -3624,7 +3609,6 @@ void MainWindow::refreshPileupList()
memcpy(line,&list[36*i],36); memcpy(line,&list[36*i],36);
t0=QString::fromLatin1(line)+"\n"; t0=QString::fromLatin1(line)+"\n";
m_callers[i]=t0; m_callers[i]=t0;
// qDebug() << "aa" << t0;
t+=t0; t+=t0;
} }
m_ActiveStationsWidget->setClickOK(false); m_ActiveStationsWidget->setClickOK(false);
@ -4959,7 +4943,7 @@ void MainWindow::guiUpdate()
} }
} }
if(m_mode=="FT8" or m_mode=="MSK144" or m_mode=="FT4" || "Q65" == m_mode) { if(m_mode=="FT8" or m_mode=="MSK144" or m_mode=="FT4" or m_mode=="Q65") {
if(ui->txrb1->isEnabled() and if(ui->txrb1->isEnabled() and
(SpecOp::NA_VHF==m_specOp or (SpecOp::NA_VHF==m_specOp or
SpecOp::FIELD_DAY==m_specOp or SpecOp::FIELD_DAY==m_specOp or
@ -6833,13 +6817,7 @@ void MainWindow::displayWidgets(qint64 n)
b=m_mode.startsWith("FST4"); b=m_mode.startsWith("FST4");
ui->sbNB->setVisible(b); ui->sbNB->setVisible(b);
genStdMsgs (m_rpt, true); genStdMsgs (m_rpt, true);
if(m_ActiveStationsWidget!=NULL and (m_mode=="Q65" or m_mode=="FT4" or m_mode=="FT8")) { configActiveStations();
if(m_specOp==SpecOp::Q65_PILEUP) {
m_ActiveStationsWidget->displayRecentStations("Q65-pileup","");
} else {
m_ActiveStationsWidget->displayRecentStations(m_mode,"");
}
}
} }
void MainWindow::on_actionFST4_triggered() void MainWindow::on_actionFST4_triggered()
@ -7052,7 +7030,6 @@ void MainWindow::on_actionFT8_triggered()
} else { } else {
if (!(keep_frequency)) switch_mode (Modes::FT8); if (!(keep_frequency)) switch_mode (Modes::FT8);
} }
if(m_specOp != SpecOp::HOUND) { if(m_specOp != SpecOp::HOUND) {
ui->houndButton->setChecked(false); ui->houndButton->setChecked(false);
ui->houndButton->setStyleSheet(""); ui->houndButton->setStyleSheet("");
@ -7086,6 +7063,7 @@ void MainWindow::on_actionFT8_triggered()
m_bWarnedSplit=true; m_bWarnedSplit=true;
} }
statusChanged(); statusChanged();
configActiveStations();
} }
void MainWindow::on_actionJT4_triggered() void MainWindow::on_actionJT4_triggered()
@ -10432,6 +10410,17 @@ void MainWindow::set_mode (QString const& mode)
else if ("Echo" == mode) on_actionEcho_triggered (); else if ("Echo" == mode) on_actionEcho_triggered ();
} }
void MainWindow::configActiveStations()
{
if(m_ActiveStationsWidget!=NULL and (m_mode=="Q65" or m_mode=="FT4" or m_mode=="FT8")) {
if(m_specOp==SpecOp::Q65_PILEUP) {
m_ActiveStationsWidget->displayRecentStations("Q65-pileup","");
} else {
m_ActiveStationsWidget->displayRecentStations(m_mode,"");
}
}
}
void MainWindow::remote_configure (QString const& mode, quint32 frequency_tolerance void MainWindow::remote_configure (QString const& mode, quint32 frequency_tolerance
, QString const& submode, bool fast_mode, quint32 tr_period, quint32 rx_df , QString const& submode, bool fast_mode, quint32 tr_period, quint32 rx_df
, QString const& dx_call, QString const& dx_grid, bool generate_messages) , QString const& dx_call, QString const& dx_grid, bool generate_messages)

1
widgets/mainwindow.h
View File

@ -377,6 +377,7 @@ private:
void chkFT4(); void chkFT4();
bool elide_tx1_not_allowed () const; bool elide_tx1_not_allowed () const;
void readWidebandDecodes(); void readWidebandDecodes();
void configActiveStations();
QProcessEnvironment const& m_env; QProcessEnvironment const& m_env;
NetworkAccessManager m_network_manager; NetworkAccessManager m_network_manager;