Index: sources/view/VTreatmentCreate.cpp =================================================================== diff -u -r052c794d6a8db55a2fbfdad172275af073ee54c3 -r6b132368f2d26c6d869ed910ee4910282c192d75 --- sources/view/VTreatmentCreate.cpp (.../VTreatmentCreate.cpp) (revision 052c794d6a8db55a2fbfdad172275af073ee54c3) +++ sources/view/VTreatmentCreate.cpp (.../VTreatmentCreate.cpp) (revision 6b132368f2d26c6d869ed910ee4910282c192d75) @@ -16,6 +16,7 @@ // Qt // Project +#include "ApplicationController.h" #include "VTreatmentCreate.h" #include "FileHandler.h" #include "MsgDefs.h" @@ -29,6 +30,10 @@ ADJUST_VIEW_CONNECTION(AdjustParametersValidationRequestData ) ACTION_VIEW_CONNECTION(AdjustParametersValidationResponseData) ADJUST_VIEW_CONNECTION( AdjustParametersConfirmRequestData) + + connect(&_ApplicationController , SIGNAL(didSettingsDone()), + this , SLOT( onSettingsDone())); + } /** @@ -374,3 +379,20 @@ << QString("%0 min").arg(_bloodPressureMeasureInterval) << QString("%0 min").arg(_rinsebackFlowRate); } + +/*! + * \brief VTreatmentCreate::onSettingsDone + * \details fills the items below, read from the settings file, when the reading is notified done by ApplicationController. + * acidConcentrateOptions + * bicarbonateConcentrateOptions + * dialyzerTypeOptions + * heparinTypeOptions + * + */ +void VTreatmentCreate::onSettingsDone() +{ + acidConcentrateOptions ( _Settings.keys("Acid Concentrate" )); + bicarbonateConcentrateOptions ( _Settings.keys("Bicarbonate Concentrate" )); + dialyzerTypeOptions ( _Settings.keys("Dialyzer Type" )); + heparinTypeOptions ( _Settings.keys("Heparin Type" )); +} Index: sources/view/VTreatmentCreate.h =================================================================== diff -u -rc4bd7072571428744e11dd24d5da1d1a3e1d1686 -r6b132368f2d26c6d869ed910ee4910282c192d75 --- sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision c4bd7072571428744e11dd24d5da1d1a3e1d1686) +++ sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision 6b132368f2d26c6d869ed910ee4910282c192d75) @@ -164,15 +164,13 @@ enum BICARBONATE_ENUM { eBicarbUnset= 9999, eBicarb01 = 0, - }; enum DIALYZER_ENUM { eDialyzerUnset = 9999, eDialyzer01 = 0, eDialyzer02 , eDialyzer03 , - }; protected: @@ -198,19 +196,13 @@ protected: - PROPERTY(QString , patientID , "" ) - PROPERTY(QStringList, acidConcentrateOptions , QStringList() << "08-1251-1" - << "08-2251-0" - << "08-3251-9") - PROPERTY(QStringList, bicarbonateConcentrateOptions , QStringList() << "Fresenius Centrisol Liquid") - PROPERTY(QStringList, dialyzerTypeOptions , QStringList() << "BBraun Diacap Pro 13H" - << "BBraun Diacap Pro 16H" - << "BBraun Diacap Pro 19H" - << "Fresenius Optiflux F160NRe" - << "Fresenius Optiflux F180NRe") + PROPERTY(QString , patientID , "") + PROPERTY(QStringList, acidConcentrateOptions , {}) + PROPERTY(QStringList, bicarbonateConcentrateOptions , {}) + PROPERTY(QStringList, dialyzerTypeOptions , {}) + PROPERTY(QStringList, heparinTypeOptions , {}) + PROPERTY(bool , continueEnabled , false) - PROPERTY(bool, continueEnabled, false) - AdjustParametersValidationRequestData treatmentData; // OK AdjustParametersConfirmRequestData confirmTreatmentRequest; @@ -231,6 +223,7 @@ private slots: bool onActionReceive(AdjustParametersValidationResponseData data); + void onSettingsDone(); public slots: void doResetCreateTreatment();