Index: DD_Calibration/interface.ui
===================================================================
diff -u -r95474c125e6f45fc7659e76d27390ac006ed6c76 -rfc2bcc5d5a0af8e977e5a1c35e2b5573630984df
--- DD_Calibration/interface.ui	(.../interface.ui)	(revision 95474c125e6f45fc7659e76d27390ac006ed6c76)
+++ DD_Calibration/interface.ui	(.../interface.ui)	(revision fc2bcc5d5a0af8e977e5a1c35e2b5573630984df)
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1183</width>
+    <width>541</width>
     <height>773</height>
    </rect>
   </property>
@@ -36,7 +36,7 @@
   <property name="windowTitle">
    <string>&amp;6 DD Info/&amp;C Calibration</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout_25">
+  <layout class="QGridLayout" name="gridLayout_5">
    <item row="0" column="0">
     <widget class="QLabel" name="label_4">
      <property name="font">
@@ -60,7 +60,7 @@
    <item row="1" column="0">
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>3</number>
+      <number>6</number>
      </property>
      <widget class="QWidget" name="tab">
       <attribute name="title">
@@ -2020,52 +2020,96 @@
       <layout class="QGridLayout" name="gridLayout_16">
        <item row="0" column="0">
         <layout class="QGridLayout" name="gridLayout_15">
-         <item row="8" column="5">
-          <widget class="QSpinBox" name="sbSetAcidConcRejectionReason">
-           <property name="alignment">
-            <set>Qt::AlignCenter</set>
+         <item row="9" column="0">
+          <widget class="QLabel" name="targetVolumeLabel_136">
+           <property name="text">
+            <string>Index</string>
            </property>
-           <property name="maximum">
-            <number>100</number>
+          </widget>
+         </item>
+         <item row="10" column="0">
+          <widget class="QLabel" name="targetVolumeLabel_137">
+           <property name="text">
+            <string>Conc Mix Ratio</string>
            </property>
           </widget>
          </item>
-         <item row="3" column="4" colspan="2">
-          <widget class="QDoubleSpinBox" name="sbGetAcidConcUSPerCM"/>
+         <item row="5" column="1" colspan="2">
+          <widget class="QDoubleSpinBox" name="sbGetAcidConcMixRatio"/>
          </item>
-         <item row="1" column="0">
-          <widget class="QLabel" name="targetVolumeLabel_135">
+         <item row="0" column="0" colspan="5">
+          <widget class="QLabel" name="label_21">
+           <property name="font">
+            <font>
+             <pointsize>10</pointsize>
+            </font>
+           </property>
+           <property name="styleSheet">
+            <string notr="true">color: rgb(238, 238, 236);
+background-color: rgb(78, 154, 6)
+</string>
+           </property>
            <property name="text">
-            <string>Req [0x12C]</string>
+            <string>301 : [0x12D]  Get Acid Concentrates</string>
            </property>
+           <property name="alignment">
+            <set>Qt::AlignCenter</set>
+           </property>
           </widget>
          </item>
-         <item row="0" column="5">
-          <widget class="QToolButton" name="tbGetAcidConcSend">
+         <item row="8" column="0">
+          <widget class="QLabel" name="targetVolumeLabel_129">
            <property name="text">
-            <string>Send</string>
+            <string>Req [0x12E]</string>
            </property>
           </widget>
          </item>
-         <item row="9" column="3" colspan="2">
-          <widget class="QLabel" name="targetVolumeLabel_142">
+         <item row="12" column="0">
+          <widget class="QLabel" name="targetVolumeLabel_139">
            <property name="text">
-            <string>Index</string>
+            <string>Conductiviy US Per CM</string>
            </property>
           </widget>
          </item>
-         <item row="3" column="1" colspan="2">
-          <widget class="QSpinBox" name="sbGetAcidConcRejectionReason">
+         <item row="7" column="0" colspan="5">
+          <widget class="QLabel" name="label_22">
+           <property name="font">
+            <font>
+             <pointsize>10</pointsize>
+            </font>
+           </property>
+           <property name="styleSheet">
+            <string notr="true">color: rgb(238, 238, 236);
+background-color: rgb(78, 154, 6)
+</string>
+           </property>
+           <property name="text">
+            <string>303 : [0x12F]  Set Acid Concentrates</string>
+           </property>
            <property name="alignment">
             <set>Qt::AlignCenter</set>
            </property>
+          </widget>
+         </item>
+         <item row="8" column="5">
+          <widget class="QSpinBox" name="sbSetAcidConcRejectionReason">
+           <property name="alignment">
+            <set>Qt::AlignCenter</set>
+           </property>
            <property name="maximum">
             <number>100</number>
            </property>
           </widget>
          </item>
