Index: leahi.qrc
===================================================================
diff -u -r6825a57fe430253271712f0afbac14d046b44794 -r07d01d133209c35053830f7e55dfa26127c4499b
--- leahi.qrc (.../leahi.qrc) (revision 6825a57fe430253271712f0afbac14d046b44794)
+++ leahi.qrc (.../leahi.qrc) (revision 07d01d133209c35053830f7e55dfa26127c4499b)
@@ -132,6 +132,8 @@
resources/images/bloodpump.png
resources/images/edit_yellow.png
resources/images/leahi-console.png
+ resources/images/moon.png
+ resources/images/sun.png
sources/gui/qml/components/MainMenu.qml
Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -rbc3fd305cbcfa47b0f535b68a9b022906d9a3797 -r07d01d133209c35053830f7e55dfa26127c4499b
--- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision bc3fd305cbcfa47b0f535b68a9b022906d9a3797)
+++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 07d01d133209c35053830f7e55dfa26127c4499b)
@@ -168,6 +168,9 @@
ID_AdjustWaterSampleReq = 0x5D00, // 93
ID_AdjustWaterSampleRsp = 0x5E00, // 94
ID_AdjustWaterSampleResultReq = 0XA300, // 163
+ ID_AdjustWaterSampleData = 0xAB00, //
+ ID_AdjustWaterSampleTimeout = 0xAc00, //
+
// Pre-Treatment Consumables Installation Confirm
ID_AdjustConsumablesConfirmReq = 0x6800, // 104 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response
// Pre-Treatment SelfTest NoCartridge Progress Data
Index: sources/gui/qml/dialogs/AlarmDialog.qml
===================================================================
diff -u -rfdddcd8b25b5acc99f8c044c998af0e95752063c -r07d01d133209c35053830f7e55dfa26127c4499b
--- sources/gui/qml/dialogs/AlarmDialog.qml (.../AlarmDialog.qml) (revision fdddcd8b25b5acc99f8c044c998af0e95752063c)
+++ sources/gui/qml/dialogs/AlarmDialog.qml (.../AlarmDialog.qml) (revision 07d01d133209c35053830f7e55dfa26127c4499b)
@@ -8,7 +8,7 @@
import "qrc:/components"
import "qrc:/compounds"
-Item { id : _root
+Rectangle { id : _root
property alias titleText : _title.text
property alias titlePixelSize : _title.font.pixelSize
@@ -33,7 +33,10 @@
property int headerOverlap : 30
anchors.fill: parent
+ color : Colors.modeBackgroundDialogColor
+ radius : Variables.alarmDialogRadius
+
signal muteClicked()
signal minimizeClicked()
signal listClicked()
@@ -91,7 +94,7 @@
}
Rectangle { id: _descriptionRect
- color : Colors.offWhite
+ color : Colors.modeBackgroundDialogColor
clip : true
anchors {
@@ -103,20 +106,19 @@
}
AutoStepController { id: _autoStepController
- anchors {
- left : parent.left
- leftMargin : Variables.defaultMargin * 4
- top : parent.top
- topMargin : Variables.defaultMargin * 2
- }
+ anchors {
+ left : parent.left
+ leftMargin : Variables.defaultMargin * 4
+ top : parent.top
+ topMargin : Variables.defaultMargin * 2
+ }
+ onTriggered : _listView.currentIndex = (_listView.currentIndex + 1) % _listView.count
+ }
- onTriggered : _listView.currentIndex = (_listView.currentIndex + 1) % _listView.count
- }
-
ListView {id: _listView
anchors {
top : _autoStepController.bottom
- topMargin : Variables.defaultMargin
+ topMargin : Variables.defaultMargin * 2
bottom : parent.bottom
left : parent.left
leftMargin : Variables.defaultMargin * 4
@@ -134,19 +136,19 @@
clip : true
Rectangle { id: _stepRect
- height : 40
+ height : 50
width : height
radius : height
- color : _delegateControl.ListView.isCurrentItem ? Colors.backgroundMainMenu : Colors.offWhite
+ color : _delegateControl.ListView.isCurrentItem ? Colors.modeButtonColor : Colors.modeAlarmStepButtonColor
border {
- color: Colors.backgroundMainMenu
+ color: Colors.modeButtonColor
width: 2
}
Text { id: _stepNumberRect
anchors.centerIn: parent
text : index + 1
- color : _delegateControl.ListView.isCurrentItem ? Colors.offWhite : Colors.backgroundMainMenu
+ color : Colors.darkMode ? Colors.offWhite : _delegateControl.ListView.isCurrentItem ? Colors.modeBackgroundColor : Colors.modeButtonColor
font.pixelSize : 20
font.weight : Font.Medium
}
@@ -172,8 +174,8 @@
height : parent.height
width : parent.width
font.pixelSize : Fonts.fontPixelInstructionStep
- font.weight : _delegateControl.ListView.isCurrentItem ? Font.DemiBold : Font.Normal
- color : _delegateControl.ListView.isCurrentItem ? "#18559E" : Colors.alarmDialogText
+ font.weight : _delegateControl.ListView.isCurrentItem ? Font.DemiBold : Font.Normal
+ color : _delegateControl.ListView.isCurrentItem ? Colors.modeSelctedColor : Colors.modeTextColor
text : model.instruction
wrapMode : Text.WordWrap
}
@@ -209,6 +211,9 @@
leftMargin : Variables.defaultMargin * 4
}
+ color : Colors.modeAlarmStopStateColor
+ radius : height
+
Text { id: _astrix
anchors {
left: parent.left
@@ -228,7 +233,7 @@
left: _astrix.right
}
- color : "black"
+ color : Colors.modeTextColor
text : qsTr("Return Blood will not be allowed in:")
font.pixelSize : 25
font.weight : Font.Medium
@@ -274,60 +279,64 @@
onPressed : resumeClicked()
text.text : qsTr("Resume")
width : _buttonGroup.buttonsWidth
- isDefault : true
- backgroundColor: Colors.white
- fgColor : isPressed ? Colors.white : borderColor
+ isDefault : Colors.darkMode
+ backgroundColor: Colors.transparent
+ fgColor : isPressed ? Colors.offWhite : Colors.modeAlarmButtonPressedColor
selectColor : Qt.darker(borderColor, 1.15)
pixelSize : Fonts.fontPixelNotification
- borderColor : Colors.alarmButton
+ borderColor : Colors.modeAlarmButtonColor
}
TouchRect { id : _temporaryBreak
visible : temporaryBreakVisible
onPressed : temporaryBreakClicked()
text.text : qsTr("Temporary Break")
width : _buttonGroup.buttonsWidth
- backgroundColor: Colors.white
- fgColor : isPressed ? Colors.white : borderColor
+ isDefault : Colors.darkMode
+ backgroundColor: Colors.transparent
+ fgColor : isPressed ? Colors.offWhite : Colors.modeAlarmButtonPressedColor
selectColor : Qt.darker(borderColor, 1.15)
pixelSize : Fonts.fontPixelNotification
- borderColor : Colors.alarmButton
+ borderColor : Colors.modeAlarmButtonColor
}
TouchRect { id : _rinsebackTouchRect
visible : rinsebackVisible
onPressed : rinsebackClicked()
text.text : qsTr("Return Blood & End Treatment")
width : _buttonGroup.buttonsWidth
- backgroundColor: Colors.white
- fgColor : isPressed ? Colors.white : borderColor
+ isDefault : Colors.darkMode
+ backgroundColor: Colors.transparent
+ fgColor : isPressed ? Colors.offWhite : Colors.modeAlarmButtonPressedColor
selectColor : Qt.darker(borderColor, 1.15)
pixelSize : Fonts.fontPixelNotification
- borderColor : Colors.alarmButton
+ borderColor : Colors.modeAlarmButtonColor
}
TouchRect { id : _endTouchRect
visible : endVisible
onPressed : endClicked()
text.text : qsTr("End Treatment Only")
width : _buttonGroup.buttonsWidth
- backgroundColor: Colors.white
- fgColor : isPressed ? Colors.white : borderColor
+ isDefault : Colors.darkMode
+ backgroundColor: Colors.transparent
+ fgColor : isPressed ? Colors.offWhite : Colors.modeAlarmButtonPressedColor
selectColor : Qt.darker(borderColor, 1.15)
pixelSize : Fonts.fontPixelNotification
- borderColor : Colors.alarmButton
+ borderColor : Colors.modeAlarmButtonColor
}
TouchRect { id : _okTouchRect
visible : okVisible
onPressed : okClicked()
text.text : qsTr("OK")
width : _buttonGroup.buttonsWidth
- backgroundColor: Colors.white
- fgColor : isPressed ? Colors.white : borderColor
+ isDefault : Colors.darkMode
+ backgroundColor: Colors.transparent
+ fgColor : isPressed ? Colors.offWhite : Colors.modeAlarmButtonPressedColor
selectColor : Qt.darker(borderColor, 1.15)
pixelSize : Fonts.fontPixelNotification
- borderColor : Colors.alarmButton
+ borderColor : Colors.modeAlarmButtonColor
}
}
@@ -340,7 +349,7 @@
leftMargin : Variables.defaultMargin * 3
bottomMargin: Variables.defaultMargin
}
- color : Colors.alarmDialogGreyText
+ color : Colors.modeAlarmListColor
font.pixelSize : Fonts.fontPixelAlarmID
}
Index: sources/gui/qml/dialogs/AlarmListDialog.qml
===================================================================
diff -u -rfdddcd8b25b5acc99f8c044c998af0e95752063c -r07d01d133209c35053830f7e55dfa26127c4499b
--- sources/gui/qml/dialogs/AlarmListDialog.qml (.../AlarmListDialog.qml) (revision fdddcd8b25b5acc99f8c044c998af0e95752063c)
+++ sources/gui/qml/dialogs/AlarmListDialog.qml (.../AlarmListDialog.qml) (revision 07d01d133209c35053830f7e55dfa26127c4499b)
@@ -25,7 +25,7 @@
/*!
* \brief Contains the Alarm Dialog Implementation
*/
-Item { id : _root
+Rectangle { id : _root
property alias titleText : _title.text;
property alias titleBarForeground : _title.color
@@ -35,10 +35,12 @@
property int alarmID : -1
property bool minVisible : true
- property color contentbackgroundColor : Colors.offWhite
+ property color contentbackgroundColor : Colors.modeBackgroundDialogColor
property int headerOverlap : 30
anchors.fill: parent
+ color : Colors.modeBackgroundDialogColor
+ radius : Variables.alarmDialogRadius
signal muteClicked()
signal minimizeClicked()
@@ -115,7 +117,7 @@
visible : ! vAlarmActiveList.adjustment_Accepted
text : vAlarmActiveList.status
objectName: "_NotificationDialog_Description"
- color: Colors.alarmDialogText
+ color: Colors.modeAlarmListColor
font.pixelSize: Fonts.fontPixelButton
anchors {
horizontalCenter: parent.horizontalCenter;
@@ -139,8 +141,8 @@
itemWidth : width
rowSpacing : 0
colSpacing : 0
- lineColor : Colors.alarmDialogText
- textColor : Colors.alarmDialogText
+ lineColor : Colors.modeAlarmListColor
+ textColor : Colors.modeAlarmListColor
itemsText : vAlarmActiveList.alarmIDs
itemsValue : vAlarmActiveList.alarmTexts
itemsTouchable : [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ]
Index: sources/gui/qml/main.qml
===================================================================
diff -u -rfdddcd8b25b5acc99f8c044c998af0e95752063c -r07d01d133209c35053830f7e55dfa26127c4499b
--- sources/gui/qml/main.qml (.../main.qml) (revision fdddcd8b25b5acc99f8c044c998af0e95752063c)
+++ sources/gui/qml/main.qml (.../main.qml) (revision 07d01d133209c35053830f7e55dfa26127c4499b)
@@ -65,6 +65,7 @@
import VPreTreatmentStates 0.1
import VTDTreatmentStates 0.1
import VPostTreatmentStates 0.1
+import VWaterSample 0.1
// Treatment - Common
import VTreatmentVitals 0.1
@@ -239,6 +240,7 @@
VTDEjector { id: vTDEjector }
VTDTemperature { id: vTDTemperature }
VListModel { id: vListModel }
+ VWaterSample { id: vWaterSample }
VTreatmentDialysateFlow { id: vTreatmentDialysateFlow }
VTreatmentIsolatedUF { id: vTreatmentIsolatedUF }