syntax sugar

[proxmark3-svn] / client / proxguiqt.cpp

diff --git a/client/proxguiqt.cpp b/client/proxguiqt.cpp
index 3e9bdfd5f7add82182a3675c015f560e44e84313..b1e6b7a00346d436f110a377e067b6f7ce10ec55 100644 (file)
--- a/client/proxguiqt.cpp
+++ b/client/proxguiqt.cpp
@@ -9,6 +9,7 @@
 //-----------------------------------------------------------------------------
 
 #include <iostream>
 //-----------------------------------------------------------------------------
 
 #include <iostream>

+//#include <QT>

 #include <QPainterPath>
 #include <QBrush>
 #include <QPen>
 #include <QPainterPath>
 #include <QBrush>
 #include <QPen>


@@ -80,10 +81,7 @@ void ProxGuiQT::MainLoop()
        plotapp->exec();
 }
 
        plotapp->exec();
 }
 

-ProxGuiQT::ProxGuiQT(int argc, char **argv) : plotapp(NULL), plotwidget(NULL),
-       argc(argc), argv(argv)
-{
-}
+ProxGuiQT::ProxGuiQT(int argc, char **argv) : plotapp(NULL), plotwidget(NULL), argc(argc), argv(argv) {}

 
 ProxGuiQT::~ProxGuiQT(void)
 {
 
 ProxGuiQT::~ProxGuiQT(void)
 {


@@ -99,29 +97,41 @@ ProxGuiQT::~ProxGuiQT(void)
        }
 }
 
        }
 }
 

