Index: sources/gui/qml/components/ConfirmTreatmentTable.qml =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -rcf61c7736f11f4b75a4e2df803f29bdc7769db53 --- sources/gui/qml/components/ConfirmTreatmentTable.qml (.../ConfirmTreatmentTable.qml) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/gui/qml/components/ConfirmTreatmentTable.qml (.../ConfirmTreatmentTable.qml) (revision cf61c7736f11f4b75a4e2df803f29bdc7769db53) @@ -96,7 +96,8 @@ anchors.top: _prescription.bottom anchors.left: _root.left anchors.leftMargin: Variables.createTreatmentMargin - anchors.topMargin: Variables.createTreatmentTableMargin + // Disabled for now since the rows changed for the A/V change and doesn't need scrolling + // anchors.topMargin: Variables.createTreatmentTableMargin anchors.bottom: parent.bottom width: parent.width - 2*Variables.createTreatmentMargin height: _root.height - _header.height @@ -107,19 +108,17 @@ qsTr("Heparin Bolus Volume" ), qsTr("Heparin Stop Time" ), qsTr("Saline Bolus Volume" )] + prescriptionValues : vTreatmentCreate.doGetPrescriptionParameterValues() + operatingKeys : [ qsTr("Heparin Type" ), qsTr("Acid Concentrate" ), qsTr("Bicarbonate Concentrate" ), qsTr("Dialyzer Type" ), qsTr("Dialysate Temperature" ), - qsTr("Arterial Pressure Limit Low" ), - qsTr("Arterial Pressure Limit High" ), - qsTr("Venous Pressure Limit Low" ), - qsTr("Venous Pressure Limit High" ), qsTr("Blood Pressure Measure Interval" ), qsTr("Rinseback Rate" )] - prescriptionValues : vTreatmentCreate.doGetPrescriptionParameterValues() operatingValues : vTreatmentCreate.doGetOperatingParameterValues() + onVisibleChanged: { if (visible) { prescriptionValues = vTreatmentCreate.doGetPrescriptionParameterValues()