Index: simulator/Simulator.ui =================================================================== diff -u -rb4e6b92304a715cba0c33fe101922ceee4174465 -r7e3d9ea9dd57df70239038bab352a6a049696dbc --- simulator/Simulator.ui (.../Simulator.ui) (revision b4e6b92304a715cba0c33fe101922ceee4174465) +++ simulator/Simulator.ui (.../Simulator.ui) (revision 7e3d9ea9dd57df70239038bab352a6a049696dbc) @@ -7,7 +7,7 @@ 0 0 831 - 928 + 929 @@ -990,6 +990,9 @@ 8000 + + 8000 + @@ -1178,6 +1181,9 @@ 480 + + 480 + @@ -1250,12 +1256,32 @@ - + + + 480 + Qt::Horizontal + + + + Value + + + + + + + 0 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + @@ -1299,6 +1325,9 @@ + + true + @@ -1327,6 +1356,9 @@ 50 + + 600 + @@ -2976,5 +3008,21 @@ + + sldDurationValue + valueChanged(int) + label_18 + setNum(int) + + + 144 + 605 + + + 252 + 602 + + + Index: simulator/run.py =================================================================== diff -u -refb0dcc34f39f35d41f43cca9667db17fd97c844 -r7e3d9ea9dd57df70239038bab352a6a049696dbc --- simulator/run.py (.../run.py) (revision efb0dcc34f39f35d41f43cca9667db17fd97c844) +++ simulator/run.py (.../run.py) (revision 7e3d9ea9dd57df70239038bab352a6a049696dbc) @@ -182,6 +182,7 @@ sldUfVolume: QtWidgets.QSlider sldArterialValue: QtWidgets.QSlider sldVenousValue: QtWidgets.QSlider + sldDurationValue: QtWidgets.QSlider # tables tblSalineSubMode: QtWidgets.QTableWidget tblSalineUFStates: QtWidgets.QTableWidget @@ -202,6 +203,7 @@ """ self.spnDurationMin = self.find_spinbox('spnDurationMin') self.spnDurationMax = self.find_spinbox('spnDurationMax') + self.sldDurationValue = self.find_slider('sldDurationValue') self.spnUFVolumeMin = self.find_spinbox('spnUFVolumeMin') self.spnUFVolumeMax = self.find_spinbox('spnUFVolumeMax') self.spnDialysateMin = self.find_spinbox('spnDialysateMin') @@ -211,6 +213,8 @@ self.timer.start(1000) self.timer.timeout.connect(self.do_ranges_data) + self.sldDurationValue.valueChanged.connect(self.do_duration_data) + def setup_uf_adjustment(self): """ sets up the treatment Ultrafiltration adjustment GUI section @@ -346,6 +350,14 @@ self.spnVenousLimitHigh.setValue(Ranges.VENOUS_PRESSURE_HIGH_DEF) @Slot() + def do_duration_data(self, value): + """ + sends the duration message + :return: none + """ + denaliMessages.setTreatmentTime(self.spnDurationMax.value() * 60, value) + + @Slot() def do_sb_accept(self): """ the slot for accept saline bolus button @@ -471,9 +483,14 @@ :return: none """ if self.chkRangesBroadcast.isChecked(): + duration_min = self.spnDurationMin.value() + duration_max = self.spnDurationMax.value() + self.sldDurationValue.setMinimum(duration_min * 60 ) + self.sldDurationValue.setMaximum(duration_max * 60 ) + denaliMessages.setTreatmentParamRanges( - self.spnDurationMin.value(), - self.spnDurationMax.value(), + duration_min, + duration_max, self.spnUFVolumeMin.value(), self.spnUFVolumeMax.value(), self.spnDialysateMin.value(), Index: tst_Internals/test.py =================================================================== diff -u -r08e394d6afe01356f9ab4da613180112ff86f32d -r7e3d9ea9dd57df70239038bab352a6a049696dbc --- tst_Internals/test.py (.../test.py) (revision 08e394d6afe01356f9ab4da613180112ff86f32d) +++ tst_Internals/test.py (.../test.py) (revision 7e3d9ea9dd57df70239038bab352a6a049696dbc) @@ -15,16 +15,13 @@ from dialin.squish import utils from dialin.squish import unittests -from dialin.utils.base import is_interface_present, is_interface_up def main(): utils.tstStart(__file__) unittests.test_python_version() unittests.test_crc8() - test.compare(is_interface_present("can0"), True, "CAN interface is present") - test.compare(is_interface_up("can0"), True, "CAN interface is up") unittests.test_can0() utils.tstDone()