From 12bddeda97b5d428f4ef9006180051c14b01aecc Mon Sep 17 00:00:00 2001
From: daniel-Jones <daniel@danieljon.es>
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/RGBController/controllerwindow.ui | 292 +++++++++++++++++++++--------------
 1 file changed, 176 insertions(+), 116 deletions(-)

(limited to 'qt/RGBController/controllerwindow.ui')

diff --git a/qt/RGBController/controllerwindow.ui b/qt/RGBController/controllerwindow.ui
index c4a9973..ca1d807 100755
--- a/qt/RGBController/controllerwindow.ui
+++ b/qt/RGBController/controllerwindow.ui
@@ -9,8 +9,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>227</width>
-    <height>499</height>
+    <width>232</width>
+    <height>629</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -18,38 +18,53 @@
   </property>
   <widget class="QWidget" name="centralWidget">
    <layout class="QGridLayout" name="gridLayout_2">
-    <item row="0" column="1">
-     <widget class="QLabel" name="arduino_status_label">
+    <item row="11" column="0">
+     <widget class="QPushButton" name="reload_preset_button">
       <property name="text">
-       <string>&lt;font color = red&gt;Disconnected&lt;/font&gt;</string>
+       <string>Reload</string>
       </property>
      </widget>
     </item>
-    <item row="1" column="0">
-     <widget class="QLabel" name="arduino_port_label">
-      <property name="minimumSize">
-       <size>
-        <width>120</width>
-        <height>0</height>
-       </size>
+    <item row="8" column="1">
+     <widget class="QPushButton" name="off_button">
+      <property name="text">
+       <string>Off</string>
       </property>
+     </widget>
+    </item>
+    <item row="13" column="1">
+     <widget class="QPushButton" name="preset_delete_button">
       <property name="text">
-       <string>Arduino port</string>
+       <string>Delete</string>
       </property>
      </widget>
     </item>
-    <item row="1" column="1">
-     <widget class="QComboBox" name="arduino_port_dropdown"/>
+    <item row="9" column="0">
+     <widget class="QLabel" name="presets_label">
+      <property name="text">
+       <string>Presets</string>
+      </property>
+     </widget>
     </item>
-    <item row="2" column="1">
-     <widget class="QPushButton" name="refresh_port_button">
+    <item row="3" column="1">
+     <widget class="QPushButton" name="disconnect_button">
       <property name="text">
-       <string>Refresh</string>
+       <string>Disconnect</string>
       </property>
      </widget>
     </item>
-    <item row="5" column="0">
-     <widget class="QSlider" name="r_slider">
+    <item row="0" column="1">
+     <widget class="QLabel" name="arduino_status_label">
+      <property name="text">
+       <string>&lt;font color = red&gt;Disconnected&lt;/font&gt;</string>
+      </property>
+     </widget>
+    </item>
+    <item row="1" column="1">
+     <widget class="QComboBox" name="arduino_port_dropdown"/>
+    </item>
+    <item row="7" column="0">
+     <widget class="QSlider" name="b_slider">
       <property name="minimumSize">
        <size>
         <width>120</width>
@@ -70,27 +85,25 @@
       </property>
      </widget>
     </item>
-    <item row="3" column="0">
-     <widget class="QPushButton" name="connect_button">
-      <property name="text">
-       <string>Connect</string>
+    <item row="17" column="0">
+     <widget class="QSlider" name="b_speed_slider">
+      <property name="minimum">
+       <number>1</number>
       </property>
-     </widget>
-    </item>
-    <item row="3" column="1">
-     <widget class="QPushButton" name="disconnect_button">
-      <property name="text">
-       <string>Disconnect</string>
+      <property name="maximum">
+       <number>500</number>
       </property>
-     </widget>
-    </item>
-    <item row="4" column="0">
-     <widget class="QLabel" name="rgb_label">
-      <property name="text">
-       <string>RGB colors</string>
+      <property name="orientation">
+       <enum>Qt::Horizontal</enum>
       </property>
      </widget>
     </item>
+    <item row="20" 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>
     <item row="10" column="0">
      <widget class="QComboBox" name="presets_dropdown">
       <property name="minimumSize">
@@ -101,44 +114,63 @@
       </property>
      </widget>
     </item>
-    <item row="5" column="1">
-     <widget class="QPushButton" name="red_button">
+    <item row="19" column="0">
+     <widget class="QLabel" name="info_log_label">
       <property name="text">
-       <string>Red</string>
+       <string>Information log</string>
       </property>
      </widget>
     </item>
