Index: denali.pro =================================================================== diff -u -rd66466bb093fc8806d76fc8b8bdfbd7852d0da98 -rc6a08131766a8f9db5f38266b7323dbca8022baf --- denali.pro (.../denali.pro) (revision d66466bb093fc8806d76fc8b8bdfbd7852d0da98) +++ denali.pro (.../denali.pro) (revision c6a08131766a8f9db5f38266b7323dbca8022baf) @@ -89,7 +89,6 @@ sources/model/hd/data/MTreatmentSalineData.h \ sources/model/hd/data/MHDAccelerometerData.h \ \ # ---------- Models - DG - Adjustment - #sources/model/dg/adjustment/MTreatmentAdjustDGVersionsResponse.h \ \ # ---------- Models - DG - Data sources/model/dg/data/MDGDrainPumpData.h \ sources/model/dg/data/MDGHeatersData.h \ @@ -228,6 +227,7 @@ sources/gui/guicontroller.cpp \ \ # ---------- Views ---------- sources/view/VEventSpy.cpp \ + sources/view/hd/adjustment/VTreatmentAdjustmentVersions.cpp \ sources/view/vpoweroff.cpp \ \ # ---------- Views - Alarm sources/view/valarmstatus.cpp \ @@ -239,7 +239,6 @@ sources/view/vtreatmentadjustmentultrafiltrationedit.cpp \ sources/view/vtreatmentadjustmentultrafiltrationconfirm.cpp \ sources/view/hd/adjustment/VTreatmentAdjustmentSaline.cpp \ - sources/view/hd/adjustment/VTreatmentAdjustmentHDVersions.cpp \ \ # ---------- Views - HD - Data sources/view/vtreatmenttime.cpp \ sources/view/vtreatmentbloodflow.cpp \ Index: denali.pro.user =================================================================== diff -u -r67a2c56f855b9344f4a200a02acc009ac0c2e3f8 -rc6a08131766a8f9db5f38266b7323dbca8022baf --- denali.pro.user (.../denali.pro.user) (revision 67a2c56f855b9344f4a200a02acc009ac0c2e3f8) +++ denali.pro.user (.../denali.pro.user) (revision c6a08131766a8f9db5f38266b7323dbca8022baf) @@ -1,6 +1,6 @@ - + EnvironmentId @@ -100,11 +100,11 @@ qmake QtProjectManager.QMakeBuildStep - false + true false false - false + true true @@ -1176,14 +1176,14 @@ denali Qt4ProjectManager.Qt4RunConfiguration:/home/denali/Projects/application/denali.pro - + --disable-timeout --disable-unhandled-report 3768 false true true false - false - true + true + false /home/denali/Projects/tmp/build/denali-Desktop_Qt_5_12_5_GCC_64bit-Debug Index: sources/gui/qml/main.qml =================================================================== diff -u -r242ef09c059eac13b036989147f5e2314df54a30 -rc6a08131766a8f9db5f38266b7323dbca8022baf --- sources/gui/qml/main.qml (.../main.qml) (revision 242ef09c059eac13b036989147f5e2314df54a30) +++ sources/gui/qml/main.qml (.../main.qml) (revision c6a08131766a8f9db5f38266b7323dbca8022baf) @@ -38,9 +38,9 @@ import VTreatmentAdjustmentUltrafiltrationState 0.1; import VTreatmentAdjustmentUltrafiltrationEdit 0.1; import VTreatmentAdjustmentUltrafiltrationConfirm 0.1; -import VTreatmentAdjustmentHDVersions 0.1; -import VTreatmentAdjustmentDGVersions 0.1; +import VTreatmentAdjustmentVersions 0.1; + import VDGDrainPump 0.1; import VDGHeaters 0.1; import VDGLoadCellReadings 0.1; @@ -132,8 +132,7 @@ VTreatmentAdjustmentUltrafiltrationEdit { id: vTreatmentAdjustmentUltrafiltrationEdit } VTreatmentAdjustmentUltrafiltrationConfirm { id: vTreatmentAdjustmentUltrafiltrationConfirm } - VTreatmentAdjustmentHDVersions { id: vTreatmentAdjustmentHDVersions } - VTreatmentAdjustmentDGVersions { id: vTreatmentAdjustmentDGVersions } + VTreatmentAdjustmentVersions { id: vTreatmentAdjustmentVersions } // ----- Follow the below Z order ----- // 1 - Screens Index: sources/gui/qml/pages/ManagerHome.qml =================================================================== diff -u -r51936e788b311fec39d28c387e5026f50e06c165 -rc6a08131766a8f9db5f38266b7323dbca8022baf --- sources/gui/qml/pages/ManagerHome.qml (.../ManagerHome.qml) (revision 51936e788b311fec39d28c387e5026f50e06c165) +++ sources/gui/qml/pages/ManagerHome.qml (.../ManagerHome.qml) (revision c6a08131766a8f9db5f38266b7323dbca8022baf) @@ -263,14 +263,14 @@ y: row(4.5) title: qsTr(" HD Ver ") model: [ "v%1.%2.%3-%4 %5 v%6.%7 %8" - .arg(vTreatmentAdjustmentHDVersions.verMajor) - .arg(vTreatmentAdjustmentHDVersions.verMinor) - .arg(vTreatmentAdjustmentHDVersions.verMicro) - .arg(vTreatmentAdjustmentHDVersions.verBuild) - .arg(vTreatmentAdjustmentHDVersions.verFPGAId) - .arg(vTreatmentAdjustmentHDVersions.verFPGAMajor) - .arg(vTreatmentAdjustmentHDVersions.verFPGAMinor) - .arg(vTreatmentAdjustmentHDVersions.verFPGALab) + .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" } @@ -280,14 +280,14 @@ y: row(5.4) title: qsTr(" DG Ver ") model: [ "v%1.%2.%3-%4 %5 v%6.%7 %8" - .arg(vTreatmentAdjustmentDGVersions.verMajor) - .arg(vTreatmentAdjustmentDGVersions.verMinor) - .arg(vTreatmentAdjustmentDGVersions.verMicro) - .arg(vTreatmentAdjustmentDGVersions.verBuild) - .arg(vTreatmentAdjustmentDGVersions.verFPGAId) - .arg(vTreatmentAdjustmentDGVersions.verFPGAMajor) - .arg(vTreatmentAdjustmentDGVersions.verFPGAMinor) - .arg(vTreatmentAdjustmentDGVersions.verFPGALab) + .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/model/hd/alarm/MAlarmStatusData.cpp =================================================================== diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -rc6a08131766a8f9db5f38266b7323dbca8022baf --- sources/model/hd/alarm/MAlarmStatusData.cpp (.../MAlarmStatusData.cpp) (revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e) +++ sources/model/hd/alarm/MAlarmStatusData.cpp (.../MAlarmStatusData.cpp) (revision c6a08131766a8f9db5f38266b7323dbca8022baf) @@ -123,7 +123,7 @@ case GuiAlarmID::AlARM_ID_NVDATA_DISINFECTION_DATE_CRC_ERROR: { result = QObject::tr("Last disinfection date CRC error." ); break; } case GuiAlarmID::ALARM_ID_RO_PUMP_OUT_PRESSURE_OUT_OF_RANGE: { result = QObject::tr("Pressure at outlet of RO pump is out of range." ); break; } case GuiAlarmID::ALARM_ID_TEMPERATURE_SENSORS_FAULT: { result = QObject::tr("DG temperature sensors fault." ); break; } - case GuiAlarmID::ALARM_ID_TEMPERATURE_SENSORS_INCONSISTENT: { result = QObject::tr("DG temperature sensors values are inconsistent." ); break; } + // case GuiAlarmID::ALARM_ID_TEMPERATURE_SENSORS_INCONSISTENT: { result = QObject::tr("DG temperature sensors values are inconsistent." ); break; } case GuiAlarmID::ALARM_ID_HD_COMM_TIMEOUT: { result = QObject::tr("HD communication timeout." ); break; } case GuiAlarmID::ALARM_ID_VALVE_CONTROL_FAILURE: { result = QObject::tr("FPGA not accepting commanded valve states." ); break; } case GuiAlarmID::ALARM_ID_BLOOD_PUMP_FLOW_VS_MOTOR_SPEED_CHECK: { result = QObject::tr("Blood pump failed flow vs. motor speed check. \nMismatch with flow rate and rate implied by motor speed." ); break; } Fisheye: Tag c6a08131766a8f9db5f38266b7323dbca8022baf refers to a dead (removed) revision in file `sources/view/hd/adjustment/VTreatmentAdjustmentHDVersions.cpp'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/view/hd/adjustment/VTreatmentAdjustmentVersions.cpp =================================================================== diff -u --- sources/view/hd/adjustment/VTreatmentAdjustmentVersions.cpp (revision 0) +++ sources/view/hd/adjustment/VTreatmentAdjustmentVersions.cpp (revision c6a08131766a8f9db5f38266b7323dbca8022baf) @@ -0,0 +1,60 @@ +/*! + * + * 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 VTreatmentAdjustmentVersions.cpp + * \author (last) Peman Montazemi + * \date (last) 6-Nov-2020 + * \author (original) Peman Montazemi + * \date (original) 6-Nov-2020 + * + */ +#include "VTreatmentAdjustmentVersions.h" + +// Project +#include "guicontroller.h" + +VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentVersions, AdjustVersionsResponseData) + +void VTreatmentAdjustmentVersions::initConnections() { + ACTION_VIEW_CONNECTION(AdjustHDVersionsResponseData); + ACTION_VIEW_CONNECTION(AdjustDGVersionsResponseData); + ADJUST_VIEW_CONNECTION( AdjustVersionsRequestData); +} + +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 ); + + // *** 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. *** + adjustmentHD(true); // set here only because adjustment parent needs it, but HD Versions does not +} + +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 ); + + // *** 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. *** + adjustmentDG(true); // set here only because adjustment parent needs it, but HD Versions does not +} Index: sources/view/hd/adjustment/VTreatmentAdjustmentVersions.h =================================================================== diff -u -rd66466bb093fc8806d76fc8b8bdfbd7852d0da98 -rc6a08131766a8f9db5f38266b7323dbca8022baf --- sources/view/hd/adjustment/VTreatmentAdjustmentVersions.h (.../VTreatmentAdjustmentVersions.h) (revision d66466bb093fc8806d76fc8b8bdfbd7852d0da98) +++ sources/view/hd/adjustment/VTreatmentAdjustmentVersions.h (.../VTreatmentAdjustmentVersions.h) (revision c6a08131766a8f9db5f38266b7323dbca8022baf) @@ -40,7 +40,8 @@ // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI // has been manually tested that it works perfectly fine - TRIGGER( bool , adjustment , 0) + TRIGGER( bool , adjustmentHD , 0) + TRIGGER( bool , adjustmentDG , 0) // coco end // HD Versions data @@ -63,9 +64,11 @@ PROPERTY( quint8 , DGVerFPGAMinor , 0) PROPERTY( quint8 , DGVerFPGALab , 0) - VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentVersions, AdjustVersionsResponseData) + VIEW_DEC_CLASS(VTreatmentAdjustmentVersions) + VIEW_DEC_SLOT (AdjustHDVersionsResponseData) + VIEW_DEC_SLOT (AdjustDGVersionsResponseData) -// ---------- HD Version +// ---------- Version public slots: void doAdjustment() { AdjustVersionsRequestData data;