Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r8d7a40bfbd30d596b4450965597d2e3f2f61326d -r6c075a49d02dbe9a3c7636a7b01bceab597b000b --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 8d7a40bfbd30d596b4450965597d2e3f2f61326d) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 6c075a49d02dbe9a3c7636a7b01bceab597b000b) @@ -78,7 +78,7 @@ {Gui::GuiActionType::ID_Saline , 4 * 4 }, // 4 parameters each 4bytes {Gui::GuiActionType::ID_Vitals , 3 * 4 }, // 3 parameters each 4bytes {Gui::GuiActionType::ID_Ultrafiltration , 4 * 4 }, // 4 parameters each 4bytes - {Gui::GuiActionType::ID_IsolatedUF , 4 * 4 }, // 4 parameters each 4bytes + {Gui::GuiActionType::ID_IsolatedUF , 6 * 4 }, // 6 parameters each 4bytes {Gui::GuiActionType::ID_Heparin , 2 * 4 }, // 2 parameters each 4bytes {Gui::GuiActionType::ID_Rinseback , 6 * 4 }, // 6 parameters each 4bytes {Gui::GuiActionType::ID_Recirculate , 2 * 4 }, // 2 parameters each 4bytes Index: sources/gui/qml/pages/treatment/sections/TreatmentTime.qml =================================================================== diff -u -re7a26aa8823fdabbfb21fe75ea9a581c7d0513b4 -r6c075a49d02dbe9a3c7636a7b01bceab597b000b --- sources/gui/qml/pages/treatment/sections/TreatmentTime.qml (.../TreatmentTime.qml) (revision e7a26aa8823fdabbfb21fe75ea9a581c7d0513b4) +++ sources/gui/qml/pages/treatment/sections/TreatmentTime.qml (.../TreatmentTime.qml) (revision 6c075a49d02dbe9a3c7636a7b01bceab597b000b) @@ -28,16 +28,15 @@ */ Rectangle { id: _root property int minimum : 0 - property int maximum : vTreatmentTime.time_Total - property int progressValue : vTreatmentTime.time_Elapsed - property int timeTextValue : vTreatmentTime.time_Remaining + property int maximum : isIsoTreatment ? vTreatmentIsolatedUF.duration : vTreatmentTime.time_Total + property int progressValue : isIsoTreatment ? vTreatmentIsolatedUF.elapsedTime : vTreatmentTime.time_Elapsed + property int timeTextValue : isIsoTreatment ? vTreatmentIsolatedUF.timeRemaining : vTreatmentTime.time_Remaining property bool isRunning : ( vTDTreatmentStates.txDialysis || vTDTreatmentStates.txIsolatedUF ) && !( vTDTreatmentStates.sbWaitPump || vTDTreatmentStates.sbRunning ) property bool isPaused : vTDTreatmentStates.txStop || ! _root.isRunning - property bool isComplete : vTDTreatmentStates.txEnd property bool isHDTreatment : vTreatmentCreate.treatmentModality === 0 Index: sources/model/td/data/treatment/MTreatmentIsolatedUFData.cpp =================================================================== diff -u -r0a9e9579c7481eb5e0900fe604cac7bba6bb86ca -r6c075a49d02dbe9a3c7636a7b01bceab597b000b --- sources/model/td/data/treatment/MTreatmentIsolatedUFData.cpp (.../MTreatmentIsolatedUFData.cpp) (revision 0a9e9579c7481eb5e0900fe604cac7bba6bb86ca) +++ sources/model/td/data/treatment/MTreatmentIsolatedUFData.cpp (.../MTreatmentIsolatedUFData.cpp) (revision 6c075a49d02dbe9a3c7636a7b01bceab597b000b) @@ -19,6 +19,8 @@ QVariantList MTreatmentIsolatedUF::parameters() const { return { _data.mDuration .value, + _data.mElapsedTime .value, + _data.mTimeRemaining .value, _data.mSetVolume .value, _data.mVolumeDelivered .value, _data.mRate .value, @@ -28,6 +30,8 @@ bool MTreatmentIsolatedUF::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position if ( ! GetValue(vByteArray, index, _data.mDuration )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mElapsedTime )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mTimeRemaining )) goto lError; if ( ! GetValue(vByteArray, index, _data.mSetVolume )) goto lError; if ( ! GetValue(vByteArray, index, _data.mVolumeDelivered )) goto lError; if ( ! GetValue(vByteArray, index, _data.mRate )) goto lError; @@ -48,6 +52,8 @@ MTreatmentIsolatedUF::Data MTreatmentIsolatedUF::data() const { return { _data.mDuration .value, + _data.mElapsedTime .value, + _data.mTimeRemaining .value, _data.mSetVolume .value, _data.mVolumeDelivered .value, _data.mRate .value Index: sources/model/td/data/treatment/MTreatmentIsolatedUFData.h =================================================================== diff -u -r3ba0ffbe79f453701c0e7f55e4dae72ca3e45142 -r6c075a49d02dbe9a3c7636a7b01bceab597b000b --- sources/model/td/data/treatment/MTreatmentIsolatedUFData.h (.../MTreatmentIsolatedUFData.h) (revision 3ba0ffbe79f453701c0e7f55e4dae72ca3e45142) +++ sources/model/td/data/treatment/MTreatmentIsolatedUFData.h (.../MTreatmentIsolatedUFData.h) (revision 6c075a49d02dbe9a3c7636a7b01bceab597b000b) @@ -37,9 +37,11 @@ * | Payload || * | || * | #1:(U32) | \ref Data::mDuration | - * | #2:(U32) | \ref Data::mSetVolume | - * | #3:(U32) | \ref Data::mVolumeDelivered | - * | #4:(U32) | \ref Data::mRate | + * | #2:(U32) | \ref Data::mElapsedTime | + * | #3:(U32) | \ref Data::mTimeRemaining | + * | #4:(F32) | \ref Data::mSetVolume | + * | #5:(F32) | \ref Data::mVolumeDelivered | + * | #6:(F32) | \ref Data::mRate | * * \sa Data * @@ -60,9 +62,11 @@ struct { Types::U32 mDuration ; - Types::U32 mSetVolume ; - Types::U32 mVolumeDelivered ; - Types::U32 mRate ; + Types::U32 mElapsedTime ; + Types::U32 mTimeRemaining ; + Types::F32 mSetVolume ; + Types::F32 mVolumeDelivered ; + Types::F32 mRate ; } _data; public: @@ -72,9 +76,11 @@ struct Data { quint32 mDuration = 0; ///< Current duration - quint32 mSetVolume = 0; ///< Current volume goal - quint32 mVolumeDelivered = 0; ///< Current volume removed during Isolateds UF - quint32 mRate = 0; ///< IsolatedUF rate + quint32 mElapsedTime = 0; ///< Elapsed Time + quint32 mTimeRemaining = 0; ///< Elapsed Time + float mSetVolume = 0; ///< Current volume goal + float mVolumeDelivered = 0; ///< Current volume removed during Isolateds UF + float mRate = 0; ///< IsolatedUF rate }; public: Index: sources/view/td/data/treatment/VTreatmentIsolatedUFData.cpp =================================================================== diff -u -r0a9e9579c7481eb5e0900fe604cac7bba6bb86ca -r6c075a49d02dbe9a3c7636a7b01bceab597b000b --- sources/view/td/data/treatment/VTreatmentIsolatedUFData.cpp (.../VTreatmentIsolatedUFData.cpp) (revision 0a9e9579c7481eb5e0900fe604cac7bba6bb86ca) +++ sources/view/td/data/treatment/VTreatmentIsolatedUFData.cpp (.../VTreatmentIsolatedUFData.cpp) (revision 6c075a49d02dbe9a3c7636a7b01bceab597b000b) @@ -23,7 +23,9 @@ void VTreatmentIsolatedUF::onActionReceive(const TreatmentIsolatedUFData &vData) { duration ( vData.mDuration ); - setVolume ( vData.mSetVolume / 1000.f ); // mL => L - volumeDelivered ( vData.mVolumeDelivered / 1000.f ); // mL => L - rate ( vData.mRate / 1000.f ); // mL/Hr => L/Hr + elapsedTime ( vData.mElapsedTime ); + timeRemaining ( vData.mTimeRemaining ); + setVolume ( vData.mSetVolume ); + volumeDelivered ( vData.mVolumeDelivered ); + rate ( vData.mRate ); } Index: sources/view/td/data/treatment/VTreatmentIsolatedUFData.h =================================================================== diff -u -r0a9e9579c7481eb5e0900fe604cac7bba6bb86ca -r6c075a49d02dbe9a3c7636a7b01bceab597b000b --- sources/view/td/data/treatment/VTreatmentIsolatedUFData.h (.../VTreatmentIsolatedUFData.h) (revision 0a9e9579c7481eb5e0900fe604cac7bba6bb86ca) +++ sources/view/td/data/treatment/VTreatmentIsolatedUFData.h (.../VTreatmentIsolatedUFData.h) (revision 6c075a49d02dbe9a3c7636a7b01bceab597b000b) @@ -37,6 +37,8 @@ Q_OBJECT PROPERTY( quint32 , duration , 0) + PROPERTY( quint32 , elapsedTime , 0) + PROPERTY( quint32 , timeRemaining , 0) PROPERTY( float , setVolume , 0) PROPERTY( float , volumeDelivered , 0) PROPERTY( float , rate , 0)