Index: sources/storage/TreatmentLog.h =================================================================== diff -u -r6d76149dca70e879f33bf6ed44203d0d06bc523a -r1d3e80dd50bfe08502c8e52de126a2b809370211 --- sources/storage/TreatmentLog.h (.../TreatmentLog.h) (revision 6d76149dca70e879f33bf6ed44203d0d06bc523a) +++ sources/storage/TreatmentLog.h (.../TreatmentLog.h) (revision 1d3e80dd50bfe08502c8e52de126a2b809370211) @@ -198,7 +198,7 @@ return ""; } QString value(quint8 vIndex) const { - if (vIndex < _values.count()) return _values[vIndex]; + if (vIndex < _valuesLog.count()) return _valuesLog[vIndex]; return ""; } QString unit(quint8 vIndex) const { @@ -207,7 +207,10 @@ } // Lists - QStringList _values; + QStringList _valuesLog; + + QStringList _valuesGui; + QList _treatmentLogAvrgeData; QList _treatmentLogAlarmData; QList _treatmentLogEventData; @@ -232,11 +235,12 @@ void timerEvent(QTimerEvent *) override; public: - void initModel(const AdjustTreatmentLogResponseData &vData, const QString &vPatientID); + void initModel(const AdjustTreatmentLogResponseData &vData, const QString &vPatientID, bool vIsHeparinOff); - const QStringList titles() const { return _titles; } - const QStringList units () const { return _units ; } - const QStringList values() const { return _values; } + const QStringList titles () const { return _titles ; } + const QStringList units () const { return _units ; } + const QStringList valuesLog () const { return _valuesLog; } + const QStringList valuesGui () const { return _valuesGui; } void append(const TreatmentLogAvrgeData &vData); void append(const TreatmentLogAlarmData &vData);