-         <item row="12" column="1" colspan="2">
-          <widget class="QLabel" name="lbSetAcidConcUSPerCM">
+         <item row="12" column="3" colspan="2">
+          <widget class="QLabel" name="targetVolumeLabel_215">
+           <property name="text">
+            <string>Conductiviy US Per CM Rejection</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1" colspan="5">
+          <widget class="QLabel" name="lbGetAcidConcReq">
            <property name="sizePolicy">
             <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
              <horstretch>0</horstretch>
@@ -2095,29 +2139,28 @@
            </property>
           </widget>
          </item>
-         <item row="5" column="3">
-          <widget class="QLabel" name="targetVolumeLabel_132">
-           <property name="text">
-            <string>CalibrationTime</string>
+         <item row="3" column="1" colspan="2">
+          <widget class="QSpinBox" name="sbGetAcidConcRejectionReason">
+           <property name="alignment">
+            <set>Qt::AlignCenter</set>
            </property>
-          </widget>
-         </item>
-         <item row="10" column="3" colspan="2">
-          <widget class="QLabel" name="targetVolumeLabel_141">
-           <property name="text">
-            <string>Conc Mix Ratio Rejection</string>
+           <property name="maximum">
+            <number>100</number>
            </property>
           </widget>
          </item>
-         <item row="2" column="3">
-          <widget class="QLabel" name="targetVolumeLabel_210">
-           <property name="text">
-            <string>Full Bottome Volume ML</string>
+         <item row="13" column="5">
+          <widget class="QSpinBox" name="sbSetAcidConcBottleTemp">
+           <property name="alignment">
+            <set>Qt::AlignCenter</set>
            </property>
+           <property name="maximum">
+            <number>100</number>
+           </property>
           </widget>
          </item>
-         <item row="13" column="1">
-          <widget class="QLabel" name="lbSetAcidConcBottleTemp">
+         <item row="9" column="1" colspan="2">
+          <widget class="QLabel" name="lbSetAcidConcIndex">
            <property name="sizePolicy">
             <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
              <horstretch>0</horstretch>
@@ -2147,55 +2190,49 @@
            </property>
           </widget>
          </item>
-         <item row="7" column="0" colspan="5">
-          <widget class="QLabel" name="label_22">
-           <property name="font">
-            <font>
-             <pointsize>10</pointsize>
-            </font>
+         <item row="5" column="3">
+          <widget class="QLabel" name="targetVolumeLabel_132">
+           <property name="text">
+            <string>CalibrationTime</string>
            </property>
-           <property name="styleSheet">
-            <string notr="true">color: rgb(238, 238, 236);
-background-color: rgb(78, 154, 6)
-</string>
+          </widget>
+         </item>
+         <item row="3" column="3">
+          <widget class="QLabel" name="targetVolumeLabel_131">
+           <property name="text">
+            <string>Conductiviy US Per CM</string>
            </property>
+          </widget>
+         </item>
+         <item row="2" column="1" colspan="2">
+          <widget class="QCheckBox" name="cbGetAcidConcAccepted">
            <property name="text">
-            <string>303 : [0x12F]  Set Acid Concentrates</string>
+            <string>Accepted</string>
            </property>
-           <property name="alignment">
-            <set>Qt::AlignCenter</set>
-           </property>
           </widget>
          </item>
-         <item row="9" column="1" colspan="2">
-          <widget class="QLabel" name="lbSetAcidConcIndex">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
+         <item row="8" column="4">
+          <widget class="QLabel" name="targetVolumeLabel_140">
+           <property name="text">
+            <string>Reason</string>
            </property>
-           <property name="minimumSize">
-            <size>
-             <width>0</width>
-             <height>0</height>
-            </size>
-           </property>
-           <property name="autoFillBackground">
-            <bool>false</bool>
-           </property>
-           <property name="frameShape">
-            <enum>QFrame::WinPanel</enum>
-           </property>
-           <property name="frameShadow">
-            <enum>QFrame::Sunken</enum>
-           </property>
+          </widget>
+         </item>
+         <item row="13" column="3" colspan="2">
+          <widget class="QLabel" name="targetVolumeLabel_213">
            <property name="text">
-            <string>-</string>
+            <string>Bottle Temperature Rejection</string>
            </property>
+          </widget>
+         </item>
+         <item row="11" column="5">
+          <widget class="QSpinBox" name="sbSetAcidConcFullBottleVolume">
            <property name="alignment">
             <set>Qt::AlignCenter</set>
            </property>
