Index: sources/model/MTreatmentParametersResp.h =================================================================== diff -u -r5387db3e9735f3bbf768906858dbcd725cf23528 -r0622f1ec79b9a24a3f9d58cd2de329df997b37d6 --- sources/model/MTreatmentParametersResp.h (.../MTreatmentParametersResp.h) (revision 5387db3e9735f3bbf768906858dbcd725cf23528) +++ sources/model/MTreatmentParametersResp.h (.../MTreatmentParametersResp.h) (revision 0622f1ec79b9a24a3f9d58cd2de329df997b37d6) @@ -21,20 +21,20 @@ quint32 bloodFlowRate = 0; quint32 dialysateFlowRate = 0; quint32 duration = 0; - quint32 heparinDispensingRate = 0; - quint32 heparinBolusVolume = 0; quint32 heparinStopTime = 0; quint32 salineBolus = 0; quint32 acidConcentrate = 0; quint32 bicarbonateConcentrate = 0; quint32 dialyzerType = 0; - quint32 dialysateTemp = 0; + quint32 bloodPressureMeasureInterval = 0; + quint32 rinsebackFlowRate = 0; quint32 arterialPressureLimitLow = 0; quint32 arterialPressureLimitHigh = 0; quint32 venousPressureLimitLow = 0; quint32 venousPressureLimitHigh = 0; - quint32 bloodPressureMeasureInterval = 0; - quint32 rinsebackFlowRate = 0; + quint32 heparinDispensingRate = 0; + quint32 heparinBolusVolume = 0; + quint32 dialysateTemp = 0; }; Data fromVariantList(const QVariantList &list); @@ -44,35 +44,31 @@ Data data() const; protected: - struct _Data { - + struct _Data { Types::U32 requestValid ; Types::U32 bloodFlowRate ; Types::U32 dialysateFlowRate ; Types::U32 duration ; - Types::U32 heparinDispensingRate ; - Types::U32 heparinBolusVolume ; Types::U32 heparinStopTime ; Types::U32 salineBolus ; Types::U32 acidConcentrate ; Types::U32 bicarbonateConcentrate ; Types::U32 dialyzerType ; - Types::U32 dialysateTemp ; + Types::U32 bloodPressureMeasureInterval ; + Types::U32 rinsebackFlowRate ; Types::U32 arterialPressureLimitLow ; Types::U32 arterialPressureLimitHigh ; Types::U32 venousPressureLimitLow ; Types::U32 venousPressureLimitHigh ; - Types::U32 bloodPressureMeasureInterval ; - Types::U32 rinsebackFlowRate ; + Types::U32 heparinDispensingRate ; + Types::U32 heparinBolusVolume ; + Types::U32 dialysateTemp ; } _data; - private: QString stringPrefix = "Treatment Parameters Response"; - }; - } typedef Model::MTreatmentParametersResponse::Data AdjustTreatmentParametersResponseData;