Index: sources/gui/qml/pages/SettingsHome.qml =================================================================== diff -u -rd2035a8728794afeefaa244bf8d1597926d945f5 -r93b6ad6b18c505fedab37d95dc87be61db48641c --- sources/gui/qml/pages/SettingsHome.qml (.../SettingsHome.qml) (revision d2035a8728794afeefaa244bf8d1597926d945f5) +++ sources/gui/qml/pages/SettingsHome.qml (.../SettingsHome.qml) (revision 93b6ad6b18c505fedab37d95dc87be61db48641c) @@ -1,16 +1,16 @@ /*! - * + * * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. - * + * * \file SettingsHome.qml * \author (last) Peter Lucia * \date (last) 01-Jul-2020 * \author (original) Behrouz NematiPour * \date (original) 21-Oct-2019 - * + * */ // Qt @@ -28,6 +28,7 @@ * which is the default screen in the "Settings" stack */ ScreenItem { id: _root + Text { id : _titleText visible: true anchors { @@ -50,6 +51,18 @@ rightMargin : (Variables.headerHeight - Variables.logoHeight) / 2 } } + + ExportButton { id: _exportButton + width: 150 + height: 50 + anchors { + top : parent.top + right : _poweroffButton.left + topMargin : (Variables.headerHeight - Variables.logoHeight) / 2 + rightMargin : (Variables.headerHeight - Variables.logoHeight) / 2 + } + } + TouchRect { id : _poweroffButton width: 150 height: Variables.logoHeight @@ -64,13 +77,31 @@ button.onPressed: { _GuiView.doActionTransmit(GuiActions.ID_PowerOff, GuiActions.NoData) } + } + + Text { id : _canbusFaultCountText + property int count: 0 + visible: true + anchors { + top : parent.top + left : parent.left + topMargin : (Variables.headerHeight - Variables.logoHeight) / 2 + leftMargin : (Variables.headerHeight - Variables.logoHeight) / 2 + } + text: qsTr("CAN Faults : %1").arg(count) + horizontalAlignment: Text.AlignLeft + color: Colors.textMain + font.pixelSize: Fonts.fontPixelTitle + } + Connections { target: _GuiView onDidActionReceive: { if (vAction === GuiActions.ID_CANBusFaultCount ) { _canbusFaultCountText.count = vData[0] } } } + Column { id: _BloodFlowColumn width : 150 spacing : 20 @@ -84,6 +115,27 @@ color: Colors.textMain font.pixelSize: Fonts.fontPixelTitle font.underline: true + } + Repeater { + model: [ + vTreatmentBloodFlow.bloodFlow_FlowSetPoint , + vTreatmentBloodFlow.bloodFlow_MeasuredFlow .toFixed(2) , + vTreatmentBloodFlow.bloodFlow_RotorSpeed .toFixed(2) , + vTreatmentBloodFlow.bloodFlow_MotorSpeed .toFixed(2) , + vTreatmentBloodFlow.bloodFlow_MotorCtlSpeed .toFixed(2) , + vTreatmentBloodFlow.bloodFlow_MotorCtlCurrent .toFixed(2) , + "%" + vTreatmentBloodFlow.bloodFlow_PWMDutyCycle .toFixed(2) + ] + Text { + text: modelData + width: _BloodFlowColumn.width + horizontalAlignment: Text.AlignRight + color: Colors.textMain + font.pixelSize: Fonts.fontPixelTitle + } + } + } + Column { id: _DialysateInletFlowColumn width : 150 spacing : 20 @@ -117,6 +169,7 @@ } } } + Column { id: _DialysateOutletFlowColumn width : 150 spacing : 20