Index: sources/gui/qml/pages/treatment/TreatmentTrends.qml =================================================================== diff -u -r77063e62e298a8e74321c714011364514dd54e4f -rcdf3731b3aa395afa89430e81b1076087f3a2776 --- sources/gui/qml/pages/treatment/TreatmentTrends.qml (.../TreatmentTrends.qml) (revision 77063e62e298a8e74321c714011364514dd54e4f) +++ sources/gui/qml/pages/treatment/TreatmentTrends.qml (.../TreatmentTrends.qml) (revision cdf3731b3aa395afa89430e81b1076087f3a2776) @@ -44,7 +44,7 @@ readonly property int paramAreaRightMargin : 5 readonly property int paramWidth : (_root.width - Variables.defaultMargin - labelWidth - scrollButtonWidth - paramAreaRightMargin - _expandButton.width) / 7 - readonly property int historyTimeWidth : 45 + readonly property int historyTimeWidth : 50 } component ScrollButton: TouchRect { id: _scrollButton @@ -412,11 +412,11 @@ } ValueText { id: _ufVolumeRemovedValue objectName : "_ufVolumeRemovedValue" - value : ufVolumeRemoved ? ufVolumeRemoved.toFixed(Variables.ultrafiltrationPrecision) : "--" + value : ufVolumeRemoved != undefined ? ufVolumeRemoved.toFixed(Variables.ultrafiltrationPrecision) : "--" } ValueText { id: _ufRateValue objectName : "_ufRateValue" - value : ufRate ? ufRate.toFixed(Variables.ultrafiltrationPrecision) : "--" + value : ufRate != undefined ? ufRate.toFixed(Variables.ultrafiltrationPrecision) : "--" } ValueText { id: _arterialPressureValue objectName : "_arterialPressureValue" Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml =================================================================== diff -u -r83f808d0f503ea847c27c1fbc65c2b95d2e5d6b0 -rcdf3731b3aa395afa89430e81b1076087f3a2776 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml (.../TreatmentAdjustmentVitals.qml) (revision 83f808d0f503ea847c27c1fbc65c2b95d2e5d6b0) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml (.../TreatmentAdjustmentVitals.qml) (revision cdf3731b3aa395afa89430e81b1076087f3a2776) @@ -179,15 +179,14 @@ Connections { target: vTreatmentVitals // On Timeout - Vitals Request function onDidTimeout () { + // interval set to OFF but 15 min default timer still running if ( ! vTreatmentVitals.interval ) { - // TODO: interval set to OFF but 15 min default timer still running return } - // On Timeout request vitas if BP cuff is enabled or shjow popup for manual entry + // On Timeout request vitals if BP cuff is enabled or show popup for manual entry if ( vTreatmentVitals.enableBPCuff ) { vTreatmentAdjustmentVitals.doRequest() - vTreatmentVitals.doTimerStart() } else { _root.open () Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitalsInterval.qml =================================================================== diff -u -rb12853c86ef9e517667516dc3e47bca07349cedf -rcdf3731b3aa395afa89430e81b1076087f3a2776 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitalsInterval.qml (.../TreatmentAdjustmentVitalsInterval.qml) (revision b12853c86ef9e517667516dc3e47bca07349cedf) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitalsInterval.qml (.../TreatmentAdjustmentVitalsInterval.qml) (revision cdf3731b3aa395afa89430e81b1076087f3a2776) @@ -31,7 +31,6 @@ function confirm() { vTreatmentCreate.bloodPressureMeasureInterval = vTreatmentRanges.bloodPressureMeasureInterval[_bpMeasurementIntervalControl.currentIndex] - vTreatmentVitals.doTimerStart() _root.close() } Index: sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp =================================================================== diff -u -r80b727733768477975addc967b3d6b04ed39e598 -rcdf3731b3aa395afa89430e81b1076087f3a2776 --- sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp (.../VCommonAdjustmentVitals.cpp) (revision 80b727733768477975addc967b3d6b04ed39e598) +++ sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp (.../VCommonAdjustmentVitals.cpp) (revision cdf3731b3aa395afa89430e81b1076087f3a2776) @@ -194,7 +194,6 @@ // trigger timeout when timer countdown is done if (totalSecLeft <= 1 ) { - timerStop(); emit didTimeout(); }