Index: leahi.qrc
===================================================================
diff -u -r1164ea502e3fabdb55aa41923e0e566505f197ef -rc749ecd5dc413ce091250af652ccba4d96f7a582
--- leahi.qrc (.../leahi.qrc) (revision 1164ea502e3fabdb55aa41923e0e566505f197ef)
+++ leahi.qrc (.../leahi.qrc) (revision c749ecd5dc413ce091250af652ccba4d96f7a582)
@@ -112,6 +112,8 @@
resources/images/Volume.png
resources/images/water_sample_fail.png
resources/images/water_sample_pass.png
+ resources/images/ArrowDownDisabled.png
+ resources/images/ArrowUpDisabled.png
sources/gui/qml/components/MainMenu.qml
Index: sources/gui/qml/components/ArrowButton.qml
===================================================================
diff -u -r21041955990385205ec1aca17ef51fc1fd9a4b29 -rc749ecd5dc413ce091250af652ccba4d96f7a582
--- sources/gui/qml/components/ArrowButton.qml (.../ArrowButton.qml) (revision 21041955990385205ec1aca17ef51fc1fd9a4b29)
+++ sources/gui/qml/components/ArrowButton.qml (.../ArrowButton.qml) (revision c749ecd5dc413ce091250af652ccba4d96f7a582)
@@ -13,11 +13,11 @@
property bool rightArrow : false
property bool expandingArrow: false
- property string iconImage : upArrow ? "qrc:/images/iChevronUp" :
- downArrow ? "qrc:/images/iChevronDown" :
- leftArrow ? "qrc:/images/iChevronLeft" :
- rightArrow ? "qrc:/images/iChevronRight" :
- expandingArrow ? "qrc:/images/iArrowsExpanding" :
+ property string iconImage : upArrow ? enabled ? "qrc:/images/iChevronUp" : "qrc:/images/iArrowUpDisabled" :
+ downArrow ? enabled ? "qrc:/images/iChevronDown" : "qrc:/images/iArrowDownDisabled" :
+ leftArrow ? enabled ? "qrc:/images/iChevronLeft" : "qrc:/images/iArrowLeftDisabled" :
+ rightArrow ? enabled ? "qrc:/images/iChevronRight" : "qrc:/images/iArrowRightDisabled" :
+ expandingArrow ? "qrc:/images/iArrowsExpanding" :
""
property int iconSize : Variables.arrowIconDiameter
Index: sources/gui/qml/compounds/BPHREntry.qml
===================================================================
diff -u -rb12853c86ef9e517667516dc3e47bca07349cedf -rc749ecd5dc413ce091250af652ccba4d96f7a582
--- sources/gui/qml/compounds/BPHREntry.qml (.../BPHREntry.qml) (revision b12853c86ef9e517667516dc3e47bca07349cedf)
+++ sources/gui/qml/compounds/BPHREntry.qml (.../BPHREntry.qml) (revision c749ecd5dc413ce091250af652ccba4d96f7a582)
@@ -41,6 +41,14 @@
width : _container.width
height : _container.height
+ function setInitialFocus() {
+ numPad.setup(_bloodPressureSystolic,
+ qsTr("Systolic"),
+ vTreatmentVitals.systolicMin,
+ vTreatmentVitals.systolicMax,
+ Variables.unitTextBloodPressure)
+ }
+
QtObject { id: _private
property bool isBloodPressureCompareValid : (parseInt(_bloodPressureDiastolic.text) <= parseInt(_bloodPressureSystolic.text))
}
Index: sources/gui/qml/compounds/NumPad.qml
===================================================================
diff -u -rbfdee4cd41dfc4609cbd6045e64217731433f79d -rc749ecd5dc413ce091250af652ccba4d96f7a582
--- sources/gui/qml/compounds/NumPad.qml (.../NumPad.qml) (revision bfdee4cd41dfc4609cbd6045e64217731433f79d)
+++ sources/gui/qml/compounds/NumPad.qml (.../NumPad.qml) (revision c749ecd5dc413ce091250af652ccba4d96f7a582)
@@ -38,12 +38,12 @@
width : Variables.numPadWidth
height : Variables.numPadHeight
- visible : false
+// visible : false
radius : 9
color : Colors.backgroundMain
x : Math.round((Variables.applicationWidth - _root.width) / 2)
y : Math.round((Variables.applicationHeight - _root.height) / 2)
- onVisibleChanged : if ( ! _root.visible ) { reset() }
+// onVisibleChanged : if ( ! _root.visible ) { reset() }
onDisplayValueChanged : if ( _root.setter ) { _root.setter( _valueLabel.text ) }
onSettingValueChanged : _valueLabel.text = _root.settingValue !== undefined ? _root.settingValue : ""
@@ -54,6 +54,22 @@
function open(entry, title, min, max, unit) {
reset()
+ setup(entry, title, min, max, unit)
+// _root.settingValue = Qt.binding(function () { return entry.text })
+// _root.title = title
+// _root.unit = unit
+// _root.range = min.isEmpty &&
+// max.isEmpty ? "" : ("%1 %2 - %3") .arg(qsTr("Range:"))
+// .arg(min)
+// .arg(max)
+// _root.getter = entry.text
+// _root.setter = function (value) { entry.text = value }
+// _root.validator = function (value) { { return value >= min && value <= max } }
+ _keyboard.setVisible(false)
+ show()
+ }
+
+ function setup(entry, title, min, max, unit) {
_root.settingValue = Qt.binding(function () { return entry.text })
_root.title = title
_root.unit = unit
@@ -64,8 +80,6 @@
_root.getter = entry.text
_root.setter = function (value) { entry.text = value }
_root.validator = function (value) { { return value >= min && value <= max } }
- _keyboard.setVisible(false)
- show()
}
function show() {
Index: sources/gui/qml/pages/treatment/TreatmentHome.qml
===================================================================
diff -u -rc9764bd0ad823c5c1725d7c7f556290c2c459d4d -rc749ecd5dc413ce091250af652ccba4d96f7a582
--- sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision c9764bd0ad823c5c1725d7c7f556290c2c459d4d)
+++ sources/gui/qml/pages/treatment/TreatmentHome.qml (.../TreatmentHome.qml) (revision c749ecd5dc413ce091250af652ccba4d96f7a582)
@@ -192,6 +192,20 @@
}
}
+ Connections { target: vTreatmentAdjustmentSaline
+ function onAdjustmentTriggered ( vValue ) {
+ if (vTreatmentAdjustmentSaline.adjustment_Accepted) {
+ if (_notification.source === 3) {
+ _notification.text = ""
+ }
+ }
+ else {
+ _notification.text = vTreatmentAdjustmentSaline.text()
+ _notification.source = 3
+ }
+ }
+ }
+
onVisibleChanged: {
if (visible) {
_mainMenu.hidden = true
Index: sources/gui/qml/pages/treatment/TreatmentSectionHeader.qml
===================================================================
diff -u -rec9c06478bddf4cadf546aa4a49bb18b224f3b50 -rc749ecd5dc413ce091250af652ccba4d96f7a582
--- sources/gui/qml/pages/treatment/TreatmentSectionHeader.qml (.../TreatmentSectionHeader.qml) (revision ec9c06478bddf4cadf546aa4a49bb18b224f3b50)
+++ sources/gui/qml/pages/treatment/TreatmentSectionHeader.qml (.../TreatmentSectionHeader.qml) (revision c749ecd5dc413ce091250af652ccba4d96f7a582)
@@ -52,7 +52,7 @@
text: title
font {
- pixelSize: 30
+ pixelSize: 27
weight: Font.Medium
}
color: Colors.textTextRectLabel
@@ -64,7 +64,7 @@
right : _editButton.left
rightMargin : Variables.defaultMargin * 2
}
-
+ iconSize : 30
visible : showLock
iconImageSource : editEnabled ? "qrc:/images/iUnlock" : "qrc:/images/iLock"
onPressed : {
@@ -79,7 +79,7 @@
right : parent.right
rightMargin : Variables.defaultMargin * 2
}
-
+ iconSize : 30
visible : showEdit
enabled : editEnabled && _root.setEditActive
iconImageSource : enabled ? "qrc:/images/iEdit" : "qrc:/images/iEditDisabled"
Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml
===================================================================
diff -u -rbea36be2766046e63c4e82539a630b5cee7ce1c6 -rc749ecd5dc413ce091250af652ccba4d96f7a582
--- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml (.../TreatmentAdjustmentVitals.qml) (revision bea36be2766046e63c4e82539a630b5cee7ce1c6)
+++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml (.../TreatmentAdjustmentVitals.qml) (revision c749ecd5dc413ce091250af652ccba4d96f7a582)
@@ -71,6 +71,7 @@
}
onOpened: {
+ _bphrEntry.setInitialFocus()
notificationText = notificationTextString
vTreatmentVitals.doTimerStop()
}
@@ -81,7 +82,7 @@
onCloseClicked: {
numPad.hide()
- numPad.visible = false
+// numPad.visible = false
vTreatmentVitals.doSkip()
}
Index: sources/gui/qml/pages/treatment/sections/TreatmentFlowsComponent.qml
===================================================================
diff -u -r863764371ec0a4569403135975a0a3f44e516163 -rc749ecd5dc413ce091250af652ccba4d96f7a582
--- sources/gui/qml/pages/treatment/sections/TreatmentFlowsComponent.qml (.../TreatmentFlowsComponent.qml) (revision 863764371ec0a4569403135975a0a3f44e516163)
+++ sources/gui/qml/pages/treatment/sections/TreatmentFlowsComponent.qml (.../TreatmentFlowsComponent.qml) (revision c749ecd5dc413ce091250af652ccba4d96f7a582)
@@ -45,8 +45,8 @@
}
font {
- pixelSize : 28
- weight : Font.Normal
+ pixelSize : Fonts.fontPixelContainerTitle
+ weight : Font.Medium
}
width : _root.width
@@ -75,7 +75,7 @@
width : Variables.treatmentFlowsComponentWidth
topText : value !== undefined ? _root.value.toFixed(_root.precision) : Variables.emptyEntry
topTextFont.pixelSize : 60
- topTextFont.weight : Font.Medium
+ topTextFont.weight : Font.Light
bottomText : _root.unitText
bottomTextFont.pixelSize: 22
bottomTextTopMargin : Variables.defaultMargin
Index: sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml
===================================================================
diff -u -r601289deb20f7059b3af5bb19e16f53974262ceb -rc749ecd5dc413ce091250af652ccba4d96f7a582
--- sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml (.../TreatmentSaline.qml) (revision 601289deb20f7059b3af5bb19e16f53974262ceb)
+++ sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml (.../TreatmentSaline.qml) (revision c749ecd5dc413ce091250af652ccba4d96f7a582)
@@ -43,25 +43,23 @@
isStarted ? _private.textStop :
_root.buttonText
- header.title : qsTr("Saline" )
+ header.title : qsTr("Fluid Delivery" )
QtObject { id: _private
readonly property string textStart : qsTr("Start Bolus") + "" + textVolumeTarget + "<\b>"
readonly property string textStop : qsTr("Stop Bolus" ) + "" + textVolumeTarget + "<\b>"
readonly property string textVolumeTarget : " (" + valueTarget + unit + ")"
- readonly property string mesgDisabled : qsTr("Maximum cumulative saline bolus volume delivered")
- readonly property string mesgWaitForPump : "" // qsTr("Saline Bolus is starting") // Not sure if we shouls show any message at this point
- readonly property string mesgRejectReason : vTreatmentAdjustmentSaline.adjustment_ReasonText
}
contentItem: Column { id :_content
spacing : Variables.defaultMargin * 3
Text { id: _descriptionText
objectName: "salineDescriptionText"
- text : isStarted ? ("%1").arg(qsTr("Delivering Saline")) : qsTr("Total Saline Delivered")
+ text : isStarted ? ("%1").arg(qsTr("Delivering Fluid")) : qsTr("Total Fluid Delivered")
height : Variables.contentHeight
font.pixelSize : Fonts.fontPixelFluidText
+ font.weight : Font.Medium
color : isStarted ? Colors.progressBarSaline : Colors.fluidText
horizontalAlignment: Text.AlignHCenter
}
@@ -129,11 +127,4 @@
}
}
}
- // TODO:
-// notification {
-// visible : true
-// text : isDisabled ? _private.mesgDisabled :
-// isWaitPump ? _private.mesgWaitForPump :
-// _private.mesgRejectReason
-// }
}
Index: sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml
===================================================================
diff -u -rf2aa3ee850de1023cfc011b845ed0364d251b749 -rc749ecd5dc413ce091250af652ccba4d96f7a582
--- sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision f2aa3ee850de1023cfc011b845ed0364d251b749)
+++ sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision c749ecd5dc413ce091250af652ccba4d96f7a582)
@@ -139,12 +139,4 @@
}
}
}
-
- // TODO
-// notification {
-// visible : true
-// text : ufInfoText
-// textColor : ufInfoTextColor
-// }
-
}
Index: sources/view/dd/data/VDDValvesStatesData.cpp
===================================================================
diff -u -r9760eecfc557430078d5ef4ec6f9bc2ec423bfc1 -rc749ecd5dc413ce091250af652ccba4d96f7a582
--- sources/view/dd/data/VDDValvesStatesData.cpp (.../VDDValvesStatesData.cpp) (revision 9760eecfc557430078d5ef4ec6f9bc2ec423bfc1)
+++ sources/view/dd/data/VDDValvesStatesData.cpp (.../VDDValvesStatesData.cpp) (revision c749ecd5dc413ce091250af652ccba4d96f7a582)
@@ -48,11 +48,11 @@
balancingChamberValve7 ( vData.mValvesStatus.at( GuiDDValves::D26_VALV ));
balancingChamberValve8 ( vData.mValvesStatus.at( GuiDDValves::D22_VALV ));
- spareValve0 ( vData.mValvesStatus.at( GuiDDValves::D79_PMP_VALV )); // Start of spare valve group
+ spareValve0 ( vData.mValvesStatus.at( GuiDDValves::D88_79_VALV )); // Start of spare valve group
spareValve1 ( vData.mValvesStatus.at( GuiDDValves::D83_VALV ));
spareValve2 ( vData.mValvesStatus.at( GuiDDValves::D91_VALV ));
- spareValve3 ( vData.mValvesStatus.at( GuiDDValves::SPARE3_VALV ));
- spareValve4 ( vData.mValvesStatus.at( GuiDDValves::SPARE4_VALV ));
+ spareValve3 ( vData.mValvesStatus.at( GuiDDValves::D104_VALV ));
+ spareValve4 ( vData.mValvesStatus.at( GuiDDValves::D95_VALV ));
spareValve5 ( vData.mValvesStatus.at( GuiDDValves::SPARE5_VALV ));
spareValve6 ( vData.mValvesStatus.at( GuiDDValves::D100_VALV ));
spareValve7 ( vData.mValvesStatus.at( GuiDDValves::SPARE7_VALV ));