Index: sources/gui/qml/pages/endtreatment/EndTreatmentBase.qml
===================================================================
diff -u -r07fa2cd47bf538e89c48fc7d425674f20afc9f2a -rcba8451ac737fb0b618173a4bea37411fdaaf824
--- sources/gui/qml/pages/endtreatment/EndTreatmentBase.qml (.../EndTreatmentBase.qml) (revision 07fa2cd47bf538e89c48fc7d425674f20afc9f2a)
+++ sources/gui/qml/pages/endtreatment/EndTreatmentBase.qml (.../EndTreatmentBase.qml) (revision cba8451ac737fb0b618173a4bea37411fdaaf824)
@@ -33,18 +33,50 @@
property int timeoutValue : 0
property string headerTitle : ""
+ onVisibleChanged: if ( visible ) { _root.updateModel() }
+
+ // update model for instruction based steps
+ function updateModel () {
+ let group = vSettings.groupModalityFormat(_root.headerTitle, vTreatmentCreate.treatmentModality)
+
+ let instructionsGroup = vSettings.instructions[group]
+
+ if ( instructionsGroup !== undefined ) {
+ instructionTitle = instructionsGroup.title
+ instructionStepNames = instructionsGroup.keys
+ instructionStepImages = instructionsGroup.values
+ }
+ }
+
Loader { id: _timeoutLoader
active : _root.hasTimeout
anchors {
horizontalCenter: parent.horizontalCenter
- bottom : title.top
- bottomMargin : Variables.minVGap
+ top : parent.top
+ topMargin : Variables.defaultMargin * 3
}
- sourceComponent : TimeText { id: _timeout
- textPixelSize : 30
- textWeight : Font.Normal
- secondsVisible : false
- seconds : _root.timeoutValue
+ sourceComponent : Item { id: _timeoutItem
+ Text { id: _description
+ objectName : "_description"
+ anchors.centerIn: parent
+ width : implicitWidth
+ height : implicitHeight
+ text : qsTr("Blood return will %1 be allowed in:").arg("NOT")
+ color : Colors.offWhite
+ font.pixelSize : Fonts.fontPixelContainerTitle
+ }
+
+ TimeText { id: _timeout
+ anchors {
+ left : _description.right
+ bottom : _description.bottom
+ }
+ textPixelSize : 30
+ textWeight : Font.DemiBold
+ secondsVisible : false
+ seconds : _root.timeoutValue
+ textColor : Colors.ufVolumeGoalText
+ }
}
}
}
Index: sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml
===================================================================
diff -u -rbc4b9e027cd54b49a73c3f7d6800a3563fc43b4c -rcba8451ac737fb0b618173a4bea37411fdaaf824
--- sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml (.../EndTreatmentRinsebackStack.qml) (revision bc4b9e027cd54b49a73c3f7d6800a3563fc43b4c)
+++ sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml (.../EndTreatmentRinsebackStack.qml) (revision cba8451ac737fb0b618173a4bea37411fdaaf824)
@@ -35,7 +35,7 @@
onVisibleChanged: {
if (visible) {
-// _headerBar.titleText = stackView.currentItem.headerTitle ?? ""
+ _headerBar.titleText = stackView.currentItem.headerTitle ?? ""
}
else {
_headerBar.titleText = ""
@@ -44,11 +44,7 @@
// Rinseback
EndTreatmentRinsebackInit { id: _endTreatmentRinsebackInit }
- EndTreatmentRinseback { id: _endTreatmentRinseback
- StackView.onActivating : {
- _headerBar.titleText = qsTr("Returning Blood")
- }
- }
+ EndTreatmentRinseback { id: _endTreatmentRinseback }
EndTreatmentAdditional { id: _endTreatmentAdditional }
EndTreatmentRinsebackReconnect { id: _endTreatmentRinsebackReconnect }
@@ -60,15 +56,14 @@
Connections { target: _endTreatmentRinsebackInit
function onRinsebackClicked ( vValue ) { vTreatmentAdjustmentRinseback.doStart ()} //82.0
- function onTreatmentEndClicked ( vValue ) { vTreatmentAdjustmentRinseback.doTreatmentEnd ()} //82.8
- function onTreatmentBackClicked ( vValue ) { vTreatmentAdjustmentRinseback.doTreatmentBack ()} //82.9
+// function onTreatmentEndClicked ( vValue ) { vTreatmentAdjustmentRinseback.doTreatmentEnd ()} //82.8
+// function onTreatmentBackClicked ( vValue ) { vTreatmentAdjustmentRinseback.doTreatmentBack ()} //82.9
}
Connections { target: _endTreatmentRinseback
function onAccelerateClicked ( vValue ) { vTreatmentAdjustmentRinseback.doIncrement ()} //82.1
function onDeccelerateClicked ( vValue ) { vTreatmentAdjustmentRinseback.doDecrement ()} //82.2
function onPauseClicked ( vValue ) { vTreatmentAdjustmentRinseback.doPause ()} //82.3
function onResumeClicked ( vValue ) { vTreatmentAdjustmentRinseback.doResume ()} //82.4
- function onEndClicked ( vValue ) { vTreatmentAdjustmentRinseback.doEnd ()} //82.5
}
Connections { target: _rinsebackCompleteDialog
@@ -87,8 +82,8 @@
function onRbInitChanged ( vValue ) { page( _endTreatmentRinsebackInit , vValue )}
function onRbRunChanged ( vValue ) { page( _endTreatmentRinseback , vValue )}
function onRbPausedChanged ( vValue ) { page( _endTreatmentRinseback , vValue )}
- function onRbStopChanged ( vValue ) { print("stop" + vValue ) ;if ( vValue ) { _rinsebackCompleteDialog.open() }}
- function onRbAdditionalChanged ( vValue ) { page( _endTreatmentAdditional , vValue )}
+ function onRbStopChanged ( vValue ) { if ( vValue ) { _rinsebackCompleteDialog.open() }}
+ function onRbAdditionalChanged ( vValue ) { page( _endTreatmentRinseback , vValue )}
function onRbReconnectChanged ( vValue ) { page( _endTreatmentRinsebackReconnect , vValue )}
}
Index: sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinseback.qml
===================================================================
diff -u -rbc4b9e027cd54b49a73c3f7d6800a3563fc43b4c -rcba8451ac737fb0b618173a4bea37411fdaaf824
--- sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinseback.qml (.../EndTreatmentRinseback.qml) (revision bc4b9e027cd54b49a73c3f7d6800a3563fc43b4c)
+++ sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinseback.qml (.../EndTreatmentRinseback.qml) (revision cba8451ac737fb0b618173a4bea37411fdaaf824)
@@ -30,11 +30,10 @@
EndTreatmentBase { id: _root
objectName : "_EndTreatmentRinseback"
- headerTitle : qsTr("Returning Blood")
+ headerTitle : qsTr("Blood Return")
signal pauseClicked ()
signal resumeClicked ()
- signal endClicked ()
signal accelerateClicked ()
signal deccelerateClicked ()
@@ -66,7 +65,7 @@
pixelSize : 76
weight : Font.Light
}
- color : Colors.textMain
+ color : vTDTreatmentStates.rbPaused ? Colors.ufVolumeGoalText : Colors.offWhite
text : vTreatmentRinseback.current.toFixed(0) + " " + qsTr(Variables.unitTextFluid)
}
@@ -78,7 +77,7 @@
horizontalCenter: parent.horizontalCenter
}
textPixelSize : 30
- textWeight : Font.Normal
+ textWeight : Font.DemiBold
secondsVisible : false
seconds : vTreatmentRinseback.timeoutCountDown * 60
visible : vTreatmentRinseback.timeoutTotal
Index: sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackInit.qml
===================================================================
diff -u -rb59827b661a423b2b1ad2ca7b8611c2c0be7bd6a -rcba8451ac737fb0b618173a4bea37411fdaaf824
--- sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackInit.qml (.../EndTreatmentRinsebackInit.qml) (revision b59827b661a423b2b1ad2ca7b8611c2c0be7bd6a)
+++ sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackInit.qml (.../EndTreatmentRinsebackInit.qml) (revision cba8451ac737fb0b618173a4bea37411fdaaf824)
@@ -28,41 +28,24 @@
EndTreatmentBase { id: _root
objectName: "_EndTreatmentRinsebackInit"
- signal treatmentBackClicked ()
signal rinsebackClicked ()
- signal treatmentEndClicked ()
- header.backVisible : vTreatmentTime .time_IsLeft
- onBackClicked : treatmentBackClicked()
-
- title.text : qsTr("Rinseback Setup")
+ headerTitle : qsTr("Blood Return Setup")
instructionBased : true
hasTimeout : vTreatmentRinseback .timeoutTotal
timeoutValue : vTreatmentRinseback .timeoutCountDown * 60
- footer {
- width : parent.width
- height : Variables.touchRectHeight
+ TouchRect { id : _beginRinsebackTouchRect
+ anchors {
+ bottom : _root.bottom
+ bottomMargin : Variables.notificationHeight * 2
+ horizontalCenter: _root.horizontalCenter
+ }
+ width : Variables.defaultButtonWidth
+ height : Variables.defaultButtonHeight
+ isDefault : true
+ textString : qsTr("Start Blood Return")
+ onClicked : rinsebackClicked()
}
- FooterStatic {
- childrenWidth : 300
- anchors.fill : footer
- children : [
- TouchRect { id : _endTreatmentTouchRect
- visible : true //DEN-15722: SRSHD 1231: REmoved => vTreatmentTime .time_IsLeft
- text.text : qsTr("END TREATMENT")
- onClicked : treatmentEndClicked()
- },
-
- TouchRect { id : _beginRinsebackTouchRect
- visible : true
- isDefault : true
- text.text : qsTr("START RINSEBACK")
- onClicked : rinsebackClicked()
- },
- Item { id: placeholder
- }
- ]
- }
}
Index: sources/view/settings/VSettings.h
===================================================================
diff -u -ra7aab61ca63538c37b6931c60252680fc2ec2416 -rcba8451ac737fb0b618173a4bea37411fdaaf824
--- sources/view/settings/VSettings.h (.../VSettings.h) (revision a7aab61ca63538c37b6931c60252680fc2ec2416)
+++ sources/view/settings/VSettings.h (.../VSettings.h) (revision cba8451ac737fb0b618173a4bea37411fdaaf824)
@@ -30,7 +30,8 @@
class VSettings : public QObject
{
Q_OBJECT
- const QString _advancedPrefix = "@";
+ const QString _advancedPrefix = "@";
+ const QString _hdfPrefix = "$";
const QString _location = QString(Storage::Settings_Category_InstructionsImagesLoc).arg(Storage::Settings_Path());
typedef QList TKeysList;
typedef struct {
@@ -104,6 +105,8 @@
.arg(vSecond.isEmpty() ? QString("%1").arg(vFirst) :
QString("%1^%2").arg(vFirst, vSecond)); }
+ QString groupModalityFormat (const QString &vFirst, const bool &vHDF) { return QString("%1%2").arg(vHDF ? _hdfPrefix : "").arg(vFirst); }
+
private slots:
void onActionReceive (GuiActionType vAction, const QVariantList &vData);