Index: denali.qrc
===================================================================
diff -u -rc15ce613e372838316d42c40a86953e6f0aa05d3 -r73091a6f5717c0fc88e236c06c618ad361f30a3c
--- denali.qrc (.../denali.qrc) (revision c15ce613e372838316d42c40a86953e6f0aa05d3)
+++ denali.qrc (.../denali.qrc) (revision 73091a6f5717c0fc88e236c06c618ad361f30a3c)
@@ -133,6 +133,7 @@
sources/gui/qml/pages/pretreatment/prime/PreTreatmentUltrafiltration.qml
sources/gui/qml/pages/pretreatment/prime/PreTreatmentPrime.qml
+ sources/gui/qml/pages/pretreatment/prime/PreTreatmentFilterFlush.qml
sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml
Index: sources/gui/qml/components/BackButton.qml
===================================================================
diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -r73091a6f5717c0fc88e236c06c618ad361f30a3c
--- sources/gui/qml/components/BackButton.qml (.../BackButton.qml) (revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e)
+++ sources/gui/qml/components/BackButton.qml (.../BackButton.qml) (revision 73091a6f5717c0fc88e236c06c618ad361f30a3c)
@@ -25,8 +25,6 @@
*/
TouchRect { id : _root
readonly property int margin: (_root.height - Variables.backIconDiameter) / 2
- backgroundColor: "Transparent"
- animated : true
width : 115
height : 45
anchors {
Index: sources/gui/qml/components/ConfirmButton.qml
===================================================================
diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -r73091a6f5717c0fc88e236c06c618ad361f30a3c
--- sources/gui/qml/components/ConfirmButton.qml (.../ConfirmButton.qml) (revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e)
+++ sources/gui/qml/components/ConfirmButton.qml (.../ConfirmButton.qml) (revision 73091a6f5717c0fc88e236c06c618ad361f30a3c)
@@ -28,12 +28,11 @@
font.pixelSize: Fonts.fontPixelConfirm
}
- backgroundColor: Colors.backgroundButtonSelect
+ isDefault: true
anchors {
top : parent.top
left : parent.left
margins : 35
}
- animated : true
}
Index: sources/gui/qml/components/ExportButton.qml
===================================================================
diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -r73091a6f5717c0fc88e236c06c618ad361f30a3c
--- sources/gui/qml/components/ExportButton.qml (.../ExportButton.qml) (revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e)
+++ sources/gui/qml/components/ExportButton.qml (.../ExportButton.qml) (revision 73091a6f5717c0fc88e236c06c618ad361f30a3c)
@@ -21,32 +21,22 @@
import "qrc:/components"
TouchRect { id : _root
- width: 50
- height: width
- x: width - 10
- animated: true
- text.text: qsTr("Export")
- text.font.pixelSize: Fonts.fontPixelButton * 0.75
- button.onPressed: {
+ width : 50
+ height : width
+ x : width - 10
+ text {
+ text: qsTr("Export")
+ font.pixelSize: Fonts.fontPixelButton * 0.75
+ }
+ onPressed: {
_GuiView.doExportLog()
}
Connections { target: _GuiView
- onDidUSBDriveUmount: {
- _root.disabled = true
- }
- onDidUSBDriveRemove: {
- //_root.animate(false)
- _root.disabled = true
- }
- onDidUSBDriveMount: {
- _root.disabled = false
- }
- onDidExportLog: {
- _root.disabled = true
- }
- onDidExport: {
- _root.disabled = false
- }
+ onDidUSBDriveUmount : _root.enabled = false
+ onDidUSBDriveRemove : _root.enabled = false
+ onDidUSBDriveMount : _root.enabled = true
+ onDidExportLog : _root.enabled = false
+ onDidExport : _root.enabled = true
}
}
Index: sources/gui/qml/components/GridSelection.qml
===================================================================
diff -u -reefe8acbe5b10deb379c5e4ceabeaa95d429410e -r73091a6f5717c0fc88e236c06c618ad361f30a3c
--- sources/gui/qml/components/GridSelection.qml (.../GridSelection.qml) (revision eefe8acbe5b10deb379c5e4ceabeaa95d429410e)
+++ sources/gui/qml/components/GridSelection.qml (.../GridSelection.qml) (revision 73091a6f5717c0fc88e236c06c618ad361f30a3c)
@@ -35,73 +35,45 @@
property int numCols : 2
property int buttonHeight : Variables.gridSelectionButtonHeight
property int buttonWidth : Variables.gridSelectionButtonWidth
- property var buttonNames : ["Button 1", "Button 2", "Button 3"]
+ property var buttonNames : []
property alias name : _text.text
- property int selectedIndex : unselectedIndex
- property int unselectedIndex : 9999
- height: numRows * buttonHeight
- width: numCols * buttonWidth
- signal buttonClicked()
+ property int selectedIndex : -1
+ height : numRows * buttonHeight
+ width : numCols * buttonWidth
- function setValid(valid) {
- if (valid) {
- _text.color = Colors.textMain
- } else {
- _text.color = Colors.textInvalid
- }
- }
+ signal buttonClicked(int vIndex)
- function setActive(active) {
- if (!active) {
- for (let i = 0; i < _repeater.count; i++) {
- _repeater.itemAt(i).setSelected(false)
- }
- selectedIndex = unselectedIndex
- }
- }
-
- Text {
- id: _text
- text: "Title"
+ Text { id: _text
+ text : "Title"
+ color : Colors.textMain;
font.pixelSize: Fonts.fontPixelFluidText
- color: Colors.textMain;
}
- Grid {
- id: _grid
- anchors.top: _text.bottom
- anchors.topMargin: Variables.sliderTextMargin
- rows: parent.numRows
- columns: parent.numCols
-
+ Grid { id: _grid
+ spacing: 5
+ anchors {
+ top : _text.bottom
+ topMargin : Variables.sliderTextMargin
+ }
+ rows : parent.numRows
+ columns : parent.numCols
Repeater { id: _repeater
model: buttonNames
- TouchRect {
- id: _touchRect
- objectName: _root.objectName + index
- text.text: modelData;
- selectable: true
- height: _root.buttonHeight
- width: _root.buttonWidth
- radius: 0
- borderColor: Colors.borderButtonUnselected
+ TouchRect { id : _touchRect
+ objectName : _root.objectName + index
+ text.text : modelData
+ selectable : true
+ height : _root.buttonHeight
+ width : _root.buttonWidth
+ radius : 5
+ Binding on selected {
+ when : _root.selectedIndex > -1
+ value : index === _root.selectedIndex
+ }
onClicked: {
- _text.color = Colors.textMain
- if (selectedIndex === index) {
- _repeater.itemAt(index).setSelected(false)
- selectedIndex = unselectedIndex
- } else {
- _repeater.itemAt(index).setSelected(true)
- selectedIndex = index
- }
-
- for (let j = 0; j < _repeater.count; j += 1) {
- if (index !== j) {
- _repeater.itemAt(j).setSelected(false)
- }
- }
- buttonClicked()
+ _root.selectedIndex = index
+ buttonClicked(index)
}
}
}
Index: sources/gui/qml/components/MainMenu.qml
===================================================================
diff -u -r6cad9b004e904200b71de7431c745795256080df -r73091a6f5717c0fc88e236c06c618ad361f30a3c
--- sources/gui/qml/components/MainMenu.qml (.../MainMenu.qml) (revision 6cad9b004e904200b71de7431c745795256080df)
+++ sources/gui/qml/components/MainMenu.qml (.../MainMenu.qml) (revision 73091a6f5717c0fc88e236c06c618ad361f30a3c)
@@ -98,11 +98,12 @@
model: _private.repeaterTitles
TouchRect { id : _touchRect
objectName: "_touchRect" + index //SquishQt testability
- width: partitionWidth
- height: parent.height
- text.text: modelData
+ animated : false
+ width : partitionWidth
+ height : parent.height
+ text.text : modelData
border.width: 0
- button.onPressed: {
+ onPressed: {
_highlightRect.x = _touchRect.x
itemPressed(index)
}
@@ -124,7 +125,7 @@
height: parent.height
text.text: _private.rightText
border.width: 0
- button.onPressed: {
+ onPressed: {
itemPressed( titles.length ? titles.length - 1 : -1 )
}
anchors.right: parent.right
Index: sources/gui/qml/components/MuteButton.qml
===================================================================
diff -u -rcd769413344091cea88a30861b49188c8c147cba -r73091a6f5717c0fc88e236c06c618ad361f30a3c
--- sources/gui/qml/components/MuteButton.qml (.../MuteButton.qml) (revision cd769413344091cea88a30861b49188c8c147cba)
+++ sources/gui/qml/components/MuteButton.qml (.../MuteButton.qml) (revision 73091a6f5717c0fc88e236c06c618ad361f30a3c)
@@ -26,7 +26,7 @@
height: 45
width : isSilenced ? 120 : height
- color: Colors.transparent
+ backgroundColor: Colors.transparent
borderColor: Colors.white
touchExpanding: 25
Row {
Index: sources/gui/qml/components/NotificationBar.qml
===================================================================
diff -u -rcd769413344091cea88a30861b49188c8c147cba -r73091a6f5717c0fc88e236c06c618ad361f30a3c
--- sources/gui/qml/components/NotificationBar.qml (.../NotificationBar.qml) (revision cd769413344091cea88a30861b49188c8c147cba)
+++ sources/gui/qml/components/NotificationBar.qml (.../NotificationBar.qml) (revision 73091a6f5717c0fc88e236c06c618ad361f30a3c)
@@ -73,6 +73,7 @@
}
MuteButton { id: _muteButton
+ backgroundColor: _root.color
anchors {
verticalCenter : _root.verticalCenter
left : _root.left
@@ -87,6 +88,7 @@
}
UpDownButton { id: _updownButton
+ backgroundColor: _root.color
isUp: true
anchors {
verticalCenter : _root.verticalCenter
@@ -100,7 +102,7 @@
height: 45
width : height
- color : Colors.transparent
+ backgroundColor: _root.color
borderColor : Colors.white
anchors {
Index: sources/gui/qml/components/TouchRect.qml
===================================================================
diff -u -rcd769413344091cea88a30861b49188c8c147cba -r73091a6f5717c0fc88e236c06c618ad361f30a3c
--- sources/gui/qml/components/TouchRect.qml (.../TouchRect.qml) (revision cd769413344091cea88a30861b49188c8c147cba)
+++ sources/gui/qml/components/TouchRect.qml (.../TouchRect.qml) (revision 73091a6f5717c0fc88e236c06c618ad361f30a3c)
@@ -26,103 +26,78 @@
*/
Rectangle { id : _root
property alias text : _text
- property alias button : _mouseArea
- property bool animated : false
- property alias loops : _clickAnimation.loops
- property int duration : 200
-
- property bool disabled : false
+ property bool animated : true
+ property bool isDefault : false
property bool selectable : false
property bool selected : false
property color textColor : Colors.textButton
property color borderColor : Colors.borderButton
property color backgroundColor : Colors.backgroundButtonNormal
+ property color defaultColor : // Colors.backgroundButtonSelect
+ backgroundColor == Colors.transparent ?
+ Colors.backgroundButtonSelect :
+ Qt.lighter(_root.backgroundColor, 1.15)
- property int touchExpanding : 0
+ property color selectColor : // Colors.backgroundButtonSelectDark
+ backgroundColor == Colors.transparent ?
+ Colors.backgroundButtonSelectDark :
+ Qt.darker (_root.backgroundColor, 1.15)
- signal clicked
-
- onDurationChanged: {
- _colorAnimationOn .duration = duration
- _colorAnimationOff.duration = duration
- }
-
- function animate(vAnimate) {
- if (vAnimate) {
- if ( disabled ) { return }
- if ( animated ) {
- _clickAnimation.restart()
- }
- } else {
- _clickAnimation.stop()
- _root.color = backgroundColor
+ QtObject { id: _private
+ function color() {
+ var mBackgroundColor = _root.backgroundColor
+ if ( isDefault ) mBackgroundColor = _root.defaultColor
+ if (! enabled ) return Colors.transparent
+ if ( selectable )
+ if ( selected ) return Colors.backgroundButtonSelectDark
+ else return mBackgroundColor
+ if (! animated ) return mBackgroundColor
+ if ( _mouseArea.pressed ) return _root.selectColor
+ return mBackgroundColor
}
- }
- onDisabledChanged: {
- if (disabled) {
- text.color = Colors.textDisableButton
- border.color = Colors.borderDisableButton
- color = "Transparent"
- } else {
- text.color = textColor
- border.color = borderColor
- color = backgroundColor
+ function borderColor() {
+ if ( ! enabled ) return Colors.borderDisableButton
+ if ( selectable )
+ if ( selected ) {
+ return _root.borderColor
+ } else {
+ return Colors.borderButtonUnselected
+ }
+ return _root.borderColor
}
}
+ color : _private.color()
+ border.color: _private.borderColor()
+
+ property int touchExpanding : 0
+
+ signal pressed
+ signal released
+ signal clicked
+
width : Variables.touchRectWidth
height : Variables.touchRectHeight
radius : Variables.touchRectRadius
- color : backgroundColor
- border {
- color: borderColor
- width: Variables.borderWidth
- }
+ border.width: Variables.borderWidth
+
+
+
Text { id: _text
anchors.centerIn: parent
- color: textColor
+ color: enabled ? _root.textColor : Colors.textDisableButton
font.pixelSize: Fonts.fontPixelButton
}
- function setSelected(isSelected) {
- _root.selected = isSelected
- if (_root.selected) {
- _root.color = Colors.backgroundButtonSelectDark
- _root.borderColor = Colors.borderButton
- }
- else {
- _root.color = backgroundColor
- _root.borderColor = Colors.borderButtonUnselected
- }
- }
-
MouseArea { id: _mouseArea
anchors.fill : parent
anchors.margins : touchExpanding * -1
- onClicked : {
- if ( disabled ) { return }
- if (selectable) {
- setSelected(!selected)
- _root.clicked()
- return
- }
- animate(true)
- _root.clicked()
- }
- }
+ onClicked : _root.clicked()
+ onPressed : _root.pressed()
+ onReleased : _root.released()
- SequentialAnimation { id: _clickAnimation
- running: false
- onStopped: {
- _root.color = backgroundColor
- }
- onFinished: {
- _root.color = backgroundColor
- }
- PropertyAnimation { id: _colorAnimationOn ; target: _root; property: "color"; to: _root.border.color; duration: duration; }
- PropertyAnimation { id: _colorAnimationOff; target: _root; property: "color"; to: _root.color ; duration: duration; }
}
}
Index: sources/gui/qml/components/USBButton.qml
===================================================================
diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -r73091a6f5717c0fc88e236c06c618ad361f30a3c
--- sources/gui/qml/components/USBButton.qml (.../USBButton.qml) (revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e)
+++ sources/gui/qml/components/USBButton.qml (.../USBButton.qml) (revision 73091a6f5717c0fc88e236c06c618ad361f30a3c)
@@ -24,30 +24,16 @@
width: 50
height: width
x: width - 10
- animated: true
- loops: Animation.Infinite
- duration: 1000 // 1 sec
-
text.text: qsTr("USB")
text.font.pixelSize: Fonts.fontPixelButton * 0.75
- button.onPressed: {
+ onPressed: {
_GuiView.doUSBDriveUmount()
- animate(true)
}
Connections { target: _GuiView
- onDidUSBDriveRemove: {
- _root.animate(false)
- _root.disabled = true
- }
- onDidUSBDriveMount: {
- _root.disabled = false
- }
- onDidExportLog: {
- _root.disabled = true
- }
- onDidExport: {
- _root.disabled = false
- }
+ onDidUSBDriveRemove : _root.enabled = false
+ onDidUSBDriveMount : _root.enabled = true
+ onDidExportLog : _root.enabled = false
+ onDidExport : _root.enabled = true
}
}
Index: sources/gui/qml/components/UpDownButton.qml
===================================================================
diff -u -r45ce6e781782be5de1480a1e7acecd1d272bcc84 -r73091a6f5717c0fc88e236c06c618ad361f30a3c
--- sources/gui/qml/components/UpDownButton.qml (.../UpDownButton.qml) (revision 45ce6e781782be5de1480a1e7acecd1d272bcc84)
+++ sources/gui/qml/components/UpDownButton.qml (.../UpDownButton.qml) (revision 73091a6f5717c0fc88e236c06c618ad361f30a3c)
@@ -25,7 +25,7 @@
height: 45
width : height
- color : Colors.transparent
+ backgroundColor: Colors.transparent
borderColor : Colors.white
Image { id: _image
Index: sources/gui/qml/dialogs/NotificationDialog.qml
===================================================================
diff -u -r07e0c7bd409782cab96a4ae761ee3f819bdb8639 -r73091a6f5717c0fc88e236c06c618ad361f30a3c
--- sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision 07e0c7bd409782cab96a4ae761ee3f819bdb8639)
+++ sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision 73091a6f5717c0fc88e236c06c618ad361f30a3c)
@@ -56,7 +56,6 @@
signal okClicked()
Rectangle { id: _titleBar
- color : Colors.backgroundButtonSelect
height : Variables.mainMenuHeight
width : _root.width
radius : _root.radius
@@ -85,6 +84,7 @@
}
UpDownButton { id: _minimizeButton
+ backgroundColor: _titleBar.color
isUp: false
anchors {
verticalCenter : _titleBar.verticalCenter
@@ -95,6 +95,7 @@
}
MuteButton { id: _muteButton
+ backgroundColor: _titleBar.color
anchors {
verticalCenter : _titleBar.verticalCenter
left : _titleBar.left
@@ -133,35 +134,39 @@
// 2 - OK button for user to only ack the alarm
// 3 - No button at all for the situations that the alarm can't be resolved by user.
// :: OK button and the other 3 buttons (Resume,Rinseback,End) should never come together
- TouchRect { id : _resumeTouchRect
- visible : resumeVisible
- button.onPressed: resumeClicked()
- text.text : qsTr("RESUME")
- width : _buttonGroup.buttonsWidth
- borderColor : Colors.white
+ TouchRect { id : _resumeTouchRect
+ visible : resumeVisible
+ onPressed : resumeClicked()
+ text.text : qsTr("RESUME")
+ width : _buttonGroup.buttonsWidth
+ borderColor : Colors.white
+ selectColor : Qt.darker(_root.backgroundColor, 1.15)
}
- TouchRect { id : _rinsebackTouchRect
- visible : rinsebackVisible
- button.onPressed: rinsebackClicked()
- text.text : qsTr("RINSEBACK")
- width : _buttonGroup.buttonsWidth
- borderColor : Colors.white
+ TouchRect { id : _rinsebackTouchRect
+ visible : rinsebackVisible
+ onPressed : rinsebackClicked()
+ text.text : qsTr("RINSEBACK")
+ width : _buttonGroup.buttonsWidth
+ borderColor : Colors.white
+ selectColor : Qt.darker(_root.backgroundColor, 1.15)
}
- TouchRect { id : _endTouchRect
- visible : endVisible
- button.onPressed: endClicked()
- text.text : qsTr("END TREATMENT")
- width : _buttonGroup.buttonsWidth
- borderColor : Colors.white
+ TouchRect { id : _endTouchRect
+ visible : endVisible
+ onPressed : endClicked()
+ text.text : qsTr("END TREATMENT")
+ width : _buttonGroup.buttonsWidth
+ borderColor : Colors.white
+ selectColor : Qt.darker(_root.backgroundColor, 1.15)
}
- TouchRect { id : _okTouchRect
- visible : okVisible
- button.onPressed: okClicked()
- text.text : qsTr("OK")
- width : _buttonGroup.buttonsWidth
- borderColor : Colors.white
+ TouchRect { id : _okTouchRect
+ visible : okVisible
+ onPressed : okClicked()
+ text.text : qsTr("OK")
+ width : _buttonGroup.buttonsWidth
+ borderColor : Colors.white
+ selectColor : Qt.darker(_root.backgroundColor, 1.15)
}
}
}
Index: sources/gui/qml/dialogs/PowerOff.qml
===================================================================
diff -u -r6cad9b004e904200b71de7431c745795256080df -r73091a6f5717c0fc88e236c06c618ad361f30a3c
--- sources/gui/qml/dialogs/PowerOff.qml (.../PowerOff.qml) (revision 6cad9b004e904200b71de7431c745795256080df)
+++ sources/gui/qml/dialogs/PowerOff.qml (.../PowerOff.qml) (revision 73091a6f5717c0fc88e236c06c618ad361f30a3c)
@@ -36,14 +36,14 @@
}
TouchRect { id : _shutdownRect
text.text: qsTr("SHUTDOWN")
- button.onPressed: {
+ onPressed: {
accepted()
close()
}
}
TouchRect { id : _cancelTouch
text.text: qsTr("CANCEL")
- button.onPressed: {
+ onPressed: {
rejected()
close()
}
Index: sources/gui/qml/globals/Colors.qml
===================================================================
diff -u -r7710fea4486a639caaa3c510add0eac0bcd4ddcc -r73091a6f5717c0fc88e236c06c618ad361f30a3c
--- sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 7710fea4486a639caaa3c510add0eac0bcd4ddcc)
+++ sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 73091a6f5717c0fc88e236c06c618ad361f30a3c)
@@ -33,7 +33,7 @@
readonly property color backgroundMain : "#1A344D"
readonly property color backgroundButtonNormal : transparent
readonly property color backgroundButtonSelect : "#438FEB"
- readonly property color backgroundButtonSelectDark : "#214773"
+ readonly property color backgroundButtonSelectDark : "#135088" // "#214773"
readonly property color backgroundDialog : "#254670"
readonly property color backgroundMenu : "#14314C"
readonly property color backgroundMainMenu : "#0D2639"
@@ -107,9 +107,6 @@
readonly property color createTrProfileID : "#ffbb44"
- readonly property color primingNotReady : "#1f4974"
- readonly property color primingReady : "#438FEB"
-
readonly property color createTreatmentActive : "#3d8eef"
readonly property color createTreatmentInactive : backgroundRangeRect
readonly property color createTreatmentNotReady : "#1f4974"
Index: sources/gui/qml/pages/MainHome.qml
===================================================================
diff -u -rc15ce613e372838316d42c40a86953e6f0aa05d3 -r73091a6f5717c0fc88e236c06c618ad361f30a3c
--- sources/gui/qml/pages/MainHome.qml (.../MainHome.qml) (revision c15ce613e372838316d42c40a86953e6f0aa05d3)
+++ sources/gui/qml/pages/MainHome.qml (.../MainHome.qml) (revision 73091a6f5717c0fc88e236c06c618ad361f30a3c)
@@ -27,10 +27,6 @@
* which is the default screen in the "Treatment" stack
*/
ScreenItem { id: _root
- // exported items
- property alias startTreatmentButton : _startTreatmentRect.button
- property alias createTreatmentButton: _createTreatmentRect.button
-
signal treatmentStarted()
signal treatmentCreated()
@@ -44,17 +40,17 @@
TitleText { id: _titleText
anchors.horizontalCenter: parent.horizontalCenter
width: parent.width
- text: qsTr("Good Morning")
+ text : qsTr("Good Morning")
}
TouchRect { id : _startTreatmentRect
anchors.horizontalCenter: parent.horizontalCenter
text.text: qsTr("START TREATMENT")
- button.onClicked: treatmentStarted()
+ onClicked: treatmentStarted()
}
TouchRect { id : _createTreatmentRect
anchors.horizontalCenter: parent.horizontalCenter
text.text: qsTr("CREATE TREATMENT")
- button.onClicked: treatmentCreated()
+ onClicked: treatmentCreated()
}
}
Index: sources/gui/qml/pages/SettingsHome.qml
===================================================================
diff -u -r01cdcd9647c07963bf4a1cf1e477755dddb84c6c -r73091a6f5717c0fc88e236c06c618ad361f30a3c
--- sources/gui/qml/pages/SettingsHome.qml (.../SettingsHome.qml) (revision 01cdcd9647c07963bf4a1cf1e477755dddb84c6c)
+++ sources/gui/qml/pages/SettingsHome.qml (.../SettingsHome.qml) (revision 73091a6f5717c0fc88e236c06c618ad361f30a3c)
@@ -51,15 +51,14 @@
TouchRect { id : _poweroffButton
width: 150
height: Variables.logoHeight
- animated: true
anchors {
top : parent.top
right : parent.right
topMargin : (Variables.headerHeight - Variables.logoHeight) / 2
rightMargin : (Variables.headerHeight - Variables.logoHeight) / 2
}
text.text: qsTr("Shutdown")
- button.onPressed: {
+ onPressed: {
_GuiView.doActionTransmit(GuiActions.ID_PowerOff, GuiActions.NoData)
}
}
Index: sources/gui/qml/pages/postTreatment/recirculate/PostTreatmentReconnect.qml
===================================================================
diff -u -rc15ce613e372838316d42c40a86953e6f0aa05d3 -r73091a6f5717c0fc88e236c06c618ad361f30a3c
--- sources/gui/qml/pages/postTreatment/recirculate/PostTreatmentReconnect.qml (.../PostTreatmentReconnect.qml) (revision c15ce613e372838316d42c40a86953e6f0aa05d3)
+++ sources/gui/qml/pages/postTreatment/recirculate/PostTreatmentReconnect.qml (.../PostTreatmentReconnect.qml) (revision 73091a6f5717c0fc88e236c06c618ad361f30a3c)
@@ -129,14 +129,14 @@
}
TouchRect { id : _backTreatmentTouchRect
- visible : true // true if only treatment is not already complete
+ visible : vTreatmentTime.time_Total > 0
text.text : qsTr("BACK TO RECIRCULATE")
width : _buttonGroup.buttonsWidth
onClicked : recirculateBackClicked()
}
TouchRect { id : _endTreatmentTouchRect
- visible : true // true if only treatment is not already complete
+ visible : vTreatmentTime.time_Total > 0
text.text : qsTr("CONFIRM")
width : _buttonGroup.buttonsWidth
color : borderColor
Index: sources/gui/qml/pages/postTreatment/rinseback/PostTreatmentRinsebackComplete.qml
===================================================================
diff -u -rc15ce613e372838316d42c40a86953e6f0aa05d3 -r73091a6f5717c0fc88e236c06c618ad361f30a3c
--- sources/gui/qml/pages/postTreatment/rinseback/PostTreatmentRinsebackComplete.qml (.../PostTreatmentRinsebackComplete.qml) (revision c15ce613e372838316d42c40a86953e6f0aa05d3)
+++ sources/gui/qml/pages/postTreatment/rinseback/PostTreatmentRinsebackComplete.qml (.../PostTreatmentRinsebackComplete.qml) (revision 73091a6f5717c0fc88e236c06c618ad361f30a3c)
@@ -64,7 +64,6 @@
right : parent.right
rightMargin : 30
}
- animated : true
onClicked : additionalClicked()
}
@@ -164,7 +163,7 @@
}
TouchRect { id : _endTreatmentTouchRect
- visible : true
+ visible : true // after the rinseback complete user can always end the treatment, regardless of incomplete or compeleted treatment
text.text : qsTr("END TREATMENT")
width : _buttonGroup.buttonsWidth
color : _private.treatmentIncomplete ? backgroundColor : borderColor
Index: sources/gui/qml/pages/postTreatment/rinseback/PostTreatmentRinsebackInit.qml
===================================================================
diff -u -rc15ce613e372838316d42c40a86953e6f0aa05d3 -r73091a6f5717c0fc88e236c06c618ad361f30a3c
--- sources/gui/qml/pages/postTreatment/rinseback/PostTreatmentRinsebackInit.qml (.../PostTreatmentRinsebackInit.qml) (revision c15ce613e372838316d42c40a86953e6f0aa05d3)
+++ sources/gui/qml/pages/postTreatment/rinseback/PostTreatmentRinsebackInit.qml (.../PostTreatmentRinsebackInit.qml) (revision 73091a6f5717c0fc88e236c06c618ad361f30a3c)
@@ -140,7 +140,7 @@
visible : true
text.text : qsTr("START RINSEBACK")
width : _buttonGroup.buttonsWidth
- color : borderColor
+ isDefault : true
onClicked : rinsebackClicked()
}
Index: sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml
===================================================================
diff -u -rc15ce613e372838316d42c40a86953e6f0aa05d3 -r73091a6f5717c0fc88e236c06c618ad361f30a3c
--- sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml (.../PreTreatmentPrimeStack.qml) (revision c15ce613e372838316d42c40a86953e6f0aa05d3)
+++ sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml (.../PreTreatmentPrimeStack.qml) (revision 73091a6f5717c0fc88e236c06c618ad361f30a3c)
@@ -29,13 +29,15 @@
stackView.initialItem : null
+ PreTreatmentFilterFlush { id: _preTreatmentFilterFlush }
+
PreTreatmentPrime { id: _pretreatmentPrime
- onBackClicked : {vTreatmentCreate.doRequestPop() }
- onContinueClicked : {vTreatmentCreate.doFinishedPrime(); }
+ onBackClicked : {vTreatmentCreate.doRequestPop() }
+ onContinueClicked : {vTreatmentCreate.doFinishedPrime(); }
}
PreTreatmentUltrafiltration { id: _pretreatmentUltrafiltration
- onBackClicked : {vTreatmentCreate.doRequestPop() }
+ onBackClicked : {vTreatmentCreate.doRequestPop() }
onStartClicked : {vTreatmentAdjustmentUltrafiltrationInit.doAdjustment(_pretreatmentUltrafiltration.ufVolume) }
}
@@ -55,7 +57,7 @@
}
Connections { target: vHDOperationMode
- onPreTreatmentChanged : { if ( vpreTreatment ) { page( _pretreatmentPrime )}}
+ onPreTreatmentChanged : { if ( vpreTreatment ) { page( _preTreatmentFilterFlush )}}
}
onVisibleChanged: {
if (visible) {
Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentConfirm.qml
===================================================================
diff -u -rc15ce613e372838316d42c40a86953e6f0aa05d3 -r73091a6f5717c0fc88e236c06c618ad361f30a3c
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentConfirm.qml (.../PreTreatmentConfirm.qml) (revision c15ce613e372838316d42c40a86953e6f0aa05d3)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentConfirm.qml (.../PreTreatmentConfirm.qml) (revision 73091a6f5717c0fc88e236c06c618ad361f30a3c)
@@ -80,7 +80,7 @@
objectName: "_continueRect"
anchors.horizontalCenter: parent.horizontalCenter
text.text: qsTr("CONFIRM TREATMENT")
- button.onClicked: {
+ onClicked: {
_root.confirmClicked()
}
}
Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml
===================================================================
diff -u -rc15ce613e372838316d42c40a86953e6f0aa05d3 -r73091a6f5717c0fc88e236c06c618ad361f30a3c
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision c15ce613e372838316d42c40a86953e6f0aa05d3)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision 73091a6f5717c0fc88e236c06c618ad361f30a3c)
@@ -453,7 +453,7 @@
backgroundColor: Colors.createTreatmentNotReady
borderColor: Colors.createTreatmentNotReady
textColor: Colors.createTreatmentTextNotReady
- button.onClicked: {
+ onClicked: {
vTreatmentCreate.saveTreatmentProfile = false;
if (vTreatmentCreate.continueEnabled) {
_root.continueClicked()
@@ -520,14 +520,14 @@
_heparinStopTime .setValid (true)
_salineBolus .setValid (true)
- _acidConcentrate .setValid (true)
- _bicarbonateConcentrate .setValid (true)
- _dialyzerType .setValid (true)
+ //_acidConcentrate .setValid (true)
+ // _bicarbonateConcentrate .setValid (true)
+ // _dialyzerType .setValid (true)
+ //
+ // _dialysateTemperature .setValid (true)
+ // _bloodPressureMeasurementInterval .setValid (true)
+ // _rinsebackFlowRate .setValid (true)
- _dialysateTemperature .setValid (true)
- _bloodPressureMeasurementInterval .setValid (true)
- _rinsebackFlowRate .setValid (true)
-
// TODO : Will be addressed in sub-task DEN-6686.
// _arterialPressureLimits .setLowValid (true)
// _arterialPressureLimits .setHighValid(true)
Index: sources/gui/qml/pages/pretreatment/prime/PreTreatmentFilterFlush.qml
===================================================================
diff -u
--- sources/gui/qml/pages/pretreatment/prime/PreTreatmentFilterFlush.qml (revision 0)
+++ sources/gui/qml/pages/pretreatment/prime/PreTreatmentFilterFlush.qml (revision 73091a6f5717c0fc88e236c06c618ad361f30a3c)
@@ -0,0 +1,65 @@
+/*!
+ *
+ * Copyright (c) 2019-2020 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 PreTreatmentFilterFlush.qml
+ * \author (last) Behrouz NematiPour
+ * \date (last) 05-May-2021
+ * \author (original) Behrouz NematiPour
+ * \date (original) 05-May-2021
+ *
+ */
+
+// Qt
+import QtQuick 2.12
+
+// Project
+// Qml imports
+import "qrc:/globals"
+import "qrc:/components"
+
+/*!
+ * \brief the pre treatment filter flush screen
+ */
+ScreenItem { id: _root
+ objectName: "_PreTreatmentFilterFlush"
+
+ readonly property int minimum : 0
+ readonly property int maximum : vDGFilterFlush.total
+ readonly property int progressValue : vDGFilterFlush.elapsed
+ readonly property int timeTextValue : vDGFilterFlush.remaining * 60
+
+ Text { id: _title
+ anchors {
+ top: parent.top
+ topMargin: 65
+ horizontalCenter: parent.horizontalCenter
+ }
+ color: "white"
+ text: qsTr("Filter Flush")
+ font.pixelSize: Fonts.fontPixelTitle
+ }
+
+ ProgressCircle { id: _circle
+ minimum: _root.minimum
+ maximum: _root.maximum
+
+ anchors.centerIn : parent
+ value: _root.progressValue
+ }
+
+ TimeText { id: _timeText
+ anchors.centerIn : parent
+ seconds : _root.timeTextValue
+ secondsVisible: false
+ }
+
+ onVisibleChanged: {
+ if (visible) {
+ _mainMenu .hidden = true
+ }
+ }
+}
Index: sources/gui/qml/pages/pretreatment/prime/PreTreatmentPrime.qml
===================================================================
diff -u -r96854524927f212c24b9e4a253baeff2e672228f -r73091a6f5717c0fc88e236c06c618ad361f30a3c
--- sources/gui/qml/pages/pretreatment/prime/PreTreatmentPrime.qml (.../PreTreatmentPrime.qml) (revision 96854524927f212c24b9e4a253baeff2e672228f)
+++ sources/gui/qml/pages/pretreatment/prime/PreTreatmentPrime.qml (.../PreTreatmentPrime.qml) (revision 73091a6f5717c0fc88e236c06c618ad361f30a3c)
@@ -112,19 +112,7 @@
width: 490
height: 60
text.text: qsTr("CONTINUE TO TREATMENT")
- disabled : false // it has not been implemeted in the FW so it is enabled always.
- // /*! vPriming.primingComplete // */vPriming.continueEnabled
- onEnabledChanged: {
- if (enabled) {
- borderColor = Colors.primingReady
- textColor = Colors.primingReady
- } else {
- borderColor = Colors.primingNotReady
- textColor = Colors.primingNotReady
- }
- }
-
- button.onClicked: {
+ onClicked: {
_root.continueClicked()
}
}
Index: sources/gui/qml/pages/pretreatment/prime/PreTreatmentUltrafiltration.qml
===================================================================
diff -u -rc15ce613e372838316d42c40a86953e6f0aa05d3 -r73091a6f5717c0fc88e236c06c618ad361f30a3c
--- sources/gui/qml/pages/pretreatment/prime/PreTreatmentUltrafiltration.qml (.../PreTreatmentUltrafiltration.qml) (revision c15ce613e372838316d42c40a86953e6f0aa05d3)
+++ sources/gui/qml/pages/pretreatment/prime/PreTreatmentUltrafiltration.qml (.../PreTreatmentUltrafiltration.qml) (revision 73091a6f5717c0fc88e236c06c618ad361f30a3c)
@@ -112,8 +112,8 @@
topMargin: 650
horizontalCenter: parent.horizontalCenter
}
- disabled: ! _volumeSlider.isActive
- backgroundColor: Colors.backgroundButtonSelect
+ enabled : _volumeSlider.isActive
+ isDefault : true
text {
text: qsTr("START")
font.weight : Font .DemiBold
Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml
===================================================================
diff -u -r76f632ce5a9039ae662d9a52286079b772f8ae7f -r73091a6f5717c0fc88e236c06c618ad361f30a3c
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml (.../TreatmentAdjustmentUltrafiltrationConfirm.qml) (revision 76f632ce5a9039ae662d9a52286079b772f8ae7f)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml (.../TreatmentAdjustmentUltrafiltrationConfirm.qml) (revision 73091a6f5717c0fc88e236c06c618ad361f30a3c)
@@ -82,9 +82,8 @@
bottomMargin: 85
horizontalCenter: parent.horizontalCenter
}
-
- backgroundColor: Colors.backgroundButtonSelect
- disabled: !(_rateAdjustmentButton.selected || _durationAdjustmentButton.selected)
+ isDefault : true
+ enabled : _rateAdjustmentButton.selected || _durationAdjustmentButton.selected
text {
text: qsTr("CONFIRM")
font.weight: Font.DemiBold
Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml
===================================================================
diff -u -r50a109da2a76b335793c2b95fa668733fb7df684 -r73091a6f5717c0fc88e236c06c618ad361f30a3c
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision 50a109da2a76b335793c2b95fa668733fb7df684)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision 73091a6f5717c0fc88e236c06c618ad361f30a3c)
@@ -122,9 +122,7 @@
topMargin: 460
horizontalCenter: parent.horizontalCenter
}
-
- backgroundColor: Colors.backgroundButtonSelect
-
+ isDefault: true
text {
text: qsTr("NEXT")
font.weight : Font .DemiBold
Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml
===================================================================
diff -u -r50a109da2a76b335793c2b95fa668733fb7df684 -r73091a6f5717c0fc88e236c06c618ad361f30a3c
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml (.../TreatmentAdjustmentUltrafiltrationPaused.qml) (revision 50a109da2a76b335793c2b95fa668733fb7df684)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml (.../TreatmentAdjustmentUltrafiltrationPaused.qml) (revision 73091a6f5717c0fc88e236c06c618ad361f30a3c)
@@ -70,9 +70,7 @@
topMargin: 350
horizontalCenter: parent.horizontalCenter
}
-
- backgroundColor: Colors.backgroundButtonSelect
-
+ isDefault: true
text {
text: qsTr("EDIT ULTRAFILTRATION VOLUME")
font.weight: Font.DemiBold
@@ -91,8 +89,6 @@
horizontalCenter: parent.horizontalCenter
}
- borderColor: Colors.borderDisableButton
-
Image { id: _image
anchors {
verticalCenter: _resumeButton.verticalCenter
Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml
===================================================================
diff -u -r76f632ce5a9039ae662d9a52286079b772f8ae7f -r73091a6f5717c0fc88e236c06c618ad361f30a3c
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml (.../TreatmentAdjustmentUltrafiltrationStart.qml) (revision 76f632ce5a9039ae662d9a52286079b772f8ae7f)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml (.../TreatmentAdjustmentUltrafiltrationStart.qml) (revision 73091a6f5717c0fc88e236c06c618ad361f30a3c)
@@ -72,9 +72,7 @@
topMargin: 400
horizontalCenter: parent.horizontalCenter
}
-
- backgroundColor: Colors.backgroundButtonSelect
-
+ isDefault: true
Image { id: _image
anchors {
left : _pauseButton.left
Index: sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml
===================================================================
diff -u -rf7fe40e1e2e5e7ccd02407aead0adcb0f5bf7f53 -r73091a6f5717c0fc88e236c06c618ad361f30a3c
--- sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml (.../TreatmentFluid.qml) (revision f7fe40e1e2e5e7ccd02407aead0adcb0f5bf7f53)
+++ sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml (.../TreatmentFluid.qml) (revision 73091a6f5717c0fc88e236c06c618ad361f30a3c)
@@ -58,12 +58,7 @@
pixelSize : 20
letterSpacing : 3
}
- animated: true
- duration: 100
- onClicked: {
- if (enabled)
- _root.clicked()
- }
+ onClicked: _root.clicked()
}
Text { id: _fluidText