Index: suite_leahi/shared/scripts/names.py =================================================================== diff -u -rc235d7f9ebda8fa8160306803187cccfa9f17cc7 -r15ffe502f51439e7a264140af4154c3f57bc6070 --- suite_leahi/shared/scripts/names.py (.../names.py) (revision c235d7f9ebda8fa8160306803187cccfa9f17cc7) +++ suite_leahi/shared/scripts/names.py (.../names.py) (revision 15ffe502f51439e7a264140af4154c3f57bc6070) @@ -38,7 +38,8 @@ 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_treatmentHome_iconImage_Image_main = {"container": mainTreatmentScreen, "id": "_iconImage", "source": "qrc:/images/iPause", "type": "Image", "unnamed": 1 } +o_treatmentHome_vitals_IconButton = {"container": mainTreatmentScreen, "id": "_vitals", "type": "IconButton", "unnamed": 1,"visible":True} o_newTreatmentDuration_ValueAdjuster = {"container": o_Overlay, "objectName": "_valueAdjuster", "type": "ValueAdjuster", } o_newTreatmentDuration = {"container": o_Overlay, "objectName": "_newTreatmentDuration", "type": "LabelUnitText", } o_Popup_CloseButton = {"container": o_Overlay, "id": "_closeButton", "type": "CloseButton", "unnamed": 1 } @@ -373,6 +374,20 @@ 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 } +#HDF +o_treatmentHDF_TreatmentHDF = {"container": treatmentStack, "id": "_treatmentHDF", "type": "TreatmentHDF", "unnamed": 1 } +o_treatmentHDF_treatmentPressures_TreatmentPressures = {"container": o_treatmentHDF_TreatmentHDF, "objectName": "_treatmentPressures", "type": "TreatmentPressures" } +o_treatmentHDF_currentDataRow_Row = {"container": o_treatmentHDF_TreatmentHDF, "id": "_currentDataRow", "type": "Row", "unnamed": 1 } +o_treatmentHDF_treatmentHdfComponent_TreatmentHDFComponent = {"container": o_treatmentHDF_TreatmentHDF, "objectName": "_treatmentHdfComponent", "type": "TreatmentHDFComponent" } +o_valueAdjuster_ValueAdjuster = {"container": o_Overlay, "objectName": "_valueAdjuster", "type": "ValueAdjuster" } +o_treatmentHDF_prescribedFluidVolume_LabelUnitValueAdjuster = {"container": o_treatmentHDF_TreatmentHDF, "objectName": "_prescribedFluidVolume", "type": "LabelUnitValueAdjuster" } +o_vitals_close_btn = {"container": o_Overlay, "id": "_image", "source": "qrc:/images/iClose", "type": "Image", "unnamed": 1 } +o_TreatmentBloodPrime_TreatmentBloodPrime = {"container": treatmentStack, "objectName": "_TreatmentBloodPrime", "type": "TreatmentBloodPrime", } +o_TreatmentBloodPrime_flowRateValue_Text = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime, "objectName": "_flowRateValue", "type": "Text", } +o_createHDFTreatment_TouchRect = {"container": o_standByScreen_MainHome, "id": "_createHDFTreatment", "type": "TouchRect", "unnamed": 1 } +#Added occurences and visible property to click on HDF tab +o_listView_ListView_2 = {"container": o_Gui_MainView, "id": "_listView", "occurrence": 2, "type": "ListView", "unnamed": 1, "visible": True} +o_listView_delegateControl_Item_2 = {"container": o_listView_ListView_2, "index": 3, "objectName": "delegateControl", "type": "Item" } #Pre Treatment Foundation o_pretreatmentInstallation_PreTreatmentBase_PreTreatmentBase_2 = {"container": o_preTreatmentStack_pretreatmentInstallation_PreTreatmentInstallStack, "objectName": "_PreTreatmentBase", "type": "PreTreatmentBase", "visible": True } @@ -486,7 +501,7 @@ o_dialysateFlowRate_LabelUnitValueAdjuster = {"container": o_Overlay, "objectName": "_dialysateFlowRate", "type": "LabelUnitValueAdjuster" } o_bloodFlowRate_LabelUnitValueAdjuster = {"container": o_Overlay, "objectName": "_bloodFlowRate", "type": "LabelUnitValueAdjuster" } o_dialysateTemperature_LabelUnitValueAdjuster = {"container": o_Overlay, "objectName": "_dialysateTemperature", "type": "LabelUnitValueAdjuster" } -o_treatmentHome_notification_NotificationBarSmall = {"container": mainTreatmentScreen, "objectName": "_notification", "type": "NotificationBarSmall" } +o_treatmentHome_notification_NotificationBarSmall = {"container": mainTreatmentScreen, "objectName": "notification", "type": "NotificationBarSmall" } o_ufVolumeRemoved_LabelUnitText = {"container": o_Overlay, "objectName": "_ufVolumeRemoved", "type": "LabelUnitText" } o_ufVolumeGoal_LabelUnitText = {"container": o_Overlay, "objectName": "_ufVolumeGoal", "type": "LabelUnitText" } o_timeElapsed_LabelUnitText = {"container": o_Overlay, "objectName": "_timeElapsed", "type": "LabelUnitText" } @@ -522,3 +537,7 @@ o_Blood_Return_Complete_Recirculate_TouchRect = {"container": o_Overlay, "id": "_additionalTouch", "type": "TouchRect", "unnamed": 1 } o_Blood_Return_Complete_End_Treatment_TouchRect = {"container": o_Overlay, "id": "_cancelTouch", "type": "TouchRect", "unnamed": 1 } o_Blood_Return_Complete_Fluid_Bolus_TouchRect = {"container": o_Overlay, "id": "_confirmTouch", "type": "ConfirmButton", "unnamed": 1 } + +#Trends and Screensaver +o_TreatmentTrends_TreatmentTrends = {"container": treatmentStack, "objectName": "_TreatmentTrends", "type": "TreatmentTrends", } +o_TreatmentTrends_paramListDelegate_Column = {"container": o_TreatmentTrends_TreatmentTrends, "id": "_paramListDelegate", "index": 0, "type": "Column", "unnamed": 1 } Index: suite_leahi/suite.conf =================================================================== diff -u -rc235d7f9ebda8fa8160306803187cccfa9f17cc7 -r15ffe502f51439e7a264140af4154c3f57bc6070 --- suite_leahi/suite.conf (.../suite.conf) (revision c235d7f9ebda8fa8160306803187cccfa9f17cc7) +++ suite_leahi/suite.conf (.../suite.conf) (revision 15ffe502f51439e7a264140af4154c3f57bc6070) @@ -1,6 +1,9 @@ AUT=leahi +ENVVARS=envvars +HOOK_SUB_PROCESSES=false +IMPLICITAUTSTART=0 LANGUAGE=Python OBJECTMAPSTYLE=script -TEST_CASES=tst_fluid_bolus 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 tst_isolated_uf tst_blood_set_auto tst_patient_vitals tst_edit_parameters tst_rinseback tst_post-treatment_foundation +TEST_CASES=tst_fluid_bolus 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 tst_isolated_uf tst_blood_set_auto tst_patient_vitals tst_edit_parameters tst_rinseback tst_post-treatment_foundation tst_main_tx_hdf tst_trends_and_screensaver VERSION=3 WRAPPERS=Qt