Index: DD_Temperature/interface.ui
===================================================================
diff -u -r767c7999a57c41783d0269ec5ba296caf5278295 -r284e2fe2b5cccdbc3e12348b6f500fa9eae0e95a
--- DD_Temperature/interface.ui	(.../interface.ui)	(revision 767c7999a57c41783d0269ec5ba296caf5278295)
+++ DD_Temperature/interface.ui	(.../interface.ui)	(revision 284e2fe2b5cccdbc3e12348b6f500fa9eae0e95a)
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1043</width>
-    <height>333</height>
+    <width>1016</width>
+    <height>318</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -80,143 +80,143 @@
    </item>
    <item row="1" column="0">
     <layout class="QGridLayout" name="gridLayout">
-     <item row="0" column="0">
-      <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item row="3" column="0">
+      <layout class="QHBoxLayout" name="horizontalLayout_3">
        <item>
-        <widget class="QLabel" name="label_2">
+        <widget class="QLabel" name="label_3">
          <property name="minimumSize">
           <size>
-           <width>230</width>
+           <width>0</width>
            <height>0</height>
           </size>
          </property>
          <property name="text">
-          <string>Inlet heat Exchanger (D1)</string>
+          <string>D44 Cond</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QDoubleSpinBox" name="dsbD1InletheatExchanger">
+        <widget class="QDoubleSpinBox" name="dsbD44Conductivity">
          <property name="maximum">
           <double>10000.000000000000000</double>
          </property>
         </widget>
        </item>
       </layout>
      </item>
-     <item row="0" column="1">
-      <layout class="QHBoxLayout" name="horizontalLayout_10">
+     <item row="4" column="0">
+      <layout class="QHBoxLayout" name="horizontalLayout_4">
        <item>
-        <widget class="QLabel" name="label_10">
+        <widget class="QLabel" name="label_4">
          <property name="minimumSize">
           <size>
-           <width>230</width>
+           <width>0</width>
            <height>0</height>
           </size>
          </property>
          <property name="text">
-          <string>Barometric Temperature</string>
+          <string>D50 Avg</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QDoubleSpinBox" name="dsbBarometric">
+        <widget class="QDoubleSpinBox" name="dsbD50MovingAverage">
          <property name="maximum">
           <double>10000.000000000000000</double>
          </property>
         </widget>
        </item>
       </layout>
      </item>
-     <item row="0" column="2">
-      <layout class="QHBoxLayout" name="horizontalLayout_15">
+     <item row="3" column="1">
+      <layout class="QHBoxLayout" name="horizontalLayout_11">
        <item>
-        <widget class="QLabel" name="label_15">
+        <widget class="QLabel" name="label_11">
          <property name="minimumSize">
           <size>
-           <width>230</width>
+           <width>0</width>
            <height>0</height>
           </size>
          </property>
          <property name="text">
-          <string>Conductivity Temp (D75)</string>
+          <string>D75 Cond</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QDoubleSpinBox" name="dsbD75">
+        <widget class="QDoubleSpinBox" name="dsbD75Conductivity">
          <property name="maximum">
           <double>10000.000000000000000</double>
          </property>
         </widget>
        </item>
       </layout>
      </item>
-     <item row="1" column="0">
-      <layout class="QHBoxLayout" name="horizontalLayout_6">
+     <item row="6" column="1">
+      <layout class="QHBoxLayout" name="horizontalLayout_19">
        <item>
-        <widget class="QLabel" name="label_6">
+        <widget class="QLabel" name="label_18">
          <property name="minimumSize">
           <size>
-           <width>230</width>
+           <width>0</width>
            <height>0</height>
           </size>
          </property>
          <property name="text">
-          <string>Outlet heat exchanger (X6)</string>
+          <string>D51 Press Avg</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QDoubleSpinBox" name="dsbX6OutletHeatExchanger">
+        <widget class="QDoubleSpinBox" name="dsbD51PressureAverage">
          <property name="maximum">
           <double>10000.000000000000000</double>
          </property>
         </widget>
        </item>
       </layout>
      </item>
-     <item row="1" column="1">
-      <layout class="QHBoxLayout" name="horizontalLayout_9">
+     <item row="5" column="0">
+      <layout class="QHBoxLayout" name="horizontalLayout_18">
        <item>
-        <widget class="QLabel" name="label_9">
+        <widget class="QLabel" name="label_17">
          <property name="minimumSize">
           <size>
