X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/999d57c20113c76bab27fc190c5fa394f9274629..refs/pull/884/head:/client/proxguiqt.cpp?ds=sidebyside
diff --git a/client/proxguiqt.cpp b/client/proxguiqt.cpp
index 6171c429..cda90cc0 100644
--- a/client/proxguiqt.cpp
+++ b/client/proxguiqt.cpp
@@ -26,13 +26,17 @@
#include <string.h>
#include "proxgui.h"
#include <QtGui>
+
+extern "C" {
+#include "util_darwin.h"
+}
//#include <ctime>
bool g_useOverlays = false;
int g_absVMax = 0;
-int startMax;
-int PageWidth;
-
+int startMax; // Maximum offset in the graph (right side of graph)
+int PageWidth; // How many samples are currently visible on this 'page' / graph
+int unlockStart = 0;
void ProxGuiQT::ShowGraphWindow(void)
{
@@ -60,7 +64,12 @@ void ProxGuiQT::_ShowGraphWindow(void)
return;
if (!plotwidget)
+ {
+#if defined(__MACH__) && defined(__APPLE__)
+ makeFocusable();
+#endif
plotwidget = new ProxWidget();
+ }
plotwidget->show();
}
@@ -84,6 +93,18 @@ void ProxGuiQT::_HideGraphWindow(void)
void ProxGuiQT::_Exit(void) {
delete this;
}
+
+void ProxGuiQT::_StartProxmarkThread(void) {
+ if (!proxmarkThread)
+ return;
+
+ // if thread finished delete self and delete application
+ QObject::connect(proxmarkThread, SIGNAL(finished()), proxmarkThread, SLOT(deleteLater()));
+ QObject::connect(proxmarkThread, SIGNAL(finished()), this, SLOT(_Exit()));
+ // start proxmark thread
+ proxmarkThread->start();
+}
+
void ProxGuiQT::MainLoop()
{
plotapp = new QApplication(argc, argv);
@@ -93,11 +114,19 @@ void ProxGuiQT::MainLoop()
connect(this, SIGNAL(HideGraphWindowSignal()), this, SLOT(_HideGraphWindow()));
connect(this, SIGNAL(ExitSignal()), this, SLOT(_Exit()));
+ //start proxmark thread after starting event loop
+ QTimer::singleShot(200, this, SLOT(_StartProxmarkThread()));
+
+#if defined(__MACH__) && defined(__APPLE__)
+ //Prevent the terminal from loosing focus during launch by making the client unfocusable
+ makeUnfocusable();
+#endif
+
plotapp->exec();
}
-ProxGuiQT::ProxGuiQT(int argc, char **argv) : plotapp(NULL), plotwidget(NULL),
- argc(argc), argv(argv)
+ProxGuiQT::ProxGuiQT(int argc, char **argv, WorkerThread *wthread) : plotapp(NULL), plotwidget(NULL),
+ argc(argc), argv(argv), proxmarkThread(wthread)
{
}
@@ -105,12 +134,12 @@ ProxGuiQT::~ProxGuiQT(void)
{
//if (plotwidget) {
//plotwidget->destroy(true,true);
- // delete plotwidget;
- // plotwidget = NULL;
+ // delete plotwidget;
+ // plotwidget = NULL;
//}
if (plotapp) {
plotapp->quit();
- delete plotapp;
+ // delete plotapp;
plotapp = NULL;
}
}
@@ -119,13 +148,13 @@ ProxGuiQT::~ProxGuiQT(void)
void ProxWidget::applyOperation()
{
//printf("ApplyOperation()");
- save_restoreGB(1);
+ save_restoreGB(GRAPH_SAVE);
memcpy(GraphBuffer, s_Buff, sizeof(int) * GraphTraceLen);
RepaintGraphWindow();
}
void ProxWidget::stickOperation()
{
- save_restoreGB(0);
+ save_restoreGB(GRAPH_RESTORE);
//printf("stickOperation()");
}
void ProxWidget::vchange_autocorr(int v)
@@ -166,8 +195,7 @@ ProxWidget::ProxWidget(QWidget *parent, ProxGuiQT *master) : QWidget(parent)
this->master = master;
resize(800,500);
- /** Setup the controller widget **/
-
+ // Setup the controller widget
controlWidget = new QWidget();
opsController = new Ui::Form();
opsController->setupUi(controlWidget);
@@ -189,23 +217,17 @@ ProxWidget::ProxWidget(QWidget *parent, ProxGuiQT *master) : QWidget(parent)
QObject::connect(opsController->horizontalSlider_dirthr_down, SIGNAL(valueChanged(int)), this, SLOT(vchange_dthr_down(int)));
QObject::connect(opsController->horizontalSlider_askedge, SIGNAL(valueChanged(int)), this, SLOT(vchange_askedge(int)));
- controlWidget->show();
-
// Set up the plot widget, which does the actual plotting
-
plot = new Plot(this);
- /*
- QSlider* slider = new QSlider(Qt::Horizontal);
- slider->setFocusPolicy(Qt::StrongFocus);
- slider->setTickPosition(QSlider::TicksBothSides);
- slider->setTickInterval(10);
- slider->setSingleStep(1);
- */
QVBoxLayout *layout = new QVBoxLayout;
- //layout->addWidget(slider);
layout->addWidget(plot);
setLayout(layout);
- //printf("Proxwidget Constructor just set layout\r\n");
+ show(); // places the window on the screen.
+
+ // Move controller widget below plot
+ controlWidget->move(x(),y()+frameSize().height());
+ controlWidget->resize(size().width(), controlWidget->size().height());
+ controlWidget->show();
}
// not 100% sure what i need in this block
@@ -254,6 +276,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;
}
@@ -434,13 +457,24 @@ void Plot::PlotGraph(int *buffer, int len, QRect plotRect, QRect annotationRect,
void Plot::plotGridLines(QPainter* painter,QRect r)
{
+ // set GridOffset
+ if (PlotGridX <= 0) return;
+ int offset = GridOffset;
+ if (GridLocked && PlotGridX) {
+ offset = GridOffset + PlotGridX - (GraphStart % PlotGridX);
+ } else if (!GridLocked && GraphStart > 0 && PlotGridX) {
+ offset = PlotGridX-((GraphStart - offset) % PlotGridX) + GraphStart - unlockStart;
+ }
+ offset %= PlotGridX;
+ if (offset < 0) offset += PlotGridX;
+
int i;
int grid_delta_x = (int) (PlotGridX * GraphPixelsPerPoint);
int grid_delta_y = PlotGridY;
if ((PlotGridX > 0) && ((PlotGridX * GraphPixelsPerPoint) > 1)) {
- for(i = (GridOffset * GraphPixelsPerPoint); i < r.right(); i += grid_delta_x) {
+ for(i = (offset * GraphPixelsPerPoint); i < r.right(); i += grid_delta_x) {
painter->drawLine(r.left()+i, r.top(), r.left()+i, r.bottom());
- }
+ }
}
if (PlotGridY > 0) {
for(i = 0; yCoordOf(i,r,g_absVMax) > r.top(); i += grid_delta_y) {
@@ -475,8 +509,9 @@ void Plot::paintEvent(QPaintEvent *event)
if(CursorDPos > GraphTraceLen)
CursorDPos= 0;
- QRect plotRect(WIDTH_AXES, 0, width()-WIDTH_AXES, height()-HEIGHT_INFO);
- QRect infoRect(0, height()-HEIGHT_INFO, width(), HEIGHT_INFO);
+ QRect plotRect(WIDTH_AXES, 0, width() - WIDTH_AXES, height() - HEIGHT_INFO);
+ QRect infoRect(0, height() - HEIGHT_INFO, width(), HEIGHT_INFO);
+ PageWidth = plotRect.width() / GraphPixelsPerPoint;
//Grey background
painter.fillRect(rect(), QColor(60, 60, 60));
@@ -495,7 +530,7 @@ void Plot::paintEvent(QPaintEvent *event)
//Start painting graph
PlotGraph(GraphBuffer, GraphTraceLen,plotRect,infoRect,&painter,0);
- if (showDemod && DemodBufferLen > 8) {
+ if (showDemod && DemodBufferLen > 8) {
PlotDemod(DemodBuffer, DemodBufferLen,plotRect,infoRect,&painter,2,g_DemodStartIdx);
}
if (g_useOverlays) {
@@ -530,7 +565,7 @@ void Plot::paintEvent(QPaintEvent *event)
//Draw annotations
char str[200];
sprintf(str, "@%d dt=%d [%2.2f] zoom=%2.2f CursorAPos=%d CursorBPos=%d GridX=%d GridY=%d (%s) GridXoffset=%d",
- GraphStart, CursorBPos - CursorAPos, (CursorBPos - CursorAPos)/CursorScaleFactor,
+ GraphStart, CursorBPos - CursorAPos, (CursorBPos - CursorAPos)/CursorScaleFactor,
GraphPixelsPerPoint,CursorAPos,CursorBPos,PlotGridXdefault,PlotGridYdefault,GridLocked?"Locked":"Unlocked",GridOffset);
painter.setPen(QColor(255, 255, 255));
painter.drawText(20, infoRect.bottom() - 3, str);
@@ -553,6 +588,8 @@ Plot::Plot(QWidget *parent) : QWidget(parent), GraphStart(0), GraphPixelsPerPoin
CursorBPos = 0;
setWindowTitle(tr("Sliders"));
+
+ master = parent;
}
void Plot::closeEvent(QCloseEvent *event)
@@ -580,17 +617,14 @@ void Plot::mouseMoveEvent(QMouseEvent *event)
void Plot::keyPressEvent(QKeyEvent *event)
{
- int offset;
- int gridchanged;
-
- gridchanged= 0;
+ int offset; // Left/right movement offset (in sample size)
if(event->modifiers() & Qt::ShiftModifier) {
if (PlotGridX)
offset= PageWidth - (PageWidth % PlotGridX);
else
offset= PageWidth;
- } else
+ } else
if(event->modifiers() & Qt::ControlModifier)
offset= 1;
else
@@ -611,53 +645,18 @@ void Plot::keyPressEvent(QKeyEvent *event)
case Qt::Key_Right:
if(GraphPixelsPerPoint < 20) {
- if (PlotGridX && GridLocked && GraphStart < startMax){
- GridOffset -= offset;
- GridOffset %= PlotGridX;
- gridchanged= 1;
- }
GraphStart += offset;
} else {
- if (PlotGridX && GridLocked && GraphStart < startMax){
- GridOffset--;
- GridOffset %= PlotGridX;
- gridchanged= 1;
- }
GraphStart++;
}
- if(GridOffset < 0) {
- GridOffset += PlotGridX;
- }
- if (gridchanged)
- if (GraphStart > startMax) {
- GridOffset += (GraphStart - startMax);
- GridOffset %= PlotGridX;
- }
break;
case Qt::Key_Left:
if(GraphPixelsPerPoint < 20) {
- if (PlotGridX && GridLocked && GraphStart > 0){
- GridOffset += offset;
- GridOffset %= PlotGridX;
- gridchanged= 1;
- }
GraphStart -= offset;
} else {
- if (PlotGridX && GridLocked && GraphStart > 0){
- GridOffset++;
- GridOffset %= PlotGridX;
- gridchanged= 1;
- }
GraphStart--;
}
- if (gridchanged){
- if (GraphStart < 0)
- GridOffset += GraphStart;
- if(GridOffset < 0)
- GridOffset += PlotGridX;
- GridOffset %= PlotGridX;
- }
break;
case Qt::Key_G:
@@ -667,36 +666,50 @@ void Plot::keyPressEvent(QKeyEvent *event)
} else {
PlotGridX= PlotGridXdefault;
PlotGridY= PlotGridYdefault;
- }
+ }
break;
case Qt::Key_H:
puts("Plot Window Keystrokes:\n");
puts(" Key Action\n");
+ puts(" UP Zoom out");
puts(" DOWN Zoom in");
puts(" G Toggle grid display");
puts(" H Show help");
puts(" L Toggle lock grid relative to samples");
+ puts(" Q Hide window");
+ puts(" HOME Move to the start of the graph");
+ puts(" END Move to the end of the graph");
puts(" LEFT Move left");
puts(" <CTL>LEFT Move left 1 sample");
puts(" <SHIFT>LEFT Page left");
puts(" LEFT-MOUSE-CLICK Set yellow cursor");
- puts(" Q Hide window");
puts(" RIGHT Move right");
puts(" <CTL>RIGHT Move right 1 sample");
puts(" <SHIFT>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;
case Qt::Key_L:
- GridLocked= !GridLocked;
+ GridLocked = !GridLocked;
+ if (GridLocked)
+ GridOffset += (GraphStart - unlockStart);
+ else
+ unlockStart = GraphStart;
break;
case Qt::Key_Q:
- this->hide();
+ master->hide();
+ break;
+
+ case Qt::Key_Home:
+ GraphStart = 0;
+ break;
+
+ case Qt::Key_End:
+ GraphStart = startMax;
break;
default: