diff options
author | daniel-Jones <daniel@danieljon.es> | 2017-02-13 16:06:14 +1030 |
---|---|---|
committer | daniel-Jones <daniel@danieljon.es> | 2017-02-13 16:06:14 +1030 |
commit | 38d8f89f2f2b27fb25e0b4b9a34b45b76f6dc6f2 (patch) | |
tree | 0db331dc9834acd3aed82033012d840946d02dfd /qt/RGBController/controllerwindow.ui | |
parent | f7bbb4f3d4325df390ce54cbb46c99a964a5a508 (diff) | |
download | RGB-Controller-38d8f89f2f2b27fb25e0b4b9a34b45b76f6dc6f2.tar.gz RGB-Controller-38d8f89f2f2b27fb25e0b4b9a34b45b76f6dc6f2.zip |
added fade ability to Arduino sketch, using psuedo threading. Rework of serial communication also started, the Qt interface is currently under development to support fading.
Diffstat (limited to 'qt/RGBController/controllerwindow.ui')
-rwxr-xr-x | qt/RGBController/controllerwindow.ui | 243 |
1 files changed, 179 insertions, 64 deletions
diff --git a/qt/RGBController/controllerwindow.ui b/qt/RGBController/controllerwindow.ui index d582851..c4a9973 100755 --- a/qt/RGBController/controllerwindow.ui +++ b/qt/RGBController/controllerwindow.ui @@ -9,22 +9,15 @@ <rect> <x>0</x> <y>0</y> - <width>235</width> - <height>428</height> + <width>227</width> + <height>499</height> </rect> </property> <property name="windowTitle"> <string>RGB Controller</string> </property> <widget class="QWidget" name="centralWidget"> - <layout class="QFormLayout" name="formLayout"> - <item row="0" column="0"> - <widget class="QLabel" name="status_label"> - <property name="text"> - <string>Status</string> - </property> - </widget> - </item> + <layout class="QGridLayout" name="gridLayout_2"> <item row="0" column="1"> <widget class="QLabel" name="arduino_status_label"> <property name="text"> @@ -55,6 +48,28 @@ </property> </widget> </item> + <item row="5" column="0"> + <widget class="QSlider" name="r_slider"> + <property name="minimumSize"> + <size> + <width>120</width> + <height>0</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>120</width> + <height>16777215</height> + </size> + </property> + <property name="maximum"> + <number>255</number> + </property> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + </widget> + </item> <item row="3" column="0"> <widget class="QPushButton" name="connect_button"> <property name="text"> @@ -76,32 +91,20 @@ </property> </widget> </item> - <item row="5" column="1"> - <widget class="QPushButton" name="red_button"> - <property name="text"> - <string>Red</string> - </property> - </widget> - </item> - <item row="5" column="0"> - <widget class="QSlider" name="r_slider"> + <item row="10" column="0"> + <widget class="QComboBox" name="presets_dropdown"> <property name="minimumSize"> <size> <width>120</width> <height>0</height> </size> </property> - <property name="maximumSize"> - <size> - <width>120</width> - <height>16777215</height> - </size> - </property> - <property name="maximum"> - <number>255</number> - </property> - <property name="orientation"> - <enum>Qt::Horizontal</enum> + </widget> + </item> + <item row="5" column="1"> + <widget class="QPushButton" name="red_button"> + <property name="text"> + <string>Red</string> </property> </widget> </item> @@ -127,6 +130,13 @@ </property> </widget> </item> + <item row="6" column="1"> + <widget class="QPushButton" name="green_button"> + <property name="text"> + <string>Green</string> + </property> + </widget> + </item> <item row="7" column="0"> <widget class="QSlider" name="b_slider"> <property name="minimumSize"> @@ -149,13 +159,6 @@ </property> </widget> </item> - <item row="6" column="1"> - <widget class="QPushButton" name="green_button"> - <property name="text"> - <string>Green</string> - </property> - </widget> - </item> <item row="7" column="1"> <widget class="QPushButton" name="blue_button"> <property name="text"> @@ -163,13 +166,6 @@ </property> </widget> </item> - <item row="9" column="0"> - <widget class="QLabel" name="presets_label"> - <property name="text"> - <string>Presets</string> - </property> - </widget> - </item> <item row="8" column="1"> <widget class="QPushButton" name="off_button"> <property name="text"> @@ -177,13 +173,6 @@ </property> </widget> </item> - <item row="14" column="0"> - <widget class="QLabel" name="info_log_label"> - <property name="text"> - <string>Information log</string> - </property> - </widget> - </item> <item row="10" column="1"> <widget class="QPushButton" name="set_preset_button"> <property name="text"> @@ -191,19 +180,13 @@ </property> </widget> </item> - <item row="10" column="0"> - <widget class="QComboBox" name="presets_dropdown"> - <property name="minimumSize"> - <size> - <width>120</width> - <height>0</height> - </size> + <item row="11" column="0"> + <widget class="QPushButton" name="reload_preset_button"> + <property name="text"> + <string>Reload</string> </property> </widget> </item> - <item row="15" column="0" colspan="2"> - <widget class="QTextEdit" name="info_log_textarea"/> - </item> <item row="12" column="0"> <widget class="QLineEdit" name="preset_name_textbox"/> </item> @@ -214,6 +197,20 @@ </property> </widget> </item> + <item row="9" column="0"> + <widget class="QLabel" name="presets_label"> + <property name="text"> + <string>Presets</string> + </property> + </widget> + </item> + <item row="0" column="0"> + <widget class="QLabel" name="status_label"> + <property name="text"> + <string>Status</string> + </property> + </widget> + </item> <item row="13" column="1"> <widget class="QPushButton" name="preset_delete_button"> <property name="text"> @@ -221,10 +218,128 @@ </property> </widget> </item> - <item row="11" column="0"> - <widget class="QPushButton" name="reload_preset_button"> + <item row="14" column="0" colspan="2"> + <layout class="QGridLayout" name="gridLayout"> + <item row="4" column="3"> + <widget class="QPushButton" name="pushButton_3"> + <property name="text"> + <string>Set</string> + </property> + </widget> + </item> + <item row="4" column="0"> + <widget class="QSpinBox" name="spinBox"> + <property name="maximum"> + <number>255</number> + </property> + </widget> + </item> + <item row="1" column="2"> + <widget class="QSpinBox" name="spinBox_4"> + <property name="maximum"> + <number>255</number> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QSpinBox" name="spinBox_3"> + <property name="maximum"> + <number>255</number> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>to</string> + </property> + </widget> + </item> + <item row="1" column="0"> + <widget class="QSpinBox" name="spinBox_2"> + <property name="maximum"> + <number>255</number> + </property> + </widget> + </item> + <item row="3" column="1"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>to</string> + </property> + </widget> + </item> + <item row="4" column="2"> + <widget class="QSpinBox" name="spinBox_6"> + <property name="maximum"> + <number>255</number> + </property> + </widget> + </item> + <item row="3" column="2"> + <widget class="QSpinBox" name="spinBox_5"> + <property name="maximum"> + <number>255</number> + </property> + </widget> + </item> + <item row="3" column="3"> + <widget class="QPushButton" name="pushButton_2"> + <property name="text"> + <string>Set</string> + </property> + </widget> + </item> + <item row="1" column="3"> + <widget class="QPushButton" name="pushButton"> + <property name="text"> + <string>Set</string> + </property> + </widget> + </item> + <item row="4" column="1"> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>to</string> + </property> + </widget> + </item> + <item row="0" column="0"> + <widget class="QLabel" name="label_4"> + <property name="text"> + <string>Fade</string> + </property> + </widget> + </item> + </layout> + </item> + <item row="16" column="0"> + <widget class="QLabel" name="info_log_label"> <property name="text"> - <string>Reload</string> + <string>Information log</string> + </property> + </widget> + </item> + <item row="17" column="0" colspan="2"> + <widget class="QTextEdit" name="info_log_textarea"/> + </item> + <item row="15" column="0"> + <widget class="QSlider" name="horizontalSlider"> + <property name="minimum"> + <number>10</number> + </property> + <property name="maximum"> + <number>500</number> + </property> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + </widget> + </item> + <item row="15" column="1"> + <widget class="QPushButton" name="pushButton_4"> + <property name="text"> + <string>Speed</string> </property> </widget> </item> |