Update README.md

[proxmark3-svn] / client / proxguiqt.cpp

diff --git a/client/proxguiqt.cpp b/client/proxguiqt.cpp
index 6171c429ddb3b22a1239073d5e5bd3cdceb9b4e0..dc8279b52ec340596c6420deb94634c561bd7457 100644 (file)
--- a/client/proxguiqt.cpp
+++ b/client/proxguiqt.cpp
@@ -32,7 +32,7 @@ bool g_useOverlays = false;
 int g_absVMax = 0;
 int startMax;
 int PageWidth;
 int g_absVMax = 0;
 int startMax;
 int PageWidth;

-
+int unlockStart = 0;

 
 void ProxGuiQT::ShowGraphWindow(void)
 {
 
 void ProxGuiQT::ShowGraphWindow(void)
 {


@@ -84,6 +84,18 @@ void ProxGuiQT::_HideGraphWindow(void)
 void ProxGuiQT::_Exit(void) {
        delete this;
 }
 void ProxGuiQT::_Exit(void) {
        delete this;
 }

+
+void ProxGuiQT::_StartProxmarkThread(void) {
+       if (!proxmarkThread)
+               return;
+
+       // if thread finished delete self and delete application
+       QObject::connect(proxmarkThread, SIGNAL(finished()), proxmarkThread, SLOT(deleteLater()));
+       QObject::connect(proxmarkThread, SIGNAL(finished()), this, SLOT(_Exit()));
+       // start proxmark thread
+       proxmarkThread->start();
+}
+

 void ProxGuiQT::MainLoop()
 {
        plotapp = new QApplication(argc, argv);
 void ProxGuiQT::MainLoop()
 {
        plotapp = new QApplication(argc, argv);


@@ -93,11 +105,14 @@ void ProxGuiQT::MainLoop()
        connect(this, SIGNAL(HideGraphWindowSignal()), this, SLOT(_HideGraphWindow()));
        connect(this, SIGNAL(ExitSignal()), this, SLOT(_Exit()));
 
        connect(this, SIGNAL(HideGraphWindowSignal()), this, SLOT(_HideGraphWindow()));
        connect(this, SIGNAL(ExitSignal()), this, SLOT(_Exit()));
 

+       //start proxmark thread after starting event loop
+       QTimer::singleShot(200, this, SLOT(_StartProxmarkThread()));
+

        plotapp->exec();
 }
 
        plotapp->exec();
 }
 

-ProxGuiQT::ProxGuiQT(int argc, char **argv) : plotapp(NULL), plotwidget(NULL),
-       argc(argc), argv(argv)
+ProxGuiQT::ProxGuiQT(int argc, char **argv, WorkerThread *wthread) : plotapp(NULL), plotwidget(NULL),
+       argc(argc), argv(argv), proxmarkThread(wthread)

 {
 }
 
 {
 }
 


@@ -110,7 +125,7 @@ ProxGuiQT::~ProxGuiQT(void)
        //}
        if (plotapp) {
                plotapp->quit();
        //}
        if (plotapp) {
                plotapp->quit();

-               delete plotapp;
+               // delete plotapp;

                plotapp = NULL;
        }
 }
                plotapp = NULL;
        }
 }


@@ -119,13 +134,13 @@ ProxGuiQT::~ProxGuiQT(void)
 void ProxWidget::applyOperation()
 {
        //printf("ApplyOperation()");
 void ProxWidget::applyOperation()
 {
        //printf("ApplyOperation()");

-       save_restoreGB(1);
+       save_restoreGB(GRAPH_SAVE);

        memcpy(GraphBuffer, s_Buff, sizeof(int) * GraphTraceLen);
        RepaintGraphWindow();
 }
 void ProxWidget::stickOperation()
 {
        memcpy(GraphBuffer, s_Buff, sizeof(int) * GraphTraceLen);
        RepaintGraphWindow();
 }
 void ProxWidget::stickOperation()
 {

-       save_restoreGB(0);
+       save_restoreGB(GRAPH_RESTORE);

        //printf("stickOperation()");
 }
 void ProxWidget::vchange_autocorr(int v)
        //printf("stickOperation()");
 }
 void ProxWidget::vchange_autocorr(int v)


