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

Merging r7834, r7835 and r7836 from trunk

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx-1.8@7837 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2017-07-10 14:24:33 +00:00
parent 2569b63bcd
commit 7c6a201bc7
3 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
mainwindow.cpp
View File

@ -2724,7 +2724,6 @@ void MainWindow::readFromStdout() //readFromStdout
if(m_mode=="FT8") {
int i1=decodedtext.string().indexOf(" "+m_baseCall+" ");
// m_bCallingCQ=true;
if(m_bCallingCQ and i1>0 and ui->cbFirst->isChecked()) {
// int snr=decodedtext.string().mid(6,4).toInt();
m_bDoubleClicked=true;
@ -2733,12 +2732,12 @@ void MainWindow::readFromStdout() //readFromStdout
} else {
int audioFreq=decodedtext.frequencyOffset();
audioFreq=decodedtext.string().mid(16,4).toInt();
if(!m_config.enable_VHF_features() and
(abs(audioFreq - m_wideGraph->rxFreq()) <= 10)) bDisplayRight=true;
if(i1>0 or (abs(audioFreq - m_wideGraph->rxFreq()) <= 10)) bDisplayRight=true;
}
}
if (bDisplayRight) {
// This msg is within 10 hertz of our tuned frequency, or a JT4 or JT65 avg
// This msg is within 10 hertz of our tuned frequency, or a JT4 or JT65 avg,
// or contains MyCall
ui->decodedTextBrowser2->displayDecodedText(decodedtext,m_baseCall,false,
m_logBook,m_config.color_CQ(),m_config.color_MyCall(),
m_config.color_DXCC(),m_config.color_NewCall());
@ -3108,7 +3107,6 @@ void MainWindow::guiUpdate()
&& !message_is_73 (m_lastMessageType, m_lastMessageSent.split (' ', QString::SkipEmptyParts));
if (m_sentFirst73) {
m_qsoStop=t2;
// if(m_config.id_after_73 () and (!m_bFastMode)) {
if(m_config.id_after_73 ()) {
icw[0] = m_ncw;
}
@ -3116,8 +3114,13 @@ void MainWindow::guiUpdate()
logQSOTimer.start (0);
}
}
if (is_73 && m_config.disable_TX_on_73 ()) {
bool b=(m_mode=="FT8") and ui->cbAutoSeq->isChecked() and ui->cbFirst->isChecked();
if(is_73 and (m_config.disable_TX_on_73() or b)) {
auto_tx_mode (false);
if(b) {
m_ntx=6;
ui->txrb6->setChecked(true);
}
}
if(m_config.id_interval () >0) {
@ -4323,14 +4326,9 @@ void MainWindow::displayWidgets(int n)
}
j=j>>1;
}
if(m_config.my_callsign()=="K1JT" or m_config.my_callsign()=="K9AN" or
m_config.my_callsign()=="G4WJS" || m_config.my_callsign () == "KI7MT") {
ui->actionWSPR_LF->setEnabled(true);
b=m_mode=="FT8";
ui->cbFirst->setVisible(b);
ui->cbWeak->setVisible(b);
ui->cbWeak->setEnabled(false);
}
b=m_mode=="FT8";
ui->cbFirst->setVisible(b);
ui->cbWeak->setVisible(false);
}
void MainWindow::on_actionFT8_triggered()
@ -6488,6 +6486,12 @@ void MainWindow::on_cbWeak_toggled(bool b)
if(b) ui->cbFirst->setChecked(!b);
}
void MainWindow::on_cbAutoSeq_toggled(bool b)
{
if(!b) ui->cbFirst->setChecked(false);
ui->cbFirst->setVisible((m_mode=="FT8") and b);
}
void MainWindow::write_transmit_entry (QString const& file_name)
{
QFile f {m_config.writeable_data_dir ().absoluteFilePath (file_name)};

1
mainwindow.h
View File

@ -240,6 +240,7 @@ private slots:
void on_cbMenus_toggled(bool b);
void on_cbFirst_toggled(bool b);
void on_cbWeak_toggled(bool b);
void on_cbAutoSeq_toggled(bool b);
void networkError (QString const&);
void on_ClrAvgButton_clicked();
void on_actionWSPR_triggered();

7
mainwindow.ui
View File

@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
<width>872</width>
<width>876</width>
<height>583</height>
</rect>
</property>
@ -2367,7 +2367,7 @@ QPushButton[state=&quot;ok&quot;] {
<rect>
<x>0</x>
<y>0</y>
<width>872</width>
<width>876</width>
<height>21</height>
</rect>
</property>
@ -2996,6 +2996,9 @@ QPushButton[state=&quot;ok&quot;] {
<property name="toolTip">
<string>Experimental LF/MF mode</string>
</property>
<property name="visible">
<bool>false</bool>
</property>
</action>
<action name="actionFT8">
<property name="checkable">