Merge pull request #287 from pwpiwi/fix_usb

[proxmark3-svn] / client / proxguiqt.h

diff --git a/client/proxguiqt.h b/client/proxguiqt.h
index fa1ba018d756874da56182ce6658e8c53e3798bb..8ea4d312a2dda96455091e811b2bfb1ce942eca9 100644 (file)
--- a/client/proxguiqt.h
+++ b/client/proxguiqt.h
@@ -8,6 +8,9 @@
 // GUI (QT)
 //-----------------------------------------------------------------------------
 
 // GUI (QT)
 //-----------------------------------------------------------------------------
 

+#ifndef PROXGUI_QT
+#define PROXGUI_QT
+

 #include <QApplication>
 #include <QPushButton>
 #include <QObject>
 #include <QApplication>
 #include <QPushButton>
 #include <QObject>


@@ -32,6 +35,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);
        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);
        QColor getColor(int graphNum);
 public:
        Plot(QWidget *parent = 0);


@@ -51,19 +55,24 @@ class ProxGuiQT;
  */
 class ProxWidget : public QWidget
 {
  */
 class ProxWidget : public QWidget
 {

-       Q_OBJECT;
+       Q_OBJECT; //needed for slot/signal classes

 
        private:
 
        private:

+               ProxGuiQT *master;

                Plot *plot;
                Ui::Form *opsController;
                Plot *plot;
                Ui::Form *opsController;

-               ProxGuiQT *master;
-       
+               QWidget* controlWidget;
+

        public:
                ProxWidget(QWidget *parent = 0, ProxGuiQT *master = NULL);
        public:
                ProxWidget(QWidget *parent = 0, ProxGuiQT *master = NULL);

+               ~ProxWidget(void);
+               //OpsShow(void);

 
 

-       //protected:
+       protected:

        //      void paintEvent(QPaintEvent *event);
        //      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);
        //      void mouseMoveEvent(QMouseEvent *event);
        //      void mousePressEvent(QMouseEvent *event) { mouseMoveEvent(event); }
        //      void keyPressEvent(QKeyEvent *event);


@@ -94,14 +103,16 @@ class ProxGuiQT : public QObject
                void RepaintGraphWindow(void);
                void HideGraphWindow(void);
                void MainLoop(void);
                void RepaintGraphWindow(void);
                void HideGraphWindow(void);
                void MainLoop(void);

-       
+               void Exit(void);

        private slots:
                void _ShowGraphWindow(void);
                void _RepaintGraphWindow(void);
                void _HideGraphWindow(void);
        private slots:
                void _ShowGraphWindow(void);
                void _RepaintGraphWindow(void);
                void _HideGraphWindow(void);

-
+               void _Exit(void);

        signals:
                void ShowGraphWindowSignal(void);
                void RepaintGraphWindowSignal(void);
                void HideGraphWindowSignal(void);
        signals:
                void ShowGraphWindowSignal(void);
                void RepaintGraphWindowSignal(void);
                void HideGraphWindowSignal(void);

+               void ExitSignal(void);

 };
 };

+#endif // PROXGUI_QT