Index: sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h =================================================================== diff -u -r5e3b27057e9c7dedf9c46e3881609b7e96c3fb71 -rb3eb8bc9696c4db9867ad1cf13b47c455a94e0fe --- sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h (.../VPostTreatmentAdjustTreatmentLog.h) (revision 5e3b27057e9c7dedf9c46e3881609b7e96c3fb71) +++ sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h (.../VPostTreatmentAdjustTreatmentLog.h) (revision b3eb8bc9696c4db9867ad1cf13b47c455a94e0fe) @@ -16,10 +16,16 @@ #include +// Qt +#include + // Project #include "main.h" // Doxygen : don't remove #include "VAdjustmentResponseBase.h" -#include "MPostTreatmentAdjustTreatmentLogResponse.h" +#include "TreatmentLog.h" // Model MPostTreatmentAdjustTreatmentLogResponse included in this controller header +#include "MTreatmentLogAvrgeData.h" +#include "MTreatmentLogAlarmData.h" +#include "MTreatmentLogEventData.h" namespace View { @@ -70,23 +76,29 @@ PROPERTY(quint32 , heparinConcentration , 0 ) PROPERTY(float , heparinBolusVolume , 0 ) PROPERTY(float , heparinDispenseRate , 0 ) - PROPERTY(quint32 , heparinPreStop , 0 ) + PROPERTY(quint32 , heparinStop , 0 ) PROPERTY(float , heparinDeliveredVolume , 0 ) PROPERTY(float , averageArterialPressure , 0 ) PROPERTY(float , averageVenousPressure , 0 ) PROPERTY(quint32 , endTreatmentEarlyAlarm , 0 ) PROPERTY(quint32 , deviceID , 0 ) PROPERTY(quint32 , waterSampleTestResult , 0 ) - - PROPERTY(QStringList , parametersTitle , {}) + PROPERTY(QStringList , parametersTitle , _TreatmentLog.titles()) + PROPERTY(QStringList , parametersUnit , _TreatmentLog.units ()) PROPERTY(QStringList , parametersText , {}) - PROPERTY(QStringList , parametersUnit , {}) - VIEW_DEC_CLASS_ADJUSTMENT(VPostTreatmentAdjustmentTreatmentLog, AdjustTreatmentLogResponseData) + PROPERTY(bool , isIdle , true) + VIEW_DEC_CLASS (VPostTreatmentAdjustmentTreatmentLog) + VIEW_DEC_SLOT (AdjustTreatmentLogResponseData) + VIEW_DEC_SLOT (TreatmentLogAvrgeData) + VIEW_DEC_SLOT (TreatmentLogAlarmData) + VIEW_DEC_SLOT (TreatmentLogEventData) + public slots: - void doRequest(); + void doRequest (); + void doExport (); signals: /*!