-    <item row="6" column="0">
-     <widget class="QSlider" name="g_slider">
-      <property name="minimumSize">
-       <size>
-        <width>120</width>
-        <height>0</height>
-       </size>
+    <item row="6" column="1">
+     <widget class="QPushButton" name="green_button">
+      <property name="text">
+       <string>Green</string>
       </property>
-      <property name="maximumSize">
-       <size>
-        <width>120</width>
-        <height>16777215</height>
-       </size>
+     </widget>
+    </item>
+    <item row="2" column="1">
+     <widget class="QPushButton" name="refresh_port_button">
+      <property name="text">
+       <string>Refresh</string>
+      </property>
+     </widget>
+    </item>
+    <item row="16" column="0">
+     <widget class="QSlider" name="g_speed_slider">
+      <property name="minimum">
+       <number>1</number>
       </property>
       <property name="maximum">
-       <number>255</number>
+       <number>500</number>
       </property>
       <property name="orientation">
        <enum>Qt::Horizontal</enum>
       </property>
      </widget>
     </item>
-    <item row="6" column="1">
-     <widget class="QPushButton" name="green_button">
+    <item row="4" column="0">
+     <widget class="QLabel" name="rgb_label">
       <property name="text">
-       <string>Green</string>
+       <string>RGB colors</string>
       </property>
      </widget>
     </item>
-    <item row="7" column="0">
-     <widget class="QSlider" name="b_slider">
+    <item row="0" column="0">
+     <widget class="QLabel" name="status_label">
+      <property name="text">
+       <string>Status</string>
+      </property>
+     </widget>
+    </item>
+    <item row="12" column="1">
+     <widget class="QPushButton" name="preset_save_button">
+      <property name="text">
+       <string>Save</string>
+      </property>
+     </widget>
+    </item>
+    <item row="6" column="0">
+     <widget class="QSlider" name="g_slider">
       <property name="minimumSize">
        <size>
         <width>120</width>
@@ -159,153 +191,171 @@
       </property>
      </widget>
     </item>
-    <item row="7" column="1">
-     <widget class="QPushButton" name="blue_button">
-      <property name="text">
-       <string>Blue</string>
+    <item row="15" column="0">
+     <widget class="QSlider" name="r_speed_slider">
+      <property name="minimum">
+       <number>1</number>
+      </property>
+      <property name="maximum">
+       <number>500</number>
+      </property>
+      <property name="orientation">
+       <enum>Qt::Horizontal</enum>
       </property>
      </widget>
     </item>
-    <item row="8" column="1">
-     <widget class="QPushButton" name="off_button">
+    <item row="16" column="1">
+     <widget class="QLabel" name="g_speed_label">
       <property name="text">
-       <string>Off</string>
+       <string>Green speed</string>
       </property>
      </widget>
     </item>
-    <item row="10" column="1">
-     <widget class="QPushButton" name="set_preset_button">
+    <item row="5" column="1">
+     <widget class="QPushButton" name="red_button">
       <property name="text">
-       <string>Set</string>
+       <string>Red</string>
       </property>
      </widget>
     </item>
-    <item row="11" column="0">
-     <widget class="QPushButton" name="reload_preset_button">
+    <item row="7" column="1">
+     <widget class="QPushButton" name="blue_button">
       <property name="text">
-       <string>Reload</string>
+       <string>Blue</string>
       </property>
      </widget>
     </item>
-    <item row="12" column="0">
-     <widget class="QLineEdit" name="preset_name_textbox"/>
-    </item>
-    <item row="12" column="1">
-     <widget class="QPushButton" name="preset_save_button">
+    <item row="3" column="0">
+     <widget class="QPushButton" name="connect_button">
       <property name="text">
-       <string>Save</string>
+       <string>Connect</string>
       </property>
      </widget>
     </item>
-    <item row="9" column="0">
-     <widget class="QLabel" name="presets_label">
+    <item row="15" column="1">
+     <widget class="QLabel" name="r_speed_label">
       <property name="text">
-       <string>Presets</string>
+       <string>Red speed</string>
       </property>
      </widget>
     </item>
-    <item row="0" column="0">
-     <widget class="QLabel" name="status_label">
-      <property name="text">
-       <string>Status</string>
+    <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="13" column="1">
-     <widget class="QPushButton" name="preset_delete_button">
+    <item row="10" column="1">
+     <widget class="QPushButton" name="set_preset_button">
       <property name="text">
-       <string>Delete</string>
+       <string>Set</string>
       </property>
      </widget>
     </item>
     <item row="14" column="0" colspan="2">
      <layout class="QGridLayout" name="gridLayout">
       <item row="4" column="3">
