Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -r56381aae237db191956aff493907cd1f0801216b -r4a7dd11138d2321f1ab8d324b3bd25f02eaefe84 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 56381aae237db191956aff493907cd1f0801216b) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 4a7dd11138d2321f1ab8d324b3bd25f02eaefe84) @@ -671,8 +671,10 @@ mData += vData.mHeparinBolusVolume ; mData += vData.mHeparinDispensingRate ; mData += vData.mDialysateTemp ; - mData += vData.mPotassium ; - mData += vData.mCalcium ; + mData += vData.mAcidConcentrateConversionFactor ; + mData += vData.mUFVolume ; + mData += vData.mUFPreWeight ; + mData += vData.mUFEstimatedTargetWeight ; onActionTransmit(GuiActionType::ID_AdjustParametersValidationReq, mData); } Index: sources/gui/qml/components/HeaderBar.qml =================================================================== diff -u -rb0370d82c7653eca5347374aa3f6b02a188c8fe7 -r4a7dd11138d2321f1ab8d324b3bd25f02eaefe84 --- sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision b0370d82c7653eca5347374aa3f6b02a188c8fe7) +++ sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision 4a7dd11138d2321f1ab8d324b3bd25f02eaefe84) @@ -12,6 +12,7 @@ readonly property int currentScreen : _headerMenu.currentScreen property bool isCreateRx : false // set in slot in parent property bool isHeparinFeatured : vSettings.heparinSyringePump + property bool isHDFFeatured : vTreatmentCreate.treatmentModality === HeaderBar.Mode_HDF width : Variables.applicationWidth height : Variables.headerHeight @@ -29,9 +30,18 @@ HDF = 3 } - onIsHeparinFeaturedChanged : vListModel.setHeaderbarVisible(HeaderBar.Heparin, _root.isHeparinFeatured) - Component.onCompleted : vListModel.setHeaderbarVisible(HeaderBar.Heparin, _root.isHeparinFeatured) + enum TreatmentModality { + Mode_HD , + Mode_HDF + } + onIsHDFFeaturedChanged : vListModel.setHeaderbarVisible(HeaderBar.HDF, _root.isHDFFeatured ) + onIsHeparinFeaturedChanged : vListModel.setHeaderbarVisible(HeaderBar.Heparin, _root.isHeparinFeatured ) + Component.onCompleted : { + vListModel.setHeaderbarVisible(HeaderBar.Heparin, _root.isHeparinFeatured ) + vListModel.setHeaderbarVisible(HeaderBar.HDF, _root.isHDFFeatured ) + } + function vitalsRecorded() { _vitalsButton.pulseAnimation.start() } MouseArea { id: _mouseArea Index: sources/gui/qml/compounds/LabelUnitContainer.qml =================================================================== diff -u -rc9764bd0ad823c5c1725d7c7f556290c2c459d4d -r4a7dd11138d2321f1ab8d324b3bd25f02eaefe84 --- sources/gui/qml/compounds/LabelUnitContainer.qml (.../LabelUnitContainer.qml) (revision c9764bd0ad823c5c1725d7c7f556290c2c459d4d) +++ sources/gui/qml/compounds/LabelUnitContainer.qml (.../LabelUnitContainer.qml) (revision 4a7dd11138d2321f1ab8d324b3bd25f02eaefe84) @@ -32,8 +32,8 @@ property int titleFontSize : Fonts.fontPixelDefaultButton property int unitFontSize : Fonts.fontUnit - height : cellHeight - width : cellWidth + height : Variables.createRxLabelUnitContainerHeight + width : Variables.createRxLabelUnitContainerWidth radius : 8.5 color : Colors.panelBackgroundColor Index: sources/gui/qml/compounds/LabelUnitValueAdjuster.qml =================================================================== diff -u -r45ce5cd058a8d0239d486e0ab4b057731f7dba76 -r4a7dd11138d2321f1ab8d324b3bd25f02eaefe84 --- sources/gui/qml/compounds/LabelUnitValueAdjuster.qml (.../LabelUnitValueAdjuster.qml) (revision 45ce5cd058a8d0239d486e0ab4b057731f7dba76) +++ sources/gui/qml/compounds/LabelUnitValueAdjuster.qml (.../LabelUnitValueAdjuster.qml) (revision 4a7dd11138d2321f1ab8d324b3bd25f02eaefe84) @@ -39,6 +39,9 @@ signal didChange (real vValue) signal didActiveChange (bool vState) + function refresh() { _valueAdjuster.refresh() } + function clear() { _valueAdjuster.clear() } + contentItem : ValueAdjuster { id: _valueAdjuster objectName : "_valueAdjuster" Index: sources/gui/qml/dialogs/watersample/WaterSampleDialysatePage.qml =================================================================== diff -u -ref8be521484c69132550e0d183fcaf964951d6dc -r4a7dd11138d2321f1ab8d324b3bd25f02eaefe84 --- sources/gui/qml/dialogs/watersample/WaterSampleDialysatePage.qml (.../WaterSampleDialysatePage.qml) (revision ef8be521484c69132550e0d183fcaf964951d6dc) +++ sources/gui/qml/dialogs/watersample/WaterSampleDialysatePage.qml (.../WaterSampleDialysatePage.qml) (revision 4a7dd11138d2321f1ab8d324b3bd25f02eaefe84) @@ -52,7 +52,7 @@ text : qsTr("Bicarbonate Cartridge Size") contentItem : Text { id: _bicarbonateCartrideSizeText anchors.centerIn: parent - text : qsTr("Bicart %1") .arg(vTreatmentRanges.dryBicabCartridgeSizeOptions[vTreatmentCreate.dryBicabCartridgeSize]) + text : qsTr("Bicart %1") .arg(vTreatmentRanges.dryBicabCartridgeSizeOptions[vTreatmentCreate.dryBicarbCartSize]) color : Colors.offWhite font.pixelSize : Fonts.fontPixelValueControl } @@ -67,7 +67,7 @@ unitText : Variables.unitTextConcentration contentItem : Text { id: _sodiumText anchors.centerIn: parent - text : vTreatmentCreate.sodiumFinalDialysateComposition + text : vTreatmentCreate.sodium color : Colors.offWhite font.pixelSize : Fonts.fontPixelValueControl } @@ -81,7 +81,7 @@ unitText : Variables.unitTextConcentration contentItem : Text { id: _bicarbonateText anchors.centerIn: parent - text : vTreatmentCreate.bicarbFinalDialysateComposition + text : vTreatmentCreate.bicarbonate color : Colors.offWhite font.pixelSize : Fonts.fontPixelValueControl } Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -r45ce5cd058a8d0239d486e0ab4b057731f7dba76 -r4a7dd11138d2321f1ab8d324b3bd25f02eaefe84 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 45ce5cd058a8d0239d486e0ab4b057731f7dba76) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 4a7dd11138d2321f1ab8d324b3bd25f02eaefe84) @@ -196,6 +196,9 @@ readonly property int adjustmentLabelUnitContainerWidth : 720 readonly property int institutionaltContainerHeight : 69 + readonly property int createRxLabelUnitContainerHeight : 79 // 85 + readonly property int createRxLabelUnitContainerWidth : 770 + readonly property real sliderDefaultRoundTickMarkDiameter : 5 readonly property int sliderDefaultBodyHeight : 15 Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml =================================================================== diff -u -r56381aae237db191956aff493907cd1f0801216b -r4a7dd11138d2321f1ab8d324b3bd25f02eaefe84 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml (.../PreTreatmentCreateContent.qml) (revision 56381aae237db191956aff493907cd1f0801216b) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml (.../PreTreatmentCreateContent.qml) (revision 4a7dd11138d2321f1ab8d324b3bd25f02eaefe84) @@ -25,12 +25,11 @@ import "qrc:/pages/pretreatment" Item { id: _root - readonly property int cellWidth : width / 2 - ( rowSpacing / 2 ) - readonly property int cellHeight : ( _contentGrid.height ) / 7 - ( columnSpacing ) - readonly property int rowSpacing : Variables.defaultMargin * 3 - readonly property int columnSpacing : 15 +// readonly property int cellWidth : Variables.createRxLabelUnitContainerWidth +// readonly property int cellHeight : Variables.createRxLabelUnitContainerHeight +// readonly property int rowSpacing : Variables.defaultMargin * 3 +// readonly property int columnSpacing : 15 readonly property bool isValidated : vTreatmentCreate.parametersValidated - readonly property bool heparinFeatured: vSettings.heparinSyringePump readonly property string editRx : qsTr( "Edit Rx" ) readonly property string selectRx : qsTr( "Select Rx" ) @@ -50,6 +49,8 @@ function activateAndRefresh() { refreshAll () // needs to be first + + vTreatmentCreate.bloodFlowRateSet = true vTreatmentCreate.dialysateFlowRateSet = true vTreatmentCreate.treatmentDurationSet = true @@ -65,31 +66,37 @@ } function refreshAll () { - _bloodFlowRateControl .refresh() - _dialysateFlowRateControl .refresh() - _durationControl .refresh() - _heparinDispensingRateControl .refresh() - _heparinBolusVolumeControl .refresh() - _heparinDeliveryDurationControl .refresh() - _dialysateTemperatureControl .refresh() - _fluidBolusVolumeControl .refresh() - _bpMeasurementIntervalControl .refresh() + _preTreatmentCreateTreatmentSettings.refreshAll () + + +// _bloodFlowRateControl .refresh() +// _dialysateFlowRateControl .refresh() +// _durationControl .refresh() +// _heparinDispensingRateControl .refresh() +// _heparinBolusVolumeControl .refresh() +// _heparinDeliveryDurationControl .refresh() +// _dialysateTemperatureControl .refresh() +// _fluidBolusVolumeControl .refresh() +// _bpMeasurementIntervalControl .refresh() } function clear () { - vTreatmentCreate.patientID = "" - _bloodFlowRateControl .clear() - _dialysateFlowRateControl .clear() - _durationControl .clear() - _heparinDispensingRateControl .clear() - _heparinBolusVolumeControl .clear() - _heparinDeliveryDurationControl .clear() - _acidConcentrateComboBox .clear() - _bicarbonateConcentrateComboBox .clear() - _dialyzerTypeComboBox .clear() - _dialysateTemperatureControl .clear() - _fluidBolusVolumeControl .clear() - _bpMeasurementIntervalControl .clear() + _preTreatmentCreateTreatmentSettings.clear () + + +// vTreatmentCreate.patientID = "" +// _bloodFlowRateControl .clear() +// _dialysateFlowRateControl .clear() +// _durationControl .clear() +// _heparinDispensingRateControl .clear() +// _heparinBolusVolumeControl .clear() +// _heparinDeliveryDurationControl .clear() +// _acidConcentrateComboBox .clear() +// _bicarbonateConcentrateComboBox .clear() +// _dialyzerTypeComboBox .clear() +// _dialysateTemperatureControl .clear() +// _fluidBolusVolumeControl .clear() +// _bpMeasurementIntervalControl .clear() clearErrors() canEdit (true) } @@ -115,32 +122,39 @@ vTreatmentCreate.heparinBolusVolumeRejectReason = Variables.noRejectReason vTreatmentCreate.heparinDispensingRateRejectReason = Variables.noRejectReason vTreatmentCreate.dialysateTempRejectReason = Variables.noRejectReason - vTreatmentCreate.potassiumRejectReason = Variables.noRejectReason - vTreatmentCreate.calciumRejectReason = Variables.noRejectReason + vTreatmentCreate.acidConcentrateConversionFactor = Variables.noRejectReason + vTreatmentCreate.ultrafiltrationVolume = Variables.noRejectReason + vTreatmentCreate.ufPreWeight = Variables.noRejectReason + vTreatmentCreate.ufEstimatedTargetWeight = Variables.noRejectReason } function confirmReady () { - return _bloodFlowRateControl .isActive && _bloodFlowRate .valid && - _dialysateFlowRateControl .isActive && _dialysateFlowRate .valid && - _durationControl .isActive && _duration .valid && - ( _root.heparinFeatured ? _heparinDispensingRateControl .isActive && _heparinDispensingRate .valid && - _heparinBolusVolumeControl .isActive && _heparinBolusVolume .valid && - _heparinDeliveryDurationControl .isActive && _heparinDeliveryDuration .valid : true ) && - _acidConcentrateComboBox .isActive && - _bicarbonateConcentrateComboBox .isActive && - _dialyzerTypeComboBox .isActive && - _dialysateTemperatureControl .isActive && _dialysateTemperature .valid && - _fluidBolusVolumeControl .isActive && _fluidBolusVolume .valid && - _bpMeasurementIntervalControl .isActive + return _preTreatmentCreateTreatmentSettings.ready() + +// return _bloodFlowRateControl .isActive && _bloodFlowRate .valid && +// _dialysateFlowRateControl .isActive && _dialysateFlowRate .valid && +// _durationControl .isActive && _duration .valid && +// ( _root.heparinFeatured ? _heparinDispensingRateControl .isActive && _heparinDispensingRate .valid && +// _heparinBolusVolumeControl .isActive && _heparinBolusVolume .valid && +// _heparinDeliveryDurationControl .isActive && _heparinDeliveryDuration .valid : true ) && +// _acidConcentrateComboBox .isActive && +// _bicarbonateConcentrateComboBox .isActive && +// _dialyzerTypeComboBox .isActive && +// _dialysateTemperatureControl .isActive && _dialysateTemperature .valid && +// _fluidBolusVolumeControl .isActive && _fluidBolusVolume .valid && +// _bpMeasurementIntervalControl .isActive } function validate () { - vTreatmentCreate .patientID = _pretreatmentPatientIDEntry.text - vPostTreatmentAdjustmentTreatmentLog.patientID = _pretreatmentPatientIDEntry.text // store for the TreatmentLog + vTreatmentCreate .patientID = _preTreatmentCreateTreatmentSettings.patientID + vPostTreatmentAdjustmentTreatmentLog.patientID = _preTreatmentCreateTreatmentSettings.patientID // store for the TreatmentLog + + + vTreatmentCreate.doValidation ( ) } - function confirm () { vTreatmentCreate.doConfirm() } + function confirm () { vTreatmentCreate.doConfirm() } /// TODO: Remove later.. keeping for now (only in popup) to get into main tx on device Connections{ target: vTreatmentCreate function onDidValidationPass ( ) { @@ -237,7 +251,7 @@ spacing : Variables.defaultMargin anchors { left : parent.left - leftMargin : (_root.width / 2) + (_root.columnSpacing * 2) + leftMargin : (_root.width / 2) + (30) verticalCenter : _prescriptionMenu.verticalCenter verticalCenterOffset: -10 } @@ -264,363 +278,295 @@ bottom : parent.bottom } - PreTreatmentCreateTreatmentSettings { id: _preTreatmentCreateTreatmentSettings; visible: _root.currentIndex === PreTreatmentCreateContent.PatientPrescription } - PreTreatmentCreatePatientPrescription { id: _preTreatmentCreatePatientPrescription; visible: _root.currentIndex === PreTreatmentCreateContent.TreatmentSettings } - } - - Grid { id: _contentGrid - anchors { - top : _prescriptionMenu.bottom - topMargin : Variables.defaultMargin * 2 - left : _root.left - right : _root.right - bottom : parent.bottom + PreTreatmentCreateTreatmentSettings { id: _preTreatmentCreateTreatmentSettings + visible : _root.currentIndex === PreTreatmentCreateContent.PatientPrescription + editingEnabled : _root.editingEnabled } - // Flow intentially set o keep top row aligned. To organize with Heparin Defeature - flow : Grid.LeftToRight - rows : _root.heparinFeatured ? 7 : 6 - columns : 2 - rowSpacing : _root.columnSpacing - columnSpacing : _root.rowSpacing + PreTreatmentCreatePatientPrescription { id: _preTreatmentCreatePatientPrescription; + visible : _root.currentIndex === PreTreatmentCreateContent.TreatmentSettings + editingEnabled : _root.editingEnabled - Item { id: _patientIDItem - height : _root.cellHeight - width : _root.cellWidth - - LabelUnitContainer { id: _patientID - anchors.verticalCenter : parent.verticalCenter - text : qsTr("Patient ID") - height : cellHeight - Variables.defaultMargin - contentArea.anchors.leftMargin : 120 - - 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 - enabled : _root.editingEnabled - onEditingFinished : vTreatmentCreate.patientID = text - - Text { id: _patientIDPlaceHolderText - 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 - } - } - } } + } +// LabelUnitContainer { id: _acidConcentrate +// text : qsTr("Acid Concentrate") +//// showEdit : _root.editingEnabled // Hide 👋📋 TODO Phase 2 +// onEditClicked : _acidConcentrateAdjustment.open() +// valid : ! vTreatmentCreate.acidConcentrateRejectReason - LabelUnitContainer { id: _bloodFlowRate - text : qsTr("Blood Flow Rate") - unitText : Variables.unitTextFlowRate - valid : ! vTreatmentCreate.bloodFlowRateRejectReason +// contentItem : BaseComboBox { id: _acidConcentrateComboBox +// anchors.rightMargin : Variables.defaultMargin * 2 +// anchors.leftMargin : anchors.rightMargin +// anchors.topMargin : Variables.defaultMargin / 2 +// anchors.bottomMargin: anchors.topMargin +// isActive : vTreatmentCreate.acidConcentrateSet +// enabled : _root.editingEnabled +// currentIndex : vTreatmentCreate.acidConcentrate +// model : vTreatmentRanges.acidConcentrateOptions +// onClear : { +// vTreatmentRanges.doClearAcidConcentrate(vTreatmentCreate.acidConcentrateSet) +// vTreatmentCreate.acidConcentrateSet = false +// } - contentItem : ValueAdjuster { id: _bloodFlowRateControl - editable : _root.editingEnabled - minimum : vTreatmentRanges.bloodFlowRateMin - maximum : vTreatmentRanges.bloodFlowRateMax - step : vTreatmentRanges.bloodFlowRateRes - defaultValue : vTreatmentRanges.bloodFlowRateDef - value : vTreatmentCreate.bloodFlowRate - isActive : vTreatmentCreate.bloodFlowRateSet - onDidActiveChange: function(vState) { vTreatmentCreate.bloodFlowRateSet = vState } - onDidChange : function(vValue) { - if ( ! _bloodFlowRate.valid ) { vTreatmentCreate.bloodFlowRateRejectReason = Variables.noRejectReason } - vTreatmentCreate.bloodFlowRate = vValue - } - } - } +// onActivated : { +// if ( ! _acidConcentrate.valid ) { vTreatmentCreate.acidConcentrateRejectReason = Variables.noRejectReason } +// vTreatmentCreate.acidConcentrate = _acidConcentrateComboBox.currentIndex +// vTreatmentCreate.acidConcentrateSet = true +//// vTreatmentCreate.acidConcentrateConversionFactor = vTreatmentRanges.acidConcentrateValues[vTreatmentCreate.acidConcentrate] - LabelUnitContainer { id: _acidConcentrate - text : qsTr("Acid Concentrate") -// showEdit : _root.editingEnabled // Hide 👋📋 TODO Phase 2 - onEditClicked : _acidConcentrateAdjustment.open() - valid : ! vTreatmentCreate.acidConcentrateRejectReason +// print( vTreatmentRanges.acidConcentrateModel.get(vTreatmentCreate.acidConcentrate).value ) - contentItem : BaseComboBox { id: _acidConcentrateComboBox - anchors.rightMargin : Variables.defaultMargin * 2 - anchors.leftMargin : anchors.rightMargin - anchors.topMargin : Variables.defaultMargin / 2 - anchors.bottomMargin: anchors.topMargin - isActive : vTreatmentCreate.acidConcentrateSet - enabled : _root.editingEnabled - currentIndex : vTreatmentCreate.acidConcentrate - model : vTreatmentRanges.acidConcentrateOptions - onClear : { - vTreatmentRanges.doClearAcidConcentrate(vTreatmentCreate.acidConcentrateSet) - vTreatmentCreate.acidConcentrateSet = false - } +// } +// } +// } - onActivated : { - if ( ! _acidConcentrate.valid ) { vTreatmentCreate.acidConcentrateRejectReason = Variables.noRejectReason } - vTreatmentCreate.acidConcentrate = _acidConcentrateComboBox.currentIndex - vTreatmentCreate.acidConcentrateSet = true -// vTreatmentCreate.acidConcentrateConversionFactor = vTreatmentRanges.acidConcentrateValues[vTreatmentCreate.acidConcentrate] +// LabelUnitContainer { id: _dialysateFlowRate +// text : qsTr("Dialysate Flow Rate") +// unitText : Variables.unitTextFlowRate +// valid : ! vTreatmentCreate.dialysateFlowRateRejectReason - print( vTreatmentRanges.acidConcentrateModel.get(vTreatmentCreate.acidConcentrate).value ) +// contentItem : ValueAdjuster { id: _dialysateFlowRateControl +// editable : _root.editingEnabled +// minimum : vTreatmentRanges.dialysateFlowRateMin +// maximum : vTreatmentRanges.dialysateFlowRateMax +// step : vTreatmentRanges.dialysateFlowRateRes +// defaultValue : vTreatmentRanges.dialysateFlowRateDef +// value : vTreatmentCreate.dialysateFlowRate +// isActive : vTreatmentCreate.dialysateFlowRateSet +// onDidActiveChange: function(vState) { vTreatmentCreate.dialysateFlowRateSet = vState } +// onDidChange : function(vValue) { +// if ( ! _dialysateFlowRate.valid ) { vTreatmentCreate.dialysateFlowRateRejectReason = Variables.noRejectReason } +// vTreatmentCreate.dialysateFlowRate = vValue +// } +// } +// } - } - } - } +// LabelUnitContainer { id: _bicarbonateConcentrate +// text : qsTr("Bicarbonate Concentrate Size") +// valid : ! vTreatmentCreate.dryBicarbCartSizeRejectReason - LabelUnitContainer { id: _dialysateFlowRate - text : qsTr("Dialysate Flow Rate") - unitText : Variables.unitTextFlowRate - valid : ! vTreatmentCreate.dialysateFlowRateRejectReason +// contentItem : BaseComboBox { id: _bicarbonateConcentrateComboBox +// anchors.rightMargin : Variables.defaultMargin * 2 +// anchors.leftMargin : anchors.rightMargin +// anchors.topMargin : Variables.defaultMargin / 2 +// anchors.bottomMargin: anchors.topMargin +// isActive : vTreatmentCreate.dryBicarbCartSizeSet +// enabled : _root.editingEnabled +// currentIndex : vTreatmentCreate.dryBicarbCartSize +// model : vTreatmentRanges.dryBicabCartridgeSizeOptions +// onClear : vTreatmentCreate.dryBicarbCartSizeSet = false +// onActivated : { +// if ( ! _bicarbonateConcentrate.valid ) { vTreatmentCreate.dryBicarbCartSizeRejectReason = Variables.noRejectReason } +// vTreatmentCreate.dryBicarbCartSize = _bicarbonateConcentrateComboBox.currentIndex +// vTreatmentCreate.dryBicarbCartSizeSet = true +// } +// } +// } - contentItem : ValueAdjuster { id: _dialysateFlowRateControl - editable : _root.editingEnabled - minimum : vTreatmentRanges.dialysateFlowRateMin - maximum : vTreatmentRanges.dialysateFlowRateMax - step : vTreatmentRanges.dialysateFlowRateRes - defaultValue : vTreatmentRanges.dialysateFlowRateDef - value : vTreatmentCreate.dialysateFlowRate - isActive : vTreatmentCreate.dialysateFlowRateSet - onDidActiveChange: function(vState) { vTreatmentCreate.dialysateFlowRateSet = vState } - onDidChange : function(vValue) { - if ( ! _dialysateFlowRate.valid ) { vTreatmentCreate.dialysateFlowRateRejectReason = Variables.noRejectReason } - vTreatmentCreate.dialysateFlowRate = vValue - } - } - } +// LabelUnitContainer { id: _duration +// text : qsTr("Duration") +// unitText : Variables.unitTextDuration +// valid : ! vTreatmentCreate.treatmentDurationRejectReason - LabelUnitContainer { id: _bicarbonateConcentrate - text : qsTr("Bicarbonate Concentrate Size") - valid : ! vTreatmentCreate.dryBicarbCartSizeRejectReason +// contentItem : ValueAdjuster { id: _durationControl +// editable : _root.editingEnabled +// minimum : vTreatmentRanges.treatmentDurationMin +// maximum : vTreatmentRanges.treatmentDurationMax +// step : vTreatmentRanges.treatmentDurationRes +// defaultValue : vTreatmentRanges.treatmentDurationDef +// value : vTreatmentCreate.treatmentDuration +// isActive : vTreatmentCreate.treatmentDurationSet +// onDidActiveChange: function(vState) { vTreatmentCreate.treatmentDurationSet = vState } +// onDidChange : function(vValue) { +// if ( ! _duration.valid ) { vTreatmentCreate.treatmentDurationRejectReason = Variables.noRejectReason } +// vTreatmentCreate.treatmentDuration = vValue - contentItem : BaseComboBox { id: _bicarbonateConcentrateComboBox - anchors.rightMargin : Variables.defaultMargin * 2 - anchors.leftMargin : anchors.rightMargin - anchors.topMargin : Variables.defaultMargin / 2 - anchors.bottomMargin: anchors.topMargin - isActive : vTreatmentCreate.dryBicarbCartSizeSet - enabled : _root.editingEnabled - currentIndex : vTreatmentCreate.dryBicarbCartSize - model : vTreatmentRanges.dryBicabCartridgeSizeOptions - onClear : vTreatmentCreate.dryBicarbCartSizeSet = false - onActivated : { - if ( ! _bicarbonateConcentrate.valid ) { vTreatmentCreate.dryBicarbCartSizeRejectReason = Variables.noRejectReason } - vTreatmentCreate.dryBicarbCartSize = _bicarbonateConcentrateComboBox.currentIndex - vTreatmentCreate.dryBicarbCartSizeSet = true - } - } - } +// // set heparin time to clear when set +// if ( _heparinDeliveryDurationControl.enabled ) { _heparinDeliveryDurationControl.clear() } +// } +// } +// } - LabelUnitContainer { id: _duration - text : qsTr("Duration") - unitText : Variables.unitTextDuration - valid : ! vTreatmentCreate.treatmentDurationRejectReason +// LabelUnitContainer { id: _dialyzerType +// text : qsTr("Dialyzer Type") +// valid : ! vTreatmentCreate.dialyzerTypeRejectReason - contentItem : ValueAdjuster { id: _durationControl - editable : _root.editingEnabled - minimum : vTreatmentRanges.treatmentDurationMin - maximum : vTreatmentRanges.treatmentDurationMax - step : vTreatmentRanges.treatmentDurationRes - defaultValue : vTreatmentRanges.treatmentDurationDef - value : vTreatmentCreate.treatmentDuration - isActive : vTreatmentCreate.treatmentDurationSet - onDidActiveChange: function(vState) { vTreatmentCreate.treatmentDurationSet = vState } - onDidChange : function(vValue) { - if ( ! _duration.valid ) { vTreatmentCreate.treatmentDurationRejectReason = Variables.noRejectReason } - vTreatmentCreate.treatmentDuration = vValue +// contentItem : BaseComboBox { id: _dialyzerTypeComboBox +// anchors.rightMargin : Variables.defaultMargin * 2 +// anchors.leftMargin : anchors.rightMargin +// anchors.topMargin : Variables.defaultMargin / 2 +// anchors.bottomMargin: anchors.topMargin +// isActive : vTreatmentCreate.dialyzerTypeSet +// enabled : _root.editingEnabled +// currentIndex : vTreatmentCreate.dialyzerType +// model : vTreatmentRanges.dialyzerTypeOptions +// onClear : vTreatmentCreate.dialyzerTypeSet = false +// onActivated : { +// if ( ! _dialyzerType.valid ) { vTreatmentCreate.dialyzerTypeRejectReason = Variables.noRejectReason } +// vTreatmentCreate.dialyzerType = _dialyzerTypeComboBox.currentIndex +// vTreatmentCreate.dialyzerTypeSet = true +// } +// } +// } - // set heparin time to clear when set - if ( _heparinDeliveryDurationControl.enabled ) { _heparinDeliveryDurationControl.clear() } - } - } - } +// LabelUnitContainer { id: _heparinBolusVolume +// text : qsTr("Heparin Bolus Volume") +// unitText : Variables.unitTextFluid +// valid : ! vTreatmentCreate.heparinBolusVolumeRejectReason +// visible : _root.heparinFeatured - LabelUnitContainer { id: _dialyzerType - text : qsTr("Dialyzer Type") - valid : ! vTreatmentCreate.dialyzerTypeRejectReason +// contentItem : ValueAdjuster { id: _heparinBolusVolumeControl +// editable : _root.editingEnabled +// minimum : vTreatmentRanges.heparinBolusVolumeMin +// maximum : vTreatmentRanges.heparinBolusVolumeMax +// step : vTreatmentRanges.heparinBolusVolumeRes +// defaultValue : vTreatmentRanges.heparinBolusVolumeDef +// value : vTreatmentCreate.heparinBolusVolume +// decimal : Variables.heparinPrecision +// canOff : true +// isActive : vTreatmentCreate.heparinBolusVolumeSet +// onDidActiveChange: function(vState) { vTreatmentCreate.heparinBolusVolumeSet = vState } +// onDidChange : function(vValue) { +// if ( ! _heparinBolusVolume.valid ) { vTreatmentCreate.heparinBolusVolumeRejectReason = Variables.noRejectReason } +// vTreatmentCreate.heparinBolusVolume = vValue +// } +// } +// } - contentItem : BaseComboBox { id: _dialyzerTypeComboBox - anchors.rightMargin : Variables.defaultMargin * 2 - anchors.leftMargin : anchors.rightMargin - anchors.topMargin : Variables.defaultMargin / 2 - anchors.bottomMargin: anchors.topMargin - isActive : vTreatmentCreate.dialyzerTypeSet - enabled : _root.editingEnabled - currentIndex : vTreatmentCreate.dialyzerType - model : vTreatmentRanges.dialyzerTypeOptions - onClear : vTreatmentCreate.dialyzerTypeSet = false - onActivated : { - if ( ! _dialyzerType.valid ) { vTreatmentCreate.dialyzerTypeRejectReason = Variables.noRejectReason } - vTreatmentCreate.dialyzerType = _dialyzerTypeComboBox.currentIndex - vTreatmentCreate.dialyzerTypeSet = true - } - } - } +// LabelUnitContainer { id: _bpMeasurementInterval +// text : qsTr("Vitals Interval") +// unitText : Variables.unitTextDuration +// valid : ! vTreatmentCreate.bloodPressureMeasureIntervalRejectReason - LabelUnitContainer { id: _heparinBolusVolume - text : qsTr("Heparin Bolus Volume") - unitText : Variables.unitTextFluid - valid : ! vTreatmentCreate.heparinBolusVolumeRejectReason - visible : _root.heparinFeatured +// contentItem : ValueAdjusterCustom { id: _bpMeasurementIntervalControl +// editable : _root.editingEnabled +// isActive : vTreatmentCreate.bloodPressureMeasureIntervalSet +// defaultValue : vTreatmentRanges.vitalsInterval +// value : vTreatmentRanges.bloodPressureMeasureInterval.indexOf(vTreatmentCreate.bloodPressureMeasureInterval.toString()) +// model : vTreatmentRanges.bloodPressureMeasureInterval +// canOff : true - contentItem : ValueAdjuster { id: _heparinBolusVolumeControl - editable : _root.editingEnabled - minimum : vTreatmentRanges.heparinBolusVolumeMin - maximum : vTreatmentRanges.heparinBolusVolumeMax - step : vTreatmentRanges.heparinBolusVolumeRes - defaultValue : vTreatmentRanges.heparinBolusVolumeDef - value : vTreatmentCreate.heparinBolusVolume - decimal : Variables.heparinPrecision - canOff : true - isActive : vTreatmentCreate.heparinBolusVolumeSet - onDidActiveChange: function(vState) { vTreatmentCreate.heparinBolusVolumeSet = vState } - onDidChange : function(vValue) { - if ( ! _heparinBolusVolume.valid ) { vTreatmentCreate.heparinBolusVolumeRejectReason = Variables.noRejectReason } - vTreatmentCreate.heparinBolusVolume = vValue - } - } - } +// onDidActiveChange: function(vState) { vTreatmentCreate.bloodPressureMeasureIntervalSet = vState } - LabelUnitContainer { id: _bpMeasurementInterval - text : qsTr("Vitals Interval") - unitText : Variables.unitTextDuration - valid : ! vTreatmentCreate.bloodPressureMeasureIntervalRejectReason +// onDidChange : function(vValue) { +// if ( ! _bpMeasurementInterval.valid ) { +// vTreatmentCreate.bloodPressureMeasureIntervalRejectReason = Variables.noRejectReason +// } - contentItem : ValueAdjusterCustom { id: _bpMeasurementIntervalControl - editable : _root.editingEnabled - isActive : vTreatmentCreate.bloodPressureMeasureIntervalSet - defaultValue : vTreatmentRanges.vitalsInterval - value : vTreatmentRanges.bloodPressureMeasureInterval.indexOf(vTreatmentCreate.bloodPressureMeasureInterval.toString()) - model : vTreatmentRanges.bloodPressureMeasureInterval - canOff : true +// vTreatmentCreate.bloodPressureMeasureInterval = vTreatmentRanges.bloodPressureMeasureInterval[vValue] +// vTreatmentCreate.bloodPressureMeasureIntervalSet = true +// } +// } +// } - onDidActiveChange: function(vState) { vTreatmentCreate.bloodPressureMeasureIntervalSet = vState } +// LabelUnitContainer { id: _heparinDispensingRate +// text : qsTr("Heparin Dispensing Rate") +// unitText : Variables.unitTextDispensingRate +// valid : ! vTreatmentCreate.heparinDispensingRateRejectReason +// visible : _root.heparinFeatured - onDidChange : function(vValue) { - if ( ! _bpMeasurementInterval.valid ) { - vTreatmentCreate.bloodPressureMeasureIntervalRejectReason = Variables.noRejectReason - } +// contentItem : ValueAdjuster { id: _heparinDispensingRateControl +// editable : _root.editingEnabled +// minimum : vTreatmentRanges.heparinDispensingRateMin +// maximum : vTreatmentRanges.heparinDispensingRateMax +// step : vTreatmentRanges.heparinDispensingRateRes +// defaultValue : vTreatmentRanges.heparinDispensingRateDef +// value : vTreatmentCreate.heparinDispensingRate +// decimal : Variables.heparinPrecision +// canOff : true +// isActive : vTreatmentCreate.heparinDispensingRateSet +// onDidActiveChange: function(vState) { vTreatmentCreate.heparinDispensingRateSet = vState } +// onDidChange : function(vValue) { +// if ( ! _heparinDispensingRate.valid ) { vTreatmentCreate.heparinDispensingRateRejectReason = Variables.noRejectReason } +// // set heparin time to clear when set OFF to value +// if ( ! vTreatmentCreate.heparinDispensingRate && vValue ) { _heparinDeliveryDurationControl.clear() } - vTreatmentCreate.bloodPressureMeasureInterval = vTreatmentRanges.bloodPressureMeasureInterval[vValue] - vTreatmentCreate.bloodPressureMeasureIntervalSet = true - } - } - } +// vTreatmentCreate.heparinDispensingRate = vValue - LabelUnitContainer { id: _heparinDispensingRate - text : qsTr("Heparin Dispensing Rate") - unitText : Variables.unitTextDispensingRate - valid : ! vTreatmentCreate.heparinDispensingRateRejectReason - visible : _root.heparinFeatured +// // if set to OFF set heparin stop time 0 +// if ( ! vTreatmentCreate.heparinDispensingRate ) { +// vTreatmentCreate.heparinDeliveryDurationSet = true +// vTreatmentCreate.heparinDeliveryDuration = 0 +// } +// } - contentItem : ValueAdjuster { id: _heparinDispensingRateControl - editable : _root.editingEnabled - minimum : vTreatmentRanges.heparinDispensingRateMin - maximum : vTreatmentRanges.heparinDispensingRateMax - step : vTreatmentRanges.heparinDispensingRateRes - defaultValue : vTreatmentRanges.heparinDispensingRateDef - value : vTreatmentCreate.heparinDispensingRate - decimal : Variables.heparinPrecision - canOff : true - isActive : vTreatmentCreate.heparinDispensingRateSet - onDidActiveChange: function(vState) { vTreatmentCreate.heparinDispensingRateSet = vState } - onDidChange : function(vValue) { - if ( ! _heparinDispensingRate.valid ) { vTreatmentCreate.heparinDispensingRateRejectReason = Variables.noRejectReason } - // set heparin time to clear when set OFF to value - if ( ! vTreatmentCreate.heparinDispensingRate && vValue ) { _heparinDeliveryDurationControl.clear() } +// onIsActiveChanged: { +// if ( ! vTreatmentCreate.heparinDispensingRate && isActive ) { +// vTreatmentCreate.heparinDeliveryDurationSet = true +// vTreatmentCreate.heparinDeliveryDuration = 0 +// } +// } +// } +// } - vTreatmentCreate.heparinDispensingRate = vValue +// LabelUnitContainer { id: _dialysateTemperature +// text : qsTr("Dialysate Temperature") +// unitText : Variables.unitTextTemperature +// valid : ! vTreatmentCreate.dialysateTempRejectReason - // if set to OFF set heparin stop time 0 - if ( ! vTreatmentCreate.heparinDispensingRate ) { - vTreatmentCreate.heparinDeliveryDurationSet = true - vTreatmentCreate.heparinDeliveryDuration = 0 - } - } +// contentItem : ValueAdjuster { id: _dialysateTemperatureControl +// editable : _root.editingEnabled +// minimum : vTreatmentRanges.dialysateTempMin +// maximum : vTreatmentRanges.dialysateTempMax +// step : vTreatmentRanges.dialysateTempRes +// defaultValue : vTreatmentRanges.dialysateTempDef +// value : vTreatmentCreate.dialysateTemp +// decimal : Variables.dialysateTempPrecision +// isActive : vTreatmentCreate.dialysateTempSet +// onDidActiveChange: function(vState) { vTreatmentCreate.dialysateTempSet = vState } +// onDidChange : function(vValue) { +// if ( ! _dialysateTemperature.valid ) { vTreatmentCreate.dialysateTempRejectReason = Variables.noRejectReason } +// vTreatmentCreate.dialysateTemp = vValue +// } +// } +// } - onIsActiveChanged: { - if ( ! vTreatmentCreate.heparinDispensingRate && isActive ) { - vTreatmentCreate.heparinDeliveryDurationSet = true - vTreatmentCreate.heparinDeliveryDuration = 0 - } - } - } - } +// LabelUnitContainer { id: _heparinDeliveryDuration +// text : qsTr("Heparin Delivery Duration") +// unitText : Variables.unitTextDuration +// valid : ! vTreatmentCreate.heparinDeliveryDurationRejectReason +// visible : _root.heparinFeatured - LabelUnitContainer { id: _dialysateTemperature - text : qsTr("Dialysate Temperature") - unitText : Variables.unitTextTemperature - valid : ! vTreatmentCreate.dialysateTempRejectReason +// contentItem : ValueAdjuster { id: _heparinDeliveryDurationControl +// editable : _root.editingEnabled +// minimum : vTreatmentRanges.heparinStopTimeMin +// maximum : _durationControl.value +// step : _durationControl.step +// defaultValue : _durationControl.value +// value : vTreatmentCreate.heparinDeliveryDuration +// enabled : vTreatmentCreate.heparinDispensingRate +// canOff : true +// isActive : vTreatmentCreate.heparinDeliveryDurationSet +// onDidActiveChange: function(vState) { vTreatmentCreate.heparinDeliveryDurationSet = vState } +// onDidChange : function(vValue) { +// if ( ! _heparinDeliveryDuration.valid ) { vTreatmentCreate.heparinDeliveryDurationRejectReason = Variables.noRejectReason } +// vTreatmentCreate.heparinDeliveryDuration = vValue +// } +// } +// } - contentItem : ValueAdjuster { id: _dialysateTemperatureControl - editable : _root.editingEnabled - minimum : vTreatmentRanges.dialysateTempMin - maximum : vTreatmentRanges.dialysateTempMax - step : vTreatmentRanges.dialysateTempRes - defaultValue : vTreatmentRanges.dialysateTempDef - value : vTreatmentCreate.dialysateTemp - decimal : Variables.dialysateTempPrecision - isActive : vTreatmentCreate.dialysateTempSet - onDidActiveChange: function(vState) { vTreatmentCreate.dialysateTempSet = vState } - onDidChange : function(vValue) { - if ( ! _dialysateTemperature.valid ) { vTreatmentCreate.dialysateTempRejectReason = Variables.noRejectReason } - vTreatmentCreate.dialysateTemp = vValue - } - } - } +// LabelUnitContainer { id: _fluidBolusVolume +// text : qsTr("Fluid Bolus Volume") +// unitText : Variables.unitTextFluid +// valid : ! vTreatmentCreate.fluidBolusVolumeRejectReason - LabelUnitContainer { id: _heparinDeliveryDuration - text : qsTr("Heparin Delivery Duration") - unitText : Variables.unitTextDuration - valid : ! vTreatmentCreate.heparinDeliveryDurationRejectReason - visible : _root.heparinFeatured +// contentItem : ValueAdjuster { id: _fluidBolusVolumeControl +// editable : _root.editingEnabled +// minimum : vTreatmentRanges.salineBolusVolumeMin +// maximum : vTreatmentRanges.salineBolusVolumeMax +// step : vTreatmentRanges.salineBolusVolumeRes +// defaultValue : vTreatmentRanges.salineBolusVolumeDef +// value : vTreatmentCreate.fluidBolusVolume +// isActive : vTreatmentCreate.fluidBolusVolumeSet +// onDidActiveChange: function(vState) { vTreatmentCreate.fluidBolusVolumeSet = vState } +// onDidChange : function(vValue) { +// if ( ! _fluidBolusVolume.valid ) { vTreatmentCreate.fluidBolusVolumeRejectReason = Variables.noRejectReason } +// vTreatmentCreate.fluidBolusVolume = vValue +// } +// } +// } +// } - contentItem : ValueAdjuster { id: _heparinDeliveryDurationControl - editable : _root.editingEnabled - minimum : vTreatmentRanges.heparinStopTimeMin - maximum : _durationControl.value - step : _durationControl.step - defaultValue : _durationControl.value - value : vTreatmentCreate.heparinDeliveryDuration - enabled : vTreatmentCreate.heparinDispensingRate - canOff : true - isActive : vTreatmentCreate.heparinDeliveryDurationSet - onDidActiveChange: function(vState) { vTreatmentCreate.heparinDeliveryDurationSet = vState } - onDidChange : function(vValue) { - if ( ! _heparinDeliveryDuration.valid ) { vTreatmentCreate.heparinDeliveryDurationRejectReason = Variables.noRejectReason } - vTreatmentCreate.heparinDeliveryDuration = vValue - } - } - } - - LabelUnitContainer { id: _fluidBolusVolume - text : qsTr("Fluid Bolus Volume") - unitText : Variables.unitTextFluid - valid : ! vTreatmentCreate.fluidBolusVolumeRejectReason - - contentItem : ValueAdjuster { id: _fluidBolusVolumeControl - editable : _root.editingEnabled - minimum : vTreatmentRanges.salineBolusVolumeMin - maximum : vTreatmentRanges.salineBolusVolumeMax - step : vTreatmentRanges.salineBolusVolumeRes - defaultValue : vTreatmentRanges.salineBolusVolumeDef - value : vTreatmentCreate.fluidBolusVolume - isActive : vTreatmentCreate.fluidBolusVolumeSet - onDidActiveChange: function(vState) { vTreatmentCreate.fluidBolusVolumeSet = vState } - onDidChange : function(vValue) { - if ( ! _fluidBolusVolume.valid ) { vTreatmentCreate.fluidBolusVolumeRejectReason = Variables.noRejectReason } - vTreatmentCreate.fluidBolusVolume = vValue - } - } - } - } } Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml =================================================================== diff -u -r56381aae237db191956aff493907cd1f0801216b -r4a7dd11138d2321f1ab8d324b3bd25f02eaefe84 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml (.../PreTreatmentCreatePatientPrescription.qml) (revision 56381aae237db191956aff493907cd1f0801216b) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml (.../PreTreatmentCreatePatientPrescription.qml) (revision 4a7dd11138d2321f1ab8d324b3bd25f02eaefe84) @@ -1,8 +1,25 @@ -import QtQuick 2.0 +// Qt +import QtQuick 2.15 +import QtQuick.Controls 2.15 -Rectangle { - anchors.fill: parent - color: "blue" +// Qml +import "qrc:/globals" +import "qrc:/components" +import "qrc:/compounds" + +Grid { id: _root + readonly property int cellWidth : Variables.createRxLabelUnitContainerWidth + readonly property int cellHeight : Variables.createRxLabelUnitContainerHeight + + + property bool editingEnabled : true + + flow : Grid.LeftToRight + rows : 7 + columns : 2 + rowSpacing : Variables.defaultMargin * 3 + columnSpacing : Variables.defaultMargin * 3 + } Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateTreatmentSettings.qml =================================================================== diff -u -r56381aae237db191956aff493907cd1f0801216b -r4a7dd11138d2321f1ab8d324b3bd25f02eaefe84 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateTreatmentSettings.qml (.../PreTreatmentCreateTreatmentSettings.qml) (revision 56381aae237db191956aff493907cd1f0801216b) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateTreatmentSettings.qml (.../PreTreatmentCreateTreatmentSettings.qml) (revision 4a7dd11138d2321f1ab8d324b3bd25f02eaefe84) @@ -1,7 +1,249 @@ -import QtQuick 2.0 +// Qt +import QtQuick 2.15 +import QtQuick.Controls 2.15 -Rectangle { - anchors.fill: parent - color: "red" +// Qml +import "qrc:/globals" +import "qrc:/components" +import "qrc:/compounds" + +Grid { id: _root + readonly property int cellWidth : Variables.createRxLabelUnitContainerWidth + readonly property int cellHeight : Variables.createRxLabelUnitContainerHeight + readonly property bool heparinFeatured : vSettings.heparinSyringePump + readonly property string patientID : _pretreatmentPatientIDEntry.text + property bool isHDFFeatured : vTreatmentCreate.treatmentModality === HeaderBar.Mode_HDF + + property bool editingEnabled : true + + flow : Grid.TopToBottom + rows : _root.isHDFFeatured ? 7 : 5 + columns : 2 + rowSpacing : 15 + columnSpacing : Variables.defaultMargin * 3 + + onIsHDFFeaturedChanged: { + if ( ! isHDFFeatured ) { + vTreatmentCreate.hdfTreatmentMode = 0 + vTreatmentCreate.substitutionFluidVolume = 0 + } + } + + function refreshAll () { + _subFluidVolume .refresh() + + _ufVolume .refresh() + _bloodFlowRate .refresh() + + _dialysateFlowRateControl .refresh() + _durationControl .refresh() + _heparinDispensingRateControl .refresh() + _heparinBolusVolumeControl .refresh() + _heparinDeliveryDurationControl .refresh() + _dialysateTemperatureControl .refresh() + _fluidBolusVolumeControl .refresh() + _bpMeasurementIntervalControl .refresh() + } + + function clear () { + vTreatmentCreate.patientID = "" + _hdfTreatmentModeComboBox .clear() + _subFluidVolume .clear() + + _ufVolume .clear() + _bloodFlowRate .clear() + + + _dialysateFlowRateControl .clear() + _durationControl .clear() + _heparinDispensingRateControl .clear() + _heparinBolusVolumeControl .clear() + _heparinDeliveryDurationControl .clear() + _acidConcentrateComboBox .clear() + _bicarbonateConcentrateComboBox .clear() + _dialyzerTypeComboBox .clear() + _dialysateTemperatureControl .clear() + _fluidBolusVolumeControl .clear() + _bpMeasurementIntervalControl .clear() + clearErrors() + canEdit (true) + } + + function ready () { + return _root.isHDFFeatured ? _hdfTreatmentModeComboBox .isActive && _hdfTreatmentMode.valid && + _subFluidVolume .isActive && _subFluidVolume .valid : true && + _bloodFlowRate .isActive && _bloodFlowRate .valid && + + _ufVolume .isActive && _ufVolume .valid && + + + + _dialysateFlowRateControl .isActive && _dialysateFlowRate .valid && + _durationControl .isActive && _duration .valid && + ( _root.heparinFeatured ? _heparinDispensingRateControl .isActive && _heparinDispensingRate .valid && + _heparinBolusVolumeControl .isActive && _heparinBolusVolume .valid && + _heparinDeliveryDurationControl .isActive && _heparinDeliveryDuration .valid : true ) && + _acidConcentrateComboBox .isActive && + _bicarbonateConcentrateComboBox .isActive && + _dialyzerTypeComboBox .isActive && + _dialysateTemperatureControl .isActive && _dialysateTemperature .valid && + _fluidBolusVolumeControl .isActive && _fluidBolusVolume .valid && + _bpMeasurementIntervalControl .isActive + } + + LabelUnitContainer { id: _patientID + text : qsTr("Patient ID") + contentArea.anchors.leftMargin : 120 + + 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 + enabled : _root.editingEnabled + onEditingFinished : vTreatmentCreate.patientID = text + + Text { id: _patientIDPlaceHolderText + 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 + } + } + } + + LabelUnitContainer { id: _treatmentModality + text : qsTr("Treatment Modality") + valid : ! vTreatmentCreate.treatmentModalityRejectReason + + contentItem : BaseComboBox { id: _treatmentModalityComboBox + anchors.rightMargin : Variables.defaultMargin * 2 + anchors.leftMargin : anchors.rightMargin + anchors.topMargin : Variables.defaultMargin / 2 + anchors.bottomMargin: anchors.topMargin + isActive : true // PRS-215 + enabled : _root.editingEnabled + currentIndex : vTreatmentCreate.treatmentModality + model : vTreatmentRanges.treatmentModalityOptions + + onActivated : { + if ( ! _treatmentModality.valid ) { vTreatmentCreate.treatmentModalityRejectReason = Variables.noRejectReason } + vTreatmentCreate.treatmentModality = _treatmentModalityComboBox.currentIndex + } + } + } + + LabelUnitContainer { id: _hdfTreatmentMode + text : qsTr("HDF Operating Mode") + valid : ! vTreatmentCreate.hdfTreatmentModeRejectReason + visible : _root.isHDFFeatured + + contentItem : BaseComboBox { id: _hdfTreatmentModeComboBox + anchors.rightMargin : Variables.defaultMargin * 2 + anchors.leftMargin : anchors.rightMargin + anchors.topMargin : Variables.defaultMargin / 2 + anchors.bottomMargin: anchors.topMargin + isActive : vTreatmentCreate.hdfTreatmentModeSet + enabled : _root.editingEnabled + currentIndex : vTreatmentCreate.hdfTreatmentMode + model : vTreatmentRanges.hdfTreatmentModeOptions + + onClear : vTreatmentCreate.hdfTreatmentModeSet = false + + onActivated : { + if ( ! _hdfTreatmentMode.valid ) { vTreatmentCreate.hdfTreatmentModeRejectReason = Variables.noRejectReason } + vTreatmentCreate.hdfTreatmentModeSet = true + vTreatmentCreate.hdfTreatmentMode = _hdfTreatmentModeComboBox.currentIndex + } + } + } + + LabelUnitValueAdjuster { id: _subFluidVolume + text : qsTr("Substitution Fluid Volume") + visible : _root.isHDFFeatured + width : _root.cellWidth + height : _root.cellHeight + unitText : Variables.unitVolume + valid : ! vTreatmentCreate.substitutionFluidVolumeRejectionReason + editable : _root.editingEnabled + minimum : vTreatmentRanges.substitutionVolumeMin + maximum : vTreatmentRanges.substitutionVolumeMax + step : vTreatmentRanges.substitutionVolumeRes + defaultValue : vTreatmentRanges.substitutionVolumeDef + decimal : Variables.substitutionPrecision + value : vTreatmentCreate.substitutionFluidVolume + isActive : vTreatmentCreate.substitutionFluidVolumeSet + + onDidActiveChange : function(vState) { vTreatmentCreate.substitutionFluidVolumeSet = vState } + onDidChange : function(vValue) { + if ( ! _ufVolume.valid ) { vTreatmentCreate.substitutionFluidVolumeRejectionReason = Variables.noRejectReason } + vTreatmentCreate.substitutionFluidVolume = vValue + } + } + + LabelUnitValueAdjuster { id: _bloodFlowRate + text : qsTr("Blood Flow Rate") + width : _root.cellWidth + height : _root.cellHeight + unitText : Variables.unitTextFlowRate + valid : ! vTreatmentCreate.bloodFlowRateRejectReason + editable : _root.editingEnabled + minimum : vTreatmentRanges.bloodFlowRateMin + maximum : vTreatmentRanges.bloodFlowRateMax + step : vTreatmentRanges.bloodFlowRateRes + defaultValue : vTreatmentRanges.bloodFlowRateDef + value : vTreatmentCreate.bloodFlowRate + isActive : vTreatmentCreate.bloodFlowRateSet + + onDidActiveChange : function(vState) { vTreatmentCreate.bloodFlowRateSet = vState } + onDidChange : function(vValue) { + if ( ! _bloodFlowRate.valid ) { vTreatmentCreate.bloodFlowRateRejectReason = Variables.noRejectReason } + vTreatmentCreate.bloodFlowRate = vValue + } + } + + + + LabelUnitValueAdjuster { id: _ufVolume + text : qsTr("Ultrafiltration Volume") + width : _root.cellWidth + height : _root.cellHeight + unitText : Variables.unitVolume + showEdit : true + valid : ! vTreatmentCreate.ultrafiltrationVolumeRejectionReason + editable : _root.editingEnabled + minimum : vTreatmentRanges.ultrafiltrationVolumeMin + maximum : vTreatmentRanges.ultrafiltrationVolumeMax + step : vTreatmentRanges.ultrafiltrationVolumeRes + defaultValue : vTreatmentRanges.ultrafiltrationVolumeDef + decimal : Variables.ultrafiltrationPrecision + value : vTreatmentCreate.ultrafiltrationVolume + isActive : vTreatmentCreate.ultrafiltrationVolumeSet + + onDidActiveChange : function(vState) { vTreatmentCreate.ultrafiltrationVolumeSet = vState } + onDidChange : function(vValue) { + if ( ! _ufVolume.valid ) { vTreatmentCreate.ultrafiltrationVolumeRejectionReason = Variables.noRejectReason } + vTreatmentCreate.ultrafiltrationVolume = vValue + } + } + + + + + + + + } Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp =================================================================== diff -u -r56381aae237db191956aff493907cd1f0801216b -r4a7dd11138d2321f1ab8d324b3bd25f02eaefe84 --- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp (.../MPreTreatmentAdjustParametersValidationResponse.cpp) (revision 56381aae237db191956aff493907cd1f0801216b) +++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp (.../MPreTreatmentAdjustParametersValidationResponse.cpp) (revision 4a7dd11138d2321f1ab8d324b3bd25f02eaefe84) @@ -18,29 +18,31 @@ QVariantList MAdjustParametersValidationResponse::parameters() const { return { - _data.mAccepted .value, - _data.mTreatmentModalityRejectionReason .value, - _data.mHDFTreatmentModeRejectionReason .value, - _data.mBloodFlowRateRejectionReason .value, - _data.mDialysateFlowRateRejectionReason .value, - _data.mTreatmentDurationRejectionReason .value, - _data.mHeparinDeliveryDurationRejectionReason .value, - _data.mHeparinTypeRejectionReason .value, - _data.mDryBicarbCartSizeRejectionReason .value, - _data.mSodiumRejectionReason .value, - _data.mBicarbonateRejectionReason .value, - _data.mDialyzerTypeRejectionReason .value, - _data.mFluidBolusVolumeRejectionReason .value, - _data.mBloodPressureMeasureIntervalRejectionReason .value, - _data.mPrimeDiscardVolumeRejectionReason .value, - _data.mRinsebackVolumeRejectionReason .value, - _data.mHepatitusBStatusRejectionReason .value, - _data.mSubstitutionFluidVolumeRejectionReason .value, - _data.mHeparinBolusVolumeRejectionReason .value, - _data.mHeparinDispensingRateRejectionReason .value, - _data.mDialysateTempRejectionReason .value, - _data.mPotassiumRejectionReason .value, - _data.mCalciumRejectionReason .value + _data.mAccepted .value, + _data.mTreatmentModalityRejectionReason .value, + _data.mHDFTreatmentModeRejectionReason .value, + _data.mBloodFlowRateRejectionReason .value, + _data.mDialysateFlowRateRejectionReason .value, + _data.mTreatmentDurationRejectionReason .value, + _data.mHeparinDeliveryDurationRejectionReason .value, + _data.mHeparinTypeRejectionReason .value, + _data.mDryBicarbCartSizeRejectionReason .value, + _data.mSodiumRejectionReason .value, + _data.mBicarbonateRejectionReason .value, + _data.mDialyzerTypeRejectionReason .value, + _data.mFluidBolusVolumeRejectionReason .value, + _data.mBloodPressureMeasureIntervalRejectionReason .value, + _data.mPrimeDiscardVolumeRejectionReason .value, + _data.mRinsebackVolumeRejectionReason .value, + _data.mHepatitusBStatusRejectionReason .value, + _data.mSubstitutionFluidVolumeRejectionReason .value, + _data.mHeparinBolusVolumeRejectionReason .value, + _data.mHeparinDispensingRateRejectionReason .value, + _data.mDialysateTempRejectionReason .value, + _data.mAcidConcentrateConversionFactorRejectionReason .value, + _data.mUFVolumeRejectionReason .value, + _data.mUFPreWeightRejectionReason .value, + _data.mUFEstimatedTargetWeightRejectionReason .value }; } @@ -67,8 +69,10 @@ if ( ! GetValue(vByteArray, index, _data.mHeparinBolusVolumeRejectionReason )) goto lError; if ( ! GetValue(vByteArray, index, _data.mHeparinDispensingRateRejectionReason )) goto lError; if ( ! GetValue(vByteArray, index, _data.mDialysateTempRejectionReason )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mPotassiumRejectionReason )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mCalciumRejectionReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mAcidConcentrateConversionFactorRejectionReason)) goto lError; + if ( ! GetValue(vByteArray, index, _data.mUFVolumeRejectionReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mUFPreWeightRejectionReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mUFEstimatedTargetWeightRejectionReason )) goto lError; return true ; @@ -101,7 +105,9 @@ data.mHeparinBolusVolumeRejectionReason = _data.mHeparinBolusVolumeRejectionReason .value; data.mHeparinDispensingRateRejectionReason = _data.mHeparinDispensingRateRejectionReason .value; data.mDialysateTempRejectionReason = _data.mDialysateTempRejectionReason .value; - data.mPotassiumRejectionReason = _data.mPotassiumRejectionReason .value; - data.mCalciumRejectionReason = _data.mCalciumRejectionReason .value; + data.mAcidConcentrateConversionFactorRejectionReason = _data.mAcidConcentrateConversionFactorRejectionReason .value; + data.mUFVolumeRejectionReason = _data.mUFVolumeRejectionReason .value; + data.mUFPreWeightRejectionReason = _data.mUFPreWeightRejectionReason .value; + data.mUFEstimatedTargetWeightRejectionReason = _data.mUFEstimatedTargetWeightRejectionReason .value; return data; } Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.h =================================================================== diff -u -r56381aae237db191956aff493907cd1f0801216b -r4a7dd11138d2321f1ab8d324b3bd25f02eaefe84 --- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.h (.../MPreTreatmentAdjustParametersValidationResponse.h) (revision 56381aae237db191956aff493907cd1f0801216b) +++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.h (.../MPreTreatmentAdjustParametersValidationResponse.h) (revision 4a7dd11138d2321f1ab8d324b3bd25f02eaefe84) @@ -56,8 +56,10 @@ * | #19:(U32) | \ref Data::mHeparinBolusVolumeRejectionReason | * | #20:(U32) | \ref Data::mHeparinDispensingRateRejectionReason | * | #21:(U32) | \ref Data::mDialysateTempRejectionReason | - * | #22:(U32) | \ref Data::mPotassiumRejectionReason | - * | #23:(U32) | \ref Data::mCalciumRejectionReason | + * | #22:(U32) | \ref Data::mAcidConcentrateConversionFactorRejectionReason | + * | #23:(U32) | \ref Data::mUFVolumeRejectionReason | + * | #23:(U32) | \ref Data::mUFPreWeightRejectionReason | + * | #23:(U32) | \ref Data::mUFEstimatedTargetWeightRejectionReason | * * \sa Data * @@ -76,29 +78,31 @@ QVariantList parameters() const override; struct { - Types::U32 mAccepted ; - Types::U32 mTreatmentModalityRejectionReason ; - Types::U32 mHDFTreatmentModeRejectionReason ; - Types::U32 mBloodFlowRateRejectionReason ; - Types::U32 mDialysateFlowRateRejectionReason ; - Types::U32 mTreatmentDurationRejectionReason ; - Types::U32 mHeparinDeliveryDurationRejectionReason ; - Types::U32 mHeparinTypeRejectionReason ; - Types::U32 mDryBicarbCartSizeRejectionReason ; - Types::U32 mSodiumRejectionReason ; - Types::U32 mBicarbonateRejectionReason ; - Types::U32 mDialyzerTypeRejectionReason ; - Types::U32 mFluidBolusVolumeRejectionReason ; - Types::U32 mBloodPressureMeasureIntervalRejectionReason ; - Types::U32 mPrimeDiscardVolumeRejectionReason ; - Types::U32 mRinsebackVolumeRejectionReason ; - Types::U32 mHepatitusBStatusRejectionReason ; - Types::U32 mSubstitutionFluidVolumeRejectionReason ; - Types::U32 mHeparinBolusVolumeRejectionReason ; - Types::U32 mHeparinDispensingRateRejectionReason ; - Types::U32 mDialysateTempRejectionReason ; - Types::U32 mPotassiumRejectionReason ; - Types::U32 mCalciumRejectionReason ; + Types::U32 mAccepted ; + Types::U32 mTreatmentModalityRejectionReason ; + Types::U32 mHDFTreatmentModeRejectionReason ; + Types::U32 mBloodFlowRateRejectionReason ; + Types::U32 mDialysateFlowRateRejectionReason ; + Types::U32 mTreatmentDurationRejectionReason ; + Types::U32 mHeparinDeliveryDurationRejectionReason ; + Types::U32 mHeparinTypeRejectionReason ; + Types::U32 mDryBicarbCartSizeRejectionReason ; + Types::U32 mSodiumRejectionReason ; + Types::U32 mBicarbonateRejectionReason ; + Types::U32 mDialyzerTypeRejectionReason ; + Types::U32 mFluidBolusVolumeRejectionReason ; + Types::U32 mBloodPressureMeasureIntervalRejectionReason ; + Types::U32 mPrimeDiscardVolumeRejectionReason ; + Types::U32 mRinsebackVolumeRejectionReason ; + Types::U32 mHepatitusBStatusRejectionReason ; + Types::U32 mSubstitutionFluidVolumeRejectionReason ; + Types::U32 mHeparinBolusVolumeRejectionReason ; + Types::U32 mHeparinDispensingRateRejectionReason ; + Types::U32 mDialysateTempRejectionReason ; + Types::U32 mAcidConcentrateConversionFactorRejectionReason ; + Types::U32 mUFVolumeRejectionReason ; + Types::U32 mUFPreWeightRejectionReason ; + Types::U32 mUFEstimatedTargetWeightRejectionReason ; } _data; public: @@ -129,8 +133,10 @@ quint32 mHeparinBolusVolumeRejectionReason = 0; quint32 mHeparinDispensingRateRejectionReason = 0; quint32 mDialysateTempRejectionReason = 0; - quint32 mPotassiumRejectionReason = 0; - quint32 mCalciumRejectionReason = 0; + quint32 mAcidConcentrateConversionFactorRejectionReason = 0; + quint32 mUFVolumeRejectionReason = 0; + quint32 mUFPreWeightRejectionReason = 0; + quint32 mUFEstimatedTargetWeightRejectionReason = 0; }; MAdjustParametersValidationResponse () {} Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h =================================================================== diff -u -r56381aae237db191956aff493907cd1f0801216b -r4a7dd11138d2321f1ab8d324b3bd25f02eaefe84 --- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h (.../MPreTreatmentAdjustRequests.h) (revision 56381aae237db191956aff493907cd1f0801216b) +++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h (.../MPreTreatmentAdjustRequests.h) (revision 4a7dd11138d2321f1ab8d324b3bd25f02eaefe84) @@ -121,8 +121,10 @@ float mHeparinBolusVolume = 0; // mL float mHeparinDispensingRate = 0; // mL/hr float mDialysateTemp = 0; // Celsius - float mPotassium = 0; // mEq/L - float mCalcium = 0; // mEq/L + float mAcidConcentrateConversionFactor = 0; // mEq/L + float mUFVolume = 0; // L + quint32 mUFPreWeight = 0; // kg + quint32 mUFEstimatedTargetWeight = 0; // kg QString toString() { return toString({ @@ -146,8 +148,10 @@ mHeparinBolusVolume , mHeparinDispensingRate , mDialysateTemp , - mPotassium , - mCalcium , + mAcidConcentrateConversionFactor, + mUFVolume , + mUFPreWeight , + mUFEstimatedTargetWeight , }); } static QString toString(const QVariantList &vParameters) { Index: sources/view/VTreatmentCreate.cpp =================================================================== diff -u -r56381aae237db191956aff493907cd1f0801216b -r4a7dd11138d2321f1ab8d324b3bd25f02eaefe84 --- sources/view/VTreatmentCreate.cpp (.../VTreatmentCreate.cpp) (revision 56381aae237db191956aff493907cd1f0801216b) +++ sources/view/VTreatmentCreate.cpp (.../VTreatmentCreate.cpp) (revision 4a7dd11138d2321f1ab8d324b3bd25f02eaefe84) @@ -42,28 +42,30 @@ AdjustParametersValidationRequestData data; - data.mTreatmentModality = _treatmentModality ; - data.mHDFTreatmentMode = _hdfTreatmentMode ; - data.mBloodFlowRate = _bloodFlowRate ; - data.mDialysateFlowRate = _dialysateFlowRate ; - data.mTreatmentDuration = _treatmentDuration ; - data.mHeparinDeliveryDuration = _heparinDeliveryDuration ; - data.mHeparinType = _heparinType ; - data.mDryBicarbCartSize = _dryBicarbCartSize ; - data.mSodium = _sodium ; - data.mBicarbonate = _bicarbonate ; - data.mDialyzerType = _dialyzerType ; - data.mFluidBolusVolume = _fluidBolusVolume ; - data.mBloodPressureMeasureInterval = _bloodPressureMeasureInterval ; - data.mPrimeDiscardVolume = _primeDiscardVolume ; - data.mRinsebackVolume = _rinsebackVolume ; - data.mHepatitusBStatus = _hepatitusBStatus ; - data.mSubstitutionFluidVolume = _substitutionFluidVolume ; - data.mHeparinBolusVolume = _heparinBolusVolume ; - data.mHeparinDispensingRate = _heparinDispensingRate ; - data.mDialysateTemp = _dialysateTemp ; -// data.mPotassium = _potassium ; -// data.mCalcium = _calcium ; + data.mTreatmentModality = _treatmentModality ; + data.mHDFTreatmentMode = _hdfTreatmentMode ; + data.mBloodFlowRate = _bloodFlowRate ; + data.mDialysateFlowRate = _dialysateFlowRate ; + data.mTreatmentDuration = _treatmentDuration ; + data.mHeparinDeliveryDuration = _heparinDeliveryDuration ; + data.mHeparinType = _heparinType ; + data.mDryBicarbCartSize = _dryBicarbCartSize ; + data.mSodium = _sodium ; + data.mBicarbonate = _bicarbonate ; + data.mDialyzerType = _dialyzerType ; + data.mFluidBolusVolume = _fluidBolusVolume ; + data.mBloodPressureMeasureInterval = _bloodPressureMeasureInterval ; + data.mPrimeDiscardVolume = _primeDiscardVolume ; + data.mRinsebackVolume = _rinsebackVolume ; + data.mHepatitusBStatus = _hepatitusBStatus ; + data.mSubstitutionFluidVolume = _substitutionFluidVolume ; + data.mHeparinBolusVolume = _heparinBolusVolume ; + data.mHeparinDispensingRate = _heparinDispensingRate ; + data.mDialysateTemp = _dialysateTemp ; + data.mAcidConcentrateConversionFactor = _acidConcentrateConversionFactor ; + data.mUFVolume = _ultrafiltrationVolume ; + data.mUFPreWeight = _ufPreWeight ; + data.mUFEstimatedTargetWeight = _ufEstimatedTargetWeight ; parametersConfirmed(false); parametersValidated(false); @@ -117,28 +119,30 @@ */ void VTreatmentCreate::onActionReceive(const AdjustParametersValidationResponseData &data) { if (! data.mAccepted) { - treatmentModalityRejectReason (data.mTreatmentModalityRejectionReason ); - hDFTreatmentModeRejectReason (data.mHDFTreatmentModeRejectionReason ); - bloodFlowRateRejectReason (data.mBloodFlowRateRejectionReason ); - dialysateFlowRateRejectReason (data.mDialysateFlowRateRejectionReason ); - treatmentDurationRejectReason (data.mTreatmentDurationRejectionReason ); - heparinDeliveryDurationRejectReason (data.mHeparinDeliveryDurationRejectionReason ); - heparinTypeRejectReason (data.mHeparinTypeRejectionReason ); - dryBicarbCartSizeRejectReason (data.mDryBicarbCartSizeRejectionReason ); - sodiumRejectReason (data.mSodiumRejectionReason ); - bicarbonateRejectReason (data.mBicarbonateRejectionReason ); - dialyzerTypeRejectReason (data.mDialyzerTypeRejectionReason ); - fluidBolusVolumeRejectReason (data.mFluidBolusVolumeRejectionReason ); - bloodPressureMeasureIntervalRejectReason (data.mBloodPressureMeasureIntervalRejectionReason ); - primeDiscardVolumeRejectReason (data.mPrimeDiscardVolumeRejectionReason ); - rinsebackVolumeRejectReason (data.mRinsebackVolumeRejectionReason ); - hepatitusBStatusRejectReason (data.mHepatitusBStatusRejectionReason ); - substitutionFluidVolumeRejectReason (data.mSubstitutionFluidVolumeRejectionReason ); - heparinBolusVolumeRejectReason (data.mHeparinBolusVolumeRejectionReason ); - heparinDispensingRateRejectReason (data.mHeparinDispensingRateRejectionReason ); - dialysateTempRejectReason (data.mDialysateTempRejectionReason ); - potassiumRejectReason (data.mPotassiumRejectionReason ); - calciumRejectReason (data.mCalciumRejectionReason ); + treatmentModalityRejectReason (data.mTreatmentModalityRejectionReason ); + hDFTreatmentModeRejectReason (data.mHDFTreatmentModeRejectionReason ); + bloodFlowRateRejectReason (data.mBloodFlowRateRejectionReason ); + dialysateFlowRateRejectReason (data.mDialysateFlowRateRejectionReason ); + treatmentDurationRejectReason (data.mTreatmentDurationRejectionReason ); + heparinDeliveryDurationRejectReason (data.mHeparinDeliveryDurationRejectionReason ); + heparinTypeRejectReason (data.mHeparinTypeRejectionReason ); + dryBicarbCartSizeRejectReason (data.mDryBicarbCartSizeRejectionReason ); + sodiumRejectReason (data.mSodiumRejectionReason ); + bicarbonateRejectReason (data.mBicarbonateRejectionReason ); + dialyzerTypeRejectReason (data.mDialyzerTypeRejectionReason ); + fluidBolusVolumeRejectReason (data.mFluidBolusVolumeRejectionReason ); + bloodPressureMeasureIntervalRejectReason (data.mBloodPressureMeasureIntervalRejectionReason ); + primeDiscardVolumeRejectReason (data.mPrimeDiscardVolumeRejectionReason ); + rinsebackVolumeRejectReason (data.mRinsebackVolumeRejectionReason ); + hepatitusBStatusRejectReason (data.mHepatitusBStatusRejectionReason ); + substitutionFluidVolumeRejectReason (data.mSubstitutionFluidVolumeRejectionReason ); + heparinBolusVolumeRejectReason (data.mHeparinBolusVolumeRejectionReason ); + heparinDispensingRateRejectReason (data.mHeparinDispensingRateRejectionReason ); + dialysateTempRejectReason (data.mDialysateTempRejectionReason ); + acidConcentrateConversionFactorRejectionReason (data.mAcidConcentrateConversionFactorRejectionReason ); + ufVolumeRejectionReason (data.mUFVolumeRejectionReason ); + ufPreWeightRejectionReason (data.mUFPreWeightRejectionReason ); + ufEstimatedTargetWeightRejectionReason (data.mUFEstimatedTargetWeightRejectionReason ); parametersValidated(false); } Index: sources/view/VTreatmentCreate.h =================================================================== diff -u -r56381aae237db191956aff493907cd1f0801216b -r4a7dd11138d2321f1ab8d324b3bd25f02eaefe84 --- sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision 56381aae237db191956aff493907cd1f0801216b) +++ sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision 4a7dd11138d2321f1ab8d324b3bd25f02eaefe84) @@ -100,43 +100,44 @@ VALUESET(float , heparinDispensingRate , 0) VALUESET(float , dialysateTemp , 0) VALUESET(float , acidConcentrateConversionFactor , 0) + VALUESET(float , ultrafiltrationVolume , 0) + VALUESET(quint32 , ufPreWeight , 0) + VALUESET(quint32 , ufEstimatedTargetWeight , 0) VALUESET(quint32 , acidConcentrate , 0) VALUESET(QString , patientID ,"") VALUESET(bool , parametersValidated , 0) VALUESET(bool , parametersConfirmed , 0) - VALUESET(qint32 , dryBicabCartridgeSize , 0) - VALUESET(qint32 , bicarbFinalDialysateComposition , 0) - VALUESET(qint32 , sodiumFinalDialysateComposition , 0) - VALUESET(qint32 , actualRORejectionPercentage , 0) + VALUESET(qint32 , actualRORejectionPercentage , 0) // TODO comes from FP Update Later - PROPERTY(QString , txCode ,"") - TRIGGER(quint32 , treatmentModalityRejectReason , 0) - TRIGGER(quint32 , hDFTreatmentModeRejectReason , 0) - TRIGGER(quint32 , bloodFlowRateRejectReason , 0) - TRIGGER(quint32 , dialysateFlowRateRejectReason , 0) - TRIGGER(quint32 , treatmentDurationRejectReason , 0) - TRIGGER(quint32 , heparinDeliveryDurationRejectReason , 0) - TRIGGER(quint32 , heparinTypeRejectReason , 0) - TRIGGER(quint32 , dryBicarbCartSizeRejectReason , 0) - TRIGGER(quint32 , sodiumRejectReason , 0) - TRIGGER(quint32 , bicarbonateRejectReason , 0) - TRIGGER(quint32 , dialyzerTypeRejectReason , 0) - TRIGGER(quint32 , fluidBolusVolumeRejectReason , 0) - TRIGGER(quint32 , bloodPressureMeasureIntervalRejectReason , 0) - TRIGGER(quint32 , primeDiscardVolumeRejectReason , 0) - TRIGGER(quint32 , rinsebackVolumeRejectReason , 0) - TRIGGER(quint32 , hepatitusBStatusRejectReason , 0) - TRIGGER(quint32 , substitutionFluidVolumeRejectReason , 0) - TRIGGER(quint32 , heparinBolusVolumeRejectReason , 0) - TRIGGER(quint32 , heparinDispensingRateRejectReason , 0) - TRIGGER(quint32 , dialysateTempRejectReason , 0) - TRIGGER(quint32 , potassiumRejectReason , 0) - TRIGGER(quint32 , calciumRejectReason , 0) + TRIGGER(quint32 , treatmentModalityRejectReason , 0) + TRIGGER(quint32 , hDFTreatmentModeRejectReason , 0) + TRIGGER(quint32 , bloodFlowRateRejectReason , 0) + TRIGGER(quint32 , dialysateFlowRateRejectReason , 0) + TRIGGER(quint32 , treatmentDurationRejectReason , 0) + TRIGGER(quint32 , heparinDeliveryDurationRejectReason , 0) + TRIGGER(quint32 , heparinTypeRejectReason , 0) + TRIGGER(quint32 , dryBicarbCartSizeRejectReason , 0) + TRIGGER(quint32 , sodiumRejectReason , 0) + TRIGGER(quint32 , bicarbonateRejectReason , 0) + TRIGGER(quint32 , dialyzerTypeRejectReason , 0) + TRIGGER(quint32 , fluidBolusVolumeRejectReason , 0) + TRIGGER(quint32 , bloodPressureMeasureIntervalRejectReason , 0) + TRIGGER(quint32 , primeDiscardVolumeRejectReason , 0) + TRIGGER(quint32 , rinsebackVolumeRejectReason , 0) + TRIGGER(quint32 , hepatitusBStatusRejectReason , 0) + TRIGGER(quint32 , substitutionFluidVolumeRejectReason , 0) + TRIGGER(quint32 , heparinBolusVolumeRejectReason , 0) + TRIGGER(quint32 , heparinDispensingRateRejectReason , 0) + TRIGGER(quint32 , dialysateTempRejectReason , 0) + TRIGGER(quint32 , acidConcentrateConversionFactorRejectionReason , 0) + TRIGGER(quint32 , ufVolumeRejectionReason , 0) + TRIGGER(quint32 , ufPreWeightRejectionReason , 0) + TRIGGER(quint32 , ufEstimatedTargetWeightRejectionReason , 0) VIEW_DEC_CLASS(VTreatmentCreate) VIEW_DEC_SLOT(AdjustParametersValidationResponseData)