Index: sources/view/hd/data/VTreatmentRanges.cpp =================================================================== diff -u -rf5c8ac5ec05bebf3712e82680489ccb950f4b090 -rcf61c7736f11f4b75a4e2df803f29bdc7769db53 --- sources/view/hd/data/VTreatmentRanges.cpp (.../VTreatmentRanges.cpp) (revision f5c8ac5ec05bebf3712e82680489ccb950f4b090) +++ sources/view/hd/data/VTreatmentRanges.cpp (.../VTreatmentRanges.cpp) (revision cf61c7736f11f4b75a4e2df803f29bdc7769db53) @@ -24,7 +24,6 @@ void VTreatmentRanges::initConnections() { ACTION_VIEW_CONNECTION(TreatmentRangesData); - ACTION_VIEW_CONNECTION(AdjustPressuresLimitsResponseData); ACTION_VIEW_CONNECTION(SettingsData); } @@ -39,21 +38,6 @@ } /*! - * \brief VTreatmentRanges::onActionReceive - * \details Model data received message handler. - * When signal received this method is called to update the view properties. - * \param vData - Model data - */ -void View::VTreatmentRanges::onActionReceive(const AdjustPressuresLimitsResponseData &vData) -{ - // Set pressure bounds with adjusted values - arterialPressureLimitLowerBound ( vData.mArterialLimitLow ); - arterialPressureLimitUpperBound ( vData.mArterialLimitHigh ); - venousPressureLimitLowerBound ( vData.mVenousLimitLow ); - venousPressureLimitUpperBound ( vData.mVenousLimitHigh ); -} - -/*! * \brief VTreatmentCreate::onSettingsDone * \details fills the items below, read from the settings file, when the reading is notified done by ApplicationController. * acidConcentrateOptions @@ -111,34 +95,25 @@ FROMVARIANT ( dialysateTempRes , "Dialysate Temperature" , "Dialysate_Temperature_Res" , Float ); FROMVARIANT ( dialysateTempDef , "Dialysate Temperature" , "Dialysate_Temperature_Def" , Float ); - FROMVARIANT ( arterialPressureLimitLowMin , "Arterial Blood Pressure Ranges" , "Arterial_Adjust_Low_Min" , Int ); - FROMVARIANT ( arterialPressureLimitLowMax , "Arterial Blood Pressure Ranges" , "Arterial_Adjust_Low_Max" , Int ); - FROMVARIANT ( arterialPressureLimitLowRes , "Arterial Blood Pressure Ranges" , "Arterial_Adjust_Low_Res" , Int ); - FROMVARIANT ( arterialPressureLimitLowDef , "Arterial Blood Pressure Ranges" , "Arterial_Adjust_Low_Def" , Int ); - FROMVARIANT ( arterialPressureLimitLowGap , "Arterial Blood Pressure Ranges" , "Arterial_Adjust_Low_Gap" , Int ); + FROMVARIANT ( arterialPressureLimitWindowMin , "Arterial Blood Pressure Ranges" , "Arterial_Adjust_Window_Min" , Int ); + FROMVARIANT ( arterialPressureLimitWindowMax , "Arterial Blood Pressure Ranges" , "Arterial_Adjust_Window_Max" , Int ); + FROMVARIANT ( arterialPressureLimitWindowRes , "Arterial Blood Pressure Ranges" , "Arterial_Adjust_Window_Res" , Int ); + FROMVARIANT ( arterialPressureLimitWindowDef , "Arterial Blood Pressure Ranges" , "Arterial_Adjust_Window_Def" , Int ); - FROMVARIANT ( arterialPressureLimitHighMin , "Arterial Blood Pressure Ranges" , "Arterial_Adjust_High_Min" , Int ); - FROMVARIANT ( arterialPressureLimitHighMax , "Arterial Blood Pressure Ranges" , "Arterial_Adjust_High_Max" , Int ); - FROMVARIANT ( arterialPressureLimitHighRes , "Arterial Blood Pressure Ranges" , "Arterial_Adjust_High_Res" , Int ); - FROMVARIANT ( arterialPressureLimitHighDef , "Arterial Blood Pressure Ranges" , "Arterial_Adjust_High_Def" , Int ); - FROMVARIANT ( arterialPressureLimitHighGap , "Arterial Blood Pressure Ranges" , "Arterial_Adjust_High_Gap" , Int ); + FROMVARIANT ( arterialPressureMonitorMin , "Arterial Blood Pressure Ranges" , "Arterial_Monitor_Min" , Int ); + FROMVARIANT ( arterialPressureMonitorMax , "Arterial Blood Pressure Ranges" , "Arterial_Monitor_Max" , Int ); + FROMVARIANT ( arterialPressureMonitorRes , "Arterial Blood Pressure Ranges" , "Arterial_Monitor_Res" , Int ); - FROMVARIANT ( arterialPressureMonitorMin , "Arterial Blood Pressure Ranges" , "Arterial_Monitor_Min" , Int ); - FROMVARIANT ( arterialPressureMonitorMax , "Arterial Blood Pressure Ranges" , "Arterial_Monitor_Max" , Int ); - FROMVARIANT ( arterialPressureMonitorRes , "Arterial Blood Pressure Ranges" , "Arterial_Monitor_Res" , Int ); + FROMVARIANT ( venousPressureLimitWindowMin , "Venous Blood Pressure Ranges" , "Venous_Adjust_Window_Min" , Int ); + FROMVARIANT ( venousPressureLimitWindowMax , "Venous Blood Pressure Ranges" , "Venous_Adjust_Window_Max" , Int ); + FROMVARIANT ( venousPressureLimitWindowRes , "Venous Blood Pressure Ranges" , "Venous_Adjust_Window_Res" , Int ); + FROMVARIANT ( venousPressureLimitWindowDef , "Venous Blood Pressure Ranges" , "Venous_Adjust_Window_Def" , Int ); - FROMVARIANT ( venousPressureLimitLowMin , "Venous Blood Pressure Ranges" , "Venous_Adjust_Low_Min" , Int ); - FROMVARIANT ( venousPressureLimitLowMax , "Venous Blood Pressure Ranges" , "Venous_Adjust_Low_Max" , Int ); - FROMVARIANT ( venousPressureLimitLowRes , "Venous Blood Pressure Ranges" , "Venous_Adjust_Low_Res" , Int ); - FROMVARIANT ( venousPressureLimitLowDef , "Venous Blood Pressure Ranges" , "Venous_Adjust_Low_Def" , Int ); - FROMVARIANT ( venousPressureLimitLowGap , "Venous Blood Pressure Ranges" , "Venous_Adjust_Low_Gap" , Int ); + FROMVARIANT ( venousPressureLimitAsymtrcMin , "Venous Blood Pressure Ranges" , "Venous_Adjust_Asymmetric_Min" , Int ); + FROMVARIANT ( venousPressureLimitAsymtrcMax , "Venous Blood Pressure Ranges" , "Venous_Adjust_Asymmetric_Max" , Int ); + FROMVARIANT ( venousPressureLimitAsymtrcRes , "Venous Blood Pressure Ranges" , "Venous_Adjust_Asymmetric_Res" , Int ); + FROMVARIANT ( venousPressureLimitAsymtrcDef , "Venous Blood Pressure Ranges" , "Venous_Adjust_Asymmetric_Def" , Int ); - FROMVARIANT ( venousPressureLimitHighMin , "Venous Blood Pressure Ranges" , "Venous_Adjust_High_Min" , Int ); - FROMVARIANT ( venousPressureLimitHighMax , "Venous Blood Pressure Ranges" , "Venous_Adjust_High_Max" , Int ); - FROMVARIANT ( venousPressureLimitHighRes , "Venous Blood Pressure Ranges" , "Venous_Adjust_High_Res" , Int ); - FROMVARIANT ( venousPressureLimitHighDef , "Venous Blood Pressure Ranges" , "Venous_Adjust_High_Def" , Int ); - FROMVARIANT ( venousPressureLimitHighGap , "Venous Blood Pressure Ranges" , "Venous_Adjust_High_Gap" , Int ); - FROMVARIANT ( venousPressureMonitorMin , "Venous Blood Pressure Ranges" , "Venous_Monitor_Min" , Int ); FROMVARIANT ( venousPressureMonitorMax , "Venous Blood Pressure Ranges" , "Venous_Monitor_Max" , Int ); FROMVARIANT ( venousPressureMonitorRes , "Venous Blood Pressure Ranges" , "Venous_Monitor_Res" , Int ); @@ -152,11 +127,4 @@ FROMVARIANT ( rinsebackFlowRateMax , "Rinseback Flow Rate Ranges" , "Rinseback_Flow_Rate_Max" , UInt ); FROMVARIANT ( rinsebackFlowRateRes , "Rinseback Flow Rate Ranges" , "Rinseback_Flow_Rate_Res" , UInt ); FROMVARIANT ( rinsebackFlowRateDef , "Rinseback Flow Rate Ranges" , "Rinseback_Flow_Rate_Def" , UInt ); - - // Set the pressure bounds with default values - //DEBUG : qDebug()<< "Default values " << _arterialPressureLimitLowMin << " "<< _arterialPressureLimitHighMax << " " << _venousPressureLimitLowMin << " " << _venousPressureLimitHighMax ; - arterialPressureLimitLowerBound ( _arterialPressureLimitLowMin ); - arterialPressureLimitUpperBound ( _arterialPressureLimitHighMax ); - venousPressureLimitLowerBound ( _venousPressureLimitLowMin ); - venousPressureLimitUpperBound ( _venousPressureLimitHighMax ); }