Index: en_US.udic =================================================================== diff -u -rf61c0aebdb0768f44883696c3a55bf26e7156489 -r2d2917978a4e25eb79a0fb71851b6124171d8072 --- en_US.udic (.../en_US.udic) (revision f61c0aebdb0768f44883696c3a55bf26e7156489) +++ en_US.udic (.../en_US.udic) (revision 2d2917978a4e25eb79a0fb71851b6124171d8072) @@ -30,3 +30,5 @@ VHDTreatment Peman Montazemi +Accelerometer +accelerometer Index: sources/gui/qml/components/StackItem.qml =================================================================== diff -u -r07e0c7bd409782cab96a4ae761ee3f819bdb8639 -r2d2917978a4e25eb79a0fb71851b6124171d8072 --- sources/gui/qml/components/StackItem.qml (.../StackItem.qml) (revision 07e0c7bd409782cab96a4ae761ee3f819bdb8639) +++ sources/gui/qml/components/StackItem.qml (.../StackItem.qml) (revision 2d2917978a4e25eb79a0fb71851b6124171d8072) @@ -30,12 +30,20 @@ width : Variables.applicationWidth height: Variables.applicationHeight + /*! + * \brief prints out the list of the items in the stack by their index position in the stack. + */ function info() { for( var i = 0; i < _stackView.depth; i++ ) { console.debug("index:", i, _stackView.get(i)) } } + /*! + * \brief page function gets the screen vScreen and tries to find the screen in the stack. + * if the page found will pop the items on stack down to that screen. + * otherwise adds that screen on top of the stack + */ function page(vScreen) { if (stackView.find(function(screen) { return screen === vScreen; @@ -48,11 +56,17 @@ info() } + /*! + * \brief pops the screen vScreen from the top of the stack + */ function pop (vScreen) { _stackView.pop(vScreen) info() } + /*! + * \brief pushes the screen vScreen on the top of the stack + */ function push (vScreen) { if ( _stackView.currentItem === vScreen) { console.debug("same current screen didn't push" , vScreen.name) @@ -63,6 +77,12 @@ info() } + /*! + * \brief replaces the current item of the stack (top) with the vScreen, if the vReplaces hasn't been passed + * otherwise will replace the screen vScreen with the screen vReplaced. + * \note it doens't check if the screen vReplaced exists in the stack, + * and it needs to be in the stack to be replaced. + */ function replace(vScreen, vReplaced) { if (vReplaced === undefined) { _stackView.replace(_stackView.currentItem, vScreen) Index: sources/gui/qml/pages/ManagerHome.qml =================================================================== diff -u -ra0f2700fad25ef602d0e3b953186d5572efd8169 -r2d2917978a4e25eb79a0fb71851b6124171d8072 --- sources/gui/qml/pages/ManagerHome.qml (.../ManagerHome.qml) (revision a0f2700fad25ef602d0e3b953186d5572efd8169) +++ sources/gui/qml/pages/ManagerHome.qml (.../ManagerHome.qml) (revision 2d2917978a4e25eb79a0fb71851b6124171d8072) @@ -277,14 +277,14 @@ y: row(4.5) title: qsTr(" HD Ver ") model: [ "v%1.%2.%3-%4 %5 v%6.%7 %8" - .arg(vTreatmentAdjustmentVersions.HDVerMajor) - .arg(vTreatmentAdjustmentVersions.HDVerMinor) - .arg(vTreatmentAdjustmentVersions.HDVerMicro) - .arg(vTreatmentAdjustmentVersions.HDVerBuild) - .arg(vTreatmentAdjustmentVersions.HDVerFPGAId) - .arg(vTreatmentAdjustmentVersions.HDVerFPGAMajor) - .arg(vTreatmentAdjustmentVersions.HDVerFPGAMinor) - .arg(vTreatmentAdjustmentVersions.HDVerFPGALab) + .arg(vTreatmentAdjustmentVersions.hdVerMajor) + .arg(vTreatmentAdjustmentVersions.hdVerMinor) + .arg(vTreatmentAdjustmentVersions.hdVerMicro) + .arg(vTreatmentAdjustmentVersions.hdVerBuild) + .arg(vTreatmentAdjustmentVersions.hdVerFPGAId) + .arg(vTreatmentAdjustmentVersions.hdVerFPGAMajor) + .arg(vTreatmentAdjustmentVersions.hdVerFPGAMinor) + .arg(vTreatmentAdjustmentVersions.hdVerFPGALab) ] textObjectName: "_HDVersions" } @@ -294,14 +294,14 @@ y: row(5.4) title: qsTr(" DG Ver ") model: [ "v%1.%2.%3-%4 %5 v%6.%7 %8" - .arg(vTreatmentAdjustmentVersions.DGVerMajor) - .arg(vTreatmentAdjustmentVersions.DGVerMinor) - .arg(vTreatmentAdjustmentVersions.DGVerMicro) - .arg(vTreatmentAdjustmentVersions.DGVerBuild) - .arg(vTreatmentAdjustmentVersions.DGVerFPGAId) - .arg(vTreatmentAdjustmentVersions.DGVerFPGAMajor) - .arg(vTreatmentAdjustmentVersions.DGVerFPGAMinor) - .arg(vTreatmentAdjustmentVersions.DGVerFPGALab) + .arg(vTreatmentAdjustmentVersions.dgVerMajor) + .arg(vTreatmentAdjustmentVersions.dgVerMinor) + .arg(vTreatmentAdjustmentVersions.dgVerMicro) + .arg(vTreatmentAdjustmentVersions.dgVerBuild) + .arg(vTreatmentAdjustmentVersions.dgVerFPGAId) + .arg(vTreatmentAdjustmentVersions.dgVerFPGAMajor) + .arg(vTreatmentAdjustmentVersions.dgVerFPGAMinor) + .arg(vTreatmentAdjustmentVersions.dgVerFPGALab) ] textObjectName: "_DGVersions" } Index: sources/gui/qml/pages/postTreatment/PostTreatmentBloodPrime.qml =================================================================== diff -u -r2d37388a2b6651ea4002d6720e933315e0ba7fa3 -r2d2917978a4e25eb79a0fb71851b6124171d8072 --- sources/gui/qml/pages/postTreatment/PostTreatmentBloodPrime.qml (.../PostTreatmentBloodPrime.qml) (revision 2d37388a2b6651ea4002d6720e933315e0ba7fa3) +++ sources/gui/qml/pages/postTreatment/PostTreatmentBloodPrime.qml (.../PostTreatmentBloodPrime.qml) (revision 2d2917978a4e25eb79a0fb71851b6124171d8072) @@ -27,8 +27,6 @@ ScreenItem { id: _root objectName: "_PostTreatmentBloodPrime" - property alias reasonText : _notification.text - Text { id: _title anchors { top: parent.top @@ -56,16 +54,4 @@ } } - - NotificationBar { id: _notification - iconVisible: false - } - - onVisibleChanged: { - _notification.text = "" - if (visible) { - _mainMenu .hidden = true - _treatmentMenu.hidden = true - } - } } Index: sources/gui/qml/pages/postTreatment/end/PostTreatmentEndPause.qml =================================================================== diff -u -r07e0c7bd409782cab96a4ae761ee3f819bdb8639 -r2d2917978a4e25eb79a0fb71851b6124171d8072 --- sources/gui/qml/pages/postTreatment/end/PostTreatmentEndPause.qml (.../PostTreatmentEndPause.qml) (revision 07e0c7bd409782cab96a4ae761ee3f819bdb8639) +++ sources/gui/qml/pages/postTreatment/end/PostTreatmentEndPause.qml (.../PostTreatmentEndPause.qml) (revision 2d2917978a4e25eb79a0fb71851b6124171d8072) @@ -27,10 +27,6 @@ ScreenItem { id: _root objectName: "_PostTreatmentEndPause" - property alias reasonText : _notification.text - - signal buttonClicked() - QtObject { id: _private property int sectionSpace : 30 property int sectionWidth : _root.width * 2/3 - sectionSpace * 1.5 @@ -77,36 +73,4 @@ font.pixelSize: Fonts.fontPixelButton } } - - Row { id: _buttonGroup - property int buttonsWidth : 300 - spacing: 75 - - anchors { - bottom : parent.bottom - horizontalCenter: parent.horizontalCenter - rightMargin : spacing - leftMargin : spacing - bottomMargin : spacing - } - - TouchRect { id : _buttonTouchRect - visible : false - text.text : qsTr("") - width : _buttonGroup.buttonsWidth - onClicked : buttonClicked() - } - } - - NotificationBar { id: _notification - iconVisible: false - } - - onVisibleChanged: { - _notification.text = "" - if (visible) { - _mainMenu .hidden = true - _treatmentMenu.hidden = true - } - } } Index: sources/model/dg/data/MDGAccelerometerData.h =================================================================== diff -u -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 -r2d2917978a4e25eb79a0fb71851b6124171d8072 --- sources/model/dg/data/MDGAccelerometerData.h (.../MDGAccelerometerData.h) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) +++ sources/model/dg/data/MDGAccelerometerData.h (.../MDGAccelerometerData.h) (revision 2d2917978a4e25eb79a0fb71851b6124171d8072) @@ -33,7 +33,7 @@ * * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | * |:------:|:------:|:-----:|:----:|:---:|:---:|:----:|:---------------------:| - * | 0x3400 | 0x080 | 8 | 1 Hz | N | DG | UI | DG Acceleromter Data | + * | 0x3400 | 0x080 | 8 | 1 Hz | N | DG | UI | DG Accelerometer Data | * * | Payload || * | || Index: sources/model/hd/data/MHDAccelerometerData.h =================================================================== diff -u -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 -r2d2917978a4e25eb79a0fb71851b6124171d8072 --- sources/model/hd/data/MHDAccelerometerData.h (.../MHDAccelerometerData.h) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) +++ sources/model/hd/data/MHDAccelerometerData.h (.../MHDAccelerometerData.h) (revision 2d2917978a4e25eb79a0fb71851b6124171d8072) @@ -34,7 +34,7 @@ * * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | * |:------:|:------:|:-----:|:----:|:---:|:---:|:----:|:---------------------:| - * | 0x3300 | 0x040 | 7 | 1 Hz | N | HD | UI | HD Acceleromter Data | + * | 0x3300 | 0x040 | 7 | 1 Hz | N | HD | UI | HD Accelerometer Data | * * | Payload || * | || @@ -49,7 +49,6 @@ * | #9:(F32) | \ref Data::mZTilt | * * \sa Data - * \sa MHDAccemelometer : HD Accelerometer Data * *

Logging info

* | || Index: sources/view/hd/adjustment/VTreatmentAdjustmentRecirculate.cpp =================================================================== diff -u -r28a383251ad37c669202c0a717ff90b8fc21a442 -r2d2917978a4e25eb79a0fb71851b6124171d8072 --- sources/view/hd/adjustment/VTreatmentAdjustmentRecirculate.cpp (.../VTreatmentAdjustmentRecirculate.cpp) (revision 28a383251ad37c669202c0a717ff90b8fc21a442) +++ sources/view/hd/adjustment/VTreatmentAdjustmentRecirculate.cpp (.../VTreatmentAdjustmentRecirculate.cpp) (revision 2d2917978a4e25eb79a0fb71851b6124171d8072) @@ -75,6 +75,3 @@ void View::VTreatmentAdjustmentRecirculate::doTreatmentEnd() { doAdjustment( GuiRecirculateCommands::REQUESTED_USER_ACTION_TX_RECIRC_END_TREATMENT ); } - - - Index: sources/view/hd/adjustment/VTreatmentAdjustmentVersions.cpp =================================================================== diff -u -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 -r2d2917978a4e25eb79a0fb71851b6124171d8072 --- sources/view/hd/adjustment/VTreatmentAdjustmentVersions.cpp (.../VTreatmentAdjustmentVersions.cpp) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) +++ sources/view/hd/adjustment/VTreatmentAdjustmentVersions.cpp (.../VTreatmentAdjustmentVersions.cpp) (revision 2d2917978a4e25eb79a0fb71851b6124171d8072) @@ -28,14 +28,14 @@ void VTreatmentAdjustmentVersions::onActionReceive(const AdjustHDVersionsResponseData &vData) { // HD versions data - HDVerMajor (vData.mMajor ); - HDVerMinor (vData.mMinor ); - HDVerMicro (vData.mMicro ); - HDVerBuild (vData.mBuild ); - HDVerFPGAId (vData.mFPGAId ); - HDVerFPGAMajor (vData.mFPGAMajor); - HDVerFPGAMinor (vData.mFPGAMinor); - HDVerFPGALab (vData.mFPGALab ); + hdVerMajor (vData.mMajor ); + hdVerMinor (vData.mMinor ); + hdVerMicro (vData.mMicro ); + hdVerBuild (vData.mBuild ); + hdVerFPGAId (vData.mFPGAId ); + hdVerFPGAMajor (vData.mFPGAMajor); + hdVerFPGAMinor (vData.mFPGAMinor); + hdVerFPGALab (vData.mFPGALab ); // *** has to be the last to let the information to be set and then emit the signal *** // *** otherwise will use the previous values before being set. *** @@ -45,14 +45,14 @@ void VTreatmentAdjustmentVersions::onActionReceive(const AdjustDGVersionsResponseData &vData) { // DG versions data - DGVerMajor (vData.mMajor ); - DGVerMinor (vData.mMinor ); - DGVerMicro (vData.mMicro ); - DGVerBuild (vData.mBuild ); - DGVerFPGAId (vData.mFPGAId ); - DGVerFPGAMajor (vData.mFPGAMajor); - DGVerFPGAMinor (vData.mFPGAMinor); - DGVerFPGALab (vData.mFPGALab ); + dgVerMajor (vData.mMajor ); + dgVerMinor (vData.mMinor ); + dgVerMicro (vData.mMicro ); + dgVerBuild (vData.mBuild ); + dgVerFPGAId (vData.mFPGAId ); + dgVerFPGAMajor (vData.mFPGAMajor); + dgVerFPGAMinor (vData.mFPGAMinor); + dgVerFPGALab (vData.mFPGALab ); // *** has to be the last to let the information to be set and then emit the signal *** // *** otherwise will use the previous values before being set. *** Index: sources/view/hd/adjustment/VTreatmentAdjustmentVersions.h =================================================================== diff -u -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 -r2d2917978a4e25eb79a0fb71851b6124171d8072 --- sources/view/hd/adjustment/VTreatmentAdjustmentVersions.h (.../VTreatmentAdjustmentVersions.h) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) +++ sources/view/hd/adjustment/VTreatmentAdjustmentVersions.h (.../VTreatmentAdjustmentVersions.h) (revision 2d2917978a4e25eb79a0fb71851b6124171d8072) @@ -45,24 +45,24 @@ // coco end // HD Versions data - PROPERTY( quint8 , HDVerMajor , 0) - PROPERTY( quint8 , HDVerMinor , 0) - PROPERTY( quint8 , HDVerMicro , 0) - PROPERTY( quint16 , HDVerBuild , 0) - PROPERTY( quint8 , HDVerFPGAId , 0) - PROPERTY( quint8 , HDVerFPGAMajor , 0) - PROPERTY( quint8 , HDVerFPGAMinor , 0) - PROPERTY( quint8 , HDVerFPGALab , 0) + PROPERTY( quint8 , hdVerMajor , 0) + PROPERTY( quint8 , hdVerMinor , 0) + PROPERTY( quint8 , hdVerMicro , 0) + PROPERTY( quint16 , hdVerBuild , 0) + PROPERTY( quint8 , hdVerFPGAId , 0) + PROPERTY( quint8 , hdVerFPGAMajor , 0) + PROPERTY( quint8 , hdVerFPGAMinor , 0) + PROPERTY( quint8 , hdVerFPGALab , 0) // DG Versions data - PROPERTY( quint8 , DGVerMajor , 0) - PROPERTY( quint8 , DGVerMinor , 0) - PROPERTY( quint8 , DGVerMicro , 0) - PROPERTY( quint16 , DGVerBuild , 0) - PROPERTY( quint8 , DGVerFPGAId , 0) - PROPERTY( quint8 , DGVerFPGAMajor , 0) - PROPERTY( quint8 , DGVerFPGAMinor , 0) - PROPERTY( quint8 , DGVerFPGALab , 0) + PROPERTY( quint8 , dgVerMajor , 0) + PROPERTY( quint8 , dgVerMinor , 0) + PROPERTY( quint8 , dgVerMicro , 0) + PROPERTY( quint16 , dgVerBuild , 0) + PROPERTY( quint8 , dgVerFPGAId , 0) + PROPERTY( quint8 , dgVerFPGAMajor , 0) + PROPERTY( quint8 , dgVerFPGAMinor , 0) + PROPERTY( quint8 , dgVerFPGALab , 0) VIEW_DEC_CLASS(VTreatmentAdjustmentVersions) VIEW_DEC_SLOT (AdjustHDVersionsResponseData) Index: sources/view/hd/data/VHDAccelerometerData.h =================================================================== diff -u -r93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16 -r2d2917978a4e25eb79a0fb71851b6124171d8072 --- sources/view/hd/data/VHDAccelerometerData.h (.../VHDAccelerometerData.h) (revision 93b6bd48e2aec1fca4f2b5b79dcefffa49e9ce16) +++ sources/view/hd/data/VHDAccelerometerData.h (.../VHDAccelerometerData.h) (revision 2d2917978a4e25eb79a0fb71851b6124171d8072) @@ -27,9 +27,9 @@ /*! * \brief The VHDAccelerometer class * \details View for Model's Data representation. - *#include "VTreatmentAdjustmentResponseBase.h" - * \sa Model::MHDAccelerometer * + * \sa Model::MHDAccelerometer + * */ class VHDAccelerometer : public QObject { Q_OBJECT Index: sources/view/hd/data/VHDTreatmentStatesData.cpp =================================================================== diff -u -r07e0c7bd409782cab96a4ae761ee3f819bdb8639 -r2d2917978a4e25eb79a0fb71851b6124171d8072 --- sources/view/hd/data/VHDTreatmentStatesData.cpp (.../VHDTreatmentStatesData.cpp) (revision 07e0c7bd409782cab96a4ae761ee3f819bdb8639) +++ sources/view/hd/data/VHDTreatmentStatesData.cpp (.../VHDTreatmentStatesData.cpp) (revision 2d2917978a4e25eb79a0fb71851b6124171d8072) @@ -32,8 +32,8 @@ void VHDTreatmentStates::initConnections() { ACTION_VIEW_CONNECTION(TreatmentStatesData ); // these messages sending the same states as in message 15 (TreatmentStates above) - // it's redundant and with a better messaging protocol one must be removed - // perhaps the one in the Adjustment messages since it is not sent on each state change + // it is redundant and with a better messaging protocol + // the one in the Adjustment messages should be removed since it is not sent on each state change // and will be sent only once to the request. ACTION_VIEW_CONNECTION(AdjustUltrafiltrationStateResponseData ); ACTION_VIEW_CONNECTION(AdjustSalineResponseData );