+           <property name="maximum">
+            <number>100</number>
+           </property>
           </widget>
          </item>
          <item row="12" column="5">
@@ -2208,8 +2245,22 @@
            </property>
           </widget>
          </item>
-         <item row="10" column="5">
-          <widget class="QSpinBox" name="sbSetAcidConcMixRatio">
+         <item row="14" column="3" colspan="2">
+          <widget class="QLabel" name="targetVolumeLabel_143">
+           <property name="text">
+            <string>CalibrationTime Rejection</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="0">
+          <widget class="QLabel" name="targetVolumeLabel_135">
+           <property name="text">
+            <string>Req [0x12C]</string>
+           </property>
+          </widget>
+         </item>
+         <item row="4" column="1" colspan="2">
+          <widget class="QSpinBox" name="sbGetAcidConcIndex">
            <property name="alignment">
             <set>Qt::AlignCenter</set>
            </property>
@@ -2218,28 +2269,39 @@
            </property>
           </widget>
          </item>
-         <item row="0" column="0" colspan="5">
-          <widget class="QLabel" name="label_21">
-           <property name="font">
-            <font>
-             <pointsize>10</pointsize>
-            </font>
+         <item row="3" column="4" colspan="2">
+          <widget class="QDoubleSpinBox" name="sbGetAcidConcUSPerCM"/>
+         </item>
+         <item row="7" column="5">
+          <widget class="QToolButton" name="tbSetAcidConcSend">
+           <property name="text">
+            <string>Send</string>
            </property>
-           <property name="styleSheet">
-            <string notr="true">color: rgb(238, 238, 236);
-background-color: rgb(78, 154, 6)
-</string>
+          </widget>
+         </item>
+         <item row="4" column="0">
+          <widget class="QLabel" name="targetVolumeLabel_133">
+           <property name="text">
+            <string>Index</string>
            </property>
+          </widget>
+         </item>
+         <item row="9" column="3" colspan="2">
+          <widget class="QLabel" name="targetVolumeLabel_142">
            <property name="text">
-            <string>301 : [0x12D]  Get Acid Concentrates</string>
+            <string>Index</string>
            </property>
-           <property name="alignment">
-            <set>Qt::AlignCenter</set>
+          </widget>
+         </item>
+         <item row="10" column="3" colspan="2">
+          <widget class="QLabel" name="targetVolumeLabel_141">
+           <property name="text">
+            <string>Conc Mix Ratio Rejection</string>
            </property>
           </widget>
          </item>
-         <item row="1" column="1" colspan="5">
-          <widget class="QLabel" name="lbGetAcidConcReq">
+         <item row="11" column="1" colspan="2">
+          <widget class="QLabel" name="lbSetAcidConcFullBottleVolume">
            <property name="sizePolicy">
             <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
              <horstretch>0</horstretch>
@@ -2269,32 +2331,22 @@
            </property>
           </widget>
          </item>
-         <item row="5" column="1" colspan="2">
-          <widget class="QDoubleSpinBox" name="sbGetAcidConcMixRatio"/>
-         </item>
-         <item row="11" column="0">
-          <widget class="QLabel" name="targetVolumeLabel_138">
+         <item row="8" column="3">
+          <widget class="QCheckBox" name="cbSetAcidConcAccepted">
            <property name="text">
-            <string>Full Bottome Volume ML</string>
+            <string>Accepted</string>
            </property>
           </widget>
          </item>
-         <item row="4" column="0">
-          <widget class="QLabel" name="targetVolumeLabel_133">
+         <item row="0" column="5">
+          <widget class="QToolButton" name="tbGetAcidConcSend">
            <property name="text">
-            <string>Index</string>
+            <string>Send</string>
            </property>
           </widget>
          </item>
-         <item row="8" column="4">
-          <widget class="QLabel" name="targetVolumeLabel_140">
-           <property name="text">
-            <string>Reason</string>
-           </property>
-          </widget>
-         </item>
-         <item row="11" column="1" colspan="2">
-          <widget class="QLabel" name="lbSetAcidConcFullBottleVolume">
+         <item row="12" column="1" colspan="2">
+          <widget class="QLabel" name="lbSetAcidConcUSPerCM">
            <property name="sizePolicy">
             <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
              <horstretch>0</horstretch>
@@ -2324,80 +2376,39 @@
            </property>
           </widget>
          </item>
-         <item row="2" column="4" colspan="2">
-          <widget class="QDoubleSpinBox" name="sbGetAcidConcFullBottleVolume"/>
-         </item>
-         <item row="8" column="3">
-          <widget class="QCheckBox" name="cbSetAcidConcAccepted">
-           <property name="text">
-            <string>Accepted</string>
+         <item row="13" column="1">
+          <widget class="QLabel" name="lbSetAcidConcBottleTemp">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
            </property>
