Index: SDDs/CreateRx.puml =================================================================== diff -u -r09b4d71593dc6c7a9465541f60cc2178164ff8a6 -ra7aab61ca63538c37b6931c60252680fc2ec2416 --- SDDs/CreateRx.puml (.../CreateRx.puml) (revision 09b4d71593dc6c7a9465541f60cc2178164ff8a6) +++ SDDs/CreateRx.puml (.../CreateRx.puml) (revision a7aab61ca63538c37b6931c60252680fc2ec2416) @@ -24,7 +24,7 @@ '[x \n ,X The rest of the parameters do not matter.] == Normal Bootup == - TD -> SW: MSG: [x12: 3,1] \n OpMode - Standby Dat + TD -> SW: MSG: [x12: #3,1] \n OpMode - Standby Dat SW -> UI: CMD: MainHome Screen UI ->o Wait_Retry: ⟲: MainHome Screen @@ -40,31 +40,31 @@ == Create Rx - Detailed == US -> UI: TCH: Create Treatment Button UI -> SW: ACT: Create Treatment - SW -> TD: MSG: [x45: 1] Req \n Initiate Treatment + SW -> TD: MSG: [x45: #1] Req \n Initiate Treatment alt Accepted: Initiate Treatment - TD -> SW: MSG: [x46: 1,X] Rsp \n Initiate Treatment - TD -> SW: MSG: [x12: 4,1] Dat \n OpMode - Parameters + TD -> SW: MSG: [x46: #1,X] Rsp \n Initiate Treatment + TD -> SW: MSG: [x12: #4,1] Dat \n OpMode - Parameters SW -> UI: CMD: Create Rx Screen UI ->o Wait_Retry: ⟲: Create Rx Screen !include common_puml/CreateRxCommon.puml else #Pink Rejected x46: Initiate Treatment - TD -> SW: MSG: [x46: 0,RR] + TD -> SW: MSG: [x46: #0,RR] SW -> UI: CMD: Rejection Reason (RR) Notification UI ->o Wait_Retry: ⟲: MainHome Screen end alt Back US -> UI: TCH: Back Button UI -> SW: ACT: Back alt Is Validated? - SW -> TD: MSG: [x44: 0] Req \n Prescription Parameters Confirmations: Back + SW -> TD: MSG: [x44: #0] Req \n Prescription Parameters Confirmations: Back SW -> UI: ACT: Set to not validated UI -> UI: ACT: Enable Fields UI ->o Wait_Retry: ⟲: Create Rx Screen else UI -> UI: ACT: Clear Create Rx Screen - SW -> TD: MSG: [x45: 0] Req \n Initiate Treatment Cancel - TD -> SW: MSG: [x12: 3,1] Dat \n OpMode - Standby + SW -> TD: MSG: [x45: #0] Req \n Initiate Treatment Cancel + TD -> SW: MSG: [x12: #3,1] Dat \n OpMode - Standby SW -> UI: CMD: MainHome Screen UI ->o Wait_Retry: ⟲: MainHome Screen end Index: SDDs/Pre-Treatment.png =================================================================== diff -u -r83401983c70c23eda679473f2972e6c364118981 -ra7aab61ca63538c37b6931c60252680fc2ec2416 Binary files differ Index: SDDs/Pre-Treatment.puml =================================================================== diff -u -ra55e0de27d8c427dd4d441f47bb22ca2fe0ca462 -ra7aab61ca63538c37b6931c60252680fc2ec2416 --- SDDs/Pre-Treatment.puml (.../Pre-Treatment.puml) (revision a55e0de27d8c427dd4d441f47bb22ca2fe0ca462) +++ SDDs/Pre-Treatment.puml (.../Pre-Treatment.puml) (revision a7aab61ca63538c37b6931c60252680fc2ec2416) @@ -17,17 +17,17 @@ ' SCL: User scrolls a flipable area ' 'Messages conventions: - '[x \n ,] - '[x \n ,# certain amount of parameters according to the content] - '[x \n ,X The rest of the parameters do not matter.] + '[x ,] \n + '[x ,# certain amount of parameters according to the content] \n + '[x ,X The rest of the parameters do not matter.] \n == Pre-Treatment == US -> UI: TCH: Create Treatment Button UI -> SW: ACT: Create Treatment - SW -> TD: MSG: [x45: 1] Req \n Initiate Treatment + SW -> TD: MSG: [x45: #1] Req \n Initiate Treatment alt Accepted: Initiate Treatment - TD -> SW: MSG: [x46: 1,X] Rsp \n Initiate Treatment - TD -> SW: MSG: [x12: 4,1] Dat \n OpMode - Pre-Treatment MOde + TD -> SW: MSG: [x46: #1,X] Rsp \n Initiate Treatment + TD -> SW: MSG: [x12: #4,1] Dat \n OpMode - Pre-Treatment MOde SW -> UI: CMD: CPre-Treatment Screen alt isStandardMode? @@ -47,8 +47,8 @@ alt #CEFAD0 Auto-Load US -> UI: TCH: Auto-Load Button UI -> SW: ACT: Auto-Load Request - SW -> TD: MSG: [x92: 0] Request - TD -> SW: MSG: [x93: #2] \n\tResponse: \ + SW -> TD: MSG: [x92: #0] Req + TD -> SW: MSG: [x93: #2] Rsp: \ \n\t(U32) mAccepted\ \n\t(U32) mReason SW -> UI: CMD: Rejection Reason @@ -61,8 +61,8 @@ else #D0D9CD Back US -> UI: TCH: Back Button UI -> SW: ACT: Back - SW -> TD: MSG: [x45: 0] Req \n Initiate Treatment Cancel - TD -> SW: MSG: [x12: 3,1] Dat \n OpMode - Standby + SW -> TD: MSG: [x45: #0] Req \n Initiate Treatment Cancel + TD -> SW: MSG: [x12: #3,1] Dat \n OpMode - Standby SW -> UI: CMD: MainHome Screen end UI -> US: ACT: Show Self-Tests page @@ -119,9 +119,9 @@ US -> UI: Act: Press Start UI -> SW: ACT: Pre-Treatment Adjustment Start Treatment - SW -> TD: MSD: [xA1: 0] Request \n Pre-Treatment Adjustment Start Treatment + SW -> TD: MSD: [xA1: #0] Req \n Pre-Treatment Adjustment Start Treatment alt #CEFAD0 Accepted - TD -> SW: MSG: [xA2: 2] \n\tResponse: \ + TD -> SW: MSG: [xA2: #2] Rsp: \ \n\t(U32) mAccepted \ \n\t(U32) mReason SW -> UI: CMD: Treatment Stack Index: sources/gui/qml/compounds/CheckListView.qml =================================================================== diff -u -ra55e0de27d8c427dd4d441f47bb22ca2fe0ca462 -ra7aab61ca63538c37b6931c60252680fc2ec2416 --- sources/gui/qml/compounds/CheckListView.qml (.../CheckListView.qml) (revision a55e0de27d8c427dd4d441f47bb22ca2fe0ca462) +++ sources/gui/qml/compounds/CheckListView.qml (.../CheckListView.qml) (revision a7aab61ca63538c37b6931c60252680fc2ec2416) @@ -147,7 +147,6 @@ length : _delegate.width + 2 * linePad thickness : 1 color : Colors.checkListLine - opacity : 0.5 anchors { bottom : _delegate.bottom left : _delegate.left Index: sources/gui/qml/globals/Colors.qml =================================================================== diff -u -r4a2b83dcb56555861d2c741a8e8894e5b07e24bf -ra7aab61ca63538c37b6931c60252680fc2ec2416 --- sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 4a2b83dcb56555861d2c741a8e8894e5b07e24bf) +++ sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision a7aab61ca63538c37b6931c60252680fc2ec2416) @@ -106,7 +106,7 @@ readonly property color textTextRectExtra : "#708795" readonly property color line : "#094266" - readonly property color checkListLine : "#4E74A3" + readonly property color checkListLine : "#345477" readonly property color pressuresText : white readonly property color pressuresArterialBar : "#FF8282" Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -r4a2b83dcb56555861d2c741a8e8894e5b07e24bf -ra7aab61ca63538c37b6931c60252680fc2ec2416 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 4a2b83dcb56555861d2c741a8e8894e5b07e24bf) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision a7aab61ca63538c37b6931c60252680fc2ec2416) @@ -291,6 +291,7 @@ readonly property string preTreatmentStepLabelUltrafiltration : qsTr("BEGIN" ) readonly property string unitTextChlorine : qsTr("mg/L") + readonly property real chlorineLevel : 0.1 // Heparin readonly property string unitHeparinType : qsTr("IU/mL") Index: sources/gui/qml/pages/pretreatment/PreTreatmentPrime.qml =================================================================== diff -u -r4a2b83dcb56555861d2c741a8e8894e5b07e24bf -ra7aab61ca63538c37b6931c60252680fc2ec2416 --- sources/gui/qml/pages/pretreatment/PreTreatmentPrime.qml (.../PreTreatmentPrime.qml) (revision 4a2b83dcb56555861d2c741a8e8894e5b07e24bf) +++ sources/gui/qml/pages/pretreatment/PreTreatmentPrime.qml (.../PreTreatmentPrime.qml) (revision a7aab61ca63538c37b6931c60252680fc2ec2416) @@ -33,7 +33,7 @@ // time circle hasTimeCircle : true timeCircleMinimum : 0 - timeCircleMaximum : 3 * 60 // vPreTreatmentDisposablesPrime.total + timeCircleMaximum : 3 * 60 // vPreTreatmentDisposablesPrime.total // TODO implement in later story timeCircleProgressValue : 0 // vPreTreatmentDisposablesPrime.elapsed timeCircleTimeTextValue : timeCircleProgressValue * 60 // vPreTreatmentDisposablesPrime.remaining * 60 @@ -44,7 +44,7 @@ qsTr("Dialysate Circuit Priming" ), ] - + // TODO implement in later story // Connections { target: vPreTreatmentStates // function onSelfTestDryChanged ( vValue ) { page( _preTreatmentDrySelfTest , vValue )} // function onSelfTestDry_startChanged ( vValue ) { _preTreatmentDrySelfTest .checkList.setItemExt(0, true )} Index: sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml =================================================================== diff -u -r8a9a7d5cb3e54aa73e499ddec62653893e7d5ca7 -ra7aab61ca63538c37b6931c60252680fc2ec2416 --- sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml (.../PreTreatmentStack.qml) (revision 8a9a7d5cb3e54aa73e499ddec62653893e7d5ca7) +++ sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml (.../PreTreatmentStack.qml) (revision a7aab61ca63538c37b6931c60252680fc2ec2416) @@ -340,4 +340,16 @@ } } } + + // TODO - update in future story. Keep for now + // Connections { target: vPreTreatmentStates + // function onWaterSampleChanged ( vValue ) { page( _preTreatmentWaterSampleStack , vValue )} + // function onSelfTestConsumablesChanged ( vValue ) { page( _preTreatmentConsumablesStack , vValue )} + // function onSelfTestNoCartridgeChanged ( vValue ) { page( _preTreatmentDisposablesStack , vValue )} + // function onInstallationChanged ( vValue ) { page( _preTreatmentDisposablesStack , vValue )} // DEBUG: Experimental : console.debug("vinstallation " + // function onSelfTestDryChanged ( vValue ) { page( _pretreatmentPrimeStack , vValue )} + // function onPrimeChanged ( vValue ) { page( _pretreatmentPrimeStack , vValue )} // DEBUG: Experimental : console.debug("vprime " + // function onRecirculateChanged ( vValue ) { page( _pretreatmentPrimeStack , vValue )} // DEBUG: Experimental : console.debug("vrecirculate " + // function onPatientConnectionChanged ( vValue ) { page( _pretreatmentConnectionStack , vValue )} + // } } Index: sources/gui/qml/pages/pretreatment/PreTreatmentUltrafiltration.qml =================================================================== diff -u -ra55e0de27d8c427dd4d441f47bb22ca2fe0ca462 -ra7aab61ca63538c37b6931c60252680fc2ec2416 --- sources/gui/qml/pages/pretreatment/PreTreatmentUltrafiltration.qml (.../PreTreatmentUltrafiltration.qml) (revision a55e0de27d8c427dd4d441f47bb22ca2fe0ca462) +++ sources/gui/qml/pages/pretreatment/PreTreatmentUltrafiltration.qml (.../PreTreatmentUltrafiltration.qml) (revision a7aab61ca63538c37b6931c60252680fc2ec2416) @@ -143,7 +143,6 @@ thickness : 2 length : _root.width * .8 color : Colors.checkListLine - opacity : 0.4 anchors.horizontalCenter: parent.horizontalCenter } Index: sources/gui/qml/pages/pretreatment/PreTreatmentWaterSample.qml =================================================================== diff -u -r4a2b83dcb56555861d2c741a8e8894e5b07e24bf -ra7aab61ca63538c37b6931c60252680fc2ec2416 --- sources/gui/qml/pages/pretreatment/PreTreatmentWaterSample.qml (.../PreTreatmentWaterSample.qml) (revision 4a2b83dcb56555861d2c741a8e8894e5b07e24bf) +++ sources/gui/qml/pages/pretreatment/PreTreatmentWaterSample.qml (.../PreTreatmentWaterSample.qml) (revision a7aab61ca63538c37b6931c60252680fc2ec2416) @@ -107,7 +107,9 @@ WaterSampleContainer { id: _failContainer imageSource : "qrc:/images/iWaterSampleFail" buttonText : qsTr("Fail") - description : qsTr("Chlorine level > 0.1 %1").arg(Variables.unitTextChlorine) + description : ("%1 > %2 %3").arg(qsTr("Chlorine level")) + .arg(Variables.chlorineLevel) + .arg(Variables.unitTextChlorine) onClicked :{ _failContainer.selected = true _passContainer.selected = false @@ -117,7 +119,9 @@ WaterSampleContainer { id: _passContainer imageSource : "qrc:/images/iWaterSamplePass" buttonText : qsTr("Pass") - description : qsTr("Chlorine level ≤ 0.1 %1").arg(Variables.unitTextChlorine) + description : ("%1 ≤ %2 %3").arg(qsTr("Chlorine level")) + .arg(Variables.chlorineLevel) + .arg(Variables.unitTextChlorine) onClicked :{ _failContainer.selected = false _passContainer.selected = true Index: sources/view/settings/VSettings.h =================================================================== diff -u -ra55e0de27d8c427dd4d441f47bb22ca2fe0ca462 -ra7aab61ca63538c37b6931c60252680fc2ec2416 --- sources/view/settings/VSettings.h (.../VSettings.h) (revision a55e0de27d8c427dd4d441f47bb22ca2fe0ca462) +++ sources/view/settings/VSettings.h (.../VSettings.h) (revision a7aab61ca63538c37b6931c60252680fc2ec2416) @@ -30,8 +30,8 @@ class VSettings : public QObject { Q_OBJECT - - QString _location = QString(Storage::Settings_Category_InstructionsImagesLoc).arg(Storage::Settings_Path()); + const QString _advancedPrefix = "@"; + const QString _location = QString(Storage::Settings_Category_InstructionsImagesLoc).arg(Storage::Settings_Path()); typedef QList TKeysList; typedef struct { QString title ; @@ -100,7 +100,7 @@ void updateServicePassword (const QString &vPassword); void checkServicePasswordSet (); - QString groupFormat (const QString &vFirst, const QString &vSecond = QString()) { return QString("%1%2").arg(_advancedMode ? "@" : "") + QString groupFormat (const QString &vFirst, const QString &vSecond = QString()) { return QString("%1%2").arg(_advancedMode ? _advancedPrefix : "") .arg(vSecond.isEmpty() ? QString("%1").arg(vFirst) : QString("%1^%2").arg(vFirst, vSecond)); }