Index: main.cpp =================================================================== diff -u -r7045fd6002bdeb28e23a7af6a708a852d522ad12 -r8f71000a841da5e8f18efccbb30a7655d3a211cd --- main.cpp (.../main.cpp) (revision 7045fd6002bdeb28e23a7af6a708a852d522ad12) +++ main.cpp (.../main.cpp) (revision 8f71000a841da5e8f18efccbb30a7655d3a211cd) @@ -66,7 +66,7 @@ int gFakeInterval = 0 ; QByteArray gFakeData = "" ; const char *gFakeData_default = "00" ; -bool gSendEmptyKeepAwake = true ; +bool gSendEmptyKeepAwake = false ; bool gFakeSeqAtBegin = false ; bool gDisableHunhandledReport = false ; @@ -84,7 +84,7 @@ * -v, --version Displays version information. \n * -c, --canOut Show the Can Frame Output \n * -m, --msgOut Show the Message Output \n - * -0, --disable-keep-awake Disable send low priority, empty message on \n + * -0, --enable-keep-awake Enable send low priority, empty message on \n * the CANBus just to keep UI board CAN driver \n * awake \n * -i, --fake-interval Test fake message interval(ms) \n @@ -112,9 +112,9 @@ QCoreApplication::translate("main", "Show the Message Output")); parser.addOption(optionConsoleoutFrameInterface); - // --- -0 : disable-keep-awake (the fast mode) - QCommandLineOption optionSendEmptyKeepAwake(QStringList() << "0" << "disable-keep-awake", - QCoreApplication::translate("main", "Disable send low priority, empty message on the CANBus just to keep UI board CAN driver awake")); + // --- -0 : enable-keep-awake (the fast mode) + QCommandLineOption optionSendEmptyKeepAwake(QStringList() << "0" << "enable-keep-awake", + QCoreApplication::translate("main", "Enable send low priority, empty message on the CANBus just to keep UI board CAN driver awake")); parser.addOption(optionSendEmptyKeepAwake); // --- -i : fake-interval @@ -152,7 +152,7 @@ gConsoleoutFrameInterface = parser.isSet(optionConsoleoutFrameInterface ); gDisableHunhandledReport = parser.isSet(optionDisableHunhandledReport ); - if (parser.isSet(optionSendEmptyKeepAwake)) gSendEmptyKeepAwake = false; + if (parser.isSet(optionSendEmptyKeepAwake)) gSendEmptyKeepAwake = true; bool ok = false; if (parser.isSet(optionFakeInterval)) { Index: sources/canbus/messageglobals.h =================================================================== diff -u -r41eec18961c2861652405a80c9cad523c0475172 -r8f71000a841da5e8f18efccbb30a7655d3a211cd --- sources/canbus/messageglobals.h (.../messageglobals.h) (revision 41eec18961c2861652405a80c9cad523c0475172) +++ sources/canbus/messageglobals.h (.../messageglobals.h) (revision 8f71000a841da5e8f18efccbb30a7655d3a211cd) @@ -73,7 +73,7 @@ // ---- {Gui::GuiActionType::AdjustUltrafiltrationEditReq , 1 * 4 }, // 1 parameters each 4bytes - {Gui::GuiActionType::AdjustUltrafiltrationEditRsp , 7 * 4 }, // 7 parameters each 4bytes + {Gui::GuiActionType::AdjustUltrafiltrationEditRsp , 8 * 4 }, // 8 parameters each 4bytes // ---- {Gui::GuiActionType::AdjustUltrafiltrationConfirmReq , 2 * 4 }, // 2 parameters each 4bytes Index: sources/gui/qml/components/MainMenu.qml =================================================================== diff -u -r670f257c9b88d3e5506eccaad111bec914102a72 -r8f71000a841da5e8f18efccbb30a7655d3a211cd --- sources/gui/qml/components/MainMenu.qml (.../MainMenu.qml) (revision 670f257c9b88d3e5506eccaad111bec914102a72) +++ sources/gui/qml/components/MainMenu.qml (.../MainMenu.qml) (revision 8f71000a841da5e8f18efccbb30a7655d3a211cd) @@ -119,7 +119,6 @@ } TouchRect { id : _rightTouchRect visible: hasRightText - objectName: "_rightTouchRect" //SquishQt testability width: partitionWidth + rightTextGaps height: parent.height text.text: _private.rightText Index: sources/gui/qml/components/ModalDialog.qml =================================================================== diff -u -reb19475a6bf4ed7f6a16bc07eefc7813496620ef -r8f71000a841da5e8f18efccbb30a7655d3a211cd --- sources/gui/qml/components/ModalDialog.qml (.../ModalDialog.qml) (revision eb19475a6bf4ed7f6a16bc07eefc7813496620ef) +++ sources/gui/qml/components/ModalDialog.qml (.../ModalDialog.qml) (revision 8f71000a841da5e8f18efccbb30a7655d3a211cd) @@ -24,6 +24,8 @@ * \brief The parent item for modal dialogs */ Dialog { id : _root + contentItem.objectName: "ModalDialog" //SquishQt testability + property bool autoHide : false property int autoHideDuration : 1000 Index: sources/gui/qml/components/UltrafiltrationButton.qml =================================================================== diff -u -rac31b8d2725200adbff01ceaebda9ff2b1e0d719 -r8f71000a841da5e8f18efccbb30a7655d3a211cd --- sources/gui/qml/components/UltrafiltrationButton.qml (.../UltrafiltrationButton.qml) (revision ac31b8d2725200adbff01ceaebda9ff2b1e0d719) +++ sources/gui/qml/components/UltrafiltrationButton.qml (.../UltrafiltrationButton.qml) (revision 8f71000a841da5e8f18efccbb30a7655d3a211cd) @@ -31,8 +31,11 @@ TreatmentDuration } - property string title : "" - property string description : "" + readonly property alias title : _title.text + readonly property alias description : _description.text + + property string titleString : "" + property string descriptionString : "" property string valueText : "" property color textColor : "white" @@ -63,7 +66,7 @@ } Text { id: _title - text: _root.title.arg(disabled ? qsTr("Invalid") : isIncrease ? qsTr("Increase") : qsTr("Decrease")) + text: _root.titleString.arg(disabled ? qsTr("Invalid") : isIncrease ? qsTr("Increase") : qsTr("Decrease")) font.pixelSize: 35 font.weight: Font.DemiBold color: disabled ? Colors.textDisableButton : textColor @@ -76,7 +79,7 @@ } Text { id: _description - text: disabled ? qsTr("Due to out of range adjutsment this option\nis disabled.") : _root.description.arg(isIncrease ? "increases" : "decreases") + text: disabled ? qsTr("Due to out of range adjustment, this option\nis disabled.") : _root.descriptionString.arg(isIncrease ? "increases" : "decreases") font.pixelSize: 26 color: disabled ? Colors.textDisableButton : textColor anchors { Index: sources/gui/qml/dialogs/AutoHideInfo.qml =================================================================== diff -u -rcd7de5f6d239a11615ba8c6c03339a10996486ca -r8f71000a841da5e8f18efccbb30a7655d3a211cd --- sources/gui/qml/dialogs/AutoHideInfo.qml (.../AutoHideInfo.qml) (revision cd7de5f6d239a11615ba8c6c03339a10996486ca) +++ sources/gui/qml/dialogs/AutoHideInfo.qml (.../AutoHideInfo.qml) (revision 8f71000a841da5e8f18efccbb30a7655d3a211cd) @@ -26,6 +26,8 @@ * and will be hidden in a second */ ModalDialog { id : _root + contentItem.objectName: "AutoHideInfoDialog" //SquishQt testability + property string message: "" autoHide: true Index: sources/gui/qml/dialogs/PowerOff.qml =================================================================== diff -u -rcd7de5f6d239a11615ba8c6c03339a10996486ca -r8f71000a841da5e8f18efccbb30a7655d3a211cd --- sources/gui/qml/dialogs/PowerOff.qml (.../PowerOff.qml) (revision cd7de5f6d239a11615ba8c6c03339a10996486ca) +++ sources/gui/qml/dialogs/PowerOff.qml (.../PowerOff.qml) (revision 8f71000a841da5e8f18efccbb30a7655d3a211cd) @@ -24,6 +24,8 @@ * \brief Contains the PowerOff Dialog Implementation */ ModalDialog { id : _root + contentItem.objectName: "PowerOffDialog" //SquishQt testability + Column { spacing: Variables.columnSpacing anchors.centerIn: parent Index: sources/gui/qml/main.qml =================================================================== diff -u -reece7acacf84e8cc34b830f6b5ab3f112823a905 -r8f71000a841da5e8f18efccbb30a7655d3a211cd --- sources/gui/qml/main.qml (.../main.qml) (revision eece7acacf84e8cc34b830f6b5ab3f112823a905) +++ sources/gui/qml/main.qml (.../main.qml) (revision 8f71000a841da5e8f18efccbb30a7655d3a211cd) @@ -95,7 +95,7 @@ // 1 - 1 SettingsStack { id: _settingsStack } // 1 - 2 - ManagerStack { id: _mansagerStack } + ManagerStack { id: _managerStack } // 1 - 3 TreatmentStack { id: _treatmentStack } @@ -107,7 +107,7 @@ } onItemPressed: { _treatmentStack.visible = vIndex == 0; - _mansagerStack .visible = vIndex == 1; + _managerStack .visible = vIndex == 1; _settingsStack .visible = vIndex == 2; } } Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -r5734e6289c18ec3cfe4749de8e3a6043f98dbcff -r8f71000a841da5e8f18efccbb30a7655d3a211cd --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 5734e6289c18ec3cfe4749de8e3a6043f98dbcff) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 8f71000a841da5e8f18efccbb30a7655d3a211cd) @@ -29,6 +29,8 @@ * is selected from the main menu. */ StackItem { id : _root + objectName: "TreatmentStack" + stackView.initialItem : _treatmentHome VTreatmentRanges { id: vTreatmentRanges } Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml =================================================================== diff -u -rcdb3ba0b019e5f279ca959b1e32ca0097261f6ef -r8f71000a841da5e8f18efccbb30a7655d3a211cd --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml (.../TreatmentAdjustmentBase.qml) (revision cdb3ba0b019e5f279ca959b1e32ca0097261f6ef) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml (.../TreatmentAdjustmentBase.qml) (revision 8f71000a841da5e8f18efccbb30a7655d3a211cd) @@ -26,6 +26,7 @@ * For all adjustment screens in treatment */ ModalDialog { id: _root + contentItem.objectName: "TreatmentAdjustmentBase" //SquishQt testability property string titleText: "" Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml =================================================================== diff -u -r5734e6289c18ec3cfe4749de8e3a6043f98dbcff -r8f71000a841da5e8f18efccbb30a7655d3a211cd --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml (.../TreatmentAdjustmentDuration.qml) (revision 5734e6289c18ec3cfe4749de8e3a6043f98dbcff) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml (.../TreatmentAdjustmentDuration.qml) (revision 8f71000a841da5e8f18efccbb30a7655d3a211cd) @@ -26,6 +26,8 @@ * To adjust the treatment duration */ TreatmentAdjustmentBase { id: _root + contentItem.objectName: "TreatmentAdjustmentDuration" //SquishQt testability + /* -- */ property alias durationValue : _durationSlider.value readonly property alias durationMinimum : _durationSlider.minimum readonly property alias durationMaximum : _durationSlider.maximum Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml =================================================================== diff -u -rcdb3ba0b019e5f279ca959b1e32ca0097261f6ef -r8f71000a841da5e8f18efccbb30a7655d3a211cd --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml (.../TreatmentAdjustmentFlow.qml) (revision cdb3ba0b019e5f279ca959b1e32ca0097261f6ef) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml (.../TreatmentAdjustmentFlow.qml) (revision 8f71000a841da5e8f18efccbb30a7655d3a211cd) @@ -26,6 +26,7 @@ * To adjust the treatment blood/dialysate flow */ TreatmentAdjustmentBase { id: _root + contentItem.objectName: "TreatmentAdjustmentFlow" //SquishQt testability property alias bloodFlowRateValue : _bloodFlowSlider.value property alias bloodFlowRateMinimum : _bloodFlowSlider.minimum Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml =================================================================== diff -u -r6866ee04934367893f32ed6ded45499d6fbfb248 -r8f71000a841da5e8f18efccbb30a7655d3a211cd --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml (.../TreatmentAdjustmentUltrafiltrationConfirm.qml) (revision 6866ee04934367893f32ed6ded45499d6fbfb248) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml (.../TreatmentAdjustmentUltrafiltrationConfirm.qml) (revision 8f71000a841da5e8f18efccbb30a7655d3a211cd) @@ -27,6 +27,8 @@ * To adjust the treatment ultrafiltration */ TreatmentAdjustmentBase { id: _root + contentItem.objectName: "TreatmentAdjustmentUltrafiltrationConfirm" //SquishQt testability + QtObject { id: _private property int decimalVolume: vTreatmentUltrafiltration.precision property int decimalRate : 0 @@ -107,8 +109,8 @@ horizontalCenter: parent.horizontalCenter } UltrafiltrationButton { id: _rateAdjustmentButton - title : qsTr("%1 UF Rate") - description : qsTr("The rate %3 by %1 %2,\nthe treatment duration remains the same.") + titleString : qsTr("%1 UF Rate") + descriptionString : qsTr("The rate %3 by %1 %2,\nthe treatment duration remains the same.") .arg(Math.abs(ultrafiltrationRateDiff .toFixed(_private.decimalRate))) .arg(ultrafiltrationRateUnit) buttonType : UltrafiltrationButton.ButtonType.UltrafiltrationRate @@ -124,8 +126,8 @@ } UltrafiltrationButton { id: _durationAdjustmentButton - title : qsTr("%1 Treatment Duration") - description : qsTr("Rate remains, the treatment\nduration %2 by %1 minutes.") + titleString : qsTr("%1 Treatment Duration") + descriptionString : qsTr("The rate remains, the treatment\nduration %2 by %1 minutes.") .arg(Math.abs(treatmentDurationDiff)) buttonType: UltrafiltrationButton.ButtonType.TreatmentDuration isIncrease: treatmentDurationDiff > 0 Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml =================================================================== diff -u -rf160ef9c259a75e8d6120ad962cda648e8f7a9b3 -r8f71000a841da5e8f18efccbb30a7655d3a211cd --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision f160ef9c259a75e8d6120ad962cda648e8f7a9b3) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision 8f71000a841da5e8f18efccbb30a7655d3a211cd) @@ -26,6 +26,7 @@ * To adjust the treatment ultrafiltration */ TreatmentAdjustmentBase { id: _root + contentItem.objectName: "TreatmentAdjustmentUltrafiltrationEdit" //SquishQt testability QtObject { id: _private property int decimal : vTreatmentUltrafiltration.precision property real minimum : vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Min @@ -92,7 +93,7 @@ maximum : _private.maximum - maxGapValue } - Text { id: _textMaximum + Text { id: _textVolume visible : true color : "white" text : _private.adjusted.toFixed(_private.decimal) Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml =================================================================== diff -u -rf160ef9c259a75e8d6120ad962cda648e8f7a9b3 -r8f71000a841da5e8f18efccbb30a7655d3a211cd --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml (.../TreatmentAdjustmentUltrafiltrationPaused.qml) (revision f160ef9c259a75e8d6120ad962cda648e8f7a9b3) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml (.../TreatmentAdjustmentUltrafiltrationPaused.qml) (revision 8f71000a841da5e8f18efccbb30a7655d3a211cd) @@ -26,6 +26,7 @@ * To adjust the treatment ultrafiltration */ TreatmentAdjustmentBase { id: _root + contentItem.objectName: "TreatmentAdjustmentUltrafiltrationPause" //SquishQt testability QtObject { id: _private property int decimal: vTreatmentUltrafiltration.precision property real minimum: vTreatmentUltrafiltration.minimum Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml =================================================================== diff -u -rf160ef9c259a75e8d6120ad962cda648e8f7a9b3 -r8f71000a841da5e8f18efccbb30a7655d3a211cd --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml (.../TreatmentAdjustmentUltrafiltrationStart.qml) (revision f160ef9c259a75e8d6120ad962cda648e8f7a9b3) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml (.../TreatmentAdjustmentUltrafiltrationStart.qml) (revision 8f71000a841da5e8f18efccbb30a7655d3a211cd) @@ -26,6 +26,8 @@ * To adjust the treatment ultrafiltration */ TreatmentAdjustmentBase { id: _root + contentItem.objectName: "TreatmentAdjustmentUltrafiltrationStart" //SquishQt testability + QtObject { id: _private property int decimal: vTreatmentUltrafiltration.precision property real minimum: vTreatmentUltrafiltration.minimum