-           <width>230</width>
+           <width>0</width>
            <height>0</height>
           </size>
          </property>
          <property name="text">
-          <string>Conductivity Temp (D16)</string>
+          <string>D30 Avg</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QDoubleSpinBox" name="dsbD16">
+        <widget class="QDoubleSpinBox" name="dsbD30MovingAverage">
          <property name="maximum">
           <double>10000.000000000000000</double>
          </property>
         </widget>
        </item>
       </layout>
      </item>
-     <item row="1" column="2">
-      <layout class="QHBoxLayout" name="horizontalLayout_14">
+     <item row="2" column="2">
+      <layout class="QHBoxLayout" name="horizontalLayout_13">
        <item>
-        <widget class="QLabel" name="label_14">
+        <widget class="QLabel" name="label_13">
          <property name="minimumSize">
           <size>
-           <width>230</width>
+           <width>0</width>
            <height>0</height>
           </size>
          </property>
          <property name="text">
-          <string>Moving Average (D4)</string>
+          <string>D30 Cond</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QDoubleSpinBox" name="dsbD4MovingAverage">
+        <widget class="QDoubleSpinBox" name="dsbD30Conductivity">
          <property name="maximum">
           <double>10000.000000000000000</double>
          </property>
@@ -230,113 +230,113 @@
         <widget class="QLabel" name="label_5">
          <property name="minimumSize">
           <size>
-           <width>230</width>
+           <width>0</width>
            <height>0</height>
           </size>
          </property>
          <property name="text">
-          <string>Hydraulics Primary (D4)</string>
+          <string>D16 Cond</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QDoubleSpinBox" name="dsbD4Hydraulics">
+        <widget class="QDoubleSpinBox" name="dsbD16Conductivity">
          <property name="maximum">
           <double>10000.000000000000000</double>
          </property>
         </widget>
        </item>
       </layout>
      </item>
-     <item row="2" column="1">
-      <layout class="QHBoxLayout" name="horizontalLayout_8">
+     <item row="1" column="2">
+      <layout class="QHBoxLayout" name="horizontalLayout_14">
        <item>
-        <widget class="QLabel" name="label_8">
+        <widget class="QLabel" name="label_14">
          <property name="minimumSize">
           <size>
-           <width>230</width>
+           <width>0</width>
            <height>0</height>
           </size>
          </property>
          <property name="text">
-          <string>Conductivity Temp (D28)</string>
+          <string>Board Temperature</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QDoubleSpinBox" name="dsbD28">
+        <widget class="QDoubleSpinBox" name="dsbBoardTemperature">
          <property name="maximum">
           <double>10000.000000000000000</double>
          </property>
         </widget>
        </item>
       </layout>
      </item>
-     <item row="2" column="2">
-      <layout class="QHBoxLayout" name="horizontalLayout_13">
+     <item row="0" column="0">
+      <layout class="QHBoxLayout" name="horizontalLayout_2">
        <item>
-        <widget class="QLabel" name="label_13">
+        <widget class="QLabel" name="label_2">
          <property name="minimumSize">
           <size>
-           <width>230</width>
+           <width>0</width>
            <height>0</height>
           </size>
          </property>
          <property name="text">
-          <string>Moving Average (D50)</string>
+          <string>D1 Tmp</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QDoubleSpinBox" name="dsbD50MovingAverage">
+        <widget class="QDoubleSpinBox" name="dsbD1Temperature">
          <property name="maximum">
           <double>10000.000000000000000</double>
          </property>
         </widget>
        </item>
       </layout>
      </item>
-     <item row="3" column="0">
-      <layout class="QHBoxLayout" name="horizontalLayout_3">
+     <item row="4" column="2">
+      <layout class="QHBoxLayout" name="horizontalLayout_12">
        <item>
-        <widget class="QLabel" name="label_3">
+        <widget class="QLabel" name="label_12">
          <property name="minimumSize">
           <size>
-           <width>230</width>
+           <width>0</width>
            <height>0</height>
           </size>
          </property>
          <property name="text">
-          <string>Trimmer Heater (D50)</string>
+          <string>D28 Avg</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QDoubleSpinBox" name="dsbD50Trimmerheater">
+        <widget class="QDoubleSpinBox" name="dsbD28MovingAverage">
          <property name="maximum">
           <double>10000.000000000000000</double>
          </property>
         </widget>
        </item>
       </layout>
      </item>
