Index: MainTreatmentData/interface.ui
===================================================================
diff -u -r5bcfcac949d3a6c28ea9555ec5dcf7de978a06fd -rfa40a497db18e58fac496b283a5b45c7307446f8
--- MainTreatmentData/interface.ui	(.../interface.ui)	(revision 5bcfcac949d3a6c28ea9555ec5dcf7de978a06fd)
+++ MainTreatmentData/interface.ui	(.../interface.ui)	(revision fa40a497db18e58fac496b283a5b45c7307446f8)
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>482</width>
-    <height>492</height>
+    <height>545</height>
    </rect>
   </property>
   <property name="maximumSize">
@@ -24,8 +24,8 @@
   <property name="windowTitle">
    <string>&amp;3 Treatment/&amp;1 Main treatment </string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_6">
-   <item>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="QLabel" name="label_41">
@@ -63,7 +63,7 @@
      </item>
     </layout>
    </item>
-   <item>
+   <item row="1" column="0">
     <widget class="QFrame" name="frame_2">
      <property name="frameShape">
       <enum>QFrame::StyledPanel</enum>
@@ -255,23 +255,10 @@
         </item>
        </layout>
       </item>
-      <item>
-       <spacer name="verticalSpacer_3">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>0</width>
-          <height>0</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="2" column="0">
     <widget class="QFrame" name="frame">
      <property name="frameShape">
       <enum>QFrame::StyledPanel</enum>
@@ -293,44 +280,87 @@
        <number>2</number>
       </property>
       <item>
-       <widget class="QLabel" name="label">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>352</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="font">
-         <font>
-          <pointsize>10</pointsize>
-         </font>
-        </property>
-        <property name="autoFillBackground">
-         <bool>false</bool>
-        </property>
-        <property name="styleSheet">
-         <string notr="true">color: rgb(238, 238, 236);
+       <layout class="QHBoxLayout" name="horizontalLayout_8">
+        <item>
+         <widget class="QLabel" name="label">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>352</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="font">
+           <font>
+            <pointsize>10</pointsize>
+           </font>
+          </property>
+          <property name="autoFillBackground">
+           <bool>false</bool>
+          </property>
+          <property name="styleSheet">
+           <string notr="true">color: rgb(238, 238, 236);
 background-color: rgb(92, 53, 102);</string>
-        </property>
-        <property name="text">
-         <string>61 : [0x3D00] : Saline Bolus</string>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignCenter</set>
-        </property>
-       </widget>
+          </property>
+          <property name="text">
+           <string>61 : [0x3D00] : Saline Bolus</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QToolButton" name="tbBolusDataSend">
+          <property name="text">
+           <string>Send</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
       </item>
       <item>
        <layout class="QFormLayout" name="formLayout_2">
         <property name="labelAlignment">
          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
         </property>
+        <item row="0" column="0">
+         <widget class="QLabel" name="saline_bolus_req">
+          <property name="text">
+           <string>Saline Bolus Req[0x5F00]</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1">
+         <widget class="QLabel" name="lbBolusStart">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="autoFillBackground">
+           <bool>false</bool>
+          </property>
+          <property name="frameShape">
+           <enum>QFrame::Box</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>
         <item row="1" column="0">
          <widget class="QLabel" name="labelLabel_3">
           <property name="text">
@@ -392,16 +422,16 @@
          </layout>
         </item>
         <item row="2" column="0">
-         <widget class="QLabel" name="labelLabel_4">
+         <widget class="QLabel" name="labelLabel_5">
           <property name="text">
-           <string>Cumulative Volume</string>
+           <string>Current Delivered Volume</string>
           </property>
          </widget>
         </item>
         <item row="2" column="1">
-         <layout class="QHBoxLayout" name="horizontalLayout_7">
+         <layout class="QHBoxLayout" name="horizontalLayout_6">
           <item>
