Index: sources/gui/qml/components/BaseComboBox.qml =================================================================== diff -u -rde099919f262c3429cb0592ef71deb6a16e92892 -rb12853c86ef9e517667516dc3e47bca07349cedf --- sources/gui/qml/components/BaseComboBox.qml (.../BaseComboBox.qml) (revision de099919f262c3429cb0592ef71deb6a16e92892) +++ sources/gui/qml/components/BaseComboBox.qml (.../BaseComboBox.qml) (revision b12853c86ef9e517667516dc3e47bca07349cedf) @@ -29,12 +29,14 @@ property int delegateWidth : dropDownWidth property int delegateHeight : height property bool canOff : false + property bool centerHorizontally: false + width : 300 displayText : _root.isActive ? currentText : Variables.emptyEntry currentIndex : 0 font.pixelSize : Fonts.fontPixelTextRectTitle - leftPadding : 30 + leftPadding : centerHorizontally || ! _root.isActive ? 30 : 10 signal clear() @@ -45,8 +47,10 @@ color : Colors.offWhite font.pixelSize : _root.isActive ? Fonts.fontPixelTextRectTitle : Fonts.fontPixelValueControl verticalAlignment : Text.AlignVCenter - horizontalAlignment : Text.AlignHCenter - rightPadding : _icon.width + horizontalAlignment : centerHorizontally || ! _root.isActive ? Text.AlignHCenter : undefined + rightPadding : _root.isActive ? 15 : 0 + clip : true + elide : Text.ElideRight } background: Rectangle { id: _background @@ -64,7 +68,9 @@ color : Colors.offWhite font : _root.font verticalAlignment : Text.AlignVCenter - horizontalAlignment : Text.AlignHCenter + horizontalAlignment : centerHorizontally ? Text.AlignHCenter : undefined + leftPadding : 10 + elide : Text.ElideRight } background: Rectangle { Index: sources/gui/qml/components/CloseButton.qml =================================================================== diff -u -rb88eb4be4b18985df3d35f249ee3847250e63a91 -rb12853c86ef9e517667516dc3e47bca07349cedf --- sources/gui/qml/components/CloseButton.qml (.../CloseButton.qml) (revision b88eb4be4b18985df3d35f249ee3847250e63a91) +++ sources/gui/qml/components/CloseButton.qml (.../CloseButton.qml) (revision b12853c86ef9e517667516dc3e47bca07349cedf) @@ -19,13 +19,11 @@ // Project import "qrc:/globals" -Rectangle { id : _root +Item { id : _root signal clicked() - width : 50 - height : 50 - color : "transparent" - opacity : 1 + width : Variables.iconsDiameter + height : Variables.iconsDiameter anchors { top : parent.top @@ -34,9 +32,8 @@ } Image { id : _image source : "qrc:/images/iClose" - width : _root.width - height : _root.height - anchors.centerIn: parent + fillMode: Image.PreserveAspectFit + anchors.fill: parent } MouseArea { anchors.fill: parent Index: sources/gui/qml/components/VitalsButton.qml =================================================================== diff -u -r9bd436782039b50ac45eb38f561a36706517271b -rb12853c86ef9e517667516dc3e47bca07349cedf --- sources/gui/qml/components/VitalsButton.qml (.../VitalsButton.qml) (revision 9bd436782039b50ac45eb38f561a36706517271b) +++ sources/gui/qml/components/VitalsButton.qml (.../VitalsButton.qml) (revision b12853c86ef9e517667516dc3e47bca07349cedf) @@ -29,12 +29,12 @@ } Text { id: _vitalCountdown - objectName: "vitalCountdown" + objectName: "_vitalCountdown" color : "gray" anchors { top : _root.bottom - topMargin : 5 * -1 + topMargin : -5 horizontalCenter: _root.horizontalCenter } horizontalAlignment : Text.AlignHCenter Index: sources/gui/qml/compounds/BPHREntry.qml =================================================================== diff -u -r2b0c62ca1a150e1a375ab388be076e17532cb20f -rb12853c86ef9e517667516dc3e47bca07349cedf --- sources/gui/qml/compounds/BPHREntry.qml (.../BPHREntry.qml) (revision 2b0c62ca1a150e1a375ab388be076e17532cb20f) +++ sources/gui/qml/compounds/BPHREntry.qml (.../BPHREntry.qml) (revision b12853c86ef9e517667516dc3e47bca07349cedf) @@ -54,10 +54,7 @@ text : qsTr("Blood Pressure") unitText : Variables.unitTextBloodPressure width : Variables.adjustmentLabelUnitContainerWidth - height : Variables.popupAdjustmentContainerHeight - titlePixelSize : Fonts.fontPixelContainerTitleSmall - unitPixelSize : Fonts.fontPixelContainerUnitSmall - titleLeftMargin : Variables.defaultMargin * 2 + height : Variables.adjustmentLabelUnitContainerHeight contentItem : Row { anchors.centerIn: parent @@ -107,10 +104,7 @@ text : qsTr("Heart Rate") unitText : Variables.unitTextHeartBeat width : Variables.adjustmentLabelUnitContainerWidth - height : Variables.popupAdjustmentContainerHeight - titlePixelSize : Fonts.fontPixelContainerTitleSmall - unitPixelSize : Fonts.fontPixelContainerUnitSmall - titleLeftMargin : Variables.defaultMargin * 2 + height : Variables.adjustmentLabelUnitContainerHeight contentItem : TextEntry { id: _heartRate text : Variables.notSetVariable(vTreatmentVitals.heartRate, 0) Index: sources/gui/qml/compounds/LabelUnitContainer.qml =================================================================== diff -u -r2b0c62ca1a150e1a375ab388be076e17532cb20f -rb12853c86ef9e517667516dc3e47bca07349cedf --- sources/gui/qml/compounds/LabelUnitContainer.qml (.../LabelUnitContainer.qml) (revision 2b0c62ca1a150e1a375ab388be076e17532cb20f) +++ sources/gui/qml/compounds/LabelUnitContainer.qml (.../LabelUnitContainer.qml) (revision b12853c86ef9e517667516dc3e47bca07349cedf) @@ -30,9 +30,6 @@ property bool valid : true property bool showUnit : true property bool showEdit : false - property int titlePixelSize : Fonts.fontPixelContainerTitle - property int unitPixelSize : Fonts.fontPixelContainerUnit - property int titleLeftMargin: Variables.defaultMargin height : cellHeight width : cellWidth @@ -50,21 +47,21 @@ anchors { verticalCenter : parent.verticalCenter left : parent.left - leftMargin : _root.titleLeftMargin + leftMargin : Variables.defaultMargin } spacing : 10 Text { id: _title anchors.verticalCenter : _titleRow.verticalCenter color : Colors.offWhite - font.pixelSize : _root.titlePixelSize + font.pixelSize : Fonts.fontPixelContainerTitle } Text { id: _unit anchors.bottom : _title.bottom text : ("(%1)").arg(_root.unitText) color : Colors.offWhite - font.pixelSize : _root.unitPixelSize + font.pixelSize : Fonts.fontPixelContainerUnit font.weight : Font.Thin visible : _root.showUnit } Index: sources/gui/qml/dialogs/AcidConcentrateAdjustment.qml =================================================================== diff -u -ree594afa3a2084c03395570954d723d04bbae215 -rb12853c86ef9e517667516dc3e47bca07349cedf --- sources/gui/qml/dialogs/AcidConcentrateAdjustment.qml (.../AcidConcentrateAdjustment.qml) (revision ee594afa3a2084c03395570954d723d04bbae215) +++ sources/gui/qml/dialogs/AcidConcentrateAdjustment.qml (.../AcidConcentrateAdjustment.qml) (revision b12853c86ef9e517667516dc3e47bca07349cedf) @@ -34,7 +34,6 @@ width : 1000 height : 600 - padding : Variables.defaultMargin onVisibleChanged: visible ? vTreatmentRanges.doPopulateAcidConcentrate( vTreatmentCreate.acidConcentrateSet, vTreatmentCreate.acidConcentrate) : notificationText = "" Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -r2b0c62ca1a150e1a375ab388be076e17532cb20f -rb12853c86ef9e517667516dc3e47bca07349cedf --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 2b0c62ca1a150e1a375ab388be076e17532cb20f) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision b12853c86ef9e517667516dc3e47bca07349cedf) @@ -194,7 +194,6 @@ readonly property int adjustmentLabelUnitContainerHeight : 75 readonly property int adjustmentLabelUnitContainerWidth : 720 - readonly property int popupAdjustmentContainerHeight : 65 readonly property real sliderDefaultRoundTickMarkDiameter : 5 readonly property int sliderDefaultBodyHeight : 15 Index: sources/gui/qml/main.qml =================================================================== diff -u -r0be698733fd4570240a91703978fee7d53a76121 -rb12853c86ef9e517667516dc3e47bca07349cedf --- sources/gui/qml/main.qml (.../main.qml) (revision 0be698733fd4570240a91703978fee7d53a76121) +++ sources/gui/qml/main.qml (.../main.qml) (revision b12853c86ef9e517667516dc3e47bca07349cedf) @@ -194,7 +194,7 @@ VTreatmentBloodFlow { id: vTreatmentBloodFlow } VTreatmentVitals { id: vTreatmentVitals interval : vTreatmentCreate.bloodPressureMeasureInterval - canStartInterval: vTreatmentCreate.parametersConfirmed + canStartInterval: vTDOpMode.inTreatment && vTDTreatmentStates.txTreatment enableBPCuff : true // TODO: PRS 343 update with enable/disable Integrated Blood Pressure Cuff onCanStartIntervalChanged : { if ( vTreatmentVitals.canStartInterval ) { vTreatmentVitals.doTimerStart() } Index: sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml =================================================================== diff -u -r477c26a4e1dcbdf7ad0f29ae7a1df4738d4dcce2 -rb12853c86ef9e517667516dc3e47bca07349cedf --- sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml (.../PreTreatmentConnectionStack.qml) (revision 477c26a4e1dcbdf7ad0f29ae7a1df4738d4dcce2) +++ sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml (.../PreTreatmentConnectionStack.qml) (revision b12853c86ef9e517667516dc3e47bca07349cedf) @@ -82,11 +82,11 @@ } } - Connections { target: vTreatmentVitals - function onDidTrigger ( vSystolic, vDiastolic, vHeartRate ) { - _preTreatmentVitals.update( vSystolic, vDiastolic, vHeartRate ) - } - } +// Connections { target: vTreatmentVitals +// function onDidTrigger ( vSystolic, vDiastolic, vHeartRate ) { +// _preTreatmentVitals.update( vSystolic, vDiastolic, vHeartRate ) +// } +// } } SettingsBluetoothCuff { id: _settingsBluetoothPage Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml =================================================================== diff -u -rde099919f262c3429cb0592ef71deb6a16e92892 -rb12853c86ef9e517667516dc3e47bca07349cedf --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml (.../PreTreatmentCreateContent.qml) (revision de099919f262c3429cb0592ef71deb6a16e92892) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml (.../PreTreatmentCreateContent.qml) (revision b12853c86ef9e517667516dc3e47bca07349cedf) @@ -513,11 +513,17 @@ enabled : _root.editingEnabled currentIndex : vTreatmentRanges.bloodPressureMeasureInterval.indexOf(vTreatmentCreate.bloodPressureMeasureInterval.toString()) model : vTreatmentRanges.bloodPressureMeasureInterval - onClear : vTreatmentCreate.bloodPressureMeasureIntervalSet = false canOff : true + centerHorizontally : true + onClear : { + vTreatmentCreate.bloodPressureMeasureIntervalSet = false + } + onActivated : { - if ( ! _bpMeasurementInterval.valid ) { vTreatmentCreate.bloodPressureMeasureIntervalRejectReason = Variables.noRejectReason } + if ( ! _bpMeasurementInterval.valid ) { + vTreatmentCreate.bloodPressureMeasureIntervalRejectReason = Variables.noRejectReason + } vTreatmentCreate.bloodPressureMeasureInterval = vTreatmentRanges.bloodPressureMeasureInterval[_bpMeasurementIntervalControl.currentIndex] vTreatmentCreate.bloodPressureMeasureIntervalSet = true } Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml =================================================================== diff -u -r0be698733fd4570240a91703978fee7d53a76121 -rb12853c86ef9e517667516dc3e47bca07349cedf --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml (.../TreatmentAdjustmentVitals.qml) (revision 0be698733fd4570240a91703978fee7d53a76121) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml (.../TreatmentAdjustmentVitals.qml) (revision b12853c86ef9e517667516dc3e47bca07349cedf) @@ -31,7 +31,7 @@ Math.round((Variables.applicationWidth - width) / 2) notification.textfontSize : 20 notification.visible : vTreatmentVitals.lastRead || vTreatmentAdjustmentVitals.adjustment_ReasonText - notification.anchors.rightMargin: numPad.isOpened ? 10 : 0 + notification.anchors.rightMargin: numPad.isOpened ? 10 : 0 // fix margins when numpad is open and notifiction is displayed backgroundItemZ : numPad.isOpened ? 0 : -1 backgroundItem : [ NumPad { id: _numPad @@ -73,7 +73,9 @@ vTreatmentVitals.doTimerStop() } - onClosed: vTreatmentVitals.doTimerStart() + onClosed: { + vTreatmentVitals.doTimerStart() + } onCloseClicked: { numPad.hide() @@ -156,7 +158,7 @@ text { text : qsTr("Measure Vitals") font.pixelSize : Fonts.fontPixelConfirm - font.weight : Font.Medium + font.weight : Font.Medium } onClicked: vTreatmentAdjustmentVitals.doRequest() @@ -166,14 +168,22 @@ } Connections { target: vTreatmentVitals - // Vitals Request + // On Timeout - Vitals Request function onDidTimeout () { - vTreatmentAdjustmentVitals.doRequest() - vTreatmentVitals.doTimerStart() + if ( vTreatmentVitals.enableBPCuff ) { + vTreatmentAdjustmentVitals.doRequest() + vTreatmentVitals.doTimerStart() + } + else { + _root.open () + _bphrEntry.systolic = "" + _bphrEntry.diastolic = "" + _bphrEntry.heartRate = "" + } } // Vitals Reading Ready - function onDidTrigger() { + function onAdjustmentTriggered ( vValue ) { _root.update ( vTreatmentVitals.systolic__rt, vTreatmentVitals.diastolic_rt, vTreatmentVitals.heartRate_rt ) _root.confirm() } @@ -184,7 +194,7 @@ function onAdjustmentTriggered ( vValue ) { // on rejected prompt user to enter vitals manually if ( ! vTreatmentAdjustmentVitals.adjustment_Accepted ) { - _root.open () + _root.open () _bphrEntry.systolic = "" _bphrEntry.diastolic = "" _bphrEntry.heartRate = "" Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitalsInterval.qml =================================================================== diff -u -r0be698733fd4570240a91703978fee7d53a76121 -rb12853c86ef9e517667516dc3e47bca07349cedf --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitalsInterval.qml (.../TreatmentAdjustmentVitalsInterval.qml) (revision 0be698733fd4570240a91703978fee7d53a76121) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitalsInterval.qml (.../TreatmentAdjustmentVitalsInterval.qml) (revision b12853c86ef9e517667516dc3e47bca07349cedf) @@ -49,9 +49,6 @@ valid : ! vTreatmentCreate.bloodPressureMeasureIntervalRejectReason width : Variables.adjustmentLabelUnitContainerWidth height : Variables.adjustmentLabelUnitContainerHeight - titlePixelSize : Fonts.fontPixelContainerTitleSmall - unitPixelSize : Fonts.fontPixelContainerUnitSmall - titleLeftMargin : Variables.defaultMargin * 2 contentItem : BaseComboBox { id: _bpMeasurementIntervalControl anchors.rightMargin : Variables.defaultMargin * 2 @@ -61,11 +58,17 @@ isActive : vTreatmentCreate.bloodPressureMeasureIntervalSet currentIndex : vTreatmentRanges.bloodPressureMeasureInterval.indexOf(vTreatmentCreate.bloodPressureMeasureInterval.toString()) model : vTreatmentRanges.bloodPressureMeasureInterval - onClear : vTreatmentCreate.bloodPressureMeasureIntervalSet = false canOff : true + centerHorizontally : true + onClear : { + vTreatmentCreate.bloodPressureMeasureIntervalSet = false + } + onActivated : { - if ( ! _bpMeasurementInterval.valid ) { vTreatmentCreate.bloodPressureMeasureIntervalRejectReason = Variables.noRejectReason } + if ( ! _bpMeasurementInterval.valid ) { + vTreatmentCreate.bloodPressureMeasureIntervalRejectReason = Variables.noRejectReason + } vTreatmentCreate.bloodPressureMeasureIntervalSet = true } } Index: sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp =================================================================== diff -u -r1a09b69b2f9dc655ddadc737fbc19bc6a9637c40 -rb12853c86ef9e517667516dc3e47bca07349cedf --- sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp (.../VCommonAdjustmentVitals.cpp) (revision 1a09b69b2f9dc655ddadc737fbc19bc6a9637c40) +++ sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp (.../VCommonAdjustmentVitals.cpp) (revision b12853c86ef9e517667516dc3e47bca07349cedf) @@ -28,8 +28,6 @@ * \details All the class signal/slot connections are defined here. */ void View::VTreatmentVitals::initConnections() { - connect(this, SIGNAL( intervalChanged (const quint8 &)), - this, SLOT(onIntervalChanged ( ))); ACTION_VIEW_CONNECTION( TreatmentVitalsData ); } @@ -47,7 +45,7 @@ .arg(vData.mSystolic ) .arg(vData.mDiastolic) .arg(vData.mHeartRate)); - emit didTrigger(); + adjustment ( true ); } /*! @@ -164,15 +162,6 @@ } /*! - * \brief View::VTreatmentVitals::onIntervalChanged - * \details Resets or stops the timer depending on whether an interval - * is currently set. - */ -void View::VTreatmentVitals::onIntervalChanged() -{ -} - -/*! * \brief View::VTreatmentVitals::start * \details Starts the timer by 1 min interval * \note the vital times are all minutes. Index: sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h =================================================================== diff -u -r1a09b69b2f9dc655ddadc737fbc19bc6a9637c40 -rb12853c86ef9e517667516dc3e47bca07349cedf --- sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h (.../VCommonAdjustmentVitals.h) (revision 1a09b69b2f9dc655ddadc737fbc19bc6a9637c40) +++ sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h (.../VCommonAdjustmentVitals.h) (revision b12853c86ef9e517667516dc3e47bca07349cedf) @@ -70,6 +70,8 @@ PROPERTY( quint16 , diastolic_rt , 0) PROPERTY( quint16 , heartRate_rt , 0) + TRIGGER( bool , adjustment , 0 ) + VIEW_DEC(VTreatmentVitals, TreatmentVitalsData) void update (quint16 vSystolic, quint16 vDiastolic, quint16 vHeartRate); @@ -84,9 +86,6 @@ void timerEvent(QTimerEvent *) override; -private slots: - void onIntervalChanged(); - public slots: // vitals void doConfirm (quint16 vSystolic, quint16 vDiastolic, quint16 vHeartRate); @@ -98,14 +97,7 @@ void doTimerStop () { timerStop (); } signals: - /*! - * \brief didTrigger - * \details the signal to trigger the Gui to notify the user for the vitals measurement - */ - void didTrigger(); - - /*! * \brief didTimeout * \details the signal to trigger the Gui to notify the user for time has timed out */