Index: SDDs/WaterSample.png =================================================================== diff -u -r03ff7d6625767b0ecc9eb75349c000c76ab8c80f -r7c78fc682c3b1dbfe2e416e3812f98e15875b751 Binary files differ Index: SDDs/WaterSample.puml =================================================================== diff -u -r03ff7d6625767b0ecc9eb75349c000c76ab8c80f -r7c78fc682c3b1dbfe2e416e3812f98e15875b751 --- SDDs/WaterSample.puml (.../WaterSample.puml) (revision 03ff7d6625767b0ecc9eb75349c000c76ab8c80f) +++ SDDs/WaterSample.puml (.../WaterSample.puml) (revision 7c78fc682c3b1dbfe2e416e3812f98e15875b751) @@ -38,8 +38,8 @@ SW -> TD: MSG: [xA3: #1] Req \n TD Water Sample Result Request \ \n\t(F32) mResult TD -> SW: MSG: [xAB: #1] Rsp \n TD Water Sample Result Response \ - \n\t(F32) mResultValue - SW -> UI: CMD: Update Water Sample Result\n(F32) mResultValue + \n\t(F32) mResult + SW -> UI: CMD: Update Water Sample Result\n(F32) mResult UI -> US: ACT: Show last result value and timestamp == Water Sample Data == Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -rc82f27ac6f0c015db70c66272f9b67e62b2f83fd -r7c78fc682c3b1dbfe2e416e3812f98e15875b751 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision c82f27ac6f0c015db70c66272f9b67e62b2f83fd) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 7c78fc682c3b1dbfe2e416e3812f98e15875b751) @@ -98,7 +98,6 @@ // DG Data Messages {Gui::GuiActionType::ID_DGROPumpData , 6 * 4 }, // 6 parameters each 4bytes {Gui::GuiActionType::ID_DGDrainPumpData , 8 * 4 }, // 8 parameters each 4bytes - {Gui::GuiActionType::ID_DGOperationModeData , 2 * 4 }, // 2 parameter each 4bytes {Gui::GuiActionType::ID_DGReservoirData , 12 * 4 }, // 12 parameters each 4bytes {Gui::GuiActionType::ID_DGLoadCellReadingsData , 4 * 4 }, // 4 parameters each 4bytes {Gui::GuiActionType::ID_DGAccelerometerData , 9 * 4 }, // 9 parameters each 4bytes @@ -113,6 +112,8 @@ {Gui::GuiActionType::ID_DDLevelData , 3 * 4 }, // 3 parameters each 4bytes {Gui::GuiActionType::ID_DDGenDialysateData , 4 * 4 }, // 4 parameters each 4bytes {Gui::GuiActionType::ID_DDBloodLeakData , 1 * 4 }, // 1 parameters each 4bytes + {Gui::GuiActionType::ID_DDOperationModeData , 2 * 4 }, // 2 parameter each 4bytes + //FP Data Messages {Gui::GuiActionType::ID_FPROPumpData , 9 * 4 }, // 9 parameters each 4bytes {Gui::GuiActionType::ID_FPPressuresData , 9 * 4 }, // 9 parameters each 4bytes Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -r5504ac8191553be2580700b4a010426a58d71fd4 -r7c78fc682c3b1dbfe2e416e3812f98e15875b751 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 5504ac8191553be2580700b4a010426a58d71fd4) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 7c78fc682c3b1dbfe2e416e3812f98e15875b751) @@ -619,6 +619,8 @@ switch (vMessage.actionId) { // notice we are in receive mode case Gui::GuiActionType::ID_Acknow : ok = true; /* TODO : implement notify<>() */ break; LOG_APPED(QString("DD,CheckIn," + QVariant(vData).toStringList().join(','))); break; + + /* // ----- POST case Gui::GuiActionType::ID_DGPostSingleResultData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGPostSingleResultData ); break; case Gui::GuiActionType::ID_DGPostFinalResultData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGPostFinalResultData ); break; @@ -627,7 +629,6 @@ case Gui::GuiActionType::ID_DGROPumpData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGROPumpData ); break; case Gui::GuiActionType::ID_DDPressuresData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDPressuresData ); break; case Gui::GuiActionType::ID_DGDrainPumpData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGDrainPumpData ); break; - case Gui::GuiActionType::ID_DGOperationModeData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGOperationModeData ); break; case Gui::GuiActionType::ID_DGReservoirData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGReservoirData ); break; case Gui::GuiActionType::ID_DDValvesStatesData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDValvesStatesData ); break; case Gui::GuiActionType::ID_DDHeatersData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDHeatersData ); break; @@ -638,24 +639,34 @@ case Gui::GuiActionType::ID_DDDebugText : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDDebugText ); break; case Gui::GuiActionType::ID_DGGeneralEvent : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGGeneralEvent ); break; case Gui::GuiActionType::ID_DGAccelerometerData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGAccelerometerData ); break; - case Gui::GuiActionType::ID_DDConductivityData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDConductivityData ); break; - case Gui::GuiActionType::ID_DDGenDialysateData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDGenDialysateData ); break; case Gui::GuiActionType::ID_DDLevelData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDLevelData ); break; case Gui::GuiActionType::ID_DDBloodLeakData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDBloodLeakData ); break; // ----- Datum - Pre-Treatment progress case Gui::GuiActionType::ID_DGFilterFlushData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGFilterFlushData ); break; // DG Response Messages - case Gui::GuiActionType::ID_AdjustVersionsDDRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsDDRsp ); break; - case Gui::GuiActionType::ID_AdjustSerialDDRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustSerialDDRsp ); break; case Gui::GuiActionType::ID_AdjustServiceDatesDGRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustServiceDatesDGRsp ); break; - case Gui::GuiActionType::ID_AdjustDDDateTimeRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDDDateTimeRsp ); break; case Gui::GuiActionType::ID_AdjustDGCleaningUsageRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDGCleaningUsageRsp ); break; // RO Water case Gui::GuiActionType::ID_DuetRoWaterStatDGq : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DuetRoWaterStatDGq ); break; case Gui::GuiActionType::ID_DuetRoWaterModeDGr : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DuetRoWaterModeDGr ); break; // unhandled messages: these will only be logged as received message // there has nothing been defined for these messages. default : printUnhandled (vMessage ); break; + */ + /////////////////////////////////////// + //// FIXME: RO LOOP TEST + /////////////////////////////////////// + + + case Gui::GuiActionType::ID_DDGenDialysateData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDGenDialysateData ); break; + case Gui::GuiActionType::ID_DDConductivityData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDConductivityData ); break; + + case Gui::GuiActionType::ID_AdjustDDDateTimeRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDDDateTimeRsp ); break; + case Gui::GuiActionType::ID_DDOperationModeData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DDOperationModeData ); break; + case Gui::GuiActionType::ID_AdjustVersionsDDRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsDDRsp ); break; + case Gui::GuiActionType::ID_AdjustSerialDDRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustSerialDDRsp ); break; + + default: break; } return ok; Index: sources/gui/GuiGlobals.cpp =================================================================== diff -u -r0bb5f08eb3570de6bff3ce67ca502db129b59096 -r7c78fc682c3b1dbfe2e416e3812f98e15875b751 --- sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 0bb5f08eb3570de6bff3ce67ca502db129b59096) +++ sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 7c78fc682c3b1dbfe2e416e3812f98e15875b751) @@ -109,7 +109,7 @@ #include "VDGDrainPumpData.h" #include "VDDHeatersData.h" #include "VDGLoadCellReadingsData.h" -#include "VDGOperationModeData.h" +#include "VDDOperationModeData.h" #include "VDDPressuresData.h" #include "VDGROPumpData.h" #include "VDGReservoirData.h" Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r5504ac8191553be2580700b4a010426a58d71fd4 -r7c78fc682c3b1dbfe2e416e3812f98e15875b751 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 5504ac8191553be2580700b4a010426a58d71fd4) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 7c78fc682c3b1dbfe2e416e3812f98e15875b751) @@ -198,7 +198,7 @@ // DG Data Messages ID_DGROPumpData = 0x1F0F, // 31 //// ----- @CRAPIZED: had to change to avoid duplication ID_DGDrainPumpData = 0x240F, // ?? //// ----- @CRAPIZED: had to change to avoid duplication - ID_DGOperationModeData = 0x270F, // ?? //// ----- @CRAPIZED: had to change to avoid duplication + ID_DDOperationModeData = 0x1300, ID_DGReservoirData = 0x280F, // ?? //// ----- @CRAPIZED: had to change to avoid duplication ID_DGLoadCellReadingsData = 0x0C00, // 12 ID_DGAccelerometerData = 0x3400, // 52 Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml =================================================================== diff -u -rc82f27ac6f0c015db70c66272f9b67e62b2f83fd -r7c78fc682c3b1dbfe2e416e3812f98e15875b751 --- sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml (.../DiagnosticsDD.qml) (revision c82f27ac6f0c015db70c66272f9b67e62b2f83fd) +++ sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml (.../DiagnosticsDD.qml) (revision 7c78fc682c3b1dbfe2e416e3812f98e15875b751) @@ -281,15 +281,33 @@ ] } - DebugDataColumn { id: _DDGenDialColumn - textObjectName :"_DDGenDialData" - title : qsTr(" GenDial ") + + DebugDataColumn { id: _DDOpModeColumn + textObjectName :"_DDOpModeColumn" + title : qsTr(" OpMode ") anchors { top : parent.top left : _DDPressureColumn.right leftMargin : spacing } + model: [ + vDDOperationMode.opMode , + vDDOperationMode.subMode , + ] + label: [ + "opMode " , + "subMode " + ] + } + DebugDataColumn { id: _DDGenDialColumn + textObjectName :"_DDGenDialData" + title : qsTr(" GenDial ") + anchors { + top : _DDOpModeColumn.bottom + topMargin : spacing + left : _DDOpModeColumn.left + } model: [ vDDGenDialysate.genDialysateExec , vDDGenDialysate.ddInProgress , Index: sources/gui/qml/dialogs/headerbar/HeaderbarSettings.qml =================================================================== diff -u -r78aa5e70b591b3544ff9d9e6b772fe07deaa2f0f -r7c78fc682c3b1dbfe2e416e3812f98e15875b751 --- sources/gui/qml/dialogs/headerbar/HeaderbarSettings.qml (.../HeaderbarSettings.qml) (revision 78aa5e70b591b3544ff9d9e6b772fe07deaa2f0f) +++ sources/gui/qml/dialogs/headerbar/HeaderbarSettings.qml (.../HeaderbarSettings.qml) (revision 7c78fc682c3b1dbfe2e416e3812f98e15875b751) @@ -39,9 +39,10 @@ BaseSwitch { id: _darkMode source : Colors.darkMode ? "qrc:/images/iMoon" : "qrc:/images/iSun" checked : Colors.darkMode - activeColor : "#2C4F77" - inactiveColor : "#F5DDB0" - knobColor : Colors.darkMode ? "#1A344D" : "#FDB635" + activeColor : Colors.switchActiveColor + inactiveColor : Colors.switchInactiveColor + knobColor : Colors.darkMode ? Colors.switchKnobActiveColor : + Colors.switchKnobInactiveColor onClicked: { Colors.darkMode = ! Colors.darkMode Index: sources/gui/qml/globals/Colors.qml =================================================================== diff -u -r78aa5e70b591b3544ff9d9e6b772fe07deaa2f0f -r7c78fc682c3b1dbfe2e416e3812f98e15875b751 --- sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 78aa5e70b591b3544ff9d9e6b772fe07deaa2f0f) +++ sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 7c78fc682c3b1dbfe2e416e3812f98e15875b751) @@ -67,6 +67,11 @@ readonly property color sliderHighlightColor : "orange" readonly property color sliderProgressBorderActive : white + readonly property color switchActiveColor : "#2C4F77" + readonly property color switchInactiveColor : "#F5DDB0" + readonly property color switchKnobActiveColor : "#1A344D" + readonly property color switchKnobInactiveColor : "#FDB635" + readonly property color backgroundUltrafiltrationButton : "#31568F" readonly property color textValueUltrafiltrationButtonFg: "#98aec2" readonly property color dialogText : "#2E5E92" Index: sources/gui/qml/main.qml =================================================================== diff -u -r0bb5f08eb3570de6bff3ce67ca502db129b59096 -r7c78fc682c3b1dbfe2e416e3812f98e15875b751 --- sources/gui/qml/main.qml (.../main.qml) (revision 0bb5f08eb3570de6bff3ce67ca502db129b59096) +++ sources/gui/qml/main.qml (.../main.qml) (revision 7c78fc682c3b1dbfe2e416e3812f98e15875b751) @@ -105,7 +105,7 @@ import VDGDrainPump 0.1 import VDDHeaters 0.1 import VDGLoadCellReadings 0.1 -import VDGOperationMode 0.1 +import VDDOperationMode 0.1 import VDDPressures 0.1 import VDGROPump 0.1 import VDGReservoir 0.1 @@ -262,7 +262,7 @@ VDGDrainPump { id: vDGDrainPump } VDDHeaters { id: vDDHeaters } VDGLoadCellReadings { id: vDGLoadCellReadings } - VDGOperationMode { id: vDGOperationMode } + VDDOperationMode { id: vDDOperationMode } VDDPressures { id: vDDPressures } VDGROPump { id: vDGROPump } VDGReservoir { id: vDGReservoir } Index: sources/model/MModel.h =================================================================== diff -u -r5504ac8191553be2580700b4a010426a58d71fd4 -r7c78fc682c3b1dbfe2e416e3812f98e15875b751 --- sources/model/MModel.h (.../MModel.h) (revision 5504ac8191553be2580700b4a010426a58d71fd4) +++ sources/model/MModel.h (.../MModel.h) (revision 7c78fc682c3b1dbfe2e416e3812f98e15875b751) @@ -103,11 +103,11 @@ #include "MAdjustTDAdvancedInstitutionalRecordResponse.h" #include "MTDAdvancedInstitutionalRecordResponse.h" -// DG Data Messages +// DD Data Messages #include "MDGDrainPumpData.h" #include "MDDHeatersData.h" #include "MDGLoadCellReadingsData.h" -#include "MDGOperationModeData.h" +#include "MDDOperationModeData.h" #include "MDDPressuresData.h" #include "MDGReservoirData.h" #include "MDGROPumpData.h" @@ -403,7 +403,7 @@ REGISTER_METATYPE( DGROPumpData ) \ REGISTER_METATYPE( DDPressuresData ) \ REGISTER_METATYPE( DGDrainPumpData ) \ - REGISTER_METATYPE( DGOperationModeData ) \ + REGISTER_METATYPE( DDOperationModeData ) \ REGISTER_METATYPE( DGReservoirData ) \ REGISTER_METATYPE( DDValvesStatesData ) \ REGISTER_METATYPE( DDHeatersData ) \ @@ -638,7 +638,7 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGROPumpData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDPressuresData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGDrainPumpData ) \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGOperationModeData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDOperationModeData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGReservoirData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDValvesStatesData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DDHeatersData ) \ @@ -886,7 +886,7 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( DGROPumpData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DDPressuresData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGDrainPumpData ) \ - ACTION_RECEIVE_BRIDGE_DEFINITION( DGOperationModeData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( DDOperationModeData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGReservoirData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DDValvesStatesData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DDHeatersData ) \ @@ -1267,7 +1267,7 @@ ACTION_RECEIVE_SIGNAL( DGROPumpData ) \ ACTION_RECEIVE_SIGNAL( DDPressuresData ) \ ACTION_RECEIVE_SIGNAL( DGDrainPumpData ) \ - ACTION_RECEIVE_SIGNAL( DGOperationModeData ) \ + ACTION_RECEIVE_SIGNAL( DDOperationModeData ) \ ACTION_RECEIVE_SIGNAL( DGReservoirData ) \ ACTION_RECEIVE_SIGNAL( DDValvesStatesData ) \ ACTION_RECEIVE_SIGNAL( DDHeatersData ) \ Index: sources/model/dd/data/MDDOperationModeData.cpp =================================================================== diff -u --- sources/model/dd/data/MDDOperationModeData.cpp (revision 0) +++ sources/model/dd/data/MDDOperationModeData.cpp (revision 7c78fc682c3b1dbfe2e416e3812f98e15875b751) @@ -0,0 +1,49 @@ +/*! + * + * Copyright (c) 2020-2024 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 MDDOperationModeData.cpp + * \author (last) Behrouz NematiPour + * \date (last) 18-May-2021 + * \author (original) Behrouz NemaiPour + * \date (original) 02-Jul-2020 + * + */ +#include "MDDOperationModeData.h" + +using namespace Model; + +QVariantList MDDOperationMode::parameters() const { + return { + _data.mOpMode .value, + _data.mSubMode .value + }; +} + +bool MDDOperationMode::fromByteArray(const QByteArray &vByteArray, int *vIndex) { + int index = 0; // message data start position + if ( ! GetValue(vByteArray, index, _data.mOpMode )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mSubMode )) goto lError; + + return true ; + +lError: + if(vIndex) { *vIndex = index; } + + return false ; +} + +/*! + * \brief MDDOperationMode::data + * \details Provides model's Data from the received messages data values + * \return Data + */ +MDDOperationMode::Data MDDOperationMode::data() const { + Data data; + data.mOpMode = _data.mOpMode .value; + data.mSubMode = _data.mSubMode .value; + return data; +} Index: sources/model/dd/data/MDDOperationModeData.h =================================================================== diff -u --- sources/model/dd/data/MDDOperationModeData.h (revision 0) +++ sources/model/dd/data/MDDOperationModeData.h (revision 7c78fc682c3b1dbfe2e416e3812f98e15875b751) @@ -0,0 +1,82 @@ +/*! + * + * Copyright (c) 2020-2024 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 MDDOperationModeData.h + * \author (last) Behrouz NematiPour + * \date (last) 18-May-2021 + * \author (original) Behrouz NemaiPour + * \date (original) 02-Jul-2020 + * + */ +#pragma once + +// Qt +#include + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MDDOperationMode class + * \details The DD operation mode data model + * + * | MSG | CAN ID | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:------:|:---:|:---:|:---:|:-----------:| + * |0x1300| 0x080 | 1 Hz | N | DG | All | DG Operation Mode Data | + * + * | Payload || + * | || + * | #1:(U32) | \ref Data::mOpMode | + * | #2:(U32) | \ref Data::mSubMode | + * + * \sa Data + * + *

Logging info

+ * | || + * | || + * | typeText | Datum | + * | unitText | DG | + * | infoText | OpMode | + * + */ +class MDDOperationMode : public MAbstract { + + // friends + friend class ::tst_models; + + QVariantList parameters() const override; + + struct { + Types::U32 mOpMode ; + Types::U32 mSubMode ; + } _data; + +public: + + Type_Enum typeText () const override { return Type_Enum::eDatum; } + Unit_Enum unitText () const override { return Unit_Enum::eDD ; } + QString infoText () const override { return QString("OpMode"); } + + struct Data { + quint32 mOpMode = 0; ///< DG operation + quint32 mSubMode = 0; ///< DG Sub-Mode + }; + + MDDOperationMode () {} + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; +}; +} + +typedef Model::MDDOperationMode::Data DDOperationModeData; Fisheye: Tag 7c78fc682c3b1dbfe2e416e3812f98e15875b751 refers to a dead (removed) revision in file `sources/model/dg/data/MDGOperationModeData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 7c78fc682c3b1dbfe2e416e3812f98e15875b751 refers to a dead (removed) revision in file `sources/model/dg/data/MDGOperationModeData.h'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustWaterSampleResultResponse.cpp =================================================================== diff -u -r9403146058e7c4cef17bd542bbd39bbf032be9f3 -r7c78fc682c3b1dbfe2e416e3812f98e15875b751 --- sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustWaterSampleResultResponse.cpp (.../MPreTreatmentAdjustWaterSampleResultResponse.cpp) (revision 9403146058e7c4cef17bd542bbd39bbf032be9f3) +++ sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustWaterSampleResultResponse.cpp (.../MPreTreatmentAdjustWaterSampleResultResponse.cpp) (revision 7c78fc682c3b1dbfe2e416e3812f98e15875b751) @@ -7,15 +7,15 @@ return { _data.mAccepted.value, _data.mReason .value, - _data.mValue .value, + _data.mResult .value, }; } bool MAdjustWaterSampleResultResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position if ( ! GetValue(vByteArray, index, _data.mAccepted )) goto lError; if ( ! GetValue(vByteArray, index, _data.mReason )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mValue )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mResult )) goto lError; return true ; @@ -34,6 +34,6 @@ Data data; data.mAccepted = _data.mAccepted.value; data.mReason = _data.mReason .value; - data.mValue = _data.mValue .value; + data.mResult = _data.mResult .value; return data; } Index: sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustWaterSampleResultResponse.h =================================================================== diff -u -r9403146058e7c4cef17bd542bbd39bbf032be9f3 -r7c78fc682c3b1dbfe2e416e3812f98e15875b751 --- sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustWaterSampleResultResponse.h (.../MPreTreatmentAdjustWaterSampleResultResponse.h) (revision 9403146058e7c4cef17bd542bbd39bbf032be9f3) +++ sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustWaterSampleResultResponse.h (.../MPreTreatmentAdjustWaterSampleResultResponse.h) (revision 7c78fc682c3b1dbfe2e416e3812f98e15875b751) @@ -18,13 +18,13 @@ * * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:----------------: | - * |0x5E00| 0x020 | 6 | Rsp | Y | TD | UI | WaterSample Response | + * |0xAB00| 0x020 | 6 | Rsp | Y | TD | UI | WaterSample Response | * * | Payload || * | || * | #1:(U32) | \ref Data::mAccepted | * | #2:(U32) | \ref Data::mReason | - * | #3:(F32) | \ref Data::mValue | + * | #3:(F32) | \ref Data::mResult | * * \sa Data * \sa MAdjustWaterSampleReq : WaterSample Request @@ -48,7 +48,7 @@ struct { Types::U32 mAccepted; Types::U32 mReason ; - Types::F32 mValue ; + Types::F32 mResult ; } _data; public: @@ -60,7 +60,7 @@ struct Data { bool mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ - float mValue = 0; /*!< Value value of type quint32 extracted out */ + float mResult = 0; /*!< Result value of type quint32 extracted out */ }; MAdjustWaterSampleResultResponse () { } Index: sources/model/td/data/MWaterSampleData.h =================================================================== diff -u -rfb1185f1c17778a9f8b300170d8d635a1532f6b4 -r7c78fc682c3b1dbfe2e416e3812f98e15875b751 --- sources/model/td/data/MWaterSampleData.h (.../MWaterSampleData.h) (revision fb1185f1c17778a9f8b300170d8d635a1532f6b4) +++ sources/model/td/data/MWaterSampleData.h (.../MWaterSampleData.h) (revision 7c78fc682c3b1dbfe2e416e3812f98e15875b751) @@ -19,7 +19,7 @@ * * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | - * |0xAB00| 0x020 | 6 | 1 Hz | N | TD | UI | WaterSample Data | + * |0xAC00| 0x020 | 6 | 1 Hz | N | TD | UI | WaterSample Data | * * | Payload || * | || Index: sources/view/VView.h =================================================================== diff -u -r0bb5f08eb3570de6bff3ce67ca502db129b59096 -r7c78fc682c3b1dbfe2e416e3812f98e15875b751 --- sources/view/VView.h (.../VView.h) (revision 0bb5f08eb3570de6bff3ce67ca502db129b59096) +++ sources/view/VView.h (.../VView.h) (revision 7c78fc682c3b1dbfe2e416e3812f98e15875b751) @@ -189,7 +189,7 @@ REGISTER_TYPE( VDGDrainPump ) \ REGISTER_TYPE( VDDHeaters ) \ REGISTER_TYPE( VDGLoadCellReadings ) \ - REGISTER_TYPE( VDGOperationMode ) \ + REGISTER_TYPE( VDDOperationMode ) \ REGISTER_TYPE( VDDPressures ) \ REGISTER_TYPE( VDGROPump ) \ REGISTER_TYPE( VDGReservoir ) \ Index: sources/view/dd/data/VDDConductivityData.cpp =================================================================== diff -u -r1439734e9dc8384eff68c061b2930a737f4cfb5e -r7c78fc682c3b1dbfe2e416e3812f98e15875b751 --- sources/view/dd/data/VDDConductivityData.cpp (.../VDDConductivityData.cpp) (revision 1439734e9dc8384eff68c061b2930a737f4cfb5e) +++ sources/view/dd/data/VDDConductivityData.cpp (.../VDDConductivityData.cpp) (revision 7c78fc682c3b1dbfe2e416e3812f98e15875b751) @@ -22,8 +22,8 @@ void VDDConductivity::onActionReceive(const DDConductivityData &vData) { bicarbCondutivity1 ( vData.mBicarbCondutivity1 ); - acidBicarbCondutivity1 ( vData.mAcidBicarbCondutivity1 ); - acidBicarbCondutivity2 ( vData.mAcidBicarbCondutivity2 ); + acidBicarbCondutivity1 ( vData.mAcidBicarbCondutivity1 ? vData.mAcidBicarbCondutivity1 / 1000 : 0 ); + acidBicarbCondutivity2 ( vData.mAcidBicarbCondutivity2 ? vData.mAcidBicarbCondutivity2 / 1000 : 0 ); spentCondutivity1 ( vData.mSpentCondutivity1 ); bicarbCondutivity2 ( vData.mBicarbCondutivity2 ); } Index: sources/view/dd/data/VDDOperationModeData.cpp =================================================================== diff -u --- sources/view/dd/data/VDDOperationModeData.cpp (revision 0) +++ sources/view/dd/data/VDDOperationModeData.cpp (revision 7c78fc682c3b1dbfe2e416e3812f98e15875b751) @@ -0,0 +1,32 @@ +/*! + * + * Copyright (c) 2020-2024 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 VDDOperationModeData.cpp + * \author (last) Behrouz NematiPour + * \date (last) 18-May-2021 + * \author (original) Behrouz NemaiPour + * \date (original) 02-Jul-2020 + * + */ +#include "VDDOperationModeData.h" + +// Project +#include "GuiController.h" + +VIEW_DEF(VDDOperationMode, DDOperationModeData) + +void VDDOperationMode::onActionReceive(const DDOperationModeData &vData) +{ + opMode ( vData.mOpMode ); + subMode( vData.mSubMode ); +} + +QString View::VDDOperationMode::text() +{ + QString text = Gui::enumString(static_cast(opMode())); + return text; +} Index: sources/view/dd/data/VDDOperationModeData.h =================================================================== diff -u --- sources/view/dd/data/VDDOperationModeData.h (revision 0) +++ sources/view/dd/data/VDDOperationModeData.h (revision 7c78fc682c3b1dbfe2e416e3812f98e15875b751) @@ -0,0 +1,51 @@ +/*! + * + * Copyright (c) 2020-2024 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 VDDOperationModeData.h + * \author (last) Behrouz NematiPour + * \date (last) 10-Aug-2021 + * \author (original) Behrouz NemaiPour + * \date (original) 02-Jul-2020 + * + */ +#pragma once + +// Qt +#include + +// Project +#include "main.h" // Doxygen : do not remove +#include "VView.h" +#include "MDDOperationModeData.h" +#include "GuiGlobals.h" + +// namespace +using namespace Gui; +namespace View { + +/*! + * \brief The VDDOperationMode class + * \details View for Model's Data representation. + * + * \sa Model::MDDOperationMode + * + */ +class VDDOperationMode : public QObject +{ + Q_OBJECT + + PROPERTY( quint32 , opMode , 0 ) + PROPERTY( quint32 , subMode , 0 ) + + Q_PROPERTY(QString text READ text NOTIFY opModeChanged) + + VIEW_DEC(VDDOperationMode, DDOperationModeData) + +public slots: + QString text(); +}; +} Fisheye: Tag 7c78fc682c3b1dbfe2e416e3812f98e15875b751 refers to a dead (removed) revision in file `sources/view/dg/data/VDGOperationModeData.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 7c78fc682c3b1dbfe2e416e3812f98e15875b751 refers to a dead (removed) revision in file `sources/view/dg/data/VDGOperationModeData.h'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.cpp =================================================================== diff -u -rfb1185f1c17778a9f8b300170d8d635a1532f6b4 -r7c78fc682c3b1dbfe2e416e3812f98e15875b751 --- sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.cpp (.../VPreTreatmentAdjustmentWaterSample.cpp) (revision fb1185f1c17778a9f8b300170d8d635a1532f6b4) +++ sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.cpp (.../VPreTreatmentAdjustmentWaterSample.cpp) (revision 7c78fc682c3b1dbfe2e416e3812f98e15875b751) @@ -41,7 +41,7 @@ adjustment_Reason ( vData.mReason ); QDateTime currentDateTime = QDateTime::currentDateTime(); - resultValue (vData.mValue ); + resultValue (vData.mResult ); resultTime (currentDateTime.toString(_Settings.getDatetimeFormat())); // *** has to be the last to let the information to be set and then emit the signal *** Index: sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.h =================================================================== diff -u -rfb1185f1c17778a9f8b300170d8d635a1532f6b4 -r7c78fc682c3b1dbfe2e416e3812f98e15875b751 --- sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.h (.../VPreTreatmentAdjustmentWaterSample.h) (revision fb1185f1c17778a9f8b300170d8d635a1532f6b4) +++ sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.h (.../VPreTreatmentAdjustmentWaterSample.h) (revision 7c78fc682c3b1dbfe2e416e3812f98e15875b751) @@ -50,8 +50,6 @@ void doResult (float vResult); signals: - - /*! * \brief didAdjustment * \details the notification signal to request to send the user water sample result. Index: sources/view/td/data/treatment/VTreatmentTrends.cpp =================================================================== diff -u -raacca8cc53f5e4ff5abb6d7df3d5ad48c915645c -r7c78fc682c3b1dbfe2e416e3812f98e15875b751 --- sources/view/td/data/treatment/VTreatmentTrends.cpp (.../VTreatmentTrends.cpp) (revision aacca8cc53f5e4ff5abb6d7df3d5ad48c915645c) +++ sources/view/td/data/treatment/VTreatmentTrends.cpp (.../VTreatmentTrends.cpp) (revision 7c78fc682c3b1dbfe2e416e3812f98e15875b751) @@ -95,7 +95,7 @@ */ void VTreatmentTrends::onActionReceive(const DDConductivityData &vData) { - _latestData[eDataRole_Conductivity] = vData.mAcidBicarbCondutivity2; + _latestData[eDataRole_Conductivity] = vData.mAcidBicarbCondutivity1 ? vData.mAcidBicarbCondutivity1 / 1000 : 0; } /*!