-     <item row="3" column="1">
-      <layout class="QHBoxLayout" name="horizontalLayout_11">
+     <item row="0" column="1">
+      <layout class="QHBoxLayout" name="horizontalLayout_10">
        <item>
-        <widget class="QLabel" name="label_11">
+        <widget class="QLabel" name="label_10">
          <property name="minimumSize">
           <size>
-           <width>230</width>
+           <width>0</width>
            <height>0</height>
           </size>
          </property>
          <property name="text">
-          <string>Conductivity Temp (D30)</string>
+          <string>D78 Tmp</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QDoubleSpinBox" name="dsbD30">
+        <widget class="QDoubleSpinBox" name="dsbD78Temperature">
          <property name="maximum">
           <double>10000.000000000000000</double>
          </property>
@@ -350,129 +350,308 @@
         <widget class="QLabel" name="label_16">
          <property name="minimumSize">
           <size>
-           <width>230</width>
+           <width>0</width>
            <height>0</height>
           </size>
          </property>
          <property name="text">
-          <string>Moving Average (D28)</string>
+          <string>D4 Avg</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QDoubleSpinBox" name="dsbD28MovingAverage">
+        <widget class="QDoubleSpinBox" name="dsbD4MovingAverage">
          <property name="maximum">
           <double>10000.000000000000000</double>
          </property>
         </widget>
        </item>
       </layout>
      </item>
-     <item row="4" column="0">
-      <layout class="QHBoxLayout" name="horizontalLayout_4">
+     <item row="2" column="1">
+      <layout class="QHBoxLayout" name="horizontalLayout_8">
        <item>
-        <widget class="QLabel" name="label_4">
+        <widget class="QLabel" name="label_8">
          <property name="minimumSize">
           <size>
-           <width>230</width>
+           <width>0</width>
            <height>0</height>
           </size>
          </property>
          <property name="text">
-          <string>Board Temperature</string>
+          <string>D28 Cond</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QDoubleSpinBox" name="dsbBoard">
+        <widget class="QDoubleSpinBox" name="dsbD28Conductivity">
          <property name="maximum">
           <double>10000.000000000000000</double>
          </property>
         </widget>
        </item>
       </layout>
      </item>
+     <item row="1" column="0">
+      <layout class="QHBoxLayout" name="horizontalLayout_6">
+       <item>
+        <widget class="QLabel" name="label_6">
+         <property name="minimumSize">
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="text">
+          <string>D50 Temp</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QDoubleSpinBox" name="dsbD50Temperature">
+         <property name="maximum">
+          <double>10000.000000000000000</double>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item row="5" column="1">
+      <layout class="QHBoxLayout" name="horizontalLayout_17">
+       <item>
+        <widget class="QLabel" name="label_19">
+         <property name="minimumSize">
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="text">
+          <string>D78 Avg</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QDoubleSpinBox" name="dsbD78MovingAverage">
+         <property name="maximum">
+          <double>10000.000000000000000</double>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
      <item row="4" column="1">
       <layout class="QHBoxLayout" name="horizontalLayout_7">
        <item>
         <widget class="QLabel" name="label_7">
          <property name="minimumSize">
           <size>
-           <width>230</width>
+           <width>0</width>
            <height>0</height>
           </size>
          </property>
          <property name="text">
-          <string>Conductivity Temp (D44)</string>
+          <string>D99 Avf</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QDoubleSpinBox" name="dsbD44">
+        <widget class="QDoubleSpinBox" name="dsbD99MovingAverage">
          <property name="maximum">
           <double>10000.000000000000000</double>
          </property>
         </widget>
        </item>
       </layout>
      </item>
-     <item row="4" column="2">
-      <layout class="QHBoxLayout" name="horizontalLayout_12">
+     <item row="1" column="1">
+      <layout class="QHBoxLayout" name="horizontalLayout_9">
        <item>
-        <widget class="QLabel" name="label_12">
+        <widget class="QLabel" name="label_9">
          <property name="minimumSize">
           <size>
-           <width>230</width>
+           <width>0</width>
            <height>0</height>
           </size>
          </property>
          <property name="text">
-          <string>Moving Average (D30)</string>
+          <string>D99 Tmp</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QDoubleSpinBox" name="dsbD30MovingAverage">
+        <widget class="QDoubleSpinBox" name="dsbD99Temperature">
          <property name="maximum">
           <double>10000.000000000000000</double>
          </property>
         </widget>
        </item>
       </layout>
      </item>
