diff --git a/gui acdc.png b/gui acdc.png
index 3111b9752392ea15d35f02c2956f898791bf9f72..e89baca3bb0b84dcd0f2f212e35d38ca4d790f29 100644
Binary files a/gui acdc.png and b/gui acdc.png differ
diff --git a/src/acdc.ui b/src/acdc.ui
index abffc3e3894e6d4fe477000e1e075d554be32719..a80f506d9becd893465be34990e4b72a57173863 100644
--- a/src/acdc.ui
+++ b/src/acdc.ui
@@ -37,6 +37,49 @@
<height>161</height>
</rect>
</property>
+ <property name="palette">
+ <palette>
+ <active>
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>241</red>
+ <green>106</green>
+ <blue>23</blue>
+ </color>
+ </brush>
+ </colorrole>
+ </active>
+ <inactive>
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>241</red>
+ <green>106</green>
+ <blue>23</blue>
+ </color>
+ </brush>
+ </colorrole>
+ </inactive>
+ <disabled>
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>190</red>
+ <green>190</green>
+ <blue>190</blue>
+ </color>
+ </brush>
+ </colorrole>
+ </disabled>
+ </palette>
+ </property>
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
<property name="autoFillBackground">
<bool>true</bool>
</property>
@@ -169,6 +212,49 @@
<height>151</height>
</rect>
</property>
+ <property name="palette">
+ <palette>
+ <active>
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>241</red>
+ <green>106</green>
+ <blue>23</blue>
+ </color>
+ </brush>
+ </colorrole>
+ </active>
+ <inactive>
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>241</red>
+ <green>106</green>
+ <blue>23</blue>
+ </color>
+ </brush>
+ </colorrole>
+ </inactive>
+ <disabled>
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>190</red>
+ <green>190</green>
+ <blue>190</blue>
+ </color>
+ </brush>
+ </colorrole>
+ </disabled>
+ </palette>
+ </property>
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
<property name="autoFillBackground">
<bool>true</bool>
</property>
@@ -176,10 +262,16 @@
<string>M8</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
- <item row="2" column="1">
- <widget class="QuInputOutput" name="tReaderWriter_8">
+ <item row="0" column="1">
+ <widget class="QuInputOutput" name="tReaderWriter_7">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <horstretch>1</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="source">
- <string>pos/movers/r_m8_dmrc_pos.02/AxisCurrentPosition</string>
+ <string>pos/movers/p_m8_dmrc_pos.02/AxisCurrentPosition</string>
</property>
<property name="target" stdset="0">
<string/>
@@ -199,18 +291,8 @@
</property>
</widget>
</item>
- <item row="2" column="0">
- <widget class="QLabel" name="label_8">
- <property name="text">
- <string>Roll</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- </widget>
- </item>
- <item row="0" column="2">
- <widget class="QuLed" name="tLed_7">
+ <item row="3" column="2">
+ <widget class="QuLed" name="tLed_9">
<property name="rectangular">
<bool>true</bool>
</property>
@@ -218,12 +300,22 @@
<bool>false</bool>
</property>
<property name="source">
- <string>pos/movers/p_m8_dmrc_pos.02/State</string>
+ <string>pos/movers/y_m8_dmrc_pos.02/State</string>
</property>
</widget>
</item>
- <item row="3" column="2">
- <widget class="QuLed" name="tLed_9">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_7">
+ <property name="text">
+ <string>Pitch</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2">
+ <widget class="QuLed" name="tLed_7">
<property name="rectangular">
<bool>true</bool>
</property>
@@ -231,7 +323,7 @@
<bool>false</bool>
</property>
<property name="source">
- <string>pos/movers/y_m8_dmrc_pos.02/State</string>
+ <string>pos/movers/p_m8_dmrc_pos.02/State</string>
</property>
</widget>
</item>
@@ -245,39 +337,33 @@
</property>
</widget>
</item>
- <item row="3" column="1">
- <widget class="QuInputOutput" name="tReaderWriter_9">
- <property name="source">
- <string>pos/movers/y_m8_dmrc_pos.02/AxisCurrentPosition</string>
+ <item row="2" column="0">
+ <widget class="QLabel" name="label_8">
+ <property name="text">
+ <string>Roll</string>
</property>
- <property name="target" stdset="0">
- <string/>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
- <item row="0" column="1">
- <widget class="QuInputOutput" name="tReaderWriter_7">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
- <horstretch>1</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
+ <item row="2" column="1">
+ <widget class="QuInputOutput" name="tReaderWriter_8">
<property name="source">
- <string>pos/movers/p_m8_dmrc_pos.02/AxisCurrentPosition</string>
+ <string>pos/movers/r_m8_dmrc_pos.02/AxisCurrentPosition</string>
</property>
<property name="target" stdset="0">
<string/>
</property>
</widget>
</item>
- <item row="0" column="0">
- <widget class="QLabel" name="label_7">
- <property name="text">
- <string>Pitch</string>
+ <item row="3" column="1">
+ <widget class="QuInputOutput" name="tReaderWriter_9">
+ <property name="source">
+ <string>pos/movers/y_m8_dmrc_pos.02/AxisCurrentPosition</string>
</property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ <property name="target" stdset="0">
+ <string/>
</property>
</widget>
</item>
@@ -286,12 +372,109 @@
<widget class="QGroupBox" name="groupBox">
<property name="geometry">
<rect>
- <x>99</x>
- <y>190</y>
+ <x>76</x>
+ <y>164</y>
<width>241</width>
<height>161</height>
</rect>
</property>
+ <property name="palette">
+ <palette>
+ <active>
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>46</red>
+ <green>117</green>
+ <blue>182</blue>
+ </color>
+ </brush>
+ </colorrole>
+ <colorrole role="Text">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>46</red>
+ <green>117</green>
+ <blue>182</blue>
+ </color>
+ </brush>
+ </colorrole>
+ <colorrole role="PlaceholderText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="128">
+ <red>46</red>
+ <green>117</green>
+ <blue>182</blue>
+ </color>
+ </brush>
+ </colorrole>
+ </active>
+ <inactive>
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>46</red>
+ <green>117</green>
+ <blue>182</blue>
+ </color>
+ </brush>
+ </colorrole>
+ <colorrole role="Text">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>46</red>
+ <green>117</green>
+ <blue>182</blue>
+ </color>
+ </brush>
+ </colorrole>
+ <colorrole role="PlaceholderText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="128">
+ <red>46</red>
+ <green>117</green>
+ <blue>182</blue>
+ </color>
+ </brush>
+ </colorrole>
+ </inactive>
+ <disabled>
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>190</red>
+ <green>190</green>
+ <blue>190</blue>
+ </color>
+ </brush>
+ </colorrole>
+ <colorrole role="Text">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>190</red>
+ <green>190</green>
+ <blue>190</blue>
+ </color>
+ </brush>
+ </colorrole>
+ <colorrole role="PlaceholderText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="128">
+ <red>0</red>
+ <green>0</green>
+ <blue>0</blue>
+ </color>
+ </brush>
+ </colorrole>
+ </disabled>
+ </palette>
+ </property>
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
<property name="autoFillBackground">
<bool>true</bool>
</property>
@@ -437,10 +620,47 @@
<height>161</height>
</rect>
</property>
+ <property name="palette">
+ <palette>
+ <active>
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>241</red>
+ <green>106</green>
+ <blue>23</blue>
+ </color>
+ </brush>
+ </colorrole>
+ </active>
+ <inactive>
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>241</red>
+ <green>106</green>
+ <blue>23</blue>
+ </color>
+ </brush>
+ </colorrole>
+ </inactive>
+ <disabled>
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>190</red>
+ <green>190</green>
+ <blue>190</blue>
+ </color>
+ </brush>
+ </colorrole>
+ </disabled>
+ </palette>
+ </property>
<property name="font">
<font>
- <weight>50</weight>
- <bold>false</bold>
+ <weight>75</weight>
+ <bold>true</bold>
</font>
</property>
<property name="autoFillBackground">
@@ -566,6 +786,49 @@
<height>161</height>
</rect>
</property>
+ <property name="palette">
+ <palette>
+ <active>
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>241</red>
+ <green>106</green>
+ <blue>23</blue>
+ </color>
+ </brush>
+ </colorrole>
+ </active>
+ <inactive>
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>241</red>
+ <green>106</green>
+ <blue>23</blue>
+ </color>
+ </brush>
+ </colorrole>
+ </inactive>
+ <disabled>
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>190</red>
+ <green>190</green>
+ <blue>190</blue>
+ </color>
+ </brush>
+ </colorrole>
+ </disabled>
+ </palette>
+ </property>
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
<property name="autoFillBackground">
<bool>true</bool>
</property>
@@ -689,6 +952,103 @@
<height>131</height>
</rect>
</property>
+ <property name="palette">
+ <palette>
+ <active>
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>46</red>
+ <green>117</green>
+ <blue>182</blue>
+ </color>
+ </brush>
+ </colorrole>
+ <colorrole role="Text">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>46</red>
+ <green>117</green>
+ <blue>182</blue>
+ </color>
+ </brush>
+ </colorrole>
+ <colorrole role="PlaceholderText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="128">
+ <red>46</red>
+ <green>117</green>
+ <blue>182</blue>
+ </color>
+ </brush>
+ </colorrole>
+ </active>
+ <inactive>
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>46</red>
+ <green>117</green>
+ <blue>182</blue>
+ </color>
+ </brush>
+ </colorrole>
+ <colorrole role="Text">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>46</red>
+ <green>117</green>
+ <blue>182</blue>
+ </color>
+ </brush>
+ </colorrole>
+ <colorrole role="PlaceholderText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="128">
+ <red>46</red>
+ <green>117</green>
+ <blue>182</blue>
+ </color>
+ </brush>
+ </colorrole>
+ </inactive>
+ <disabled>
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>190</red>
+ <green>190</green>
+ <blue>190</blue>
+ </color>
+ </brush>
+ </colorrole>
+ <colorrole role="Text">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>190</red>
+ <green>190</green>
+ <blue>190</blue>
+ </color>
+ </brush>
+ </colorrole>
+ <colorrole role="PlaceholderText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="128">
+ <red>0</red>
+ <green>0</green>
+ <blue>0</blue>
+ </color>
+ </brush>
+ </colorrole>
+ </disabled>
+ </palette>
+ </property>
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
<property name="autoFillBackground">
<bool>true</bool>
</property>
@@ -795,8 +1155,8 @@
<widget class="QGroupBox" name="groupBox_5">
<property name="geometry">
<rect>
- <x>1109</x>
- <y>200</y>
+ <x>1070</x>
+ <y>164</y>
<width>241</width>
<height>161</height>
</rect>
@@ -924,6 +1284,103 @@
<height>131</height>
</rect>
</property>
+ <property name="palette">
+ <palette>
+ <active>
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>46</red>
+ <green>117</green>
+ <blue>182</blue>
+ </color>
+ </brush>
+ </colorrole>
+ <colorrole role="Text">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>46</red>
+ <green>117</green>
+ <blue>182</blue>
+ </color>
+ </brush>
+ </colorrole>
+ <colorrole role="PlaceholderText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="128">
+ <red>46</red>
+ <green>117</green>
+ <blue>182</blue>
+ </color>
+ </brush>
+ </colorrole>
+ </active>
+ <inactive>
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>46</red>
+ <green>117</green>
+ <blue>182</blue>
+ </color>
+ </brush>
+ </colorrole>
+ <colorrole role="Text">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>46</red>
+ <green>117</green>
+ <blue>182</blue>
+ </color>
+ </brush>
+ </colorrole>
+ <colorrole role="PlaceholderText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="128">
+ <red>46</red>
+ <green>117</green>
+ <blue>182</blue>
+ </color>
+ </brush>
+ </colorrole>
+ </inactive>
+ <disabled>
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>190</red>
+ <green>190</green>
+ <blue>190</blue>
+ </color>
+ </brush>
+ </colorrole>
+ <colorrole role="Text">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>190</red>
+ <green>190</green>
+ <blue>190</blue>
+ </color>
+ </brush>
+ </colorrole>
+ <colorrole role="PlaceholderText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="128">
+ <red>0</red>
+ <green>0</green>
+ <blue>0</blue>
+ </color>
+ </brush>
+ </colorrole>
+ </disabled>
+ </palette>
+ </property>
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
<property name="autoFillBackground">
<bool>true</bool>
</property>
@@ -1034,6 +1491,141 @@
<string>Show Units</string>
</property>
</widget>
+ <widget class="QuLabel" name="quLabel">
+ <property name="geometry">
+ <rect>
+ <x>1310</x>
+ <y>640</y>
+ <width>141</width>
+ <height>40</height>
+ </rect>
+ </property>
+ <property name="source">
+ <string>pos/dmrc/dmrc_pos.01/Delay</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="label_18">
+ <property name="geometry">
+ <rect>
+ <x>1240</x>
+ <y>640</y>
+ <width>61</width>
+ <height>35</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>Delay</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ <widget class="QGroupBox" name="groupBox_4">
+ <property name="geometry">
+ <rect>
+ <x>1230</x>
+ <y>460</y>
+ <width>231</width>
+ <height>75</height>
+ </rect>
+ </property>
+ <property name="title">
+ <string>Mobile Branch Filter </string>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QuLabel" name="lMobileBranch">
+ <property name="source">
+ <string>pos/mover1d/flt-var_dmrc_pos.01/Instrument</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QuComboBox" name="cbMobileBranch">
+ <property name="target">
+ <string>pos/mover1d/flt-var_dmrc_pos.01/Instrument</string>
+ </property>
+ <property name="executeOnIndexChanged">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QGroupBox" name="groupBox_7">
+ <property name="geometry">
+ <rect>
+ <x>1230</x>
+ <y>550</y>
+ <width>231</width>
+ <height>75</height>
+ </rect>
+ </property>
+ <property name="title">
+ <string>Fixed Branch Filter</string>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QuLabel" name="lStaticBranch">
+ <property name="source">
+ <string>pos/mover1d/flt-fix_dmrc_pos.01/Instrument</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QuComboBox" name="cbStaticBranch">
+ <property name="target">
+ <string>pos/mover1d/flt-fix_dmrc_pos.01/Instrument</string>
+ </property>
+ <property name="executeOnIndexChanged">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QuLabel" name="quLabel_2">
+ <property name="geometry">
+ <rect>
+ <x>1310</x>
+ <y>690</y>
+ <width>141</width>
+ <height>40</height>
+ </rect>
+ </property>
+ <property name="source">
+ <string>fb/pos/acdc_pos.01/State</string>
+ </property>
+ </widget>
+ <widget class="QLabel" name="label_20">
+ <property name="geometry">
+ <rect>
+ <x>1240</x>
+ <y>690</y>
+ <width>61</width>
+ <height>35</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>Feedback</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ <widget class="QuButton" name="bStopAll">
+ <property name="geometry">
+ <rect>
+ <x>30</x>
+ <y>730</y>
+ <width>80</width>
+ <height>26</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>Stop All</string>
+ </property>
+ </widget>
<zorder>label</zorder>
<zorder>groupBox_2</zorder>
<zorder>groupBox_10</zorder>
@@ -1044,6 +1636,13 @@
<zorder>groupBox_3</zorder>
<zorder>groupBox</zorder>
<zorder>cbShowUnits</zorder>
+ <zorder>quLabel</zorder>
+ <zorder>label_18</zorder>
+ <zorder>groupBox_4</zorder>
+ <zorder>groupBox_7</zorder>
+ <zorder>quLabel_2</zorder>
+ <zorder>label_20</zorder>
+ <zorder>bStopAll</zorder>
</widget>
</widget>
</item>
@@ -1051,11 +1650,26 @@
</widget>
<layoutdefault spacing="6" margin="11"/>
<customwidgets>
+ <customwidget>
+ <class>QuLabel</class>
+ <extends>QLabel</extends>
+ <header>qulabel.h</header>
+ </customwidget>
<customwidget>
<class>QuLed</class>
<extends>QWidget</extends>
<header>quled.h</header>
</customwidget>
+ <customwidget>
+ <class>QuComboBox</class>
+ <extends>QComboBox</extends>
+ <header>qucombobox.h</header>
+ </customwidget>
+ <customwidget>
+ <class>QuButton</class>
+ <extends>QPushButton</extends>
+ <header>qubutton.h</header>
+ </customwidget>
<customwidget>
<class>QuInputOutput</class>
<extends>QFrame</extends>