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

More cleanup after making "Save None" mean NO SAVING AT ALL.

Browse Source
This commit is contained in:
Joe Taylor 2020-03-19 15:41:18 -04:00
parent 7de6b8c98d
commit fe33bcdd6c
3 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
shortcuts.txt
View File

@ -41,5 +41,4 @@
<tr><td><b>Alt+R </b></td><td>Set Tx4 message to RR73</td></tr> <tr><td><b>Alt+R </b></td><td>Set Tx4 message to RR73</td></tr>
<tr><td><b>Alt+S </b></td><td>Stop monitoring</td></tr> <tr><td><b>Alt+S </b></td><td>Stop monitoring</td></tr>
<tr><td><b>Alt+T </b></td><td>Tune</td></tr> <tr><td><b>Alt+T </b></td><td>Tune</td></tr>
<tr><td><b>Alt+V </b></td><td>Save the most recently completed *.wav file</td></tr>
</table> </table>

12
widgets/mainwindow.cpp
View File

@ -1482,7 +1482,6 @@ void MainWindow::dataSink(qint64 frames)
auto const& period_start = now.addSecs (-(now.time ().minute () % (int(m_TRperiod) / 60)) * 60); auto const& period_start = now.addSecs (-(now.time ().minute () % (int(m_TRperiod) / 60)) * 60);
m_fnameWE=m_config.save_directory ().absoluteFilePath (period_start.toString ("yyMMdd_hhmm")); m_fnameWE=m_config.save_directory ().absoluteFilePath (period_start.toString ("yyMMdd_hhmm"));
} }
m_fileToSave.clear ();
int samples=m_TRperiod*12000; int samples=m_TRperiod*12000;
if(m_mode=="FT4") samples=21*3456; if(m_mode=="FT4") samples=21*3456;
@ -1691,7 +1690,6 @@ void MainWindow::fastSink(qint64 frames)
if(n<(m_TRperiod/2)) n=n+m_TRperiod; if(n<(m_TRperiod/2)) n=n+m_TRperiod;
auto const& period_start = now.addSecs (-n); auto const& period_start = now.addSecs (-n);
m_fnameWE = m_config.save_directory ().absoluteFilePath (period_start.toString ("yyMMdd_hhmmss")); m_fnameWE = m_config.save_directory ().absoluteFilePath (period_start.toString ("yyMMdd_hhmmss"));
m_fileToSave.clear ();
if(m_saveAll or m_bAltV or (m_bDecoded and m_saveDecoded) or (m_mode!="MSK144")) { if(m_saveAll or m_bAltV or (m_bDecoded and m_saveDecoded) or (m_mode!="MSK144")) {
m_bAltV=false; m_bAltV=false;
// the following is potential a threading hazard - not a good // the following is potential a threading hazard - not a good
@ -2086,13 +2084,6 @@ void MainWindow::keyPressEvent (QKeyEvent * e)
return; return;
} }
break; break;
case Qt::Key_V:
if(e->modifiers() & Qt::AltModifier) {
m_fileToSave = m_fnameWE;
m_bAltV=true;
return;
}
break;
case Qt::Key_Z: //### Recover from hung decode() ?? ### case Qt::Key_Z: //### Recover from hung decode() ?? ###
if(e->modifiers() & Qt::AltModifier) { if(e->modifiers() & Qt::AltModifier) {
decodeDone(); decodeDone();
@ -3443,8 +3434,7 @@ void MainWindow::pskPost (DecodedText const& decodedtext)
void MainWindow::killFile () void MainWindow::killFile ()
{ {
if (m_fnameWE.size () && if (m_fnameWE.size () && !(m_saveAll || (m_saveDecoded && m_bDecoded))) {
!(m_saveAll || (m_saveDecoded && m_bDecoded) || m_fnameWE == m_fileToSave)) {
QFile f1 {m_fnameWE + ".wav"}; QFile f1 {m_fnameWE + ".wav"};
if(f1.exists()) f1.remove(); if(f1.exists()) f1.remove();
if(m_mode.startsWith ("WSPR")) { if(m_mode.startsWith ("WSPR")) {

1
widgets/mainwindow.h
View File

@ -608,7 +608,6 @@ private:
QString m_cmnd; QString m_cmnd;
QString m_cmndP1; QString m_cmndP1;
QString m_msgSent0; QString m_msgSent0;
QString m_fileToSave;
QString m_calls; QString m_calls;
QString m_CQtype; QString m_CQtype;
QString m_opCall; QString m_opCall;