Initial commit where connection window is active and it is possible to

connect to GVRET but this time through the connection window and the
menu option "Connect".
This commit is contained in:
Collin Kidder
2015-10-18 15:34:40 -04:00
parent 49f2525320
commit 4dc8c5b434
8 changed files with 129 additions and 154 deletions
+8 -2
View File
@@ -19,6 +19,7 @@
#include "mainsettingsdialog.h"
#include "firmwareuploaderwindow.h"
#include "discretestatewindow.h"
#include "connectionwindow.h"
namespace Ui {
class MainWindow;
@@ -56,6 +57,7 @@ private slots:
void showComparisonWindow();
void showSettingsDialog();
void showFirmwareUploaderWindow();
void showConnectionSettingsWindow();
void exitApp();
void handleSaveDecoded();
void changeBaudRates();
@@ -78,6 +80,7 @@ public slots:
void gotFrames(int, int);
void updateSettings();
void gotCenterTimeID(int32_t ID, double timestamp);
void updateConnectionSettings(QString connectionType, QString port, int speed0, int speed1);
signals:
void sendSerialPort(QSerialPortInfo *port);
@@ -98,8 +101,7 @@ private:
//canbus related data
CANFrameModel *model;
DBCHandler *dbcHandler;
QList<QSerialPortInfo> ports;
DBCHandler *dbcHandler;
QThread serialWorkerThread;
SerialWorker *worker;
QByteArray inputBuffer;
@@ -121,6 +123,7 @@ private:
MainSettingsDialog *settingsDialog;
DiscreteStateWindow *discreteStateWindow;
FirmwareUploaderWindow *firmwareUploaderWindow;
ConnectionWindow *connectionWindow;
//various private storage
QLabel lbStatusConnected;
@@ -128,6 +131,9 @@ private:
QLabel lbStatusDatabase;
int normalRowHeight;
bool isConnected;
QSerialPortInfo portInfo;
QString connType, portName;
int canSpeed0, canSpeed1;
//private methods
void saveDecodedTextFile(QString);