Index: sources/gui/qml/components/SliderCreateTreatment.qml =================================================================== diff -u -rb61d8a3e01fef66eee8095c9cddf835d9bb32b66 -r1a7d3535b65d7edf23bc6638c4113e4b55c49c2a --- sources/gui/qml/components/SliderCreateTreatment.qml (.../SliderCreateTreatment.qml) (revision b61d8a3e01fef66eee8095c9cddf835d9bb32b66) +++ sources/gui/qml/components/SliderCreateTreatment.qml (.../SliderCreateTreatment.qml) (revision 1a7d3535b65d7edf23bc6638c4113e4b55c49c2a) @@ -85,6 +85,7 @@ diameter: Variables.sliderCircleDiameter color : Colors.createTreatmentInactive knobColor: Colors.createTreatmentInactive + touchMargin: Variables.createTreatmentSliderMargin height : 5 minimum : 100 maximum : 500 Index: sources/gui/qml/components/SliderDoubleCreateTreatment.qml =================================================================== diff -u -rb61d8a3e01fef66eee8095c9cddf835d9bb32b66 -r1a7d3535b65d7edf23bc6638c4113e4b55c49c2a --- sources/gui/qml/components/SliderDoubleCreateTreatment.qml (.../SliderDoubleCreateTreatment.qml) (revision b61d8a3e01fef66eee8095c9cddf835d9bb32b66) +++ sources/gui/qml/components/SliderDoubleCreateTreatment.qml (.../SliderDoubleCreateTreatment.qml) (revision 1a7d3535b65d7edf23bc6638c4113e4b55c49c2a) @@ -53,8 +53,10 @@ property alias lowSelectedValueObjectName: _lowSelectedValue.objectName property alias highSliderObjectName: _highSlider.objectName property alias highSelectedValueObjectName: _highSelectedValue.objectName - signal lowSliderChanged() - signal highSliderChanged() + signal lowSliderPressed() + signal lowSliderReleased() + signal highSliderPressed() + signal highSliderReleased() height: Variables.progressbarRectHeight width: Variables.progressbarSmallWidth @@ -109,6 +111,7 @@ diameter: Variables.sliderCircleDiameter color : Colors.createTreatmentInactive knobColor: Colors.createTreatmentInactive + touchMargin: Variables.createTreatmentSliderMargin height : 5 minimum: 0 maximum: 100 @@ -117,7 +120,6 @@ ticks : true onValueChanged: { _lowSelectedValue.text = value + " " + _root.lowUnits; - lowSliderChanged() } onActiveChanged: { if (isActive) { @@ -131,6 +133,8 @@ onProgressRectClicked: { setActive(true); setLowValid(true); } onProgressRectDragged: { setActive(true); setLowValid(true); } + onPressed: { _root.lowSliderPressed(); } + onReleased: { _root.lowSliderReleased(); } onDragged: { setActive(true); setLowValid(true); } onClicked: { setActive(true); setLowValid(true); } } @@ -162,6 +166,7 @@ diameter: Variables.sliderCircleDiameter color : Colors.createTreatmentInactive knobColor: Colors.createTreatmentInactive + touchMargin: Variables.createTreatmentSliderMargin height : 5 minimum: 50 maximum: 100 @@ -170,7 +175,6 @@ ticks : true onValueChanged: { _highSelectedValue.text = value + " " + _root.highUnits; - highSliderChanged() } onActiveChanged: { @@ -185,6 +189,8 @@ onProgressRectClicked: { setActive(true); setHighValid(true); } onProgressRectDragged: { setActive(true); setHighValid(true); } + onPressed: { _root.highSliderPressed(); } + onReleased: { _root.highSliderReleased(); } onDragged: { setActive(true); setHighValid(true); } onClicked: { setActive(true); setHighValid(true); } } Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -rb61d8a3e01fef66eee8095c9cddf835d9bb32b66 -r1a7d3535b65d7edf23bc6638c4113e4b55c49c2a --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision b61d8a3e01fef66eee8095c9cddf835d9bb32b66) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 1a7d3535b65d7edf23bc6638c4113e4b55c49c2a) @@ -23,77 +23,79 @@ * which is going to be used in the project. */ QtObject { - readonly property int applicationWidth : 1280 - readonly property int applicationHeight : 800 - readonly property int buttonSpacing : 150 - readonly property int dialogIconHeight : 50 - readonly property int dialogIconWidth : 50 - readonly property int dialogIconHorizontalOffset: 25 - readonly property int headerHeight : 100 + readonly property int applicationWidth : 1280 + readonly property int applicationHeight : 800 + readonly property int buttonSpacing : 150 + readonly property int dialogIconHeight : 50 + readonly property int dialogIconWidth : 50 + readonly property int dialogIconHorizontalOffset : 25 + readonly property int headerHeight : 100 - readonly property int mainMenuHeight : 70 + readonly property int mainMenuHeight : 70 - readonly property int logoWidth : 50 - readonly property int logoHeight : 50 + readonly property int logoWidth : 50 + readonly property int logoHeight : 50 - readonly property int largeArrowWidth : 24 - readonly property int largeArrowHeight : 32 + readonly property int largeArrowWidth : 24 + readonly property int largeArrowHeight : 32 - readonly property int arrowWidth : 12 - readonly property int arrowHeight : 16 + readonly property int arrowWidth : 12 + readonly property int arrowHeight : 16 - readonly property int borderWidth : 2 + readonly property int borderWidth : 2 - readonly property int touchRectWidth : 512 //K:D //425 - readonly property int touchRectHeight : 85 //K:D //70 - readonly property int touchRectRadius : 45 + readonly property int touchRectWidth : 512 //K:D //425 + readonly property int touchRectHeight : 85 //K:D //70 + readonly property int touchRectRadius : 45 - readonly property int titleBottomPadding : 25 + readonly property int titleBottomPadding : 25 - readonly property int columnSpacing : 25 //K:D //20 + readonly property int columnSpacing : 25 //K:D //20 - readonly property int dialogMargin : mainMenuHeight * 2 - readonly property int dialogWidth : applicationWidth - dialogMargin - readonly property int dialogHeight : applicationHeight - dialogMargin - readonly property int dialogRadius : 10 + readonly property int dialogMargin : mainMenuHeight * 2 + readonly property int dialogWidth : applicationWidth - dialogMargin + readonly property int dialogHeight : applicationHeight - dialogMargin + readonly property int dialogRadius : 10 - readonly property int rangeRectMargin : 1 - readonly property int rangeRectRadius : 2 - readonly property int rangeRectTextMargin : 7 - readonly property int rangeMarkerHeight : 60 - readonly property int rangeMarkerHeightMidle: 40 - readonly property int rangeMarkerHeightShort: 20 - readonly property int rangeMarkerWidth : 2 + readonly property int rangeRectMargin : 1 + readonly property int rangeRectRadius : 2 + readonly property int rangeRectTextMargin : 7 + readonly property int rangeMarkerHeight : 60 + readonly property int rangeMarkerHeightMidle : 40 + readonly property int rangeMarkerHeightShort : 20 + readonly property int rangeMarkerWidth : 2 - readonly property int progressbarHeight : 30 - readonly property int progressbarHandler : 35 + readonly property int progressbarHeight : 30 + readonly property int progressbarHandler : 35 - readonly property int progressbarFluidHeight: 5 - readonly property int progressbarSmall : 5 - readonly property int progressbarSmallWidth : 600 - readonly property int progressbarRectHeight : 50 - readonly property int progressbarRectWidth : 620 + readonly property int progressbarFluidHeight : 5 + readonly property int progressbarSmall : 5 + readonly property int progressbarSmallWidth : 600 + readonly property int progressbarRectHeight : 50 + readonly property int progressbarRectWidth : 620 - readonly property int sliderTextMargin : 20 - readonly property int treatmentSpacing : 60 + readonly property int sliderTextMargin : 20 + readonly property int treatmentSpacing : 60 - readonly property int cTreatmentTableHeight : 800 - readonly property int cTreatmentTableWidth : applicationWidth - 50 - readonly property int cTreatmentMargin : 45 - readonly property int cTreatmentHdrHeight : 130 - readonly property int cTreatmentTblMargin : 20 - readonly property int cTreatmentSubTblHeight: 50 - readonly property int cTreatmentSubTblWidth : 500 + // TODO: rename these. + readonly property int cTreatmentTableHeight : 800 + readonly property int cTreatmentTableWidth : applicationWidth - 50 + readonly property int cTreatmentMargin : 45 + readonly property int cTreatmentHdrHeight : 130 + readonly property int cTreatmentTblMargin : 20 + readonly property int cTreatmentSubTblHeight : 50 + readonly property int cTreatmentSubTblWidth : 500 + readonly property int createTreatmentSliderMargin : 50 - readonly property int notificationHeight : 50 - readonly property int notificationIconSize : 36 + readonly property int notificationHeight : 50 + readonly property int notificationIconSize : 36 - readonly property int backIconDiameter : 17 + readonly property int backIconDiameter : 17 - readonly property int pauseIconDiameter : 60 - readonly property int topBarMenuHeight : 100 - readonly property int sliderCircleDiameter : 25 + readonly property int pauseIconDiameter : 60 + readonly property int topBarMenuHeight : 100 + readonly property int sliderCircleDiameter : 25 readonly property int ultrafiltrationProgressbarWidth : 880 Index: sources/gui/qml/pages/treatment/TreatmentBegin.qml =================================================================== diff -u -rb61d8a3e01fef66eee8095c9cddf835d9bb32b66 -r1a7d3535b65d7edf23bc6638c4113e4b55c49c2a --- sources/gui/qml/pages/treatment/TreatmentBegin.qml (.../TreatmentBegin.qml) (revision b61d8a3e01fef66eee8095c9cddf835d9bb32b66) +++ sources/gui/qml/pages/treatment/TreatmentBegin.qml (.../TreatmentBegin.qml) (revision 1a7d3535b65d7edf23bc6638c4113e4b55c49c2a) @@ -53,6 +53,10 @@ contentHeight: _column.implicitHeight clip: true + function setInteractive(isInteractive) { + _flickable.interactive = isInteractive + } + ScrollBar.vertical: ScrollBar { id: _scrollBar anchors.right: _flickable.right anchors.rightMargin: 3 @@ -87,10 +91,12 @@ max: vTreatmentBegin.ufVolumeMax step: vTreatmentBegin.ufVolumeRes onPressed: { - vTreatmentBegin.ufVolume = value; + _flickable.setInteractive(false) + vTreatmentBegin.ufVolume = value } onReleased: { - vTreatmentBegin.ufVolume = value; + vTreatmentBegin.ufVolume = value + _flickable.setInteractive(true) } } Index: sources/gui/qml/pages/treatment/TreatmentCreate.qml =================================================================== diff -u -rb61d8a3e01fef66eee8095c9cddf835d9bb32b66 -r1a7d3535b65d7edf23bc6638c4113e4b55c49c2a --- sources/gui/qml/pages/treatment/TreatmentCreate.qml (.../TreatmentCreate.qml) (revision b61d8a3e01fef66eee8095c9cddf835d9bb32b66) +++ sources/gui/qml/pages/treatment/TreatmentCreate.qml (.../TreatmentCreate.qml) (revision 1a7d3535b65d7edf23bc6638c4113e4b55c49c2a) @@ -51,6 +51,10 @@ contentHeight: _column.implicitHeight clip: true + function setInteractive(isInteractive) { + _flickable.interactive = isInteractive + } + ScrollBar.vertical: ScrollBar { id: _scrollBar anchors.right: _flickable.right anchors.rightMargin: 3 @@ -93,10 +97,12 @@ text: qsTr("Blood Flow Rate") units: qsTr("mL/min") onPressed: { - vTreatmentCreate.bloodFlowRate = value; + _flickable.setInteractive(false) + vTreatmentCreate.bloodFlowRate = value } onReleased: { - vTreatmentCreate.bloodFlowRate = value; + vTreatmentCreate.bloodFlowRate = value + _flickable.setInteractive(true) } } @@ -110,10 +116,12 @@ text: qsTr("Dialysate Flow Rate") units: qsTr("mL/min") onPressed: { + _flickable.setInteractive(false) vTreatmentCreate.dialysateFlowRate = value; } onReleased: { vTreatmentCreate.dialysateFlowRate = value; + _flickable.setInteractive(true) } } @@ -127,10 +135,12 @@ text: qsTr("Duration") units: qsTr("min") onPressed: { + _flickable.setInteractive(false) vTreatmentCreate.duration = value; } onReleased: { vTreatmentCreate.duration = value; + _flickable.setInteractive(true) } } @@ -144,10 +154,12 @@ text: qsTr("Heparin Dispensing Rate") units: qsTr("mL/hr") onPressed: { - vTreatmentCreate.heparinDispensingRate = value; + _flickable.setInteractive(false) + vTreatmentCreate.heparinDispensingRate = value } onReleased: { - vTreatmentCreate.heparinDispensingRate = value; + vTreatmentCreate.heparinDispensingRate = value + _flickable.setInteractive(true) } } @@ -162,10 +174,12 @@ text: qsTr("Heparin Bolus Volume") units: qsTr("mL") onPressed: { - vTreatmentCreate.heparinBolusVolume = value; + _flickable.setInteractive(false) + vTreatmentCreate.heparinBolusVolume = value } onReleased: { - vTreatmentCreate.heparinBolusVolume = value; + vTreatmentCreate.heparinBolusVolume = value + _flickable.setInteractive(true) } } @@ -179,10 +193,12 @@ text: qsTr("Heparin Stop Time") units: qsTr("min") onPressed: { - vTreatmentCreate.heparinStopTime = value; + _flickable.setInteractive(false) + vTreatmentCreate.heparinStopTime = value } onReleased: { - vTreatmentCreate.heparinStopTime = value; + vTreatmentCreate.heparinStopTime = value + _flickable.setInteractive(true) } } @@ -195,20 +211,22 @@ max: vTreatmentCreate.salineBolusVolumeMax step: vTreatmentCreate.salineBolusVolumeRes onPressed: { - vTreatmentCreate.salineBolusVolume = value; + _flickable.setInteractive(false) + vTreatmentCreate.salineBolusVolume = value } onReleased: { - vTreatmentCreate.salineBolusVolume = value; + vTreatmentCreate.salineBolusVolume = value + _flickable.setInteractive(true) } } GridSelection { id: _acidConcentrate objectName: "_acidConcentrateRect" name: qsTr("Acid Concentrate") - buttonNames: vTreatmentCreate.acidConcentrateOptions; + buttonNames: vTreatmentCreate.acidConcentrateOptions onButtonClicked: { - vTreatmentCreate.acidConcentrate = selectedIndex; + vTreatmentCreate.acidConcentrate = selectedIndex } } @@ -244,10 +262,12 @@ text: qsTr("Dialysate Temperature") units: qsTr("C") onPressed: { - vTreatmentCreate.dialysateTemp = value; + _flickable.setInteractive(false) + vTreatmentCreate.dialysateTemp = value } onReleased: { - vTreatmentCreate.dialysateTemp = value; + vTreatmentCreate.dialysateTemp = value + _flickable.setInteractive(true) } } @@ -277,12 +297,22 @@ highValue: vTreatmentCreate.arterialPressureLimitHighMin lowStep: vTreatmentCreate.arterialPressureLimitLowRes highStep: vTreatmentCreate.arterialPressureLimitHighRes - onLowSliderChanged: { + onLowSliderPressed: { + _flickable.setInteractive(false) vTreatmentCreate.arterialPressureLimitLow = lowValue } - onHighSliderChanged: { + onLowSliderReleased: { + vTreatmentCreate.arterialPressureLimitLow = lowValue + _flickable.setInteractive(true) + } + onHighSliderPressed: { + _flickable.setInteractive(false) vTreatmentCreate.arterialPressureLimitHigh = highValue } + onHighSliderReleased: { + vTreatmentCreate.arterialPressureLimitHigh = highValue + _flickable.setInteractive(true) + } } @@ -312,12 +342,22 @@ highValue: vTreatmentCreate.venousPressureLimitHighMin lowStep: vTreatmentCreate.venousPressureLimitLowRes highStep: vTreatmentCreate.venousPressureLimitHighRes - onLowSliderChanged: { + onLowSliderPressed: { + _flickable.setInteractive(false) vTreatmentCreate.venousPressureLimitLow = lowValue } - onHighSliderChanged: { + onLowSliderReleased: { + vTreatmentCreate.venousPressureLimitLow = lowValue + _flickable.setInteractive(true) + } + onHighSliderPressed: { + _flickable.setInteractive(false) vTreatmentCreate.venousPressureLimitHigh = highValue } + onHighSliderReleased: { + vTreatmentCreate.venousPressureLimitHigh = highValue + _flickable.setInteractive(true) + } } SliderCreateTreatment { id: _bloodPressureMeasurementInterval @@ -331,10 +371,12 @@ step: vTreatmentCreate.bloodPressureMeasureIntervalRes stepSnap: true onPressed: { + _flickable.setInteractive(false) vTreatmentCreate.bloodPressureMeasureInterval = value } onReleased: { vTreatmentCreate.bloodPressureMeasureInterval = value + _flickable.setInteractive(true) } } @@ -349,10 +391,12 @@ step: vTreatmentCreate.rinsebackFlowRateRes stepSnap: true onPressed: { + _flickable.setInteractive(false) vTreatmentCreate.rinsebackFlowRate = value } onReleased: { vTreatmentCreate.rinsebackFlowRate = value + _flickable.setInteractive(true) } } Index: sources/gui/qml/pages/treatment/TreatmentPrime.qml =================================================================== diff -u -rb61d8a3e01fef66eee8095c9cddf835d9bb32b66 -r1a7d3535b65d7edf23bc6638c4113e4b55c49c2a --- sources/gui/qml/pages/treatment/TreatmentPrime.qml (.../TreatmentPrime.qml) (revision b61d8a3e01fef66eee8095c9cddf835d9bb32b66) +++ sources/gui/qml/pages/treatment/TreatmentPrime.qml (.../TreatmentPrime.qml) (revision 1a7d3535b65d7edf23bc6638c4113e4b55c49c2a) @@ -125,7 +125,7 @@ TouchRect { id : _continueRect anchors.horizontalCenter: parent.horizontalCenter text.text: vPriming.continueBtnText - enabled: vPriming.currentState >= 4 + enabled: vPriming.continueEnabled onEnabledChanged: { if (enabled) { borderColor = Colors.primingReady Index: sources/view/VPriming.cpp =================================================================== diff -u -rb61d8a3e01fef66eee8095c9cddf835d9bb32b66 -r1a7d3535b65d7edf23bc6638c4113e4b55c49c2a --- sources/view/VPriming.cpp (.../VPriming.cpp) (revision b61d8a3e01fef66eee8095c9cddf835d9bb32b66) +++ sources/view/VPriming.cpp (.../VPriming.cpp) (revision 1a7d3535b65d7edf23bc6638c4113e4b55c49c2a) @@ -29,15 +29,10 @@ void VPriming::onActionReceive(const PrimingData &data) { - qDebug() << "current state: " << data.currentState; - qDebug() << "seconds remaining: " << data.secondsRemaining; - qDebug() << "seconds total: " << data.secondsTotal; - secondsTotal (data.secondsTotal ); secondsRemaining (data.secondsRemaining ); currentState (data.currentState ); - PrimingStates state = static_cast(currentState()); switch (state) { @@ -46,7 +41,7 @@ case PRIMING_LINES: { continueBtnText = "CONTINUE TO TREATMENT"; - continueEnabled(false); +// continueEnabled(false); // TODO: Uncomment once FW supports priming emit continueBtnTextChanged(); break; } Index: sources/view/VPriming.h =================================================================== diff -u -r32bc2f04da62ae95a041945b449d2c40465f9308 -r1a7d3535b65d7edf23bc6638c4113e4b55c49c2a --- sources/view/VPriming.h (.../VPriming.h) (revision 32bc2f04da62ae95a041945b449d2c40465f9308) +++ sources/view/VPriming.h (.../VPriming.h) (revision 1a7d3535b65d7edf23bc6638c4113e4b55c49c2a) @@ -33,7 +33,7 @@ PROPERTY(quint32 , currentState , 0) PROPERTY(quint32 , secondsRemaining , 0) PROPERTY(quint32 , secondsTotal , 0) - PROPERTY(bool , continueEnabled , true) // TODO: Update this once priming messaging w/ FW is in place. + PROPERTY(bool , continueEnabled , true) // TODO: Set to False when FW supports priming QString continueBtnText = "Continue to Treatment"; Index: sources/view/VTreatmentCreate.cpp =================================================================== diff -u -rb61d8a3e01fef66eee8095c9cddf835d9bb32b66 -r1a7d3535b65d7edf23bc6638c4113e4b55c49c2a --- sources/view/VTreatmentCreate.cpp (.../VTreatmentCreate.cpp) (revision b61d8a3e01fef66eee8095c9cddf835d9bb32b66) +++ sources/view/VTreatmentCreate.cpp (.../VTreatmentCreate.cpp) (revision 1a7d3535b65d7edf23bc6638c4113e4b55c49c2a) @@ -45,10 +45,10 @@ connect(&_GuiController, SIGNAL(didActionReceive(StartTreatmentResponseData)), this, SLOT(onStartTreatmentResponse(StartTreatmentResponseData))); - loadTreatmentParameterRanges(); - connect(this, SIGNAL(requestConcurrentSave(QString,QString,bool)), &_FileSaver, SLOT(onConcurrentSave(QString,QString,bool))); + + loadTreatmentParameterRanges(); } /** Index: sources/view/VTreatmentCreate.h =================================================================== diff -u -rb61d8a3e01fef66eee8095c9cddf835d9bb32b66 -r1a7d3535b65d7edf23bc6638c4113e4b55c49c2a --- sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision b61d8a3e01fef66eee8095c9cddf835d9bb32b66) +++ sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision 1a7d3535b65d7edf23bc6638c4113e4b55c49c2a) @@ -64,20 +64,20 @@ TREATMENT_PARAMETER(quint32, bloodFlowRate, 100, 100, 500, 25 ) // mL/min TREATMENT_PARAMETER(quint32, dialysateFlowRate, 100, 100, 600, 50 ) // mL/min TREATMENT_PARAMETER(quint32, duration, 60, 60, 480, 15 ) // minutes - TREATMENT_PARAMETER(float, heparinDispensingRate, 0, 0.1, 1.0, 0.1) // mL/hr (0 = off) - TREATMENT_PARAMETER(float, heparinBolusVolume, 0, 0.1, 2.0, 0.1) // mL (0 = off) + TREATMENT_PARAMETER(qreal, heparinDispensingRate, 0, 0.1, 1.0, 0.1) // mL/hr (0 = off) + TREATMENT_PARAMETER(qreal, heparinBolusVolume, 0, 0.1, 2.0, 0.1) // mL (0 = off) TREATMENT_PARAMETER(quint32, heparinStopTime, 0, 0, 480, 10 ) // min TREATMENT_PARAMETER(quint32, salineBolusVolume, 100, 100, 300, 100) // mL TREATMENT_PARAMETER(quint32, acidConcentrate, UNSET, 0, 3, 1) TREATMENT_PARAMETER(quint32, bicarbonateConcentrate, UNSET, 0, 1, 1) TREATMENT_PARAMETER(quint32, dialyzerType, UNSET, 0, 3, 1) - TREATMENT_PARAMETER(float, dialysateTemp, 37, 35, 38, 0.5) // Celsius - TREATMENT_PARAMETER(qint32, arterialPressureLimitLow, -300, -300, 200, 10) // mmHg - TREATMENT_PARAMETER(qint32, arterialPressureLimitHigh, 100, -300, 200, 10) // mmHg - TREATMENT_PARAMETER(qint32, venousPressureLimitLow, -100, -100, 600, 10) // mmHg - TREATMENT_PARAMETER(qint32, venousPressureLimitHigh, 400, 100, 600, 10) // mmHg + TREATMENT_PARAMETER(qreal, dialysateTemp, 37, 35, 38, 0.5) // Celsius + TREATMENT_PARAMETER(qint32, arterialPressureLimitLow, -300, -300, 200, 10) // mmHg + TREATMENT_PARAMETER(qint32, arterialPressureLimitHigh, 100, -300, 200, 10) // mmHg + TREATMENT_PARAMETER(qint32, venousPressureLimitLow, -100, -100, 600, 10) // mmHg + TREATMENT_PARAMETER(qint32, venousPressureLimitHigh, 400, 100, 600, 10) // mmHg TREATMENT_PARAMETER(quint32, bloodPressureMeasureInterval, 30, 15, 60, 5) // minutes TREATMENT_PARAMETER(quint32, rinsebackFlowRate, 75, 50, 150, 25) // mL/min @@ -166,9 +166,7 @@ void onSelectingParameters(); void onCancelSelectingParameters(); void onRequestPop(); - }; - } #endif // VCREATETREATMENT_H