Merge branch 'master' into fix_iso15693_fpga

[proxmark3-svn] / client / proxguiqt.cpp

diff --git a/client/proxguiqt.cpp b/client/proxguiqt.cpp
index 30e4c8de782cd0f94d60db9d4834f35753296fde..cda90cc0d3c08bb010347b97fe9149aed8d4c348 100644 (file)
--- a/client/proxguiqt.cpp
+++ b/client/proxguiqt.cpp
@@ -34,8 +34,8 @@ extern "C" {
 
 bool g_useOverlays = false;
 int g_absVMax = 0;
 
 bool g_useOverlays = false;
 int g_absVMax = 0;

-int startMax;
-int PageWidth;
+int startMax;  // Maximum offset in the graph (right side of graph)
+int PageWidth; // How many samples are currently visible on this 'page' / graph

 int unlockStart = 0;
 
 void ProxGuiQT::ShowGraphWindow(void)
 int unlockStart = 0;
 
 void ProxGuiQT::ShowGraphWindow(void)


@@ -134,8 +134,8 @@ ProxGuiQT::~ProxGuiQT(void)
 {
        //if (plotwidget) {
                //plotwidget->destroy(true,true);
 {
        //if (plotwidget) {
                //plotwidget->destroy(true,true);

-       //      delete plotwidget;
-       //      plotwidget = NULL;
+       //  delete plotwidget;
+       //  plotwidget = NULL;

        //}
        if (plotapp) {
                plotapp->quit();
        //}
        if (plotapp) {
                plotapp->quit();


@@ -474,7 +474,7 @@ void Plot::plotGridLines(QPainter* painter,QRect r)
        if ((PlotGridX > 0) && ((PlotGridX * GraphPixelsPerPoint) > 1)) {
                for(i = (offset * GraphPixelsPerPoint); i < r.right(); i += grid_delta_x) {
                        painter->drawLine(r.left()+i, r.top(), r.left()+i, r.bottom());
        if ((PlotGridX > 0) && ((PlotGridX * GraphPixelsPerPoint) > 1)) {
                for(i = (offset * GraphPixelsPerPoint); i < r.right(); i += grid_delta_x) {
                        painter->drawLine(r.left()+i, r.top(), r.left()+i, r.bottom());

-               } 
+               }

        }
        if (PlotGridY > 0) {
                for(i = 0; yCoordOf(i,r,g_absVMax) > r.top(); i += grid_delta_y) {
        }
        if (PlotGridY > 0) {
                for(i = 0; yCoordOf(i,r,g_absVMax) > r.top(); i += grid_delta_y) {


@@ -509,8 +509,9 @@ void Plot::paintEvent(QPaintEvent *event)
        if(CursorDPos > GraphTraceLen)
                CursorDPos= 0;
 
        if(CursorDPos > GraphTraceLen)
                CursorDPos= 0;
 

-       QRect plotRect(WIDTH_AXES, 0, width()-WIDTH_AXES, height()-HEIGHT_INFO);
-       QRect infoRect(0, height()-HEIGHT_INFO, width(), HEIGHT_INFO);
+       QRect plotRect(WIDTH_AXES, 0, width() - WIDTH_AXES, height() - HEIGHT_INFO);
+       QRect infoRect(0, height() - HEIGHT_INFO, width(), HEIGHT_INFO);
+       PageWidth = plotRect.width() / GraphPixelsPerPoint;

 
        //Grey background
        painter.fillRect(rect(), QColor(60, 60, 60));
 
        //Grey background
        painter.fillRect(rect(), QColor(60, 60, 60));


@@ -529,7 +530,7 @@ void Plot::paintEvent(QPaintEvent *event)
 
        //Start painting graph
        PlotGraph(GraphBuffer, GraphTraceLen,plotRect,infoRect,&painter,0);
 
        //Start painting graph
        PlotGraph(GraphBuffer, GraphTraceLen,plotRect,infoRect,&painter,0);

-       if (showDemod && DemodBufferLen > 8) {
+       if (showDemod && DemodBufferLen > 8) {

                PlotDemod(DemodBuffer, DemodBufferLen,plotRect,infoRect,&painter,2,g_DemodStartIdx);
        }
        if (g_useOverlays) {
                PlotDemod(DemodBuffer, DemodBufferLen,plotRect,infoRect,&painter,2,g_DemodStartIdx);
        }
        if (g_useOverlays) {


@@ -564,7 +565,7 @@ void Plot::paintEvent(QPaintEvent *event)
        //Draw annotations
        char str[200];
        sprintf(str, "@%d  dt=%d [%2.2f] zoom=%2.2f  CursorAPos=%d  CursorBPos=%d  GridX=%d  GridY=%d (%s) GridXoffset=%d",
        //Draw annotations
        char str[200];
        sprintf(str, "@%d  dt=%d [%2.2f] zoom=%2.2f  CursorAPos=%d  CursorBPos=%d  GridX=%d  GridY=%d (%s) GridXoffset=%d",

-                       GraphStart,     CursorBPos - CursorAPos, (CursorBPos - CursorAPos)/CursorScaleFactor,
+                       GraphStart, CursorBPos - CursorAPos, (CursorBPos - CursorAPos)/CursorScaleFactor,

                        GraphPixelsPerPoint,CursorAPos,CursorBPos,PlotGridXdefault,PlotGridYdefault,GridLocked?"Locked":"Unlocked",GridOffset);
        painter.setPen(QColor(255, 255, 255));
        painter.drawText(20, infoRect.bottom() - 3, str);
                        GraphPixelsPerPoint,CursorAPos,CursorBPos,PlotGridXdefault,PlotGridYdefault,GridLocked?"Locked":"Unlocked",GridOffset);
        painter.setPen(QColor(255, 255, 255));
        painter.drawText(20, infoRect.bottom() - 3, str);


@@ -616,14 +617,14 @@ void Plot::mouseMoveEvent(QMouseEvent *event)
 
 void Plot::keyPressEvent(QKeyEvent *event)
 {
 
 void Plot::keyPressEvent(QKeyEvent *event)
 {

-       int     offset;
+       int offset; // Left/right movement offset (in sample size)

 
        if(event->modifiers() & Qt::ShiftModifier) {
                if (PlotGridX)
                        offset= PageWidth - (PageWidth % PlotGridX);
                else
                        offset= PageWidth;
 
        if(event->modifiers() & Qt::ShiftModifier) {
                if (PlotGridX)
                        offset= PageWidth - (PageWidth % PlotGridX);
                else
                        offset= PageWidth;

-       } else 
+       } else

                if(event->modifiers() & Qt::ControlModifier)
                        offset= 1;
                else
                if(event->modifiers() & Qt::ControlModifier)
                        offset= 1;
                else


@@ -671,20 +672,22 @@ void Plot::keyPressEvent(QKeyEvent *event)
                case Qt::Key_H:
                        puts("Plot Window Keystrokes:\n");
                        puts(" Key                      Action\n");
                case Qt::Key_H:
                        puts("Plot Window Keystrokes:\n");
                        puts(" Key                      Action\n");

+                       puts(" UP                       Zoom out");

                        puts(" DOWN                     Zoom in");
                        puts(" G                        Toggle grid display");
                        puts(" H                        Show help");
                        puts(" L                        Toggle lock grid relative to samples");
                        puts(" DOWN                     Zoom in");
                        puts(" G                        Toggle grid display");
                        puts(" H                        Show help");
                        puts(" L                        Toggle lock grid relative to samples");

+                       puts(" Q                        Hide window");
+                       puts(" HOME                     Move to the start of the graph");
+                       puts(" END                      Move to the end of the graph");

                        puts(" LEFT                     Move left");
                        puts(" <CTL>LEFT                Move left 1 sample");
                        puts(" <SHIFT>LEFT              Page left");
                        puts(" LEFT-MOUSE-CLICK         Set yellow cursor");
                        puts(" LEFT                     Move left");
                        puts(" <CTL>LEFT                Move left 1 sample");
                        puts(" <SHIFT>LEFT              Page left");
                        puts(" LEFT-MOUSE-CLICK         Set yellow cursor");

-                       puts(" Q                        Hide window");

                        puts(" RIGHT                    Move right");
                        puts(" <CTL>RIGHT               Move right 1 sample");
                        puts(" <SHIFT>RIGHT             Page right");
                        puts(" RIGHT-MOUSE-CLICK        Set purple cursor");
                        puts(" RIGHT                    Move right");
                        puts(" <CTL>RIGHT               Move right 1 sample");
                        puts(" <SHIFT>RIGHT             Page right");
                        puts(" RIGHT-MOUSE-CLICK        Set purple cursor");

-                       puts(" UP                       Zoom out");

                        puts("");
                        puts("Use client window 'data help' for more plot commands\n");
                        break;
                        puts("");
                        puts("Use client window 'data help' for more plot commands\n");
                        break;


@@ -701,6 +704,14 @@ void Plot::keyPressEvent(QKeyEvent *event)
                        master->hide();
                        break;
 
                        master->hide();
                        break;
 

+               case Qt::Key_Home:
+                       GraphStart = 0;
+                       break;
+
+               case Qt::Key_End:
+                       GraphStart = startMax;
+                       break;
+

                default:
                        QWidget::keyPressEvent(event);
                        return;
                default:
                        QWidget::keyPressEvent(event);
                        return;