Index: sources/model/dd/data/MDDPressuresData.h =================================================================== diff -u -r0cb2630813e6f7216adaf990f4129deb87b849bf -r4ae0f0abdbe4edfcd93dbf5b0240417f1f079586 --- sources/model/dd/data/MDDPressuresData.h (.../MDDPressuresData.h) (revision 0cb2630813e6f7216adaf990f4129deb87b849bf) +++ sources/model/dd/data/MDDPressuresData.h (.../MDDPressuresData.h) (revision 4ae0f0abdbe4edfcd93dbf5b0240417f1f079586) @@ -36,20 +36,12 @@ * * | Payload || * | || - * | #01:(F32) | \ref Data::mWaterInletPSI | - * | #02:(F32) | \ref Data::mWaterOutletPSI | - * | #03:(F32) | \ref Data::mHydrolicOutletPSI | - * | #04:(F32) | \ref Data::mBicarbBagPSI | - * | #05:(F32) | \ref Data::mSpentDialysatePSI | - * | #06:(F32) | \ref Data::mFreshDialysatePSI | - * | #07:(F32) | \ref Data::mTransmembranePSI | - * | #08:(F32) | \ref Data::mWaterInletTemp | - * | #09:(F32) | \ref Data::mWaterOutletTemp | - * | #10:(F32) | \ref Data::mHydrolicOutletTemp | - * | #11:(F32) | \ref Data::mBicarbBagTemp | - * | #12:(F32) | \ref Data::mSpentDialysateTemp | - * | #13:(F32) | \ref Data::mFreshDialysateTemp | - * | #14:(F32) | \ref Data::mTransmembraneTemp | + * | #01:(F32) | \ref Data::mD9Pressure | + * | #02:(F32) | \ref Data::mD66Pressure | + * | #03:(F32) | \ref Data::mD51Pressure | + * | #04:(F32) | \ref Data::mD18Pressure | + * | #05:(F32) | \ref Data::mD41Pressure | + * | #06:(F32) | \ref Data::mD87Pressure | * * \sa Data * @@ -65,24 +57,15 @@ // friends friend class ::tst_models; - QVariantList parameters() const override; struct { - Types::F32 m1Pressure ; ///< Water Inlet Input pressure - Types::F32 m3Pressure ; ///< Water Inlet Output pressure - Types::F32 d9Pressure ; ///< Hydraulics outlet pressure - Types::F32 d66Pressure ; ///< Bicarb bag pressure - Types::F32 d51Pressure ; ///< Spent Dialysate pressure - Types::F32 d18Pressure ; ///< Fresh Dialysate pressure - Types::F32 d41Pressure ; ///< Transmembrane pressure - Types::F32 m1PresTemp ; ///< Water Inlet Input temperature - Types::F32 m3PresTemp ; ///< Water Inlet Output temperature - Types::F32 d9PresTemp ; ///< Hydraulics outlet pressure temperature - Types::F32 d66PresTemp ; ///< Bicarb bag temperature - Types::F32 d51PresTemp ; ///< Spent Dialysate temperature - Types::F32 d18PresTemp ; ///< Fresh Dialysate temperature - Types::F32 d41PresTemp ; ///< Transmembrane temperature + Types::F32 mD9Pressure ; + Types::F32 mD66Pressure ; + Types::F32 mD51Pressure ; + Types::F32 mD18Pressure ; + Types::F32 mD41Pressure ; + Types::F32 mD87Pressure ; } _data; public: @@ -92,20 +75,12 @@ QString infoText () const override { return QString("Pressures"); } struct Data { - float mWaterInletPSI = 0; ///< Water Inlet Input pressure - float mWaterOutletPSI = 0; ///< Water Inlet Output pressure - float mHydrolicOutletPSI = 0; ///< Hydraulics outlet pressure - float mBicarbBagPSI = 0; ///< Bicarb bag pressure - float mSpentDialysatePSI = 0; ///< Spent Dialysate pressure - float mFreshDialysatePSI = 0; ///< Fresh Dialysate pressure - float mTransmembranePSI = 0; ///< Transmembrane pressure - float mWaterInletTemp = 0; ///< Water Inlet Input temperature - float mWaterOutletTemp = 0; ///< Water Inlet Output temperature - float mHydrolicOutletTemp = 0; ///< Hydraulics outlet pressure temperature - float mBicarbBagTemp = 0; ///< Bicarb bag temperature - float mSpentDialysateTemp = 0; ///< Spent Dialysate temperature - float mFreshDialysateTemp = 0; ///< Fresh Dialysate temperature - float mTransmembraneTemp = 0; ///< Transmembrane temperature + float mD9Pressure = 0; + float mD66Pressure = 0; + float mD51Pressure = 0; + float mD18Pressure = 0; + float mD41Pressure = 0; + float mD87Pressure = 0; }; MDDPressures () {}