-           <widget class="QSlider" name="CumulativeVolumeSlider">
+           <widget class="QSlider" name="SalineCurrDeliveredVolumeSlider">
             <property name="sizePolicy">
              <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
               <horstretch>0</horstretch>
@@ -423,7 +453,7 @@
            </widget>
           </item>
           <item>
-           <widget class="QLabel" name="label_9">
+           <widget class="QLabel" name="label_10">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
               <horstretch>0</horstretch>
@@ -452,16 +482,16 @@
          </layout>
         </item>
         <item row="3" column="0">
-         <widget class="QLabel" name="labelLabel_5">
+         <widget class="QLabel" name="labelLabel_4">
           <property name="text">
-           <string>Current Delivered Volume</string>
+           <string>Cumulative Volume</string>
           </property>
          </widget>
         </item>
         <item row="3" column="1">
-         <layout class="QHBoxLayout" name="horizontalLayout_6">
+         <layout class="QHBoxLayout" name="horizontalLayout_7">
           <item>
-           <widget class="QSlider" name="SalineCurrDeliveredVolumeSlider">
+           <widget class="QSlider" name="CumulativeVolumeSlider">
             <property name="sizePolicy">
              <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
               <horstretch>0</horstretch>
@@ -483,7 +513,7 @@
            </widget>
           </item>
           <item>
-           <widget class="QLabel" name="label_10">
+           <widget class="QLabel" name="label_9">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
               <horstretch>0</horstretch>
@@ -511,57 +541,29 @@
           </item>
          </layout>
         </item>
-        <item row="0" column="0">
-         <widget class="QLabel" name="saline_bolus_req">
+        <item row="4" column="0">
+         <widget class="QLabel" name="stateLabel_3">
           <property name="text">
-           <string>Saline Bolus Req[0x5F00]</string>
+           <string>Bolus Permitted</string>
           </property>
          </widget>
         </item>
-        <item row="0" column="1">
-         <widget class="QLabel" name="lbBolusStart">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="autoFillBackground">
-           <bool>false</bool>
-          </property>
-          <property name="frameShape">
-           <enum>QFrame::Box</enum>
-          </property>
-          <property name="frameShadow">
-           <enum>QFrame::Sunken</enum>
-          </property>
+        <item row="4" column="1">
+         <widget class="QCheckBox" name="cbBolusPermitted">
           <property name="text">
-           <string>-</string>
+           <string/>
           </property>
-          <property name="alignment">
-           <set>Qt::AlignCenter</set>
+          <property name="checked">
+           <bool>true</bool>
           </property>
          </widget>
         </item>
        </layout>
       </item>
-      <item>
-       <spacer name="verticalSpacer_4">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>0</width>
-          <height>0</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="3" column="0">
     <widget class="QFrame" name="frame_3">
      <property name="frameShape">
       <enum>QFrame::StyledPanel</enum>
@@ -857,7 +859,7 @@
      </layout>
     </widget>
    </item>
-   <item>
+   <item row="4" column="0">
     <widget class="QFrame" name="frame_4">
      <property name="frameShape">
       <enum>QFrame::StyledPanel</enum>
@@ -1022,7 +1024,6 @@
  <tabstops>
   <tabstop>TargetVolumeSlider</tabstop>
   <tabstop>CumulativeVolumeSlider</tabstop>
-  <tabstop>SalineCurrDeliveredVolumeSlider</tabstop>
   <tabstop>DurationSlider</tabstop>
   <tabstop>ElapsedSlider</tabstop>
   <tabstop>tbSend</tabstop>
