Merge pull request #6 from camrein/cleanup

Cleaned certain parts of codes and added versioning of builds.

.drone.yml

@@ -4,6 +4,7 @@ build:
   pull: true
   commands:
     # Compilation
+    - EZ_VERSION=$CI_TAG
     - if [ $$arch = 32 ]; then target=i686; fi
     - if [ $$arch = 64 ]; then target=x86_64; fi
     - pacman -S --needed --noconfirm --noprogressbar mingw-w64-${target}-pkg-config mingw-w64-${target}-qt5 zip

.travis.yml

@@ -17,6 +17,7 @@ before_install:
     - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then source /opt/qt55/bin/qt55-env.sh ; fi
 
 script:
+    - EZ_VERSION=$TRAVIS_TAG
     - qmake -v
     - qmake -config release EzGraver.pro
     - make

EzGraverCli/EzGraverCli.pro

@@ -1,3 +1,5 @@
+include(../common.pri)
+
 QT += core
 QT += gui
 

EzGraverCli/main.cpp

@@ -15,7 +15,8 @@ std::ostream& operator<<(std::ostream& rhv, QString const& lhv) {
 void showHelp() {
     std::cout << "Usage: EzGraverCli <option> [arguments...]\n\n";
     std::cout << "Available options:\n";
-    std::cout << "  a <port> - Shows the available ports\n";
+    std::cout << "  v - Prints the version information\n";
+    std::cout << "  a - Shows the available ports\n";
     std::cout << "  h <port> - Moves the engraver to the home position\n";
     std::cout << "  s <port> - Starts the engraving process with the burn time 60\n";
     std::cout << "  p <port> - Pauses the engraver\n";
@@ -60,9 +61,13 @@ void handleArguments(QStringList const& arguments) {
     }
 
     auto argument = arguments[1][0].toLatin1();
-    if(argument == 'a') {
+    switch(argument) {
+    case 'a':
         showAvailablePorts();
         return;
+    case 'v':
+        std::cout << "EzGraver " << EZ_VERSION << '\n';
+        return;
     }
 
     if(arguments.size() < 3) {
@@ -103,7 +108,7 @@ void handleArguments(QStringList const& arguments) {
     }
 }
 
-int main(int argc, char *argv[]) {
+int main(int argc, char* argv[]) {
     QCoreApplication app{argc, argv};
 
     QStringList arguments{};

EzGraverLib/EzGraverLib.pro

@@ -3,6 +3,7 @@
 # Project created by QtCreator 2016-08-22T09:05:45
 #
 #-------------------------------------------------
+include(../common.pri)
 
 QT += gui
 QT += serialport

EzGraverUi/EzGraverUi.pro

@@ -3,6 +3,7 @@
 # Project created by QtCreator 2016-08-22T09:16:50
 #
 #-------------------------------------------------
+include(../common.pri)
 
 QT += core
 QT += gui
@@ -30,3 +31,5 @@ else:unix: LIBS += -L$$OUT_PWD/../EzGraverLib/ -lEzGraverLib
 
 INCLUDEPATH += $$PWD/../EzGraverLib
 DEPENDPATH += $$PWD/../EzGraverLib
+
+DISTFILES +=

EzGraverUi/main.cpp

@@ -1,11 +1,13 @@
 #include "mainwindow.h"
 #include <QApplication>
+#include <QString>
 
 int main(int argc, char *argv[])
 {
     QApplication a(argc, argv);
     MainWindow w;
     w.show();
+    w.setWindowTitle(QString{"EzGraver %1"}.arg(EZ_VERSION));
 
     return a.exec();
 }

EzGraverUi/mainwindow.cpp

@@ -11,7 +11,7 @@
 #include <stdexcept>
 #include <functional>
 
-MainWindow::MainWindow(QWidget *parent)
+MainWindow::MainWindow(QWidget* parent)
         :  QMainWindow{parent}, _ui{new Ui::MainWindow},
           _portTimer{}, _ezGraver{}, _connected{false}, _imageLoaded{false} {
     _ui->setupUi(this);
@@ -25,10 +25,11 @@ MainWindow::MainWindow(QWidget *parent)
 }
 
 MainWindow::~MainWindow() {
+    delete _ui;
 }
 
 void MainWindow::setupBindings() {
-    connect(_ui->burnTime, &QSlider::valueChanged, [this](const int& v) { _ui->burnTimeLabel->setText(QString::number(v)); });
+    connect(_ui->burnTime, &QSlider::valueChanged, [this](int const& v) { _ui->burnTimeLabel->setText(QString::number(v)); });
 
     connect(this, &MainWindow::connectedChanged, _ui->ports, &QComboBox::setDisabled);
     connect(this, &MainWindow::connectedChanged, _ui->connect, &QPushButton::setDisabled);

EzGraverUi/mainwindow.h

@@ -50,7 +50,7 @@ private slots:
     void dropEvent(QDropEvent* event);
 
 private:
-    std::shared_ptr<Ui::MainWindow> _ui;
+    Ui::MainWindow* _ui;
     QTimer _portTimer;
 
     std::shared_ptr<EzGraver> _ezGraver;

EzGraverUi/mainwindow.ui

@@ -31,6 +31,9 @@
           <height>512</height>
          </size>
         </property>
+        <property name="frameShape">
+         <enum>QFrame::StyledPanel</enum>
+        </property>
         <property name="text">
          <string>No Image Loaded</string>
         </property>

README.md

@@ -9,6 +9,7 @@ Beside the graphical user interface, EzGraver provides a pure command line inter
 Usage: EzGraverCli <option> [arguments...]
 
 Available options:
+  v - Prints the version information
   a - Shows the available ports
   h <port> - Moves the engraver to the home position
   s <port> - Starts the engraving process with the burn time 60

appveyor.yml

@@ -9,6 +9,7 @@ install:
   - set PATH=%PATH%;%QT_DIR%\bin
 
 before_build:
+  - set EZ_VERSION=%APPVEYOR_REPO_TAG_NAME%
   - cd EzGraverCli & qmake -config release -tp vc -spec win32-msvc2015 EzGraverCli.pro & cd ..
   - cd EzGraverLib & qmake -config release -tp vc -spec win32-msvc2015 EzGraverLib.pro & cd ..
   - cd EzGraverUi & qmake -config release -tp vc -spec win32-msvc2015 EzGraverUi.pro & cd ..

common.pri

@@ -0,0 +1 @@
+DEFINES += EZ_VERSION=\\\"$$(EZ_VERSION)\\\"