X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/afdcb8c159a73aba95a017f1cfec98e8fa2b93c1..3458bb279b00048892e56cec6f0a13e8c03f97db:/client/proxguiqt.h?ds=inline

diff --git a/client/proxguiqt.h b/client/proxguiqt.h
index 4b2b2a27..9677b49c 100644
--- a/client/proxguiqt.h
+++ b/client/proxguiqt.h
@@ -21,7 +21,6 @@
 #include <QPainter>
 #include <QtGui>
 
-#include "uart.h"
 #include "ui/ui_overlays.h"
 /**
  * @brief The actual plot, black area were we paint the graph
@@ -29,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);
@@ -73,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();
@@ -92,14 +92,13 @@ class ProxWidget : public QWidget
 class WorkerThread : public QThread {
 		Q_OBJECT;
 	public:
-		WorkerThread(char*, char*, bool, serial_port*);
+		WorkerThread(char*, char*, bool);
 		~WorkerThread();
 		void run();
 	private:
 		char *script_cmds_file = NULL;
 		char *script_cmd = NULL;
 		bool usb_present;
-		serial_port *sp = NULL;
 };
 
 class ProxGuiQT : public QObject
@@ -111,9 +110,8 @@ class ProxGuiQT : public QObject
 		ProxWidget *plotwidget;
 		int argc;
 		char **argv;
-		void (*main_func)(void);
 		WorkerThread *proxmarkThread;
-	
+
 	public:
 		ProxGuiQT(int argc, char **argv, WorkerThread *wthread);
 		~ProxGuiQT(void);