From d20ea22beb97dd8a4b5512097c8c24584ce49099 Mon Sep 17 00:00:00 2001 From: Jan Grewe Date: Mon, 18 Mar 2024 09:37:22 +0100 Subject: [PATCH] rename grabber to singlecamgrabber --- pylonrecorder.cpp | 2 +- pylonrecorder.h | 4 ++-- grabber.cpp => singlecamgrabber.cpp | 4 ++-- grabber.h => singlecamgrabber.h | 10 +++++----- 4 files changed, 10 insertions(+), 10 deletions(-) rename grabber.cpp => singlecamgrabber.cpp (91%) rename grabber.h => singlecamgrabber.h (78%) diff --git a/pylonrecorder.cpp b/pylonrecorder.cpp index c9826d1..985242d 100644 --- a/pylonrecorder.cpp +++ b/pylonrecorder.cpp @@ -762,7 +762,7 @@ void PylonRecorder::startSinglecamRecording() { delete singlecamgrabber; singlecamgrabber = nullptr; } - singlecamgrabber = new Grabber(singlecam, buffer, defaultFrameRate); + singlecamgrabber = new SinglecamGrabber(singlecam, buffer, defaultFrameRate); if (framerateSpinner->value() != singlecamgrabber->currentFramerate()) singlecamgrabber->setFrameRate(framerateSpinner->value()); diff --git a/pylonrecorder.h b/pylonrecorder.h index 1aa8abe..d893480 100644 --- a/pylonrecorder.h +++ b/pylonrecorder.h @@ -10,7 +10,7 @@ #include "singlecamwrapper.h" #include "dualcamwrapper.h" #include "imagebuffer.h" -#include "grabber.h" +#include "singlecamgrabber.h" #include "dualcamgrabber.h" #include "writer.h" #include "projectsettings.h" @@ -108,7 +108,7 @@ private: SingleCamWrapper *singlecam; DualcamWrapper *dualcam; ImageBuffer *buffer; - Grabber *singlecamgrabber; + SinglecamGrabber *singlecamgrabber; DualcamGrabber *dualcamgrabber; Writer *writer; CameraLayout layout; diff --git a/grabber.cpp b/singlecamgrabber.cpp similarity index 91% rename from grabber.cpp rename to singlecamgrabber.cpp index fc87e10..60f044f 100644 --- a/grabber.cpp +++ b/singlecamgrabber.cpp @@ -1,8 +1,8 @@ -#include "grabber.h" +#include "singlecamgrabber.h" #include #include -void Grabber::run() { +void SinglecamGrabber::run() { stop_request = false; int count = 0; if (camera->isOpen()) { diff --git a/grabber.h b/singlecamgrabber.h similarity index 78% rename from grabber.h rename to singlecamgrabber.h index b6882e4..d2c4d6c 100644 --- a/grabber.h +++ b/singlecamgrabber.h @@ -1,16 +1,16 @@ -#ifndef GRABBER_H -#define GRABBER_H +#ifndef SINGLECAMGRABBER_H +#define SINGLECAMGRABBER_H #include #include #include "singlecamwrapper.h" #include "imagebuffer.h" -class Grabber : public QThread +class SinglecamGrabber : public QThread { Q_OBJECT public: - Grabber(SingleCamWrapper *camera, ImageBuffer*buffer, int framerate, QObject *parent = nullptr) : + SinglecamGrabber(SingleCamWrapper *camera, ImageBuffer*buffer, int framerate, QObject *parent = nullptr) : QThread(parent), camera(camera), buffer(buffer), framerate(framerate) {} void run() override; @@ -51,4 +51,4 @@ signals: void terminated(); }; -#endif // GRABBER_H +#endif // SINGLECAMGRABBER_H