Index: sources/gui/qml/components/GridSelection.qml =================================================================== diff -u -rb61d8a3e01fef66eee8095c9cddf835d9bb32b66 -rb62ab443e75b76a91e35aca6ba2efd84e7199602 --- sources/gui/qml/components/GridSelection.qml (.../GridSelection.qml) (revision b61d8a3e01fef66eee8095c9cddf835d9bb32b66) +++ sources/gui/qml/components/GridSelection.qml (.../GridSelection.qml) (revision b62ab443e75b76a91e35aca6ba2efd84e7199602) @@ -34,8 +34,8 @@ color: "transparent" property int numRows : 2 property int numCols : 2 - property int buttonHeight : 78 - property int buttonWidth : 313 + property int buttonHeight : Variables.gridSelectionButtonHeight + property int buttonWidth : Variables.gridSelectionButtonWidth property var buttonNames : ["Button 1", "Button 2", "Button 3"] property alias name : _text.text property int selectedIndex : unselectedIndex @@ -86,6 +86,7 @@ height: _root.buttonHeight width: _root.buttonWidth radius: 0 + borderColor: Colors.borderButtonUnselected onClicked: { _text.color = Colors.textMain if (selectedIndex === index) { Index: sources/gui/qml/components/Slider.qml =================================================================== diff -u -r0583a63307936f09e184dfe16acca25f9e3fd81c -rb62ab443e75b76a91e35aca6ba2efd84e7199602 --- sources/gui/qml/components/Slider.qml (.../Slider.qml) (revision 0583a63307936f09e184dfe16acca25f9e3fd81c) +++ sources/gui/qml/components/Slider.qml (.../Slider.qml) (revision b62ab443e75b76a91e35aca6ba2efd84e7199602) @@ -24,22 +24,23 @@ * \brief Denali project ProgressBar */ RangeRect { id: _root - property alias value : _progressRect.value + property alias value : _progressRect.value - property real step : 1 - property bool stepSnap : false + property real step : 1 + property bool stepSnap : false - property bool ticks : false + property bool ticks : false - property alias color : _progressRect.color - property alias bgColor : _root.color + property alias color : _progressRect.color + property alias bgColor : _root.color - property alias handler : _handler + property alias handler : _handler - property alias diameter : _handler.diameter - property alias knobColor : _handler.color + property alias diameter : _handler.diameter + property alias knobColor : _handler.color - property bool isActive : false + property bool isActive : false + property alias progressRectMargin : _progressRect.margin signal progressRectClicked() signal progressRectDragged() @@ -121,7 +122,6 @@ ProgressRect { id: _progressRect color : Colors.highlightProgressBar - touchMargin : parent.touchMargin decimal : _root.decimal minimum : _root.minimum maximum : _root.maximum Index: sources/gui/qml/components/SliderCreateTreatment.qml =================================================================== diff -u -r0401b9a1fb6f89f0ec83571f2f868956c7500a0f -rb62ab443e75b76a91e35aca6ba2efd84e7199602 --- sources/gui/qml/components/SliderCreateTreatment.qml (.../SliderCreateTreatment.qml) (revision 0401b9a1fb6f89f0ec83571f2f868956c7500a0f) +++ sources/gui/qml/components/SliderCreateTreatment.qml (.../SliderCreateTreatment.qml) (revision b62ab443e75b76a91e35aca6ba2efd84e7199602) @@ -44,8 +44,8 @@ signal pressed() signal released() - height: Variables.progressbarRectHeight - width: Variables.progressbarRectWidth + height: Variables.createTreatmentSliderHeight + width: Variables.createTreatmentSliderWidth anchors.horizontalCenter: parent.horizontalCenter color: "transparent"; @@ -82,7 +82,7 @@ Slider { id : _slider anchors.horizontalCenter: parent.horizontalCenter; anchors.bottom: parent.bottom; - width : Variables.progressbarSmallWidth + width : Variables.createTreatmentSliderWidth diameter: Variables.sliderCircleDiameter color : Colors.createTreatmentInactive knobColor: Colors.createTreatmentInactive Index: sources/gui/qml/components/SliderDoubleCreateTreatment.qml =================================================================== diff -u -r0401b9a1fb6f89f0ec83571f2f868956c7500a0f -rb62ab443e75b76a91e35aca6ba2efd84e7199602 --- sources/gui/qml/components/SliderDoubleCreateTreatment.qml (.../SliderDoubleCreateTreatment.qml) (revision 0401b9a1fb6f89f0ec83571f2f868956c7500a0f) +++ sources/gui/qml/components/SliderDoubleCreateTreatment.qml (.../SliderDoubleCreateTreatment.qml) (revision b62ab443e75b76a91e35aca6ba2efd84e7199602) @@ -59,8 +59,8 @@ signal highSliderPressed() signal highSliderReleased() - height: Variables.progressbarRectHeight - width: Variables.progressbarSmallWidth + height: Variables.createTreatmentSliderHeight + width: Variables.createTreatmentSliderWidth anchors.horizontalCenter: parent.horizontalCenter color: "transparent"; @@ -91,28 +91,27 @@ anchors.left: parent.left font.pixelSize: Fonts.fontPixelFluidText color: Colors.textMain; - } Text { id: _lowSelectedValue anchors.top: parent.top anchors.right: parent.horizontalCenter - anchors.rightMargin: Variables.progressbarSmallWidth / 15 + anchors.rightMargin: Variables.createTreatmentSliderWidth / 15 text: "-- " + _lowSlider.unit font.pixelSize: Fonts.fontPixelFluidUnit color: Colors.createTreatmentInactive; - } Slider { id : _lowSlider anchors.left: parent.left; anchors.bottom: parent.bottom - width: Variables.progressbarSmallWidth / 2.3 + width: Variables.createTreatmentSliderWidth / 2.3 diameter: Variables.sliderCircleDiameter color : Colors.createTreatmentInactive knobColor: Colors.createTreatmentInactive touchMargin: Variables.createTreatmentSliderMargin + progressRectMargin: 0 height : 5 minimum: 0 maximum: 100 @@ -128,7 +127,6 @@ _lowSelectedValue.color = Colors.textMain } else { _lowSelectedValue.color = Colors.createTreatmentInactive; - } } @@ -147,7 +145,6 @@ anchors.left: _highSlider.left font.pixelSize: Fonts.fontPixelFluidText color: Colors.textMain; - } Text { @@ -157,17 +154,17 @@ text: "-- " + _highSlider.unit font.pixelSize: Fonts.fontPixelFluidUnit color: Colors.createTreatmentInactive; - } Slider { id : _highSlider anchors.right: parent.right; anchors.bottom: parent.bottom; - width: Variables.progressbarSmallWidth / 2.3 + width: Variables.createTreatmentSliderWidth / 2.3 diameter: Variables.sliderCircleDiameter color : Colors.createTreatmentInactive knobColor: Colors.createTreatmentInactive touchMargin: Variables.createTreatmentSliderMargin + progressRectMargin: 0 height : 5 minimum: 50 maximum: 100 @@ -184,7 +181,6 @@ _highSelectedValue.color = Colors.textMain } else { _highSelectedValue.color = Colors.createTreatmentInactive - } } Index: sources/gui/qml/components/TouchRect.qml =================================================================== diff -u -rb61d8a3e01fef66eee8095c9cddf835d9bb32b66 -rb62ab443e75b76a91e35aca6ba2efd84e7199602 --- sources/gui/qml/components/TouchRect.qml (.../TouchRect.qml) (revision b61d8a3e01fef66eee8095c9cddf835d9bb32b66) +++ sources/gui/qml/components/TouchRect.qml (.../TouchRect.qml) (revision b62ab443e75b76a91e35aca6ba2efd84e7199602) @@ -89,9 +89,11 @@ _root.selected = isSelected if (_root.selected) { _root.color = Colors.backgroundButtonSelectDark + _root.borderColor = Colors.borderButton } else { _root.color = backgroundColor + _root.borderColor = Colors.borderButtonUnselected } } Index: sources/gui/qml/globals/Colors.qml =================================================================== diff -u -rb61d8a3e01fef66eee8095c9cddf835d9bb32b66 -rb62ab443e75b76a91e35aca6ba2efd84e7199602 --- sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision b61d8a3e01fef66eee8095c9cddf835d9bb32b66) +++ sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision b62ab443e75b76a91e35aca6ba2efd84e7199602) @@ -53,6 +53,7 @@ readonly property color textInvalid : "red" readonly property color borderButton : "#4290EC" //K:D //"#438FEB" + readonly property color borderButtonUnselected : "#53667d" readonly property color borderDisableButton : "#607A91" readonly property color boderSeparatorLine : "#476982" readonly property color borderDialog : "transparent" // different colors for different displays // "#D01A344D" // "#D00F0F0F" //"#F51A344D" Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -r0401b9a1fb6f89f0ec83571f2f868956c7500a0f -rb62ab443e75b76a91e35aca6ba2efd84e7199602 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 0401b9a1fb6f89f0ec83571f2f868956c7500a0f) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision b62ab443e75b76a91e35aca6ba2efd84e7199602) @@ -87,6 +87,9 @@ readonly property int topBarMenuHeight : 100 readonly property int sliderCircleDiameter : 25 + readonly property int gridSelectionButtonHeight : 100 + readonly property int gridSelectionButtonWidth : 375 + readonly property int createTreatmentFlickableDeceleration : 4500 readonly property int createTreatmentTableHeight : 800 readonly property int createTreatmentTableWidth : applicationWidth - 50 @@ -96,6 +99,8 @@ readonly property int createTreatmentSubTableHeight : 50 readonly property int createTreatmentSubTableWidth : 500 readonly property int createTreatmentSliderMargin : 40 + readonly property int createTreatmentSliderHeight : 50 + readonly property int createTreatmentSliderWidth : 750 readonly property int ultrafiltrationProgressbarWidth : 880 readonly property int ultrafiltrationAdjustmtenOptionWidth : 520 Index: sources/gui/qml/pages/treatment/TreatmentBegin.qml =================================================================== diff -u -r0401b9a1fb6f89f0ec83571f2f868956c7500a0f -rb62ab443e75b76a91e35aca6ba2efd84e7199602 --- sources/gui/qml/pages/treatment/TreatmentBegin.qml (.../TreatmentBegin.qml) (revision 0401b9a1fb6f89f0ec83571f2f868956c7500a0f) +++ sources/gui/qml/pages/treatment/TreatmentBegin.qml (.../TreatmentBegin.qml) (revision b62ab443e75b76a91e35aca6ba2efd84e7199602) @@ -28,9 +28,11 @@ * which is the default screen in the "Manager" stack */ ScreenItem { id: _root + objectName: "_treatmentBegin" + backgroundRect.color: Colors.backgroundMainMenu + signal clickedBack() signal clickedStart() - backgroundRect.color: Colors.backgroundMainMenu TopMenuBarCreateTreatment { id: _topMenuBar anchors.top: parent.top @@ -45,6 +47,7 @@ Flickable { id: _flickable + objectName: "_treatmentBeginFlickable" anchors.top: _topMenuBar.bottom anchors.left: parent.left anchors.bottom: parent.bottom @@ -102,6 +105,7 @@ } TouchRect { id : _continueRect + objectName: "_treatmentBeginStart" anchors.horizontalCenter: parent.horizontalCenter text.text: qsTr("START") button.onClicked: { Index: sources/gui/qml/pages/treatment/TreatmentConfirm.qml =================================================================== diff -u -rb61d8a3e01fef66eee8095c9cddf835d9bb32b66 -rb62ab443e75b76a91e35aca6ba2efd84e7199602 --- sources/gui/qml/pages/treatment/TreatmentConfirm.qml (.../TreatmentConfirm.qml) (revision b61d8a3e01fef66eee8095c9cddf835d9bb32b66) +++ sources/gui/qml/pages/treatment/TreatmentConfirm.qml (.../TreatmentConfirm.qml) (revision b62ab443e75b76a91e35aca6ba2efd84e7199602) @@ -44,8 +44,8 @@ } - Flickable { - id: _flickable + Flickable { id: _flickable + objectName: "_confirmTreatmentFlickable" anchors.top: _topMenuBar.bottom anchors.left: parent.left anchors.bottom: parent.bottom Index: sources/gui/qml/pages/treatment/TreatmentPrime.qml =================================================================== diff -u -r0401b9a1fb6f89f0ec83571f2f868956c7500a0f -rb62ab443e75b76a91e35aca6ba2efd84e7199602 --- sources/gui/qml/pages/treatment/TreatmentPrime.qml (.../TreatmentPrime.qml) (revision 0401b9a1fb6f89f0ec83571f2f868956c7500a0f) +++ sources/gui/qml/pages/treatment/TreatmentPrime.qml (.../TreatmentPrime.qml) (revision b62ab443e75b76a91e35aca6ba2efd84e7199602) @@ -27,6 +27,7 @@ * which is the default screen in the "Manager" stack */ ScreenItem { id: _root + objectName: "_treatmentPrime" backgroundRect.color: Colors.backgroundMainMenu signal clickedBack() @@ -45,6 +46,7 @@ Flickable { id: _flickable + objectName: "_treatmentPrimeFlickable" anchors.top: _topMenuBar.bottom anchors.left: parent.left anchors.bottom: parent.bottom @@ -125,6 +127,7 @@ } TouchRect { id : _continueRect + objectName: "_treatmentPrimeContinueButton" anchors.horizontalCenter: parent.horizontalCenter text.text: vPriming.continueBtnText enabled: vPriming.continueEnabled Index: sources/main.h =================================================================== diff -u -r321e667cd58da515845f2173d5e1a59082823455 -rb62ab443e75b76a91e35aca6ba2efd84e7199602 --- sources/main.h (.../main.h) (revision 321e667cd58da515845f2173d5e1a59082823455) +++ sources/main.h (.../main.h) (revision b62ab443e75b76a91e35aca6ba2efd84e7199602) @@ -251,8 +251,8 @@ bool is##NAME##Set = false; \ protected: \ Q_PROPERTY(TYPE NAME \ - READ get_##NAME \ - WRITE set_##NAME \ + READ NAME \ + WRITE NAME \ NOTIFY NAME##Changed) \ Q_PROPERTY(TYPE NAME##Min \ READ NAME##Min \ @@ -266,7 +266,7 @@ READ NAME##Res \ WRITE NAME##Res \ NOTIFY NAME##ResChanged) \ - void set_##NAME(const TYPE &v##NAME) { \ + void NAME(const TYPE &v##NAME) { \ if ( !is##NAME##Set || _##NAME != v##NAME ) { \ _##NAME = v##NAME; \ is##NAME##Set = true; \ @@ -284,7 +284,7 @@ TYPE NAME##Res() const { return _##NAME##Res; } \ void NAME##Res(const TYPE &v##NAME##Res) \ { _##NAME##Res = v##NAME##Res; emit NAME##ResChanged(_##NAME##Res);} \ - TYPE get_##NAME() const { \ + TYPE NAME() const { \ return _##NAME; \ } \ void reset_##NAME() { \ Index: sources/view/VTreatmentCreate.cpp =================================================================== diff -u -r321e667cd58da515845f2173d5e1a59082823455 -rb62ab443e75b76a91e35aca6ba2efd84e7199602 --- sources/view/VTreatmentCreate.cpp (.../VTreatmentCreate.cpp) (revision 321e667cd58da515845f2173d5e1a59082823455) +++ sources/view/VTreatmentCreate.cpp (.../VTreatmentCreate.cpp) (revision b62ab443e75b76a91e35aca6ba2efd84e7199602) @@ -705,28 +705,28 @@ } if (vData.arterialPressureLimitLow < _arterialPressureLimitLowMin || vData.arterialPressureLimitLow > _arterialPressureLimitLowMax || - vData.arterialPressureLimitLow > vData.arterialPressureLimitHigh) + vData.arterialPressureLimitLow >= vData.arterialPressureLimitHigh) { emit arterialPressureLimitLow_ValidationFailed(uiRejections.value(LOW_HIGH_INCOMPATIBLE)); success = false; } if (vData.arterialPressureLimitHigh < _arterialPressureLimitHighMin || vData.arterialPressureLimitHigh > _arterialPressureLimitHighMax || - vData.arterialPressureLimitHigh < vData.arterialPressureLimitLow) + vData.arterialPressureLimitHigh <= vData.arterialPressureLimitLow) { emit arterialPressureLimitHigh_ValidationFailed(uiRejections.value(LOW_HIGH_INCOMPATIBLE)); success = false; } if (vData.venousPressureLimitLow < _venousPressureLimitLowMin || vData.venousPressureLimitLow > _venousPressureLimitLowMax || - vData.venousPressureLimitLow > vData.venousPressureLimitHigh) + vData.venousPressureLimitLow >= vData.venousPressureLimitHigh) { emit venousPressureLimitLow_ValidationFailed(uiRejections.value(LOW_HIGH_INCOMPATIBLE)); success = false; } if (vData.venousPressureLimitHigh < _venousPressureLimitHighMin || vData.venousPressureLimitHigh > _venousPressureLimitHighMax || - vData.venousPressureLimitHigh < vData.venousPressureLimitLow) + vData.venousPressureLimitHigh <= vData.venousPressureLimitLow) { emit venousPressureLimitHigh_ValidationFailed(uiRejections.value(LOW_HIGH_INCOMPATIBLE)); success = false; @@ -838,15 +838,15 @@ if ((acidConcentrateOptions().length() - 1 < (int)_acidConcentrate) || ((int)_acidConcentrate < 0)) aConcentrate = "None"; else - aConcentrate = acidConcentrateOptions().at(get_acidConcentrate()); + aConcentrate = acidConcentrateOptions().at(acidConcentrate()); if ((bicarbonateConcentrateOptions().length() - 1 < (int)_bicarbonateConcentrate) || ((int)_bicarbonateConcentrate < 0)) bCarbConcentrate = "None"; else - bCarbConcentrate = bicarbonateConcentrateOptions().at(get_bicarbonateConcentrate()); + bCarbConcentrate = bicarbonateConcentrateOptions().at(bicarbonateConcentrate()); if ((dialyzerTypeOptions().length() - 1 < (int)_dialyzerType) || ((int)_dialyzerType < 0)) dType = "None"; else - dType = dialyzerTypeOptions().at(get_dialyzerType()); + dType = dialyzerTypeOptions().at(dialyzerType()); return QStringList() << aConcentrate << bCarbConcentrate << dType Index: unittests/tst_views.cpp =================================================================== diff -u -r321e667cd58da515845f2173d5e1a59082823455 -rb62ab443e75b76a91e35aca6ba2efd84e7199602 --- unittests/tst_views.cpp (.../tst_views.cpp) (revision 321e667cd58da515845f2173d5e1a59082823455) +++ unittests/tst_views.cpp (.../tst_views.cpp) (revision b62ab443e75b76a91e35aca6ba2efd84e7199602) @@ -75,26 +75,26 @@ for (int i = 0; i < 18; ++i) { View::VTreatmentCreate view; - if (i != 0) view.set_bloodFlowRate(view.bloodFlowRateMax()); - if (i != 1) view.set_dialysateFlowRate(view.dialysateFlowRateMax()); - if (i != 2) view.set_duration(view.durationMax()); - if (i != 3) view.set_heparinDispensingRate(view.heparinDispensingRateMax()); + if (i != 0) view.bloodFlowRate(view.bloodFlowRateMax()); + if (i != 1) view.dialysateFlowRate(view.dialysateFlowRateMax()); + if (i != 2) view.duration(view.durationMax()); + if (i != 3) view.heparinDispensingRate(view.heparinDispensingRateMax()); - if (i != 4) view.set_heparinBolusVolume(view.heparinBolusVolumeMax()); - if (i != 5) view.set_heparinStopTime(view.heparinStopTimeMax()); - if (i != 6) view.set_salineBolusVolume(view.salineBolusVolumeMax()); - if (i != 7) view.set_acidConcentrate(0); - if (i != 8) view.set_bicarbonateConcentrate(0); + if (i != 4) view.heparinBolusVolume(view.heparinBolusVolumeMax()); + if (i != 5) view.heparinStopTime(view.heparinStopTimeMax()); + if (i != 6) view.salineBolusVolume(view.salineBolusVolumeMax()); + if (i != 7) view.acidConcentrate(0); + if (i != 8) view.bicarbonateConcentrate(0); - if (i != 9) view.set_dialyzerType(0); - if (i != 10) view.set_dialysateTemp(view.dialysateTempMax()); - if (i != 11) view.set_arterialPressureLimitLow(view.arterialPressureLimitLowMin()); - if (i != 12) view.set_arterialPressureLimitHigh(view.arterialPressureLimitHighMax()); - if (i != 13) view.set_venousPressureLimitLow(view.venousPressureLimitLowMin()); - if (i != 14) view.set_venousPressureLimitHigh(view.venousPressureLimitHighMax()); + if (i != 9) view.dialyzerType(0); + if (i != 10) view.dialysateTemp(view.dialysateTempMax()); + if (i != 11) view.arterialPressureLimitLow(view.arterialPressureLimitLowMin()); + if (i != 12) view.arterialPressureLimitHigh(view.arterialPressureLimitHighMax()); + if (i != 13) view.venousPressureLimitLow(view.venousPressureLimitLowMin()); + if (i != 14) view.venousPressureLimitHigh(view.venousPressureLimitHighMax()); - if (i != 15) view.set_bloodPressureMeasureInterval(view.bloodPressureMeasureIntervalMax()); - if (i != 16) view.set_rinsebackFlowRate(view.rinsebackFlowRateMax()); + if (i != 15) view.bloodPressureMeasureInterval(view.bloodPressureMeasureIntervalMax()); + if (i != 16) view.rinsebackFlowRate(view.rinsebackFlowRateMax()); if (i == 17) { QCOMPARE(view.isbloodFlowRateSet, true); @@ -117,26 +117,26 @@ QCOMPARE(view.validate(view.treatmentData), true); // check getters - QCOMPARE(view.get_bloodFlowRate(), view.bloodFlowRateMax()); - QCOMPARE(view.get_dialysateFlowRate(), view.dialysateFlowRateMax()); - QCOMPARE(view.get_duration(), view.durationMax()); - QCOMPARE(view.get_heparinDispensingRate(),view.heparinDispensingRateMax()); + QCOMPARE(view.bloodFlowRate(), view.bloodFlowRateMax()); + QCOMPARE(view.dialysateFlowRate(), view.dialysateFlowRateMax()); + QCOMPARE(view.duration(), view.durationMax()); + QCOMPARE(view.heparinDispensingRate(),view.heparinDispensingRateMax()); - QCOMPARE(view.get_heparinBolusVolume(),view.heparinBolusVolumeMax()); - QCOMPARE(view.get_heparinStopTime(),view.heparinStopTimeMax()); - QCOMPARE(view.get_salineBolusVolume(), view.salineBolusVolumeMax()); - QCOMPARE(view.get_acidConcentrate(), quint32(0)); - QCOMPARE(view.get_bicarbonateConcentrate(), quint32(0)); + QCOMPARE(view.heparinBolusVolume(),view.heparinBolusVolumeMax()); + QCOMPARE(view.heparinStopTime(),view.heparinStopTimeMax()); + QCOMPARE(view.salineBolusVolume(), view.salineBolusVolumeMax()); + QCOMPARE(view.acidConcentrate(), quint32(0)); + QCOMPARE(view.bicarbonateConcentrate(), quint32(0)); - QCOMPARE(view.get_dialyzerType(), quint32(0)); - QCOMPARE(view.get_dialysateTemp(), view.dialysateTempMax()); - QCOMPARE(view.get_arterialPressureLimitLow(),view.arterialPressureLimitLowMin()); - QCOMPARE(view.get_arterialPressureLimitHigh(), view.arterialPressureLimitHighMax()); - QCOMPARE(view.get_venousPressureLimitLow(), view.venousPressureLimitLowMin()); - QCOMPARE(view.get_venousPressureLimitHigh(), view.venousPressureLimitHighMax()); + QCOMPARE(view.dialyzerType(), quint32(0)); + QCOMPARE(view.dialysateTemp(), view.dialysateTempMax()); + QCOMPARE(view.arterialPressureLimitLow(),view.arterialPressureLimitLowMin()); + QCOMPARE(view.arterialPressureLimitHigh(), view.arterialPressureLimitHighMax()); + QCOMPARE(view.venousPressureLimitLow(), view.venousPressureLimitLowMin()); + QCOMPARE(view.venousPressureLimitHigh(), view.venousPressureLimitHighMax()); - QCOMPARE(view.get_bloodPressureMeasureInterval(), view.bloodPressureMeasureIntervalMax()); - QCOMPARE(view.get_rinsebackFlowRate(), view.rinsebackFlowRateMax()); + QCOMPARE(view.bloodPressureMeasureInterval(), view.bloodPressureMeasureIntervalMax()); + QCOMPARE(view.rinsebackFlowRate(), view.rinsebackFlowRateMax()); view.doFinishedCreate(); } @@ -153,26 +153,26 @@ */ void tst_views::VCreateTreatment_simulate_valid_parameters(View::VTreatmentCreate &view) { - view.set_bloodFlowRate(view.bloodFlowRateMax()); - view.set_dialysateFlowRate(view.dialysateFlowRateMax()); - view.set_duration(view.durationMax()); - view.set_heparinDispensingRate(view.heparinDispensingRateMax()); + view.bloodFlowRate(view.bloodFlowRateMax()); + view.dialysateFlowRate(view.dialysateFlowRateMax()); + view.duration(view.durationMax()); + view.heparinDispensingRate(view.heparinDispensingRateMax()); - view.set_heparinBolusVolume(view.heparinBolusVolumeMax()); - view.set_heparinStopTime(view.heparinStopTimeMax()); - view.set_salineBolusVolume(0); - view.set_acidConcentrate(0); - view.set_bicarbonateConcentrate(0); + view.heparinBolusVolume(view.heparinBolusVolumeMax()); + view.heparinStopTime(view.heparinStopTimeMax()); + view.salineBolusVolume(0); + view.acidConcentrate(0); + view.bicarbonateConcentrate(0); - view.set_dialyzerType(0); - view.set_dialysateTemp(view.dialysateTempMax()); - view.set_arterialPressureLimitLow(view.arterialPressureLimitLowMin()); - view.set_arterialPressureLimitHigh(view.arterialPressureLimitHighMax()); - view.set_venousPressureLimitLow(view.venousPressureLimitLowMin()); - view.set_venousPressureLimitHigh(view.venousPressureLimitHighMax()); + view.dialyzerType(0); + view.dialysateTemp(view.dialysateTempMax()); + view.arterialPressureLimitLow(view.arterialPressureLimitLowMin()); + view.arterialPressureLimitHigh(view.arterialPressureLimitHighMax()); + view.venousPressureLimitLow(view.venousPressureLimitLowMin()); + view.venousPressureLimitHigh(view.venousPressureLimitHighMax()); - view.set_bloodPressureMeasureInterval(view.bloodPressureMeasureIntervalMax()); - view.set_rinsebackFlowRate(view.rinsebackFlowRateMax()); + view.bloodPressureMeasureInterval(view.bloodPressureMeasureIntervalMax()); + view.rinsebackFlowRate(view.rinsebackFlowRateMax()); } @@ -255,26 +255,26 @@ view.rinsebackFlowRateMin(1); // setters - view.set_bloodFlowRate(0); - view.set_dialysateFlowRate(0); - view.set_duration(0); - view.set_heparinDispensingRate(1); + view.bloodFlowRate(0); + view.dialysateFlowRate(0); + view.duration(0); + view.heparinDispensingRate(1); - view.set_heparinBolusVolume(0); - view.set_heparinStopTime(0); - view.set_salineBolusVolume(-1); - view.set_acidConcentrate(-1); - view.set_bicarbonateConcentrate(-1); + view.heparinBolusVolume(0); + view.heparinStopTime(0); + view.salineBolusVolume(-1); + view.acidConcentrate(-1); + view.bicarbonateConcentrate(-1); - view.set_dialyzerType(-1); - view.set_dialysateTemp(0); - view.set_arterialPressureLimitLow(1); - view.set_arterialPressureLimitHigh(1); - view.set_venousPressureLimitLow(1); - view.set_venousPressureLimitHigh(1); + view.dialyzerType(-1); + view.dialysateTemp(0); + view.arterialPressureLimitLow(1); + view.arterialPressureLimitHigh(1); + view.venousPressureLimitLow(1); + view.venousPressureLimitHigh(1); - view.set_bloodPressureMeasureInterval(1); - view.set_rinsebackFlowRate(0); + view.bloodPressureMeasureInterval(1); + view.rinsebackFlowRate(0); view.setTreatmentData(); @@ -299,8 +299,8 @@ QCOMPARE(view.validate(view.treatmentData), false); // edge case when pressure lows are set greater than the highs - view.set_arterialPressureLimitLow(view.arterialPressureLimitHighMin()+1); - view.set_venousPressureLimitLow(view.venousPressureLimitHighMin()+1); + view.arterialPressureLimitLow(view.arterialPressureLimitHighMin()+1); + view.venousPressureLimitLow(view.venousPressureLimitHighMin()+1); QCOMPARE(view.validate(view.treatmentData), false); @@ -311,26 +311,26 @@ VCreateTreatment_simulate_valid_parameters(view); switch (i) { - case 0: view.set_bloodFlowRate(view.bloodFlowRateMax()+1); break; - case 1: view.set_dialysateFlowRate(view.dialysateFlowRateMax()+1); break; - case 2: view.set_duration(view.durationMax()+1); break; - case 3: view.set_heparinDispensingRate(view.heparinDispensingRateMax()+1); break; + case 0: view.bloodFlowRate(view.bloodFlowRateMax()+1); break; + case 1: view.dialysateFlowRate(view.dialysateFlowRateMax()+1); break; + case 2: view.duration(view.durationMax()+1); break; + case 3: view.heparinDispensingRate(view.heparinDispensingRateMax()+1); break; - case 4: view.set_heparinBolusVolume(view.heparinBolusVolumeMax()+1); break; - case 5: view.set_heparinStopTime(view.heparinStopTimeMax()+1); break; - case 6: view.set_salineBolusVolume(view.salineBolusVolumeMax()+1); break; - case 7: view.set_acidConcentrate(view.acidConcentrateOptions().length()); break; - case 8: view.set_bicarbonateConcentrate(view.bicarbonateConcentrateOptions().length()); break; + case 4: view.heparinBolusVolume(view.heparinBolusVolumeMax()+1); break; + case 5: view.heparinStopTime(view.heparinStopTimeMax()+1); break; + case 6: view.salineBolusVolume(view.salineBolusVolumeMax()+1); break; + case 7: view.acidConcentrate(view.acidConcentrateOptions().length()); break; + case 8: view.bicarbonateConcentrate(view.bicarbonateConcentrateOptions().length()); break; - case 9: view.set_dialyzerType(view.dialyzerTypeOptions().length()); break; - case 10: view.set_dialysateTemp(view.dialysateTempMax()+1); break; - case 11: view.set_arterialPressureLimitLow(view.arterialPressureLimitLowMax()+1); break; - case 12: view.set_arterialPressureLimitHigh(view.arterialPressureLimitHighMax()+1); break; - case 13: view.set_venousPressureLimitLow(view.venousPressureLimitLowMax()+1); break; - case 14: view.set_venousPressureLimitHigh(view.venousPressureLimitHighMax()+1); break; + case 9: view.dialyzerType(view.dialyzerTypeOptions().length()); break; + case 10: view.dialysateTemp(view.dialysateTempMax()+1); break; + case 11: view.arterialPressureLimitLow(view.arterialPressureLimitLowMax()+1); break; + case 12: view.arterialPressureLimitHigh(view.arterialPressureLimitHighMax()+1); break; + case 13: view.venousPressureLimitLow(view.venousPressureLimitLowMax()+1); break; + case 14: view.venousPressureLimitHigh(view.venousPressureLimitHighMax()+1); break; - case 15: view.set_bloodPressureMeasureInterval(view.bloodPressureMeasureIntervalMax()+1); break; - case 16: view.set_rinsebackFlowRate(view.rinsebackFlowRateMax()+1); break; + case 15: view.bloodPressureMeasureInterval(view.bloodPressureMeasureIntervalMax()+1); break; + case 16: view.rinsebackFlowRate(view.rinsebackFlowRateMax()+1); break; default: break; }