-       <widget class="QPushButton" name="pushButton_3">
+       <widget class="QPushButton" name="blue_fade_button">
         <property name="text">
-         <string>Set</string>
+         <string>Blue toggle</string>
         </property>
        </widget>
       </item>
       <item row="4" column="0">
-       <widget class="QSpinBox" name="spinBox">
+       <widget class="QSpinBox" name="bfrom">
         <property name="maximum">
          <number>255</number>
         </property>
        </widget>
       </item>
       <item row="1" column="2">
-       <widget class="QSpinBox" name="spinBox_4">
+       <widget class="QSpinBox" name="rto">
         <property name="maximum">
          <number>255</number>
         </property>
        </widget>
       </item>
       <item row="3" column="0">
-       <widget class="QSpinBox" name="spinBox_3">
+       <widget class="QSpinBox" name="gfrom">
         <property name="maximum">
          <number>255</number>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
-       <widget class="QLabel" name="label">
+       <widget class="QLabel" name="r_to_label">
         <property name="text">
          <string>to</string>
         </property>
        </widget>
       </item>
       <item row="1" column="0">
-       <widget class="QSpinBox" name="spinBox_2">
+       <widget class="QSpinBox" name="rfrom">
         <property name="maximum">
          <number>255</number>
         </property>
        </widget>
       </item>
       <item row="3" column="1">
-       <widget class="QLabel" name="label_2">
+       <widget class="QLabel" name="g_to_label">
         <property name="text">
          <string>to</string>
         </property>
        </widget>
       </item>
       <item row="4" column="2">
-       <widget class="QSpinBox" name="spinBox_6">
+       <widget class="QSpinBox" name="bto">
         <property name="maximum">
          <number>255</number>
         </property>
        </widget>
       </item>
       <item row="3" column="2">
-       <widget class="QSpinBox" name="spinBox_5">
+       <widget class="QSpinBox" name="gto">
         <property name="maximum">
          <number>255</number>
         </property>
        </widget>
       </item>
       <item row="3" column="3">
-       <widget class="QPushButton" name="pushButton_2">
+       <widget class="QPushButton" name="green_fade_button">
         <property name="text">
-         <string>Set</string>
+         <string>Green toggle</string>
         </property>
        </widget>
       </item>
       <item row="1" column="3">
-       <widget class="QPushButton" name="pushButton">
+       <widget class="QPushButton" name="red_fade_button">
         <property name="text">
-         <string>Set</string>
+         <string>Red toggle</string>
         </property>
        </widget>
       </item>
       <item row="4" column="1">
-       <widget class="QLabel" name="label_3">
+       <widget class="QLabel" name="_to_label">
         <property name="text">
          <string>to</string>
         </property>
        </widget>
       </item>
       <item row="0" column="0">
-       <widget class="QLabel" name="label_4">
+       <widget class="QLabel" name="fade_label">
         <property name="text">
          <string>Fade</string>
         </property>
@@ -313,18 +363,35 @@
       </item>
      </layout>
     </item>
-    <item row="16" column="0">
-     <widget class="QLabel" name="info_log_label">
+    <item row="1" column="0">
+     <widget class="QLabel" name="arduino_port_label">
+      <property name="minimumSize">
+       <size>
+        <width>120</width>
+        <height>0</height>
+       </size>
+      </property>
       <property name="text">
-       <string>Information log</string>
+       <string>Arduino port</string>
       </property>
      </widget>
     </item>
-    <item row="17" column="0" colspan="2">
-     <widget class="QTextEdit" name="info_log_textarea"/>
+    <item row="17" column="1">
+     <widget class="QLabel" name="b_speed_label">
+      <property name="text">
+       <string>Blue speed</string>
+      </property>
+     </widget>
     </item>
-    <item row="15" column="0">
-     <widget class="QSlider" name="horizontalSlider">
+    <item row="18" column="1">
+     <widget class="QPushButton" name="speed_button">
+      <property name="text">
+       <string>Speed</string>
+      </property>
+     </widget>
+    </item>
+    <item row="18" column="0">
+     <widget class="QSlider" name="speed_slider">
       <property name="minimum">
        <number>10</number>
       </property>
@@ -336,13 +403,6 @@
       </property>
      </widget>
     </item>
-    <item row="15" column="1">
-     <widget class="QPushButton" name="pushButton_4">
-      <property name="text">
-       <string>Speed</string>
-      </property>
-     </widget>
-    </item>
    </layout>
   </widget>
  </widget>
-- 
cgit v1.2.3