Index: denali.pro.user =================================================================== diff -u -r27331dcb133e4d400eef25d5595c3b277e79504c -r723c692a3a1de3b780d90bcc73a370beb22d73ab --- denali.pro.user (.../denali.pro.user) (revision 27331dcb133e4d400eef25d5595c3b277e79504c) +++ denali.pro.user (.../denali.pro.user) (revision 723c692a3a1de3b780d90bcc73a370beb22d73ab) @@ -1,6 +1,6 @@ - + EnvironmentId Index: sources/gui/qml/components/RangeSlider.qml =================================================================== diff -u -rfc329c788fe9453983072bee937ccbc95b4ed6e4 -r723c692a3a1de3b780d90bcc73a370beb22d73ab --- sources/gui/qml/components/RangeSlider.qml (.../RangeSlider.qml) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) +++ sources/gui/qml/components/RangeSlider.qml (.../RangeSlider.qml) (revision 723c692a3a1de3b780d90bcc73a370beb22d73ab) @@ -65,9 +65,9 @@ property bool minAdjusted : false ///< first time user adjustment happens property bool maxAdjusted : false ///< first time user adjustment happens - property bool hasAdjusted : false ///< if set to true then component is grayed out until both min and max are adjusted + property bool hasAdjust : false ///< if set to true then component is grayed out until both min and max are adjusted - onHasAdjustedChanged: { + onHasAdjustChanged : { setAdjusted() } onMinAdjustedChanged: { @@ -126,7 +126,7 @@ } /// - /// \brief grays out the rangebar and handler if not adjusted and hasAdjusted set to true + /// \brief grays out the rangebar and handler if not adjusted and hasAdjust set to true /// function setAdjusted() { function check() { @@ -139,7 +139,7 @@ _handlerLeft .color = Colors.createTreatmentActive _handlerRight.color = Colors.createTreatmentActive } - if ( ! hasAdjusted ) { + if ( ! hasAdjust ) { active() } else { Index: sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml =================================================================== diff -u -ra32a3170be06340e9a62ed93998758cf2cf266d3 -r723c692a3a1de3b780d90bcc73a370beb22d73ab --- sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml (.../PreTreatmentConnectionStack.qml) (revision a32a3170be06340e9a62ed93998758cf2cf266d3) +++ sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml (.../PreTreatmentConnectionStack.qml) (revision 723c692a3a1de3b780d90bcc73a370beb22d73ab) @@ -51,11 +51,12 @@ } Label { text : qsTr("Press START on Blood Pressure Measurement Cuff to display reading or enter vitals manually") - width : unitWidth - // height : Variables.notificationHeight - anchors.bottom: parent.bottom - anchors.bottomMargin: Variables.notificationHeight + Variables.minVGap - anchors.horizontalCenter: parent.horizontalCenter + width : parent.width + anchors { + bottom: parent.bottom + bottomMargin: Variables.notificationHeight + Variables.minVGap + horizontalCenter: parent.horizontalCenter + } } onConfirmClicked: { if ( _bphrEntry.isValid ) { Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml =================================================================== diff -u -rdb92783a0a9dab0ddf2b68c51d15b1ae1cb3ddcc -r723c692a3a1de3b780d90bcc73a370beb22d73ab --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision db92783a0a9dab0ddf2b68c51d15b1ae1cb3ddcc) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision 723c692a3a1de3b780d90bcc73a370beb22d73ab) @@ -215,15 +215,41 @@ onReleased : vTreatmentCreate.dialysateTemp = value } + // TODO : This has to be a Component Column { id: _arterialColumn spacing: 45 anchors.horizontalCenter: parent.horizontalCenter - Text { id: _arterialLabel - visible : true - color : Colors.textMain - text : qsTr("Arterial Pressure Limits") + " " + "(" + Variables.unitTextBloodPressure + ")" - font.pixelSize : Fonts.fontPixelFluidText - anchors.left : _arterialPressureLimits.left + Row { id: _arterialTitleRow + function setColor() { + let slider = _arterialPressureLimits + let color = Colors.textDisableButton + if ( slider.minAdjusted && slider.maxAdjusted ) { + // if ( ! slider.valid ) { + // color = Colors.createTreatmentInvalidParam + // return + // } + color = Colors.textMain + } + return color + } + width : parent.width + height : _arterialLabel.height + anchors.left: parent.left + Text { id: _arterialLabel + visible : true + width : parent.width/2 + color : _arterialTitleRow.setColor() + text : qsTr("Arterial Pressure Limits") + font.pixelSize : Fonts.fontPixelFluidText + } + Text { id: _arterialUnit + visible : true + width : parent.width/2 + color : _arterialLabel.color + text : Variables.unitTextBloodPressure + font.pixelSize : Fonts.fontPixelFluidText + horizontalAlignment: Text.AlignRight + } } RangeSlider { id: _arterialPressureLimits objectName : "_arterialPressureLimitsSlider" @@ -234,7 +260,7 @@ anchors.horizontalCenter: parent.horizontalCenter ticks : true stepSnap : true - hasAdjusted : true + hasAdjust : true // Texts lowerText.visible : true @@ -281,15 +307,41 @@ } } + // TODO : This has to be a Component Column { id: _venousColumn spacing: 45 anchors.horizontalCenter: parent.horizontalCenter - Text { id: _venousLabel - visible : true - color : Colors.textMain - text : qsTr("Venous Pressure Limits") + " " + "(" + Variables.unitTextBloodPressure + ")" - font.pixelSize : Fonts.fontPixelFluidText - anchors.left : _venousPressureLimits.left + Row { id: _venousTitleRow + function setColor() { + let slider = _venousPressureLimits + let color = Colors.textDisableButton + if ( slider.minAdjusted && slider.maxAdjusted ) { + // if ( ! slider.valid ) { + // color = Colors.createTreatmentInvalidParam + // return + // } + color = Colors.textMain + } + return color + } + width : parent.width + height : _venousLabel.height + anchors.left: parent.left + Text { id: _venousLabel + visible : true + width : parent.width/2 + color : _venousTitleRow.setColor() + text : qsTr("Venous Pressure Limits") + font.pixelSize : Fonts.fontPixelFluidText + } + Text { id: _venousUnit + visible : true + width : parent.width/2 + color : _venousTitleRow.setColor() + text : Variables.unitTextBloodPressure + font.pixelSize : Fonts.fontPixelFluidText + horizontalAlignment: Text.AlignRight + } } RangeSlider { id: _venousPressureLimits objectName: "_venousPressureLimitsSlider" @@ -300,7 +352,7 @@ anchors.horizontalCenter: parent.horizontalCenter ticks : true stepSnap : true - hasAdjusted : true + hasAdjust : true // Texts lowerText.visible : true Index: sources/view/VTreatmentCreate.h =================================================================== diff -u -r80250cfdbe58a3df17950d342212f155d52d3971 -r723c692a3a1de3b780d90bcc73a370beb22d73ab --- sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision 80250cfdbe58a3df17950d342212f155d52d3971) +++ sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision 723c692a3a1de3b780d90bcc73a370beb22d73ab) @@ -65,93 +65,93 @@ private: // mL/min - const quint32 bloodFlowRate_Def = 100 ; // PRS 30 const quint32 bloodFlowRate_Min = 100 ; // PRS 30 const quint32 bloodFlowRate_Max = 500 ; // PRS 30 const quint32 bloodFlowRate_Res = 25 ; // PRS 30 + const quint32 bloodFlowRate_Def = bloodFlowRate_Min ; // PRS 30 // mL/min - const quint32 dialysateFlowRate_Def = 100 ; // PRS 345 const quint32 dialysateFlowRate_Min = 100 ; // PRS 345 const quint32 dialysateFlowRate_Max = 600 ; // PRS 345 const quint32 dialysateFlowRate_Res = 50 ; // PRS 345 + const quint32 dialysateFlowRate_Def = dialysateFlowRate_Min ; // PRS 345 // minutes - const quint32 duration_Def = 60 ; // PRS 346 const quint32 duration_Min = 60 ; // PRS 346 const quint32 duration_Max = 480 ; // PRS 346 const quint32 duration_Res = 15 ; // PRS 346 + const quint32 duration_Def = duration_Min ; // PRS 346 // mL/hr (0 = off) - const qreal heparinDispensingRate_Def = 0.0 ; // PRS 347 const qreal heparinDispensingRate_Min = 0.0 ; // PRS 347 const qreal heparinDispensingRate_Max = 1.0 ; // PRS 347 const qreal heparinDispensingRate_Res = 0.1 ; // PRS 347 + const qreal heparinDispensingRate_Def = heparinDispensingRate_Min ; // PRS 347 // mL - const qreal heparinBolusVolume_Def = 0.0 ; // PRS 348 const qreal heparinBolusVolume_Min = 0.0 ; // PRS 348 const qreal heparinBolusVolume_Max = 2.0 ; // PRS 348 const qreal heparinBolusVolume_Res = 0.1 ; // PRS 348 + const qreal heparinBolusVolume_Def = heparinBolusVolume_Min ; // PRS 348 // min - const quint32 heparinStopTime_Def = 0 ; // PRS 464 const quint32 heparinStopTime_Min = 0 ; // PRS 464 const quint32 heparinStopTime_Max = 470 ; // PRS 464 const quint32 heparinStopTime_Res = 10 ; // PRS 464 + const quint32 heparinStopTime_Def = heparinStopTime_Min ; // PRS 464 // mL - const quint32 salineBolusVolume_Def = 100 ; // PRS 350 const quint32 salineBolusVolume_Min = 100 ; // PRS 350 const quint32 salineBolusVolume_Max = 300 ; // PRS 350 const quint32 salineBolusVolume_Res = 100 ; // PRS 350 + const quint32 salineBolusVolume_Def = salineBolusVolume_Min ; // PRS 350 const quint32 heparinType_Res = 1 ; // PRS ??? const quint32 acidConcentrate_Res = 1 ; // PRS 35 const quint32 bicarbonateConcentrate_Res = 1 ; // PRS 351 const quint32 dialyzerType_Res = 1 ; // PRS 352 // Celsius - const qreal dialysateTemp_Def = 37 ; // PRS 353 const qreal dialysateTemp_Min = 35 ; // PRS 353 const qreal dialysateTemp_Max = 38 ; // PRS 353 const qreal dialysateTemp_Res = 0.5 ; // PRS 353 + const qreal dialysateTemp_Def = dialysateTemp_Min ; // PRS 353 // mmHg - const qint32 arterialPressureLimitLow_Def = -300 ; // PRS 354 const qint32 arterialPressureLimitLow_Min = -300 ; // PRS 354 const qint32 arterialPressureLimitLow_Max = -30 ; // PRS 354 const qint32 arterialPressureLimitLow_Res = 10 ; // PRS 354 + const qint32 arterialPressureLimitLow_Def = arterialPressureLimitLow_Min ; // PRS 354 // mmHg - const qint32 arterialPressureLimitHigh_Def = 0 ; // PRS 355 const qint32 arterialPressureLimitHigh_Min = -270 ; // PRS 355 const qint32 arterialPressureLimitHigh_Max = 0 ; // PRS 355 const qint32 arterialPressureLimitHigh_Res = 10 ; // PRS 355 + const qint32 arterialPressureLimitHigh_Def = arterialPressureLimitHigh_Min ; // PRS 355 // mmHg - const qint32 venousPressureLimitLow_Def = 20 ; // PRS 356 const qint32 venousPressureLimitLow_Min = 20 ; // PRS 356 const qint32 venousPressureLimitLow_Max = 570 ; // PRS 356 const qint32 venousPressureLimitLow_Res = 10 ; // PRS 356 + const qint32 venousPressureLimitLow_Def = venousPressureLimitLow_Min ; // PRS 356 // mmHg - const qint32 venousPressureLimitHigh_Def = 400 ; // PRS 357 const qint32 venousPressureLimitHigh_Min = 50 ; // PRS 357 const qint32 venousPressureLimitHigh_Max = 600 ; // PRS 357 const qint32 venousPressureLimitHigh_Res = 10 ; // PRS 357 + const qint32 venousPressureLimitHigh_Def = venousPressureLimitHigh_Min ; // PRS 357 // min - const quint32 bloodPressureMeasureInterval_Def = 30 ; // PRS 358 const quint32 bloodPressureMeasureInterval_Min = 0 ; // PRS 358 const quint32 bloodPressureMeasureInterval_Max = 60 ; // PRS 358 const quint32 bloodPressureMeasureInterval_Res = 5 ; // PRS 358 + const quint32 bloodPressureMeasureInterval_Def = bloodPressureMeasureInterval_Min ; // PRS 358 // mL/min - const quint32 rinsebackFlowRate_Def = 75 ; // PRS 359 const quint32 rinsebackFlowRate_Min = 50 ; // PRS 359 const quint32 rinsebackFlowRate_Max = 150 ; // PRS 359 const quint32 rinsebackFlowRate_Res = 25 ; // PRS 359 + const quint32 rinsebackFlowRate_Def = rinsebackFlowRate_Min ; // PRS 359 enum ACID_ENUM { eAcidUnset = 9999,