+     <item row="0" column="2">
+      <layout class="QHBoxLayout" name="horizontalLayout_15">
+       <item>
+        <widget class="QLabel" name="label_15">
+         <property name="minimumSize">
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="text">
+          <string>D4 Tmp</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QDoubleSpinBox" name="dsbD4Temperature">
+         <property name="maximum">
+          <double>10000.000000000000000</double>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item row="7" column="1">
+      <layout class="QHBoxLayout" name="horizontalLayout_20">
+       <item>
+        <widget class="QLabel" name="label_20">
+         <property name="minimumSize">
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="text">
+          <string>D87 Press Avg</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QDoubleSpinBox" name="dsbD87PressureAverage">
+         <property name="maximum">
+          <double>10000.000000000000000</double>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item row="5" column="2">
+      <layout class="QHBoxLayout" name="horizontalLayout_21">
+       <item>
+        <widget class="QLabel" name="label_21">
+         <property name="minimumSize">
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="text">
+          <string>D9 Press Avg</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QDoubleSpinBox" name="dsbD9PressureAverage">
+         <property name="maximum">
+          <double>10000.000000000000000</double>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item row="6" column="2">
+      <layout class="QHBoxLayout" name="horizontalLayout_22">
+       <item>
+        <widget class="QLabel" name="label_22">
+         <property name="minimumSize">
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="text">
+          <string>D18 Press Avg</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QDoubleSpinBox" name="dsbD18PressureAverage">
+         <property name="maximum">
+          <double>10000.000000000000000</double>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item row="6" column="0">
+      <layout class="QHBoxLayout" name="horizontalLayout_24">
+       <item>
+        <widget class="QLabel" name="label_24">
+         <property name="minimumSize">
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="text">
+          <string>D66 Press Avg</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QDoubleSpinBox" name="dsbD66PressureAverage">
+         <property name="maximum">
+          <double>10000.000000000000000</double>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item row="7" column="0">
+      <layout class="QHBoxLayout" name="horizontalLayout_23">
+       <item>
+        <widget class="QLabel" name="label_23">
+         <property name="minimumSize">
+          <size>
+           <width>0</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="text">
+          <string>D41 Press Avg</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QDoubleSpinBox" name="dsbD41PressureAverage">
+         <property name="maximum">
+          <double>10000.000000000000000</double>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
     </layout>
    </item>
-   <item row="2" column="0">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
   </layout>
  </widget>
  <tabstops>
-  <tabstop>dsbD1InletheatExchanger</tabstop>
-  <tabstop>dsbX6OutletHeatExchanger</tabstop>
-  <tabstop>dsbD4Hydraulics</tabstop>
-  <tabstop>dsbD50Trimmerheater</tabstop>
-  <tabstop>dsbBoard</tabstop>
-  <tabstop>dsbBarometric</tabstop>
-  <tabstop>dsbD16</tabstop>
-  <tabstop>dsbD28</tabstop>
-  <tabstop>dsbD30</tabstop>
-  <tabstop>dsbD44</tabstop>
-  <tabstop>dsbD75</tabstop>
-  <tabstop>dsbD4MovingAverage</tabstop>
+  <tabstop>dsbD1Temperature</tabstop>
+  <tabstop>dsbD50Temperature</tabstop>
+  <tabstop>dsbD16Conductivity</tabstop>
+  <tabstop>dsbD44Conductivity</tabstop>
   <tabstop>dsbD50MovingAverage</tabstop>
+  <tabstop>dsbD78Temperature</tabstop>
+  <tabstop>dsbD99Temperature</tabstop>
+  <tabstop>dsbD28Conductivity</tabstop>
+  <tabstop>dsbD75Conductivity</tabstop>
+  <tabstop>dsbD99MovingAverage</tabstop>
+  <tabstop>dsbD4Temperature</tabstop>
+  <tabstop>dsbBoardTemperature</tabstop>
+  <tabstop>dsbD30Conductivity</tabstop>
+  <tabstop>dsbD4MovingAverage</tabstop>
   <tabstop>dsbD28MovingAverage</tabstop>
-  <tabstop>dsbD30MovingAverage</tabstop>
   <tabstop>tbSend</tabstop>
   <tabstop>tbReset</tabstop>
  </tabstops>