From 0720c9bb28cf79ef317ae2c2bae06042fcf8b47a Mon Sep 17 00:00:00 2001 From: Grant Date: Wed, 20 Nov 2019 21:50:40 -0800 Subject: [PATCH] Link New Image Connection --- ImageManager.cpp | 2 +- ImageManager.hpp | 2 +- StreamManager.cpp | 3 +-- StreamManager.hpp | 2 +- StreamReader.hpp | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/ImageManager.cpp b/ImageManager.cpp index 919bcab..4b0c0e9 100644 --- a/ImageManager.cpp +++ b/ImageManager.cpp @@ -26,7 +26,7 @@ ImageManager::~ImageManager() } -void ImageManager::ProcessImage(uint32_t width, uint32_t height, uint8_t *imgPointer) +void ImageManager::ProcessImage(int width, int height, uint8_t *imgPointer) { Mat frame, mask, viewfinder; std::vector> contours; diff --git a/ImageManager.hpp b/ImageManager.hpp index 4cd104c..a974891 100644 --- a/ImageManager.hpp +++ b/ImageManager.hpp @@ -15,7 +15,7 @@ public: ImageManager(QObject *parent); virtual ~ImageManager(); - void ProcessImage(uint32_t width, uint32_t height, uint8_t *imgPointer); + void ProcessImage(int width, int height, uint8_t *imgPointer); void SendImage(cv::Mat image); QUdpSocket *socket; diff --git a/StreamManager.cpp b/StreamManager.cpp index 97341ae..0ee5629 100644 --- a/StreamManager.cpp +++ b/StreamManager.cpp @@ -42,14 +42,13 @@ StreamManager::~StreamManager() Disconnect(); } -void StreamManager::SendForProcessing(uint32_t width, uint32_t height, uint8_t *imgPointer) +void StreamManager::SendForProcessing(int width, int height, uint8_t *imgPointer) { ((FaultFinder *)parent())->image_mgr->ProcessImage(width, height, imgPointer); } void StreamManager::SetEmissivity(double emissivity) { - qInfo() << "HERE"; if (lDeviceParams) lDeviceParams->SetFloatValue("ObjectEmissivity", emissivity); } diff --git a/StreamManager.hpp b/StreamManager.hpp index 762c73c..917bf92 100644 --- a/StreamManager.hpp +++ b/StreamManager.hpp @@ -24,7 +24,7 @@ public: public slots: void SetEmissivity(double emissivity); - void SendForProcessing(uint32_t width, uint32_t height, uint8_t *imgPointer); + void SendForProcessing(int width, int height, uint8_t *imgPointer); private: PvResult FindDevice(); diff --git a/StreamReader.hpp b/StreamReader.hpp index e2981c2..3bc5f10 100644 --- a/StreamReader.hpp +++ b/StreamReader.hpp @@ -17,7 +17,7 @@ public: StreamReader(PvDevice *Device, PvStream *Stream, PvPipeline *Pipeline); signals: - void NewImage(uint32_t width, uint32_t height, uint8_t *imgPointer); + void NewImage(int width, int height, uint8_t *imgPointer); private: PvDevice *Device = NULL;