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

Testing: don't call fil4 if parameters are out of range.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3622 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2014-01-07 21:09:58 +00:00
parent e39c3f468b
commit e1d0115684
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Detector.cpp
View File

@ -70,12 +70,14 @@ qint64 Detector::writeData (char const * data, qint64 maxSize)
if(m_bufferPos==m_framesPerSignal*m_downSampleFactor && m_monitoring) { if(m_bufferPos==m_framesPerSignal*m_downSampleFactor && m_monitoring) {
qint32 framesToProcess (m_framesPerSignal * m_downSampleFactor); qint32 framesToProcess (m_framesPerSignal * m_downSampleFactor);
qint32 framesAfterDownSample; qint32 framesAfterDownSample;
if(framesToProcess!=13824) qDebug() << "framesToProcess =" if(framesToProcess==13824 and jt9com_.kin>=0 and jt9com_.kin<1440000) {
<< framesToProcess; fil4_(&m_buffer[0], &framesToProcess, &jt9com_.d2[jt9com_.kin],
if(jt9com_.kin<0 or jt9com_.kin>=1440000) qDebug() << "jt9com_.kin =" &framesAfterDownSample);
<< jt9com_.kin; } else {
fil4_(&m_buffer[0], &framesToProcess, &jt9com_.d2[jt9com_.kin], qDebug() << "framesToProcess = " << framesToProcess;
&framesAfterDownSample); qDebug() << "jt9com_.kin = " << jt9com_.kin;
qDebug() << "secondInPeriod = " << secondInPeriod();
}
Q_ASSERT(framesAfterDownSample==3456); Q_ASSERT(framesAfterDownSample==3456);
jt9com_.kin += framesAfterDownSample; jt9com_.kin += framesAfterDownSample;
Q_EMIT framesWritten (jt9com_.kin); Q_EMIT framesWritten (jt9com_.kin);

2
mainwindow.cpp
View File

@ -1,4 +1,4 @@
//----------------------------------------------------------------- MainWindow //---------------------------------------------------------------- MainWindow
#include "mainwindow.h" #include "mainwindow.h"
#include "ui_mainwindow.h" #include "ui_mainwindow.h"

4
wsjtx.iss
View File

@ -1,7 +1,7 @@
[Setup] [Setup]
AppName=wsjtx AppName=wsjtx
AppVerName=wsjtx Version 1.2.1a r3590 AppVerName=wsjtx Version 1.2.2 r3620
AppCopyright=Copyright (C) 2001-2013 by Joe Taylor, K1JT AppCopyright=Copyright (C) 2001-2014 by Joe Taylor, K1JT
DefaultDirName=c:\wsjtx1.2 DefaultDirName=c:\wsjtx1.2
DefaultGroupName=wsjtx1.2 DefaultGroupName=wsjtx1.2