Index: sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.h =================================================================== diff -u -rca67f7413160dfba507856222bd9aa95c5fa6200 -r9403146058e7c4cef17bd542bbd39bbf032be9f3 --- sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.h (.../VPreTreatmentAdjustmentWaterSample.h) (revision ca67f7413160dfba507856222bd9aa95c5fa6200) +++ sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.h (.../VPreTreatmentAdjustmentWaterSample.h) (revision 9403146058e7c4cef17bd542bbd39bbf032be9f3) @@ -19,15 +19,15 @@ // Project #include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" -#include "MPreTreatmentAdjustWaterSampleResponse.h" +#include "MPreTreatmentAdjustWaterSampleResultResponse.h" namespace View { /*! * \brief The VPreTreatmentAdjustmentWaterSample class * \details View for Model's Data representation. * - * \sa Model::MAdjustWaterSampleResponse + * \sa Model::MAdjustWaterSampleResultResponse * */ class VPreTreatmentAdjustmentWaterSample : public VAdjustmentResponseBase @@ -39,25 +39,17 @@ // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI - TRIGGER( bool , adjustment , 0) + TRIGGER ( bool , adjustment , 0) -// VIEW_DEC_CLASS_ADJUSTMENT(VPreTreatmentAdjustmentWaterSample, AdjustWaterSampleResponseData) - VIEW_DEC_CLASS(VPreTreatmentAdjustmentWaterSample) + PROPERTY ( float , resultValue , 0) - // ----------- Adjust Ultrafiltration + VIEW_DEC_CLASS_ADJUSTMENT(VPreTreatmentAdjustmentWaterSample, AdjustWaterSampleResultResponseData) + public slots: -// void doSample (bool vStart); void doResult (float vResult); signals: - void didTimeout(); - /*! - * \brief didAdjustment - * \details the notification signal to send user request of start/stop the water sample. - * \param vData - data model that contains the request data. - */ -// void didAdjustment(const AdjustWaterSampleRequestData &vData); /*! * \brief didAdjustment