Index: sources/storage/TreatmentLog.h =================================================================== diff -u -r0f1aa395dfb46e006bdec10d0bb99f2ed27739bf -r86e9dfbff50cb7e16fd94c16c1c818cef3b47eac --- sources/storage/TreatmentLog.h (.../TreatmentLog.h) (revision 0f1aa395dfb46e006bdec10d0bb99f2ed27739bf) +++ sources/storage/TreatmentLog.h (.../TreatmentLog.h) (revision 86e9dfbff50cb7e16fd94c16c1c818cef3b47eac) @@ -7,7 +7,7 @@ * * \file TreatmentLog.h * \author (last) Behrouz NematiPour - * \date (last) 01-Mar-2022 + * \date (last) 11-Apr-2022 * \author (original) Behrouz NematiPour * \date (original) 04-May-2021 * @@ -78,7 +78,8 @@ _lastTxInfo; - QString _deviceID = ""; + QString _deviceID = ""; + QString _txCode = ""; // content of this value comes from CloudSync App. enum Role { eValue, @@ -88,7 +89,6 @@ enum TreatmentLogIndex { ePatientID , -// eDeviceID , // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00. eBloodFlowRate , eDialysateFlowRate , eTreatmentDuration , @@ -118,18 +118,11 @@ eTargetUFRate , eActualUFRate , eSalineBolusVolume , -// eAverageBloodFlow , // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00. -// eAverageDialysateFlow , // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00. -// eAverageDialysateTemp , // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00. -// eAverageArterialPressure , // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00. -// eAverageVenousPressure , // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00. - - eTreatmentLogIndexCount + eTreatmentLogIndexCount , }; const QStringList _titles { tr("Patient ID" ), // ePatientID -// tr("Device ID" ), // eDeviceID // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00. tr("Blood Flow Rate" ), // eBloodFlowRate tr("Dialysate Flow Rate" ), // eDialysateFlowRate tr("Treatment Duration" ), // eTreatmentDuration @@ -159,16 +152,10 @@ tr("Target UF Rate" ), // eTargetUFRate tr("Actual UF Rate" ), // eActualUFRate tr("Saline Bolus Volume" ), // eSalineBolusVolume -// tr("Average Blood Flow" ), // eAverageBloodFlow // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00. -// tr("Average Dialysate Flow" ), // eAverageDialysateFlow // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00. -// tr("Average Dialysate Temp" ), // eAverageDialysateTemp // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00. -// tr("Average Arterial Pressure" ), // eAverageArterialPressure // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00. -// tr("Average Venous Pressure" ), // eAverageVenousPressure // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00. }; const QStringList _units { "" , // ePatientID -// "" , // eDeviceID // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00. _unitTextFlowRate , // eBloodFlowRate _unitTextFlowRate , // eDialysateFlowRate _unitTextDurationMin , // eTreatmentDuration @@ -198,11 +185,6 @@ _unitTextFlowRate , // eTargetUFRate _unitTextFlowRate , // eActualUFRate _unitTextFluid , // eSalineBolusVolume -// _unitTextFlowRate , // eAverageBloodFlow // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00. -// _unitTextFlowRate , // eAverageDialysateFlow // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00. -// _unitTextTemperature , // eAverageDialysateTemp // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00. -// _unitTextBloodPressure , // eAverageArterialPressure // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00. -// _unitTextBloodPressure , // eAverageVenousPressure // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00. }; QString title(quint8 vIndex) const { @@ -250,6 +232,7 @@ void onLogPathSet(Logger::LogType vLogType, const QString &vLogPath); void onSave (); void onExport (); + void onTxCodeReceive(const QString &vTxCode); public slots: void doSave (); @@ -259,6 +242,9 @@ void didTreatmentLogSave( const QString &vDeviceID , const QString &vPatientID , const QString &vFileName ); + void didTxCodeReceive ( const QString &vTxCode ); + + void didNotification ( const QString &vNotification); }; }