w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-08-02 06:02:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Code cleanup; more Fox-mode additions.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8294 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2017-12-07 17:09:03 +00:00
parent 0a07f6058a
commit 768974cb1e
6 changed files with 55 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
displaytext.cpp
View File

@ -232,6 +232,9 @@ void DisplayText::displayTransmittedText(QString text, QString modeTx, qint32 tx
if(bFastMode or modeTx=="FT8") { if(bFastMode or modeTx=="FT8") {
t = QDateTime::currentDateTimeUtc().toString("hhmmss") + \ t = QDateTime::currentDateTimeUtc().toString("hhmmss") + \
" Tx " + t2 + t1 + text; " Tx " + t2 + t1 + text;
} else if(modeTx.mid(0,6)=="FT8fox") {
t = QDateTime::currentDateTimeUtc().toString("hhmmss") + \
" Tx" + modeTx.mid(7) + " " + text;
} else { } else {
t = QDateTime::currentDateTimeUtc().toString("hhmm") + \ t = QDateTime::currentDateTimeUtc().toString("hhmm") + \
" Tx " + t2 + t1 + text; " Tx " + t2 + t1 + text;

2
logqso.cpp
View File

@ -57,7 +57,7 @@ void LogQSO::initLogQSO(QString const& hisCall, QString const& hisGrid, QString
QString const& rptSent, QString const& rptRcvd, QString const& rptSent, QString const& rptRcvd,
QDateTime const& dateTimeOn, QDateTime const& dateTimeOff, QDateTime const& dateTimeOn, QDateTime const& dateTimeOff,
Radio::Frequency dialFreq, QString const& myCall, QString const& myGrid, Radio::Frequency dialFreq, QString const& myCall, QString const& myGrid,
bool noSuffix, bool toRTTY, bool dBtoComments, QString const& opCall) bool noSuffix, bool toRTTY, bool dBtoComments, bool bFox, QString const& opCall)
{ {
if(!isHidden()) return; if(!isHidden()) return;
ui->call->setText(hisCall); ui->call->setText(hisCall);

2
logqso.h
View File

@ -30,7 +30,7 @@ public:
QString const& rptSent, QString const& rptRcvd, QDateTime const& dateTimeOn, QString const& rptSent, QString const& rptRcvd, QDateTime const& dateTimeOn,
QDateTime const& dateTimeOff, QDateTime const& dateTimeOff,
Radio::Frequency dialFreq, QString const& myCall, QString const& myGrid, Radio::Frequency dialFreq, QString const& myCall, QString const& myGrid,
bool noSuffix, bool toRTTY, bool dBtoComments, QString const& opCall); bool noSuffix, bool toRTTY, bool dBtoComments, bool bFox, QString const& opCall);
public slots: public slots:
void accept(); void accept();

72
mainwindow.cpp
View File

@ -989,7 +989,7 @@ void MainWindow::writeSettings()
m_settings->setValue("ShowMenus",ui->cbMenus->isChecked()); m_settings->setValue("ShowMenus",ui->cbMenus->isChecked());
m_settings->setValue("CallFirst",ui->cbFirst->isChecked()); m_settings->setValue("CallFirst",ui->cbFirst->isChecked());
m_settings->setValue("HoundSort",ui->comboBoxHoundSort->currentIndex()); m_settings->setValue("HoundSort",ui->comboBoxHoundSort->currentIndex());
m_settings->setValue("FoxNsig",ui->sbNsig->value()); m_settings->setValue("FoxNlist",ui->sbNlist->value());
m_settings->setValue("FoxNslots",ui->sbNslots->value()); m_settings->setValue("FoxNslots",ui->sbNslots->value());
m_settings->setValue("FoxMaxDB",ui->sbMax_dB->value()); m_settings->setValue("FoxMaxDB",ui->sbMax_dB->value());
m_settings->setValue("FoxMaxRepeats",ui->sbMaxRepeats->value()); m_settings->setValue("FoxMaxRepeats",ui->sbMaxRepeats->value());
@ -1061,7 +1061,7 @@ void MainWindow::readSettings()
ui->cbMenus->setChecked(m_settings->value("ShowMenus",true).toBool()); ui->cbMenus->setChecked(m_settings->value("ShowMenus",true).toBool());
ui->cbFirst->setChecked(m_settings->value("CallFirst",true).toBool()); ui->cbFirst->setChecked(m_settings->value("CallFirst",true).toBool());
ui->comboBoxHoundSort->setCurrentIndex(m_settings->value("HoundSort",3).toInt()); ui->comboBoxHoundSort->setCurrentIndex(m_settings->value("HoundSort",3).toInt());
ui->sbNsig->setValue(m_settings->value("FoxNsig",12).toInt()); ui->sbNlist->setValue(m_settings->value("FoxNlist",12).toInt());
ui->sbNslots->setValue(m_settings->value("FoxNslots",5).toInt()); ui->sbNslots->setValue(m_settings->value("FoxNslots",5).toInt());
ui->sbMax_dB->setValue(m_settings->value("FoxMaxDB",30).toInt()); ui->sbMax_dB->setValue(m_settings->value("FoxMaxDB",30).toInt());
ui->sbMaxRepeats->setValue(m_settings->value("FoxMaxRepeats",3).toInt()); ui->sbMaxRepeats->setValue(m_settings->value("FoxMaxRepeats",3).toInt());
@ -3308,9 +3308,8 @@ void MainWindow::guiUpdate()
} }
if(m_restart) { if(m_restart) {
write_transmit_entry ("ALL.TXT"); write_transmit_entry ("ALL.TXT");
if (m_config.TX_messages ()) if (m_config.TX_messages ()) {
{ ui->decodedTextBrowser2->displayTransmittedText(m_currentMessage,m_modeTx,
ui->decodedTextBrowser2->displayTransmittedText(m_currentMessage,m_modeTx,
ui->TxFreqSpinBox->value(),m_config.color_TxMsg(),m_bFastMode); ui->TxFreqSpinBox->value(),m_config.color_TxMsg(),m_bFastMode);
} }
} }
@ -4696,7 +4695,8 @@ void MainWindow::on_logQSOButton_clicked() //Log QSO button
m_logDlg->initLogQSO (m_hisCall, m_hisGrid, m_modeTx, m_rptSent, m_rptRcvd, m_logDlg->initLogQSO (m_hisCall, m_hisGrid, 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_noSuffix, m_config.my_callsign(), m_config.my_grid(), m_noSuffix,
m_config.log_as_RTTY(), m_config.report_in_comments(), m_opCall); m_config.log_as_RTTY(), m_config.report_in_comments(),
m_config.bFox(), m_opCall);
} }
void MainWindow::acceptQSO2(QDateTime const& QSO_date_off, QString const& call, QString const& grid void MainWindow::acceptQSO2(QDateTime const& QSO_date_off, QString const& call, QString const& grid
@ -7000,9 +7000,9 @@ void MainWindow::write_transmit_entry (QString const& file_name)
// -------------------------- Code for DXpedition Fox Mode --------------------------- // -------------------------- Code for DXpedition Fox Mode ---------------------------
void MainWindow::on_sbNsig_valueChanged(int n) void MainWindow::on_sbNlist_valueChanged(int n)
{ {
m_Nsig=n; m_Nlist=n;
} }
void MainWindow::on_sbNslots_valueChanged(int n) void MainWindow::on_sbNslots_valueChanged(int n)
@ -7123,9 +7123,9 @@ QString MainWindow::sortHoundCalls(QString t, int isort, int max_dB)
int i0=t.indexOf("\n") + 1; int i0=t.indexOf("\n") + 1;
m_nSortedHounds=0; m_nSortedHounds=0;
if(i0 > 0) { if(i0 > 0) {
m_nSortedHounds=qMin(t.length(),m_Nsig*i0)/i0; // Number of sorted & displayed Hounds m_nSortedHounds=qMin(t.length(),m_Nlist*i0)/i0; // Number of sorted & displayed Hounds
} }
m_houndCallers=t.mid(0,m_Nsig*i0); m_houndCallers=t.mid(0,m_Nlist*i0);
return m_houndCallers; return m_houndCallers;
} }
@ -7150,10 +7150,12 @@ void MainWindow::selectHound(QString line)
QString houndGrid=line.split(" ",QString::SkipEmptyParts).at(1); // Hound caller's grid QString houndGrid=line.split(" ",QString::SkipEmptyParts).at(1); // Hound caller's grid
QString rpt=line.split(" ",QString::SkipEmptyParts).at(2); // Hound SNR QString rpt=line.split(" ",QString::SkipEmptyParts).at(2); // Hound SNR
/*
ui->dxCallEntry->setText(houndCall); // Not necessary? ui->dxCallEntry->setText(houndCall); // Not necessary?
ui->dxGridEntry->setText(houndGrid); ui->dxGridEntry->setText(houndGrid);
genStdMsgs(rpt); genStdMsgs(rpt);
on_txb2_clicked(); on_txb2_clicked();
*/
m_houndCallers=m_houndCallers.remove(line+"\n"); // Remove t from sorted Hound list m_houndCallers=m_houndCallers.remove(line+"\n"); // Remove t from sorted Hound list
m_nSortedHounds--; m_nSortedHounds--;
@ -7246,9 +7248,10 @@ void MainWindow::foxTxSequencer()
int i1=m_foxMsgToBeSent[i].indexOf(";"); int i1=m_foxMsgToBeSent[i].indexOf(";");
if(i1>0) m_foxMsgToBeSent[i]=m_foxMsgToBeSent[i].mid(i1+2); if(i1>0) m_foxMsgToBeSent[i]=m_foxMsgToBeSent[i].mid(i1+2);
QString fm=m_foxMsgToBeSent[i]; //Fox message to be transmitted in this slot QString fm; //Fox message to be transmitted in this slot
if(fm=="") { fm=m_foxMsgToBeSent[i]; //Default, if available
if(!m_houndQueue.isEmpty()) { if(fm=="" or fm.mid(0,3)=="CQ ") {
if(!m_houndQueue.isEmpty()) { //Fetch new hound call from queue
QString t=m_houndQueue.dequeue(); QString t=m_houndQueue.dequeue();
m_houndCall[i]=t.mid(0,6).trimmed(); m_houndCall[i]=t.mid(0,6).trimmed();
QString rpt=t.mid(7,3); QString rpt=t.mid(7,3);
@ -7256,50 +7259,67 @@ void MainWindow::foxTxSequencer()
QString tb4=ui->textBrowser4->toPlainText(); QString tb4=ui->textBrowser4->toPlainText();
tb4=tb4.remove(t+"\n"); tb4=tb4.remove(t+"\n");
ui->textBrowser4->setText(tb4); ui->textBrowser4->setText(tb4);
} else { } else { //If all else fails, call CQ
fm=ui->comboBoxCQ->currentText() + " " + m_config.my_callsign() + fm=ui->comboBoxCQ->currentText() + " " + m_config.my_callsign() +
" " + m_config.my_grid().mid(0,4); " " + m_config.my_grid().mid(0,4);
} }
} }
if(fm.contains(" RR73")) { if(fm.contains(" RR73")) {
qDebug() << "Logged:" << i << m_houndCall[i] << m_houndRptSent[i] << m_houndRptRcvd[i];
// Log this QSO!
m_hisCall=m_houndCall[i];
m_hisGrid="";
m_rptSent=m_houndRptSent[i];
m_rptRcvd=m_houndRptRcvd[i];
qDebug() << "Logged:" << i << m_hisCall << m_rptSent << m_rptRcvd;
on_logQSOButton_clicked();
//Find someone to call next
if(!m_houndQueue.isEmpty()) { if(!m_houndQueue.isEmpty()) {
QString t=m_houndQueue.dequeue(); //Fetch next hound call QString t=m_houndQueue.dequeue(); //Fetch next hound call
m_houndCall[i]=t.mid(0,6).trimmed(); m_houndCall[i]=t.mid(0,6).trimmed();
QString rpt=t.mid(7,3); QString rpt=t.mid(7,3);
fm=fm.mid(0,7) + "RR73; " + m_houndCall[i] + " <" + m_config.my_callsign() + fm=fm.mid(0,6) + " RR73; " + m_houndCall[i] + " <" + m_config.my_callsign() +
"> " + rpt; "> " + rpt;
QString tb4=ui->textBrowser4->toPlainText(); //Remove popped call from tb4 QString tb4=ui->textBrowser4->toPlainText(); //Remove popped call from tb4
tb4=tb4.remove(t+"\n"); tb4=tb4.remove(t+"\n");
ui->textBrowser4->setText(tb4); ui->textBrowser4->setText(tb4);
} else { } else {
//Default to a standard (i3bit=0) message if queue is empty
fm=m_houndCall[i] + " " + m_config.my_callsign() + " RR73"; fm=m_houndCall[i] + " " + m_config.my_callsign() + " RR73";
} }
} }
if(!fm.contains(";")) {
fm += " "; fm.remove("<");
fm=fm.mid(0,32); fm.remove(">");
if(m_houndCall[i]!=m_houndCall0[i]) {
m_nFoxMsgTimes[i]=0;
} }
if(m_houndCall[i]!=m_houndCall0[i]) m_nFoxMsgTimes[i]=0; //Reset the repeat counter
m_houndCall0[i]=m_houndCall[i]; m_houndCall0[i]=m_houndCall[i];
m_nFoxMsgTimes[i]++; m_nFoxMsgTimes[i]++;
// ### Send a flag with m_nFoxMsgTimes[i] to tb2 ###
ui->decodedTextBrowser2->displayTransmittedText(fm, m_modeTx, //Send Tx message to right window
fm += " ";
fm=fm.mid(0,32);
QString txModeArg;
txModeArg.sprintf("FT8fox %d %2d",i+1,m_nFoxMsgTimes[i]);
ui->decodedTextBrowser2->displayTransmittedText(fm.trimmed(), txModeArg,
300+60*i,m_config.color_TxMsg(),m_bFastMode); 300+60*i,m_config.color_TxMsg(),m_bFastMode);
//Generate and accumulate the Tx waveform
foxcom_.i3bit[i]=0; foxcom_.i3bit[i]=0;
if(fm.indexOf("<")>0) foxcom_.i3bit[i]=1; if(fm.indexOf("<")>0) foxcom_.i3bit[i]=1;
strncpy(&foxcom_.cmsg[i][0], fm.toLatin1(),32); //Copy this message into cmsg[i] strncpy(&foxcom_.cmsg[i][0], fm.toLatin1(),32); //Copy this message into cmsg[i]
m_foxMsgSent[i]=fm.trimmed(); //What was actually sent m_foxMsgSent[i]=fm.trimmed(); //What was actually sent
// qDebug() << "Tx:" << i << foxcom_.i3bit[i] << m_foxMsgSent[i] << m_nFoxMsgTimes[i];
i1=fm.indexOf(";"); i1=fm.indexOf(";");
if(i1>0) fm=fm.mid(i1+2); if(i1>0) fm=fm.mid(i1+2); //Remove the "houndCall RR73;"
m_foxMsgToBeSent[i]=fm; m_foxMsgToBeSent[i]=fm;
i1=qMax(fm.indexOf("+"),fm.indexOf("-")); i1=qMax(fm.indexOf("+"),fm.indexOf("-"));
if(i1>6) { if(i1>6) {
m_houndRptSent[i]=fm.mid(i1,3); //Active hound call for slot i m_houndRptSent[i]=fm.mid(i1,3); //Report sent to Hound in slot i
} }
} }
foxcom_.nslots=m_Nslots; foxcom_.nslots=m_Nslots;

