Merge pull request #938 from pwpiwi/fix_printf_scanf

[proxmark3-svn] / client / proxguiqt.h

diff --git a/client/proxguiqt.h b/client/proxguiqt.h
index e43311ee2ff1af0ed65387079d7d53c50e181953..9677b49c1c4d4a188f26ebacf67dc4c2e25ee528 100644 (file)
--- a/client/proxguiqt.h
+++ b/client/proxguiqt.h
@@ -29,8 +29,8 @@ class Plot: public QWidget
 {
 private:
        QWidget *master;
 {
 private:
        QWidget *master;

-       int GraphStart;
-       double GraphPixelsPerPoint;
+       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();


@@ -110,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);