github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-20 05:13:46 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

code cleanup.

Browse source
This commit is contained in:
iceman1001 2016-03-20 19:33:59 +01:00
commit eb7eab8570
2 changed files with 58 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

74
client/proxguiqt.cpp
View file

@ -106,12 +106,12 @@ void ProxWidget::paintEvent(QPaintEvent *event)
painter.setFont(QFont("Arial", 10)); painter.setFont(QFont("Arial", 10));
if(GraphStart < 0) { if(GraphStart < 0)
GraphStart = 0; GraphStart = 0;
}
if (CursorAPos > GraphTraceLen) if (CursorAPos > GraphTraceLen)
CursorAPos= 0; CursorAPos= 0;
if(CursorBPos > GraphTraceLen) if(CursorBPos > GraphTraceLen)
CursorBPos= 0; CursorBPos= 0;
@ -155,35 +155,36 @@ void ProxWidget::paintEvent(QPaintEvent *event)
} }
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++) { for(i = GraphStart; ; i++) {
if(i >= GraphTraceLen) {
break; if(i >= GraphTraceLen) break;
}
if(fabs((double)GraphBuffer[i]) > absYMax) { 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); absYMax = (int)(absYMax*1.2 + 1);
// number of points that will be plotted // number of points that will be plotted
int span = (int)((r.right() - r.left()) / GraphPixelsPerPoint); int span = (int)((r.right() - r.left()) / GraphPixelsPerPoint);
// one label every 100 pixels, let us say // one label every 100 pixels, let us say
int labels = (r.right() - r.left() - 40) / 100; int labels = (r.right() - r.left() - 40) / 100;
if(labels <= 0) labels = 1; if(labels <= 0) labels = 1;
int pointsPerLabel = span / labels; int pointsPerLabel = span / labels;
if(pointsPerLabel <= 0) pointsPerLabel = 1; if(pointsPerLabel <= 0) pointsPerLabel = 1;
@ -193,30 +194,28 @@ void ProxWidget::paintEvent(QPaintEvent *event)
int n = 0; int n = 0;
for(i = GraphStart; ; i++) { for(i = GraphStart; ; i++) {
if(i >= GraphTraceLen) { if(i >= GraphTraceLen) break;
break;
}
int x = 40 + (int)((i - GraphStart)*GraphPixelsPerPoint); int x = 40 + (int)((i - GraphStart)*GraphPixelsPerPoint);
if(x > r.right() + GraphPixelsPerPoint) { if(x > r.right() + GraphPixelsPerPoint) break;
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; yMean += y;
n++; n++;
y = (y * (r.top() - r.bottom()) / (2*absYMax)) + zeroHeight; 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);
}
if(GraphPixelsPerPoint > 10) { if(GraphPixelsPerPoint > 10) {
QRect f(QPoint(x - 3, y - 3),QPoint(x + 3, y + 3)); QRect f(QPoint(x - 3, y - 3),QPoint(x + 3, y + 3));
@ -242,20 +241,19 @@ void ProxWidget::paintEvent(QPaintEvent *event)
if(i == CursorAPos || i == CursorBPos) { if(i == CursorAPos || i == CursorBPos) {
QPainterPath *cursorPath; QPainterPath *cursorPath;
if(i == CursorAPos) { if(i == CursorAPos)
cursorPath = &cursorAPath; cursorPath = &cursorAPath;
} else { else
cursorPath = &cursorBPath; cursorPath = &cursorBPath;
}
cursorPath->moveTo(x, r.top()); cursorPath->moveTo(x, r.top());
cursorPath->lineTo(x, r.bottom()); cursorPath->lineTo(x, r.bottom());
penPath.moveTo(x, y); penPath.moveTo(x, y);
} }
} }
if(n != 0) { if(n != 0)
yMean /= n; yMean /= n;
}
painter.setPen(QColor(255, 255, 255)); painter.setPen(QColor(255, 255, 255));
painter.drawPath(whitePath); painter.drawPath(whitePath);
@ -269,7 +267,17 @@ void ProxWidget::paintEvent(QPaintEvent *event)
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)",
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"); CursorBPos - CursorAPos,
(CursorBPos - CursorAPos)/CursorScaleFactor,
GraphPixelsPerPoint,
CursorAPos,
GraphBuffer[CursorAPos],
CursorBPos,
GraphBuffer[CursorBPos],
PlotGridXdefault,
PlotGridYdefault,
GridLocked ? "Locked" : "Unlocked"
);
painter.setPen(QColor(255, 255, 255)); painter.setPen(QColor(255, 255, 255));
painter.drawText(50, r.bottom() - 20, str); painter.drawText(50, r.bottom() - 20, str);