Index: Trends/loader.py =================================================================== diff -u -r368399921133b7fdd7f4e97fed2804c326dac711 -r1d6d102bd22f94e88ad8a45f0d673a20b3254cdb --- Trends/loader.py (.../loader.py) (revision 368399921133b7fdd7f4e97fed2804c326dac711) +++ Trends/loader.py (.../loader.py) (revision 1d6d102bd22f94e88ad8a45f0d673a20b3254cdb) @@ -58,6 +58,7 @@ self.vitalsRspRejectReason = self.find_widget(QtWidgets.QSpinBox , 'sbVitalsRspRejectReason' ) self.trendsSend = self.find_widget(QtWidgets.QToolButton, 'tbTrendsDataSend' ) + self.trendsBpSend = self.find_widget(QtWidgets.QToolButton, 'tbTrendsDataBpSend' ) self.trendsReset = self.find_widget(QtWidgets.QToolButton, 'tbTrendsDataReset' ) self.vitalsSend = self.find_widget(QtWidgets.QToolButton , 'tbVitalsDataSend' ) @@ -111,6 +112,7 @@ self.trendsReset .clicked.connect(self.init_trends_data) self.trendsSend .clicked.connect(self.do_trends_data) + self.trendsBpSend .clicked.connect(self.do_trends_bp_data) self.vitalsReset .clicked.connect(self.init_vitals_data) self.vitalsSend .clicked.connect(self.do_vitals_data) @@ -161,6 +163,7 @@ :return: none """ self.init_vitals_response() + self.init_vitals_data() self.init_trends_data() @@ -201,20 +204,20 @@ @Slot() def init_trends_data(self): """ - slot for initializing all trends data + slot for initializing all trends data minus vitals :return: none """ - self.init_vitals_data() self.init_uf_data() self.init_pressure_data() self.init_saline_data() self.init_set_point_data() self.init_conductivity_data() + @Slot() - def do_trends_data(self): + def do_trends_bp_data(self): """ - slot for initializing all trends data + slot for initializing all trends data plus vitals :return: none """ self.do_uf_data() @@ -228,6 +231,19 @@ @Slot() + def do_trends_data(self): + """ + slot for initializing all trends data + :return: none + """ + self.do_uf_data() + self.do_pressure_data() + self.do_saline_data() + self.do_set_point_data() + self.do_conductivity_data() + + + @Slot() def init_vitals_data(self): """ slot for initializing vitals data