Index: leahi.qrc
===================================================================
diff -u -r8302a9d68a896a5b2694d69818aecbc33061cd49 -r600b6707b102919d981f3b1d18611834e23eae60
--- leahi.qrc (.../leahi.qrc) (revision 8302a9d68a896a5b2694d69818aecbc33061cd49)
+++ leahi.qrc (.../leahi.qrc) (revision 600b6707b102919d981f3b1d18611834e23eae60)
@@ -300,7 +300,7 @@
sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentIsolatedUFConfirm.qml
sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml
sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitalsInterval.qml
- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentMode.qml
+ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentHDF.qml
sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml
Index: sources/gui/qml/pages/treatment/TreatmentHDF.qml
===================================================================
diff -u -rba86bcba8047d424b5b0f617d7297f2349b0d975 -r600b6707b102919d981f3b1d18611834e23eae60
--- sources/gui/qml/pages/treatment/TreatmentHDF.qml (.../TreatmentHDF.qml) (revision ba86bcba8047d424b5b0f617d7297f2349b0d975)
+++ sources/gui/qml/pages/treatment/TreatmentHDF.qml (.../TreatmentHDF.qml) (revision 600b6707b102919d981f3b1d18611834e23eae60)
@@ -29,7 +29,7 @@
readonly property color statusColor : Colors.statusActive
signal sectionPressuresClicked()
- signal treatmentModeEditClicked()
+ signal treatmentHDFEditClicked()
// onStatusColorChanged: TODO update to this
Component.onCompleted : vListModel.setHeaderbarStatusColor(HeaderBar.HDF, _root.statusColor.toString())
@@ -91,9 +91,9 @@
height : _column.cellHeight
statusColor : _root.statusColor
- onSubstitutionFlowClicked: print ("Substitution Flow Clicked")
+ onSubstitutionFlowClicked : print ("Substitution Flow Clicked")
- onTreatmentModeEditClicked: _root.treatmentModeEditClicked()
+ onEditClicked : _root.treatmentHDFEditClicked()
}
}
}
Index: sources/gui/qml/pages/treatment/TreatmentStack.qml
===================================================================
diff -u -r70d690fd679722b8b1bd8e2872f15b1e11e868d2 -r600b6707b102919d981f3b1d18611834e23eae60
--- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 70d690fd679722b8b1bd8e2872f15b1e11e868d2)
+++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 600b6707b102919d981f3b1d18611834e23eae60)
@@ -140,8 +140,8 @@
_treatmentAdjustmentPressuresLimits.open()
}
- function onTreatmentModeEditClicked ( ) {
- _treatmentAdjustmentMode.open()
+ function onTreatmentHDFEditClicked ( ) {
+ _treatmentAdjustmentHDF.open()
}
}
@@ -151,7 +151,7 @@
TreatmentAdjustmentPressuresLimits { id: _treatmentAdjustmentPressuresLimits }
TreatmentAdjustmentBolusVolume { id: _treatmentAdjustmentBolusVolume }
TreatmentAdjustmentUltrafiltrationStack { id: _treatmentAdjustmentUltrafiltration }
- TreatmentAdjustmentMode { id: _treatmentAdjustmentMode }
+ TreatmentAdjustmentHDF { id: _treatmentAdjustmentHDF }
Connections { target: _treatmentAdjustmentSetPoints
function onConfirmClicked ( vValue ) {
Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentHDF.qml
===================================================================
diff -u
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentHDF.qml (revision 0)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentHDF.qml (revision 600b6707b102919d981f3b1d18611834e23eae60)
@@ -0,0 +1,92 @@
+
+// Qt
+import QtQuick 2.12
+
+// Project
+import "qrc:/globals"
+import "qrc:/components"
+import "qrc:/compounds"
+
+TreatmentAdjustmentBase { id: _root
+ contentItem.objectName: "TreatmentAdjustmentHDF"
+ titleText : qsTr("HDF Adjustments")
+
+ titlePixelSize : Fonts.fontPixelSection
+ height : Variables.smallDialogHeight
+ width : Variables.smallDialogWidth
+
+ function confirm() {
+ vTreatmentCreate.hdfTreatmentMode = _treatmentModeControl.currentIndex
+ vTreatmentCreate.substitutionFluidVolume = _prescribedFluidVolume.value
+ _root.close()
+ }
+
+ onOpened: {
+ _treatmentModeControl.currentIndex = vTreatmentCreate.hdfTreatmentMode
+ _prescribedFluidVolume.value = vTreatmentCreate.substitutionFluidVolume
+ }
+
+ Column { id: _column
+ spacing: Variables.defaultMargin * 2
+
+ anchors {
+ verticalCenter : _root.contentItem.verticalCenter
+ verticalCenterOffset: Variables.defaultMargin * -3 // better align label with dialog height
+ horizontalCenter : _root.contentItem.horizontalCenter
+ }
+
+ LabelUnitContainer { id: _treatmentMode
+ objectName : "_treatmentMode"
+ text : qsTr("Treatment Mode")
+ width : Variables.adjustmentLabelUnitContainerWidth
+ height : Variables.adjustmentLabelUnitContainerHeight
+ onEditClicked : _root.treatmentHDFEditClicked()
+
+ contentItem : ValueAdjusterCustom { id: _treatmentModeControl
+ value : vTreatmentCreate.hdfTreatmentMode
+ model : vTreatmentRanges.hdfTreatmentModeOptions
+ }
+ }
+
+ LabelUnitValueAdjuster { id: _prescribedFluidVolume
+ objectName : "_prescribedFluidVolume"
+ text : qsTr("Prescribed Sub. Fluid Volume")
+ width : Variables.adjustmentLabelUnitContainerWidth
+ height : Variables.adjustmentLabelUnitContainerHeight
+ unitText : Variables.unitVolume
+ decimal : Variables.substitutionPrecision
+ valueTextColor : Colors.offWhite
+ isActive : true
+ minimum : vTreatmentRanges.substitutionVolumeMin
+ maximum : vTreatmentRanges.substitutionVolumeMax
+ step : vTreatmentRanges.substitutionVolumeRes
+ value : vTreatmentCreate.substitutionFluidVolume
+ defaultValue : vTreatmentRanges.substitutionVolumeDef
+
+ onDidChange : function(vValue) {
+ value = vValue
+ }
+ }
+ }
+
+ ConfirmButton { id : _confirmButton
+ anchors {
+ bottom : _root.contentItem.bottom
+ bottomMargin : Variables.defaultMargin * 4
+ horizontalCenter: _root.contentItem.horizontalCenter
+ }
+
+ width : Variables.defaultButtonWidth
+ height : Variables.defaultButtonHeight
+
+ anchors {
+ top : undefined
+ right : undefined
+ margins : 0
+ }
+
+ onClicked : {
+ _root.confirm()
+ }
+ }
+}
Fisheye: Tag 600b6707b102919d981f3b1d18611834e23eae60 refers to a dead (removed) revision in file `sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentMode.qml'.
Fisheye: No comparison available. Pass `N' to diff?
Index: sources/gui/qml/pages/treatment/sections/TreatmentHDFComponent.qml
===================================================================
diff -u -r11cf98a0aae3c01a7e7608b0c9f8a4c2112ca997 -r600b6707b102919d981f3b1d18611834e23eae60
--- sources/gui/qml/pages/treatment/sections/TreatmentHDFComponent.qml (.../TreatmentHDFComponent.qml) (revision 11cf98a0aae3c01a7e7608b0c9f8a4c2112ca997)
+++ sources/gui/qml/pages/treatment/sections/TreatmentHDFComponent.qml (.../TreatmentHDFComponent.qml) (revision 600b6707b102919d981f3b1d18611834e23eae60)
@@ -24,11 +24,8 @@
color : Colors.panelBackgroundColor
header.color : Colors.heparinSectionHeader
enableDropShadow: false
- header {
- showEdit : false
- title : qsTr("Hemodiafiltration") + " (" + qsTr("HDF") + ")"
+ header.title : qsTr("Hemodiafiltration") + " (" + qsTr("HDF") + ")"
- }
contentArea.anchors {
topMargin : Variables.defaultMargin
leftMargin : Variables.defaultMargin * 2
@@ -68,7 +65,6 @@
readonly property int cellWidth : contentItem.width / 2 - _row.spacing
signal substitutionFlowClicked()
- signal treatmentModeEditClicked()
contentItem: Row { id: _row
spacing: Variables.defaultMargin * 2
@@ -123,7 +119,7 @@
height : 20
decimal : Variables.substitutionPrecision
minimum : _root.minimum
- maximum : _root.maximum
+ maximum : vTreatmentCreate.substitutionFluidVolume
value : _root.substitutionValue
unitText : Variables.unitVolume
color : Colors.progressBarUltrafiltration
@@ -253,8 +249,6 @@
text : qsTr("Treatment Mode")
width : _rightColumn.width
height : Variables.adjustmentLabelUnitContainerHeight
- showEdit : true
- onEditClicked : _root.treatmentModeEditClicked()
contentItem : ValueAdjusterCustom { id: _treatmentModeControl
value : vTreatmentCreate.hdfTreatmentMode
@@ -271,17 +265,15 @@
text : qsTr("Prescribed Sub. Fluid Volume")
unitText : Variables.unitVolume
decimal : Variables.substitutionPrecision
+ valueTextColor : Colors.offWhite
isActive : true
+ editable : false
minimum : _root.minimum
maximum : _root.maximum
step : _root.resolution
width : _rightColumn.width
- value : 24.0
- defaultValue : 24.0
-
- onDidChange : function(vValue) {
- value = vValue
- }
+ value : vTreatmentCreate.substitutionFluidVolume
+ defaultValue : vTreatmentRanges.substitutionVolumeDef
}
}
}
Index: sources/view/VTreatmentCreate.h
===================================================================
diff -u -r45ce5cd058a8d0239d486e0ab4b057731f7dba76 -r600b6707b102919d981f3b1d18611834e23eae60
--- sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision 45ce5cd058a8d0239d486e0ab4b057731f7dba76)
+++ sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision 600b6707b102919d981f3b1d18611834e23eae60)
@@ -79,6 +79,7 @@
PROPERTY(bool , heparinDispensingRateOff , true)
PROPERTY(bool , heparinBolusVolumeOff , true)
+ VALUESET(quint32 , hdfTreatmentMode , 0)
VALUESET(quint32 , bloodFlowRate , 0)
VALUESET(quint32 , dialysateFlowRate , 0)
VALUESET(quint32 , treatmentDuration , 0)
@@ -98,7 +99,7 @@
VALUESET(float , dialysateTemp , 0)
VALUESET(float , heparinDispensingRate , 0)
VALUESET(float , heparinBolusVolume , 0)
- VALUESET(quint32 , hdfTreatmentMode , 0)
+ VALUESET(float , substitutionFluidVolume , 0)
VALUESET(QString , patientID ,"")
VALUESET(bool , parametersValidated , 0)