Index: sources/gui/qml/dialogs/watersample/WaterSampleBase.qml =================================================================== diff -u -ref583f0056a0fb8c66a64e132be159719b2bc2f6 -ra563e719d85e3274b0cd0fa831ef8257032e49bc --- sources/gui/qml/dialogs/watersample/WaterSampleBase.qml (.../WaterSampleBase.qml) (revision ef583f0056a0fb8c66a64e132be159719b2bc2f6) +++ sources/gui/qml/dialogs/watersample/WaterSampleBase.qml (.../WaterSampleBase.qml) (revision a563e719d85e3274b0cd0fa831ef8257032e49bc) @@ -16,7 +16,7 @@ ContentArea { id : _contentArea anchors { top : _root.top - topMargin : Variables.mainMenuHeight + _root.spacing + topMargin : Variables.mainMenuHeight + Variables.defaultMargin left : _root.left leftMargin : _root.spacing * 2 right : _root.right Index: sources/gui/qml/dialogs/watersample/WaterSampleDialysatePage.qml =================================================================== diff -u -ref583f0056a0fb8c66a64e132be159719b2bc2f6 -ra563e719d85e3274b0cd0fa831ef8257032e49bc --- sources/gui/qml/dialogs/watersample/WaterSampleDialysatePage.qml (.../WaterSampleDialysatePage.qml) (revision ef583f0056a0fb8c66a64e132be159719b2bc2f6) +++ sources/gui/qml/dialogs/watersample/WaterSampleDialysatePage.qml (.../WaterSampleDialysatePage.qml) (revision a563e719d85e3274b0cd0fa831ef8257032e49bc) @@ -1,4 +1,3 @@ - // Qt import QtQuick 2.15 @@ -10,61 +9,160 @@ WaterSampleBase { id: _root anchors.fill: parent - contentItem : Row { id: _content - spacing : Variables.defaultMargin * 2 + contentItem : Item { id: _content + readonly property int cellWidth : width / 2 - ( _row.spacing / 2 ) // 2 items for the row and subtract spacing for widths + Text { id: _description + anchors.top : parent.top + text : qsTr("Test dialysate sample per your clinic's instructions.\n\nBased on facility policies, pH, conductivity, and temperature may be tested at this time") + color : Colors.offWhite + font.pixelSize : Fonts.fontPixelNotification + font.weight : Font.Light + width : _content.width + height : implicitHeight + horizontalAlignment : Text.AlignHCenter + verticalAlignment : Text.AlignTop + } - readonly property int cellWidth : width / 2 - ( spacing / 2 ) // 2 items for the row and subtract spacing for widths + Row { id: _row + anchors.top : _description.bottom + anchors.topMargin : Variables.defaultMargin * 2 + spacing : Variables.defaultMargin * 2 + Column { id: _leftColumn + spacing : Variables.defaultMargin - Column { id: _leftColumn - spacing : 10 + LabelUnitContainer { id: _acidConcentrateContainer + objectName : "_acidConcentrateContainer" + width : _content.cellWidth + height : Variables.adjustmentLabelUnitContainerHeight + text : qsTr("Acid Concentrate") + contentItem : Text { id: _acidConcentrateText + anchors.centerIn: parent + text : qsTr("%1%2 %3%4") .arg(vTreatmentRanges.potassium.toFixed(Variables.potassiumPrecision)) + .arg(Variables.unitTextPotassium) + .arg(vTreatmentRanges.calcium.toFixed(Variables.calciumPrecision)) + .arg(Variables.unitTextCalcium) + color : Colors.offWhite + font.pixelSize : Fonts.fontPixelValueControl + } + } - LabelUnitContainer { id: _theoriticalCondictivityContainer - objectName : "_theoriticalCondictivityContainer" - width : _content.cellWidth - height : Variables.adjustmentLabelUnitContainerHeight - text : qsTr("Theoretical Conductivity") - unitText : Variables.unitTextDialCond - contentItem : Text { id: _theoriticalCondictivityText - anchors.centerIn: parent - text : "13.7" // TODO add actual value - color : Colors.offWhite - font.pixelSize : Fonts.fontPixelValueControl + LabelUnitContainer { id: _bicarbonateCartrideSizeContainer + objectName : "_bicarbonateCartrideSizeContainer" + width : _content.cellWidth + height : Variables.adjustmentLabelUnitContainerHeight + text : qsTr("Bicarbonate Cartridge Size") + contentItem : Text { id: _bicarbonateCartrideSizeText + anchors.centerIn: parent + text : qsTr("Bicart %1") .arg(vTreatmentRanges.dryBicabCartridgeSizeOptions[vTreatmentCreate.dryBicabCartridgeSize]) + color : Colors.offWhite + font.pixelSize : Fonts.fontPixelValueControl + } } - } - LabelUnitContainer { id: _independentConductivityReadingContainer - objectName : "_independentConductivityReadingContainer" - width : _content.cellWidth - height : Variables.adjustmentLabelUnitContainerHeight - text : qsTr("Independent Conductivity Reading") - unitText : Variables.unitTextDialCond - contentItem : Text { id: _independentConductivityReadingText - anchors.centerIn: parent - text : "13.7" // TODO add actual value - color : Colors.offWhite - font.pixelSize : Fonts.fontPixelValueControl + + LabelUnitContainer { id: _sodiumContainer + objectName : "_sodiumContainer" + width : _content.cellWidth + height : Variables.adjustmentLabelUnitContainerHeight + text : qsTr("Sodium") + unitText : Variables.unitTextConcentration + contentItem : Text { id: _sodiumText + anchors.centerIn: parent + text : vTreatmentCreate.sodiumFinalDialysateComposition + color : Colors.offWhite + font.pixelSize : Fonts.fontPixelValueControl + } } + + LabelUnitContainer { id: _bicarbonateContainer + objectName : "_bicarbonateContainer" + width : _content.cellWidth + height : Variables.adjustmentLabelUnitContainerHeight + text : qsTr("Bicarbonate") + unitText : Variables.unitTextConcentration + contentItem : Text { id: _bicarbonateText + anchors.centerIn: parent + text : vTreatmentCreate.bicarbFinalDialysateComposition + color : Colors.offWhite + font.pixelSize : Fonts.fontPixelValueControl + } + } } - } - Column { id: _rightColumn - spacing : 10 + Column { id: _rightColumn + spacing : Variables.defaultMargin - LabelUnitContainer { id: _test - objectName : "_test" - width : _content.cellWidth - height : Variables.adjustmentLabelUnitContainerHeight - text : qsTr("TEST") - unitText : Variables.unitTextDialCond - contentItem : Text { id: _independentConductivityReadingCText8 - anchors.centerIn: parent - text : "13.7" // TODO add actual value - color : Colors.offWhite - font.pixelSize : Fonts.fontPixelValueControl + LabelUnitContainer { id: _theoriticalCondictivityContainer + objectName : "_theoriticalCondictivityContainer" + width : _content.cellWidth + height : Variables.adjustmentLabelUnitContainerHeight + text : qsTr("Theoretical Conductivity") + unitText : Variables.unitTextDialCond + contentItem : Text { id: _theoriticalCondictivityText + anchors.centerIn: parent + text : "13.7" // TODO add actual value + color : Colors.offWhite + font.pixelSize : Fonts.fontPixelValueControl + } } + + LabelUnitContainer { id: _independentConductivityReadingContainer1 + objectName : "_independentConductivityReadingContainer1" + width : _content.cellWidth + height : Variables.adjustmentLabelUnitContainerHeight + text : qsTr("Independent Conductivity Reading 1") + unitText : Variables.unitTextDialCond + contentItem : Text { id: _independentConductivityReading1Text + anchors.centerIn: parent + text : "13.7" // TODO add actual value + color : Colors.offWhite + font.pixelSize : Fonts.fontPixelValueControl + } + } + + LabelUnitContainer { id: _independentConductivityReadingContainer2 + objectName : "_independentConductivityReadingContainer2" + width : _content.cellWidth + height : Variables.adjustmentLabelUnitContainerHeight + text : qsTr("Independent Conductivity Reading 2") + unitText : Variables.unitTextDialCond + contentItem : Text { id: _independentConductivityReading2Text + anchors.centerIn: parent + text : "13.7" // TODO add actual value + color : Colors.offWhite + font.pixelSize : Fonts.fontPixelValueControl + } + } + + LabelUnitContainer { id: _dialsateTemperatureContainer + objectName : "_dialsateTemperatureContainer" + width : _content.cellWidth + height : Variables.adjustmentLabelUnitContainerHeight + text : qsTr("Dialysate Temperature") + unitText : Variables.unitTextTemperature + contentItem : Text { id: _dialsateTemperatureText + anchors.centerIn: parent + text : vTreatmentCreate.dialysateTemp.toFixed(Variables.dialysateTempPrecision) + color : Colors.offWhite + font.pixelSize : Fonts.fontPixelValueControl + } + } + + LabelUnitContainer { id: _actualRORejectionPercentageContainer + objectName : "_actualRORejectionPercentageContainer" + width : _content.cellWidth + height : Variables.adjustmentLabelUnitContainerHeight + text : qsTr("Actual RO Rejection Percentage") + unitText : "%" + contentItem : Text { id: _actualRORejectionPercentageText + anchors.centerIn: parent + text : vTreatmentCreate.actualRORejectionPercentage + color : Colors.offWhite + font.pixelSize : Fonts.fontPixelValueControl + } + } } } - } } Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml =================================================================== diff -u -r1164ea502e3fabdb55aa41923e0e566505f197ef -ra563e719d85e3274b0cd0fa831ef8257032e49bc --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml (.../PreTreatmentCreateContent.qml) (revision 1164ea502e3fabdb55aa41923e0e566505f197ef) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml (.../PreTreatmentCreateContent.qml) (revision a563e719d85e3274b0cd0fa831ef8257032e49bc) @@ -318,6 +318,8 @@ if ( ! _acidConcentrate.valid ) { vTreatmentCreate.acidConcentrateRejectReason = Variables.noRejectReason } vTreatmentCreate.acidConcentrate = _acidConcentrateComboBox.currentIndex vTreatmentCreate.acidConcentrateSet = true + vTreatmentRanges.doPopulateAcidConcentrate( vTreatmentCreate.acidConcentrateSet, + vTreatmentCreate.acidConcentrate) } } } Index: sources/view/VTreatmentCreate.h =================================================================== diff -u -rb1462640e36df3f567c42aa8c8cbd6dafe865625 -ra563e719d85e3274b0cd0fa831ef8257032e49bc --- sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision b1462640e36df3f567c42aa8c8cbd6dafe865625) +++ sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision a563e719d85e3274b0cd0fa831ef8257032e49bc) @@ -103,6 +103,12 @@ VALUESET(bool , parametersValidated , 0) VALUESET(bool , parametersConfirmed , 0) + VALUESET(qint32 , dryBicabCartridgeSize , 0) + VALUESET(qint32 , bicarbFinalDialysateComposition , 0) + VALUESET(qint32 , sodiumFinalDialysateComposition , 0) + VALUESET(qint32 , actualRORejectionPercentage , 0) + + PROPERTY(QString , txCode ,"") TRIGGER(quint32 , bloodFlowRateRejectReason , 0)