Index: leahi.qrc
===================================================================
diff -u -r0726161fc14b31f239da1ad98eadb9f9baca9638 -r23f8a6036e22f80c3c5fd2834a2980bb62d2a34d
--- leahi.qrc (.../leahi.qrc) (revision 0726161fc14b31f239da1ad98eadb9f9baca9638)
+++ leahi.qrc (.../leahi.qrc) (revision 23f8a6036e22f80c3c5fd2834a2980bb62d2a34d)
@@ -88,6 +88,7 @@
sources/gui/qml/components/TitleText.qml
sources/gui/qml/components/ImageLogoD.qml
sources/gui/qml/components/ScreenItem.qml
+ sources/gui/qml/components/IconButton.qml
sources/gui/qml/components/StackItem.qml
sources/gui/qml/components/ModalDialog.qml
sources/gui/qml/components/BackButton.qml
@@ -229,7 +230,6 @@
sources/gui/qml/pages/treatment/TreatmentUltrafiltrationItem.qml
sources/gui/qml/pages/treatment/TreatmentSection.qml
sources/gui/qml/pages/treatment/TreatmentSectionHeader.qml
- sources/gui/qml/pages/treatment/TreatmentSectionIcon.qml
sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml
Index: sources/gui/qml/components/Circle.qml
===================================================================
diff -u -r7caa737179a8c31825ae6445f593ac7ff5f95080 -r23f8a6036e22f80c3c5fd2834a2980bb62d2a34d
--- sources/gui/qml/components/Circle.qml (.../Circle.qml) (revision 7caa737179a8c31825ae6445f593ac7ff5f95080)
+++ sources/gui/qml/components/Circle.qml (.../Circle.qml) (revision 23f8a6036e22f80c3c5fd2834a2980bb62d2a34d)
@@ -16,7 +16,6 @@
// Qt
import QtQuick 2.12
import QtQuick.Shapes 1.12
-import QtGraphicalEffects 1.0
// Project
@@ -30,7 +29,6 @@
Item { id: _root
property alias thickness : _path.strokeWidth
property alias color : _path.strokeColor
- property alias shape : _shape
property alias shadow : _rectangle.border
property int shadowEdge : 1
property alias fillColor : _rectangle.color
@@ -41,9 +39,7 @@
property real diameter : Variables.circleNormalDiameter
- property bool showGradient : false
property bool runAnimation : false
- property color startGradientColor : _root.color
width : diameter
height : diameter
@@ -79,32 +75,6 @@
}
}
- ConicalGradient { id: borderGradient
-
- anchors.fill: _shape
- angle : -7
- source : _shape
-
- gradient: Gradient {
- GradientStop { position: 0.0; color: showGradient ? _root.startGradientColor :
- _root.color }
- GradientStop { position: 1.0; color: _root.color }
- }
- }
-
- OpacityAnimator { target: borderGradient
- from : 0.2
- to : 1
- duration : 1000
- running : ! runAnimation
- onFinished : {
- var tmp = from
- from = to
- to = tmp
- ! runAnimation ? restart() : target.opacity = 1
- }
- }
-
OpacityAnimator { target: _shape
from : 0.2
to : 1
Index: sources/gui/qml/components/IconButton.qml
===================================================================
diff -u
--- sources/gui/qml/components/IconButton.qml (revision 0)
+++ sources/gui/qml/components/IconButton.qml (revision 23f8a6036e22f80c3c5fd2834a2980bb62d2a34d)
@@ -0,0 +1,39 @@
+/*!
+ *
+ * Copyright (c) 2019-2025 Diality Inc. - All Rights Reserved.
+ * \copyright
+ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+ *
+ * \file MonitorItem.qml
+ * \author (last) Nico Ramirez
+ * \date (last) 27-Jun-2025
+ * \author (original) Nico Ramirez
+ * \date (original) 27-Jun-2025
+ *
+ */
+
+// Qt
+import QtQuick 2.12
+
+import "qrc:/globals"
+import "qrc:/components"
+
+TouchRect { id : _icon
+ property alias iconImage : _iconImage
+ property int iconSize : Variables.iconButtonSize
+
+ width : iconSize + 20
+ height : iconSize + 20
+ radius : height
+ border.color: "transparent"
+ color : "transparent"
+
+ Image { id : _iconImage
+ anchors.centerIn: parent
+ height : iconSize
+ width : iconSize
+ fillMode: Image.PreserveAspectFit
+ source : ""
+ }
+}
Index: sources/gui/qml/components/ModalDialog.qml
===================================================================
diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r23f8a6036e22f80c3c5fd2834a2980bb62d2a34d
--- sources/gui/qml/components/ModalDialog.qml (.../ModalDialog.qml) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1)
+++ sources/gui/qml/components/ModalDialog.qml (.../ModalDialog.qml) (revision 23f8a6036e22f80c3c5fd2834a2980bb62d2a34d)
@@ -62,6 +62,7 @@
if (autoHide && visible) {
_autoHideAnimation.start()
}
+ dimBackground.visible = _root.visible
}
NumberAnimation { id: _autoHideAnimation
Index: sources/gui/qml/components/NotificationBarSmall.qml
===================================================================
diff -u -rdff9d50ebfa80ec99313586e1d48662b72940d24 -r23f8a6036e22f80c3c5fd2834a2980bb62d2a34d
--- sources/gui/qml/components/NotificationBarSmall.qml (.../NotificationBarSmall.qml) (revision dff9d50ebfa80ec99313586e1d48662b72940d24)
+++ sources/gui/qml/components/NotificationBarSmall.qml (.../NotificationBarSmall.qml) (revision 23f8a6036e22f80c3c5fd2834a2980bb62d2a34d)
@@ -25,10 +25,11 @@
Rectangle { id: _root
objectName: "NotificationBar" // SquishQt
- property alias image : _image
property alias imageSource : _image.source
property bool imageAutoSize : false
property bool imageAnimated : false
+ property int imageDiameter : Variables.notificationIconDiameter
+ property int imageTopMargin : 0
property alias text : _text.text
property alias textColor : _text.color
@@ -53,11 +54,11 @@
anchors.centerIn: parent
spacing: 10
Image { id: _image
- width : source == "" ? 0 : imageAutoSize ? Math.min(_root.height, _root.width) : Variables.notificationIconDiameter
- height: source == "" ? 0 : imageAutoSize ? Math.min(_root.height, _root.width) : Variables.notificationIconDiameter
+ width : source == "" ? 0 : imageAutoSize ? Math.min(_root.height, _root.width) : _root.imageDiameter
+ height: source == "" ? 0 : imageAutoSize ? Math.min(_root.height, _root.width) : _root.imageDiameter
anchors.verticalCenter : imageAutoSize ? parent.verticalCenter : undefined
anchors.top : imageAutoSize ? undefined : parent.top
- anchors.topMargin : height > _root.height ? -((height - _root.height) / 2) : 0
+ anchors.topMargin : height > _root.height ? -((height - _root.height) / 2) : imageTopMargin
}
Text { id: _text
color : Colors.textNotificationNoneFg
Index: sources/gui/qml/components/ProgressBar.qml
===================================================================
diff -u -rdff9d50ebfa80ec99313586e1d48662b72940d24 -r23f8a6036e22f80c3c5fd2834a2980bb62d2a34d
--- sources/gui/qml/components/ProgressBar.qml (.../ProgressBar.qml) (revision dff9d50ebfa80ec99313586e1d48662b72940d24)
+++ sources/gui/qml/components/ProgressBar.qml (.../ProgressBar.qml) (revision 23f8a6036e22f80c3c5fd2834a2980bb62d2a34d)
@@ -15,6 +15,7 @@
// Qt
import QtQuick 2.12
+import QtGraphicalEffects 1.15
// Project
// Qml imports
@@ -36,12 +37,11 @@
property alias marker : _marker
property alias markerHeight : _marker.height
property string unitText : ""
+ property bool showMarker : true
property alias decimal : _root.decimal
property alias minimum : _root.minimum
property alias maximum : _root.maximum
- property color gradientStart : _root.color
- property color gradientEnd : _root.color
signal progressClicked()
@@ -51,7 +51,7 @@
maximum : 0
minText.visible : true
- maxText.visible : true
+ maxText.visible : true
// Since this Component is the base Component of the ProgressBarEx
// we need to use the z order
@@ -63,8 +63,6 @@
minimum : _root.minimum
maximum : _root.maximum
value : _root.value
- gradientStart : _root.gradientStart
- gradientEnd : _root.gradientEnd
onClicked : progressClicked()
}
@@ -81,5 +79,6 @@
decimal : _root.decimal
value : _root.value
+ visible : _root.showMarker
}
}
Index: sources/gui/qml/components/ProgressBarEx.qml
===================================================================
diff -u -r7caa737179a8c31825ae6445f593ac7ff5f95080 -r23f8a6036e22f80c3c5fd2834a2980bb62d2a34d
--- sources/gui/qml/components/ProgressBarEx.qml (.../ProgressBarEx.qml) (revision 7caa737179a8c31825ae6445f593ac7ff5f95080)
+++ sources/gui/qml/components/ProgressBarEx.qml (.../ProgressBarEx.qml) (revision 23f8a6036e22f80c3c5fd2834a2980bb62d2a34d)
@@ -34,8 +34,6 @@
minText.visible : true
maxText.visible : true
- radius : height
- progressRadius : radius
ProgressRect { id: _progressRectEx
z : 0 // ProgressBarEx z order in the gui
@@ -45,19 +43,10 @@
minimum : _root.minimum
maximum : _root.maximum
value : _root.valueEx
+ color : Colors.highlightMedProgressBar
margin : 0
maxText.visible : visible
onClicked : extraClicked()
}
-
- Rectangle { id: _rightBackground // to match design and get the right end of progress bar straight edged and not rounded
- property int percent: ((value / (maximum - minimum)) * 100)
-
- color : gradientEnd
- height : parent.height
- width : percent < 3 ? 2 : 8
- anchors.right : progress.right
- visible : percent > 3
- }
}
Index: sources/gui/qml/components/ProgressCircle.qml
===================================================================
diff -u -r68757118f0b5dc5d831f8330ff3fec40dc461aa9 -r23f8a6036e22f80c3c5fd2834a2980bb62d2a34d
--- sources/gui/qml/components/ProgressCircle.qml (.../ProgressCircle.qml) (revision 68757118f0b5dc5d831f8330ff3fec40dc461aa9)
+++ sources/gui/qml/components/ProgressCircle.qml (.../ProgressCircle.qml) (revision 23f8a6036e22f80c3c5fd2834a2980bb62d2a34d)
@@ -28,9 +28,12 @@
property int maximum : 0
property int value : minimum
property alias diameter : _circle.diameter
- property alias thickness : _circle.thickness
- property color color : Colors.borderButton
- property alias circle : _circle
+ property alias thickness: _circle.thickness
+ property color color : _circle.runAnimation ? Colors.borderButton :
+ Colors.pauseColor
+ property color circleShadowColor : Colors.backgroundMainMenu
+ property color circleFillColor : Colors.transparent
+ property alias runAnimation : _circle.runAnimation
width : _circle.width
height : _circle.height
@@ -42,8 +45,9 @@
Circle { id: _circle
anchors.centerIn: parent
color : _root.color
- shadow.color : Colors.backgroundMainMenu
+ shadow.color : _root.circleShadowColor
angle : _private.value
thickness : 2
+ fillColor : _root.circleFillColor
}
}
Index: sources/gui/qml/components/ProgressRect.qml
===================================================================
diff -u -r622129c7f05af77f361d7e055eb7bcccaba1a0f9 -r23f8a6036e22f80c3c5fd2834a2980bb62d2a34d
--- sources/gui/qml/components/ProgressRect.qml (.../ProgressRect.qml) (revision 622129c7f05af77f361d7e055eb7bcccaba1a0f9)
+++ sources/gui/qml/components/ProgressRect.qml (.../ProgressRect.qml) (revision 23f8a6036e22f80c3c5fd2834a2980bb62d2a34d)
@@ -28,15 +28,7 @@
RangeRect { id: _root
property real value : 0
property real margin : Variables.progressbarRectMargin
- property color gradientStart : _root.color
- property color gradientEnd : _root.color
- gradient: Gradient {
- orientation : Gradient.Horizontal
- GradientStop { position: 0.0; color: gradientStart}
- GradientStop { position: 1.0; color: gradientEnd }
- }
-
QtObject { id: _private
property int length: if ( value < minimum ) {
0
Index: sources/gui/qml/components/RangeBar.qml
===================================================================
diff -u -rdff9d50ebfa80ec99313586e1d48662b72940d24 -r23f8a6036e22f80c3c5fd2834a2980bb62d2a34d
--- sources/gui/qml/components/RangeBar.qml (.../RangeBar.qml) (revision dff9d50ebfa80ec99313586e1d48662b72940d24)
+++ sources/gui/qml/components/RangeBar.qml (.../RangeBar.qml) (revision 23f8a6036e22f80c3c5fd2834a2980bb62d2a34d)
@@ -31,7 +31,6 @@
property int upperBound : 0
property alias rangebar : _rangeRect
- property alias marker : _rangeMarkerValue
QtObject { id: _private
property int val : isOutLower ? min : isOutUpper ? max : value
Index: sources/gui/qml/dialogs/AutoHideInfo.qml
===================================================================
diff -u -r8fa24e534368d2baad16f262d31630996798977f -r23f8a6036e22f80c3c5fd2834a2980bb62d2a34d
--- sources/gui/qml/dialogs/AutoHideInfo.qml (.../AutoHideInfo.qml) (revision 8fa24e534368d2baad16f262d31630996798977f)
+++ sources/gui/qml/dialogs/AutoHideInfo.qml (.../AutoHideInfo.qml) (revision 23f8a6036e22f80c3c5fd2834a2980bb62d2a34d)
@@ -30,14 +30,17 @@
contentItem.objectName: "AutoHideInfoDialog" //SquishQt testability
property string message : ""
- property alias text : _titleText
+ property int fontSize : Fonts.fontPixelTitle
+ property int verticalOffset : 0
autoHide: true
TitleText { id: _titleText
anchors.centerIn: parent
+ anchors.verticalCenterOffset: _root.verticalOffset
width: parent.width
text: message
+ font.pixelSize: _root.fontSize
}
function showDialog(vMessage, vDuration) {
Index: sources/gui/qml/globals/Colors.qml
===================================================================
diff -u -r36a488a3d29449ffedfe364d0031ed74d03c0ae0 -r23f8a6036e22f80c3c5fd2834a2980bb62d2a34d
--- sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 36a488a3d29449ffedfe364d0031ed74d03c0ae0)
+++ sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 23f8a6036e22f80c3c5fd2834a2980bb62d2a34d)
@@ -56,8 +56,8 @@
readonly property color highlightProgressBar : "#3d8eef"
readonly property color highlightMedProgressBar : "#1b2b3e"
readonly property color textProgressBar : "#88a3c5"
- readonly property color progressBarGradientStart : "#12949D"
- readonly property color progressBarGradientEnd : "#73D8DF"
+ readonly property color progressBarSaline : "#73D8DF"
+ readonly property color progressBarUltrafiltration : "#67ACFF"
readonly property color textRangeMarker : white
readonly property color rangeMarker : white
@@ -77,6 +77,7 @@
readonly property color boderSeparatorLine : "#476982"
readonly property color borderDialog : transparent // different colors for different displays // "#D01A344D" // "#D00F0F0F" //"#F51A344D"
readonly property color buttonDisableColor : "#515050"
+ readonly property color pauseColor : "#9B864E"
readonly property color touchTextAreaTitle : "#a0b6d0"
Index: sources/gui/qml/globals/Variables.qml
===================================================================
diff -u -r36a488a3d29449ffedfe364d0031ed74d03c0ae0 -r23f8a6036e22f80c3c5fd2834a2980bb62d2a34d
--- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 36a488a3d29449ffedfe364d0031ed74d03c0ae0)
+++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 23f8a6036e22f80c3c5fd2834a2980bb62d2a34d)
@@ -55,7 +55,7 @@
readonly property int arrowHeight : 16
readonly property int alarmListIconDiameter : 45
- readonly property int treatmentSectionIconSize : 35
+ readonly property int iconButtonSize : 35
readonly property int borderWidth : 2
Index: sources/gui/qml/main.qml
===================================================================
diff -u -r8fa24e534368d2baad16f262d31630996798977f -r23f8a6036e22f80c3c5fd2834a2980bb62d2a34d
--- sources/gui/qml/main.qml (.../main.qml) (revision 8fa24e534368d2baad16f262d31630996798977f)
+++ sources/gui/qml/main.qml (.../main.qml) (revision 23f8a6036e22f80c3c5fd2834a2980bb62d2a34d)
@@ -261,8 +261,8 @@
Background {}
Rectangle {
- id: menuBlurredBackground
- objectName: "menuBlurredBackground"
+ id: dimBackground
+ objectName: "dimBackground"
color: "black"
anchors.fill: parent
z: 3
@@ -480,6 +480,7 @@
isSilenced : _alarmItem.isSilenced
timeout : _alarmItem.timeout
backgroundFading : vTDOpMode.fault
+ z : 995
}
GuiView { id: _GuiView
Index: sources/gui/qml/pages/treatment/TreatmentHome.qml
===================================================================
diff -u -r36a488a3d29449ffedfe364d0031ed74d03c0ae0 -r23f8a6036e22f80c3c5fd2834a2980bb62d2a34d
--- sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision 36a488a3d29449ffedfe364d0031ed74d03c0ae0)
+++ sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision 23f8a6036e22f80c3c5fd2834a2980bb62d2a34d)
@@ -15,7 +15,6 @@
// Qt
import QtQuick 2.12
-import QtGraphicalEffects 1.12
// Project
@@ -51,18 +50,16 @@
objectName : "lockDialog"
width: 600
- height: 600
+ height: 400
backgroundColor: "#091E31"
- text.font.pixelSize: 35
- onVisibleChanged: {
- menuBlurredBackground.visible = _lockDialog.visible
- }
+ fontSize: 35
+ verticalOffset: Variables.defaultMargin * 5
Rectangle { id: _mainCircle
objectName: "lockDialogMainCircle"
anchors {
top: parent.top
- topMargin: Variables.defaultMargin * 3
+ topMargin: Variables.defaultMargin * 2
horizontalCenter: parent.horizontalCenter
}
height : 200
@@ -137,7 +134,6 @@
height: cellHeight
onEditClicked: sectionVitalsClicked()
- // TODO: Keep????
Text { id: _vitalCountdown
objectName: "vitalCountdown"
Index: sources/gui/qml/pages/treatment/TreatmentSectionHeader.qml
===================================================================
diff -u -r8fa24e534368d2baad16f262d31630996798977f -r23f8a6036e22f80c3c5fd2834a2980bb62d2a34d
--- sources/gui/qml/pages/treatment/TreatmentSectionHeader.qml (.../TreatmentSectionHeader.qml) (revision 8fa24e534368d2baad16f262d31630996798977f)
+++ sources/gui/qml/pages/treatment/TreatmentSectionHeader.qml (.../TreatmentSectionHeader.qml) (revision 23f8a6036e22f80c3c5fd2834a2980bb62d2a34d)
@@ -50,7 +50,7 @@
color: Colors.textTextRectLabel
}
- TreatmentSectionIcon { id : _lockButton
+ IconButton { id : _lockButton
anchors {
verticalCenter : _title.verticalCenter
right : _editButton.left
@@ -65,7 +65,7 @@
}
}
- TreatmentSectionIcon { id : _editButton
+ IconButton { id : _editButton
anchors {
verticalCenter : _title.verticalCenter
right : parent.right
Fisheye: Tag 23f8a6036e22f80c3c5fd2834a2980bb62d2a34d refers to a dead (removed) revision in file `sources/gui/qml/pages/treatment/TreatmentSectionIcon.qml'.
Fisheye: No comparison available. Pass `N' to diff?
Index: sources/gui/qml/pages/treatment/TreatmentStack.qml
===================================================================
diff -u -r36a488a3d29449ffedfe364d0031ed74d03c0ae0 -r23f8a6036e22f80c3c5fd2834a2980bb62d2a34d
--- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 36a488a3d29449ffedfe364d0031ed74d03c0ae0)
+++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 23f8a6036e22f80c3c5fd2834a2980bb62d2a34d)
@@ -59,8 +59,8 @@
MainMenu { id: _treatmentMenu
position : MainMenu.Position.Top
hidden : true
- titles : [ qsTr("Treatment") ]
- visibleItems : [ true ]
+ titles : [ qsTr("Treatment") , qsTr("Trends") , qsTr("Heparin")]
+ visibleItems : [ true , false , false ]
spacing : Variables.defaultMargin
leftPdding : Variables.headerBarDateTimeWidth + Variables.columnSpacing // 200 + 60
partitionWidth : 80 * titles.length// Todo Important : max width should be the width for all bottons
Index: sources/gui/qml/pages/treatment/sections/TreatmentFlowsComponent.qml
===================================================================
diff -u -r36a488a3d29449ffedfe364d0031ed74d03c0ae0 -r23f8a6036e22f80c3c5fd2834a2980bb62d2a34d
--- sources/gui/qml/pages/treatment/sections/TreatmentFlowsComponent.qml (.../TreatmentFlowsComponent.qml) (revision 36a488a3d29449ffedfe364d0031ed74d03c0ae0)
+++ sources/gui/qml/pages/treatment/sections/TreatmentFlowsComponent.qml (.../TreatmentFlowsComponent.qml) (revision 23f8a6036e22f80c3c5fd2834a2980bb62d2a34d)
@@ -1,7 +1,6 @@
// Qt
import QtQuick 2.12
-import QtGraphicalEffects 1.12
// Project
@@ -24,8 +23,8 @@
color : Colors.mainTreatmentLighterBlue
radius : 5
- signal increment
- signal decrement
+ signal increment()
+ signal decrement()
Text { id: _title
objectName: "title"
@@ -118,15 +117,4 @@
color : "orange"
horizontalAlignment : Text.AlignHCenter
}
-
- layer.enabled : _root.dropShadowEnabled
- layer.effect : DropShadow { id: _dropShadow
- horizontalOffset: 3
- verticalOffset : 3
- radius : 3.0
- samples : 7
- color : "#50000000"
- source : _root
- anchors.fill : _root
- }
}
Index: sources/gui/qml/pages/treatment/sections/TreatmentPressureComponent.qml
===================================================================
diff -u -r7caa737179a8c31825ae6445f593ac7ff5f95080 -r23f8a6036e22f80c3c5fd2834a2980bb62d2a34d
--- sources/gui/qml/pages/treatment/sections/TreatmentPressureComponent.qml (.../TreatmentPressureComponent.qml) (revision 7caa737179a8c31825ae6445f593ac7ff5f95080)
+++ sources/gui/qml/pages/treatment/sections/TreatmentPressureComponent.qml (.../TreatmentPressureComponent.qml) (revision 23f8a6036e22f80c3c5fd2834a2980bb62d2a34d)
@@ -66,16 +66,4 @@
Behavior on minimum { NumberAnimation { duration: 1000 } }
Behavior on maximum { NumberAnimation { duration: 1000 } }
}
-
- function expandRangeBar() {
- prevMinimum = _rangeBar.minimum
- prevMaximum = _rangeBar.maximum
- _rangeBar.minimum = lowerBound - 20
- _rangeBar.maximum = upperBound + 20
- }
-
- function resetRangeBar() {
- _rangeBar.minimum = prevMinimum
- _rangeBar.maximum = prevMaximum
- }
}
Index: sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml
===================================================================
diff -u -r36a488a3d29449ffedfe364d0031ed74d03c0ae0 -r23f8a6036e22f80c3c5fd2834a2980bb62d2a34d
--- sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml (.../TreatmentPressures.qml) (revision 36a488a3d29449ffedfe364d0031ed74d03c0ae0)
+++ sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml (.../TreatmentPressures.qml) (revision 23f8a6036e22f80c3c5fd2834a2980bb62d2a34d)
@@ -118,30 +118,7 @@
}
expandingArrow : true
- enabled : ! expandingTimer.running
- onClicked : {
- expandingTimer.start()
- expandAllRangeBars()
- }
+ onClicked : print ("Expanding Arrows clicked")
}
-
- Timer {
- id : expandingTimer
- interval : 30000 // 30 second expand timer
- repeat : false
- onTriggered : resetAllRangeBars()
- }
-
- function expandAllRangeBars() {
- _arterialRangeBar.expandRangeBar()
- _venousRangeBar.expandRangeBar()
- _tmpRangeBar.expandRangeBar()
- }
-
- function resetAllRangeBars() {
- _arterialRangeBar.resetRangeBar()
- _venousRangeBar.resetRangeBar()
- _tmpRangeBar.resetRangeBar()
- }
}
Index: sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml
===================================================================
diff -u -r7caa737179a8c31825ae6445f593ac7ff5f95080 -r23f8a6036e22f80c3c5fd2834a2980bb62d2a34d
--- sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml (.../TreatmentSaline.qml) (revision 7caa737179a8c31825ae6445f593ac7ff5f95080)
+++ sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml (.../TreatmentSaline.qml) (revision 23f8a6036e22f80c3c5fd2834a2980bb62d2a34d)
@@ -15,7 +15,6 @@
// Qt
import QtQuick 2.12
-import QtGraphicalEffects 1.12
// Project
import VTreatmentSaline 0.1;
@@ -80,10 +79,9 @@
minText.visible : false
maxText.visible : false
marker.visible : false
- gradientStart : Colors.progressBarGradientStart
- gradientEnd : Colors.progressBarGradientEnd
- maximum : valueCumulative
- value : valueDelivered
+ color : Colors.progressBarSaline
+ maximum : 100//valueCumulative
+ value : 60//valueDelivered
decimal : _root.valueDecimal
radius : 9
progressRadius : radius
@@ -93,8 +91,8 @@
property real value: valueDelivered
anchors {
- verticalCenter : __valueDeliveredUnit.verticalCenter
- right : __valueDeliveredUnit.left
+ verticalCenter : _valueDeliveredUnit.verticalCenter
+ right : _valueDeliveredUnit.left
rightMargin : 5
}
font.pixelSize : 18
@@ -103,7 +101,7 @@
width : contentWidth
}
- Label { id: __valueDeliveredUnit
+ Label { id: _valueDeliveredUnit
property real value: 0
anchors {
bottom : _fluidProgressBar.top
@@ -132,17 +130,6 @@
if ( isIdle ) vTreatmentAdjustmentSaline.doStart() // IDLE
if ( isStarted ) vTreatmentAdjustmentSaline.doStop () // IN_PROGRESS
}
-
- layer.enabled : true
- layer.effect : DropShadow { id: _dropShadow
- horizontalOffset: 0
- verticalOffset : 3
- radius : 3.0
- samples : 7
- color : "#50000000"
- source : _startFluidButton
- anchors.fill : _startFluidButton
- }
}
}
Index: sources/gui/qml/pages/treatment/sections/TreatmentTime.qml
===================================================================
diff -u -r21bcf654a57e2b3a6d1a2fee1173c3dff81f8f99 -r23f8a6036e22f80c3c5fd2834a2980bb62d2a34d
--- sources/gui/qml/pages/treatment/sections/TreatmentTime.qml (.../TreatmentTime.qml) (revision 21bcf654a57e2b3a6d1a2fee1173c3dff81f8f99)
+++ sources/gui/qml/pages/treatment/sections/TreatmentTime.qml (.../TreatmentTime.qml) (revision 23f8a6036e22f80c3c5fd2834a2980bb62d2a34d)
@@ -15,7 +15,6 @@
// Qt
import QtQuick 2.12
-import QtGraphicalEffects 1.12
// Project
@@ -50,13 +49,9 @@
anchors.fill : parent
value : _root.progressValue
thickness : 35
- circle.shadow.color : Colors.mainTreatmentLighterBlue
- circle.fillColor : Colors.mainTreatmentDarkerBlue
- circle.showGradient : _root.isRunning
- circle.runAnimation : _root.isRunning
- circle.startGradientColor: "#2A5A93"
- color: _root.isRunning ? Colors.borderButton :
- "#9B864E"
+ circleShadowColor : Colors.mainTreatmentLighterBlue
+ circleFillColor : Colors.mainTreatmentDarkerBlue
+ runAnimation : _root.isRunning
}
TimeText { id: _timeText
@@ -96,7 +91,7 @@
color : Colors.textMain
}
- TreatmentSectionIcon { id : _editTimeIcon
+ IconButton { id : _editTimeIcon
objectName: "editTimeIcon"
anchors {
bottom: _timeTitle.top
@@ -122,25 +117,13 @@
visible : ! _root.isRunning
height : 25
color : "transparent"
- image.width : 25
- image.height : 25
- image.anchors.topMargin: 4
+ imageDiameter : 25
+ imageTopMargin : 4
imageSource : "qrc:/images/iPauseOrange"
text : qsTr("Treatment Paused")
textColor : "#FFB836"
textfontSize : 26
textfontWeight : Font.Medium
}
-
- layer.enabled: true
- layer.effect: DropShadow { id: _dropShadow
- horizontalOffset: 3
- verticalOffset : 3
- radius : 3.0
- samples : 7
- color : "#50000000"
- source : _root
- anchors.fill : _root
- }
}
Index: sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml
===================================================================
diff -u -r7caa737179a8c31825ae6445f593ac7ff5f95080 -r23f8a6036e22f80c3c5fd2834a2980bb62d2a34d
--- sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision 7caa737179a8c31825ae6445f593ac7ff5f95080)
+++ sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision 23f8a6036e22f80c3c5fd2834a2980bb62d2a34d)
@@ -29,8 +29,8 @@
TreatmentSection { id: _root
readonly property real minimum : vTreatmentUltrafiltration.minimum
- readonly property real maximum : vTreatmentUltrafiltration.maximum
- readonly property real value : vTreatmentUltrafiltration.ultrafiltration_RefUFVol
+ readonly property real maximum : 100//vTreatmentUltrafiltration.maximum
+ readonly property real value : 60//vTreatmentUltrafiltration.ultrafiltration_RefUFVol
readonly property int topTextFontSize : 25
readonly property int bottomTextFontSize : 60
@@ -75,7 +75,7 @@
topTextFont.pixelSize : topTextFontSize
topTextFont.weight : Font.Medium
- bottomText : vTreatmentUltrafiltration.ultrafiltration_UfCurrentRate.toFixed(0)
+ bottomText : vTreatmentUltrafiltration.ultrafiltration_UfCurrentRate.toFixed(Variables.ultrafiltrationPrecision)
bottomTextFont.pixelSize: bottomTextFontSize
bottomTextFont.weight : Font.Normal
leftAlign : true
@@ -89,7 +89,8 @@
width : contentItem.width
height : _root.height
- ProgressBarEx { id: _progressbarex
+
+ ProgressBar { id: _progressbar
enabled : ! isSBInProgress
width : contentItem.width * 0.6
height : 20
@@ -98,29 +99,12 @@
minimum : _root.minimum
maximum : _root.maximum
value : _root.value
- valueEx : 0
unitText: Variables.unitVolume
- marker.handle.width : 12
- marker.handle.height: marker.handle.width
- marker.text.anchors {
- bottom : marker.handle.top
- bottomMargin: 10
- right : marker.handle.right
- // center align text above handle until about 75% through progress bar then right align to not cut off value
- rightMargin : (_root.value / (_root.maximum - _root.minimum)) > 0.75 ? 0 : -Variables.defaultMargin * 3
- }
+ color : Colors.progressBarUltrafiltration
+ radius : height
+ progressRadius : radius
+ showMarker : false
- gradientStart : "#2184FA"
- gradientEnd : "#67ACFF"
-
- marker.color : isUFPaused ? "dimgray" : Colors.rangeMarker
- marker.font {
- weight : Font.DemiBold
- pixelSize : 40
- }
-
- marker.valueOnTop : true
-
minText.color: "#818181"
minText.font {
pixelSize : 18
@@ -133,6 +117,19 @@
weight : Font.Normal
}
+ Text { id: _valueText
+ anchors {
+ bottom : parent.top
+ bottomMargin : Variables.defaultMargin
+ right : parent.right
+ }
+ text : _root.value + Variables.unitVolume
+ color : Colors.white
+ font.pixelSize : 40
+ font.weight : Font.DemiBold
+
+ }
+
Text { id: _volumeRemovedText
anchors {
top : parent.bottom
@@ -150,7 +147,7 @@
}
}
- TouchRect { id: _isolatedUFButton
+ Rectangle { id: _isolatedUFRect
anchors {
top : header.bottom
topMargin : Variables.defaultMargin
@@ -161,17 +158,18 @@
width : 250
height : 60
radius : height
- text.text : ufButtonText
- backgroundColor : Colors.backgroundMain
- borderColor : backgroundColor
- textColor : ufButtonColor
- text.font {
- weight : Font.DemiBold
- pixelSize : 20
+ color : Colors.backgroundMain
+
+ Text { id: _isolatedUFText
+ anchors.centerIn: parent
+ text : _root.ufButtonText
+ color : _root.ufButtonColor
+
+ font {
+ weight : Font.DemiBold
+ pixelSize : 20
+ }
}
- onPressed : {
- // TODO
- }
}
// TODO