Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml =================================================================== diff -u -r8f53c579291988cf29fce189d95f77a0bb7679f0 -raa03f07a386a12895435facfff9f4bff9f7a45f0 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml (.../TreatmentAdjustmentBase.qml) (revision 8f53c579291988cf29fce189d95f77a0bb7679f0) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml (.../TreatmentAdjustmentBase.qml) (revision aa03f07a386a12895435facfff9f4bff9f7a45f0) @@ -40,9 +40,9 @@ signal confirmClicked() signal backClicked() - width: Variables.adjustmentDialogWidth - height: Variables.adjustmentDialogHeight - y: Math.round((Variables.applicationHeight - height) / 2) - Variables.headerHeight + width : Variables.adjustmentDialogWidth + height : Variables.adjustmentDialogHeight + y : Math.round((Variables.applicationHeight - height) / 2) - Variables.headerHeight onVisibleChanged: { notificationText = "" @@ -53,19 +53,19 @@ // TODO: remove ConfirmButton later once it is moved out into screens that inherit this ConfirmButton { id : _confirmButton anchors { - right: parent.right - verticalCenter: _backButton.verticalCenter - margins: Variables.adjustmentButtonMargin + right : parent.right + verticalCenter : _backButton.verticalCenter + margins : Variables.adjustmentButtonMargin } visible: _root.confirmVisible onClicked : confirmClicked() } BackButton { id : _backButton anchors { - top: parent.top - left: parent.left - margins: Variables.adjustmentButtonMargin + top : parent.top + left : parent.left + margins : Variables.adjustmentButtonMargin } visible: _root.backVisible onClicked : backClicked() @@ -74,24 +74,24 @@ TitleText { id : _titleText text: titleText font { - pixelSize: Fonts.fontPixelTitle - weight: Font.Medium + pixelSize : Fonts.fontPixelTitle + weight : Font.Medium } - color: Colors.textMain - width: contentWidth - height: contentHeight + color : Colors.textMain + width : contentWidth + height : contentHeight anchors { - bottom: parent.bottom - horizontalCenter: parent.horizontalCenter - margins: Variables.defaultMargin + bottom : parent.bottom + horizontalCenter : parent.horizontalCenter + margins : Variables.defaultMargin } } CloseButton { id : _closeButton anchors { - right: parent.right - verticalCenter: _backButton.verticalCenter - margins: Variables.adjustmentButtonMargin + right : parent.right + verticalCenter : _backButton.verticalCenter + margins : Variables.adjustmentButtonMargin } visible: _root.closeVisible onClicked : { Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml =================================================================== diff -u -r038d30c2f22add13830b92a9775d70c9615861b2 -raa03f07a386a12895435facfff9f4bff9f7a45f0 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision 038d30c2f22add13830b92a9775d70c9615861b2) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision aa03f07a386a12895435facfff9f4bff9f7a45f0) @@ -31,9 +31,9 @@ QtObject { id: _private readonly property real minimum : vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Min readonly property real maximum : vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Max - property int decimal : Variables.ultrafiltrationPrecision - property real setVolume : vTreatmentUltrafiltration.setVolume - property real volumeRemoved : vTreatmentUltrafiltration.volumeRemoved + property int decimal : Variables.ultrafiltrationPrecision + property real setVolume : vTreatmentUltrafiltration.setVolume + property real volumeRemoved : vTreatmentUltrafiltration.volumeRemoved } signal continueClicked(real vVolume) Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml =================================================================== diff -u -r038d30c2f22add13830b92a9775d70c9615861b2 -raa03f07a386a12895435facfff9f4bff9f7a45f0 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml (.../TreatmentAdjustmentUltrafiltrationStart.qml) (revision 038d30c2f22add13830b92a9775d70c9615861b2) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml (.../TreatmentAdjustmentUltrafiltrationStart.qml) (revision aa03f07a386a12895435facfff9f4bff9f7a45f0) @@ -32,8 +32,8 @@ QtObject { id: _private readonly property real minimum : vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Min readonly property real maximum : vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Max - property real setVolume : vTreatmentUltrafiltration.setVolume - property real volumeRemoved : vTreatmentUltrafiltration.volumeRemoved + property real setVolume : vTreatmentUltrafiltration.setVolume + property real volumeRemoved : vTreatmentUltrafiltration.volumeRemoved } signal editClicked() @@ -114,7 +114,7 @@ anchors.bottomMargin: marker.valueOnTop ? 13 : 0 font { pixelSize: Fonts.fontPixelUltrafiltrationRangeMarker - weight: Font.DemiBold + weight : Font.DemiBold } } } @@ -170,7 +170,7 @@ width : Variables.ultrafiltrationButtonWidth height : Variables.ultrafiltrationButtonHeight text { - text : qsTr("Resume Ultrafiltration") + text : qsTr("Resume Ultrafiltration") font { pixelSize : Fonts.fontPixelUltrafiltrationAdjustmentButton weight : Font.DemiBold @@ -217,8 +217,8 @@ } anchors { - bottom: _pauseButton.top - bottomMargin: 25 + bottom : _pauseButton.top + bottomMargin : 25 horizontalCenter: parent.horizontalCenter } visible: _pauseButton.visible Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h =================================================================== diff -u -r1ea05b21849b7ee431804166f8e206f623c39509 -raa03f07a386a12895435facfff9f4bff9f7a45f0 --- sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 1ea05b21849b7ee431804166f8e206f623c39509) +++ sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision aa03f07a386a12895435facfff9f4bff9f7a45f0) @@ -170,7 +170,7 @@ * * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | - * |0x1100| 0x100 | 9 | Req | Y | UI | HD | UF Vol. Change Request | + * |0x4100| 0x100 | 9 | Req | Y | UI | HD | UF Vol. Change Request | * * | Payload || * | || @@ -194,7 +194,7 @@ * * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | - * |0x4100| 0x041 | 9 | Req | Y | UI | HD | UF Vol. Change User Confirm | + * |0x6600| 0x041 | 9 | Req | Y | UI | HD | UF Vol. Change User Confirm | * * | Payload || * | || Fisheye: Tag aa03f07a386a12895435facfff9f4bff9f7a45f0 refers to a dead (removed) revision in file `sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag aa03f07a386a12895435facfff9f4bff9f7a45f0 refers to a dead (removed) revision in file `sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag aa03f07a386a12895435facfff9f4bff9f7a45f0 refers to a dead (removed) revision in file `sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag aa03f07a386a12895435facfff9f4bff9f7a45f0 refers to a dead (removed) revision in file `sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag aa03f07a386a12895435facfff9f4bff9f7a45f0 refers to a dead (removed) revision in file `sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationStateResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag aa03f07a386a12895435facfff9f4bff9f7a45f0 refers to a dead (removed) revision in file `sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationStateResponse.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag aa03f07a386a12895435facfff9f4bff9f7a45f0 refers to a dead (removed) revision in file `sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag aa03f07a386a12895435facfff9f4bff9f7a45f0 refers to a dead (removed) revision in file `sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag aa03f07a386a12895435facfff9f4bff9f7a45f0 refers to a dead (removed) revision in file `sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationEdit.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag aa03f07a386a12895435facfff9f4bff9f7a45f0 refers to a dead (removed) revision in file `sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationEdit.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag aa03f07a386a12895435facfff9f4bff9f7a45f0 refers to a dead (removed) revision in file `sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationState.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag aa03f07a386a12895435facfff9f4bff9f7a45f0 refers to a dead (removed) revision in file `sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationState.h'. Fisheye: No comparison available. Pass `N' to diff?