Index: leahi.qrc
===================================================================
diff -u -rd59edcf7fa2a0f096e22d330012dbaefa4bda374 -r627062628b60e4d512ee8830c2dbc23eef02fe28
--- leahi.qrc (.../leahi.qrc) (revision d59edcf7fa2a0f096e22d330012dbaefa4bda374)
+++ leahi.qrc (.../leahi.qrc) (revision 627062628b60e4d512ee8830c2dbc23eef02fe28)
@@ -200,6 +200,7 @@
sources/gui/qml/components/SubStepIndicator.qml
sources/gui/qml/components/SDCInfo.qml
sources/gui/qml/components/BaseChart.qml
+ sources/gui/qml/components/ReviewContainer.qml
sources/gui/qml/compounds/PressureRangeSlider.qml
@@ -219,6 +220,7 @@
sources/gui/qml/compounds/SettingsSlider.qml
sources/gui/qml/compounds/AutoStepController.qml
sources/gui/qml/compounds/InteractiveImage.qml
+ sources/gui/qml/compounds/ProcessStatusView.qml
qtquickcontrols2.conf
@@ -342,5 +344,6 @@
sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml
sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml
sources/gui/qml/pages/posttreatment/PostTreatmentDisconnectStack.qml
+ sources/gui/qml/pages/posttreatment/PostTreatmentDrainConsumables.qml
Index: sources/gui/qml/components/ReviewContainer.qml
===================================================================
diff -u
--- sources/gui/qml/components/ReviewContainer.qml (revision 0)
+++ sources/gui/qml/components/ReviewContainer.qml (revision 627062628b60e4d512ee8830c2dbc23eef02fe28)
@@ -0,0 +1,111 @@
+
+// Qt
+import QtQuick 2.15
+
+// Project
+
+// Qml imports
+import "qrc:/compounds"
+import "qrc:/globals"
+
+Rectangle { id: _root
+ property var initial : []
+ property var actual : []
+ property var label : []
+ property var units : []
+ property var precision : Array(label.count).fill(0) // default all 0 precision
+ property string title : ""
+
+ height : _column.implicitHeight + 10
+ width : parent.width
+ radius : 9
+ color : Colors.panelBackgroundColor
+ clip : true
+
+ border {
+ width: 1
+ color: Colors.panelBorderColor
+ }
+
+ Column { id: _column
+ Rectangle { id: _header
+ width : _root.width
+ height : Variables.createRxLabelUnitContainerHeight
+ color : Colors.panelBackgroundColor
+ radius : _root.radius
+
+ border {
+ width: 1
+ color: Colors.panelBorderColor
+ }
+
+ Text { id: _title
+ text : _root.title
+ color : Colors.offWhite
+ font.family : Fonts.fontFamilyFixed
+ font.weight : Font.DemiBold
+ font.pixelSize : Fonts.fontPixelTextRectTitle
+ anchors {
+ left : parent.left
+ leftMargin : Variables.defaultMargin
+ verticalCenter : parent.verticalCenter
+ }
+ }
+ }
+
+ Repeater { id: _repeater
+ model : _root.label
+ height : delegate.implicitHeight
+ width : delegate.implicitWidth
+
+ delegate : LabelUnitContainer { id: _delegate
+ text : modelData
+ color : Colors.transparent
+ width : parent.width
+ unitText : _root.units[index]
+ border.width: 0
+
+ contentItem : Item { id: _contentItem
+ Row { id: _row
+ anchors {
+ right : parent.right
+ rightMargin : Variables.defaultMargin * 2
+ verticalCenter : parent.verticalCenter
+ }
+ spacing : Variables.defaultMargin * 2
+
+ Text { id: _initial
+ text : typeof _root.initial[index] === "number" ? _root.initial[index].toFixed(_root.precision[index]) ?? "" :
+ _root.initial[index]
+ color : Colors.offWhite
+ font.pixelSize : Fonts.fontPixelValueControl
+ verticalAlignment : Text.AlignVCenter
+ visible : _root.initial[index] ?? false
+ }
+
+ Text { id: _actual
+ text : typeof _root.actual[index] === "number" ? _root.actual[index].toFixed(_root.precision[index]) ?? "" :
+ _root.actual[index]
+ color : Colors.ufVolumeGoalText
+ font.pixelSize : Fonts.fontPixelValueControl
+ verticalAlignment : Text.AlignVCenter
+ visible : _root.actual[index] ?? false
+ }
+ }
+ }
+
+ Line { id: _divider
+ color : Colors.panelBorderColor
+ visible : index !== _repeater.count - 1
+ anchors {
+ bottom : parent.bottom
+ left : parent.left
+ leftMargin : Variables.minVGap + Variables.defaultMargin
+ right : parent.right
+ rightMargin : Variables.minVGap + Variables.defaultMargin
+ }
+ }
+ }
+ }
+ }
+}
Index: sources/gui/qml/compounds/ProcessStatusView.qml
===================================================================
diff -u
--- sources/gui/qml/compounds/ProcessStatusView.qml (revision 0)
+++ sources/gui/qml/compounds/ProcessStatusView.qml (revision 627062628b60e4d512ee8830c2dbc23eef02fe28)
@@ -0,0 +1,93 @@
+// Qt
+import QtQuick 2.12
+
+// Qml imports
+import "qrc:/globals"
+import "qrc:/components"
+
+
+Item { id: _root
+
+ property alias title : _title.text
+ property alias progressText : _progressText.text
+ property alias minimum : _progressCircle.minimum
+ property alias maximum : _progressCircle.maximum
+ property int value : 0
+
+ property string leftButtonText : ""
+ property string rightButtonText : ""
+
+
+ Text { id: _title
+ anchors {
+ top : _root.top
+ horizontalCenter: parent.horizontalCenter
+ }
+ color : Colors.offWhite
+ font.pixelSize : Fonts.fontPixelTextRectExtra
+ font.weight : Font.Medium
+ }
+
+ ProgressCircle { id: _progressCircle
+ anchors {
+ top : _title.bottom
+ topMargin : Variables.defaultMargin * 4
+ horizontalCenter: parent.horizontalCenter
+ }
+ diameter : 175
+ circleShadowColor : Colors.mainTreatmentLighterBlue
+ thickness : 10
+ value : _root.value
+
+ Text { id: _progressPercent
+ anchors.centerIn: parent
+ color : Colors.offWhite
+ font.pixelSize : Fonts.fontPixelCirclProgressTimeSmall
+ text : _root.value + "%"
+ }
+ }
+
+ Text { id: _progressText
+ anchors {
+ top : _progressCircle.bottom
+ topMargin : Variables.defaultMargin * 2
+ horizontalCenter: parent.horizontalCenter
+ }
+ color : Colors.statusTextActive
+ font.pixelSize : Fonts.fontPixelContainerTitleSmall
+ font.weight : Font.DemiBold
+ font.italic : true
+ }
+
+ Row { id: _buttonRow
+ anchors {
+ bottom : parent.bottom
+ horizontalCenter: parent.horizontalCenter
+ }
+ spacing : Variables.defaultMargin * 3
+
+ TouchRect { id : _leftButton
+ width : Variables.defaultButtonWidth
+ height : Variables.defaultButtonHeight
+ text {
+ text : _root.leftButtonText
+ font.pixelSize : Fonts.fontPixelConfirm
+ font.weight : Font.Medium
+ }
+ visible : _root.leftButtonText
+ isDefault : true
+ }
+
+ TouchRect { id : _rightButton
+ width : Variables.defaultButtonWidth
+ height : Variables.defaultButtonHeight
+ text {
+ text : _root.rightButtonText
+ font.pixelSize : Fonts.fontPixelConfirm
+ font.weight : Font.Medium
+ }
+ visible : _root.rightButtonText
+ isDefault : true
+ }
+ }
+}
Index: sources/gui/qml/pages/posttreatment/PostTreatmentDisconnectStack.qml
===================================================================
diff -u -rab7cddfe742a1c00e265a37effe043f2c3db8bec -r627062628b60e4d512ee8830c2dbc23eef02fe28
--- sources/gui/qml/pages/posttreatment/PostTreatmentDisconnectStack.qml (.../PostTreatmentDisconnectStack.qml) (revision ab7cddfe742a1c00e265a37effe043f2c3db8bec)
+++ sources/gui/qml/pages/posttreatment/PostTreatmentDisconnectStack.qml (.../PostTreatmentDisconnectStack.qml) (revision 627062628b60e4d512ee8830c2dbc23eef02fe28)
@@ -22,6 +22,12 @@
property int subStepIndex: PostTreatmentDisconnectStack.Step.DisconnectPatient
+ onVisibleChanged: {
+ if (visible) {
+ _headerBar.activeStack = stackView
+ }
+ }
+
signal goToNextStep()
function initStack() { page ( _postTreatmentDisconnectPatient ) }
@@ -66,8 +72,7 @@
onVisibleChanged : if (visible) { _root.subStepIndex = PostTreatmentDisconnectStack.Step.DisconnectPatient ; updateModel() }
}
- PostTreatmentBase { id: _postTreatmentDrainConsumables
- title.text : qsTr("Drain Consumable Options")
+ PostTreatmentDrainConsumables { id: _postTreatmentDrainConsumables
onVisibleChanged : if (visible) { _root.subStepIndex = PostTreatmentDisconnectStack.Step.DrainConsumable }
}
}
Index: sources/gui/qml/pages/posttreatment/PostTreatmentDrainConsumables.qml
===================================================================
diff -u
--- sources/gui/qml/pages/posttreatment/PostTreatmentDrainConsumables.qml (revision 0)
+++ sources/gui/qml/pages/posttreatment/PostTreatmentDrainConsumables.qml (revision 627062628b60e4d512ee8830c2dbc23eef02fe28)
@@ -0,0 +1,77 @@
+// Qt
+import QtQuick 2.12
+
+// Qml imports
+import "qrc:/globals"
+import "qrc:/components"
+import "qrc:/compounds"
+import "qrc:/pages/posttreatment"
+
+
+PostTreatmentBase { id: _root
+ title.text : qsTr("Drain Consumable Options")
+ title.anchors {
+ top : header.bottom
+ topMargin : Variables.defaultMargin * 2
+ }
+
+ title.font.pixelSize : Fonts.fontPixelSection
+ title.font.weight : Font.Medium
+
+ Text { id: _descriptionText
+ anchors {
+ top : title.bottom
+ topMargin : Variables.defaultMargin
+ horizontalCenter: parent.horizontalCenter
+ }
+ color : Colors.textMain
+ font.pixelSize : Fonts.fontPixelTextRectExtra
+ text : qsTr("Disconnect your consumables per your clinic's instructions")
+ }
+
+ Item { id: _content
+ anchors {
+ top : _descriptionText.bottom
+ topMargin : Variables.defaultMargin * 4
+ bottom : footer.top
+ left : parent.left
+ right : parent.right
+ }
+
+ ProcessStatusView { id: _drainDialyzer
+ anchors.right : _line.left
+ width : parent.width / 3
+ height : parent.height
+ title : qsTr("Draining Dialyzer")
+ leftButtonText : qsTr("Cancel Drain")
+ progressText : qsTr("Draining Dialyzer...")
+
+ // TODO update with messaging
+ minimum : 0
+ maximum : 100
+ value : 50
+ }
+
+ Line { id: _line
+ orientation : Line.Orientation.Vertical
+ color : Colors.panelBorderColor
+ length : _content.height
+ anchors.horizontalCenter: parent.horizontalCenter
+ }
+
+ ProcessStatusView { id: _drainBicarbCartridge
+ anchors.left : _line.right
+ width : parent.width / 3
+ height : parent.height
+ title : qsTr("Bicarb Cartridge Options")
+ leftButtonText : qsTr("Cancel Drain")
+ rightButtonText : qsTr("Depressurize")
+ progressText : qsTr("Draining Bicart...")
+
+ // TODO update with messaging
+ minimum : 0
+ maximum : 100
+ value : 25
+ }
+ }
+}
Index: sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml
===================================================================
diff -u -rab7cddfe742a1c00e265a37effe043f2c3db8bec -r627062628b60e4d512ee8830c2dbc23eef02fe28
--- sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml (.../PostTreatmentReview.qml) (revision ab7cddfe742a1c00e265a37effe043f2c3db8bec)
+++ sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml (.../PostTreatmentReview.qml) (revision 627062628b60e4d512ee8830c2dbc23eef02fe28)
@@ -27,7 +27,9 @@
* \brief the post treatment Treatment Log review screen
*/
PostTreatmentBase { id: _root
- Rectangle { id: _rect
+ property int colSpacing: Variables.defaultMargin
+
+ Flickable { id: _flickable
anchors {
top : header.bottom
topMargin : Variables.defaultMargin * 2
@@ -40,55 +42,138 @@
}
- color : Colors.panelBackgroundColor
- radius : 9
+ contentWidth : width
+ contentHeight : _row.height
+ clip : true
- border {
- width : Variables.panelBorderWidth
- color : Colors.panelBorderColor
- }
+ Row { id: _row
+ width : _flickable.width
+ spacing : Variables.defaultMargin
- Grid { id: _grid
- property int cellHeight : parent.height / 10
- property int cellWidth : parent.width / 3 - ( Variables.defaultMargin ) // subtract columnSpacing
+ Column { id: _leftColumn
+ width : _flickable.width / 2
+ spacing : _root.colSpacing
- clip: true
- anchors.fill: parent
- anchors.leftMargin: Variables.defaultMargin
- anchors.rightMargin: Variables.defaultMargin
+ ReviewContainer { id: _patientInfo
+ title : qsTr("Patient Information")
+ width : parent.width
- flow : Grid.TopToBottom
- columns : 3
- rows : _repeater.model.count / columns
- rowSpacing : 0
- columnSpacing : Variables.defaultMargin
+ label : [ qsTr("Patient ID") ,
+ qsTr("Secondary Patient ID")]
- Repeater { id: _repeater
- model : vPostTreatmentAdjustmentTreatmentLog.parametersTitle
+ initial : [ "initial 1" ,
+ "initial 2" ]
- LabelUnitText { id: _container
- height : _grid.cellHeight
- width : _grid.cellWidth
- label : modelData
- unit : vPostTreatmentAdjustmentTreatmentLog.parametersUnit[index] ?? ""
- value : "123" // vPostTreatmentAdjustmentTreatmentLog.parametersText[index] ?? ""
- textAlignment: Text.AlignJustify
- radius : 0
- color : Colors.transparent
- border.width: 0
+ actual : [ "" , "" ]
+ units : [ "" , "" ]
+ }
- Line {
- anchors.bottom: parent.bottom
- anchors.left : parent.left
- anchors.right : parent.right
- visible: index !== 9 && index !== 19 && index !== 29
- color: Colors.panelBorderColor
- }
+ ReviewContainer { id: _bloodFlowDiaysate
+ title : qsTr("Blood Flow Rate and Dialysate Settings")
+ width : parent.width
+ label : [ qsTr("Blood Flow Rate") ,
+ qsTr("Dialysis Flow Rate") ,
+ qsTr("Dialyzer Type") ,
+ qsTr("Dialysate Temperature") ,
+ qsTr("Dialysate Volume Used") ]
+
+ initial : [ vTreatmentCreate.bloodFlowRate ,
+ vTreatmentCreate.dialysateFlowRate ,
+ "ifabef" ,
+ vTreatmentCreate.dialysateTemp ,
+ "alot " ]
+
+ actual : [ "BFR 1" ,
+ "DFR 1" ,
+ "" ,
+ "Temp1" ,
+ "" ]
+ precision : [0,0,0,Variables.dialysateTempPrecision , Variables.ultrafiltrationPrecision]
+
+ units : [ Variables.unitTextFlowRate ,
+ Variables.unitTextFlowRate ,
+ "" ,
+ Variables.unitTextTemperature ,
+ Variables.unitVolume ]
+
+
}
+
}
+
+ Column { id: _rightColumn
+ width : _flickable.width / 2
+ spacing : _root.colSpacing
+
+ }
}
}
+ ScrollBar { flickable: _flickable }
+
+
+// Rectangle { id: _rect
+// anchors {
+// top : header.bottom
+// topMargin : Variables.defaultMargin * 2
+// bottom : _root.bottom
+// bottomMargin : Variables.notificationHeight + Variables.minVGap
+// left : parent.left
+// leftMargin : Variables.defaultMargin * 4
+// right : parent.right
+// rightMargin : Variables.defaultMargin * 4
+
+// }
+
+// color : Colors.panelBackgroundColor
+// radius : 9
+
+// border {
+// width : Variables.panelBorderWidth
+// color : Colors.panelBorderColor
+// }
+
+// Grid { id: _grid
+// property int cellHeight : parent.height / 10
+// property int cellWidth : parent.width / 3 - ( Variables.defaultMargin ) // subtract columnSpacing
+
+// clip: true
+// anchors.fill: parent
+// anchors.leftMargin: Variables.defaultMargin
+// anchors.rightMargin: Variables.defaultMargin
+
+// flow : Grid.TopToBottom
+// columns : 3
+// rows : _repeater.model.count / columns
+// rowSpacing : 0
+// columnSpacing : Variables.defaultMargin
+
+// Repeater { id: _repeater
+// model : vPostTreatmentAdjustmentTreatmentLog.parametersTitle
+
+// LabelUnitText { id: _container
+// height : _grid.cellHeight
+// width : _grid.cellWidth
+// label : modelData
+// unit : vPostTreatmentAdjustmentTreatmentLog.parametersUnit[index] ?? ""
+// value : "123" // vPostTreatmentAdjustmentTreatmentLog.parametersText[index] ?? ""
+// textAlignment: Text.AlignJustify
+// radius : 0
+// color : Colors.transparent
+// border.width: 0
+
+// Line {
+// anchors.bottom: parent.bottom
+// anchors.left : parent.left
+// anchors.right : parent.right
+// visible: index !== 9 && index !== 19 && index !== 29
+// color: Colors.panelBorderColor
+// }
+// }
+// }
+// }
+// }
+
reasonText : vPostTreatmentAdjustmentTreatmentLog.text()
informationText : vPostTreatmentAdjustmentTreatmentLog.notification
}
Index: sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml
===================================================================
diff -u -r18e4634800357ac1d8bc1da1cad04836ba85d33c -r627062628b60e4d512ee8830c2dbc23eef02fe28
--- sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml (.../PostTreatmentStack.qml) (revision 18e4634800357ac1d8bc1da1cad04836ba85d33c)
+++ sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml (.../PostTreatmentStack.qml) (revision 627062628b60e4d512ee8830c2dbc23eef02fe28)
@@ -136,6 +136,12 @@
subStepIndex : isDisconnect ? _postTreatmentDisconnectStack.subStepIndex + 1 : 0
+ currentStep : {
+ let arr =Array(stepNames.length).fill(false)
+ arr[PostTreatmentStack.Disconnect] = isDisconnect
+ return arr
+ }
+
subSteps : {
let arr =Array(stepNames.length).fill(0)
arr[ PostTreatmentStack.Disconnect] = PostTreatmentDisconnectStack.Step.Count
@@ -191,7 +197,7 @@
PostTreatmentBase { id: _postTreatmentDisinfection
objectName :" _postTreatmentDisinfection"
- onVisibleChanged : if (visible) { stackStepIndex = PostTreatmentStack.Disinfection }
+ onVisibleChanged : if (visible) { stackStepIndex = PostTreatmentStack.Disinfection }
}
// connections
Index: sources/gui/qml/pages/treatment/TreatmentStack.qml
===================================================================
diff -u -r8cf828e5768d491c3e329c39b108624832054e94 -r627062628b60e4d512ee8830c2dbc23eef02fe28
--- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 8cf828e5768d491c3e329c39b108624832054e94)
+++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 627062628b60e4d512ee8830c2dbc23eef02fe28)
@@ -145,11 +145,9 @@
Connections { target: _treatmentAdjustmentSetPoints
function onConfirmClicked ( vValue ) {
vTreatmentAdjustmentSetPoints.doAdjustment(
-// _treatmentAdjustmentSetPoints.treatmentModality , // TODO
_treatmentAdjustmentSetPoints.bloodFlowRate ,
_treatmentAdjustmentSetPoints.dialysateFlowRate ,
_treatmentAdjustmentSetPoints.dialysateTemperature ,
-// _treatmentAdjustmentSetPoints.hepatitus // TODO
_treatmentAdjustmentSetPoints.acidConcentrate ,
vTreatmentRanges.acidConcentrateModel.get(_treatmentAdjustmentSetPoints.acidConcentrate).value,
_treatmentAdjustmentSetPoints.bicarbConcentrate ,
Index: sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.h
===================================================================
diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -r627062628b60e4d512ee8830c2dbc23eef02fe28
--- sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.h (.../MPostTreatmentAdjustTreatmentLogResponse.h) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3)
+++ sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.h (.../MPostTreatmentAdjustTreatmentLogResponse.h) (revision 627062628b60e4d512ee8830c2dbc23eef02fe28)
@@ -71,7 +71,67 @@
* | 33 - (F32) | \ref Data::mAverageArterialPressure | Average Arterial Pressure | (mmHg) |
* | 34 - (F32) | \ref Data::mAverageVenousPressure | Average Venous Pressure | (mmHg) |
* | 35 - (U32) | \ref Data::mDeviceID | Device ID | |
- * | 36 - (U32) | \ref Data::mWaterSampleTestResult | Water Sample Test Result | |
+ * | 36 - (U32) | \ref Data::mWaterSampleTestResult | Water Sample Test Result | |\
+ *
+ *
+ *
+ * | 01 - (U32) | \ref Data::mAccepted
+ * | 02 - (U32) | \ref Data::mReason
+ * | 03 - (U32) | \ref Data::mBloodFlowRate
+ * | 04 - (U32) | \ref Data::mDialysateFlowRate
+ * | 05 - (U32) | \ref Data::mTreatmentDuration
+ * | 06 - (U32) | \ref Data::mActualTreatmentDuration
+ * | 07 - (U32) | \ref Data::mAcidConcentrateType
+ * | 08 - (U32) | \ref Data::mBicarbonateConcentrateType
+ * | 09 - (U32) | \ref Data::mPotassiumConcentration
+ * | 10 - (U32) | \ref Data::mCalciumConcentration
+ * | 11 - (U32) | \ref Data::mBicarbonateConcentration
+ * | 12 - (U32) | \ref Data::mSodiumConcentration
+ * | 13 - (F32) | \ref Data::mDialysateTemperature
+ * | 14 - (U32) | \ref Data::mDialyzerType
+ * | 15 - (U32) | \ref Data::mTreatmentStartEpoch
+ * | 16 - (U32) | \ref Data::mTreatmentEndEpoch
+ * | 17 - (F32) | \ref Data::mAverageBloodFlow ******* remove
+ * | 18 - (F32) | \ref Data::mAverageDialysateFlow ******* remove
+ * | 19 - (F32) | \ref Data::mDialysateVolumeUsed
+ * | 20 - (F32) | \ref Data::mAverageDialysateTemp ******* remove
+ * | 21 - (F32) | \ref Data::mOriginUFVolume
+ * | 22 - (F32) | \ref Data::mTargetUFVolume
+ * | 23 - (F32) | \ref Data::mActualUFVolume
+ * | 24 - (F32) | \ref Data::mOriginUFRate
+ * | 25 - (F32) | \ref Data::mTargetUFRate
+ * | 26 - (F32) | \ref Data::mActualUFRate
+ * | 27 - (U32) | \ref Data::mFluidBolusVolume
+ * | 28 - (F32) | \ref Data::mHeparinBolusVolume
+ * | 29 - (F32) | \ref Data::mHeparinDispenseRate
+ * | 30 - (U32) | \ref Data::mHeparinDeliveryDuration
+ * | 31 - (F32) | \ref Data::mHeparinDeliveredVolume
+ * | 32 - (U32) | \ref Data::mHeparinType
+ * | 33 - (F32) | \ref Data::mAverageArterialPressure ******* remove
+ * | 34 - (F32) | \ref Data::mAverageVenousPressure ******* remove
+ * | 35 - (U32) | \ref Data::mPatientID
+ * | 36 - (U32) | \ref Data::mSecondaryPatientID
+ * | 37 (U32) | \ref Data::mVitalsInterval
+ * | 38 (U32) | \ref Data::mTreatmentModality
+ * | 39 (U32) | \ref Data::mHDFOperatingMode
+ * | 40 (F32) | \ref Data::mOriginSubstitutionRate
+ * | 41 (F32) | \ref Data::mTargetSubstitutionRate
+ * | 42 (F32) | \ref Data::mActualSubstitutionRate
+ * | 43 (F32) | \ref Data::mOriginSubstitutionVolume
+ * | 44 (F32) | \ref Data::mTargetSubstitutionVolume
+ * | 45 (F32) | \ref Data::mActualSubstitutionVolume
+ * | 46 (F32) | \ref Data::mOriginIsoUfRate
+ * | 47 (F32) | \ref Data::mTargetIsoUfRate
+ * | 48 (F32) | \ref Data::mActualIsoUfRate
+ * | 49 (F32) | \ref Data::mOriginIsoUfVolume
+ * | 50 (F32) | \ref Data::mTargetIsoUfVolume
+ * | 51 (F32) | \ref Data::mActualIsoUfVolume
+ * | 52 (F32) | \ref Data::mWaterSampleTestResult
+ * | 53 (U32) | \ref Data::mHepatitisStatus
+
+
+
+
* \sa Data
* \sa MAdjustTreatmentLogReq : TreatmentLog Request
* \sa MTreatmentTreatmentLog : TreatmentLog Data
Index: sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h
===================================================================
diff -u -r7c12b8ce1964a37e856ebcae205f8b4ed19f3c6a -r627062628b60e4d512ee8830c2dbc23eef02fe28
--- sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h (.../VPostTreatmentAdjustTreatmentLog.h) (revision 7c12b8ce1964a37e856ebcae205f8b4ed19f3c6a)
+++ sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h (.../VPostTreatmentAdjustTreatmentLog.h) (revision 627062628b60e4d512ee8830c2dbc23eef02fe28)
@@ -89,9 +89,9 @@
PROPERTY(quint32 , heparinType , 0 )
PROPERTY(quint32 , heparinConcentration , 0 )
- PROPERTY(QStringList , parametersTitle , _TreatmentLog.titles())
- PROPERTY(QStringList , parametersUnit , _TreatmentLog.units ())
- PROPERTY(QStringList , parametersText , {})
+// PROPERTY(QStringList , parametersTitle , _TreatmentLog.titles())
+// PROPERTY(QStringList , parametersUnit , _TreatmentLog.units ())
+// PROPERTY(QStringList , parametersText , {})
PROPERTY(QString , txCode , "TEST-1231123212")
PROPERTY(QString , notification , "")