Index: sources/gui/qml/main.qml =================================================================== diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -rc8fc31f15b8a6f26f40824963577ed2d0957c946 --- sources/gui/qml/main.qml (.../main.qml) (revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e) +++ sources/gui/qml/main.qml (.../main.qml) (revision c8fc31f15b8a6f26f40824963577ed2d0957c946) @@ -31,6 +31,7 @@ import VAlarmStatus 0.1; import VPowerOff 0.1; import VHDOperationMode 0.1; +import VHDAccelerometer 0.1; import VTreatmentAdjustmentDuration 0.1; import VTreatmentAdjustmentFlows 0.1; @@ -109,6 +110,7 @@ VTreatmentPressureOcclusion { id: vTreatmentPressureOcclusion } VTreatmentUltrafiltration { id: vTreatmentUltrafiltration } VTreatmentTime { id: vTreatmentTime } + VHDAccelerometer { id: vHDAccelerometer } VDGDrainPump { id: vDGDrainPump } VDGHeaters { id: vDGHeaters } @@ -161,7 +163,6 @@ } NotificationBar { id: _alarm_bar - anchors.bottom: _mainMenu.top level : vAlarmStatus.alarm_Priority text : vAlarmStatus.text; @@ -173,8 +174,6 @@ _alarm_bar.visible = false; _alarm_dialog.visible = true; } - - } function isAlarmHighPriority() { @@ -204,7 +203,6 @@ } _alarm_bar.setFlashing(false); } - onClickedSilence: { _alarm_dialog.visible = false; vAlarmStatus.requestSilence(); @@ -264,10 +262,8 @@ default : // GuiActions.ALARM_PRIORITY_NONE root_color = Colors.textNotificationNoneBg; text_color = Colors.textNotificationNoneFg; - } return [root_color, text_color]; - } function getAlarmTopBarColors(level) { @@ -311,7 +307,6 @@ 2000 // notifies user and hides the dialog ) break; - } } } Index: sources/gui/qml/pages/ManagerHome.qml =================================================================== diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -rc8fc31f15b8a6f26f40824963577ed2d0957c946 --- sources/gui/qml/pages/ManagerHome.qml (.../ManagerHome.qml) (revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e) +++ sources/gui/qml/pages/ManagerHome.qml (.../ManagerHome.qml) (revision c8fc31f15b8a6f26f40824963577ed2d0957c946) @@ -220,6 +220,24 @@ textObjectName: "_HDOperationModeData" } + DebugDataColumn { id: _HDAccelerometerColumn + x: col(7) + y: row(3) + title: qsTr(" HD Acc ") + model: [ + vHDAccelerometer.x .toFixed(2) , + vHDAccelerometer.y .toFixed(2) , + vHDAccelerometer.z .toFixed(2) , + vHDAccelerometer.xMax .toFixed(2) , + vHDAccelerometer.yMax .toFixed(2) , + vHDAccelerometer.zMax .toFixed(2) , + vHDAccelerometer.xTilt .toFixed(2) , + vHDAccelerometer.yTilt .toFixed(2) , + vHDAccelerometer.zTilt .toFixed(2) + ] + textObjectName: "_HDAccelerometerData" + } + Text { id : _canbusFaultCountText x: col(0) y: row(6) Index: sources/model/hd/data/MHDAccelerometerData.cpp =================================================================== diff -u -r9187b3bc0167642cfb350a372654e4cfc0be046b -rc8fc31f15b8a6f26f40824963577ed2d0957c946 --- sources/model/hd/data/MHDAccelerometerData.cpp (.../MHDAccelerometerData.cpp) (revision 9187b3bc0167642cfb350a372654e4cfc0be046b) +++ sources/model/hd/data/MHDAccelerometerData.cpp (.../MHDAccelerometerData.cpp) (revision c8fc31f15b8a6f26f40824963577ed2d0957c946) @@ -18,29 +18,29 @@ QVariantList MHDAccelerometer::parameters() const { return { - _data.mX .value, - _data.mY .value, - _data.mZ .value, - _data.mXMax .value, - _data.mYMax .value, - _data.mZMax .value, - _data.mXTilt .value, - _data.mYTilt .value, - _data.mZTilt .value, + _data.mx .value, + _data.my .value, + _data.mz .value, + _data.mxMax .value, + _data.myMax .value, + _data.mzMax .value, + _data.mxTilt .value, + _data.myTilt .value, + _data.mzTilt .value, }; } bool MHDAccelerometer::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if (GetValue(vByteArray, index, _data.mX )) - if (GetValue(vByteArray, index, _data.mY )) - if (GetValue(vByteArray, index, _data.mZ )) - if (GetValue(vByteArray, index, _data.mXMax )) - if (GetValue(vByteArray, index, _data.mYMax )) - if (GetValue(vByteArray, index, _data.mZMax )) - if (GetValue(vByteArray, index, _data.mXTilt )) - if (GetValue(vByteArray, index, _data.mYTilt )) - if (GetValue(vByteArray, index, _data.mZTilt )) + if (GetValue(vByteArray, index, _data.mx )) + if (GetValue(vByteArray, index, _data.my )) + if (GetValue(vByteArray, index, _data.mz )) + if (GetValue(vByteArray, index, _data.mxMax )) + if (GetValue(vByteArray, index, _data.myMax )) + if (GetValue(vByteArray, index, _data.mzMax )) + if (GetValue(vByteArray, index, _data.mxTilt )) + if (GetValue(vByteArray, index, _data.myTilt )) + if (GetValue(vByteArray, index, _data.mzTilt )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } @@ -55,14 +55,14 @@ MHDAccelerometer::Data MHDAccelerometer::data() const { Data data; - data.mX = _data.mX .value; - data.mY = _data.mY .value; - data.mZ = _data.mZ .value; - data.mXMax = _data.mXMax .value; - data.mYMax = _data.mYMax .value; - data.mZMax = _data.mZMax .value; - data.mXTilt = _data.mXTilt .value; - data.mYTilt = _data.mYTilt .value; - data.mZTilt = _data.mZTilt .value; + data.mx = _data.mx .value; + data.my = _data.my .value; + data.mz = _data.mz .value; + data.mxMax = _data.mxMax .value; + data.myMax = _data.myMax .value; + data.mzMax = _data.mzMax .value; + data.mxTilt = _data.mxTilt .value; + data.myTilt = _data.myTilt .value; + data.mzTilt = _data.mzTilt .value; return data; } Index: sources/model/hd/data/MHDAccelerometerData.h =================================================================== diff -u -r9187b3bc0167642cfb350a372654e4cfc0be046b -rc8fc31f15b8a6f26f40824963577ed2d0957c946 --- sources/model/hd/data/MHDAccelerometerData.h (.../MHDAccelerometerData.h) (revision 9187b3bc0167642cfb350a372654e4cfc0be046b) +++ sources/model/hd/data/MHDAccelerometerData.h (.../MHDAccelerometerData.h) (revision c8fc31f15b8a6f26f40824963577ed2d0957c946) @@ -35,15 +35,15 @@ QVariantList parameters() const override; struct { - Types::F32 mX ; - Types::F32 mY ; - Types::F32 mZ ; - Types::F32 mXMax ; - Types::F32 mYMax ; - Types::F32 mZMax ; - Types::F32 mXTilt ; - Types::F32 mYTilt ; - Types::F32 mZTilt ; + Types::F32 mx ; + Types::F32 my ; + Types::F32 mz ; + Types::F32 mxMax ; + Types::F32 myMax ; + Types::F32 mzMax ; + Types::F32 mxTilt ; + Types::F32 myTilt ; + Types::F32 mzTilt ; } _data; public: @@ -53,15 +53,15 @@ QString infoText() const override { return QString("HDAccelData") ; } struct Data { - float mX = 0; /*!< X Magnitude of acceleration vector in X axis in g units */ - float mY = 0; /*!< Y Magnitude of acceleration vector in Y axis in g units */ - float mZ = 0; /*!< Z Magnitude of acceleration vector in Z axis in g units */ - float mXMax = 0; /*!< X Max Maximum magnitude of acceleration vector in X axis in g units */ - float mYMax = 0; /*!< Y Max Maximum magnitude of acceleration vector in Y axis in g units */ - float mZMax = 0; /*!< Z Max Maximum magnitude of acceleration vector in Z axis in g units */ - float mXTilt = 0; /*!< X Tilt Tilt angle in the X axis in degrees */ - float mYTilt = 0; /*!< Y Tilt Tilt angle in the Y axis in degrees */ - float mZTilt = 0; /*!< Z Tilt Tilt angle in the Z axis in degrees */ + float mx = 0; /*!< x Magnitude of acceleration vector in x axis in g units */ + float my = 0; /*!< y Magnitude of acceleration vector in y axis in g units */ + float mz = 0; /*!< z Magnitude of acceleration vector in z axis in g units */ + float mxMax = 0; /*!< x Max Maximum magnitude of acceleration vector in x axis in g units */ + float myMax = 0; /*!< y Max Maximum magnitude of acceleration vector in y axis in g units */ + float mzMax = 0; /*!< z Max Maximum magnitude of acceleration vector in z axis in g units */ + float mxTilt = 0; /*!< x Tilt Tilt angle in the x axis in degrees */ + float myTilt = 0; /*!< y Tilt Tilt angle in the y axis in degrees */ + float mzTilt = 0; /*!< z Tilt Tilt angle in the z axis in degrees */ }; public: @@ -70,7 +70,6 @@ bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; Data data ( ) const ; }; - } typedef Model::MHDAccelerometer::Data HDAccelerometerData; Index: sources/view/hd/data/VHDAccelerometerData.cpp =================================================================== diff -u -r9187b3bc0167642cfb350a372654e4cfc0be046b -rc8fc31f15b8a6f26f40824963577ed2d0957c946 --- sources/view/hd/data/VHDAccelerometerData.cpp (.../VHDAccelerometerData.cpp) (revision 9187b3bc0167642cfb350a372654e4cfc0be046b) +++ sources/view/hd/data/VHDAccelerometerData.cpp (.../VHDAccelerometerData.cpp) (revision c8fc31f15b8a6f26f40824963577ed2d0957c946) @@ -21,13 +21,13 @@ void VHDAccelerometer::onActionReceive(const HDAccelerometerData &vData) { - X (vData.mX ); - Y (vData.mY ); - Z (vData.mZ ); - XMax (vData.mXMax ); - YMax (vData.mYMax ); - ZMax (vData.mZMax ); - XTilt (vData.mXTilt ); - YTilt (vData.mYTilt ); - ZTilt (vData.mZTilt ); + x (vData.mx ); + y (vData.my ); + z (vData.mz ); + xMax (vData.mxMax ); + yMax (vData.myMax ); + zMax (vData.mzMax ); + zTilt (vData.mxTilt ); + yTilt (vData.myTilt ); + zTilt (vData.mzTilt ); } Index: sources/view/hd/data/VHDAccelerometerData.h =================================================================== diff -u -r9187b3bc0167642cfb350a372654e4cfc0be046b -rc8fc31f15b8a6f26f40824963577ed2d0957c946 --- sources/view/hd/data/VHDAccelerometerData.h (.../VHDAccelerometerData.h) (revision 9187b3bc0167642cfb350a372654e4cfc0be046b) +++ sources/view/hd/data/VHDAccelerometerData.h (.../VHDAccelerometerData.h) (revision c8fc31f15b8a6f26f40824963577ed2d0957c946) @@ -28,15 +28,15 @@ { Q_OBJECT - PROPERTY( float , X , 0) - PROPERTY( float , Y , 0) - PROPERTY( float , Z , 0) - PROPERTY( float , XMax , 0) - PROPERTY( float , YMax , 0) - PROPERTY( float , ZMax , 0) - PROPERTY( float , XTilt , 0) - PROPERTY( float , YTilt , 0) - PROPERTY( float , ZTilt , 0) + PROPERTY( float , x , 0) + PROPERTY( float , y , 0) + PROPERTY( float , z , 0) + PROPERTY( float , xMax , 0) + PROPERTY( float , yMax , 0) + PROPERTY( float , zMax , 0) + PROPERTY( float , xTilt , 0) + PROPERTY( float , yTilt , 0) + PROPERTY( float , zTilt , 0) VIEW_DEC(VHDAccelerometer, HDAccelerometerData) };