Index: denali.pro =================================================================== diff -u -re591b135f821c1b1e13c2db8429dc63648c2452c -reece7acacf84e8cc34b830f6b5ab3f112823a905 --- denali.pro (.../denali.pro) (revision e591b135f821c1b1e13c2db8429dc63648c2452c) +++ denali.pro (.../denali.pro) (revision eece7acacf84e8cc34b830f6b5ab3f112823a905) @@ -44,6 +44,7 @@ sources/main.h \ sources/maintimer.h \ sources/model/mloadcellreadings.h \ + sources/model/mtemperaturesensors.h \ sources/model/mtreatmentadjustblooddialysateresponse.h \ sources/model/mtreatmentadjustdurationresponse.h \ sources/model/mtreatmentadjustrequests.h \ @@ -74,6 +75,7 @@ sources/model/mtreatmentoutletflow.h \ sources/model/mtreatmenttime.h \ sources/view/vloadcellreadings.h \ + sources/view/vtemperaturesensors.h \ sources/view/vtreatmentadjustmentduration.h \ sources/view/vtreatmentadjustmentflows.h \ sources/view/vtreatmentadjustmentresponsebase.h \ @@ -102,6 +104,7 @@ main.cpp \ sources/maintimer.cpp \ sources/model/mloadcellreadings.cpp \ + sources/model/mtemperaturesensors.cpp \ sources/model/mtreatmentadjustblooddialysateresponse.cpp \ sources/model/mtreatmentadjustdurationresponse.cpp \ sources/model/mtreatmentadjustultrafiltrationconfirmresponse.cpp \ @@ -130,6 +133,7 @@ sources/model/malarmstatus.cpp \ sources/view/vloadcellreadings.cpp \ sources/view/vpoweroff.cpp \ + sources/view/vtemperaturesensors.cpp \ sources/view/vtreatmentadjustmentduration.cpp \ sources/view/vtreatmentadjustmentflows.cpp \ sources/view/vtreatmentadjustmentresponsebase.cpp \ @@ -295,5 +299,4 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin !isEmpty(target.path): INSTALLS += target -DISTFILES += \ - todos +DISTFILES += Index: sources/applicationcontroller.cpp =================================================================== diff -u -r9cfaddcf21cf36ab5a948b65dd8ef659598a4ed7 -reece7acacf84e8cc34b830f6b5ab3f112823a905 --- sources/applicationcontroller.cpp (.../applicationcontroller.cpp) (revision 9cfaddcf21cf36ab5a948b65dd8ef659598a4ed7) +++ sources/applicationcontroller.cpp (.../applicationcontroller.cpp) (revision eece7acacf84e8cc34b830f6b5ab3f112823a905) @@ -111,7 +111,7 @@ connect(&_Logger , SIGNAL(didExport()), this , SLOT( onExport())); - // ---- + // ---- Signal/Slots ADJUST_TRANSMT_MODEL_BRIDGE_CONNECTIONS(_GuiController ) ACTION_RECEIVE_MODEL_BRIDGE_CONNECTIONS(_MessageDispatcher) } Index: sources/applicationcontroller.h =================================================================== diff -u -r9cfaddcf21cf36ab5a948b65dd8ef659598a4ed7 -reece7acacf84e8cc34b830f6b5ab3f112823a905 --- sources/applicationcontroller.h (.../applicationcontroller.h) (revision 9cfaddcf21cf36ab5a948b65dd8ef659598a4ed7) +++ sources/applicationcontroller.h (.../applicationcontroller.h) (revision eece7acacf84e8cc34b830f6b5ab3f112823a905) @@ -88,7 +88,7 @@ void didExport (); - // ---- + // ---- Signal/Slots ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS ACTION_RECEIVE_MODEL_BRIDGE_DEFINITIONS Index: sources/canbus/messagedispatcher.cpp =================================================================== diff -u -r9cfaddcf21cf36ab5a948b65dd8ef659598a4ed7 -reece7acacf84e8cc34b830f6b5ab3f112823a905 --- sources/canbus/messagedispatcher.cpp (.../messagedispatcher.cpp) (revision 9cfaddcf21cf36ab5a948b65dd8ef659598a4ed7) +++ sources/canbus/messagedispatcher.cpp (.../messagedispatcher.cpp) (revision eece7acacf84e8cc34b830f6b5ab3f112823a905) @@ -102,7 +102,7 @@ connect(&_MessageAcknowModel , SIGNAL(didFailedTransmit( Sequence )), this , SLOT( onFailedTransmit( Sequence ))); - // ---- + // ---- Signal/Slots ADJUST_TRANSMT_MODEL_BRIDGE_CONNECTIONS(_ApplicationController) ACTION_RECEIVE_MODEL_BRIDGE_CONNECTIONS(_interpreter ) } @@ -238,7 +238,7 @@ void MessageDispatcher::onAdjustment(const AdjustDurationRequestData &vData) { QVariantList mData; - mData += vData.duratoin; + mData += vData.duration; onActionTransmit(GuiActionType::AdjustDurationReq, mData); } Index: sources/canbus/messagedispatcher.h =================================================================== diff -u -r9cfaddcf21cf36ab5a948b65dd8ef659598a4ed7 -reece7acacf84e8cc34b830f6b5ab3f112823a905 --- sources/canbus/messagedispatcher.h (.../messagedispatcher.h) (revision 9cfaddcf21cf36ab5a948b65dd8ef659598a4ed7) +++ sources/canbus/messagedispatcher.h (.../messagedispatcher.h) (revision eece7acacf84e8cc34b830f6b5ab3f112823a905) @@ -194,7 +194,7 @@ // An Action has been requested to be transmitted. void onActionTransmit (GuiActionType vActionId, const QVariantList &vData); - // ---- + // ---- Signal/Slots ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS_NOEMIT ACTION_RECEIVE_MODEL_BRIDGE_DEFINITIONS Index: sources/canbus/messageglobals.h =================================================================== diff -u -re591b135f821c1b1e13c2db8429dc63648c2452c -reece7acacf84e8cc34b830f6b5ab3f112823a905 --- sources/canbus/messageglobals.h (.../messageglobals.h) (revision e591b135f821c1b1e13c2db8429dc63648c2452c) +++ sources/canbus/messageglobals.h (.../messageglobals.h) (revision eece7acacf84e8cc34b830f6b5ab3f112823a905) @@ -52,6 +52,7 @@ {Gui::GuiActionType::TreatmentTime , 3 * 4 }, // 3 parameters each 4bytes {Gui::GuiActionType::PressureOcclusion , 5 * 4 }, // 5 parameters each 4bytes {Gui::GuiActionType::LoadCellReadings , 4 * 4 }, // 4 parameters each 4bytes + {Gui::GuiActionType::TempertureSensors , 12 * 4 }, // 12 parameters each 4bytes // ---- {Gui::GuiActionType::AlarmStatus , 4 * 4 + 2 }, // 4 parameters each 4bytes + 1 parameter 2bytes Index: sources/canbus/messageinterpreter.cpp =================================================================== diff -u -re591b135f821c1b1e13c2db8429dc63648c2452c -reece7acacf84e8cc34b830f6b5ab3f112823a905 --- sources/canbus/messageinterpreter.cpp (.../messageinterpreter.cpp) (revision e591b135f821c1b1e13c2db8429dc63648c2452c) +++ sources/canbus/messageinterpreter.cpp (.../messageinterpreter.cpp) (revision eece7acacf84e8cc34b830f6b5ab3f112823a905) @@ -328,6 +328,10 @@ ok = loadCellReadingsData (vMessage, vData); break; + case Gui::GuiActionType::TempertureSensors: + ok = tempratureSensorsData (vMessage, vData); + break; + default: printUnhandled (vMessage); break; @@ -733,6 +737,33 @@ } /*! + * \brief MessageInterpreter::TempratureSensorsData + * \details This method interprets TempratureSensors message data + * in vMessage of type Message. + * \param vMessage - The vMessage of type Message which contains all the data, + * require to be interpreted. + * \param vData - Load Cell Readings data + * \return true if the data can be extracted as defined for TempratureSensors Message ID + */ +bool MessageInterpreter::tempratureSensorsData(const Message &vMessage, QVariantList &vData) +{ + // TODO : review other methods + bool ok = false; + if ( ! isType (vMessage, Gui::GuiActionType::TempertureSensors) ) return ok; + if ( ! isPayloadLenValid(vMessage, Gui::GuiActionType::TempertureSensors) ) return ok; + + Model::MTemperatureSensors mData; + ok = mData.fromByteArray(vMessage.data); + LOG_DATUM(mData.toString()); + + mData.toVariantList(vData); + emit didActionReceive(mData.data()); + + return ok; +} + + +/*! * \brief MessageInterpreter::loadCellReadingsData * \details This method interprets LoadCellReadings message data * in vMessage of type Message. @@ -754,7 +785,7 @@ Types::U32 mCanBUSFaultCount; ok = GetValue(vMessage.data, index, mCanBUSFaultCount); if (ok) { - vData += mCanBUSFaultCount .value; + vData += mCanBUSFaultCount.value; } } return ok; @@ -823,6 +854,7 @@ bool MessageInterpreter::adjustUltrafiltrationStateData(const Message &vMessage, QVariantList &vData) { bool ok = false; + // TODO : The Ultrafiltration State change shall have the rejection reason like other responses. if ( ! isType (vMessage, Gui::GuiActionType::AdjustUltrafiltrationStateReq) ) return ok; if ( ! isPayloadLenValid(vMessage, Gui::GuiActionType::AcknowGeneric ) ) return ok; Index: sources/canbus/messageinterpreter.h =================================================================== diff -u -re591b135f821c1b1e13c2db8429dc63648c2452c -reece7acacf84e8cc34b830f6b5ab3f112823a905 --- sources/canbus/messageinterpreter.h (.../messageinterpreter.h) (revision e591b135f821c1b1e13c2db8429dc63648c2452c) +++ sources/canbus/messageinterpreter.h (.../messageinterpreter.h) (revision eece7acacf84e8cc34b830f6b5ab3f112823a905) @@ -86,6 +86,9 @@ // ---- Load Cell Readings bool canbusFaultCountData(const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__; + // ---- Temprature Sensors + bool tempratureSensorsData(const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__; + // ~~~~ Adjustments ~~~~ // ---- Treatment Adjust response for Blood/Dialysate Flow Rate bool adjustBloodDialysateData (const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__; Index: sources/gui/guicontroller.cpp =================================================================== diff -u -r9cfaddcf21cf36ab5a948b65dd8ef659598a4ed7 -reece7acacf84e8cc34b830f6b5ab3f112823a905 --- sources/gui/guicontroller.cpp (.../guicontroller.cpp) (revision 9cfaddcf21cf36ab5a948b65dd8ef659598a4ed7) +++ sources/gui/guicontroller.cpp (.../guicontroller.cpp) (revision eece7acacf84e8cc34b830f6b5ab3f112823a905) @@ -81,7 +81,7 @@ connect(&_ApplicationController, SIGNAL(didExport()), this , SLOT( onExport())); - // ---- + // ---- Signal/Slots ACTION_RECEIVE_MODEL_BRIDGE_CONNECTIONS(_ApplicationController) } Index: sources/gui/guicontroller.h =================================================================== diff -u -r9cfaddcf21cf36ab5a948b65dd8ef659598a4ed7 -reece7acacf84e8cc34b830f6b5ab3f112823a905 --- sources/gui/guicontroller.h (.../guicontroller.h) (revision 9cfaddcf21cf36ab5a948b65dd8ef659598a4ed7) +++ sources/gui/guicontroller.h (.../guicontroller.h) (revision eece7acacf84e8cc34b830f6b5ab3f112823a905) @@ -78,7 +78,7 @@ void didExportLog(); void didExport (); - // ---- + // ---- Signal/Slots ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS_PUBLIC ACTION_RECEIVE_MODEL_BRIDGE_DEFINITIONS Index: sources/gui/guiglobals.cpp =================================================================== diff -u -re591b135f821c1b1e13c2db8429dc63648c2452c -reece7acacf84e8cc34b830f6b5ab3f112823a905 --- sources/gui/guiglobals.cpp (.../guiglobals.cpp) (revision e591b135f821c1b1e13c2db8429dc63648c2452c) +++ sources/gui/guiglobals.cpp (.../guiglobals.cpp) (revision eece7acacf84e8cc34b830f6b5ab3f112823a905) @@ -36,6 +36,7 @@ #include "vtreatmentranges.h" #include "vloadcellreadings.h" +#include "vtemperaturesensors.h" #include "vtreatmentadjustmentduration.h" #include "vtreatmentadjustmentflows.h" Index: sources/gui/guiglobals.h =================================================================== diff -u -re591b135f821c1b1e13c2db8429dc63648c2452c -reece7acacf84e8cc34b830f6b5ab3f112823a905 --- sources/gui/guiglobals.h (.../guiglobals.h) (revision e591b135f821c1b1e13c2db8429dc63648c2452c) +++ sources/gui/guiglobals.h (.../guiglobals.h) (revision eece7acacf84e8cc34b830f6b5ab3f112823a905) @@ -57,6 +57,8 @@ PressureOcclusion = 0x0900, + TempertureSensors = 0x2D00, // 45 + AdjustBloodDialysateReq = 0x1700, // 23 AdjustBloodDialysateRsp = 0x1800, // 24 Index: sources/gui/qml/main.qml =================================================================== diff -u -re591b135f821c1b1e13c2db8429dc63648c2452c -reece7acacf84e8cc34b830f6b5ab3f112823a905 --- sources/gui/qml/main.qml (.../main.qml) (revision e591b135f821c1b1e13c2db8429dc63648c2452c) +++ sources/gui/qml/main.qml (.../main.qml) (revision eece7acacf84e8cc34b830f6b5ab3f112823a905) @@ -37,6 +37,7 @@ import VTreatmentAdjustmentUltrafiltrationConfirm 0.1; import VLoadCellReadings 0.1; +import VTemperatureSensors 0.1; // Qml imports import "qrc:/globals" @@ -81,6 +82,7 @@ VTreatmentTime { id: vTreatmentTime } VLoadCellReadings { id: vLoadCellReadings } + VTemperatureSensors { id: vTemperatureSensors } VTreatmentAdjustmentDuration { id: vTreatmentAdjustmentDuration } VTreatmentAdjustmentFlows { id: vTreatmentAdjustmentFlows } Index: sources/gui/qml/pages/SettingsHome.qml =================================================================== diff -u -re591b135f821c1b1e13c2db8429dc63648c2452c -reece7acacf84e8cc34b830f6b5ab3f112823a905 --- sources/gui/qml/pages/SettingsHome.qml (.../SettingsHome.qml) (revision e591b135f821c1b1e13c2db8429dc63648c2452c) +++ sources/gui/qml/pages/SettingsHome.qml (.../SettingsHome.qml) (revision eece7acacf84e8cc34b830f6b5ab3f112823a905) @@ -251,4 +251,43 @@ } } } + + Column { id: _TemperatureSensorsColumn + width : 150 + spacing : -5 + topPadding : 100 + leftPadding : 1000 + Text { + id: _TemperatureSensors_Title + text: qsTr(" Temp ") + width: _LoadCellReadingColumn.width + horizontalAlignment: Text.AlignRight + color: Colors.textMain + font.pixelSize: Fonts.fontPixelTitle + font.underline: true + } + Repeater { + model: [ + vTemperatureSensors.inletPrimaryHeater .toFixed(2) , + vTemperatureSensors.outletPrimaryHeater .toFixed(2) , + vTemperatureSensors.conductivitySensor1 .toFixed(2) , + vTemperatureSensors.conductivitySensor2 .toFixed(2) , + vTemperatureSensors.outletRedundancy .toFixed(2) , + vTemperatureSensors.inletDialysate .toFixed(2) , + vTemperatureSensors.primaryHeaterThermoCouple .toFixed(2) , + vTemperatureSensors.trimmerHeaterThermoCouple .toFixed(2) , + vTemperatureSensors.primaryHeaterColdJunction .toFixed(2) , + vTemperatureSensors.trimmerHeaterColdJunction .toFixed(2) , + vTemperatureSensors.primaryHeaterInternal .toFixed(2) , + vTemperatureSensors.trimmerHeaterInternal .toFixed(2) + ] + Text { + text: modelData + width: _TemperatureSensorsColumn.width + horizontalAlignment: Text.AlignRight + color: Colors.textMain + font.pixelSize: Fonts.fontPixelTitle + } + } + } } Index: sources/model/mmodel.h =================================================================== diff -u -re591b135f821c1b1e13c2db8429dc63648c2452c -reece7acacf84e8cc34b830f6b5ab3f112823a905 --- sources/model/mmodel.h (.../mmodel.h) (revision e591b135f821c1b1e13c2db8429dc63648c2452c) +++ sources/model/mmodel.h (.../mmodel.h) (revision eece7acacf84e8cc34b830f6b5ab3f112823a905) @@ -26,6 +26,7 @@ #include "mtreatmentranges.h" #include "mloadcellreadings.h" +#include "mtemperaturesensors.h" #include "mtreatmentadjustblooddialysateresponse.h" #include "mtreatmentadjustdurationresponse.h" @@ -133,6 +134,7 @@ REGISTER_METATYPE( TreatmentRangesData ) \ \ REGISTER_METATYPE( LoadCellReadingsData ) \ + REGISTER_METATYPE( TemperatureSensorsData ) \ \ REGISTER_METATYPE( AdjustBloodDialysateRequestData ) \ REGISTER_METATYPE( AdjustDurationRequestData ) \ @@ -158,6 +160,7 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentRangesData ) \ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, LoadCellReadingsData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TemperatureSensorsData ) \ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationStateResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustBloodDialysateResponseData ) \ @@ -183,6 +186,7 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentRangesData ) \ \ ACTION_RECEIVE_BRIDGE_DEFINITION( LoadCellReadingsData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( TemperatureSensorsData ) \ \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationStateResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustBloodDialysateResponseData ) \ @@ -222,6 +226,7 @@ ACTION_RECEIVE_SIGNAL( TreatmentRangesData ) \ \ ACTION_RECEIVE_SIGNAL( LoadCellReadingsData ) \ + ACTION_RECEIVE_SIGNAL( TemperatureSensorsData ) \ \ ACTION_RECEIVE_SIGNAL( AdjustUltrafiltrationStateResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustBloodDialysateResponseData ) \ Index: sources/model/mtemperaturesensors.cpp =================================================================== diff -u --- sources/model/mtemperaturesensors.cpp (revision 0) +++ sources/model/mtemperaturesensors.cpp (revision eece7acacf84e8cc34b830f6b5ab3f112823a905) @@ -0,0 +1,93 @@ +/*! + * + * 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 mtemperaturesensors.cpp + * \date 6/12/2020 + * \author Behrouz NematiPour + * + */ +#include "mtemperaturesensors.h" + +using namespace Model; + +QString MTemperatureSensors::toString() const { + return QString(stringPrefix + "(%1, %2, %3, %4)") + .arg(_data.mInletPrimaryHeater .value) + .arg(_data.mOutletPrimaryHeater .value) + .arg(_data.mConductivitySensor1 .value) + .arg(_data.mConductivitySensor2 .value) + .arg(_data.mOutletRedundancy .value) + .arg(_data.mInletDialysate .value) + .arg(_data.mPrimaryHeaterThermoCouple .value) + .arg(_data.mTrimmerHeaterThermoCouple .value) + .arg(_data.mPrimaryHeaterColdJunction .value) + .arg(_data.mTrimmerHeaterColdJunction .value) + .arg(_data.mPrimaryHeaterInternal .value) + .arg(_data.mTrimmerHeaterInternal .value); +} + +void MTemperatureSensors::toVariantList(QVariantList &vData) const { + vData += _data.mInletPrimaryHeater .value; + vData += _data.mOutletPrimaryHeater .value; + vData += _data.mConductivitySensor1 .value; + vData += _data.mConductivitySensor2 .value; + vData += _data.mOutletRedundancy .value; + vData += _data.mInletDialysate .value; + vData += _data.mPrimaryHeaterThermoCouple .value; + vData += _data.mTrimmerHeaterThermoCouple .value; + vData += _data.mPrimaryHeaterColdJunction .value; + vData += _data.mTrimmerHeaterColdJunction .value; + vData += _data.mPrimaryHeaterInternal .value; + vData += _data.mTrimmerHeaterInternal .value; +} + +bool MTemperatureSensors::fromByteArray(const QByteArray &vByteArray, int *vIndex) { + int index = 0; // message data start position + if (GetValue(vByteArray, index, _data.mInletPrimaryHeater )) + if (GetValue(vByteArray, index, _data.mOutletPrimaryHeater )) + if (GetValue(vByteArray, index, _data.mConductivitySensor1 )) + if (GetValue(vByteArray, index, _data.mConductivitySensor2 )) + if (GetValue(vByteArray, index, _data.mOutletRedundancy )) + if (GetValue(vByteArray, index, _data.mInletDialysate )) + if (GetValue(vByteArray, index, _data.mPrimaryHeaterThermoCouple )) + if (GetValue(vByteArray, index, _data.mTrimmerHeaterThermoCouple )) + if (GetValue(vByteArray, index, _data.mPrimaryHeaterColdJunction )) + if (GetValue(vByteArray, index, _data.mTrimmerHeaterColdJunction )) + if (GetValue(vByteArray, index, _data.mPrimaryHeaterInternal )) + if (GetValue(vByteArray, index, _data.mTrimmerHeaterInternal )) + return true ; + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } +} + +MTemperatureSensors::Data MTemperatureSensors::data() const { + Data data; + data.mInletPrimaryHeater = _data.mInletPrimaryHeater .value; + data.mOutletPrimaryHeater = _data.mOutletPrimaryHeater .value; + data.mConductivitySensor1 = _data.mConductivitySensor1 .value; + data.mConductivitySensor2 = _data.mConductivitySensor2 .value; + data.mOutletRedundancy = _data.mOutletRedundancy .value; + data.mInletDialysate = _data.mInletDialysate .value; + data.mPrimaryHeaterThermoCouple = _data.mPrimaryHeaterThermoCouple .value; + data.mTrimmerHeaterThermoCouple = _data.mTrimmerHeaterThermoCouple .value; + data.mPrimaryHeaterColdJunction = _data.mPrimaryHeaterColdJunction .value; + data.mTrimmerHeaterColdJunction = _data.mTrimmerHeaterColdJunction .value; + data.mPrimaryHeaterInternal = _data.mPrimaryHeaterInternal .value; + data.mTrimmerHeaterInternal = _data.mTrimmerHeaterInternal .value; + return data; +} Index: sources/model/mtemperaturesensors.h =================================================================== diff -u --- sources/model/mtemperaturesensors.h (revision 0) +++ sources/model/mtemperaturesensors.h (revision eece7acacf84e8cc34b830f6b5ab3f112823a905) @@ -0,0 +1,70 @@ +/*! + * + * 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 mloadcellreadings.h + * \date 6/12/2020 + * \author Behrouz NematiPour + * + */ +#pragma once + +// Qt +#include + +// Project +#include "types.h" + +namespace Model { + +class MTemperatureSensors { +public: + QString stringPrefix = "Temperature Sensors"; + struct Data { + float mInletPrimaryHeater = 0; ///< Inlet primary heaters temperature sensor + float mOutletPrimaryHeater = 0; ///< Outlet primary heaters temperature sensor + float mConductivitySensor1 = 0; ///< Conductivity sensor 1 temperature sensor + float mConductivitySensor2 = 0; ///< Conductivity sensor 2 temperature sensor + float mOutletRedundancy = 0; ///< Outlet redundancy temperature sensor + float mInletDialysate = 0; ///< Inlet dialysate temperature sensor + float mPrimaryHeaterThermoCouple = 0; ///< Primary heaters internal temperature sensor + float mTrimmerHeaterThermoCouple = 0; ///< Trimmer heater internal temperature sensor + float mPrimaryHeaterColdJunction = 0; ///< Primary heaters cold junction temperature sensor + float mTrimmerHeaterColdJunction = 0; ///< Trimmer heater cold junction temperature sensor + float mPrimaryHeaterInternal = 0; ///< Primary heaters internal temperature + float mTrimmerHeaterInternal = 0; ///< Trimmer heater internal temperature + }; + +private: + struct { + Types::F32 mInletPrimaryHeater ; + Types::F32 mOutletPrimaryHeater ; + Types::F32 mConductivitySensor1 ; + Types::F32 mConductivitySensor2 ; + Types::F32 mOutletRedundancy ; + Types::F32 mInletDialysate ; + Types::F32 mPrimaryHeaterThermoCouple ; + Types::F32 mTrimmerHeaterThermoCouple ; + Types::F32 mPrimaryHeaterColdJunction ; + Types::F32 mTrimmerHeaterColdJunction ; + Types::F32 mPrimaryHeaterInternal ; + Types::F32 mTrimmerHeaterInternal ; + } _data; + +public: + MTemperatureSensors() { } + + QString toString ( ) const ; + void toVariantList ( QVariantList &vData ) const ; + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr); + + Data data() const; +}; + +} + +typedef Model::MTemperatureSensors::Data TemperatureSensorsData; Index: sources/model/mtreatmentadjustrequests.h =================================================================== diff -u -rf160ef9c259a75e8d6120ad962cda648e8f7a9b3 -reece7acacf84e8cc34b830f6b5ab3f112823a905 --- sources/model/mtreatmentadjustrequests.h (.../mtreatmentadjustrequests.h) (revision f160ef9c259a75e8d6120ad962cda648e8f7a9b3) +++ sources/model/mtreatmentadjustrequests.h (.../mtreatmentadjustrequests.h) (revision eece7acacf84e8cc34b830f6b5ab3f112823a905) @@ -29,7 +29,7 @@ class MAdjustDurationReq { public: - quint32 duratoin = 0; + quint32 duration = 0; }; class MAdjustUltrafiltrationStateReq { Index: sources/view/vtemperaturesensors.cpp =================================================================== diff -u --- sources/view/vtemperaturesensors.cpp (revision 0) +++ sources/view/vtemperaturesensors.cpp (revision eece7acacf84e8cc34b830f6b5ab3f112823a905) @@ -0,0 +1,35 @@ +/*! + * + * 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 vtemperaturesensors.cpp + * \date 6/12/2020 + * \author Behrouz NematiPour + * + */ +#include "vtemperaturesensors.h" + +// Project +#include "guicontroller.h" + +VIEW_DEF(VTemperatureSensors, TemperatureSensorsData) + +void VTemperatureSensors::onActionReceive(const TemperatureSensorsData &vData) +{ + inletPrimaryHeater ( vData.mInletPrimaryHeater ); + outletPrimaryHeater ( vData.mOutletPrimaryHeater ); + conductivitySensor1 ( vData.mConductivitySensor1 ); + conductivitySensor2 ( vData.mConductivitySensor2 ); + outletRedundancy ( vData.mOutletRedundancy ); + inletDialysate ( vData.mInletDialysate ); + primaryHeaterThermoCouple ( vData.mPrimaryHeaterThermoCouple ); + trimmerHeaterThermoCouple ( vData.mTrimmerHeaterThermoCouple ); + primaryHeaterColdJunction ( vData.mPrimaryHeaterColdJunction ); + trimmerHeaterColdJunction ( vData.mTrimmerHeaterColdJunction ); + primaryHeaterInternal ( vData.mPrimaryHeaterInternal ); + trimmerHeaterInternal ( vData.mTrimmerHeaterInternal ); +} Index: sources/view/vtemperaturesensors.h =================================================================== diff -u --- sources/view/vtemperaturesensors.h (revision 0) +++ sources/view/vtemperaturesensors.h (revision eece7acacf84e8cc34b830f6b5ab3f112823a905) @@ -0,0 +1,46 @@ +/*! + * + * 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 vtemperaturesensors.h + * \date 6/12/2020 + * \author Behrouz NematiPour + * + */ +#pragma once + +// Qt +#include + +// Project +#include "mmodel.h" +#include "vview.h" + +// namespace +namespace View { + +class VTemperatureSensors : public QObject +{ + Q_OBJECT + + PROPERTY( float , inletPrimaryHeater , 0) + PROPERTY( float , outletPrimaryHeater , 0) + PROPERTY( float , conductivitySensor1 , 0) + PROPERTY( float , conductivitySensor2 , 0) + PROPERTY( float , outletRedundancy , 0) + PROPERTY( float , inletDialysate , 0) + PROPERTY( float , primaryHeaterThermoCouple , 0) + PROPERTY( float , trimmerHeaterThermoCouple , 0) + PROPERTY( float , primaryHeaterColdJunction , 0) + PROPERTY( float , trimmerHeaterColdJunction , 0) + PROPERTY( float , primaryHeaterInternal , 0) + PROPERTY( float , trimmerHeaterInternal , 0) + + VIEW_DEC(VTemperatureSensors, TemperatureSensorsData) + +}; +} Index: sources/view/vtreatmentadjustmentduration.h =================================================================== diff -u -rf160ef9c259a75e8d6120ad962cda648e8f7a9b3 -reece7acacf84e8cc34b830f6b5ab3f112823a905 --- sources/view/vtreatmentadjustmentduration.h (.../vtreatmentadjustmentduration.h) (revision f160ef9c259a75e8d6120ad962cda648e8f7a9b3) +++ sources/view/vtreatmentadjustmentduration.h (.../vtreatmentadjustmentduration.h) (revision eece7acacf84e8cc34b830f6b5ab3f112823a905) @@ -45,7 +45,7 @@ public slots: // ----- Adjust Duration void doAdjustment(quint32 vDuration) { - _data.duratoin = vDuration; + _data.duration = vDuration; emit didAdjustment(_data); } signals: Index: sources/view/vtreatmentultrafiltration.h =================================================================== diff -u -r6616f7b9b88efffa42ab605833d296afb76d3cb1 -reece7acacf84e8cc34b830f6b5ab3f112823a905 --- sources/view/vtreatmentultrafiltration.h (.../vtreatmentultrafiltration.h) (revision 6616f7b9b88efffa42ab605833d296afb76d3cb1) +++ sources/view/vtreatmentultrafiltration.h (.../vtreatmentultrafiltration.h) (revision eece7acacf84e8cc34b830f6b5ab3f112823a905) @@ -28,7 +28,7 @@ Q_OBJECT PROPERTY( float, precision , 3) // Centralized Gui value : none model property - // ~~~~~ Prescription values which we currently doesn't have. + // ~~~~~ Prescription values which we currently don't have. // TODO : min/max should come from pre-treatment prescription parameters which we don't have now (2020/05/12) PROPERTY( float, minimum , 0.000) PROPERTY( float, maximum , 0.600) Index: sources/view/vview.h =================================================================== diff -u -re591b135f821c1b1e13c2db8429dc63648c2452c -reece7acacf84e8cc34b830f6b5ab3f112823a905 --- sources/view/vview.h (.../vview.h) (revision e591b135f821c1b1e13c2db8429dc63648c2452c) +++ sources/view/vview.h (.../vview.h) (revision eece7acacf84e8cc34b830f6b5ab3f112823a905) @@ -103,6 +103,7 @@ REGISTER_TYPE( VTreatmentRanges ) \ \ REGISTER_TYPE( VLoadCellReadings ) \ + REGISTER_TYPE( VTemperatureSensors ) \ \ REGISTER_TYPE( VTreatmentAdjustmentDuration ) \ REGISTER_TYPE( VTreatmentAdjustmentFlows ) \ Fisheye: Tag eece7acacf84e8cc34b830f6b5ab3f112823a905 refers to a dead (removed) revision in file `todos'. Fisheye: No comparison available. Pass `N' to diff?