Merge pull request #913 from 0x2b3bfa0/patch-1

[proxmark3-svn] / client / proxguiqt.h

diff --git a/client/proxguiqt.h b/client/proxguiqt.h
index 4b2b2a2773054db7f24d38c7c090ea28b71b0bc8..9677b49c1c4d4a188f26ebacf67dc4c2e25ee528 100644 (file)
--- a/client/proxguiqt.h
+++ b/client/proxguiqt.h
@@ -21,7 +21,6 @@
 #include <QPainter>
 #include <QtGui>
 
 #include <QPainter>
 #include <QtGui>
 

-#include "uart.h"

 #include "ui/ui_overlays.h"
 /**
  * @brief The actual plot, black area were we paint the graph
 #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:
 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);
        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:
                //OpsShow(void);
 
        protected:

-       //      void paintEvent(QPaintEvent *event);
+       //  void paintEvent(QPaintEvent *event);

                void closeEvent(QCloseEvent *event);
                void showEvent(QShowEvent *event);
                void hideEvent(QHideEvent *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();
        public slots:
                void applyOperation();
                void stickOperation();


@@ -92,14 +92,13 @@ class ProxWidget : public QWidget
 class WorkerThread : public QThread {
                Q_OBJECT;
        public:
 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;
                ~WorkerThread();
                void run();
        private:
                char *script_cmds_file = NULL;
                char *script_cmd = NULL;
                bool usb_present;

-               serial_port *sp = NULL;

 };
 
 class ProxGuiQT : public QObject
 };
 
 class ProxGuiQT : public QObject


@@ -111,9 +110,8 @@ class ProxGuiQT : public QObject
                ProxWidget *plotwidget;
                int argc;
                char **argv;
                ProxWidget *plotwidget;
                int argc;
                char **argv;

-               void (*main_func)(void);

                WorkerThread *proxmarkThread;
                WorkerThread *proxmarkThread;

-       
+

        public:
                ProxGuiQT(int argc, char **argv, WorkerThread *wthread);
                ~ProxGuiQT(void);
        public:
                ProxGuiQT(int argc, char **argv, WorkerThread *wthread);
                ~ProxGuiQT(void);