diff --git a/Detector.cpp b/Detector.cpp index 5b7a45aba..ec3751164 100644 --- a/Detector.cpp +++ b/Detector.cpp @@ -70,12 +70,14 @@ qint64 Detector::writeData (char const * data, qint64 maxSize) if(m_bufferPos==m_framesPerSignal*m_downSampleFactor && m_monitoring) { qint32 framesToProcess (m_framesPerSignal * m_downSampleFactor); qint32 framesAfterDownSample; - if(framesToProcess!=13824) qDebug() << "framesToProcess =" - << framesToProcess; - if(jt9com_.kin<0 or jt9com_.kin>=1440000) qDebug() << "jt9com_.kin =" - << jt9com_.kin; - fil4_(&m_buffer[0], &framesToProcess, &jt9com_.d2[jt9com_.kin], - &framesAfterDownSample); + if(framesToProcess==13824 and jt9com_.kin>=0 and jt9com_.kin<1440000) { + fil4_(&m_buffer[0], &framesToProcess, &jt9com_.d2[jt9com_.kin], + &framesAfterDownSample); + } else { + qDebug() << "framesToProcess = " << framesToProcess; + qDebug() << "jt9com_.kin = " << jt9com_.kin; + qDebug() << "secondInPeriod = " << secondInPeriod(); + } Q_ASSERT(framesAfterDownSample==3456); jt9com_.kin += framesAfterDownSample; Q_EMIT framesWritten (jt9com_.kin); diff --git a/mainwindow.cpp b/mainwindow.cpp index f77c2e850..025e1f2f7 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,4 +1,4 @@ -//----------------------------------------------------------------- MainWindow +//---------------------------------------------------------------- MainWindow #include "mainwindow.h" #include "ui_mainwindow.h" diff --git a/wsjtx.iss b/wsjtx.iss index f3d9fb25c..8836d7b41 100644 --- a/wsjtx.iss +++ b/wsjtx.iss @@ -1,7 +1,7 @@ [Setup] AppName=wsjtx -AppVerName=wsjtx Version 1.2.1a r3590 -AppCopyright=Copyright (C) 2001-2013 by Joe Taylor, K1JT +AppVerName=wsjtx Version 1.2.2 r3620 +AppCopyright=Copyright (C) 2001-2014 by Joe Taylor, K1JT DefaultDirName=c:\wsjtx1.2 DefaultGroupName=wsjtx1.2