Merge pull request #302 from pwpiwi/fix_QtThreads

[proxmark3-svn] / client / proxguiqt.h

diff --git a/client/proxguiqt.h b/client/proxguiqt.h
index fa1ba018d756874da56182ce6658e8c53e3798bb..73f9286c39440ce9e58d2b3b8eff4bf68dbe73ca 100644 (file)
--- a/client/proxguiqt.h
+++ b/client/proxguiqt.h
@@ -8,6 +8,12 @@
 // GUI (QT)
 //-----------------------------------------------------------------------------
 
+#ifndef PROXGUI_QT
+#define PROXGUI_QT
+
+#include <stdint.h>
+#include <string.h>
+
 #include <QApplication>
 #include <QPushButton>
 #include <QObject>
@@ -32,6 +38,7 @@ private:
        int xCoordOf(int i, QRect r );
        int yCoordOf(int v, QRect r, int maxVal);
        int valueOf_yCoord(int y, QRect r, int maxVal);
+       void setMaxAndStart(int *buffer, int len, QRect plotRect);
        QColor getColor(int graphNum);
 public:
        Plot(QWidget *parent = 0);
@@ -51,19 +58,24 @@ class ProxGuiQT;
  */
 class ProxWidget : public QWidget
 {
-       Q_OBJECT;
+       Q_OBJECT; //needed for slot/signal classes
 
        private:
+               ProxGuiQT *master;
                Plot *plot;
                Ui::Form *opsController;
-               ProxGuiQT *master;
-       
+               QWidget* controlWidget;
+
        public:
                ProxWidget(QWidget *parent = 0, ProxGuiQT *master = NULL);
+               ~ProxWidget(void);
+               //OpsShow(void);
 
-       //protected:
+       protected:
        //      void paintEvent(QPaintEvent *event);
-       //      void closeEvent(QCloseEvent *event);
+               void closeEvent(QCloseEvent *event);
+               void showEvent(QShowEvent *event);
+               void hideEvent(QHideEvent *event);
        //      void mouseMoveEvent(QMouseEvent *event);
        //      void mousePressEvent(QMouseEvent *event) { mouseMoveEvent(event); }
        //      void keyPressEvent(QKeyEvent *event);
@@ -94,14 +106,29 @@ class ProxGuiQT : public QObject
                void RepaintGraphWindow(void);
                void HideGraphWindow(void);
                void MainLoop(void);
-       
+               void Exit(void);
        private slots:
                void _ShowGraphWindow(void);
                void _RepaintGraphWindow(void);
                void _HideGraphWindow(void);
-
+               void _Exit(void);
        signals:
                void ShowGraphWindowSignal(void);
                void RepaintGraphWindowSignal(void);
                void HideGraphWindowSignal(void);
+               void ExitSignal(void);
+};
+
+
+class WorkerThread : public QThread {
+       Q_OBJECT;
+public:
+       WorkerThread(char*, bool);
+       ~WorkerThread();
+       void run();
+private:
+       char *script_cmds_file = NULL;
+       bool usb_present = false;
 };
+
+#endif // PROXGUI_QT