From 12bddeda97b5d428f4ef9006180051c14b01aecc Mon Sep 17 00:00:00 2001 From: daniel-Jones Date: Wed, 15 Feb 2017 12:17:06 +1030 Subject: Fade with individual speed control now works, can fade each color at its own speed. Serial communication revamped to allow extra commands in both the front and backend. --- qt/build-RGBController-Desktop-Debug/Makefile | 2 +- .../ui_controllerwindow.h | 24 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) (limited to 'qt/build-RGBController-Desktop-Debug') diff --git a/qt/build-RGBController-Desktop-Debug/Makefile b/qt/build-RGBController-Desktop-Debug/Makefile index 7c3deb5..30bb4c2 100644 --- a/qt/build-RGBController-Desktop-Debug/Makefile +++ b/qt/build-RGBController-Desktop-Debug/Makefile @@ -1,6 +1,6 @@ ############################################################################# # Makefile for building: RGBController -# Generated by qmake (2.01a) (Qt 4.8.7) on: Tue Jan 17 02:39:24 2017 +# Generated by qmake (2.01a) (Qt 4.8.7) on: Tue Feb 14 11:06:35 2017 # Project: ../RGBController/RGBController.pro # Template: app # Command: /usr/lib/qt4/bin/qmake -spec /usr/share/qt4/mkspecs/linux-g++ CONFIG+=debug -o Makefile ../RGBController/RGBController.pro diff --git a/qt/build-RGBController-Desktop-Debug/ui_controllerwindow.h b/qt/build-RGBController-Desktop-Debug/ui_controllerwindow.h index 57f3a75..2b317f2 100644 --- a/qt/build-RGBController-Desktop-Debug/ui_controllerwindow.h +++ b/qt/build-RGBController-Desktop-Debug/ui_controllerwindow.h @@ -70,8 +70,8 @@ public: QLabel *label_4; QLabel *info_log_label; QTextEdit *info_log_textarea; - QSlider *horizontalSlider; - QPushButton *pushButton_4; + QSlider *speed_slider; + QPushButton *speed_button; void setupUi(QMainWindow *controllerWindow) { @@ -296,18 +296,18 @@ public: gridLayout_2->addWidget(info_log_textarea, 17, 0, 1, 2); - horizontalSlider = new QSlider(centralWidget); - horizontalSlider->setObjectName(QString::fromUtf8("horizontalSlider")); - horizontalSlider->setMinimum(10); - horizontalSlider->setMaximum(500); - horizontalSlider->setOrientation(Qt::Horizontal); + speed_slider = new QSlider(centralWidget); + speed_slider->setObjectName(QString::fromUtf8("speed_slider")); + speed_slider->setMinimum(10); + speed_slider->setMaximum(500); + speed_slider->setOrientation(Qt::Horizontal); - gridLayout_2->addWidget(horizontalSlider, 15, 0, 1, 1); + gridLayout_2->addWidget(speed_slider, 15, 0, 1, 1); - pushButton_4 = new QPushButton(centralWidget); - pushButton_4->setObjectName(QString::fromUtf8("pushButton_4")); + speed_button = new QPushButton(centralWidget); + speed_button->setObjectName(QString::fromUtf8("speed_button")); - gridLayout_2->addWidget(pushButton_4, 15, 1, 1, 1); + gridLayout_2->addWidget(speed_button, 15, 1, 1, 1); controllerWindow->setCentralWidget(centralWidget); @@ -343,7 +343,7 @@ public: label_3->setText(QApplication::translate("controllerWindow", "to", 0, QApplication::UnicodeUTF8)); label_4->setText(QApplication::translate("controllerWindow", "Fade", 0, QApplication::UnicodeUTF8)); info_log_label->setText(QApplication::translate("controllerWindow", "Information log", 0, QApplication::UnicodeUTF8)); - pushButton_4->setText(QApplication::translate("controllerWindow", "Speed", 0, QApplication::UnicodeUTF8)); + speed_button->setText(QApplication::translate("controllerWindow", "Speed", 0, QApplication::UnicodeUTF8)); } // retranslateUi }; -- cgit v1.2.3