Merge pull request #90 from 4m4rOk/master

[proxmark3-svn] / client / proxguiqt.cpp

diff --git a/client/proxguiqt.cpp b/client/proxguiqt.cpp
index b269d72176348a4a32c7d45d915f985ff1ba2f25..b1e6b7a00346d436f110a377e067b6f7ce10ec55 100644 (file)
--- a/client/proxguiqt.cpp
+++ b/client/proxguiqt.cpp
@@ -9,6 +9,7 @@
 //-----------------------------------------------------------------------------
 
 #include <iostream>
+//#include <QT>
 #include <QPainterPath>
 #include <QBrush>
 #include <QPen>
@@ -278,8 +279,10 @@ void ProxWidget::paintEvent(QPaintEvent *event)
                int foo = 40 + (int)((CursorCPos - GraphStart) * GraphPixelsPerPoint);  
                int bar = 40 + ((CursorDPos - GraphStart) * GraphPixelsPerPoint);       
                QRect r_stt(foo, r.top(), bar-foo, r.bottom() );
-               painter.fillRect(r_stt, QBrush( QT_ORANGE_TS ));
-               painter.drawRect(r_stt);
+               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
@@ -293,8 +296,11 @@ void ProxWidget::paintEvent(QPaintEvent *event)
                        int foo = 40 + (int)((i - GraphStart) * GraphPixelsPerPoint);   
                        int bar = 40 + ((i + PlotClock - GraphStart) * GraphPixelsPerPoint);    
                        QRect r_clock(foo, r.top(), bar-foo, r.bottom() );
-                       painter.fillRect(r_clock, QBrush( QT_RED_TS ));
-                       painter.drawRect(r_clock);
+                       
+                       QBrush b_clk( QBrush( QT_RED_TS ));
+                       b_clk.setStyle(Qt::Dense1Pattern);
+                       painter.setPen(Qt::NoPen);
+                       painter.fillRect(r_clock, b_clk);
                }
        }
        
@@ -309,7 +315,7 @@ void ProxWidget::paintEvent(QPaintEvent *event)
        //painter.setPen( QT_LIGHTBLUE ); painter.drawPath(cursorDPath);
 
        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,
                        CursorBPos - CursorAPos,
                        (CursorBPos - CursorAPos)/CursorScaleFactor,
@@ -320,11 +326,12 @@ void ProxWidget::paintEvent(QPaintEvent *event)
                        GraphBuffer[CursorBPos],
                        PlotGridXdefault,
                        PlotGridYdefault,
-                       GridLocked ? "Locked" : "Unlocked"
+                       GridLocked ? "Locked" : "Unlocked",
+                       PlotClock
                );
 
        painter.setPen( QT_WHITE );
-       painter.drawText(50, r.bottom() - 20, str);
+       painter.drawText(50, r.bottom() - 10, str);
 }
 
 ProxWidget::ProxWidget(QWidget *parent) : QWidget(parent), GraphStart(0), GraphPixelsPerPoint(1)
@@ -339,6 +346,7 @@ ProxWidget::ProxWidget(QWidget *parent) : QWidget(parent), GraphStart(0), GraphP
        setAutoFillBackground(true);
        CursorAPos = 0;
        CursorBPos = 0;
+       PlotClock = 0;
 }
 
 void ProxWidget::closeEvent(QCloseEvent *event)