Index: denali.pro.user =================================================================== diff -u -r4afc91856c00e01dfb5d84bc54d2d92faefec0db -r9327fae7b109203ca698d361b113a81d139a0cf9 --- denali.pro.user (.../denali.pro.user) (revision 4afc91856c00e01dfb5d84bc54d2d92faefec0db) +++ denali.pro.user (.../denali.pro.user) (revision 9327fae7b109203ca698d361b113a81d139a0cf9) @@ -1,6 +1,6 @@ - + EnvironmentId Index: en_US.udic =================================================================== diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -r9327fae7b109203ca698d361b113a81d139a0cf9 --- en_US.udic (.../en_US.udic) (revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f) +++ en_US.udic (.../en_US.udic) (revision 9327fae7b109203ca698d361b113a81d139a0cf9) @@ -68,3 +68,4 @@ yyyy MessageID unhandled +VCreate Index: sources/gui/qml/components/SliderCreateTreatment.qml =================================================================== diff -u -rccb91da4becded9a7ad409b758bba96784d9feba -r9327fae7b109203ca698d361b113a81d139a0cf9 --- sources/gui/qml/components/SliderCreateTreatment.qml (.../SliderCreateTreatment.qml) (revision ccb91da4becded9a7ad409b758bba96784d9feba) +++ sources/gui/qml/components/SliderCreateTreatment.qml (.../SliderCreateTreatment.qml) (revision 9327fae7b109203ca698d361b113a81d139a0cf9) @@ -24,8 +24,7 @@ /*! * \brief Slider component with a title and the currently selected value */ -Rectangle { - id: _root +Rectangle { id: _root property alias text: _text.text property var units: "" @@ -38,16 +37,14 @@ property alias stepSnap: _slider.stepSnap property alias sliderWidth: _slider.width property alias isActive: _slider.isActive - property alias sliderObjectName: _slider.objectName - property alias selectedValueObjectName: _selected_value.objectName signal pressed() signal released() height: Variables.createTreatmentSliderHeight width: Variables.createTreatmentSliderWidth anchors.horizontalCenter: parent.horizontalCenter - color: "transparent"; + color: "transparent" function setValid(valid) { if (valid) { @@ -65,53 +62,50 @@ anchors.top: parent.top anchors.left: parent.left font.pixelSize: Fonts.fontPixelFluidText - color: Colors.textMain; + color: Colors.textMain } - Text { - id: _selected_value + Text { id: _selected_value + objectName: _root.objectName + "Value" anchors.top: parent.top anchors.right: parent.right - text: "__ " + _root.units + text: qsTr("__") + " " + _root.units font.pixelSize: Fonts.fontPixelFluidUnit - color: Colors.textDisableButton; - + color: Colors.textDisableButton } Slider { id : _slider - anchors.horizontalCenter: parent.horizontalCenter; - anchors.bottom: parent.bottom; - width : Variables.createTreatmentSliderWidth - diameter: Variables.sliderCircleDiameter - color : Colors.createTreatmentInactive + objectName: _root.objectName + "Slider" + anchors.horizontalCenter: parent.horizontalCenter + anchors.bottom : parent.bottom + width : Variables.createTreatmentSliderWidth + diameter : Variables.sliderCircleDiameter + color : Colors.createTreatmentInactive handlerColor: Colors.createTreatmentInactive - touchMargin: Variables.createTreatmentSliderMargin - height : 5 - minimum : 100 - maximum : 500 - unit : qsTr("") - step : Variables.bloodFlowResolution - ticks : true + touchMargin : Variables.createTreatmentSliderMargin + height : 5 + isActive : false + ticks : true onValueChanged: { - _selected_value.text = value + " " + _root.units + if (isActive) + _selected_value.text = value + " " + _root.units } - onActiveChanged: { if (isActive) { + _selected_value.text = value + " " + _root.units _selected_value.color = Colors.textMain _text.color = Colors.textMain } else { _selected_value.color = Colors.textDisableButton _text.color = Colors.textDisableButton } } - - onProgressRectClicked: { setActive(true); setValid(true); } - onProgressRectDragged: { setActive(true); setValid(true); } - onPressed: { _root.pressed(); } - onReleased: { _root.released(); } - onDragged: { setActive(true); setValid(true); } - onClicked: { setActive(true); setValid(true); } + onProgressRectClicked : { setActive (true); setValid(true); } + onProgressRectDragged : { setActive (true); setValid(true); } + onPressed : { _root.pressed ( ); } + onReleased : { _root.released ( ); } + onDragged : { setActive (true); setValid(true); } + onClicked : { setActive (true); setValid(true); } } } Index: sources/gui/qml/compounds/PressureRangeSlider.qml =================================================================== diff -u -r21c61eb54daa66b4f79d0453b2238b624fbfd646 -r9327fae7b109203ca698d361b113a81d139a0cf9 --- sources/gui/qml/compounds/PressureRangeSlider.qml (.../PressureRangeSlider.qml) (revision 21c61eb54daa66b4f79d0453b2238b624fbfd646) +++ sources/gui/qml/compounds/PressureRangeSlider.qml (.../PressureRangeSlider.qml) (revision 9327fae7b109203ca698d361b113a81d139a0cf9) @@ -151,7 +151,7 @@ } height : 5 - diameter: 30 + diameter: Variables.sliderCircleDiameter decimal : 1 bgColor : Colors.pressuresOutOfRaneBg Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -r9327fae7b109203ca698d361b113a81d139a0cf9 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 9327fae7b109203ca698d361b113a81d139a0cf9) @@ -95,7 +95,7 @@ readonly property int pauseIconDiameter : 60 readonly property int topBarMenuHeight : 100 - readonly property int sliderCircleDiameter : 25 + readonly property int sliderCircleDiameter : 30 readonly property int pressuresProgressbarWidth : 725 @@ -215,18 +215,20 @@ // Units // - Ultrafiltration - readonly property string unitTextUltrafiltrationRate : qsTr("mL/min") + readonly property string unitTextUltrafiltrationRate : unitTextFlowRate readonly property string unitTextUltrafiltrationVolume : qsTr("(L)") - readonly property string unitTextTreatmentDuration : qsTr("min") + // - Duration/Interval + readonly property string unitTextDuration : qsTr("min") // - Flows readonly property string unitTextFlowRate : qsTr("mL/min") + readonly property string unitTextDispencingRate : qsTr("mL/hr") // - Vitals readonly property string unitTextBloodPressure : qsTr("mmHg") readonly property string unitTextHeartBeat : qsTr("BPM" ) // - Fluid readonly property string unitTextFluid : qsTr("mL") readonly property string unitTextSaline : unitTextFluid readonly property string unitTextHeparin : unitTextFluid - // - Create Treatment - readonly property string unitTextBPMeasurementInterval : qsTr("min") + // - Temperature + readonly property string unitTextTemperature : qsTr("°C") } Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml =================================================================== diff -u -r2fcd1a1722285e5e741b89176ad21989eb0f56f5 -r9327fae7b109203ca698d361b113a81d139a0cf9 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision 2fcd1a1722285e5e741b89176ad21989eb0f56f5) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision 9327fae7b109203ca698d361b113a81d139a0cf9) @@ -40,9 +40,9 @@ objectName: "TreatmentCreateFlickable" anchors { top : _root.title.bottom - topMargin : 15 + topMargin : Variables.minVGap bottom : _root.bottom - bottomMargin : Variables.notificationHeight + 15 + bottomMargin : Variables.notificationHeight + Variables.minVGap horizontalCenter: parent.horizontalCenter } width: parent.width @@ -77,13 +77,12 @@ SliderCreateTreatment { id: _bloodFlowRate objectName: "_bloodFlowRate" - sliderObjectName: objectName + "Slider" - selectedValueObjectName: objectName + "Value" - min: vTreatmentCreate.bloodFlowRateMin - max: vTreatmentCreate.bloodFlowRateMax - step: vTreatmentCreate.bloodFlowRateRes - text: qsTr("Blood Flow Rate") - units: qsTr("mL/min") + value : vTreatmentCreate.bloodFlowRate + min : vTreatmentCreate.bloodFlowRateMin + max : vTreatmentCreate.bloodFlowRateMax + step : vTreatmentCreate.bloodFlowRateRes + text : qsTr("Blood Flow Rate") + units : Variables.unitTextFlowRate onPressed: { setInteractive(false) vTreatmentCreate.bloodFlowRate = value @@ -96,13 +95,12 @@ SliderCreateTreatment { id: _dialysateFlowRate objectName: "_dialysateFlowRate" - sliderObjectName: objectName + "Slider" - selectedValueObjectName: objectName + "Value" - min: vTreatmentCreate.dialysateFlowRateMin - max: vTreatmentCreate.dialysateFlowRateMax - step: vTreatmentCreate.dialysateFlowRateRes - text: qsTr("Dialysate Flow Rate") - units: qsTr("mL/min") + value : vTreatmentCreate.dialysateFlowRate + min : vTreatmentCreate.dialysateFlowRateMin + max : vTreatmentCreate.dialysateFlowRateMax + step : vTreatmentCreate.dialysateFlowRateRes + text : qsTr("Dialysate Flow Rate") + units : Variables.unitTextFlowRate onPressed: { setInteractive(false) vTreatmentCreate.dialysateFlowRate = value @@ -115,13 +113,12 @@ SliderCreateTreatment { id: _duration objectName: "_duration" - sliderObjectName: objectName + "Slider" - selectedValueObjectName: objectName + "Value" - min: vTreatmentCreate.durationMin - max: vTreatmentCreate.durationMax - step: vTreatmentCreate.durationRes - text: qsTr("Duration") - units: qsTr("min") + value : vTreatmentCreate.duration + min : vTreatmentCreate.durationMin + max : vTreatmentCreate.durationMax + step : vTreatmentCreate.durationRes + text : qsTr("Duration") + units : Variables.unitTextDuration onPressed: { setInteractive(false) vTreatmentCreate.duration = value @@ -134,13 +131,12 @@ SliderCreateTreatment { id: _heparinDispensingRate objectName: "_heparinDispensingRate" - sliderObjectName: objectName + "Slider" - selectedValueObjectName: objectName + "Value" - min: vTreatmentCreate.heparinDispensingRateMin - max: vTreatmentCreate.heparinDispensingRateMax - step: vTreatmentCreate.heparinDispensingRateRes - text: qsTr("Heparin Dispensing Rate") - units: qsTr("mL/hr") + value : vTreatmentCreate.heparinDispensingRate + min : vTreatmentCreate.heparinDispensingRateMin + max : vTreatmentCreate.heparinDispensingRateMax + step : vTreatmentCreate.heparinDispensingRateRes + text : qsTr("Heparin Dispensing Rate") + units : Variables.unitTextDispencingRate onPressed: { setInteractive(false) vTreatmentCreate.heparinDispensingRate = value @@ -153,14 +149,12 @@ SliderCreateTreatment { id: _heparinBolusVolume objectName: "_heparinBolusVolume" - sliderObjectName: objectName + "Slider" - selectedValueObjectName: objectName + "Value" - min: vTreatmentCreate.heparinBolusVolumeMin - max: vTreatmentCreate.heparinBolusVolumeMax - step: vTreatmentCreate.heparinBolusVolumeRes - - text: qsTr("Heparin Bolus Volume") - units: qsTr("mL") + value : vTreatmentCreate.heparinBolusVolume + min : vTreatmentCreate.heparinBolusVolumeMin + max : vTreatmentCreate.heparinBolusVolumeMax + step : vTreatmentCreate.heparinBolusVolumeRes + text : qsTr("Heparin Bolus Volume") + units : Variables.unitTextFluid onPressed: { setInteractive(false) vTreatmentCreate.heparinBolusVolume = value @@ -173,13 +167,12 @@ SliderCreateTreatment { id: _heparinStopTime objectName: "_heparinStopTime" - sliderObjectName: objectName + "Slider" - selectedValueObjectName: objectName + "Value" - min: vTreatmentCreate.heparinStopTimeMin - max: vTreatmentCreate.heparinStopTimeMax - step: vTreatmentCreate.heparinStopTimeRes - text: qsTr("Heparin Stop Time") - units: qsTr("min") + value : vTreatmentCreate.heparinStopTime + min : vTreatmentCreate.heparinStopTimeMin + max : vTreatmentCreate.heparinStopTimeMax + step : vTreatmentCreate.heparinStopTimeRes + text : qsTr("Heparin Stop Time") + units : Variables.unitTextDuration onPressed: { setInteractive(false) vTreatmentCreate.heparinStopTime = value @@ -190,16 +183,14 @@ } } - SliderCreateTreatment { - id: _salineBolus + SliderCreateTreatment { id: _salineBolus objectName: "_salineBolus" - sliderObjectName: objectName + "Slider" - selectedValueObjectName: objectName + "Value" - text: "Saline Bolus" - units: qsTr("mL") - min: vTreatmentCreate.salineBolusVolumeMin - max: vTreatmentCreate.salineBolusVolumeMax - step: vTreatmentCreate.salineBolusVolumeRes + value : vTreatmentCreate.salineBolusVolume + min : vTreatmentCreate.salineBolusVolumeMin + max : vTreatmentCreate.salineBolusVolumeMax + step : vTreatmentCreate.salineBolusVolumeRes + text : "Saline Bolus" + units : Variables.unitTextFluid onPressed: { setInteractive(false) vTreatmentCreate.salineBolusVolume = value @@ -218,19 +209,18 @@ font.bold: true } - GridSelection { - id: _acidConcentrate - objectName: "_acidConcentrateRect" - name: qsTr("Acid Concentrate") - buttonNames: vTreatmentCreate.acidConcentrateOptions + GridSelection { id: _acidConcentrate + objectName : "_acidConcentrateRect" + name : qsTr("Acid Concentrate") + buttonNames : vTreatmentCreate.acidConcentrateOptions onButtonClicked: { vTreatmentCreate.acidConcentrate = selectedIndex } } GridSelection { id: _bicarbonateConcentrate - objectName: "_bicarbonateConcentrateRect" - name: qsTr("Bicarbonate Concentrate") + objectName : "_bicarbonateConcentrateRect" + name : qsTr("Bicarbonate Concentrate") numRows: 1 numCols: 2 buttonNames: vTreatmentCreate.bicarbonateConcentrateOptions @@ -252,13 +242,12 @@ SliderCreateTreatment { id: _dialysateTemperature objectName: "_dialysateTemperature" - sliderObjectName: objectName + "Slider" - selectedValueObjectName: objectName + "Value" - min: vTreatmentCreate.dialysateTempMin - max: vTreatmentCreate.dialysateTempMax - step: vTreatmentCreate.dialysateTempRes - text: qsTr("Dialysate Temperature") - units: qsTr("C") + value : vTreatmentCreate.dialysateTemp + min : vTreatmentCreate.dialysateTempMin + max : vTreatmentCreate.dialysateTempMax + step : vTreatmentCreate.dialysateTempRes + text : qsTr("Dialysate Temperature") + units : Variables.unitTextTemperature onPressed: { setInteractive(false) vTreatmentCreate.dialysateTemp = value @@ -403,13 +392,12 @@ SliderCreateTreatment { id: _bloodPressureMeasurementInterval objectName: "_bloodPressureMeasurementInterval" - sliderObjectName: objectName + "Slider" - selectedValueObjectName: objectName + "Value" - text: qsTr("Blood Pressure Measurement Interval") - units: Variables.unitTextBPMeasurementInterval - min: vTreatmentCreate.bloodPressureMeasureIntervalMin - max: vTreatmentCreate.bloodPressureMeasureIntervalMax - step: vTreatmentCreate.bloodPressureMeasureIntervalRes + value : vTreatmentCreate.bloodPressureMeasureInterval + min : vTreatmentCreate.bloodPressureMeasureIntervalMin + max : vTreatmentCreate.bloodPressureMeasureIntervalMax + step : vTreatmentCreate.bloodPressureMeasureIntervalRes + text : qsTr("Blood Pressure Measurement Interval") + units : Variables.unitTextDuration stepSnap: true onPressed: { setInteractive(false) @@ -423,13 +411,12 @@ SliderCreateTreatment { id: _rinsebackFlowRate objectName: "_rinsebackFlowRate" - sliderObjectName: objectName + "Slider" - selectedValueObjectName: objectName + "Value" - text: qsTr("Rinseback Flow Rate") - units: Variables.unitTextFlowRate - min: vTreatmentCreate.rinsebackFlowRateMin - max: vTreatmentCreate.rinsebackFlowRateMax - step: vTreatmentCreate.rinsebackFlowRateRes + value : vTreatmentCreate.rinsebackFlowRate + min : vTreatmentCreate.rinsebackFlowRateMin + max : vTreatmentCreate.rinsebackFlowRateMax + step : vTreatmentCreate.rinsebackFlowRateRes + text : qsTr("Rinseback Flow Rate") + units : Variables.unitTextFlowRate stepSnap: true onPressed: { setInteractive(false) Index: sources/view/VTreatmentCreate.cpp =================================================================== diff -u -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f -r9327fae7b109203ca698d361b113a81d139a0cf9 --- sources/view/VTreatmentCreate.cpp (.../VTreatmentCreate.cpp) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) +++ sources/view/VTreatmentCreate.cpp (.../VTreatmentCreate.cpp) (revision 9327fae7b109203ca698d361b113a81d139a0cf9) @@ -367,7 +367,7 @@ return QStringList() << aConcentrate << bCarbConcentrate << dType - << QString("%0 C").arg(_dialysateTemp) + << QString("%0 °C").arg(_dialysateTemp) << QString("%0 mmHg").arg(_arterialPressureLimitLow) << QString("%0 mmHg").arg(_arterialPressureLimitHigh) << QString("%0 mmHg").arg(_venousPressureLimitLow) Index: sources/view/VTreatmentCreate.h =================================================================== diff -u -r7cc15ae5968205b241a08ca4646f283b8bf97b03 -r9327fae7b109203ca698d361b113a81d139a0cf9 --- sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision 7cc15ae5968205b241a08ca4646f283b8bf97b03) +++ sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision 9327fae7b109203ca698d361b113a81d139a0cf9) @@ -120,28 +120,28 @@ const qreal dialysateTemp_Res = 0.5 ; // PRS 353 // mmHg + const qint32 arterialPressureLimitLow_Def = -300 ; // PRS 354 const qint32 arterialPressureLimitLow_Min = -300 ; // PRS 354 const qint32 arterialPressureLimitLow_Max = 0 ; // PRS 354 const qint32 arterialPressureLimitLow_Res = 10 ; // PRS 354 - const qint32 arterialPressureLimitLow_Def = -300 ; // PRS 354 // mmHg + const qint32 arterialPressureLimitHigh_Def = 0 ; // PRS 355 const qint32 arterialPressureLimitHigh_Min = -300 ; // PRS 355 const qint32 arterialPressureLimitHigh_Max = 0 ; // PRS 355 const qint32 arterialPressureLimitHigh_Res = 10 ; // PRS 355 - const qint32 arterialPressureLimitHigh_Def = 0 ; // PRS 355 // mmHg + const qint32 venousPressureLimitLow_Def = 20 ; // PRS 356 const qint32 venousPressureLimitLow_Min = 20 ; // PRS 356 const qint32 venousPressureLimitLow_Max = 600 ; // PRS 356 const qint32 venousPressureLimitLow_Res = 10 ; // PRS 356 - const qint32 venousPressureLimitLow_Def = 20 ; // PRS 356 // mmHg + const qint32 venousPressureLimitHigh_Def = 400 ; // PRS 357 const qint32 venousPressureLimitHigh_Min = 20 ; // PRS 357 const qint32 venousPressureLimitHigh_Max = 600 ; // PRS 357 const qint32 venousPressureLimitHigh_Res = 10 ; // PRS 357 - const qint32 venousPressureLimitHigh_Def = 400 ; // PRS 357 // min const quint32 bloodPressureMeasureInterval_Def = 30 ; // PRS 358 @@ -202,9 +202,10 @@ PROPERTY(QStringList, acidConcentrateOptions , QStringList() << "08-1251-1" << "08-2251-0" << "08-3251-9") - PROPERTY(QStringList, bicarbonateConcentrateOptions , QStringList() << "Dimesol - BC-201") - PROPERTY(QStringList, dialyzerTypeOptions , QStringList() << "Nipro Elisio-H 17" - << "Nipro Elisio-H 19" + 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")