@@ -434,11 +449,22 @@ void Plot::PlotGraph(int *buffer, int len, QRect plotRect, QRect annotationRect,
 
 void Plot::plotGridLines(QPainter* painter,QRect r)
 {
 
 void Plot::plotGridLines(QPainter* painter,QRect r)
 {

+       // set GridOffset
+       if (PlotGridX <= 0) return;
+       int offset = GridOffset;
+       if (GridLocked && PlotGridX) {
+               offset = GridOffset + PlotGridX - (GraphStart % PlotGridX);
+       } else if (!GridLocked && GraphStart > 0 && PlotGridX) {
+               offset = PlotGridX-((GraphStart - offset) % PlotGridX) + GraphStart - unlockStart;
+       }
+       offset %= PlotGridX;
+       if (offset < 0) offset += PlotGridX;
+

        int i;
        int grid_delta_x = (int) (PlotGridX * GraphPixelsPerPoint);
        int grid_delta_y = PlotGridY;
        if ((PlotGridX > 0) && ((PlotGridX * GraphPixelsPerPoint) > 1)) {
        int i;
        int grid_delta_x = (int) (PlotGridX * GraphPixelsPerPoint);
        int grid_delta_y = PlotGridY;
        if ((PlotGridX > 0) && ((PlotGridX * GraphPixelsPerPoint) > 1)) {

-               for(i = (GridOffset * GraphPixelsPerPoint); i < r.right(); i += grid_delta_x) {
+               for(i = (offset * GraphPixelsPerPoint); i < r.right(); i += grid_delta_x) {

                        painter->drawLine(r.left()+i, r.top(), r.left()+i, r.bottom());
                } 
        }
                        painter->drawLine(r.left()+i, r.top(), r.left()+i, r.bottom());
                } 
        }


@@ -581,9 +607,6 @@ void Plot::mouseMoveEvent(QMouseEvent *event)
 void Plot::keyPressEvent(QKeyEvent *event)
 {
        int     offset;
 void Plot::keyPressEvent(QKeyEvent *event)
 {
        int     offset;

-       int     gridchanged;
-
-       gridchanged= 0;

 
        if(event->modifiers() & Qt::ShiftModifier) {
                if (PlotGridX)
 
        if(event->modifiers() & Qt::ShiftModifier) {
                if (PlotGridX)


@@ -611,53 +634,18 @@ void Plot::keyPressEvent(QKeyEvent *event)
 
                case Qt::Key_Right:
                        if(GraphPixelsPerPoint < 20) {
 
                case Qt::Key_Right:
                        if(GraphPixelsPerPoint < 20) {

-                               if (PlotGridX && GridLocked && GraphStart < startMax){
-                                       GridOffset -= offset;
-                                       GridOffset %= PlotGridX;
-                                       gridchanged= 1;
-                               }

                                GraphStart += offset;
                        } else {
                                GraphStart += offset;
                        } else {

-                               if (PlotGridX && GridLocked && GraphStart < startMax){
-                                       GridOffset--;
-                                       GridOffset %= PlotGridX;
-                                       gridchanged= 1;
-                               }

                                GraphStart++;
                        }
                                GraphStart++;
                        }

-                       if(GridOffset < 0) {
-                               GridOffset += PlotGridX;
-                       }
-                       if (gridchanged)
-                               if (GraphStart > startMax) {
-                                       GridOffset += (GraphStart - startMax);
-                                       GridOffset %= PlotGridX;
-                               }

                        break;
 
                case Qt::Key_Left:
                        if(GraphPixelsPerPoint < 20) {
                        break;
 
                case Qt::Key_Left:
                        if(GraphPixelsPerPoint < 20) {

-                               if (PlotGridX && GridLocked && GraphStart > 0){
-                                       GridOffset += offset;
-                                       GridOffset %= PlotGridX;
-                                       gridchanged= 1;
-                               }

                                GraphStart -= offset;
                        } else {
                                GraphStart -= offset;
                        } else {

-                               if (PlotGridX && GridLocked && GraphStart > 0){
-                                       GridOffset++;
-                                       GridOffset %= PlotGridX;
-                                       gridchanged= 1;
-                               }

                                GraphStart--;
                        }
                                GraphStart--;
                        }

-                       if (gridchanged){
-                               if (GraphStart < 0)
-                                       GridOffset += GraphStart;
-                               if(GridOffset < 0)
-                                       GridOffset += PlotGridX;
-                       GridOffset %= PlotGridX;
-                       }

                        break;
 
                case Qt::Key_G:
                        break;
 
                case Qt::Key_G:


@@ -667,7 +655,7 @@ void Plot::keyPressEvent(QKeyEvent *event)
                        } else {
                                PlotGridX= PlotGridXdefault;
                                PlotGridY= PlotGridYdefault;
                        } else {
                                PlotGridX= PlotGridXdefault;
                                PlotGridY= PlotGridYdefault;

-                               }
+                       }

                        break;
 
                case Qt::Key_H:
                        break;
 
                case Qt::Key_H:


@@ -692,7 +680,11 @@ void Plot::keyPressEvent(QKeyEvent *event)
                        break;
 
                case Qt::Key_L:
                        break;
 
                case Qt::Key_L:

-                       GridLocked= !GridLocked;
+                       GridLocked = !GridLocked;
+                       if (GridLocked)
+                               GridOffset += (GraphStart - unlockStart);
+                       else
+                               unlockStart = GraphStart;

                        break;
 
                case Qt::Key_Q:
                        break;
 
                case Qt::Key_Q: