Index: suite_leahi/shared/scripts/configuration/config.py =================================================================== diff -u -r7fd6ffc903ecfb127ebdf81efdd1527d7031f706 -rbff8f993aebd0923b751f60493b7105217613c95 --- suite_leahi/shared/scripts/configuration/config.py (.../config.py) (revision 7fd6ffc903ecfb127ebdf81efdd1527d7031f706) +++ suite_leahi/shared/scripts/configuration/config.py (.../config.py) (revision bff8f993aebd0923b751f60493b7105217613c95) @@ -124,8 +124,6 @@ INSTITUTIONAL_SETTINGS_NOTIFICATION_TEXT = "Institutional records and preferences updated" ERROR_ADVANCED_INSTITUTIONAL_SETTINGS_NOTIFICATION_TEXT = "Error Adjusting Advanced Institutional Records" ERROR_INSTITUTIONAL_SETTINGS_NOTIFICATION_TEXT = "Error Adjusting Institutional Records" -CREATERX = "Rx" -NEXT = "Next" #Device Settings Options DEVICE_SETTINGS = "Device Settings" @@ -148,10 +146,6 @@ DELIVERING_FLUID = "Delivering Fluid" BLOOD_PRIME_PAUSED_NOTIFICATION = "Blood Prime Paused" -#Menu Bar -PRESCRIPTIONS = "Prescriptions" -TREATMENT = "Treatment" -SETTINGS = "Settings" # Pre-Treatment Foundation SELF_TESTS_PAGE_CONTENTS = [ @@ -167,3 +161,11 @@ RECIRCULATION_COUNTDOWN_DESCRIPTION_TEXT = "Recirculation Time Elapsed:" RECONNECT_TO_PATIENT = "Reconnect To Patient" END_TREATMENT = "End Treatment" + + +#General Aesthetics +SD_CARD_SECTION_CONTENTS = ["SD-Card", "0.000 MB Used", "0.000 Free MB of 0.000 MB"] +OPMODE_TITLE = " Opmode " +OPMODE = 'opMode ' +SUBMODE = 'subMode ' +TX_STATES = ' TXStates ' \ No newline at end of file Index: suite_leahi/shared/scripts/names.py =================================================================== diff -u -r565fe7aef2a986066e364be426458fbe1e9e0a76 -rbff8f993aebd0923b751f60493b7105217613c95 --- suite_leahi/shared/scripts/names.py (.../names.py) (revision 565fe7aef2a986066e364be426458fbe1e9e0a76) +++ suite_leahi/shared/scripts/names.py (.../names.py) (revision bff8f993aebd0923b751f60493b7105217613c95) @@ -40,25 +40,18 @@ o_dialyste_cond_title_Text = {"container": mainTreatmentScreen, "id": "_dialysateCond", "objectName": "dialysateCondComponent", "type": "TreatmentFlowsComponent" } o_treatmentTimeNotificationBarSmall = {"container": mainTreatmentScreen, "objectName": "notification", "type": "NotificationBarSmall" } -# settings_service_export_logs -o_mainMenu_MainMenu = {"container": o_Gui_MainView, "id": "_mainMenu", "type": "MainMenu", "unnamed": 1 } -o_headerBar_HeaderBar = {"container": o_Gui_MainView, "id": "_headerBar", "type": "HeaderBar", "unnamed": 1 } -o_listView_ListView = {"container": o_Gui_MainView, "id": "_listView", "type": "ListView", "unnamed": 1 } -o_listView_delegateControl = {"container": o_listView_ListView, "index": 2, "objectName": "delegateControl", "type": "Item" } -o_Settings_Menu = {"container": o_listView_delegateControl, "objectName": "_touchRect2", "type": "TouchRect" } -o_SettingsHome = {"container": o_Gui_MainView, "objectName": "_SettingsHome", "type": "SettingsHome" } -o_SettingsExportLogs = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsExportLogs" } -o_DeviceSettingsTitleText = {"container": o_SettingsHome, "id":"_titleText", "type": "Text", "unnamed": 1 } -o_SettingsInformation = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsBase" } -o_USBEjectButton = {"container": o_SettingsExportLogs, "id": "_usbEjectButton", "type": "USBButton", "unnamed": 1 } -o_ExportLogsPageTitleText = {"container": o_SettingsInformation, "id":"_titleText", "type": "Text", "unnamed": 1 } -o_LogTypeComboBox = {"container": o_SettingsInformation, "id": "_logTypeCombo", "type": "ComboBox", "unnamed": 1 } -o_OptionComboBox = {"container": o_Overlay, "type": "Text", "unnamed": 1 } -o_ExportButton = {"container": o_SettingsExportLogs, "id": "_logTypeExportButton", "type": "ExportButton", "unnamed": 1 } -o_ExportLogsProgressRect = {"container": o_SettingsExportLogs, "id": "_progressRect", "type": "ProgressRect", "unnamed": 1 } -o_ExportLogsNotificationBar = {"container": o_SettingsExportLogs, "id": "_information", "type": "NotificationBarSmall" } -o_DeviceSettingsGrid = {"container": o_SettingsHome, "id": "_grid", "type": "Grid", } - +# settings_service_export_logs +o_SettingsHome = {"container": o_Gui_MainView, "objectName": "_SettingsHome", "type": "SettingsHome", } +o_SettingsExportLogs = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsExportLogs", } +o_SettingsInformation = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsBase", } +o_USBEjectButton = {"container": o_SettingsExportLogs, "id": "_usbEjectButton", "type": "USBButton", "unnamed": 1 } +o_LogTypeComboBox = {"container": o_SettingsInformation, "id": "_logTypeCombo", "type": "ComboBox", "unnamed": 1 } +o_OptionComboBox = {"container": o_Overlay, "type": "Text", "unnamed": 1 } +o_ExportButton = {"container": o_SettingsExportLogs, "id": "_logTypeExportButton", "type": "ExportButton", "unnamed": 1 } +o_ExportLogsProgressRect = {"container": o_SettingsExportLogs, "id": "_progressRect", "type": "ProgressRect", "unnamed": 1 } +o_ExportLogsNotificationBar = {"container": o_SettingsExportLogs, "id": "_information", "type": "NotificationBarSmall", } +o_DeviceSettingsGrid = {"container": o_SettingsHome, "id": "_grid", "type": "Grid", } + #HeaderBar Information Pop up o_InformationIconButton = {"container": o_Gui_MainView, "id": "_informationButton", "type": "IconButton", "unnamed": 1 } o_InformationParameters = {"container": o_Overlay, "type": "Text", "unnamed": 1 } @@ -195,7 +188,8 @@ o_preTreatmentStack_PreTreatmentStack = {"container": o_Gui_MainView, "id": "_preTreatmentStack", "type": "PreTreatmentStack", "unnamed": 1 } o_preTreatmentStack_PreTreatmentBase_PreTreatmentBase = {"container": o_preTreatmentStack_PreTreatmentStack, "objectName": "_PreTreatmentBase", "type": "PreTreatmentBase" } o_PreTreatmentBase_instructionView_InstructionView = {"container": o_preTreatmentStack_PreTreatmentBase_PreTreatmentBase, "id": "_instructionView", "type": "InstructionView", "unnamed": 1 } - + + #Heparin o_listView_Item = {"container": o_Gui_MainView, "type": "Item", "unnamed": 1 } o_treatmentHeparin_TreatmentHeparin = {"container": o_Gui_MainView, "id": "_treatmentHeparin", "type": "TreatmentHeparin", "unnamed": 1 } @@ -249,25 +243,6 @@ o_cancelTouch_TouchRect = {"container": o_Overlay, "id": "_cancelTouch", "type": "TouchRect", "unnamed": 1 } o_confirmTouch_ConfirmButton = {"container": o_Overlay, "id": "_confirmTouch", "type": "ConfirmButton", "unnamed": 1 } -#Helpers -o_SettingsStack_SettingsStack = {"container": o_Gui_MainView, "objectName": "_SettingsStack", "type": "SettingsStack", } -o_UserConfirmation_SettingsServicePassword = {"container": o_SettingsStack_SettingsStack, "objectName": "UserConfirmation", "type": "SettingsServicePassword", } -o_loginPage_Titletext = {"container": o_UserConfirmation_SettingsServicePassword, "id":"_titleText", "type": "Text", "unnamed": 1 } -o_userConfirmation_TextInput = {"container": o_UserConfirmation_SettingsServicePassword, "id": "_input", "type": "TextInput", "unnamed": 1 } -o_userConfirmation_ConfirmButton = {"container": o_UserConfirmation_SettingsServicePassword, "objectName": "_confirmButton", "type": "ConfirmButton", } -o_PreTreatmentSampleStack_PreTreatmentWaterSample = {"container": o_preTreatmentStack_PreTreatmentStack, "objectName": "_PreTreatmentSampleStack", "type": "PreTreatmentWaterSample", } -o_PreTreatmentSampleStack_button_TouchRect = {"container": o_PreTreatmentSampleStack_PreTreatmentWaterSample, "id": "_button", "type": "TouchRect", "unnamed": 1 } -o_preTreatmentStack_repeater_Repeater = {"container": o_preTreatmentStack_PreTreatmentStack, "id": "repeater", "type": "Repeater", "unnamed": 1 } -o_PreTreatmentCreate_bpMeasurementIntervalControl_ValueAdjusterCustom= {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_bpMeasurementIntervalControl", "type": "ValueAdjusterCustom", "unnamed": 1 } -o_preTreatmentStack_confirmButton_ConfirmButton = {"container": o_preTreatmentStack_PreTreatmentStack, "objectName": "_confirmButton", "type": "ConfirmButton", "visible": True } -o_PostTreatmentStack_PostTreatmentStack = {"container": o_Gui_MainView, "objectName": "_PostTreatmentStack", "type": "PostTreatmentStack", } -o_SettingsBase_SettingsAdvancedMode = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsAdvancedMode", } -o_settingsAdvancedMode_BaseSwitch = {"container": o_SettingsBase_SettingsAdvancedMode, "id": "_settingsAdvancedMode", "type": "BaseSwitch", "unnamed": 1 } -o_SettingsBase_backButton_AdvancedMode = {"container": o_SettingsBase_SettingsAdvancedMode, "objectName": "_backButton", "type": "BackButton", } -o_preTreatmentStack_pretreatmentInstallation_PreTreatmentInstallStack= {"container": o_preTreatmentStack_PreTreatmentStack, "id": "_pretreatmentInstallation", "type": "PreTreatmentInstallStack", "unnamed": 1 } -o_pretreatmentInstallation_PreTreatmentBase_PreTreatmentBase = {"container": o_preTreatmentStack_pretreatmentInstallation_PreTreatmentInstallStack, "objectName": "_PreTreatmentBase", "type": "PreTreatmentBase", } -o_pretreatmentInstallation_instructionView_InstructionView = {"container": o_pretreatmentInstallation_PreTreatmentBase_PreTreatmentBase, "id": "_instructionView", "type": "InstructionView", "unnamed": 1 } - # Feature Options o_SettingsBase_SettingsFeatureConfigurations = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsFeatureConfigurations", } o_SettingsBase_integratedBPCuffSwitch_BaseSwitch = {"checkable": True, "container": o_SettingsBase_SettingsFeatureConfigurations, "id": "_integratedBPCuffSwitch", "type": "BaseSwitch", "unnamed": 1 } @@ -321,11 +296,11 @@ o_SettingsAdvancedInstitutional_min_ValueAdjuster = {"container": o_SettingsBase_SettingsAdvancedInstitutional, "id": "_min", "type": "ValueAdjuster", "unnamed": 1 } o_SettingsAdvancedInstitutional_max_ValueAdjuster = {"container": o_SettingsBase_SettingsAdvancedInstitutional, "id": "_max", "type": "ValueAdjuster", "unnamed": 1 } o_SettingsAdvancedInstitutional_def_ValueAdjuster = {"container": o_SettingsBase_SettingsAdvancedInstitutional, "id": "_def", "type": "ValueAdjuster", "unnamed": 1 } -o_PreTreatmentCreate_leftArrow_IconButton = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_leftArrow", "type": "IconButton", "unnamed": 1 } o_PreTreatmentCreate_rightArrow_IconButton = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_rightArrow", "type": "IconButton", "unnamed": 1 } o_PreTreatmentSampleStack_PreTreatmentWaterSample = {"container": o_preTreatmentStack_PreTreatmentStack, "objectName": "_PreTreatmentSampleStack", "type": "PreTreatmentWaterSample", } o_PreTreatmentSampleStack_button_TouchRect = {"container": o_PreTreatmentSampleStack_PreTreatmentWaterSample, "id": "_button", "type": "TouchRect", "unnamed": 1 } o_preTreatmentStack_repeater_Repeater = {"container": o_preTreatmentStack_PreTreatmentStack, "id": "repeater", "type": "Repeater", "unnamed": 1 } +o_PreTreatmentCreate_leftArrow_IconButton = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_leftArrow", "type": "IconButton", "unnamed": 1 } #Recirculate o_recirculateRecirculateStack_EndTreatmentRecirculateStack = {"container": treatmentStack, "objectName": "_recirculateRecirculateStack", "type": "EndTreatmentRecirculateStack", } @@ -346,6 +321,21 @@ o_EndTreatmentBase_NotificationBar_NotificationBarSmall_2 = {"container": o_recirculateRecirculateStack_EndTreatmentBase_EndTreatmentBase_2, "objectName": "NotificationBar", "type": "NotificationBarSmall", } o_EndTreatmentBase_ButtonResume_2 = {"container": o_recirculateRecirculateStack_EndTreatmentBase_EndTreatmentBase_2, "type": "ButtonResume", "unnamed": 1 } +#General Aesthetics +o_HeaderBar_SettingsButton = {"container": o_Gui_MainView, "id": "_settingsButton", "type": "IconButton", "unnamed": 1 } +o_HeaderBar_Settings_iconImage = {"container": o_Gui_MainView, "id": "_iconImage", "source": "qrc:/images/iSettings", "type": "Image", "unnamed": 1 } +o_HeaderBar_Settings_Popup = {"container": o_Overlay, "id": "_backgroundRect", "type": "Rectangle", "unnamed": 1 } +o_Settings_Popup_BrightnessImage = {"container": o_Overlay, "id": "_image", "source": "qrc:/images/iBrightness", "type": "Image", "unnamed": 1 } +o_Settings_Popup_VolumeImage = {"container": o_Overlay, "id": "_image", "source": "qrc:/images/iVolume", "type": "Image", "unnamed": 1 } +o_HeaderBar_Diagnostics_Popup = {"container": o_Overlay, "id": "_backgroundRect", "type": "Rectangle", "unnamed": 1 } +o_view_SwipeView = {"container": o_Overlay, "id": "_view", "type": "SwipeView", "unnamed": 1 } +o_HeaderBar_Diagnostics_Popup_TDOpModeColumn = {"container": o_view_SwipeView, "id": "_TDOpModeColumn", "type": "DebugDataColumn", "unnamed": 1 } +o_HeaderBar_Diagnostics_Popup_TDOpmodeData_Value = {"container": o_view_SwipeView, "objectName": "_TDOpmodeData0", "type": "Text", } +o_HeaderBar_Diagnostics_Popup_TDOpmode_Text = {"container": o_view_SwipeView, "objectName": "_TDOpmodeDataL0", "type": "Text", } +o_HeaderBar_Diagnostics_Popup_TDOpmode_Submode_Value = {"container": o_view_SwipeView, "objectName": "_TDOpmodeData1", "type": "Text", } +o_HeaderBar_Diagnostics_Popup_TDOpmode_Submode_Text = {"container": o_view_SwipeView, "objectName": "_TDOpmodeDataL1", "type": "Text", } +o_HeaderBar_Diagnostics_Popup_TDTXStatesColumn = {"container": o_view_SwipeView, "id": "_TDTXStatesColumn", "type": "DebugDataColumn", "unnamed": 1 } + # Blood Prime o_TreatmentBloodPrime_TreatmentBloodPrime = {"container": treatmentStack, "objectName": "_TreatmentBloodPrime", "type": "TreatmentBloodPrime", } o_TreatmentBloodPrime_arterialRangeBar = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime, "id": "_arterialRangeBar", "type": "TreatmentPressureComponent", "unnamed": 1 } @@ -368,3 +358,4 @@ o_TreatmentBloodPrime_incrementFlowRateButton_ArrowButton = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime, "objectName": "_incrementFlowRateButton", "type": "ArrowButton", } o_TreatmentBloodPrime_pauseResumeButton_TouchRect = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime, "objectName": "_pauseResumeButton", "type": "TouchRect", } o_TreatmentBloodPrime_NotificationBar = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime, "objectName": "NotificationBar", "type": "NotificationBarSmall", } + Index: suite_leahi/suite.conf =================================================================== diff -u -r565fe7aef2a986066e364be426458fbe1e9e0a76 -rbff8f993aebd0923b751f60493b7105217613c95 --- suite_leahi/suite.conf (.../suite.conf) (revision 565fe7aef2a986066e364be426458fbe1e9e0a76) +++ suite_leahi/suite.conf (.../suite.conf) (revision bff8f993aebd0923b751f60493b7105217613c95) @@ -1,6 +1,6 @@ AUT=leahi LANGUAGE=Python OBJECTMAPSTYLE=script -TEST_CASES=tst_solution_infusion tst_main_treatment tst_service_export_logs tst_device_settings_information_version tst_headerbar_information_popup tst_headerbar_wifi_indicator tst_device_settings_wifi tst_ultrafiltration tst_create_treatment tst_general_alarm_requirements_instruction tst_headerbar_prescription tst_heparin tst_pre_treatment_foundation tst_feature_options tst_end_of_treatment tst_service_institutional tst_settings_service tst_recirculate tst_blood_prime +TEST_CASES=tst_solution_infusion tst_main_treatment tst_service_export_logs tst_device_settings_information_version tst_headerbar_information_popup tst_headerbar_wifi_indicator tst_device_settings_wifi tst_ultrafiltration tst_create_treatment tst_general_alarm_requirements_instruction tst_headerbar_prescription tst_heparin tst_pre_treatment_foundation tst_feature_options tst_end_of_treatment tst_service_institutional tst_settings_service tst_recirculate tst_blood_prime tst_headerbar_settings_diagnostics_popup VERSION=3 WRAPPERS=Qt