Index: sources/model/dg/data/MDGReservoirData.cpp =================================================================== diff -u -r6cad9b004e904200b71de7431c745795256080df -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 --- sources/model/dg/data/MDGReservoirData.cpp (.../MDGReservoirData.cpp) (revision 6cad9b004e904200b71de7431c745795256080df) +++ sources/model/dg/data/MDGReservoirData.cpp (.../MDGReservoirData.cpp) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) @@ -1,15 +1,15 @@ /*! * - * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * 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 MDGReservoirData.cpp - * \author (last) Behrouz NematiPour - * \date (last) 16-Oct-2020 - * \author (original) Behrouz NemaiPour - * \date (original) 02-Jul-2020 + * \file MDGReservoirData.cpp + * \author (last) Behrouz NematiPour + * \date (last) 31-Oct-2023 + * \author (original) Behrouz NemaiPour + * \date (original) 02-Jul-2020 * */ #include "MDGReservoirData.h" @@ -18,21 +18,48 @@ QVariantList MDGReservoir::parameters() const { return { - _data.mActiveReservoir .value, - _data.mFillToVol .value, - _data.mDrainToVol .value + _data.mActiveReservoir .value, + _data.mFillToVol .value, + _data.mDrainToVol .value, + _data.mTimeReservoirCycleMS .value, + _data.mTimeReservoirFill2SwitchMS .value, + _data.mTimeUFDecayMS .value, + _data.mTempUFFill .value, + _data.mTempReservoirUseActual .value, + _data.mTempReservoirEndFill .value, + _data.mTempAvgFill .value, + _data.mTempLastFill .value, + _data.mTimereservoirFill .value, }; } bool MDGReservoir::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if (GetValue(vByteArray, index, _data.mActiveReservoir )) - if (GetValue(vByteArray, index, _data.mFillToVol )) - if (GetValue(vByteArray, index, _data.mDrainToVol )) + if (GetValue(vByteArray, index, _data.mActiveReservoir )) + if (GetValue(vByteArray, index, _data.mFillToVol )) + if (GetValue(vByteArray, index, _data.mDrainToVol )) + if (GetValue(vByteArray, index, _data.mTimeReservoirCycleMS )) + if (GetValue(vByteArray, index, _data.mTimeReservoirFill2SwitchMS )) + if (GetValue(vByteArray, index, _data.mTimeUFDecayMS )) + if (GetValue(vByteArray, index, _data.mTempUFFill )) + if (GetValue(vByteArray, index, _data.mTempReservoirUseActual )) + if (GetValue(vByteArray, index, _data.mTempReservoirEndFill )) + if (GetValue(vByteArray, index, _data.mTempAvgFill )) + if (GetValue(vByteArray, index, _data.mTempLastFill )) + if (GetValue(vByteArray, index, _data.mTimereservoirFill )) 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; } } /*! @@ -42,8 +69,17 @@ */ MDGReservoir::Data MDGReservoir::data() const { Data data; - data.mActiveReservoir = _data.mActiveReservoir .value; - data.mFillToVol = _data.mFillToVol .value; - data.mDrainToVol = _data.mDrainToVol .value; + data.mActiveReservoir = _data.mActiveReservoir .value; + data.mFillToVol = _data.mFillToVol .value; + data.mDrainToVol = _data.mDrainToVol .value; + data.mTimeReservoirCycleMS = _data.mTimeReservoirCycleMS .value; + data.mTimeReservoirFill2SwitchMS = _data.mTimeReservoirFill2SwitchMS .value; + data.mTimeUFDecayMS = _data.mTimeUFDecayMS .value; + data.mTempUFFill = _data.mTempUFFill .value; + data.mTempReservoirUseActual = _data.mTempReservoirUseActual .value; + data.mTempReservoirEndFill = _data.mTempReservoirEndFill .value; + data.mTempAvgFill = _data.mTempAvgFill .value; + data.mTempLastFill = _data.mTempLastFill .value; + data.mTimereservoirFill = _data.mTimereservoirFill .value; return data; }