Merge pull request #143 from kipr/v30.3.0

V30.3.0

include/botui/Create3ExampleWidget.h

@@ -1,42 +1,42 @@
-#ifndef _CREATE3EXAMPLEWIDGET_H_
-#define _CREATE3EXAMPLEWIDGET_H_
-
-#include "StandardWidget.h"
-
-#include <QRegularExpression>
-#include <QStringListModel>
-namespace Ui
-{
-	class Create3ExampleWidget;
-}
-
-class Create3SensorModel;
-
-class Create3ExampleWidget : public StandardWidget
-{
-	Q_OBJECT
-public:
-	Create3ExampleWidget(Device *device, QWidget *parent = 0);
-	~Create3ExampleWidget();
-
-private slots:
-
-	int create3Connect();
-	int isConnected();
-	void indexChanged(int index);
-	void run();
-
-private:
-	Ui::Create3ExampleWidget *ui;
-
-	Create3SensorModel *_model;
-	double m_setpointVal;
-	double m_feedbackVal;
-	int m_position_1;
-	double m_vel_1;
-	void update();
-	QStringListModel *model; 
-	void updatePids();
-};
-
-#endif
+// #ifndef _CREATE3EXAMPLEWIDGET_H_
+// #define _CREATE3EXAMPLEWIDGET_H_
+
+// #include "StandardWidget.h"
+
+// #include <QRegularExpression>
+// #include <QStringListModel>
+// namespace Ui
+// {
+// 	class Create3ExampleWidget;
+// }
+
+// class Create3SensorModel;
+
+// class Create3ExampleWidget : public StandardWidget
+// {
+// 	Q_OBJECT
+// public:
+// 	Create3ExampleWidget(Device *device, QWidget *parent = 0);
+// 	~Create3ExampleWidget();
+
+// private slots:
+
+// 	int create3Connect();
+// 	int isConnected();
+// 	void indexChanged(int index);
+// 	void run();
+
+// private:
+// 	Ui::Create3ExampleWidget *ui;
+
+// 	Create3SensorModel *_model;
+// 	double m_setpointVal;
+// 	double m_feedbackVal;
+// 	int m_position_1;
+// 	double m_vel_1;
+// 	void update();
+// 	QStringListModel *model; 
+// 	void updatePids();
+// };
+
+// #endif

include/botui/Create3Widget.h

@@ -4,6 +4,7 @@
 #include "StandardWidget.h"
 
 #include <QRegularExpression>
+#include <QStringListModel>
 #include <QProcess>
 
 namespace Ui
@@ -15,30 +16,27 @@ class Create3SensorModel;
 
 class Create3Widget : public StandardWidget
 {
-Q_OBJECT
+	Q_OBJECT
 public:
 	Create3Widget(Device *device, QWidget *parent = 0);
 	~Create3Widget();
 
 private slots:
 
-  void create3Connect();
-	// void resetServer();
-	void sensorList();
-	void exampleList();
 	QString getIP();
 	void toggleChanged();
-
+	void indexChanged(int index);
+	void run();
 
 private:
 	Ui::Create3Widget *ui;
 
-  Create3SensorModel *_model;
+	Create3SensorModel *_model;
 	double m_setpointVal;
 	double m_feedbackVal;
 	int m_position_1;
+	QStringListModel *model; 
 	double m_vel_1;
 };
 
-
 #endif