Index: sources/view/hd/data/VTreatmentRanges.h =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -re8df7fe7fe6274c416f176369250b9581e07d2a5 --- sources/view/hd/data/VTreatmentRanges.h (.../VTreatmentRanges.h) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/view/hd/data/VTreatmentRanges.h (.../VTreatmentRanges.h) (revision e8df7fe7fe6274c416f176369250b9581e07d2a5) @@ -21,7 +21,7 @@ #include "main.h" // Doxygen : do not remove #include "VView.h" #include "MTreatmentRangesData.h" - +#include "MSettings.h" // namespace namespace View { @@ -36,13 +36,43 @@ { Q_OBJECT - PROPERTY( quint32, treatmentRanges_Duration_Min , 0) - PROPERTY( quint32, treatmentRanges_Duration_Max , 0) - PROPERTY( float , treatmentRanges_Ultrafiltration_Volume_Min, 0) - PROPERTY( float , treatmentRanges_Ultrafiltration_Volume_Max, 0) - PROPERTY( quint32, treatmentRanges_Dialysate_Flow_Min , 0) - PROPERTY( quint32, treatmentRanges_Dialysate_Flow_Max , 0) + // Real-time properties received from HD + READONLY( quint32 , treatmentRanges_Duration_Min , 0) + READONLY( quint32 , treatmentRanges_Duration_Max , 0) + READONLY( float , treatmentRanges_Ultrafiltration_Volume_Min , 0) + READONLY( float , treatmentRanges_Ultrafiltration_Volume_Max , 0) + READONLY( quint32 , treatmentRanges_Dialysate_Flow_Min , 0) + READONLY( quint32 , treatmentRanges_Dialysate_Flow_Max , 0) - VIEW_DEC(VTreatmentRanges, TreatmentRangesData) + // constant properties coming from the settings + RANGESET( quint32 , bloodFlowRate , 0) + RANGESET( quint32 , dialysateFlowRate , 0) + RANGESET( quint32 , treatmentDuration , 0) + RANGESET( float , heparinDispensingRate , 0) + RANGESET( float , heparinBolusVolume , 0) + RANGESET( quint32 , heparinStopTime , 0) + RANGESET( quint32 , salineBolusVolume , 0) + + READONLY( QStringList , heparinTypeOptions ,{}) + READONLY( QStringList , acidConcentrateOptions ,{}) + READONLY( QStringList , bicarbonateConcentrateOptions ,{}) + READONLY( QStringList , dialyzerTypeOptions ,{}) + + RANGESET( float , dialysateTemp , 0) + RANGESET( qint32 , arterialPressureLimitLow , 0) + RANGESET( qint32 , arterialPressureLimitHigh , 0) + RANGESET( qint32 , venousPressureLimitLow , 0) + RANGESET( qint32 , venousPressureLimitHigh , 0) + RANGESET( quint32 , bloodPressureMeasureInterval , 0) + RANGESET( quint32 , rinsebackFlowRate , 0) + + // monitoring ranges + RANGESET( qint32 , arterialPressureMonitor , 0) + RANGESET( qint32 , venousPressureMonitor , 0) + + VIEW_DEC_CLASS(VTreatmentRanges) + VIEW_DEC_SLOT(TreatmentRangesData) + VIEW_DEC_SLOT(SettingsData) + }; }