Index: shared/scripts/configuration/config.py =================================================================== diff -u -r122e2381f21a1534424c61059dc720c756710cd8 -rb3607d87895b4cd58cadb51edfb3c2e3fe98dc4f --- shared/scripts/configuration/config.py (.../config.py) (revision 122e2381f21a1534424c61059dc720c756710cd8) +++ shared/scripts/configuration/config.py (.../config.py) (revision b3607d87895b4cd58cadb51edfb3c2e3fe98dc4f) @@ -24,7 +24,9 @@ TREATMENT_HIGHLIGHTED_COLOR = "#135088" #Service password loction -SERVICE_CONF_LOCATION ="".join([str(HOME_DIR_PATH),'/Projects/application/resources/settings/Service.conf']) +CONFIG_PATH = Path(os.getcwd()) +HOME_DIR_PATH = CONFIG_PATH.parent.parent.parent +SERVICE_CONF_LOCATION ="".join([str(HOME_DIR_PATH),'/Projects/application/resources/settings/Settings/System.conf']) #Post Treatment log file location POST_TREATMENT_LOG_LOCATION = "".join([str(HOME_DIR_PATH),'/Desktop/sd-card/treatment/*.log']) @@ -379,17 +381,14 @@ BRIGHTNESS_MAX_VAL = 100 VOLUME_MIN_VAL = 20 VOLUME_MAX_VAL = 100 -DEVICE_SETTINGS_TEXT = "Device Settings" -SERVICE_TEXT = "Service" + PASSWORD = 123 -CONFIRM_TEXT = "CONFIRM" -SERVICE_BACK_BTN = "BACK" + IP_ADDRESS = {"valid" : "192.168.1.1","invalid" : "192.168.1"} GATEWAY = {"valid" : "255.255.255.0", "invalid" : "255.255.255"} SUBNET_MASK = {"valid" : "255.255.255.0", "invalid" : "255.255.255"} DNS = {"valid" : "0.0.0.0", "invalid" : "255.255.255"} - #dictionary consist of review parameters values of post treatment POST_TREATMENT_REVIEW_PARAMETER_RANGE = { "Patient ID": ["abcd", "xyz"], Index: shared/scripts/configuration/strings.py =================================================================== diff -u -r122e2381f21a1534424c61059dc720c756710cd8 -rb3607d87895b4cd58cadb51edfb3c2e3fe98dc4f --- shared/scripts/configuration/strings.py (.../strings.py) (revision 122e2381f21a1534424c61059dc720c756710cd8) +++ shared/scripts/configuration/strings.py (.../strings.py) (revision b3607d87895b4cd58cadb51edfb3c2e3fe98dc4f) @@ -342,14 +342,17 @@ #Information INFORMATION_TITLES = ["Information", "Versions"] INFORMATION_PARAMETERS = ["Information", "UI Version", "HD Version", "HD FPGA Version", "HD Serial Number", "DG Version", "DG FPGA Version", "DG Serial Number"] -SERIVCES_TITLE = "Service" +SERVICE_TEXT = "Service" SERVICES_PARAMETERS = ["HD Last Service Date", "HD Next Service Date", "DG Last Service Date", "DG Next Service Date"] #volume and brightness VOLUME_AND_BRIGHTNESS_TEXT = "Volume And Brightness" BRIGHTNESS_TEXT = "Brightness" ALARM_VOLUME_TEXT = "Alarm Volume" +CONFIRM_TEXT = "CONFIRM" +SERVICE_BACK_BTN = "BACK" +BACK_TEXT = "BACK" UNIT_OF_VOLUME_AND_BRIGHTNESS = "%" #services @@ -776,48 +779,11 @@ HEAT_DISINFECTION_TEXT = "Heat Disinfection" CHEMICAL_DISINFECTION_TEXT = "Chemical Disinfection" - -CURRENT_COLOR = '#000000' -COMPLETE_COLOR= '#4290ec' -ENABLED_COLOR = '#fcfcfc' -INCOMPLETE_COLOR = '#607a91' -BLOOD_FLOW_RATE = "Blood Flow Rate" -DIALYSATE_FLOW_RATE = "Dialysate Flow Rate" -DURATION = "Duration" -HEPARIN_DISPENSING_RATE = "Heparin Dispensing Rate" -HEPARIN_BOLUS_VOLUME = "Heparin Bolus Volume" -HEPARIN_STOP_TIME = "Heparin Stop Time" -SALINE_BOLUS_VOLUME = "Saline Bolus Volume" -HEPARIN_TYPE_TITLE = "Heparin Type" -SALINE_BOLUS_TITLE = "Saline Bolus" -ACID_CONCENTRATE_TITLE = "Acid Concentrate" -BICARBONATE_CONCENTRATE_TITLE = "Bicarbonate Concentrate" -DIALYZER_TYPE_TITLE = "Dialyzer Type" -DIALYSATE_TEMPERATURE = "Dialysate Temperature" -BLOOD_PRESSURE_MEASUREMENT_INTERVAL = "Blood Pressure Measurement Interval" -RINSEBACK_FLOW_RATE = "Rinseback Flow Rate" - - -CREATE_TREATMENT_PARAMETERS = ["Blood Flow Rate", "Dialysate Flow Rate", "Duration","Heparin Dispensing Rate", - "Heparin Bolus Volume","Heparin Stop Time", "Saline Bolus", "Dialysate Temperature", - "Blood Pressure Measurement Interval", "Rinseback Flow Rate"] - BACK_TEXT = "BACK" CONTINUE_TEXT = "CONTINUE" SKIP_TEXT = "SKIP" OFF_TEXT = "OFF" -ON_TEXT = "ON" - -PRESCRIPTION_DETAILS = { - "Blood Flow Rate": "mL/min", "Dialysate Flow Rate": "mL/min", - "Duration": "min", "Heparin Dispensing Rate": "mL/hr", - "Heparin Bolus Volume": "mL", "Heparin Stop Time": "min", - "Saline Bolus Volume": "mL", - "Dialysate Temperature": "°C", "Arterial Pressure Limit Low": "mmHg", - "Arterial Pressure Limit High": "mmHg","Blood Pressure Measure Interval":"min", - "Rinseback Rate" : "mL/min", "Venous Pressure Limit High": "mmHg", - "Venous Pressure Limit Low": "mmHg" -} +ON_TEXT = "ON" OPERATIONAL_PARAMETERS = {"Heparin Type": HEPARIN_TYPE, "Acid Concentrate": "Fres. Naturalyte", "Bicarbonate Concentrate": BICARBONATE_CONCENTRATE, "Dialyzer Type": "BB Diacap Pro 16H"} @@ -849,5 +815,3 @@ BLOOD_PRIMING_TEXT = "Blood Priming" SALINE_UNIT = "mL" - - Index: shared/scripts/names.py =================================================================== diff -u -r8f3de7f8fce86a928381a2c4ca5fa10cad3e5d19 -rb3607d87895b4cd58cadb51edfb3c2e3fe98dc4f --- shared/scripts/names.py (.../names.py) (revision 8f3de7f8fce86a928381a2c4ca5fa10cad3e5d19) +++ shared/scripts/names.py (.../names.py) (revision b3607d87895b4cd58cadb51edfb3c2e3fe98dc4f) @@ -1040,7 +1040,3 @@ progress_bar = {"container": o_initialModeScreen_ScreenItem, "id": "_textMaximum", "type": "Text", "unnamed": 1, "visible": False} o_alarm_text = {"container": o_Overlay, "id": "_desc", "objectName": "_NotificationDialog_Description", "type": "Text", "visible": True} o_SettingsBase_mouseArea_MouseArea = {"container": o_SettingsBase_SettingsWiFi, "id": "_mouseArea", "type": "MouseArea", "unnamed": 1, "visible": True} - - - -