w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-05-24 10:22:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix some illogical use of variable m_RxLog.

Browse Source 
Add -DUNIX flag to FFLAGS in Makefile.linux.
Tweak the use of framesAfterDownsample in Detector.cpp.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3631 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2014-01-09 18:14:58 +00:00
parent 052aedef20
commit 7cf44f5f54
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Detector.cpp
View File

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

3
lib/Makefile.linux
View File

@ -6,7 +6,8 @@ CC = gcc
CXX = g++ CXX = g++
FC = gfortran FC = gfortran
FFLAGS = -O2 -fbounds-check -Wall -Wno-conversion -fno-second-underscore -fPIE FFLAGS = -O2 -fbounds-check -Wall -Wno-conversion -fno-second-underscore \
-fPIE -DUNIX
CFLAGS = -I. -fbounds-check -fPIE CFLAGS = -I. -fbounds-check -fPIE
# Default rules # Default rules

4
mainwindow.cpp
View File

@ -1368,7 +1368,7 @@ void MainWindow::decode() //decode()
jt9com_.nfSplit=m_wideGraph->getFmin(); jt9com_.nfSplit=m_wideGraph->getFmin();
jt9com_.nfb=m_wideGraph->getFmax(); jt9com_.nfb=m_wideGraph->getFmax();
jt9com_.ntol=20; jt9com_.ntol=20;
if(jt9com_.nutc < m_nutc0) m_RxLog |= 1; //Date and Time to all.txt if(jt9com_.nutc < m_nutc0) m_RxLog = 1; //Date and Time to all.txt
m_nutc0=jt9com_.nutc; m_nutc0=jt9com_.nutc;
jt9com_.ntxmode=9; jt9com_.ntxmode=9;
if(m_modeTx=="JT65") jt9com_.ntxmode=65; if(m_modeTx=="JT65") jt9com_.ntxmode=65;
@ -1438,7 +1438,7 @@ void MainWindow::readFromStdout() //readFromStdout
QFile f("ALL.TXT"); QFile f("ALL.TXT");
f.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Append); f.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Append);
QTextStream out(&f); QTextStream out(&f);
if(m_RxLog && 1) { if(m_RxLog==1) {
out << QDateTime::currentDateTimeUtc().toString("yyyy-MMM-dd hh:mm") out << QDateTime::currentDateTimeUtc().toString("yyyy-MMM-dd hh:mm")
<< " " << m_dialFreq << " MHz " << m_mode << endl; << " " << m_dialFreq << " MHz " << m_mode << endl;
m_RxLog=0; m_RxLog=0;