Index: leahi.qrc
===================================================================
diff -u -r1164ea502e3fabdb55aa41923e0e566505f197ef -ref583f0056a0fb8c66a64e132be159719b2bc2f6
--- leahi.qrc (.../leahi.qrc) (revision 1164ea502e3fabdb55aa41923e0e566505f197ef)
+++ leahi.qrc (.../leahi.qrc) (revision ef583f0056a0fb8c66a64e132be159719b2bc2f6)
@@ -53,6 +53,12 @@
sources/gui/qml/dialogs/headerbar/HeaderbarPrescription.qml
sources/gui/qml/dialogs/headerbar/HeaderbarInformation.qml
+
+ sources/gui/qml/dialogs/watersample/WaterSampleDialog.qml
+ sources/gui/qml/dialogs/watersample/WaterSampleBase.qml
+ sources/gui/qml/dialogs/watersample/WaterSamplePage.qml
+ sources/gui/qml/dialogs/watersample/WaterSampleDialysatePage.qml
+
resources/images/Logo d.png
resources/images/Logo DialityT.png
@@ -112,6 +118,7 @@
resources/images/Volume.png
resources/images/water_sample_fail.png
resources/images/water_sample_pass.png
+ resources/images/water_sample.png
sources/gui/qml/components/MainMenu.qml
@@ -252,11 +259,9 @@
sources/gui/qml/pages/pretreatment/PreTreatmentBase.qml
sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml
- sources/gui/qml/pages/pretreatment/PreTreatmentWaterSample.qml
sources/gui/qml/pages/pretreatment/PreTreatmentSelfTests.qml
sources/gui/qml/pages/pretreatment/PreTreatmentPrime.qml
sources/gui/qml/pages/pretreatment/PreTreatmentInstallStack.qml
- sources/gui/qml/pages/pretreatment/PreTreatmentUltrafiltration.qml
sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml
Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -rd9993ef9458e1c25abc86a63d4d10b666ff8cd2c -ref583f0056a0fb8c66a64e132be159719b2bc2f6
--- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision d9993ef9458e1c25abc86a63d4d10b666ff8cd2c)
+++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision ef583f0056a0fb8c66a64e132be159719b2bc2f6)
@@ -167,7 +167,7 @@
ID_DGFilterFlushData = 0x600F, // ?? //// ----- @CRAPIZED: had to change to avoid duplication
ID_AdjustWaterSampleReq = 0x5D00, // 93
ID_AdjustWaterSampleRsp = 0x5E00, // 94
- ID_AdjustWaterSampleResultReq = 0x5F0F, // 95 //// ----- @CRAPIZED: had to change to avoid duplication
+ ID_AdjustWaterSampleResultReq = 0XA900,
// Pre-Treatment Consumables Installation Confirm
ID_AdjustConsumablesConfirmReq = 0x6800, // 104 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response
// Pre-Treatment SelfTest NoCartridge Progress Data
Index: sources/gui/qml/components/HeaderBar.qml
===================================================================
diff -u -rf0e262920199d1d5ebdbe3f1bf0c58c58a82d363 -ref583f0056a0fb8c66a64e132be159719b2bc2f6
--- sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision f0e262920199d1d5ebdbe3f1bf0c58c58a82d363)
+++ sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision ef583f0056a0fb8c66a64e132be159719b2bc2f6)
@@ -165,6 +165,14 @@
onPressed : _endTreatmentDialog.open()
}
+ IconButton { id : _waterSample
+ iconSize : Variables.headerIconDiameter
+ iconImageSource : "qrc:/images/iWaterSample"
+ extraSpace : _headerButtonRow.spacing
+
+ onPressed : _headerbarWaterSampleDialysate.open()
+ }
+
IconButton { id : _prescriptionButton
iconSize : Variables.headerIconDiameter
iconImageSource : "qrc:/images/iPrescription"
Index: sources/gui/qml/components/NotificationBarSmall.qml
===================================================================
diff -u -r6084f7bd48dc98616b4a5e0d076c2d03330001db -ref583f0056a0fb8c66a64e132be159719b2bc2f6
--- sources/gui/qml/components/NotificationBarSmall.qml (.../NotificationBarSmall.qml) (revision 6084f7bd48dc98616b4a5e0d076c2d03330001db)
+++ sources/gui/qml/components/NotificationBarSmall.qml (.../NotificationBarSmall.qml) (revision ef583f0056a0fb8c66a64e132be159719b2bc2f6)
@@ -39,6 +39,7 @@
property alias textfontSize : _text.font.pixelSize
property alias textfontWeight : _text.font.weight
property alias rowAnchors : _row.anchors
+ property int contentWidth : _row.implicitWidth
property int level : 0
Index: sources/gui/qml/dialogs/watersample/WaterSampleBase.qml
===================================================================
diff -u
--- sources/gui/qml/dialogs/watersample/WaterSampleBase.qml (revision 0)
+++ sources/gui/qml/dialogs/watersample/WaterSampleBase.qml (revision ef583f0056a0fb8c66a64e132be159719b2bc2f6)
@@ -0,0 +1,30 @@
+// Qt
+import QtQuick 2.12
+
+// Project
+// Qml imports
+import "qrc:/globals"
+import "qrc:/components"
+import "qrc:/pages"
+
+
+Item { id: _root
+ property Item contentItem : null
+ property alias contentArea : _contentArea
+ property int spacing : Variables.defaultMargin * 2
+
+ ContentArea { id : _contentArea
+ anchors {
+ top : _root.top
+ topMargin : Variables.mainMenuHeight + _root.spacing
+ left : _root.left
+ leftMargin : _root.spacing * 2
+ right : _root.right
+ rightMargin : _root.spacing * 2
+ bottom : _root.bottom
+ bottomMargin: _root.spacing
+ }
+
+ contentItem: _root.contentItem
+ }
+}
Index: sources/gui/qml/dialogs/watersample/WaterSampleDialog.qml
===================================================================
diff -u
--- sources/gui/qml/dialogs/watersample/WaterSampleDialog.qml (revision 0)
+++ sources/gui/qml/dialogs/watersample/WaterSampleDialog.qml (revision ef583f0056a0fb8c66a64e132be159719b2bc2f6)
@@ -0,0 +1,73 @@
+/*!
+ *
+ * Copyright (c) 2025-2026 Diality Inc. - All Rights Reserved.
+ * \copyright
+ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+ *
+ * \file WaterSampleDialog.qml
+ * \author (last) Nico Ramirez
+ * \date (last) 10-Feb-2026
+ * \author (original) Nico Ramirez
+ * \date (original) 10-Feb-2026
+ *
+ */
+
+// Qt
+import QtQuick 2.12
+
+// Project
+// Qml imports
+import "qrc:/globals"
+import "qrc:/components"
+
+ModalDialog { id: _root
+
+ width : Variables.dialogWidth
+ height : Variables.dialogHeight
+ clip : true
+
+ enum Page {
+ WaterSample ,
+ Dialysate
+ }
+
+ WaterSamplePage { id: _waterSample; visible : _menu.index === WaterSampleDialog.WaterSample; }
+ WaterSampleDialysatePage { id: _dialysateChecks; visible : _menu.index === WaterSampleDialog.Dialysate; }
+
+ MainMenu { id: _menu
+ anchors {
+ top : parent.top
+ left : parent.left
+ leftMargin : Variables.defaultMargin * 4
+ right : parent.right
+ rightMargin : Variables.defaultMargin * 4
+ }
+
+ width : _root.width
+ color : Colors.transparent
+ titlePixelSize : 30
+ model : _model
+
+ ListModel { id: _model
+ ListElement { text: qsTr("Water Sample") ; visible: true }
+ ListElement { text: qsTr("Dialysate Checks") ; visible: true }
+ }
+
+ Line {
+ anchors {
+ bottom : parent.bottom
+ right : parent.right
+ left : parent.left
+ }
+
+ color : Colors.panelBorderColor
+ }
+ }
+
+ CloseButton { id : _closeButton
+ onClicked : {
+ _root.close()
+ }
+ }
+}
Index: sources/gui/qml/dialogs/watersample/WaterSampleDialysatePage.qml
===================================================================
diff -u
--- sources/gui/qml/dialogs/watersample/WaterSampleDialysatePage.qml (revision 0)
+++ sources/gui/qml/dialogs/watersample/WaterSampleDialysatePage.qml (revision ef583f0056a0fb8c66a64e132be159719b2bc2f6)
@@ -0,0 +1,70 @@
+
+// Qt
+import QtQuick 2.15
+
+// Qml imports
+import "qrc:/globals"
+import "qrc:/components"
+import "qrc:/compounds"
+
+WaterSampleBase { id: _root
+ anchors.fill: parent
+
+ contentItem : Row { id: _content
+ spacing : Variables.defaultMargin * 2
+
+ readonly property int cellWidth : width / 2 - ( spacing / 2 ) // 2 items for the row and subtract spacing for widths
+
+
+ Column { id: _leftColumn
+ spacing : 10
+
+ 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: _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
+ }
+ }
+ }
+
+ Column { id: _rightColumn
+ spacing : 10
+
+ 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
+ }
+ }
+ }
+
+ }
+}
Index: sources/gui/qml/dialogs/watersample/WaterSamplePage.qml
===================================================================
diff -u
--- sources/gui/qml/dialogs/watersample/WaterSamplePage.qml (revision 0)
+++ sources/gui/qml/dialogs/watersample/WaterSamplePage.qml (revision ef583f0056a0fb8c66a64e132be159719b2bc2f6)
@@ -0,0 +1,200 @@
+
+// Qt
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+
+// Qml imports
+import "qrc:/globals"
+import "qrc:/components"
+
+WaterSampleBase { id: _root
+ anchors.fill: parent
+
+ property int attempt: 1
+
+ component WaterSampleRadioButton: RadioButton { id: _waterSampleRadioButton
+ property alias imageSource : _resultImage.source
+
+ indicator: Rectangle { id: _indicator
+ width : 35
+ height : 35
+ radius : 35
+ border.width: 2
+ border.color: Colors.backgroundMainMenu
+ anchors.verticalCenter: parent.verticalCenter
+
+ Rectangle {
+ anchors.centerIn: parent
+ width : 25
+ height : 25
+ radius : 25
+ color : _waterSampleRadioButton.checked ? Colors.highlightProgressBar: Colors.backgroundMainMenu
+ visible : _waterSampleRadioButton.checked
+ }
+ }
+
+ contentItem: Row { id: _row
+ spacing : _waterSampleRadioButton.spacing
+ leftPadding : 70
+ anchors.verticalCenter: parent.verticalCenter
+
+ Image { id: _resultImage }
+
+ Text { id: _text
+ text : _waterSampleRadioButton.text
+ font.pixelSize : Fonts.fontPixelInstructionStep
+ color : Colors.backgroundMainMenu
+ verticalAlignment : Text.AlignVCenter
+ height : _row.height
+ width : _text.implicitWidth
+ }
+ }
+ }
+
+ contentItem : Rectangle { id: _content
+ color : Colors.offWhite
+ radius : Variables.alarmDialogRadius
+ clip : true
+
+ Text { id: _title
+ anchors {
+ left : parent.left
+ leftMargin : Variables.defaultMargin * 3 // with current resolution this makes the screen look nice
+ top : parent.top
+ topMargin : Variables.defaultMargin * 2 // with current resolution this makes the screen look nice
+ }
+ text : qsTr("Test Primary Carbon Filter")
+ height : Variables.contentHeight
+ color : Colors.backgroundMainMenu
+ font.pixelSize : Fonts.fontPixelInstructionTitle
+ font.weight : Font.Medium
+ }
+
+ Item { id: _infoItem
+ anchors {
+ left : _title.left
+ top : _title.bottom
+ topMargin : Variables.defaultMargin * 2
+ }
+ height : Variables.contentHeight
+ width : _infoNotificationBar.contentWidth
+
+ NotificationBarSmall { id: _infoNotificationBar
+ color : "transparent"
+ imageSource : "qrc:/images/iHelp"
+ imageVisible : true
+ text : qsTr("Test the carbon filters per your clinic's instructions")
+ textColor : "#595959"
+ imageDiameter : 25
+ imageTopMargin : 3
+ }
+ }
+
+ Item { id: _instructionContainer
+ anchors {
+ right : _content.right
+ left : _title.left
+ top : _infoItem.bottom
+ bottom : _content.bottom
+ }
+
+ Item { id: _instruction
+ width : _instructionContainer.width
+ height : Variables.instructionHeight
+
+ Rectangle { id: _attemptRect
+ anchors.left : parent.left
+ anchors.verticalCenter : parent.verticalCenter
+
+ height : 50
+ width : height
+ radius : height
+ color : Colors.backgroundMainMenu
+
+ Text { id: _attemptNumberRect
+ anchors.centerIn: parent
+ text : _root.attempt
+ color : Colors.white
+ font.pixelSize : 28
+ font.weight : Font.Medium
+ }
+ }
+
+ Text { id: _message
+ anchors {
+ left : _attemptRect.right
+ leftMargin : Variables.defaultMargin * 2 // with current resolution this makes the screen look nice
+ right : parent.right
+ verticalCenter : parent.verticalCenter
+ }
+ text : qsTr("Test the primary carbon filter and select the result below")
+ font.weight : Font.Medium
+ color : "#18559E"
+ wrapMode : Text.WordWrap
+ font.pixelSize : Fonts.fontPixelInstructionStep
+ }
+ }
+
+ Column {
+ anchors {
+ left : parent.left
+ leftMargin : Variables.defaultMargin * 6
+ top : _instruction.bottom
+ topMargin : Variables.defaultMargin
+ }
+ spacing: Variables.defaultMargin * 3
+
+ ButtonGroup { id: _radioGroup }
+
+ WaterSampleRadioButton { id: _failContainer
+ text: ("%1 > %2 %3") .arg(qsTr("Chlorine level"))
+ .arg(Variables.chlorineLevel)
+ .arg(Variables.unitTextChlorine)
+ ButtonGroup.group : _radioGroup
+ spacing : Variables.defaultMargin
+ imageSource : "qrc:/images/iWaterSampleFail"
+ }
+
+ WaterSampleRadioButton { id: _passContainer
+ text: ("%1 ≤ %2 %3").arg(qsTr("Chlorine level"))
+ .arg(Variables.chlorineLevel)
+ .arg(Variables.unitTextChlorine)
+ ButtonGroup.group: _radioGroup
+ spacing : Variables.defaultMargin
+ imageSource : "qrc:/images/iWaterSamplePass"
+ }
+ }
+
+ Image { id: _image
+ anchors.right : parent.right
+// source : "qrc:/images/iRedCrossWCircle" // TODO get actual image
+ }
+ }
+
+ ConfirmButton { id : _confirmButton
+ objectName : "_confirmButton"
+ anchors {
+ top : undefined
+ right : undefined
+ bottom : parent.bottom
+ horizontalCenter: parent.horizontalCenter
+ }
+ enabled : _failContainer.checked || _passContainer.checked
+
+ onClicked : vPreTreatmentAdjustmentWaterSample.doResult( _passContainer.checked )
+ }
+ }
+
+ // TODO water sample
+// Connections { target: vPreTreatmentAdjustmentWaterSample
+// function onAdjustmentTriggered ( vValue ) {
+// if ( vPreTreatmentAdjustmentWaterSample.adjustment_Accepted ) {
+// _pretreatmentWaterSample.reasonText = ""
+// page ( _pretreatmentCreate )
+// } else {
+// _pretreatmentWaterSample.reasonText = vPreTreatmentAdjustmentWaterSample.text()
+// }
+// }
+// }
+
+}
Index: sources/gui/qml/main.qml
===================================================================
diff -u -rf0e262920199d1d5ebdbe3f1bf0c58c58a82d363 -ref583f0056a0fb8c66a64e132be159719b2bc2f6
--- sources/gui/qml/main.qml (.../main.qml) (revision f0e262920199d1d5ebdbe3f1bf0c58c58a82d363)
+++ sources/gui/qml/main.qml (.../main.qml) (revision ef583f0056a0fb8c66a64e132be159719b2bc2f6)
@@ -165,6 +165,7 @@
import "qrc:/dialogs"
import "qrc:/dialogs/diagnostics"
import "qrc:/dialogs/headerbar"
+import "qrc:/dialogs/watersample"
/*!
* \brief Initialization and start point of the QML
@@ -395,19 +396,20 @@
KeyboardItem { id: _keyboard }
// Dialogs
- AcidConcentrateAdjustment { id: _acidConcentrateAdjustment }
- HeaderbarPrescription { id: _headerbarPrescription }
- HeaderbarWiFi { id: _headerbarWifi }
- HeaderbarSettings { id: _headerbarSettings }
- HeaderbarInformation { id: _headerbarInformation }
- TreatmentAdjustmentVitals { id: _treatmentAdjustmentVitals }
- EndTreatmentDialog { id: _endTreatmentDialog }
+ AcidConcentrateAdjustment { id: _acidConcentrateAdjustment }
+ HeaderbarPrescription { id: _headerbarPrescription }
+ HeaderbarWiFi { id: _headerbarWifi }
+ HeaderbarSettings { id: _headerbarSettings }
+ HeaderbarInformation { id: _headerbarInformation }
+ WaterSampleDialog { id: _headerbarWaterSampleDialysate }
+ TreatmentAdjustmentVitals { id: _treatmentAdjustmentVitals }
+ EndTreatmentDialog { id: _endTreatmentDialog }
- LockDialog { id: _lockDialog }
- AlarmItem { id: _alarmItem ; z: 996 }
- PowerItem { id: _powerItem ; z: 997 }
- ConfirmDialog { id: _confirmDialog ; z: 998 }
- DiagnosticsDialog { id: _diagnosticsDialog; z: 999 }
+ LockDialog { id: _lockDialog }
+ AlarmItem { id: _alarmItem ; z: 996 }
+ PowerItem { id: _powerItem ; z: 997 }
+ ConfirmDialog { id: _confirmDialog ; z: 998 }
+ DiagnosticsDialog { id: _diagnosticsDialog; z: 999 }
// Note: NotificationBar has to be anchored to the main menu and if it is moved into the AlarmItem
// then cannot be anchored.
Index: sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml
===================================================================
diff -u -ra7aab61ca63538c37b6931c60252680fc2ec2416 -ref583f0056a0fb8c66a64e132be159719b2bc2f6
--- sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml (.../PreTreatmentStack.qml) (revision a7aab61ca63538c37b6931c60252680fc2ec2416)
+++ sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml (.../PreTreatmentStack.qml) (revision ef583f0056a0fb8c66a64e132be159719b2bc2f6)
@@ -36,9 +36,7 @@
SelfTests ,
Saline ,
Prime ,
- WaterSample ,
CreateRx ,
- DialysateUF ,
Connect
}
@@ -48,9 +46,6 @@
readonly property bool isInstall : stepKeys[_root.stackStepIndex] === PreTreatmentStack.Step.Installation
readonly property bool isCreateRx : stepKeys[_root.stackStepIndex] === PreTreatmentStack.Step.CreateRx
- // TODO testing defeature... update later
- property bool enableWaterSample : true
-
onVisibleChanged: {
if (visible) {
rebuildMap()
@@ -87,18 +82,9 @@
keys.push(PreTreatmentStack.Step.Prime)
values.push(qsTr("Prime"))
- // TODO update to defeature later.. testing for science 🧪🔬
- if (_root.enableWaterSample) {
- keys.push(PreTreatmentStack.Step.WaterSample)
- values.push(qsTr("Water Sample"))
- }
-
keys.push(PreTreatmentStack.Step.CreateRx)
values.push(qsTr("Rx"))
- keys.push(PreTreatmentStack.Step.DialysateUF)
- values.push(qsTr("UF/Dialysate"))
-
keys.push(PreTreatmentStack.Step.Connect)
values.push(qsTr("Connect"))
@@ -119,7 +105,6 @@
case PreTreatmentStack.Step.Installation:
if ( vSettings.advancedMode ) { vPreTreatmentAdjustmentDisposablesConfirm.doConfirm() }
else { _pretreatmentInstallation.continueClicked() }
-
break
case PreTreatmentStack.Step.SelfTests:
page ( _pretreatmentSaline )
@@ -129,22 +114,12 @@
break
case PreTreatmentStack.Step.Prime:
if ( _pretreatmentPrime.timeCircleProgressValue === 0 ) { vPreTreatmentAdjustmentDisposablesPrime.doPrime(); }
-
- if ( enableWaterSample ) { page ( _pretreatmentWaterSample ) }
- else { page ( _pretreatmentCreate ) }
+ page ( _pretreatmentCreate )
break
- case PreTreatmentStack.Step.WaterSample:
- vPreTreatmentAdjustmentWaterSample.doResult( _pretreatmentWaterSample.result )
- page ( _pretreatmentCreate ) // TODO remove when implementing messaging
- break
case PreTreatmentStack.Step.CreateRx:
_pretreatmentCreate.confirmButtonClicked()
- if ( vTreatmentCreate.parametersValidated ) { page ( _pretreatmentDialysateUf ) }
+ if ( vTreatmentCreate.parametersValidated ) { page ( _pretreatmentConnect ) }
break
- case PreTreatmentStack.Step.DialysateUF:
- vPreTreatmentAdjustmentUltrafiltrationInit.doAdjustment(_pretreatmentDialysateUf.ufVolume)
- page ( _pretreatmentConnect ) // TODO remove when implementing messaging
- break
case PreTreatmentStack.Step.Connect:
vPreTreatmentAdjustmentStartTreatment.doStart()
break
@@ -201,8 +176,6 @@
// return _pretreatmentSelfTests.isComplete
// case PreTreatmentStack.Step.Prime:
// return _pretreatmentPrime.isComplete
- case PreTreatmentStack.Step.WaterSample:
- return _pretreatmentWaterSample.confirmEnabled
case PreTreatmentStack.Step.CreateRx:
return _pretreatmentCreate.confirmReady()
default:
@@ -261,18 +234,10 @@
onVisibleChanged : if (visible) { _root.stackStepIndex = stepKeys.indexOf(PreTreatmentStack.Step.Prime); }
}
- PreTreatmentWaterSample { id: _pretreatmentWaterSample
- onVisibleChanged : if (visible) { _root.stackStepIndex = stepKeys.indexOf(PreTreatmentStack.Step.WaterSample); }
- }
-
PreTreatmentCreate { id: _pretreatmentCreate
onVisibleChanged : if (visible) { _root.stackStepIndex = stepKeys.indexOf(PreTreatmentStack.Step.CreateRx) }
}
- PreTreatmentUltrafiltration { id: _pretreatmentDialysateUf
- onVisibleChanged : if (visible) { _root.stackStepIndex = stepKeys.indexOf(PreTreatmentStack.Step.DialysateUF); }
- }
-
PreTreatmentBase { id: _pretreatmentConnect
instructionBased : true
onVisibleChanged : if (visible) { _root.stackStepIndex = stepKeys.indexOf(PreTreatmentStack.Step.Connect); updateModel() }
@@ -302,34 +267,21 @@
}
}
- // water sample
- Connections { target: vPreTreatmentAdjustmentWaterSample
- function onAdjustmentTriggered ( vValue ) {
- if ( vPreTreatmentAdjustmentWaterSample.adjustment_Accepted ) {
- _pretreatmentWaterSample.reasonText = ""
- page ( _pretreatmentCreate )
- } else {
- _pretreatmentWaterSample.reasonText = vPreTreatmentAdjustmentWaterSample.text()
- }
- }
- }
+ // TODO - keep for now Ultrafiltration is beingn moved into Create Rx
+// Connections { target: vPreTreatmentAdjustmentUltrafiltrationInit
+// function onAdjustmentTriggered ( vValue ) {
+// // the maximum ultrafiltration volume has to be set/revert regardless
+// vTreatmentUltrafiltration.maximum = vPreTreatmentAdjustmentUltrafiltrationInit.volume
- // Ultrafiltration
- Connections { target: vPreTreatmentAdjustmentUltrafiltrationInit
- function onAdjustmentTriggered ( vValue ) {
- // the maximum ultrafiltration volume has to be set/revert regardless
- vTreatmentUltrafiltration.maximum = vPreTreatmentAdjustmentUltrafiltrationInit.volume
+// // but only if it has been accepted it will navigate
+// if ( vPreTreatmentAdjustmentUltrafiltrationInit.adjustment_Accepted ) {
+// }
+// else {
+// _pretreatmentDialysateUf.reasonText = vPreTreatmentAdjustmentUltrafiltrationInit.text()
+// }
+// }
+// }
- // but only if it has been accepted it will navigate
- if ( vPreTreatmentAdjustmentUltrafiltrationInit.adjustment_Accepted ) {
- page( _pretreatmentConnect )
- }
- else {
- _pretreatmentDialysateUf.reasonText = vPreTreatmentAdjustmentUltrafiltrationInit.text()
- }
- }
- }
-
// start treatment
Connections { target: vPreTreatmentAdjustmentStartTreatment
function onAdjustmentTriggered ( vValue ) {
Fisheye: Tag ef583f0056a0fb8c66a64e132be159719b2bc2f6 refers to a dead (removed) revision in file `sources/gui/qml/pages/pretreatment/PreTreatmentUltrafiltration.qml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag ef583f0056a0fb8c66a64e132be159719b2bc2f6 refers to a dead (removed) revision in file `sources/gui/qml/pages/pretreatment/PreTreatmentWaterSample.qml'.
Fisheye: No comparison available. Pass `N' to diff?
Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h
===================================================================
diff -u -r4035fe64301494f2e1b5c9811e55efa2c6c55aa1 -ref583f0056a0fb8c66a64e132be159719b2bc2f6
--- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h (.../MPreTreatmentAdjustRequests.h) (revision 4035fe64301494f2e1b5c9811e55efa2c6c55aa1)
+++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h (.../MPreTreatmentAdjustRequests.h) (revision ef583f0056a0fb8c66a64e132be159719b2bc2f6)
@@ -207,7 +207,7 @@
*
* | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description |
* |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:---------------------------:|
- * |0x5F00| 0x100 | 9 | Req | Y | UI | HD | Water Sample Result Request |
+ * |0xA900| 0x100 | 9 | Req | Y | UI | TD | Water Sample Result Request |
*
* | Payload ||
* | ||