Index: MainTreatmentData/loader.py
===================================================================
diff -u -r9307b8315113adb7ad1823a19d58df6ea7e4ef8b -rfa40a497db18e58fac496b283a5b45c7307446f8
--- MainTreatmentData/loader.py	(.../loader.py)	(revision 9307b8315113adb7ad1823a19d58df6ea7e4ef8b)
+++ MainTreatmentData/loader.py	(.../loader.py)	(revision fa40a497db18e58fac496b283a5b45c7307446f8)
@@ -53,7 +53,10 @@
         self.saline_tgt_vol     = self.find_widget(QtWidgets.QSlider            , 'TargetVolumeSlider'              )
         self.saline_cum_vol     = self.find_widget(QtWidgets.QSlider            , 'CumulativeVolumeSlider'          )
         self.saline_bol_del     = self.find_widget(QtWidgets.QSlider            , 'SalineCurrDeliveredVolumeSlider' )
+        self.cbBolusPermitted   = self.find_widget(QtWidgets.QCheckBox          , 'cbBolusPermitted'                )
 
+        self.tbBolusDataSend        = self.find_widget(QtWidgets.QToolButton    , 'tbBolusDataSend'                 )
+
         self.ufDataSend             = self.find_widget(QtWidgets.QToolButton    , 'ufDataSendButton'                )
         self.ufDataReset            = self.find_widget(QtWidgets.QToolButton    , 'ufDataResetButton'               )
         self.ufSetVolume            = self.find_widget(QtWidgets.QSlider        , 'ufSetVolumeSlider'               )
@@ -62,7 +65,7 @@
         self.ufState                = self.find_widget(QtWidgets.QSpinBox       , 'ufStateSpinBox'                  )
         self.ufSetVolumeLabel       = self.find_widget(QtWidgets.QLabel         , 'ufSetVolumeLabel'                )
         self.ufTargetRateLabel      = self.find_widget(QtWidgets.QLabel         , 'ufTargetRateLabel'               )
-        self.ufVolumeDeliveredLabel = self.find_widget(QtWidgets.QLabel         , 'ufVolumeDeliveredLabel'          )
+        self.ufVolumeDeliveredLabel = self.find_widget(QtWidgets.QLabel         , 'ufVolumeDeliveredLabel'          ) 
 
         self.tx_duration        = self.find_widget(QtWidgets.QSlider            , 'DurationSlider'                  )
         self.tx_elapsed         = self.find_widget(QtWidgets.QSlider            , 'ElapsedSlider'                   )  
@@ -87,6 +90,8 @@
         self.saline_tgt_vol  .valueChanged.connect(self.do_saline_data)
         self.saline_cum_vol  .valueChanged.connect(self.do_saline_data)
         self.saline_bol_del  .valueChanged.connect(self.do_saline_data)
+        self.cbBolusPermitted.clicked.connect(self.do_saline_data)
+        self.tbBolusDataSend .clicked.connect(self.do_saline_data)
 
         self.ufDataSend         .clicked.connect(self.do_uf_data)
         self.ufDataReset        .clicked.connect(self.init_uf_data)
@@ -112,6 +117,7 @@
         state,index = conversions.bytearray_to_integer( message, index)
         self.lbBolusStart .setText( str(state) )
 
+
     @Slot()
     def _init_widgets(self):
         """
@@ -131,21 +137,23 @@
         self.dial_flow_st_pt    .setValue(0)
         self.dial_temp_st_pt    .setValue(0)
 
+
     @Slot()
     def do_saline_data(self):
         """
         the slot for Saline Data
         :return: none
         """
-        target_volume      = self.saline_tgt_vol.value()
-        cumulative_volume  = self.saline_cum_vol.value()
-        bolus_volume       = self.saline_bol_del.value()
+        target_volume      = self.saline_tgt_vol    .value()
+        bolus_volume       = self.saline_bol_del    .value()
+        cumulative_volume  = self.saline_cum_vol    .value()
+        bolusPermitted     = int(self.cbBolusPermitted  .isChecked())
 
         self.td_interface.td_saline(
             target_volume      ,
-            cumulative_volume  ,
             bolus_volume       ,
-            0              
+            cumulative_volume  ,
+            bolusPermitted
         )