rename grabber to singlecamgrabber
This commit is contained in:
parent
ec3844ba9c
commit
d20ea22beb
@ -762,7 +762,7 @@ void PylonRecorder::startSinglecamRecording() {
|
|||||||
delete singlecamgrabber;
|
delete singlecamgrabber;
|
||||||
singlecamgrabber = nullptr;
|
singlecamgrabber = nullptr;
|
||||||
}
|
}
|
||||||
singlecamgrabber = new Grabber(singlecam, buffer, defaultFrameRate);
|
singlecamgrabber = new SinglecamGrabber(singlecam, buffer, defaultFrameRate);
|
||||||
|
|
||||||
if (framerateSpinner->value() != singlecamgrabber->currentFramerate())
|
if (framerateSpinner->value() != singlecamgrabber->currentFramerate())
|
||||||
singlecamgrabber->setFrameRate(framerateSpinner->value());
|
singlecamgrabber->setFrameRate(framerateSpinner->value());
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
#include "singlecamwrapper.h"
|
#include "singlecamwrapper.h"
|
||||||
#include "dualcamwrapper.h"
|
#include "dualcamwrapper.h"
|
||||||
#include "imagebuffer.h"
|
#include "imagebuffer.h"
|
||||||
#include "grabber.h"
|
#include "singlecamgrabber.h"
|
||||||
#include "dualcamgrabber.h"
|
#include "dualcamgrabber.h"
|
||||||
#include "writer.h"
|
#include "writer.h"
|
||||||
#include "projectsettings.h"
|
#include "projectsettings.h"
|
||||||
@ -108,7 +108,7 @@ private:
|
|||||||
SingleCamWrapper *singlecam;
|
SingleCamWrapper *singlecam;
|
||||||
DualcamWrapper *dualcam;
|
DualcamWrapper *dualcam;
|
||||||
ImageBuffer *buffer;
|
ImageBuffer *buffer;
|
||||||
Grabber *singlecamgrabber;
|
SinglecamGrabber *singlecamgrabber;
|
||||||
DualcamGrabber *dualcamgrabber;
|
DualcamGrabber *dualcamgrabber;
|
||||||
Writer *writer;
|
Writer *writer;
|
||||||
CameraLayout layout;
|
CameraLayout layout;
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
#include "grabber.h"
|
#include "singlecamgrabber.h"
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <pylon/PylonIncludes.h>
|
#include <pylon/PylonIncludes.h>
|
||||||
|
|
||||||
void Grabber::run() {
|
void SinglecamGrabber::run() {
|
||||||
stop_request = false;
|
stop_request = false;
|
||||||
int count = 0;
|
int count = 0;
|
||||||
if (camera->isOpen()) {
|
if (camera->isOpen()) {
|
@ -1,16 +1,16 @@
|
|||||||
#ifndef GRABBER_H
|
#ifndef SINGLECAMGRABBER_H
|
||||||
#define GRABBER_H
|
#define SINGLECAMGRABBER_H
|
||||||
|
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
#include <QThread>
|
#include <QThread>
|
||||||
#include "singlecamwrapper.h"
|
#include "singlecamwrapper.h"
|
||||||
#include "imagebuffer.h"
|
#include "imagebuffer.h"
|
||||||
|
|
||||||
class Grabber : public QThread
|
class SinglecamGrabber : public QThread
|
||||||
{
|
{
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
public:
|
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) {}
|
QThread(parent), camera(camera), buffer(buffer), framerate(framerate) {}
|
||||||
|
|
||||||
void run() override;
|
void run() override;
|
||||||
@ -51,4 +51,4 @@ signals:
|
|||||||
void terminated();
|
void terminated();
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // GRABBER_H
|
#endif // SINGLECAMGRABBER_H
|
Loading…
Reference in New Issue
Block a user