Index: shared/scripts/configuration/config.py =================================================================== diff -u -re40cca6b5c63aaec802e3538588cf5e8381cea56 -rd2d42b0be2521f2f34d3ab3f83c5321d6df0693e --- shared/scripts/configuration/config.py (.../config.py) (revision e40cca6b5c63aaec802e3538588cf5e8381cea56) +++ shared/scripts/configuration/config.py (.../config.py) (revision d2d42b0be2521f2f34d3ab3f83c5321d6df0693e) @@ -372,6 +372,8 @@ 43: "REQUEST_REJECT_REASON_SYRINGE_NOT_PRESENT", # Syringe is not present } + +NUM_OF_REQUEST_REJECT_REASONS = 43 UNDEFINED_ALARM_ID_MSG = "ALARM_ID_UNDEFINED" ALARM_TITLE = "Alarm" @@ -441,7 +443,6 @@ EDIT_TEXT = "EDIT ULTRAFILTRATION VOLUME" TITLE_TEXT = "ULTRAFILTRATION VOLUME (L)" -NUM_OF_REQUEST_REJECT_REASONS = 43 #main treatment pressure PRESSURE_TITLE = "PRESSURES" @@ -545,5 +546,27 @@ "Rinseback Flow Rate"] TREATMENT_PAUSED_TEXT = "Treatment Paused" +#ultrafilteration volume based on flow parameters. Python list contains Rotational speed, Motor speed, +# MC speed, MC current and PWM. +TREATMENT_ULTRAFILTRATION_FLOW_PARAMETERS = { + 0 : [100, 1, 1, 1, 1, 1, 1], + 1 : [550, 24, 32, 425, 85, 18, 36], + 2 : [80, 125, 187, 257, 530, 458, 985], + 3 : [100, 0, 0, 0, 0, 0, 0], + 4 : [220, 1.45, 1.45, 1.45, 1.45, 1.45, 1.45], + } +#dictionary contains uf maximum and minimum value's to set. +TREATMENT_ULTRAFILTRATION_TESTING_OPTION = { + 0 : {"uf_maximum" : 600, "uf_minimum" : 0}, + 1 : {"uf_maximum" : 500, "uf_minimum" : 0}, + 2 : {"uf_maximum" : 550, "uf_minimum" : 0}, + 3 : {"uf_maximum" : 300, "uf_minimum" : 0}, + 4 : {"uf_maximum" : 280, "uf_minimum" : 0}, + 5 : {"uf_maximum" : 765, "uf_minimum" : 500}, + 6 : {"uf_maximum" : 680, "uf_minimum" : 450}, + 7 : {"uf_maximum" : 480, "uf_minimum" : 380}, + 8 : {"uf_maximum" : 390, "uf_minimum" : 675}, + 9 : {"uf_maximum" : 290, "uf_minimum" : 125}, + } Index: shared/scripts/names.py =================================================================== diff -u -reabfecc1d8d205f4b8888b99158c54f5ac92ae4e -rd2d42b0be2521f2f34d3ab3f83c5321d6df0693e --- shared/scripts/names.py (.../names.py) (revision eabfecc1d8d205f4b8888b99158c54f5ac92ae4e) +++ shared/scripts/names.py (.../names.py) (revision d2d42b0be2521f2f34d3ab3f83c5321d6df0693e) @@ -157,27 +157,21 @@ o_cumulative_fluid_text = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "Cumulative Delivered", "type": "Text", "unnamed": 1, "visible": True} # Ultrafiltration Section +o_progressbarex_ProgressBarEx = {"container": o_Overlay, "id": "_progressbarex", "type": "ProgressBarEx", "unnamed": 1, "visible": True} +notificationBar_NotificationBarSmall = {"container": o_Overlay, "objectName": "NotificationBar", "type": "NotificationBarSmall", "visible": True} o_treatmentStart_TreatmentStart = {"container": o_QQuickView, "id": "_treatmentStart", "type": "TreatmentStart", "unnamed": 1, "visible": True} o_treatmentStart_ultrafiltration_section = {"container": o_treatmentStart_TreatmentStart , "id": "_ultrafiltrationTouchArea", "type": "TreatmentUltrafiltration"} o_treatmentStart_ultrafiltration_notification = {"container": o_treatmentStart_ultrafiltration_section, "objectName": "NotificationBar" , "type": "NotificationBarSmall" } o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration = {"container": o_treatmentHome, "id": "_ultrafiltrationTouchArea", "type": "TreatmentUltrafiltration", "unnamed": 1, "visible": True} -o_uf_minimum_value = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "0.000", "type": "Text", "unnamed": 1, "visible": True} -o_uf_maximum_value = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "0.600", "type": "Text", "unnamed": 1, "visible": True} -o_uf_minimum_value_pop_up = {"container": o_Overlay, "text": "0.000", "type": "Text", "unnamed": 1, "visible": True} -o_uf_maximum_value_pop_up = {"container": o_Overlay, "text": "0.600", "type": "Text", "unnamed": 1, "visible": True} -o_uf_edit_ultrafilteration_volume = {"container": o_Overlay, "text": "EDIT ULTRAFILTRATION VOLUME", "type": "Text", "unnamed": 1, "visible": True} +o_treatmentHome_Ultrafiltration_Paused_Text = {"container": o_treatmentHome, "text": "Ultrafiltration Paused", "type": "Text", "unnamed": 1, "visible": True} o_treatmentHome_progressbar_start_state = {"container": o_treatmentHome, "id": "_progressbarex", "type": "ProgressBarEx", "unnamed": 1, "visible": True} o_treatmentHome_progressbar_edit_uf = {"container": o_Overlay, "id": "_rangeProgressBar", "type": "ProgressBarEx", "unnamed": 1, "visible": True} o_volumeSlider_slider = {"container": o_Overlay,"id": "_volumeSlider", "type": "Slider", "unnamed": 1, "visible": True} -o_treatmenthome_ultrafiltration_paused_text = {"container": o_treatmentHome, "text": "Ultrafiltration Paused", "type": "Text", "unnamed": 1, "visible": True} -o_ultrafiltration_paused_text = {"container": o_Overlay, "text": "Ultrafiltration Paused", "type": "Text", "unnamed": 1, "visible": True} -o_resume_ultrafilteration_text = {"container": o_Overlay, "text": "RESUME ULTRAFILTRATION", "type": "Text", "unnamed": 1, "visible": True} -o_ultrafilteration_volume_text = {"container": o_Overlay, "text": "ULTRAFILTRATION VOLUME (L)", "type": "Text", "unnamed": 1, "visible": True} -o_ultrafilteration_closeButton = {"container": o_Overlay, "id": "_closeButton", "type": "CloseButton", "unnamed": 1, "visible": True} +o_ultrafiltration_volume_text = {"container": o_Overlay, "text": "ULTRAFILTRATION VOLUME (L)", "type": "Text", "unnamed": 1, "visible": True} +o_ultrafiltration_closeButton = {"container": o_Overlay, "id": "_closeButton", "type": "CloseButton", "unnamed": 1, "visible": True} o_backbutton_backbutton = {"container": o_Overlay, "id": "_backButton", "type": "BackButton", "unnamed": 1, "visible": True} o_notificationbar_response = {"container": o_Overlay, "objectName": "NotificationBar", "type": "NotificationBar", "visible": True} - #flows o_treatment_blood_flow_touch_area = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "FLOWS", "type": "Text", "unnamed": 1, "visible": True} o_treatmentStart_TreatmentStart = {"container": o_QQuickView, "id": "_treatmentStart", "type": "TreatmentStart", "unnamed": 1, "visible": True} @@ -343,4 +337,8 @@ o_confirm_button = {"container": o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase, "text": "CONFIRM", "type": "Text", "unnamed": 1, "visible": True} o_back_button_confirm_treatment = {"container": o_Gui_MainView, "type": "Text", "unnamed": 1, "visible": True} +o_headerRect_Rectangle = {"container": o_Overlay, "id": "_headerRect", "type": "Rectangle", "unnamed": 1, "visible": True} +o_resumeButton_TouchRect = {"container": o_Overlay, "id": "_resumeButton", "type": "TouchRect", "unnamed": 1, "visible": True} +o_editButton_TouchRect = {"container": o_Overlay, "id": "_editButton", "type": "TouchRect", "unnamed": 1, "visible": True} +