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

Correct a timing issue for saving MSK144 files in short (e.g. 5 s) sequences. Save after Alt-V even if Save = None.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7191 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2016-10-17 16:51:14 +00:00
parent 71ec7a3971
commit 2897a3bde1
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mainwindow.cpp
View File

@ -808,6 +808,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
m_ntx = 1; m_ntx = 1;
m_fCPUmskrtd=0.0; m_fCPUmskrtd=0.0;
m_bFastDone=false; m_bFastDone=false;
m_bAltV=false;
ui->txrb1->setChecked(true); ui->txrb1->setChecked(true);
if(m_mode.startsWith ("WSPR") and m_pctx>0) { if(m_mode.startsWith ("WSPR") and m_pctx>0) {
@ -1300,7 +1301,7 @@ void MainWindow::fastSink(qint64 frames)
float fracTR=float(k)/(12000.0*m_TRperiod); float fracTR=float(k)/(12000.0*m_TRperiod);
decodeNow=false; decodeNow=false;
if(fracTR>0.98) { if(fracTR>0.92) {
m_dataAvailable=true; m_dataAvailable=true;
fast_decode_done(); fast_decode_done();
m_bFastDone=true; m_bFastDone=true;
@ -1323,6 +1324,7 @@ void MainWindow::fastSink(qint64 frames)
decode(); decode();
} }
} }
if(decodeNow or m_bFastDone) { if(decodeNow or m_bFastDone) {
if(!m_diskData) { if(!m_diskData) {
QDateTime now {QDateTime::currentDateTimeUtc()}; QDateTime now {QDateTime::currentDateTimeUtc()};
@ -1331,7 +1333,8 @@ void MainWindow::fastSink(qint64 frames)
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 (); m_fileToSave.clear ();
if(m_saveAll 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;
// the following is potential a threading hazard - not a good // the following is potential a threading hazard - not a good
// idea to pass pointer to be processed in another thread // idea to pass pointer to be processed in another thread
m_saveWAVWatcher.setFuture (QtConcurrent::run (std::bind (&MainWindow::save_wave_file, m_saveWAVWatcher.setFuture (QtConcurrent::run (std::bind (&MainWindow::save_wave_file,
@ -1575,7 +1578,7 @@ void MainWindow::keyPressEvent (QKeyEvent * e)
case Qt::Key_V: case Qt::Key_V:
if(e->modifiers() & Qt::AltModifier) { if(e->modifiers() & Qt::AltModifier) {
m_fileToSave = m_fnameWE; m_fileToSave = m_fnameWE;
m_bDecoded=true; //### m_bAltV=true;
return; return;
} }
break; break;

1
mainwindow.h
View File

@ -418,6 +418,7 @@ private:
bool m_bRefSpec; bool m_bRefSpec;
bool m_bUseRef; bool m_bUseRef;
bool m_bFastDone; bool m_bFastDone;
bool m_bAltV;
float m_pctZap; float m_pctZap;
int m_ihsym; int m_ihsym;
int m_nzap; int m_nzap;