From 6a6c6717a0973bb6cdcab04b6f437851fb33f458 Mon Sep 17 00:00:00 2001 From: "Thiago C. Santini" Date: Wed, 4 May 2016 09:50:14 +0200 Subject: [PATCH] Removes parallel port synchronization test stuff --- src/ImageAcquisition.cpp | 2 -- src/ParallelPort.cpp | 8 +++++--- src/utils.cpp | 1 - src/utils.h | 1 - 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/ImageAcquisition.cpp b/src/ImageAcquisition.cpp index ac314f4..7186870 100644 --- a/src/ImageAcquisition.cpp +++ b/src/ImageAcquisition.cpp @@ -259,8 +259,6 @@ void ImageAcquisition::frameCallbackInternal(char *pixelBuffer, size_t input, do latestSlaveFrame.copyTo(entry.fieldFrame); slaveMutex.unlock(); - Scalar m = mean(entry.leftEyeFrame); - gIntensity = m[0]; entry.incIdx(); emit imageAcquisitionDone(entry); } diff --git a/src/ParallelPort.cpp b/src/ParallelPort.cpp index 1a4d6b7..a5e059e 100644 --- a/src/ParallelPort.cpp +++ b/src/ParallelPort.cpp @@ -67,9 +67,11 @@ void ParallelPort::poll() return; if (log->is_open()) { - WORD wData = fpInp32(888); - //*log << gTimer.timestamp() << "\t" << wData << std::endl; - *log << gTimer.timestamp() << "," << wData << "," << gIntensity << std::endl; + if (hInpOutDll) { + WORD wData = fpInp32(888); + *log << gTimer.timestamp() << "\t" << wData << std::endl; + } + } } diff --git a/src/utils.cpp b/src/utils.cpp index ae189a0..4f189f4 100644 --- a/src/utils.cpp +++ b/src/utils.cpp @@ -50,4 +50,3 @@ GlobalTimer gTimer; QString gBinaryPath = ""; QString gCurrentSubjectName = ""; QString gFileIndexStr = "0000"; -std::atomic gIntensity = 0; diff --git a/src/utils.h b/src/utils.h index c2fac6e..393dfdc 100644 --- a/src/utils.h +++ b/src/utils.h @@ -23,7 +23,6 @@ void exitBanner(); extern QString gBinaryPath; extern QString gCurrentSubjectName; extern QString gFileIndexStr; -extern std::atomic gIntensity; extern GlobalTimer gTimer; // Only valid after first frame has been received! void logMessages(QtMsgType type, const QMessageLogContext &context, const QString &msg); -- GitLab