Index: simulator/plugins/PostTreatment/interface.ui =================================================================== diff -u -r82ea7accddf6d599fe4d8730722d567d3d7b4ed7 -rf7ddf9ad0024ce755a89661d7bf47a2342d97890 --- simulator/plugins/PostTreatment/interface.ui (.../interface.ui) (revision 82ea7accddf6d599fe4d8730722d567d3d7b4ed7) +++ simulator/plugins/PostTreatment/interface.ui (.../interface.ui) (revision f7ddf9ad0024ce755a89661d7bf47a2342d97890) @@ -7,7 +7,7 @@ 0 0 1042 - 996 + 978 @@ -66,59 +66,7 @@ - - - - - - - - 165 - 0 - - - - - 165 - 16777215 - - - - - Courier - - - - 1-(U32) TimeStamp - - - leTreatmentDateTime - - - - - - - - Courier - - - - 9999999999 - - - 1620913600 - - - 10 - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - @@ -154,7 +102,7 @@ - 2-(U32) Alarm ID + 1(U32) Alarm ID leTreatmentDateTime @@ -206,7 +154,7 @@ - 3-(U32) Param 1 + 2(U32) Param 1 leBloodFlowRate @@ -260,7 +208,7 @@ - 4-(U32) Param 2 + 3(U32) Param 2 leBloodFlowRate @@ -319,59 +267,7 @@ - - - - - - - - 165 - 0 - - - - - 165 - 16777215 - - - - - Courier - - - - 1(U32) TimeStamp - - - leTreatmentDateTime - - - - - - - - Courier - - - - 9999999999 - - - 1620913600 - - - 10 - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - @@ -407,7 +303,7 @@ - 2(U32) Event ID + 1(U32) Event ID leTreatmentDateTime @@ -459,7 +355,7 @@ - 3(U32) Old + 2(U32) Old leBloodFlowRate @@ -511,7 +407,7 @@ - 4(U32) New + 3(U32) New leBloodFlowRate @@ -541,21 +437,21 @@ - - - - Qt::Vertical - - - - 20 - 40 - - - - + + + + Qt::Vertical + + + + 20 + 40 + + + + @@ -2237,59 +2133,7 @@ - - - - - - - - 245 - 0 - - - - - 245 - 16777215 - - - - - Courier - - - - 1(U32) TimeStamp - - - leTreatmentDateTime - - - - - - - - Courier - - - - 9999999999 - - - 1620913600 - - - 10 - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - @@ -2325,7 +2169,7 @@ - 2(U32) Blood Flow Rate + 1(U32) Blood Flow Rate leBloodFlowRate @@ -2395,7 +2239,7 @@ - 3(U32) Dialysate Flow Rate + 2(U32) Dialysate Flow Rate leDialysateFlowRate @@ -2465,7 +2309,7 @@ - 4(F32) UF Rate + 3(F32) UF Rate leTargetUFRate @@ -2532,7 +2376,7 @@ - 5(F32) Arterial Pressure + 4(F32) Arterial Pressure leAverageArterialPressure @@ -2599,7 +2443,7 @@ - 6(F32) Venous Pressure + 5(F32) Venous Pressure leAverageVenousPressure Index: simulator/plugins/PostTreatment/loader.py =================================================================== diff -u -r82ea7accddf6d599fe4d8730722d567d3d7b4ed7 -rf7ddf9ad0024ce755a89661d7bf47a2342d97890 --- simulator/plugins/PostTreatment/loader.py (.../loader.py) (revision 82ea7accddf6d599fe4d8730722d567d3d7b4ed7) +++ simulator/plugins/PostTreatment/loader.py (.../loader.py) (revision f7ddf9ad0024ce755a89661d7bf47a2342d97890) @@ -68,21 +68,18 @@ leWaterSampleTestResult: QtWidgets.QLineEdit btnTxLogDataSend: QtWidgets.QPushButton - leTxLogDataTimestamp: QtWidgets.QLineEdit leTxLogDataBloodFlowRate: QtWidgets.QLineEdit leTxLogDataDialysateFlowRate: QtWidgets.QLineEdit leTxLogDataUFRate: QtWidgets.QLineEdit leTxLogDataArterialPressure: QtWidgets.QLineEdit leTxLogDataVenousPressure: QtWidgets.QLineEdit btnTxLogAlarmSend: QtWidgets.QPushButton - leTxLogAlarmTimestamp: QtWidgets.QLineEdit leTxLogAlarmID: QtWidgets.QLineEdit leTxLogAlarmP1: QtWidgets.QLineEdit leTxLogAlarmP2: QtWidgets.QLineEdit btnTxLogEventSend: QtWidgets.QPushButton - leTxLogEventTimestamp: QtWidgets.QLineEdit leTxLogEventID: QtWidgets.QLineEdit leTxLogEventOld: QtWidgets.QLineEdit leTxLogEventNew: QtWidgets.QLineEdit @@ -141,21 +138,18 @@ self.leWaterSampleTestResult = self.find_line_edit('leWaterSampleTestResult') self.btnTxLogDataSend = self.find_button('btnTxLogDataSend') - self.leTxLogDataTimestamp = self.find_line_edit('leTxLogDataTimestamp') self.leTxLogDataBloodFlowRate = self.find_line_edit('leTxLogDataBloodFlowRate') self.leTxLogDataDialysateFlowRate = self.find_line_edit('leTxLogDataDialysateFlowRate') self.leTxLogDataUFRate = self.find_line_edit('leTxLogDataUFRate') self.leTxLogDataArterialPressure = self.find_line_edit('leTxLogDataArterialPressure') self.leTxLogDataVenousPressure = self.find_line_edit('leTxLogDataVenousPressure') self.btnTxLogAlarmSend = self.find_button('btnTxLogAlarmSend') - self.leTxLogAlarmTimestamp = self.find_line_edit('leTxLogAlarmTimestamp') self.leTxLogAlarmID = self.find_line_edit('leTxLogAlarmID') self.leTxLogAlarmP1 = self.find_line_edit('leTxLogAlarmP1') self.leTxLogAlarmP2 = self.find_line_edit('leTxLogAlarmP2') self.btnTxLogEventSend = self.find_button('btnTxLogEventSend') - self.leTxLogEventTimestamp = self.find_line_edit('leTxLogEventTimestamp') self.leTxLogEventID = self.find_line_edit('leTxLogEventID') self.leTxLogEventOld = self.find_line_edit('leTxLogEventOld') self.leTxLogEventNew = self.find_line_edit('leTxLogEventNew') @@ -188,14 +182,12 @@ sends the treatment log data (Average 30 min) values :return: """ - tx_log_data_timestamp = int(self.leTxLogDataTimestamp.text()) tx_log_data_blood_flow_rate = int(self.leTxLogDataBloodFlowRate.text()) tx_log_data_dialysate_flow_rate = int(self.leTxLogDataDialysateFlowRate.text()) tx_log_data_uf_rate = float(self.leTxLogDataUFRate.text()) tx_log_data_arterial_pressure = float(self.leTxLogDataArterialPressure.text()) tx_log_data_venous_pressure = float(self.leTxLogDataVenousPressure.text()) - self.hd_simulator.cmd_send_treatment_log_data(tx_log_data_timestamp, - tx_log_data_blood_flow_rate, + self.hd_simulator.cmd_send_treatment_log_data(tx_log_data_blood_flow_rate, tx_log_data_dialysate_flow_rate, tx_log_data_uf_rate, tx_log_data_arterial_pressure, @@ -207,12 +199,10 @@ sends the treatment log alarm list of values :return: """ - tx_log_alarm_timestamp = int(self.leTxLogAlarmTimestamp.text()) tx_log_alarm_id = int(self.leTxLogAlarmID.text()) tx_log_alarm_parameter1 = int(self.leTxLogAlarmP1.text()) tx_log_alarm_parameter2 = int(self.leTxLogAlarmP2.text()) - self.hd_simulator.cmd_send_treatment_log_alarm(tx_log_alarm_timestamp, - tx_log_alarm_id, + self.hd_simulator.cmd_send_treatment_log_alarm(tx_log_alarm_id, tx_log_alarm_parameter1, tx_log_alarm_parameter2) @@ -222,12 +212,10 @@ sends the treatment log event list of values :return: """ - tx_log_event_timestamp = int(self.leTxLogEventTimestamp.text()) tx_log_event_id = int(self.leTxLogEventID.text()) tx_log_event_old_value = float(self.leTxLogEventOld.text()) tx_log_event_new_value = float(self.leTxLogEventNew.text()) - self.hd_simulator.cmd_send_treatment_log_event(tx_log_event_timestamp, - tx_log_event_id, + self.hd_simulator.cmd_send_treatment_log_event(tx_log_event_id, tx_log_event_old_value, tx_log_event_new_value)