4
mainwindow.h
View File

@ -282,7 +282,7 @@ private slots:
void on_actionFreqCal_triggered(); void on_actionFreqCal_triggered();
void splash_done (); void splash_done ();
void on_measure_check_box_stateChanged (int); void on_measure_check_box_stateChanged (int);
void on_sbNsig_valueChanged(int n); void on_sbNlist_valueChanged(int n);
void on_sbNslots_valueChanged(int n); void on_sbNslots_valueChanged(int n);
void on_sbMax_dB_valueChanged(int n); void on_sbMax_dB_valueChanged(int n);
void on_pbFoxReset_clicked(); void on_pbFoxReset_clicked();
@ -418,7 +418,7 @@ private:
qint32 m_max_dB; qint32 m_max_dB;
qint32 m_nSortedHounds=0; qint32 m_nSortedHounds=0;
qint32 m_nHoundsCalling=0; qint32 m_nHoundsCalling=0;
qint32 m_Nsig=12; qint32 m_Nlist=12;
qint32 m_Nslots=5; qint32 m_Nslots=5;
qint32 m_nFoxMsgTimes[5]={0,0,0,0,0}; qint32 m_nFoxMsgTimes[5]={0,0,0,0,0};

4
mainwindow.ui
View File

@ -1823,7 +1823,7 @@ list. The list can be maintained in Settings (F2).</string>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QSpinBox" name="sbNsig"> <widget class="QSpinBox" name="sbNlist">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -1837,7 +1837,7 @@ list. The list can be maintained in Settings (F2).</string>
</size> </size>
</property> </property>
<property name="prefix"> <property name="prefix">
<string>N Sigs </string> <string>N List </string>
</property> </property>
<property name="minimum"> <property name="minimum">
<number>5</number> <number>5</number>