+// solid colors
+#define QT_ORANGE QColor(255, 153, 0)
+#define QT_WHITE QColor(255, 255, 255)
+#define QT_YELLOW QColor(255, 255, 0)
+#define QT_MAGENTA QColor(255, 0, 255)
+#define QT_LIGHTBLUE QColor(0, 0, 205)
+#define QT_LIGHTGREEN QColor(100, 255, 100)
+#define QT_GRAY QColor(100,100,100)
+#define QT_BLACK QColor(0,0,0)
+// transparent colors
+#define QT_ORANGE_TS QColor(255, 153, 0, 96)
+#define QT_RED_TS QColor(255, 0, 0, 64)
+#define QT_BLACK_TS QColor(0,0,0,0)
+       

 void ProxWidget::paintEvent(QPaintEvent *event)
 {
        QPainter painter(this);
 void ProxWidget::paintEvent(QPaintEvent *event)
 {
        QPainter painter(this);

-       QPainterPath penPath, whitePath, greyPath, lightgreyPath, cursorAPath, cursorBPath;
+       QPainterPath penPath, whitePath, greyPath, lightgreyPath, cursorAPath, cursorBPath, cursorCPath, cursorDPath;

        QRect r;
        QRect r;

-       QBrush brush(QColor(100, 255, 100));
-       QPen pen(QColor(100, 255, 100));
+       QBrush brush(QT_LIGHTGREEN);
+       QPen pen(QT_LIGHTGREEN);

 
        painter.setFont(QFont("Arial", 10));
 
 
        painter.setFont(QFont("Arial", 10));
 

-       if(GraphStart < 0) {
+       if(GraphStart < 0) 

                GraphStart = 0;
                GraphStart = 0;

-       }

 
 

-       if (CursorAPos > GraphTraceLen)
-               CursorAPos= 0;
-       if(CursorBPos > GraphTraceLen)
-               CursorBPos= 0;
+       if (CursorAPos > GraphTraceLen) CursorAPos = 0;
+       if (CursorBPos > GraphTraceLen) CursorBPos = 0;
+       if (CursorCPos > GraphTraceLen) CursorCPos = 0;
+       if (CursorDPos > GraphTraceLen) CursorDPos = 0;

 
        r = rect();
 
        r = rect();

-
-       painter.fillRect(r, QColor(0, 0, 0));
-
+       painter.fillRect(r, QT_BLACK);
+       

        whitePath.moveTo(r.left() + 40, r.top());
        whitePath.lineTo(r.left() + 40, r.bottom());
 
        whitePath.moveTo(r.left() + 40, r.top());
        whitePath.lineTo(r.left() + 40, r.bottom());
 


@@ -129,64 +139,65 @@ void ProxWidget::paintEvent(QPaintEvent *event)
 
        greyPath.moveTo(r.left(), zeroHeight);
        greyPath.lineTo(r.right(), zeroHeight);
 
        greyPath.moveTo(r.left(), zeroHeight);
        greyPath.lineTo(r.right(), zeroHeight);

-       painter.setPen(QColor(100, 100, 100));
+       painter.setPen(QT_GRAY);

        painter.drawPath(greyPath);
 
        painter.drawPath(greyPath);
 

-       PageWidth= (int)((r.right() - r.left() - 40) / GraphPixelsPerPoint);
+       PageWidth = (int)((r.right() - r.left() - 40) / GraphPixelsPerPoint);

        
        

-        // plot X and Y grid lines
-        int i;
-        if ((PlotGridX > 0) && ((PlotGridX * GraphPixelsPerPoint) > 1)) {
-               for(i = 40 + (GridOffset * GraphPixelsPerPoint); i < r.right(); i += (int)(PlotGridX * GraphPixelsPerPoint)) {
-                       //SelectObject(hdc, GreyPenLite);
-                       //MoveToEx(hdc, r.left + i, r.top, NULL);
-                       //LineTo(hdc, r.left + i, r.bottom);
-                       lightgreyPath.moveTo(r.left()+i,r.top());
+       // plot X and Y grid lines
+       int i;
+       if ((PlotGridX > 0) && ((PlotGridX * GraphPixelsPerPoint) > 1)) {
+               for(i = 40 + (GridOffset * GraphPixelsPerPoint); i < r.right(); i += (int)(PlotGridX * GraphPixelsPerPoint)) {
+                       //SelectObject(hdc, GreyPenLite);
+                       //MoveToEx(hdc, r.left + i, r.top, NULL);
+                       //LineTo(hdc, r.left + i, r.bottom);
+                       lightgreyPath.moveTo(r.left()+i,r.top());

                        lightgreyPath.lineTo(r.left()+i,r.bottom());
                        painter.drawPath(lightgreyPath);
                        lightgreyPath.lineTo(r.left()+i,r.bottom());
                        painter.drawPath(lightgreyPath);

-               } 
-        } 
-        if ((PlotGridY > 0) && ((PlotGridY * GraphPixelsPerPoint) > 1)){
-               for(i = 0; i < ((r.top() + r.bottom())>>1); i += (int)(PlotGridY * GraphPixelsPerPoint)) {
-                               lightgreyPath.moveTo(r.left() + 40,zeroHeight + i);
+               } 
+       } 
+       if ((PlotGridY > 0) && ((PlotGridY * GraphPixelsPerPoint) > 1)){
+               for(i = 0; i < ((r.top() + r.bottom())>>1); i += (int)(PlotGridY * GraphPixelsPerPoint)) {
+                       lightgreyPath.moveTo(r.left() + 40,zeroHeight + i);

                        lightgreyPath.lineTo(r.right(),zeroHeight + i);
                        painter.drawPath(lightgreyPath);
                        lightgreyPath.lineTo(r.right(),zeroHeight + i);
                        painter.drawPath(lightgreyPath);

-                       lightgreyPath.moveTo(r.left() + 40,zeroHeight - i);
+                       lightgreyPath.moveTo(r.left() + 40,zeroHeight - i);

                        lightgreyPath.lineTo(r.right(),zeroHeight - i);
                        painter.drawPath(lightgreyPath);
                        lightgreyPath.lineTo(r.right(),zeroHeight - i);
                        painter.drawPath(lightgreyPath);

-               }
-        }
+               }
+       }

 
        startMax = (GraphTraceLen - (int)((r.right() - r.left() - 40) / GraphPixelsPerPoint));
 
        startMax = (GraphTraceLen - (int)((r.right() - r.left() - 40) / GraphPixelsPerPoint));

-       if(startMax < 0) {
+       
+       if(startMax < 0) 

                startMax = 0;
                startMax = 0;

-       }
-       if(GraphStart > startMax) {
+       
+       if(GraphStart > startMax) 

                GraphStart = startMax;
                GraphStart = startMax;

-       }

 
        int absYMax = 1;
 
 
        int absYMax = 1;
 

-       for(i = GraphStart; ; i++) {
-               if(i >= GraphTraceLen) {
-                       break;
-               }
-               if(fabs((double)GraphBuffer[i]) > absYMax) {
+       for(i = GraphStart; ;i++) {
+
+               if(i >= GraphTraceLen) break;
+               
+               if (fabs((double)GraphBuffer[i]) > absYMax)

                        absYMax = (int)fabs((double)GraphBuffer[i]);
                        absYMax = (int)fabs((double)GraphBuffer[i]);

-               }
+               

                int x = 40 + (int)((i - GraphStart)*GraphPixelsPerPoint);
                int x = 40 + (int)((i - GraphStart)*GraphPixelsPerPoint);

-               if(x > r.right()) {
-                       break;
-               }
+
+               if(x > r.right()) break;

        }
 
        absYMax = (int)(absYMax*1.2 + 1);
        
        // number of points that will be plotted
        int span = (int)((r.right() - r.left()) / GraphPixelsPerPoint);
        }
 
        absYMax = (int)(absYMax*1.2 + 1);
        
        // number of points that will be plotted
        int span = (int)((r.right() - r.left()) / GraphPixelsPerPoint);

+       

        // one label every 100 pixels, let us say
        int labels = (r.right() - r.left() - 40) / 100;
        if(labels <= 0) labels = 1;
        // one label every 100 pixels, let us say
        int labels = (r.right() - r.left() - 40) / 100;
        if(labels <= 0) labels = 1;

+       

        int pointsPerLabel = span / labels;
        if(pointsPerLabel <= 0) pointsPerLabel = 1;
 
        int pointsPerLabel = span / labels;
        if(pointsPerLabel <= 0) pointsPerLabel = 1;
 


@@ -194,33 +205,36 @@ void ProxWidget::paintEvent(QPaintEvent *event)
        int yMax = INT_MIN;
        int yMean = 0;
        int n = 0;
        int yMax = INT_MIN;
        int yMean = 0;
        int n = 0;

+       //int stt_x1 = 0, stt_x2 = 0;

 
        for(i = GraphStart; ; i++) {
 
        for(i = GraphStart; ; i++) {

-               if(i >= GraphTraceLen) {
-                       break;
-               }
-               int x = 40 + (int)((i - GraphStart)*GraphPixelsPerPoint);
-               if(x > r.right() + GraphPixelsPerPoint) {
-                       break;
-               }
+               if(i >= GraphTraceLen) break;
+
+               // x == pixel pos.
+               int x = 40 + (int)((i - GraphStart) * GraphPixelsPerPoint);
+
+               // if x reaches end of box, stop loop
+               if(x > r.right() + GraphPixelsPerPoint) break;

 
                int y = GraphBuffer[i];
 
                int y = GraphBuffer[i];

-               if(y < yMin) {
+               if(y < yMin)

                        yMin = y;
                        yMin = y;

-               }
-               if(y > yMax) {
+
+               if(y > yMax)

                        yMax = y;
                        yMax = y;

-               }
+

                yMean += y;
                n++;
 
                y = (y * (r.top() - r.bottom()) / (2*absYMax)) + zeroHeight;
                yMean += y;
                n++;
 
                y = (y * (r.top() - r.bottom()) / (2*absYMax)) + zeroHeight;

-               if(i == GraphStart) {
+               
+               if(i == GraphStart)

                        penPath.moveTo(x, y);
                        penPath.moveTo(x, y);

-               } else {
+               else

                        penPath.lineTo(x, y);
                        penPath.lineTo(x, y);

-               }
+               

 
 

+               // small white boxes (the dots on the signal)

                if(GraphPixelsPerPoint > 10) {
                        QRect f(QPoint(x - 3, y - 3),QPoint(x + 3, y + 3));
                        painter.fillRect(f, brush);
                if(GraphPixelsPerPoint > 10) {
                        QRect f(QPoint(x - 3, y - 3),QPoint(x + 3, y + 3));
                        painter.fillRect(f, brush);


@@ -233,7 +247,7 @@ void ProxWidget::paintEvent(QPaintEvent *event)
                        char str[100];
                        sprintf(str, "+%d", (i - GraphStart));
 
                        char str[100];
                        sprintf(str, "+%d", (i - GraphStart));
 

-                       painter.setPen(QColor(255, 255, 255));
+                       painter.setPen( QT_WHITE );

                        QRect size;
                        QFontMetrics metrics(painter.font());
                        size = metrics.boundingRect(str);
                        QRect size;
                        QFontMetrics metrics(painter.font());
                        size = metrics.boundingRect(str);


@@ -242,54 +256,97 @@ void ProxWidget::paintEvent(QPaintEvent *event)
                        penPath.moveTo(x,y);
                }
 
                        penPath.moveTo(x,y);
                }
 

-               if(i == CursorAPos || i == CursorBPos) {
+               if(i == CursorAPos || i == CursorBPos || i == CursorCPos || i == CursorDPos) {

                        QPainterPath *cursorPath;
 
                        QPainterPath *cursorPath;
 

-                       if(i == CursorAPos) {
+                       if ( i == CursorAPos ) 

                                cursorPath = &cursorAPath;
                                cursorPath = &cursorAPath;

-                       } else {
+                       else if ( i == CursorBPos ) 

                                cursorPath = &cursorBPath;
                                cursorPath = &cursorBPath;

-                       }
+                       else if ( i == CursorCPos ) 
+                               cursorPath = &cursorCPath;
+                       else 
+                               cursorPath = &cursorDPath;
+                       

                        cursorPath->moveTo(x, r.top());
                        cursorPath->lineTo(x, r.bottom());
                        cursorPath->moveTo(x, r.top());
                        cursorPath->lineTo(x, r.bottom());

-                       penPath.moveTo(x, y);
+                       penPath.moveTo(x, y);           

                }
        }
                }
        }

-
-       if(n != 0) {
-               yMean /= n;
+       
+       // Mark STT block in signal
+       if ( CursorCPos > 0 ){
+               int foo = 40 + (int)((CursorCPos - GraphStart) * GraphPixelsPerPoint);  
+               int bar = 40 + ((CursorDPos - GraphStart) * GraphPixelsPerPoint);       
+               QRect r_stt(foo, r.top(), bar-foo, r.bottom() );
+               QBrush b_stt( QBrush( QT_ORANGE_TS ));
+               b_stt.setStyle(Qt::Dense1Pattern);
+               painter.setPen(Qt::NoPen);
+               painter.fillRect(r_stt, b_stt);
+       }
+       
+       // Mark Clock pulse
+       //extern int PlotClock, PlockClockStartIndex;
+       if ( PlotClock > 0){
+               for(int i = PlockClockStartIndex; ; i += PlotClock * 2) {
+
+                       if(i >= GraphTraceLen ) break;
+                       if ((CursorCPos > 0) && (i >= CursorCPos)) break;
+                       
+                       int foo = 40 + (int)((i - GraphStart) * GraphPixelsPerPoint);   
+                       int bar = 40 + ((i + PlotClock - GraphStart) * GraphPixelsPerPoint);    
+                       QRect r_clock(foo, r.top(), bar-foo, r.bottom() );
+                       
+                       QBrush b_clk( QBrush( QT_RED_TS ));
+                       b_clk.setStyle(Qt::Dense1Pattern);
+                       painter.setPen(Qt::NoPen);
+                       painter.fillRect(r_clock, b_clk);
+               }

        }
        }

+       
+       if(n != 0)
+               yMean /= n;

 
 

-       painter.setPen(QColor(255, 255, 255));
-       painter.drawPath(whitePath);
-       painter.setPen(pen);
-       painter.drawPath(penPath);
-       painter.setPen(QColor(255, 255, 0));
-       painter.drawPath(cursorAPath);
-       painter.setPen(QColor(255, 0, 255));
-       painter.drawPath(cursorBPath);
+       painter.setPen( QT_WHITE ); painter.drawPath(whitePath);
+       painter.setPen(pen); painter.drawPath(penPath);
+       painter.setPen( QT_YELLOW ); painter.drawPath(cursorAPath);
+       painter.setPen( QT_MAGENTA ); painter.drawPath(cursorBPath);
+       //painter.setPen( QT_ORANGE ); painter.drawPath(cursorCPath);
+       //painter.setPen( QT_LIGHTBLUE ); painter.drawPath(cursorDPath);

 
        char str[200];
 
        char str[200];

-       sprintf(str, "@%d   max=%d min=%d mean=%d n=%d/%d    dt=%d [%.3f] zoom=%.3f CursorA=%d [%d] CursorB=%d [%d]    GridX=%d GridY=%d (%s)",
+       sprintf(str, "@%d   max=%d min=%d mean=%d n=%d/%d    dt=%d [%.3f] zoom=%.3f CursorA=%d [%d] CursorB=%d [%d]  GridX=%d GridY=%d (%s)  [Clock RF/%d]",

                        GraphStart, yMax, yMin, yMean, n, GraphTraceLen,
                        GraphStart, yMax, yMin, yMean, n, GraphTraceLen,

-                       CursorBPos - CursorAPos, (CursorBPos - CursorAPos)/CursorScaleFactor,GraphPixelsPerPoint,CursorAPos,GraphBuffer[CursorAPos],CursorBPos,GraphBuffer[CursorBPos],PlotGridXdefault,PlotGridYdefault,GridLocked?"Locked":"Unlocked");
-
-       painter.setPen(QColor(255, 255, 255));
-       painter.drawText(50, r.bottom() - 20, str);
+                       CursorBPos - CursorAPos,
+                       (CursorBPos - CursorAPos)/CursorScaleFactor,
+                       GraphPixelsPerPoint,
+                       CursorAPos,
+                       GraphBuffer[CursorAPos],
+                       CursorBPos,
+                       GraphBuffer[CursorBPos],
+                       PlotGridXdefault,
+                       PlotGridYdefault,
+                       GridLocked ? "Locked" : "Unlocked",
+                       PlotClock
+               );
+
+       painter.setPen( QT_WHITE );
+       painter.drawText(50, r.bottom() - 10, str);

 }
 
 ProxWidget::ProxWidget(QWidget *parent) : QWidget(parent), GraphStart(0), GraphPixelsPerPoint(1)
 {
        resize(600, 300);
 
 }
 
 ProxWidget::ProxWidget(QWidget *parent) : QWidget(parent), GraphStart(0), GraphPixelsPerPoint(1)
 {
        resize(600, 300);
 

-       QPalette palette(QColor(0,0,0,0));
-       palette.setColor(QPalette::WindowText, QColor(255,255,255));
-       palette.setColor(QPalette::Text, QColor(255,255,255));
-       palette.setColor(QPalette::Button, QColor(100, 100, 100));
+       QPalette palette( QT_BLACK_TS );
+       palette.setColor(QPalette::WindowText, QT_WHITE );
+       palette.setColor(QPalette::Text, QT_WHITE );
+       palette.setColor(QPalette::Button, QT_GRAY );

        setPalette(palette);
        setAutoFillBackground(true);
        CursorAPos = 0;
        CursorBPos = 0;
        setPalette(palette);
        setAutoFillBackground(true);
        CursorAPos = 0;
        CursorBPos = 0;

+       PlotClock = 0;

 }
 
 void ProxWidget::closeEvent(QCloseEvent *event)
 }
 
 void ProxWidget::closeEvent(QCloseEvent *event)


@@ -310,7 +367,6 @@ void ProxWidget::mouseMoveEvent(QMouseEvent *event)
                CursorBPos = x;
        }
 
                CursorBPos = x;
        }
 

-

        this->update();
 }
 
        this->update();
 }