X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/480e2f239421563263d07f6d11f2c929d7f14d1f..a9eeb576983f932ee622554ccd4e08be10e695b5:/client/proxguiqt.cpp

diff --git a/client/proxguiqt.cpp b/client/proxguiqt.cpp
index 677f26d5..a845468f 100644
--- a/client/proxguiqt.cpp
+++ b/client/proxguiqt.cpp
@@ -99,21 +99,25 @@ ProxGuiQT::~ProxGuiQT(void)
 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;
 	QBrush brush(QColor(100, 255, 100));
 	QPen pen(QColor(100, 255, 100));
 
 	painter.setFont(QFont("Arial", 10));
 
-	if(GraphStart < 0) {
+	if(GraphStart < 0)
 		GraphStart = 0;
-	}
 
 	if (CursorAPos > GraphTraceLen)
 		CursorAPos= 0;
+
 	if(CursorBPos > GraphTraceLen)
 		CursorBPos= 0;
+	if(CursorCPos > GraphTraceLen)
+		CursorCPos= 0;
+	if(CursorDPos > GraphTraceLen)
+		CursorDPos= 0;
 
 	r = rect();
 
@@ -139,51 +143,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;
 
@@ -193,30 +198,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));
@@ -239,23 +242,26 @@ void ProxWidget::paintEvent(QPaintEvent *event)
 			penPath.moveTo(x,y);
 		}
 
-		if(i == CursorAPos || i == CursorBPos) {
+		if(i == CursorAPos || i == CursorBPos || i == CursorCPos || i == CursorDPos) {
 			QPainterPath *cursorPath;
 
-			if(i == CursorAPos) {
+			if (i == CursorAPos)
 				cursorPath = &cursorAPath;
-			} else {
+			else if (i == CursorBPos)
 				cursorPath = &cursorBPath;
-			}
+			else if (i == CursorCPos)
+				cursorPath = &cursorCPath;
+			else
+				cursorPath = &cursorDPath;
+			
 			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);
@@ -265,11 +271,25 @@ void ProxWidget::paintEvent(QPaintEvent *event)
 	painter.drawPath(cursorAPath);
 	painter.setPen(QColor(255, 0, 255));
 	painter.drawPath(cursorBPath);
+	painter.setPen(QColor(255, 153, 0)); //orange
+	painter.drawPath(cursorCPath);
+	painter.setPen(QColor(0, 0, 205)); //light blue
+	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)",
 			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.drawText(50, r.bottom() - 20, str);