Index: sources/gui/qml/compounds/InstructionView.qml =================================================================== diff -u -r2fc811482a7453b22c2a1d650b06e83869f35670 -r3082da7333694567052cdf407765e0e409328a5b --- sources/gui/qml/compounds/InstructionView.qml (.../InstructionView.qml) (revision 2fc811482a7453b22c2a1d650b06e83869f35670) +++ sources/gui/qml/compounds/InstructionView.qml (.../InstructionView.qml) (revision 3082da7333694567052cdf407765e0e409328a5b) @@ -70,7 +70,7 @@ Column { id: _contentColumn anchors { top : _root.showAutoStep ? _autoStepController.bottom : parent.top - topMargin : _root.showAutoStep ? Variables.defaultMargin * 2.5 : Variables.defaultMargin + topMargin : Variables.defaultMargin * 2.5 } spacing : 5 Index: sources/gui/qml/globals/Colors.qml =================================================================== diff -u -r99e596082b87afd73b06dae039d51e4a67cc5913 -r3082da7333694567052cdf407765e0e409328a5b --- sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 99e596082b87afd73b06dae039d51e4a67cc5913) +++ sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 3082da7333694567052cdf407765e0e409328a5b) @@ -107,6 +107,7 @@ readonly property color panelInvalidBorderColor : "#FFA500" readonly property color panelBackground : "#2A3F53" readonly property color panelBorder : "#324C65" + readonly property color calibrationData : "#22425D" readonly property color heparinPanelBorderColor         : "#CC42556B" readonly property color heparinSectionHeader            : "#384B60" Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -rbc97db7aaffa2e2115d2049bbcda2da34fb8f9a8 -r3082da7333694567052cdf407765e0e409328a5b --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision bc97db7aaffa2e2115d2049bbcda2da34fb8f9a8) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 3082da7333694567052cdf407765e0e409328a5b) @@ -272,6 +272,10 @@ // chlorine readonly property int chlorinePrecision : 2 + // PSI + readonly property int psiPrecision : 2 + + function sizeConverted(vSize, vSizePowers, vRound = 2) { return ( vSize / vSizePowers // convert from byte to Giga byte Index: sources/gui/qml/pages/settings/servicemode/ServiceModeHydraulics.qml =================================================================== diff -u -r2fc811482a7453b22c2a1d650b06e83869f35670 -r3082da7333694567052cdf407765e0e409328a5b --- sources/gui/qml/pages/settings/servicemode/ServiceModeHydraulics.qml (.../ServiceModeHydraulics.qml) (revision 2fc811482a7453b22c2a1d650b06e83869f35670) +++ sources/gui/qml/pages/settings/servicemode/ServiceModeHydraulics.qml (.../ServiceModeHydraulics.qml) (revision 3082da7333694567052cdf407765e0e409328a5b) @@ -16,6 +16,8 @@ property var instructionStepNames : [] property var instructionStepImages : [] + property bool deaerationInProgress : false + property var options : [ qsTr("Deaeration Pressure" ), qsTr("Flow Pressure" ), @@ -34,35 +36,9 @@ UFPumpVolume } - onCurrentIndexChanged: updateModel () -// onCurrentIndexChanged: { -// switch (currentIndex) { -// case ServiceModeHydraulics.DeaerationPressure : -// print("Deaeration Pressure") -// break + onVisibleChanged : if ( visible) updateModel () + onCurrentIndexChanged : updateModel () -// case ServiceModeHydraulics.FlowPressure : -// print("Flow Pressure") -// break - -// case ServiceModeHydraulics.BalanceChamber : -// print("Balance Chamber") -// break - -// case ServiceModeHydraulics.AcidPumpVolume : -// print("Acid Pump Volume") -// break - -// case ServiceModeHydraulics.BicPumpVolume : -// print("Bic Pump Volume") -// break - -// case ServiceModeHydraulics.UFPumpVolume : -// print("UF Pump Volume") -// break -// } -// } - function updateModel () { let stepName = _root.options[_root.currentIndex] ?? "" let group = vSettings.groupFormat(stepName) @@ -77,13 +53,15 @@ contentItem: Row { id: _row anchors.fill : parent - anchors.topMargin : Variables.defaultMargin - spacing : Variables.defaultMargin * 2 + anchors.topMargin : Variables.defaultMargin * -4 + anchors.bottomMargin: Variables.defaultMargin * 5 + spacing : Variables.defaultMargin Column { id: _optionsColumn - width : _row.width * 0.2 - height : _row.height - spacing : Variables.defaultMargin + width : _row.width * 0.2 + height : _row.height + spacing : Variables.defaultMargin + topPadding: Variables.defaultMargin * 4 Repeater { id: _repeater @@ -118,13 +96,144 @@ } InstructionView { id: _instructionView - title : "test" //_root.instructionTitle - stepNames : _root.options//_root.instructionStepNames -// stepImages : _root.instructionStepImages + title : _root.instructionTitle + stepNames : _root.instructionStepNames + stepImages : _root.instructionStepImages width : _row.width * 0.8 - _row.spacing height : _row.height showAutoStep : false darkModeOnly : true } } + + Row { id: _dataRow + anchors { + bottom : _adjustPumpRate.top + bottomMargin : Variables.defaultMargin * 4 + horizontalCenter: parent.horizontalCenter + } + spacing : Variables.defaultMargin + visible : _root.currentIndex === ServiceModeHydraulics.DeaerationPressure + + LabelUnitText { id: _d9Pressure + width : _root.width / 6 + height : Variables.createRxLabelUnitContainerHeight + label : qsTr("D9 Pressure") + unit : Variables.unitPressure + value : vDDPressures.d9Pressure.toFixed(Variables.psiPrecision) + valueColor : Colors.offWhite + color : Colors.calibrationData + border.width: 0 + } + + LabelUnitText { id: _d18Pressure + width : _root.width / 6 + height : Variables.createRxLabelUnitContainerHeight + label : qsTr("D18 Pressure") + unit : Variables.unitPressure + value : vDDPressures.d18Pressure.toFixed(Variables.psiPrecision) + valueColor : Colors.offWhite + color : Colors.calibrationData + border.width: 0 + } + + LabelUnitText { id: _d4Temp + width : _root.width / 6 + height : Variables.createRxLabelUnitContainerHeight + label : qsTr("D4 Temperature") + unit : Variables.unitPressure + value : vDDTemperatures.d4Temperature.toFixed(Variables.psiPrecision) + valueColor : Colors.offWhite + color : Colors.calibrationData + border.width: 0 + } + } + + LabelUnitContainer { id: _adjustPumpRate + anchors { + bottom : _buttonRow.top + bottomMargin : Variables.settingsContentBottomMargin + horizontalCenter: parent.horizontalCenter + } + text : qsTr("Current Pump Rate") + unitText : qsTr("D-to-A") + showEdit : true + width : _root.width / 3 + visible : _root.currentIndex === ServiceModeHydraulics.DeaerationPressure + + + contentItem : TextEntry { id: _pretreatmentPatientIDEntry + clip : true + textInput.width : parent.width - Variables.defaultMargin * 4 + text : vTreatmentCreate.patientID + anchors.centerIn : parent + textInput.maximumLength : 20 // LEAHI-PRS-236 + textInput.rightPadding : Variables.defaultMargin + textInput.leftPadding : Variables.defaultMargin * 14 + textInput.inputMethodHints : Qt.ImhPreferLowercase + textInput.echoMode : TextInput.Normal + textInput.validator : RegExpValidator { regExp: Variables.regExp_PatientID } + line.visible : false + textInput.onTextChanged : vTreatmentCreate.patientID = textInput.text + + Text { id: _placeHolderText + text : Variables.emptyEntry + anchors.fill : parent + rightPadding : 125 + horizontalAlignment : Text.AlignRight + font.pixelSize : Fonts.fontPixelValueControl + color : Colors.offWhite + visible : _pretreatmentPatientIDEntry.textInput.text.length === 0 && + ! _pretreatmentPatientIDEntry.textInput.activeFocus + } + } + } + + Row { id: _buttonRow + anchors { + bottom : parent.bottom + bottomMargin : Variables.settingsContentBottomMargin + horizontalCenter: parent.horizontalCenter + } + spacing : Variables.defaultMargin * 3 + visible : _root.currentIndex === ServiceModeHydraulics.DeaerationPressure + + TouchRect { id : _startCalibrationButton + width : Variables.defaultButtonWidth + height : Variables.defaultButtonHeight + textString : qsTr("Start Calibration" ) + isDefault : true + visible : ! _root.deaerationInProgress && _root.currentIndex === ServiceModeHydraulics.DeaerationPressure + + onClicked : { + + print("Start Calibration" ) + _root.deaerationInProgress = !_root.deaerationInProgress + } + } + + TouchRect { id : _cancelButton + width : Variables.defaultButtonWidth + height : Variables.defaultButtonHeight + textString : qsTr("Cancel" ) + isDefault : true + visible : _root.deaerationInProgress && _root.currentIndex === ServiceModeHydraulics.DeaerationPressure + + onClicked : { + + print("Cancel" ) + _root.deaerationInProgress = !_root.deaerationInProgress + } + } + + TouchRect { id : _setPumpRateButton + width : Variables.defaultButtonWidth + height : Variables.defaultButtonHeight + textString : qsTr("Set Pump Rate" ) + isDefault : true + visible : _root.deaerationInProgress && _root.currentIndex === ServiceModeHydraulics.DeaerationPressure + + onClicked : print("Set Pump Rate" ) + } + } } Index: sources/model/hd/adjustment/settings/MAdjustHDRequests.h =================================================================== diff -u -r8c3cf6523e22b063f4f9d7c595d16398e95ef7bc -r3082da7333694567052cdf407765e0e409328a5b --- sources/model/hd/adjustment/settings/MAdjustHDRequests.h (.../MAdjustHDRequests.h) (revision 8c3cf6523e22b063f4f9d7c595d16398e95ef7bc) +++ sources/model/hd/adjustment/settings/MAdjustHDRequests.h (.../MAdjustHDRequests.h) (revision 3082da7333694567052cdf407765e0e409328a5b) @@ -194,11 +194,11 @@ /*! * \brief The MAdjustServiceModeReq class - * \details The HD Service Mode request model + * \details The TD Service Mode request model * * | MSG | CAN ID | Type | Ack | Src | Dest | Description | * |:------:|:------:|:----:|:---:|:---:|:----:|:-----------:| - * | 0xB000 | 0x100 | Req | Y | UI | HD | Service Mode Request | + * | 0xD000 | 0x100 | Req | Y | UI | TD | Service Mode Request | * * | Payload || * | || Index: sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.h =================================================================== diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -r3082da7333694567052cdf407765e0e409328a5b --- sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.h (.../MAdjustHDServiceModeResponse.h) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.h (.../MAdjustHDServiceModeResponse.h) (revision 3082da7333694567052cdf407765e0e409328a5b) @@ -28,11 +28,11 @@ /*! * \brief The MAdjustServiceModeResponse class - * \details The HD Date and Time adjustment response model + * \details The TD Date and Time adjustment response model * * | MSG | CAN ID | Type | Ack | Src | Dest | Description | * |:----:|:------:|:----:|:---:|:---:|:----:|:-----------:| - * |0xB100| 0x020 | Rsp | Y | HD | UI | Service Mode | + * |0xD100| 0x020 | Rsp | Y | TD | UI | Service Mode | * * | Payload || * | ||