X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/18856d889485abf5839ae50a93d1df07240ad666..b62cbadb6198fcfcf7b6787acac01b5b7262eea6:/client/proxguiqt.cpp?ds=sidebyside diff --git a/client/proxguiqt.cpp b/client/proxguiqt.cpp index b34eecfd..151f6ce9 100644 --- a/client/proxguiqt.cpp +++ b/client/proxguiqt.cpp @@ -80,10 +80,7 @@ void ProxGuiQT::MainLoop() 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) { @@ -109,12 +106,12 @@ void ProxWidget::paintEvent(QPaintEvent *event) painter.setFont(QFont("Arial", 10)); - if(GraphStart < 0) { + if(GraphStart < 0) GraphStart = 0; - } if (CursorAPos > GraphTraceLen) CursorAPos= 0; + if(CursorBPos > GraphTraceLen) CursorBPos= 0; @@ -142,51 +139,52 @@ void ProxWidget::paintEvent(QPaintEvent *event) //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); - 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.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)); - if(startMax < 0) { + + if(startMax < 0) startMax = 0; - } - if(GraphStart > startMax) { + + if(GraphStart > startMax) GraphStart = startMax; - } int absYMax = 1; for(i = GraphStart; ; i++) { - if(i >= GraphTraceLen) { - break; - } - if(fabs((double)GraphBuffer[i]) > absYMax) { + + if(i >= GraphTraceLen) break; + + if(fabs((double)GraphBuffer[i]) > absYMax) absYMax = (int)fabs((double)GraphBuffer[i]); - } + 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); + // 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; @@ -196,30 +194,28 @@ void ProxWidget::paintEvent(QPaintEvent *event) int n = 0; for(i = GraphStart; ; i++) { - if(i >= GraphTraceLen) { - break; - } + if(i >= GraphTraceLen) break; + int x = 40 + (int)((i - GraphStart)*GraphPixelsPerPoint); - if(x > r.right() + GraphPixelsPerPoint) { - break; - } + if(x > r.right() + GraphPixelsPerPoint) break; int y = GraphBuffer[i]; - if(y < yMin) { + if(y < yMin) yMin = y; - } - if(y > yMax) { + + if(y > yMax) yMax = y; - } + yMean += y; n++; y = (y * (r.top() - r.bottom()) / (2*absYMax)) + zeroHeight; - if(i == GraphStart) { + + if(i == GraphStart) penPath.moveTo(x, y); - } else { + else penPath.lineTo(x, y); - } + if(GraphPixelsPerPoint > 10) { QRect f(QPoint(x - 3, y - 3),QPoint(x + 3, y + 3)); @@ -245,20 +241,19 @@ void ProxWidget::paintEvent(QPaintEvent *event) if(i == CursorAPos || i == CursorBPos) { QPainterPath *cursorPath; - if(i == CursorAPos) { + if(i == CursorAPos) cursorPath = &cursorAPath; - } else { + else cursorPath = &cursorBPath; - } + cursorPath->moveTo(x, r.top()); cursorPath->lineTo(x, r.bottom()); penPath.moveTo(x, y); } } - if(n != 0) { + if(n != 0) yMean /= n; - } painter.setPen(QColor(255, 255, 255)); painter.drawPath(whitePath); @@ -270,9 +265,19 @@ void ProxWidget::paintEvent(QPaintEvent *event) painter.drawPath(cursorBPath); 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]", + 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)", GraphStart, yMax, yMin, yMean, n, GraphTraceLen, - CursorBPos - CursorAPos, (CursorBPos - CursorAPos)/CursorScaleFactor,GraphPixelsPerPoint,CursorAPos,GraphBuffer[CursorAPos],CursorBPos,GraphBuffer[CursorBPos]); + 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); @@ -280,7 +285,7 @@ void ProxWidget::paintEvent(QPaintEvent *event) ProxWidget::ProxWidget(QWidget *parent) : QWidget(parent), GraphStart(0), GraphPixelsPerPoint(1) { - resize(600, 500); + resize(600, 300); QPalette palette(QColor(0,0,0,0)); palette.setColor(QPalette::WindowText, QColor(255,255,255)); @@ -288,6 +293,8 @@ ProxWidget::ProxWidget(QWidget *parent) : QWidget(parent), GraphStart(0), GraphP palette.setColor(QPalette::Button, QColor(100, 100, 100)); setPalette(palette); setAutoFillBackground(true); + CursorAPos = 0; + CursorBPos = 0; } void ProxWidget::closeEvent(QCloseEvent *event) @@ -308,7 +315,6 @@ void ProxWidget::mouseMoveEvent(QMouseEvent *event) CursorBPos = x; } - this->update(); } @@ -324,9 +330,11 @@ void ProxWidget::keyPressEvent(QKeyEvent *event) offset= PageWidth - (PageWidth % PlotGridX); else offset= PageWidth; - } - else - offset= (int)(20 / GraphPixelsPerPoint); + } else + if(event->modifiers() & Qt::ControlModifier) + offset= 1; + else + offset= (int)(20 / GraphPixelsPerPoint); switch(event->key()) { case Qt::Key_Down: @@ -404,17 +412,21 @@ void ProxWidget::keyPressEvent(QKeyEvent *event) case Qt::Key_H: puts("Plot Window Keystrokes:\n"); - puts(" Key Action\n"); - puts(" DOWN Zoom in"); - puts(" G Toggle grid display"); - puts(" H Show help"); - puts(" LEFT Move left"); - puts(" LEFT Page left"); - puts(" L Toggle lock grid relative to samples"); - puts(" Q Hide window"); - puts(" RIGHT Move right"); - puts(" RIGHT Page right"); - puts(" UP Zoom out"); + puts(" Key Action\n"); + puts(" DOWN Zoom in"); + puts(" G Toggle grid display"); + puts(" H Show help"); + puts(" L Toggle lock grid relative to samples"); + puts(" LEFT Move left"); + puts(" LEFT Move left 1 sample"); + puts(" LEFT Page left"); + puts(" LEFT-MOUSE-CLICK Set yellow cursor"); + puts(" Q Hide window"); + puts(" RIGHT Move right"); + puts(" RIGHT Move right 1 sample"); + puts(" 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;