w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-09-29 16:46:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Minor code cleanup.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8349 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2017-12-19 19:12:59 +00:00
parent ac818337a6
commit 1dd9357b44
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mainwindow.cpp
View File

@ -2295,7 +2295,7 @@ void MainWindow::on_actionAstronomical_data_toggled (bool checked)
} }
} }
void MainWindow::on_actionFox_Callers_triggered() void MainWindow::on_actionFox_Log_triggered()
{ {
on_actionMessage_averaging_triggered(); on_actionMessage_averaging_triggered();
m_msgAvgWidget->foxLogSetup(); m_msgAvgWidget->foxLogSetup();
@ -2854,7 +2854,7 @@ void MainWindow::readFromStdout() //readFromStdout
(decodedtext.string().contains("R+") or decodedtext.string().contains("R-"))) { (decodedtext.string().contains("R+") or decodedtext.string().contains("R-"))) {
QString houndCall,houndGrid; QString houndCall,houndGrid;
decodedtext.deCallAndGrid(/*out*/houndCall,houndGrid); decodedtext.deCallAndGrid(/*out*/houndCall,houndGrid);
foxRxSequencer(decodedtext,houndCall,houndGrid); foxRxSequencer(houndCall,houndGrid);
} }
//Left (Band activity) window //Left (Band activity) window
@ -3721,6 +3721,7 @@ void MainWindow::on_txrb1_toggled (bool status)
void MainWindow::on_txrb1_doubleClicked () void MainWindow::on_txrb1_doubleClicked ()
{ {
if(m_mode=="FT8" and m_config.bHound()) return;
// skip Tx1, only allowed if not a type 2 compound callsign // skip Tx1, only allowed if not a type 2 compound callsign
auto const& my_callsign = m_config.my_callsign (); auto const& my_callsign = m_config.my_callsign ();
auto is_compound = my_callsign != m_baseCall; auto is_compound = my_callsign != m_baseCall;
@ -7063,8 +7064,8 @@ void MainWindow::on_cbMenus_toggled(bool b)
void MainWindow::on_cbCQonly_toggled(bool b) void MainWindow::on_cbCQonly_toggled(bool b)
{ {
QFile {m_config.temp_dir ().absoluteFilePath (".lock")}.remove (); // Allow jt9 to start QFile {m_config.temp_dir().absoluteFilePath(".lock")}.remove(); // Allow jt9 to start
decodeBusy(true); decodeBusy(true or b); //"or b" to silence compiler warning
} }
void MainWindow::on_cbFirst_toggled(bool b) void MainWindow::on_cbFirst_toggled(bool b)
@ -7343,7 +7344,7 @@ void MainWindow::houndCallers()
} }
} }
void MainWindow::foxRxSequencer(DecodedText decodedtext, QString houndCall, QString houndGrid) void MainWindow::foxRxSequencer(QString houndCall, QString houndGrid)
{ {
/* Called from "readFromStdOut()" to process decoded messages of the form /* Called from "readFromStdOut()" to process decoded messages of the form
* "myCall houndCall R+rpt". * "myCall houndCall R+rpt".
@ -7501,6 +7502,7 @@ void MainWindow::rm_tb4(QString houndCall)
void MainWindow::doubleClickOnFoxQueue(Qt::KeyboardModifiers modifiers) void MainWindow::doubleClickOnFoxQueue(Qt::KeyboardModifiers modifiers)
{ {
if(modifiers==9999) return; //Silence compiler warning
QTextCursor cursor=ui->textBrowser4->textCursor(); QTextCursor cursor=ui->textBrowser4->textCursor();
cursor.setPosition(cursor.selectionStart()); cursor.setPosition(cursor.selectionStart());
QString houndCall=cursor.block().text().mid(0,6).trimmed(); QString houndCall=cursor.block().text().mid(0,6).trimmed();

4
mainwindow.h
View File

@ -240,7 +240,7 @@ private slots:
void stopTuneATU(); void stopTuneATU();
void auto_tx_mode(bool); void auto_tx_mode(bool);
void on_actionMessage_averaging_triggered(); void on_actionMessage_averaging_triggered();
void on_actionFox_Callers_triggered(); void on_actionFox_Log_triggered();
void on_actionInclude_averaging_toggled (bool); void on_actionInclude_averaging_toggled (bool);
void on_actionInclude_correlation_toggled (bool); void on_actionInclude_correlation_toggled (bool);
void on_actionEnable_AP_DXcall_toggled (bool); void on_actionEnable_AP_DXcall_toggled (bool);
@ -678,7 +678,7 @@ private:
void write_transmit_entry (QString const& file_name); void write_transmit_entry (QString const& file_name);
void selectHound(QString t); void selectHound(QString t);
void houndCallers(); void houndCallers();
void foxRxSequencer(DecodedText decodedtext, QString houndCall, QString houndGrid); void foxRxSequencer(QString houndCall, QString houndGrid);
void foxTxSequencer(); void foxTxSequencer();
}; };

12
mainwindow.ui
View File

@ -2669,7 +2669,7 @@ QPushButton[state="ok"] {
<addaction name="actionMessage_averaging"/> <addaction name="actionMessage_averaging"/>
<addaction name="actionEcho_Graph"/> <addaction name="actionEcho_Graph"/>
<addaction name="actionFast_Graph"/> <addaction name="actionFast_Graph"/>
<addaction name="actionFox_Callers"/> <addaction name="actionFox_Log"/>
<addaction name="separator"/> <addaction name="separator"/>
</widget> </widget>
<widget class="QMenu" name="menuDecode"> <widget class="QMenu" name="menuDecode">
@ -3315,9 +3315,15 @@ QPushButton[state=&quot;ok&quot;] {
<string>Shift+F1</string> <string>Shift+F1</string>
</property> </property>
</action> </action>
<action name="actionFox_Callers"> <action name="actionFox_Log">
<property name="text"> <property name="text">
<string>Fox Callers</string> <string>Fox Log</string>
</property>
<property name="iconText">
<string>Fox Log</string>
</property>
<property name="toolTip">
<string>Fox Log</string>
</property> </property>
</action> </action>
</widget> </widget>