X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/999d57c20113c76bab27fc190c5fa394f9274629..ae60ceca92b802fc980a883cb280d1c57b7932cf:/client/proxguiqt.h?ds=sidebyside

diff --git a/client/proxguiqt.h b/client/proxguiqt.h
index 8ea4d312..9677b49c 100644
--- a/client/proxguiqt.h
+++ b/client/proxguiqt.h
@@ -11,6 +11,9 @@
 #ifndef PROXGUI_QT
 #define PROXGUI_QT
 
+#include <stdint.h>
+#include <string.h>
+
 #include <QApplication>
 #include <QPushButton>
 #include <QObject>
@@ -25,8 +28,9 @@
 class Plot: public QWidget
 {
 private:
-	int GraphStart;
-	double GraphPixelsPerPoint;
+	QWidget *master;
+	int GraphStart; // Starting point/offset for the left side of the graph
+	double GraphPixelsPerPoint; // How many visual pixels are between each sample point (x axis)
 	int CursorAPos;
 	int CursorBPos;
 	void PlotGraph(int *buffer, int len, QRect r,QRect r2, QPainter* painter, int graphNum);
@@ -69,13 +73,13 @@ class ProxWidget : public QWidget
 		//OpsShow(void);
 
 	protected:
-	//	void paintEvent(QPaintEvent *event);
+	//  void paintEvent(QPaintEvent *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);
+	//  void mouseMoveEvent(QMouseEvent *event);
+	//  void mousePressEvent(QMouseEvent *event) { mouseMoveEvent(event); }
+	//  void keyPressEvent(QKeyEvent *event);
 	public slots:
 		void applyOperation();
 		void stickOperation();
@@ -85,6 +89,18 @@ class ProxWidget : public QWidget
 		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;
@@ -94,10 +110,10 @@ class ProxGuiQT : public QObject
 		ProxWidget *plotwidget;
 		int argc;
 		char **argv;
-		void (*main_func)(void);
-	
+		WorkerThread *proxmarkThread;
+
 	public:
-		ProxGuiQT(int argc, char **argv);
+		ProxGuiQT(int argc, char **argv, WorkerThread *wthread);
 		~ProxGuiQT(void);
 		void ShowGraphWindow(void);
 		void RepaintGraphWindow(void);
@@ -109,10 +125,12 @@ class ProxGuiQT : public QObject
 		void _RepaintGraphWindow(void);
 		void _HideGraphWindow(void);
 		void _Exit(void);
+		void _StartProxmarkThread(void);
 	signals:
 		void ShowGraphWindowSignal(void);
 		void RepaintGraphWindowSignal(void);
 		void HideGraphWindowSignal(void);
 		void ExitSignal(void);
 };
+
 #endif // PROXGUI_QT