Index: suite_leahi/shared/scripts/configuration/utility.py =================================================================== diff -u -r6f50d4bea7fb93aa7c03d1aa0e98cc7e5e9cd859 -r9751968c3118396daa677c2e95961aba5b0bf001 --- suite_leahi/shared/scripts/configuration/utility.py (.../utility.py) (revision 6f50d4bea7fb93aa7c03d1aa0e98cc7e5e9cd859) +++ suite_leahi/shared/scripts/configuration/utility.py (.../utility.py) (revision 9751968c3118396daa677c2e95961aba5b0bf001) @@ -2,22 +2,14 @@ import test import object import names -<<<<<<< HEAD from squish import * from leahi_dialin.ui import utils -from builtins import int as pyInt from datetime import datetime - -======= from leahi_dialin.ui.td_messaging import TD_Messaging -from leahi_dialin.common.td_defs import TDOpModes,TDTreatmentStates from configuration import config, navigation td =TD_Messaging() -from leahi_dialin.ui import utils -from builtins import int as pyInt ->>>>>>> origin/staging - + def get_object_from_names(names_dict, error_message = "Missing object", timeout_ms = 200): """ To get an object with try..except catching to prevent script errors when the object is not found on the GUI @@ -30,8 +22,6 @@ test.fail("ERROR : " + error_message) return None -<<<<<<< HEAD -======= def get_bullet_object(screen_obj, num): """ To obtain a bullet object based on occurrence provided. @@ -53,7 +43,6 @@ names.o_text_object["text"] = txt return names.o_text_object ->>>>>>> origin/staging def setObjectText(text,obj): """ Method to set object property based on text @@ -74,13 +63,8 @@ found = findObjectById(child, id) if found: return found -<<<<<<< HEAD - return None -======= - return None - def findChildByText(parent_object, target_text): """Recursively finds a child object by its text property.""" for child in object.children(parent_object): @@ -90,7 +74,6 @@ if found: return found ->>>>>>> origin/staging def set_value_based_on_target(obj, target_value): """ obj: dictionary containing object paths @@ -113,48 +96,28 @@ right_arrow =findObjectById(parent_obj, "_rightArrow") # Read current value (supports invisible text too) -<<<<<<< HEAD - try: - current_value = round(float(findObject(obj).value),1) - except LookupError: - current_value = float(findObject(obj).property("value")) - -======= current_value = round(float(squish.findObject(obj).value),1) ->>>>>>> origin/staging # Determine direction while current_value != float(target_value): if current_value < float(target_value): squish.mouseClick(squish.waitForObject(right_arrow)) elif current_value > float(target_value): squish.mouseClick(squish.waitForObject(left_arrow)) -<<<<<<< HEAD - # Update current value after click - try: - current_value = round(float(findObject(obj).value),1) - except Exception: - current_value = float(findObject(obj).property("value")) - -======= current_value = round(float(squish.findObject(obj).value),1) ->>>>>>> origin/staging test.log(f"Updated value: {current_value}") test.log(f"✅ Target value reached: {current_value}") def select_different_dropdown(object,type,whichTypeIndex): -<<<<<<< HEAD -======= """ Selects a value from a dropdown using a doc string. """ ->>>>>>> origin/staging type_combo_box = get_object_from_names(object, error_message="Combo box object is missing") if type_combo_box is not None: squish.mouseClick(squish.waitForObjectExists(object)) @@ -165,8 +128,6 @@ return True return False # default return if not successful -<<<<<<< HEAD -======= def verify_create_treatment_parameters(): test.startSection("Pre treatment parameters") navigation.navigation_pageIndicator_step(config.CREATERX) @@ -228,41 +189,24 @@ results.extend(findAllObjectsById(child, target_id)) return results - - - - ->>>>>>> origin/staging def set_value_with_slider(value_field_obj, slider_obj,parameter): """ Opens the slider and moves it gradually to the target value (step of 10). Uses controlled arrow key input for fine adjustment. """ try: -<<<<<<< HEAD - value_field = waitForObject(value_field_obj) - test.log(f"Opening slider for {parameter}...") - - # Try right-click first - squish.mousePress(value_field, squish.Qt.LeftButton) - # utils.waitForGUI(0.2) -======= value_field = waitForObject(value_field_obj,1000) test.log(f"Opening slider for {parameter}...") squish.mousePress(value_field, squish.Qt.LeftButton) ->>>>>>> origin/staging value = value_field.value # If not visible, try left long-press if not object.exists(slider_obj): test.log(f"{parameter}: Slider not opened by left-click, trying long left-press...") squish.mousePress(value_field, squish.Qt.LeftButton) -<<<<<<< HEAD -======= ->>>>>>> origin/staging if not object.exists(slider_obj): test.fail(f"{parameter}: Slider did not appear.") @@ -272,7 +216,6 @@ final_value = waitForObject(value_field_obj).value test.verify(final_value!= value, f"{parameter} slider adjusted correctly to {final_value}") squish.mouseRelease(slider, squish.Qt.LeftButton) -<<<<<<< HEAD if object.exists(slider_obj): test.log(f"Waiting for {parameter} slider to close...") waitFor(lambda: not object.exists(slider_obj), 1000) @@ -282,15 +225,7 @@ def get_current_date_and_time(date_format='%Y/%b/%d - %H:%M'): date = datetime.now() return str(date.strftime(date_format)) -======= - if object.exists(slider_obj): - test.log(f"Waiting for {parameter} slider to close...") - - waitFor(lambda: not object.exists(slider_obj), 1000) - except LookupError as e: - test.fail(f"{parameter}: LookupError - {e}") - def click_left_until_off(object_name): """ Method to perform the left arrow untill the value @@ -341,4 +276,3 @@ except LookupError: test.fail("ERROR : " + error_message) return None ->>>>>>> origin/staging Index: suite_leahi/shared/scripts/names.py =================================================================== diff -u -r6f50d4bea7fb93aa7c03d1aa0e98cc7e5e9cd859 -r9751968c3118396daa677c2e95961aba5b0bf001 --- suite_leahi/shared/scripts/names.py (.../names.py) (revision 6f50d4bea7fb93aa7c03d1aa0e98cc7e5e9cd859) +++ suite_leahi/shared/scripts/names.py (.../names.py) (revision 9751968c3118396daa677c2e95961aba5b0bf001) @@ -3,105 +3,6 @@ from objectmaphelper import * # Top Parents -<<<<<<< HEAD -o_Gui_MainView = { "type": "Gui::MainView", "unnamed": 1 } -o_QQuickView = { "type": "QQuickView" } -o_Overlay = {"container": o_QQuickView, "type": "Overlay" } - -# Solution Infusion -o_standByScreen_MainHome = {"container": o_Gui_MainView, "type": "MainHome" } -treatmentStack = {"container": o_Gui_MainView, "type": "TreatmentStack" } -mainTreatmentScreen = {"container": treatmentStack, "id": "_treatmentHome", "type": "TreatmentHome", "unnamed": 1 } -startFluidButton = {"container": mainTreatmentScreen, "id": "_startFluidButton", "type": "TouchRect", "unnamed": 1 } -salineDeliveredText = {"container": mainTreatmentScreen, "objectName": "salineDescriptionText", "type": "Text" } -currentBolusVolume = {"container": mainTreatmentScreen, "type": "Label", "unnamed": 1 } -treatmentSaline = {"container": mainTreatmentScreen, "objectName": "treatmentSaline", "type": "TreatmentSaline" } -salineProgressBar = {"container": mainTreatmentScreen, "id": "_fluidProgressBar", "type": "ProgressBar", "unnamed": 1 } - -# Main Treatment -o_arterial_RangeBar = {"container": mainTreatmentScreen, "id": "_arterialRangeBar", "type": "TreatmentPressureComponent", "unnamed": 1 } -o_venous_RangeBar = {"container": mainTreatmentScreen, "id": "_venousRangeBar", "type": "TreatmentPressureComponent", "unnamed": 1 } -o_tmp_RangeBar = {"container": mainTreatmentScreen, "id": "_tmpRangeBar", "type": "TreatmentPressureComponent", "unnamed": 1 } -o_treatmentUltrafiltration = {"container": mainTreatmentScreen, "objectName": "treatmentUltrafiltration", "type": "TreatmentUltrafiltration" } -o_UF_Volume_Text = {"container": mainTreatmentScreen, "id": "_ufVolume", "type": "LabelValue", "unnamed": 1 } -o_UF_Rate_Text = {"container": mainTreatmentScreen, "id": "_ufRate", "type": "LabelValue", "unnamed": 1 } -o_treatment_duration = {"container": mainTreatmentScreen, "objectName": "treatmentTime", "type": "TreatmentTime" } -o_UF_Volume_LabelValue = {"container": mainTreatmentScreen, "id": "_ufVolume", "type": "LabelValue", "unnamed": 1 } -o_UF_Rate_LabelValue = {"container": mainTreatmentScreen, "id": "_ufRate", "type": "LabelValue", "unnamed": 1 } -o_Volume_Delivered = {"container": mainTreatmentScreen, "id": "_valueText", "type": "Text", "unnamed": 1 } -o_blood_flow_value = {"container": mainTreatmentScreen, "id": "_bloodFlow", "objectName": "bloodFlowComponent", "type": "TreatmentFlowsComponent" } -o_dial_flow_value = {"container": mainTreatmentScreen, "objectName": "dialysateFlowComponent", "type": "TreatmentFlowsComponent" } -o_dial_tmp_value = {"container": mainTreatmentScreen, "id": "_dialysateTemp", "objectName": "dialysateTempComponent", "type": "TreatmentFlowsComponent" } -o_dial_cond_value = {"container": mainTreatmentScreen, "id": "_dialysateCond", "objectName": "dialysateCondComponent", "type": "TreatmentFlowsComponent" } -o_blood_flow_title_Text = {"container": mainTreatmentScreen, "id": "_bloodFlow", "objectName": "bloodFlowComponent", "type": "TreatmentFlowsComponent" } -o_dialyste_flow_title_Text = {"container": mainTreatmentScreen, "objectName": "dialysateFlowComponent", "type": "TreatmentFlowsComponent" } -o_dialyste_tmp_title_Text = {"container": mainTreatmentScreen, "id": "_dialysateTemp", "objectName": "dialysateTempComponent", "type": "TreatmentFlowsComponent" } -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_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", } - -#patient vitals -o_option_combo_box = {"container": o_Overlay, "type": "Text", "unnamed": 1 } -o_treatmentVitals = {"container": mainTreatmentScreen, "objectName": "treatmentVitals", "type": "TreatmentVitals" } -o_treatmentHome_editButton_IconButton = {"container": o_treatmentVitals, "id": "_editButton", "type": "IconButton", "unnamed": 1 } -# o_PreTreatmentCreateStack_PreTreatmentCreateStack = {"container": o_Gui_MainView, "objectName": "_PreTreatmentCreateStack","type": "PreTreatmentCreateStack", } -o_preTreatmentStack_PreTreatmentStack = {"container": o_Gui_MainView, "id": "_preTreatmentStack", "type": "PreTreatmentStack", "unnamed": 1 } -o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate = {"container": o_preTreatmentStack_PreTreatmentStack, "objectName": "_PreTreatmentCreate", "type": "PreTreatmentCreate" } -o_PreTreatmentCreate_pretreatmentPatientIDEntry_TextEntry = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_pretreatmentPatientIDEntry", "type": "TextEntry", "unnamed": 1 } - -# o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate = {"container": o_PreTreatmentCreateStack_PreTreatmentCreateStack, "objectName": "_PreTreatmentCreate", "type": "PreTreatmentCreate", } -o_PreTreatmentCreate_bloodFlowRateControl_ValueAdjuster = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_bloodFlowRateControl", "type": "ValueAdjuster", "unnamed": 1 } -o_PreTreatmentCreate_dialysateFlowRateControl_ValueAdjuster = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_dialysateFlowRateControl", "type": "ValueAdjuster", "unnamed": 1 } -o_PreTreatmentCreate_durationControl_ValueAdjuster = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_durationControl", "type": "ValueAdjuster", "unnamed": 1 } -o_PreTreatmentCreate_heparinBolusVolumeControl_ValueAdjuster = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_heparinBolusVolumeControl", "type": "ValueAdjuster", "unnamed": 1 } -o_PreTreatmentCreate_heparinDispensingRateControl_ValueAdjuster = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_heparinDispensingRateControl", "type": "ValueAdjuster", "unnamed": 1 } -o_PreTreatmentCreate_heparinStopTimeControl_ValueAdjuster = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_heparinStopTimeControl", "type": "ValueAdjuster", "unnamed": 1 } -o_PreTreatmentCreate_dialysateTemperatureControl_ValueAdjuster = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_dialysateTemperatureControl", "type": "ValueAdjuster", "unnamed": 1 } -o_PreTreatmentCreate_salineBolusVolumeControl_ValueAdjuster = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_salineBolusVolumeControl", "type": "ValueAdjuster", "unnamed": 1 } -o_PreTreatmentCreate_bicarbonateConcentrateComboBox_BaseComboBox= {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_bicarbonateConcentrateComboBox", "type": "BaseComboBox", "unnamed": 1 } -o_createTreatmentRect_TouchRect = {"container": o_standByScreen_MainHome, "id": "_createTreatmentRect", "type": "TouchRect", "unnamed": 1 } -o_PreTreatment_vitalsCombobox_BaseCombobox = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_bpMeasurementIntervalControl", "type": "BaseComboBox", "unnamed": 1 } -o_PreTreatmentButtom = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "objectName": "_confirmButton", "type": "ConfirmButton" } -o_PreTreatmentCreate_acidConcentrateComboBox_BaseComboBox = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_acidConcentrateComboBox", "type": "BaseComboBox", "unnamed": 1 } -o_PreTreatmentCreate_dialyzerTypeComboBox_BaseComboBox = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_dialyzerTypeComboBox", "type": "BaseComboBox", "unnamed": 1 } -o_vitalsButton_VitalsButton = {"container": o_Gui_MainView, "id": "_vitalsButton", "type": "VitalsButton", "unnamed": 1 } -o_bloodPressureSystolic_TextEntry = {"container": o_Overlay, "id": "_bloodPressureSystolic", "type": "TextEntry", "unnamed": 1 } -o_bloodPressureDiastolic_TextEntry = {"container": o_Overlay, "id": "_bloodPressureDiastolic", "type": "TextEntry", "unnamed": 1 } -o_title_Text = {"container": o_Overlay, "type": "Text", "unnamed": 1 } -o_heartRate_TextEntry = {"container": o_Overlay, "id": "_heartRate", "type": "TextEntry", "unnamed": 1 } -o_confirm_button = {"container": o_Overlay, "id": "_confirmButton", "type": "ConfirmButton", "unnamed": 1 } -o_treatmentHome_bloodPressure_LabelValue = {"container": mainTreatmentScreen, "id": "_bloodPressure", "type": "LabelValue", "unnamed": 1 } -o_vitals_Interval_TitleText = {"container": o_Overlay, "type": "TitleText", "unnamed": 1 } -o_vitals_Interval_BaseComboBox = {"container": o_Overlay, "id": "_bpMeasurementIntervalControl", "type": "BaseComboBox", "unnamed": 1 } -o_treatmentHome_heartBeat_LabelValue = {"container": mainTreatmentScreen, "id": "_heartBeat", "type": "LabelValue", "unnamed": 1 } -o_vitals_close_btn = {"container": o_Overlay, "id": "_image", "source": "qrc:/images/iClose", "type": "Image", "unnamed": 1 } -o_back_space_key = {"container": o_Overlay, "source": "qrc:/images/iBackspace", "type": "Image", "unnamed": 1 } -o_PatientIDEntry_TextEntry = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_pretreatmentPatientIDEntry", "type": "TextEntry", "unnamed": 1 } -o_vitalCountdown_Text = {"container": o_Gui_MainView, "objectName": "_vitalCountdown", "type": "Text" } -o_vitals_reading = {"container": mainTreatmentScreen, "type": "Text", "unnamed": 1 } -keyboard_input = {"container": o_Overlay, "type": "Text", "unnamed": 1 } -o_last_read = {"container": mainTreatmentScreen, "id":"_lastRecorded" , "type": "Text", "unnamed": 1 } -o_measureVitalsButton_TouchRect = {"container": o_Overlay, "id": "_measureVitalsButton", "type": "TouchRect", "unnamed": 1 } -o_preTreatmentStack_confirmButton_ConfirmButton = {"container": o_preTreatmentStack_PreTreatmentStack, "objectName": "_confirmButton", "type": "ConfirmButton" } - -======= o_Gui_MainView = { "type": "Gui::MainView", "unnamed": 1 } o_QQuickView = { "type": "QQuickView" } o_Overlay = {"container": o_QQuickView, "type": "Overlay" } @@ -158,6 +59,7 @@ o_InformationIconButton = {"container": o_Gui_MainView, "id": "_informationButton", "type": "IconButton", "unnamed": 1 } o_InformationParameters = {"container": o_Overlay, "type": "Text", "unnamed": 1 } o_VersionColumn = {"container": o_Overlay, "id": "_versionColumn", "type": "Column", "unnamed": 1 } + # General Alarm Requirements Instruction o_AlarmButton_Mute = {"container": o_Overlay, "id": "_muteButton", "type": "MuteButton" } o_AlarmButton_Mute_Min = {"container": o_AlarmButton_Mute, "id": "_hourText", "type": "Text" } @@ -292,35 +194,23 @@ o_qrCode_Image = {"container": o_Overlay, "id": "_qrCode", "type": "Image", "unnamed": 1 } 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 } +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 } o_treatmentHeparin_Prescription_Column = {"container": o_treatmentHeparin_TreatmentHeparin, "id": "_heparinPrescriptionContent", "type": "Column", "unnamed": 1 } o_treatmentHeparin_heparinButton_TouchRect = {"container": o_treatmentHeparin_TreatmentHeparin, "id": "_heparinButton", "type": "TouchRect", "unnamed": 1 } o_treatmentHeparin_status_Rectangle = {"container": o_treatmentHeparin_TreatmentHeparin, "id": "_status", "type": "Rectangle", "unnamed": 1 } -o_createTreatmentRect_TouchRect = {"container": o_standByScreen_MainHome, "id": "_createTreatmentRect", "type": "TouchRect", "unnamed": 1 } o_option_combo_box = {"container": o_Overlay, "type": "Text", "unnamed": 1 } -o_preTreatmentStack_PreTreatmentStack = {"container": o_Gui_MainView, "id": "_preTreatmentStack", "type": "PreTreatmentStack", "unnamed": 1 } o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate = {"container": o_preTreatmentStack_PreTreatmentStack, "objectName": "_PreTreatmentCreate", "type": "PreTreatmentCreate" } o_PreTreatmentCreate_pretreatmentPatientIDEntry_TextEntry = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_pretreatmentPatientIDEntry", "type": "TextEntry", "unnamed": 1 } -o_PreTreatmentCreate_bloodFlowRateControl_ValueAdjuster = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_bloodFlowRateControl", "type": "ValueAdjuster", "unnamed": 1 } -o_PreTreatmentCreate_dialysateFlowRateControl_ValueAdjuster = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_dialysateFlowRateControl", "type": "ValueAdjuster", "unnamed": 1 } -o_PreTreatmentCreate_durationControl_ValueAdjuster = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_durationControl", "type": "ValueAdjuster", "unnamed": 1 } -o_PreTreatmentCreate_heparinBolusVolumeControl_ValueAdjuster = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_heparinBolusVolumeControl", "type": "ValueAdjuster", "unnamed": 1 } -o_PreTreatmentCreate_heparinDispensingRateControl_ValueAdjuster = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_heparinDispensingRateControl", "type": "ValueAdjuster", "unnamed": 1 } -o_PreTreatmentCreate_heparinStopTimeControl_ValueAdjuster = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_heparinStopTimeControl", "type": "ValueAdjuster", "unnamed": 1 } -o_PreTreatmentCreate_dialysateTemperatureControl_ValueAdjuster = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_dialysateTemperatureControl", "type": "ValueAdjuster", "unnamed": 1 } -o_PreTreatmentCreate_salineBolusVolumeControl_ValueAdjuster = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_salineBolusVolumeControl", "type": "ValueAdjuster", "unnamed": 1 } -o_PreTreatmentCreate_bicarbonateConcentrateComboBox_BaseComboBox= {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_bicarbonateConcentrateComboBox", "type": "BaseComboBox", "unnamed": 1 } -o_createTreatmentRect_TouchRect = {"container": o_standByScreen_MainHome, "id": "_createTreatmentRect", "type": "TouchRect", "unnamed": 1 } -o_PreTreatment_vitalsCombobox_BaseCombobox = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_bpMeasurementIntervalControl", "type": "BaseComboBox", "unnamed": 1 } -o_PreTreatmentCreate_acidConcentrateComboBox_BaseComboBox = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_acidConcentrateComboBox", "type": "BaseComboBox", "unnamed": 1 } -o_PreTreatmentCreate_dialyzerTypeComboBox_BaseComboBox = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_dialyzerTypeComboBox", "type": "BaseComboBox", "unnamed": 1 } -o_PreTreatmentCreate_pretreatmentPatientIDEntry_TextEntry = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_pretreatmentPatientIDEntry", "type": "TextEntry", "unnamed": 1 } +o_createTreatmentRect_TouchRect = {"container": o_standByScreen_MainHome, "id": "_createTreatmentRect", "type": "TouchRect", "unnamed": 1 } o_preTreatmentStack_Text = {"container": o_preTreatmentStack_PreTreatmentStack, "type": "Text", "unnamed": 1 } o_preTreatmentStack_stepIndicator_StepIndicator = {"container": o_preTreatmentStack_PreTreatmentStack, "id": "_stepIndicator", "type": "StepIndicator", "unnamed": 1 } - ->>>>>>> origin/staging +o_preTreatmentStack_confirmButton_ConfirmButton = {"container": o_preTreatmentStack_PreTreatmentStack, "objectName": "_confirmButton", "type": "ConfirmButton" } + +#patient vitals +o_treatmentVitals = {"container": mainTreatmentScreen, "objectName": "treatmentVitals", "type": "TreatmentVitals" } +o_treatmentHome_editButton_IconButton = {"container": o_treatmentVitals, "id": "_editButton", "type": "IconButton", "unnamed": 1 } + Index: suite_leahi/suite.conf =================================================================== diff -u -r6f50d4bea7fb93aa7c03d1aa0e98cc7e5e9cd859 -r9751968c3118396daa677c2e95961aba5b0bf001 --- suite_leahi/suite.conf (.../suite.conf) (revision 6f50d4bea7fb93aa7c03d1aa0e98cc7e5e9cd859) +++ suite_leahi/suite.conf (.../suite.conf) (revision 9751968c3118396daa677c2e95961aba5b0bf001) @@ -1,10 +1,6 @@ AUT=leahi LANGUAGE=Python OBJECTMAPSTYLE=script -<<<<<<< HEAD -TEST_CASES=tst_solution_infusion tst_main_treatment tst_service_export_logs tst_patient_vitals -======= -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 ->>>>>>> origin/staging +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_patient_vitals VERSION=3 WRAPPERS=Qt