projects
/
proxmark3-svn
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixing iso15693
[proxmark3-svn]
/
client
/
proxguiqt.h
diff --git
a/client/proxguiqt.h
b/client/proxguiqt.h
index b3a3e85a3bf4bfec1c6dd764be78972358e4a847..9677b49c1c4d4a188f26ebacf67dc4c2e25ee528 100644
(file)
--- a/
client/proxguiqt.h
+++ b/
client/proxguiqt.h
@@
-28,8
+28,9
@@
class Plot: public QWidget
{
private:
class Plot: public QWidget
{
private:
- int GraphStart;
- double GraphPixelsPerPoint;
+ QWidget *master;
+ int GraphStart; // Starting point/offset for the left side of the graph
+ double GraphPixelsPerPoint; // How many visual pixels are between each sample point (x axis)
int CursorAPos;
int CursorBPos;
void PlotGraph(int *buffer, int len, QRect r,QRect r2, QPainter* painter, int graphNum);
int CursorAPos;
int CursorBPos;
void PlotGraph(int *buffer, int len, QRect r,QRect r2, QPainter* painter, int graphNum);
@@
-72,13
+73,13
@@
class ProxWidget : public QWidget
//OpsShow(void);
protected:
//OpsShow(void);
protected:
- //
void paintEvent(QPaintEvent *event);
+ // void paintEvent(QPaintEvent *event);
void closeEvent(QCloseEvent *event);
void showEvent(QShowEvent *event);
void hideEvent(QHideEvent *event);
void closeEvent(QCloseEvent *event);
void showEvent(QShowEvent *event);
void hideEvent(QHideEvent *event);
- //
void mouseMoveEvent(QMouseEvent *event);
- //
void mousePressEvent(QMouseEvent *event) { mouseMoveEvent(event); }
- //
void keyPressEvent(QKeyEvent *event);
+ // void mouseMoveEvent(QMouseEvent *event);
+ // void mousePressEvent(QMouseEvent *event) { mouseMoveEvent(event); }
+ // void keyPressEvent(QKeyEvent *event);
public slots:
void applyOperation();
void stickOperation();
public slots:
void applyOperation();
void stickOperation();
@@
-88,6
+89,18
@@
class ProxWidget : public QWidget
void vchange_dthr_down(int v);
};
void vchange_dthr_down(int v);
};
+class WorkerThread : public QThread {
+ Q_OBJECT;
+ public:
+ WorkerThread(char*, char*, bool);
+ ~WorkerThread();
+ void run();
+ private:
+ char *script_cmds_file = NULL;
+ char *script_cmd = NULL;
+ bool usb_present;
+};
+
class ProxGuiQT : public QObject
{
Q_OBJECT;
class ProxGuiQT : public QObject
{
Q_OBJECT;
@@
-97,10
+110,10
@@
class ProxGuiQT : public QObject
ProxWidget *plotwidget;
int argc;
char **argv;
ProxWidget *plotwidget;
int argc;
char **argv;
-
void (*main_func)(void)
;
-
+
WorkerThread *proxmarkThread
;
+
public:
public:
- ProxGuiQT(int argc, char **argv);
+ ProxGuiQT(int argc, char **argv
, WorkerThread *wthread
);
~ProxGuiQT(void);
void ShowGraphWindow(void);
void RepaintGraphWindow(void);
~ProxGuiQT(void);
void ShowGraphWindow(void);
void RepaintGraphWindow(void);
@@
-112,10
+125,12
@@
class ProxGuiQT : public QObject
void _RepaintGraphWindow(void);
void _HideGraphWindow(void);
void _Exit(void);
void _RepaintGraphWindow(void);
void _HideGraphWindow(void);
void _Exit(void);
+ void _StartProxmarkThread(void);
signals:
void ShowGraphWindowSignal(void);
void RepaintGraphWindowSignal(void);
void HideGraphWindowSignal(void);
void ExitSignal(void);
};
signals:
void ShowGraphWindowSignal(void);
void RepaintGraphWindowSignal(void);
void HideGraphWindowSignal(void);
void ExitSignal(void);
};
+
#endif // PROXGUI_QT
#endif // PROXGUI_QT
Impressum
,
Datenschutz