-          </widget>
-         </item>
-         <item row="12" column="0">
-          <widget class="QLabel" name="targetVolumeLabel_139">
-           <property name="text">
-            <string>Conductiviy US Per CM</string>
+           <property name="minimumSize">
+            <size>
+             <width>0</width>
+             <height>0</height>
+            </size>
            </property>
-          </widget>
-         </item>
-         <item row="5" column="0">
-          <widget class="QLabel" name="targetVolumeLabel_209">
-           <property name="text">
-            <string>Conc Mix Ratio</string>
+           <property name="autoFillBackground">
+            <bool>false</bool>
            </property>
-          </widget>
-         </item>
-         <item row="4" column="1" colspan="2">
-          <widget class="QSpinBox" name="sbGetAcidConcIndex">
-           <property name="alignment">
-            <set>Qt::AlignCenter</set>
+           <property name="frameShape">
+            <enum>QFrame::WinPanel</enum>
            </property>
-           <property name="maximum">
-            <number>100</number>
+           <property name="frameShadow">
+            <enum>QFrame::Sunken</enum>
            </property>
-          </widget>
-         </item>
-         <item row="4" column="3">
-          <widget class="QLabel" name="targetVolumeLabel_211">
            <property name="text">
-            <string>Bottle Temperature</string>
+            <string>-</string>
            </property>
-          </widget>
-         </item>
-         <item row="11" column="3" colspan="2">
-          <widget class="QLabel" name="targetVolumeLabel_144">
-           <property name="text">
-            <string>Full Bottome Volume ML Rejection</string>
-           </property>
-          </widget>
-         </item>
-         <item row="9" column="0">
-          <widget class="QLabel" name="targetVolumeLabel_136">
-           <property name="text">
-            <string>Index</string>
-           </property>
-          </widget>
-         </item>
-         <item row="5" column="4" colspan="2">
-          <widget class="QSpinBox" name="sbGetAcidConcCalibrationTime">
            <property name="alignment">
             <set>Qt::AlignCenter</set>
            </property>
-           <property name="maximum">
-            <number>100</number>
-           </property>
           </widget>
          </item>
-         <item row="10" column="0">
-          <widget class="QLabel" name="targetVolumeLabel_137">
-           <property name="text">
-            <string>Conc Mix Ratio</string>
-           </property>
-          </widget>
-         </item>
-         <item row="13" column="5">
-          <widget class="QSpinBox" name="sbSetAcidConcBottleTemp">
+         <item row="10" column="5">
+          <widget class="QSpinBox" name="sbSetAcidConcMixRatio">
            <property name="alignment">
             <set>Qt::AlignCenter</set>
            </property>
@@ -2406,15 +2417,8 @@
            </property>
           </widget>
          </item>
-         <item row="7" column="5">
-          <widget class="QToolButton" name="tbSetAcidConcSend">
-           <property name="text">
-            <string>Send</string>
-           </property>
-          </widget>
-         </item>
          <item row="9" column="5">
-          <widget class="QSpinBox" name="sbSetAcidConcRIndex">
+          <widget class="QSpinBox" name="sbSetAcidConcIndex">
            <property name="alignment">
             <set>Qt::AlignCenter</set>
            </property>
@@ -2423,37 +2427,20 @@
            </property>
           </widget>
          </item>
-         <item row="8" column="0">
-          <widget class="QLabel" name="targetVolumeLabel_129">
+         <item row="2" column="3">
+          <widget class="QLabel" name="targetVolumeLabel_210">
            <property name="text">
-            <string>Req [0x12E]</string>
+            <string>Full Bottome Volume ML</string>
            </property>
           </widget>
          </item>
-         <item row="13" column="0">
-          <widget class="QLabel" name="targetVolumeLabel_212">
+         <item row="4" column="3">
+          <widget class="QLabel" name="targetVolumeLabel_211">
            <property name="text">
             <string>Bottle Temperature</string>
            </property>
           </widget>
          </item>
-         <item row="2" column="1" colspan="2">
-          <widget class="QCheckBox" name="cbGetAcidConcAccepted">
-           <property name="text">
-            <string>Accepted</string>
-           </property>
-          </widget>
-         </item>
-         <item row="3" column="3">
-          <widget class="QLabel" name="targetVolumeLabel_131">
-           <property name="text">
-            <string>Conductiviy US Per CM</string>
-           </property>
-          </widget>
-         </item>
-         <item row="4" column="4" colspan="2">
-          <widget class="QDoubleSpinBox" name="sbGetAcidConcBottleTemp"/>
-         </item>
          <item row="10" column="1" colspan="2">
           <widget class="QLabel" name="lbSetAcidConcMixRatio">
            <property name="sizePolicy">
