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

diff --git a/client/proxguiqt.h b/client/proxguiqt.h
index 794db2d7..5f7199fc 100644
--- 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>
@@ -22,6 +28,7 @@
 class Plot: public QWidget
 {
 private:
+	QWidget *master;
 	int GraphStart;
 	double GraphPixelsPerPoint;
 	int CursorAPos;
@@ -32,6 +39,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 +59,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);
@@ -71,10 +84,23 @@ class ProxWidget : public QWidget
 		void applyOperation();
 		void stickOperation();
 		void vchange_autocorr(int v);
+		void vchange_askedge(int v);
 		void vchange_dthr_up(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;
@@ -84,23 +110,27 @@ 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);
 		void HideGraphWindow(void);
 		void MainLoop(void);
-	
+		void Exit(void);
 	private slots:
 		void _ShowGraphWindow(void);
 		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