From: marshmellow42 <marshmellow42@users.noreply.github.com>
Date: Tue, 15 May 2018 06:19:49 +0000 (-0400)
Subject: fix gui (plot) bugs (#604)
X-Git-Tag: v3.1.0~49
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/e8924be8bac6e8ddc91d1950368ef51c454a6e55

fix gui (plot) bugs (#604)

G keypress event would cause a crash if no data
Q keypress didn't work.

Thanks to @iceman1001 for identifying and providing the fixes.
---

diff --git a/client/proxguiqt.cpp b/client/proxguiqt.cpp
index dc8279b5..ab0976cc 100644
--- a/client/proxguiqt.cpp
+++ b/client/proxguiqt.cpp
@@ -269,6 +269,7 @@ int Plot::xCoordOf(int i, QRect r )
 int Plot::yCoordOf(int v, QRect r, int maxVal)
 {
 	int z = (r.bottom() - r.top())/2;
+	if ( maxVal == 0 ) maxVal++;
 	return -(z * v) / maxVal + z;
 }
 
@@ -579,6 +580,8 @@ Plot::Plot(QWidget *parent) : QWidget(parent), GraphStart(0), GraphPixelsPerPoin
 	CursorBPos = 0;
 
 	setWindowTitle(tr("Sliders"));
+
+	master = parent;
 }
 
 void Plot::closeEvent(QCloseEvent *event)
@@ -688,7 +691,7 @@ void Plot::keyPressEvent(QKeyEvent *event)
 			break;
 
 		case Qt::Key_Q:
-			this->hide();
+			master->hide();
 			break;
 
 		default:
diff --git a/client/proxguiqt.h b/client/proxguiqt.h
index 45a65b04..e43311ee 100644
--- a/client/proxguiqt.h
+++ b/client/proxguiqt.h
@@ -28,6 +28,7 @@
 class Plot: public QWidget
 {
 private:
+	QWidget *master;
 	int GraphStart;
 	double GraphPixelsPerPoint;
 	int CursorAPos;