@@ -2485,13 +2472,17 @@
            </property>
           </widget>
          </item>
-         <item row="11" column="5">
-          <widget class="QSpinBox" name="sbSetAcidConcFullBottleVolume">
-           <property name="alignment">
-            <set>Qt::AlignCenter</set>
+         <item row="11" column="0">
+          <widget class="QLabel" name="targetVolumeLabel_138">
+           <property name="text">
+            <string>Full Bottome Volume ML</string>
            </property>
-           <property name="maximum">
-            <number>100</number>
+          </widget>
+         </item>
+         <item row="11" column="3" colspan="2">
+          <widget class="QLabel" name="targetVolumeLabel_144">
+           <property name="text">
+            <string>Full Bottome Volume ML Rejection</string>
            </property>
           </widget>
          </item>
@@ -2512,27 +2503,74 @@
            </property>
           </widget>
          </item>
-         <item row="14" column="3" colspan="2">
-          <widget class="QLabel" name="targetVolumeLabel_143">
+         <item row="5" column="4" colspan="2">
+          <widget class="QSpinBox" name="sbGetAcidConcCalibrationTime">
+           <property name="alignment">
+            <set>Qt::AlignCenter</set>
+           </property>
+           <property name="maximum">
+            <number>100</number>
+           </property>
+          </widget>
+         </item>
+         <item row="5" column="0">
+          <widget class="QLabel" name="targetVolumeLabel_209">
            <property name="text">
-            <string>CalibrationTime Rejection</string>
+            <string>Conc Mix Ratio</string>
            </property>
           </widget>
          </item>
-         <item row="12" column="3" colspan="2">
-          <widget class="QLabel" name="targetVolumeLabel_215">
+         <item row="13" column="0">
+          <widget class="QLabel" name="targetVolumeLabel_212">
            <property name="text">
-            <string>Conductiviy US Per CM Rejection</string>
+            <string>Bottle Temperature</string>
            </property>
           </widget>
          </item>
-         <item row="13" column="3" colspan="2">
-          <widget class="QLabel" name="targetVolumeLabel_213">
+         <item row="4" column="4" colspan="2">
+          <widget class="QDoubleSpinBox" name="sbGetAcidConcBottleTemp"/>
+         </item>
+         <item row="2" column="4" colspan="2">
+          <widget class="QDoubleSpinBox" name="sbGetAcidConcFullBottleVolume"/>
+         </item>
+         <item row="14" column="0">
+          <widget class="QLabel" name="targetVolumeLabel_242">
            <property name="text">
-            <string>Bottle Temperature Rejection</string>
+            <string>CalibrationTime</string>
            </property>
           </widget>
          </item>
+         <item row="14" column="1">
+          <widget class="QLabel" name="lbSetAcidConcCalibrationTime">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>0</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="autoFillBackground">
+            <bool>false</bool>
+           </property>
+           <property name="frameShape">
+            <enum>QFrame::WinPanel</enum>
+           </property>
+           <property name="frameShadow">
+            <enum>QFrame::Sunken</enum>
+           </property>
+           <property name="text">
+            <string>-</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignCenter</set>
+           </property>
+          </widget>
+         </item>
         </layout>
        </item>
       </layout>
@@ -2638,7 +2676,7 @@
           </widget>
          </item>
          <item row="9" column="5">
-          <widget class="QSpinBox" name="sbSetBicarbConcRIndex">
+          <widget class="QSpinBox" name="sbSetBicarbConcIndex">
            <property name="alignment">
             <set>Qt::AlignCenter</set>
            </property>
@@ -3057,6 +3095,44 @@
            </property>
           </widget>
          </item>
+         <item row="14" column="0">
+          <widget class="QLabel" name="targetVolumeLabel_243">
+           <property name="text">
+            <string>CalibrationTime</string>
+           </property>
+          </widget>
+         </item>
+         <item row="14" column="1">
+          <widget class="QLabel" name="lbSetBicarbConcCalibrationTime">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>0</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="autoFillBackground">
+            <bool>false</bool>
+           </property>
+           <property name="frameShape">
+            <enum>QFrame::WinPanel</enum>
+           </property>
+           <property name="frameShadow">
+            <enum>QFrame::Sunken</enum>
+           </property>
+           <property name="text">
+            <string>-</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignCenter</set>
+           </property>
+          </widget>
+         </item>
         </layout>
        </item>
       </layout>