and the QT part of monstermerge..

client/proxguiqt.h

@@ -8,26 +8,40 @@
 // GUI (QT)
 //-----------------------------------------------------------------------------
 
+#ifndef PROXGUI_QT
+#define PROXGUI_QT
+
+#include <stdint.h>
+#include <string.h>
+
 #include <QApplication>
 #include <QPushButton>
 #include <QObject>
 #include <QWidget>
 #include <QPainter>
+#include <QtGui>
 
-class ProxWidget : public QWidget
+#include "ui/ui_overlays.h"
+/**
+ * @brief The actual plot, black area were we paint the graph
+ */
+class Plot: public QWidget
 {
-	Q_OBJECT;
-
 	private:
 		int GraphStart;
 		double GraphPixelsPerPoint;
 		int CursorAPos;
 		int CursorBPos;
-		//int CursorCPos;
-		//int CursorDPos;
-
+	void PlotGraph(int *buffer, int len, QRect r,QRect r2, QPainter* painter, int graphNum);
+	void PlotDemod(uint8_t *buffer, size_t len, QRect r,QRect r2, QPainter* painter, int graphNum, int plotOffset);
+	void plotGridLines(QPainter* painter,QRect r);
+	int xCoordOf(int i, QRect r );
+	int yCoordOf(int v, QRect r, int maxVal);
+	int valueOf_yCoord(int y, QRect r, int maxVal);
+	void setMaxAndStart(int *buffer, int len, QRect plotRect);
+	QColor getColor(int graphNum);
 	public:
-		ProxWidget(QWidget *parent = 0);
+	Plot(QWidget *parent = 0);
 
 	protected:
 		void paintEvent(QPaintEvent *event);
@@ -35,6 +49,43 @@ class ProxWidget : public QWidget
 		void mouseMoveEvent(QMouseEvent *event);
 		void mousePressEvent(QMouseEvent *event) { mouseMoveEvent(event); }
 		void keyPressEvent(QKeyEvent *event);
+
+};
+class ProxGuiQT;
+
+/**
+ * The window with plot and controls
+ */
+class ProxWidget : public QWidget
+{
+	Q_OBJECT; //needed for slot/signal classes
+
+	private:
+		ProxGuiQT *master;
+		Plot *plot;
+		Ui::Form *opsController;
+		QWidget* controlWidget;
+
+	public:
+		ProxWidget(QWidget *parent = 0, ProxGuiQT *master = NULL);
+		~ProxWidget(void);
+		//OpsShow(void);
+
+	protected:
+	//	void paintEvent(QPaintEvent *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);
+	public slots:
+		void applyOperation();
+		void stickOperation();
+		void vchange_autocorr(int v);
+		void vchange_askedge(int v);
+		void vchange_dthr_up(int v);
+		void vchange_dthr_down(int v);
 };
 
 class ProxGuiQT : public QObject
@@ -55,14 +106,29 @@ class ProxGuiQT : public QObject
 		void RepaintGraphWindow(void);
 		void HideGraphWindow(void);
 		void MainLoop(void);
-	
+		void Exit(void);
 	private slots:
 		void _ShowGraphWindow(void);
 		void _RepaintGraphWindow(void);
 		void _HideGraphWindow(void);
-
+		void _Exit(void);
 	signals:
 		void ShowGraphWindowSignal(void);
 		void RepaintGraphWindowSignal(void);
 		void HideGraphWindowSignal(void);
+		void ExitSignal(void);
 };
+
+
+class WorkerThread : public QThread {
+	Q_OBJECT;
+public:
+	WorkerThread(char*, bool);
+	~WorkerThread();
+	void run();
+private:
+	char *script_cmds_file = NULL;
+	bool usb_present;
+};
+
+#endif // PROXGUI_QT