From 4036c5b270264118e01745e4d4804472be3a2aad Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Wed, 1 Apr 2015 09:23:27 +0200 Subject: [PATCH] Convert to Qt5, add serial port as command line parameter --- src/mainwindow.h | 2 +- src/osccommthread.cpp | 2 ++ src/src.pro | 2 ++ src/tekpic.cpp | 5 ++++- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/mainwindow.h b/src/mainwindow.h index 77a358b..74f37f9 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -20,7 +20,7 @@ #ifndef MAINWINDOW_H #define MAINWINDOW_H -#include +#include #include "ui_main.h" #include "osccommthread.h" #include diff --git a/src/osccommthread.cpp b/src/osccommthread.cpp index c1722de..e1aad77 100644 --- a/src/osccommthread.cpp +++ b/src/osccommthread.cpp @@ -24,6 +24,8 @@ #include #include #include +#include + using namespace std; ostream& operator<<(ostream& s, OscImage& im) diff --git a/src/src.pro b/src/src.pro index e8b107f..a5c7033 100644 --- a/src/src.pro +++ b/src/src.pro @@ -15,3 +15,5 @@ SOURCES += tekpic.cpp \ mainwindow.cpp \ serial.cpp \ osccommthread.cpp + +QT += widgets diff --git a/src/tekpic.cpp b/src/tekpic.cpp index 008da2f..14e82f1 100644 --- a/src/tekpic.cpp +++ b/src/tekpic.cpp @@ -30,8 +30,11 @@ int main(int argc, char *argv[]) { + string port("/dev/ttyS0"); QApplication app(argc, argv); - MainWindow *window = new MainWindow(string("/dev/ttyS0")); + if (argc > 1) + port = argv[1]; + MainWindow *window = new MainWindow(port); window->show(); return app.exec(); -- 2.39.2