Index: MainTreatmentData/loader.py
===================================================================
diff -u -r871361792769299b3f8f2033b058ba343cec0aa7 -rc43959d92d8ae0439b01b9acd6fa5bb3922afd17
--- MainTreatmentData/loader.py	(.../loader.py)	(revision 871361792769299b3f8f2033b058ba343cec0aa7)
+++ MainTreatmentData/loader.py	(.../loader.py)	(revision c43959d92d8ae0439b01b9acd6fa5bb3922afd17)
@@ -55,29 +55,17 @@
         self.saline_cum_vol     = self.find_widget(QtWidgets.QSlider            , 'CumulativeVolumeSlider'          )
         self.saline_bol_del     = self.find_widget(QtWidgets.QSlider            , 'SalineCurrDeliveredVolumeSlider' )
 
-        self.UF_set_vol         = self.find_widget(QtWidgets.QSlider            , 'UFSetVolSlider'                  )    
-        self.UF_tgt_rate        = self.find_widget(QtWidgets.QSlider            , 'UFRateSlider'                    )
-        self.UF_vol_del         = self.find_widget(QtWidgets.QSlider            , 'UFVolDelSlider'                  )
-        self.UF_State           = self.find_widget(QtWidgets.QSpinBox           , 'UFStatespinBox'                  )
-        self.UF_Max             = self.find_widget(QtWidgets.QDoubleSpinBox     , 'UFMaxDoubleSpinBox'              ) # Value only to configure UF slider
-
         self.tx_duration        = self.find_widget(QtWidgets.QSlider            , 'DurationSlider'                  )
         self.tx_elapsed         = self.find_widget(QtWidgets.QSlider            , 'ElapsedSlider'                   )  
 
         self.blood_flow_st_pt   = self.find_widget(QtWidgets.QSpinBox           , 'BloodFlowSpinBox'                )
         self.dial_flow_st_pt    = self.find_widget(QtWidgets.QSpinBox           , 'DialFlowDpinBox'                 )
         self.dial_temp_st_pt    = self.find_widget(QtWidgets.QDoubleSpinBox     , 'DialTempDoubleSpinBox'           )
 
-        self.uf_scaling         = 100.00           # UF Scaling factor to be 2 decimal places
-
-        self.UF_tgt_rate_label  = self.find_widget(QtWidgets.QLabel             , 'targetufLabel'                   )
-        self.UF_vol_del_label   = self.find_widget(QtWidgets.QLabel             , 'ufvolumeDeliveredlabel'          )
-        self.UF_set_vol_label   = self.find_widget(QtWidgets.QLabel             , 'setufvolumeLabel'                )
         self.saline_bolus_req   = self.find_widget(QtWidgets.QLabel             , 'saline_bolus_req'                )
 
         self.lbBolusStart       = self.find_widget(QtWidgets.QLabel             , 'lbBolusStart'                    )
 
-
     def _init_connections(self):
         """
         initializes the widgets connections
@@ -91,19 +79,12 @@
         self.saline_cum_vol  .valueChanged.connect(self.do_saline_data)
         self.saline_bol_del  .valueChanged.connect(self.do_saline_data)
 
-        self.UF_set_vol      .valueChanged.connect(self.do_uf_data)
-        self.UF_tgt_rate     .valueChanged.connect(self.do_uf_data)
-        self.UF_vol_del      .valueChanged.connect(self.do_uf_data)
-        self.UF_State        .valueChanged.connect(self.do_uf_data)
-        self.UF_Max          .valueChanged.connect(self.do_uf_max)
-
         self.tx_duration     .valueChanged.connect(self.do_tx_time_data)
         self.tx_elapsed      .valueChanged.connect(self.do_tx_time_data)
 
         self.blood_flow_st_pt.valueChanged.connect(self.do_tx_set_point_data)  
         self.dial_flow_st_pt .valueChanged.connect(self.do_tx_set_point_data)  
         self.dial_temp_st_pt .valueChanged.connect(self.do_tx_set_point_data)  
-        
 
     def handle_solution_infusion_request(self, message, timestamp = 0.0):
         """
@@ -121,33 +102,17 @@
         initializes the widgets' properties
         :return: none
         """
-
         self.saline_tgt_vol .setValue(0)
         self.saline_cum_vol .setValue(0)
         self.saline_bol_del .setValue(0)
 
-        self.UF_set_vol     .setValue(0)
-        self.UF_tgt_rate    .setValue(0)
-        self.UF_vol_del     .setValue(0)
-        self.UF_State       .setValue(0)
-
         self.tx_duration    .setValue(0)
         self.tx_elapsed     .setValue(0)
 
-    @Slot()
-    def do_uf_max(self):
-        """
-        initializes the widgets' properties
-        :return: none
-        """
-        new_max_uf = self.UF_Max.value() * self.uf_scaling
-        if self.UF_vol_del.value() > new_max_uf:
-            self.UF_vol_del         .setValue(new_max_uf)
-            self.UF_vol_del_label   .setText(str(self.UF_vol_del.value() / self.uf_scaling))
+        self.blood_flow_st_pt   .setValue(0)
+        self.dial_flow_st_pt    .setValue(0)
+        self.dial_temp_st_pt    .setValue(0)
 
-        self.UF_vol_del.setMaximum( self.UF_Max.value() * self.uf_scaling )
-
-
     @Slot()
     def do_saline_data(self):
         """
@@ -166,29 +131,6 @@
         )
 
     @Slot()
-    def do_uf_data(self):
-        """
-        the slot for UF Data
-        :return: none
-        """
-        set_volume              = self.UF_set_vol    .value() / self.uf_scaling
-        target_rate             = self.UF_tgt_rate   .value() / self.uf_scaling
-        volume_delivered        = self.UF_vol_del    .value() / self.uf_scaling
-        state                   = self.UF_State      .value()
-
-        self.UF_set_vol_label .setText(str(set_volume       ))
-        self.UF_tgt_rate_label.setText(str(target_rate      ))
-        self.UF_vol_del_label .setText(str(volume_delivered ))
-        
-
-        self.td_interface.td_ultrafiltration(
-            set_volume         ,
-            target_rate        ,
-            volume_delivered   ,
-            state              
-        )
-
-    @Slot()
     def do_tx_time_data(self):
         """
         the slot for treatment time Data
@@ -227,6 +169,5 @@
         :return: none
         """
         self.do_saline_data()
-        self.do_uf_data()
         self.do_tx_time_data()
         self.do_tx_set_point_data()