Index: shared/scripts/configuration/config.py =================================================================== diff -u -r9cb75f8b54e08f5f0ca42befd3c35ae5aea84c68 -re3f67a6e78d267bb99596ba1ce439c6fe7d89a25 --- shared/scripts/configuration/config.py (.../config.py) (revision 9cb75f8b54e08f5f0ca42befd3c35ae5aea84c68) +++ shared/scripts/configuration/config.py (.../config.py) (revision e3f67a6e78d267bb99596ba1ce439c6fe7d89a25) @@ -62,10 +62,12 @@ "Magenta":"#fd28fd", "Orange": "#f2721c", "Peach":"#f1979a", "Red": "#c53b33", "Rose":"#fc178d", "Slate blue":"#7f7ffa", "Violet": "#6435c9", "White": "#ffffff", "Yellow": "#fcfc4d"} +CURRENT_INSTRUCTION_COLOR = '#4290ec' CURRENT_COLOR = '#000000' COMPLETE_COLOR = '#4290ec' ENABLED_COLOR = '#fcfcfc' INCOMPLETE_COLOR = '#607a91' +INCOMPLETE_INSTRUCTION_COLOR = '#4290ec' OUT_OF_RANGE_COLOR = "#c53b33" #Disinfection @@ -122,29 +124,29 @@ CREATE_TREATMENT_PARAMETER_RANGE = { "Blood Flow Rate": [100, 125, 150, 175, 200, 225, 250, 275, 300, 325, 350, 375, 400, 425, 450, 475, 500], "Dialysate Flow Rate": [100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 600], - "Duration": [60, 75, 90, 105, 120, 135, 150, 165, 180, 195, 240, 255, 270, 285, 300, 315, 330, 345, 360, 375, 390, 405, 420, 435, 450, 465, 480], + "Duration": [60, 75, 90, 105, 120, 135, 150, 165, 180, 195, 210, 225, 240, 255, 270, 285, 300, 315, 330, 345, 360, 375, 390, 405, 420, 435, 450, 465, 480], "Heparin Dispensing Rate": [0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1], "Heparin Bolus Volume": [0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9, 2], "Heparin Stop Time": [0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120, 130, 140, 150, 160, 170, 180, 190, 200, 210, 220, 230, 240, 250, 260, 270, 280, 290, 300, 310, 320, 330, 340, 350, 360, 370, 380, 390, 400, 410, 420, 430, 440, 450, 460, 470, 480], "Saline Bolus Volume": [100, 200, 300], "Dialysate Temperature": [35.0, 35.5, 36.0, 36.5, 37.0], - "Blood Pressure Measurement Interval": [0, 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 60, 0], + "Blood Pressure Measurement Interval": [5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 60, 0], "Rinseback Flow Rate": [50, 75, 100, 125, 150], } -#dictionary consist of slider minimum value, slider buffer value, width buffer of slider +#dictionary consist of slider [minimum value, slider buffer value, width buffer of slider, maximum value] CREATE_TREATMENT_SLIDER_VALUES = { - "blood_flow_rate" : [100, 25, 46], - "dialysate_flow_rate" : [100, 50, 75], - "duration" : [60, 15, 28], - "heparin_dispensing_rate" : [0.2, 0.1, 93], - "heparin_bolus_volume" : [0.2, 0.1, 41], - "heparin_stop_time" : [0, 10, 15.75], - "saline_bolus" : [100, 100, 425], - "dialysate_temperature" : [35, 0.5, 187.5], + "blood_flow_rate" : [100, 25, 46, 500], + "dialysate_flow_rate" : [100, 50, 75, 600], + "duration" : [60, 15, 28, 480], + "heparin_dispensing_rate" : [0.2, 0.1, 93, 1.0], + "heparin_bolus_volume" : [0.2, 0.1, 41, 2.0], + "heparin_stop_time" : [0, 10, 15.75, 480], + "saline_bolus" : [100, 100, 425, 300], + "dialysate_temperature" : [35, 0.5, 187.5, 37.0], "arterial_pressure_limit_high" : [20, 10, 11.931], - "blood_pressure_measurement_interval" : [5, 5, 50], + "blood_pressure_measurement_interval" : [5, 5, 60, 60], } #Alarms location @@ -294,14 +296,14 @@ SALINE_BOLUS_VALUES = { 0 : 0, 1.0 : 1.0, - 125.56 : 100.56, + 125.56 : 100.54, 165.87 : 145.87, - 220.65 : 220.65, - 325.25 : 300.25, + 220.64 : 220.64, + 325.26 : 300.24, 400.86 : 380.86, - 500.00 : 500.25, + 500.00 : 500.24, 634.76 : 634.76, - 823.65 : 800.65, + 823.67 : 800.64, 999.99 : 999.99, 1000 : 1000 } @@ -337,7 +339,7 @@ HEART_RATE_VAL_181 = 181 HEART_RATE_VAL_200 = 200 UF_MINIMUM_SLIDER_WIDTH = -2 -UF_MAXIMUM_SLIDER_WIDTH = 638.00 +UF_MAXIMUM_SLIDER_WIDTH = 875.00 UF_VALID_RANGE = 700 TRAINING_INDICATOR_SCREEN = 4 ULTRAFILTRATION_VOLUME_COMBINATION_FROM_ULTRAFILTRATION_SETUP_SCREEN = {