From 6aabd0f1a8aae489e895c0212532dd7462e88661 Mon Sep 17 00:00:00 2001 From: Hiro Protagonist Date: Tue, 4 Apr 2017 17:10:12 +1200 Subject: [PATCH] A bit more refactoring. --- src/imagegrabber.h | 3 ++- src/serialcommunicator.h | 12 +++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/imagegrabber.h b/src/imagegrabber.h index 2d41320..7cff60a 100644 --- a/src/imagegrabber.h +++ b/src/imagegrabber.h @@ -10,12 +10,13 @@ class ImageGrabber : public QThread { public: ImageGrabber( QObject * parent = 0 ) : QThread( parent ) {} void run() Q_DECL_OVERRIDE; + void setCamera( FlyCapture2::Camera * cam ); private: bool capture; - FlyCapture2::Camera * cam; + FlyCapture2::Camera * cam; FlyCapture2::Image tmp; signals: diff --git a/src/serialcommunicator.h b/src/serialcommunicator.h index bf98f37..15e49d0 100644 --- a/src/serialcommunicator.h +++ b/src/serialcommunicator.h @@ -9,13 +9,12 @@ class SerialCommunicator : public QObject { public: explicit SerialCommunicator( QObject * parent = 0 ); ~SerialCommunicator(); - const QList &getPorts(); + bool isConnected() const { return port.isOpen(); } - signals: - void dataRead( QByteArray data ); + const QList &getPorts(); public slots: // returns False if the port is not open @@ -43,12 +42,15 @@ class SerialCommunicator : public QObject { private: QSerialPort port; QList ports; - void write( QByteArray data ); - int lastBuff; + void write( QByteArray data ); + private slots: void handleRead(); + + signals: + void dataRead( QByteArray data ); }; bool SerialCommunicator::selectPort( const int index ) {