Merge branch 'master' into fix_hfmfsim

[proxmark3-svn] / client / proxguiqt.h

diff --git a/client/proxguiqt.h b/client/proxguiqt.h
index 73f9286c39440ce9e58d2b3b8eff4bf68dbe73ca..45a65b040c5702dc922644c8deb18bbbbe6206a0 100644 (file)
--- a/client/proxguiqt.h
+++ b/client/proxguiqt.h
@@ -88,6 +88,18 @@ class ProxWidget : public QWidget
                void vchange_dthr_down(int v);
 };
 
                void vchange_dthr_down(int v);
 };
 

+class WorkerThread : public QThread {
+               Q_OBJECT;
+       public:
+               WorkerThread(char*, char*, bool);
+               ~WorkerThread();
+               void run();
+       private:
+               char *script_cmds_file = NULL;
+               char *script_cmd = NULL;
+               bool usb_present;
+};
+

 class ProxGuiQT : public QObject
 {
        Q_OBJECT;
 class ProxGuiQT : public QObject
 {
        Q_OBJECT;


@@ -98,9 +110,10 @@ class ProxGuiQT : public QObject
                int argc;
                char **argv;
                void (*main_func)(void);
                int argc;
                char **argv;
                void (*main_func)(void);

+               WorkerThread *proxmarkThread;

        
        public:
        
        public:

-               ProxGuiQT(int argc, char **argv);
+               ProxGuiQT(int argc, char **argv, WorkerThread *wthread);

                ~ProxGuiQT(void);
                void ShowGraphWindow(void);
                void RepaintGraphWindow(void);
                ~ProxGuiQT(void);
                void ShowGraphWindow(void);
                void RepaintGraphWindow(void);


@@ -112,6 +125,7 @@ class ProxGuiQT : public QObject
                void _RepaintGraphWindow(void);
                void _HideGraphWindow(void);
                void _Exit(void);
                void _RepaintGraphWindow(void);
                void _HideGraphWindow(void);
                void _Exit(void);

+               void _StartProxmarkThread(void);

        signals:
                void ShowGraphWindowSignal(void);
                void RepaintGraphWindowSignal(void);
        signals:
                void ShowGraphWindowSignal(void);
                void RepaintGraphWindowSignal(void);


@@ -119,16 +133,4 @@ class ProxGuiQT : public QObject
                void ExitSignal(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
 #endif // PROXGUI_QT