Index: denali.qrc
===================================================================
diff -u -rf148379112a69d1c52027f2667e95f3f96d948ad -r45617764a63d5573bfb942b039f2854ed25ba15d
--- denali.qrc (.../denali.qrc) (revision f148379112a69d1c52027f2667e95f3f96d948ad)
+++ denali.qrc (.../denali.qrc) (revision 45617764a63d5573bfb942b039f2854ed25ba15d)
@@ -73,7 +73,6 @@
sources/gui/qml/pages/treatment/sections/TreatmentPressure.qml
sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml
sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml
- sources/gui/qml/pages/treatment/sections/TreatmentInfusion.qml
sources/gui/qml/pages/treatment/sections/TreatmentTime.qml
Index: main.cpp
===================================================================
diff -u -rd3f916066c2d10c10fffa91fd8a7e5ac6dd86c7d -r45617764a63d5573bfb942b039f2854ed25ba15d
--- main.cpp (.../main.cpp) (revision d3f916066c2d10c10fffa91fd8a7e5ac6dd86c7d)
+++ main.cpp (.../main.cpp) (revision 45617764a63d5573bfb942b039f2854ed25ba15d)
@@ -100,31 +100,31 @@
parser.addHelpOption();
parser.addVersionOption();
- // ---
+ // --- -c : canOut
QCommandLineOption optionConsoleoutCanInterface(
QStringList() << "c" << "canOut",
QCoreApplication::translate("main", "Show the Can Frame Output"));
parser.addOption(optionConsoleoutCanInterface);
- // ---
+ // --- -m : msgOut
QCommandLineOption optionConsoleoutFrameInterface(
QStringList() << "m" << "msgOut",
QCoreApplication::translate("main", "Show the Message Output"));
parser.addOption(optionConsoleoutFrameInterface);
- // ---
+ // --- -0 : disable-keep-awake
QCommandLineOption optionSendEmptyKeepAwake(QStringList() << "0" << "disable-keep-awake",
QCoreApplication::translate("main", "Disable send low priority, empty message on the CANBus just to keep UI board CAN driver awake"));
parser.addOption(optionSendEmptyKeepAwake);
- // ---
+ // --- -i : fake-interval
QCommandLineOption optionFakeInterval(
QStringList() << "i" << "fake-interval",
QCoreApplication::translate("main", "Test fake message interval(ms)"),
QCoreApplication::translate("main", "interval"));
parser.addOption(optionFakeInterval);
- // ---
+ // --- -f : fake-message
QCommandLineOption optionFakeData(
QStringList() << "f" << "fake-message",
QCoreApplication::translate("main", "Test fake message data\n"
@@ -133,19 +133,19 @@
QCoreApplication::translate("main", "data"));
parser.addOption(optionFakeData);
- // ---
+ // --- -b : fake-message-seq-atbegin
QCommandLineOption optionFakeSeqAtBegin(
QStringList() << "b" << "fake-message-seq-atbegin",
QCoreApplication::translate("main", "Test fake message sequence at the beginning of the frame"));
parser.addOption(optionFakeSeqAtBegin);
- // ---
+ // --- -u : disable-unhandled-report
QCommandLineOption optionDisableHunhandledReport(QStringList() << "u" << "disable-unhandled-report",
QCoreApplication::translate("main", "Disable unhandled messages report as an error in the log"));
parser.addOption(optionDisableHunhandledReport);
- // ---
+ // --- parse command lines
parser.process(*qApp);
gConsoleoutCanInterface = parser.isSet(optionConsoleoutCanInterface );
Index: sources/gui/qml/components/TouchRect.qml
===================================================================
diff -u -r7edbf109108511ddf6066758bdb7aa29f9d8fad3 -r45617764a63d5573bfb942b039f2854ed25ba15d
--- sources/gui/qml/components/TouchRect.qml (.../TouchRect.qml) (revision 7edbf109108511ddf6066758bdb7aa29f9d8fad3)
+++ sources/gui/qml/components/TouchRect.qml (.../TouchRect.qml) (revision 45617764a63d5573bfb942b039f2854ed25ba15d)
@@ -56,10 +56,6 @@
}
}
- onBackgroundColorChanged: {
- _root.color = backgroundColor
- }
-
onDisabledChanged: {
if (disabled) {
text.color = Colors.textDisableButton
Index: sources/gui/qml/globals/Colors.qml
===================================================================
diff -u -rf148379112a69d1c52027f2667e95f3f96d948ad -r45617764a63d5573bfb942b039f2854ed25ba15d
--- sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision f148379112a69d1c52027f2667e95f3f96d948ad)
+++ sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 45617764a63d5573bfb942b039f2854ed25ba15d)
@@ -62,9 +62,9 @@
readonly property color pressuresArterialBar : "#31bcdb"
readonly property color pressuresVenousBar : "#c568ed"
- readonly property color infusionText : "white"
- readonly property color infusionValue : "white"
- readonly property color infusionUnit : "#708795"
+ readonly property color fluidText : "white"
+ readonly property color fluidValue : "white"
+ readonly property color fluidUnit : "#708795"
readonly property color textNotificationNoneBg : "white"
readonly property color textNotificationNoneFg : "#1b2b3e"
Index: sources/gui/qml/globals/Fonts.qml
===================================================================
diff -u -rf148379112a69d1c52027f2667e95f3f96d948ad -r45617764a63d5573bfb942b039f2854ed25ba15d
--- sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision f148379112a69d1c52027f2667e95f3f96d948ad)
+++ sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision 45617764a63d5573bfb942b039f2854ed25ba15d)
@@ -38,9 +38,10 @@
readonly property int fontPixelPresseuresText : 22
- readonly property int fontPixelInfusionText : 22
- readonly property int fontPixelInfusionValue : 32
- readonly property int fontPixelInfusionUnit : 22
+ readonly property int fontPixelFluidText : 22
+ readonly property int fontPixelFluidValue : 32
+ readonly property int fontPixelFluidUnit : 22
+ readonly property int fontPixelFluidVolume : 16
readonly property int fontPixelConfirm : 19
Index: sources/gui/qml/globals/Variables.qml
===================================================================
diff -u -rf148379112a69d1c52027f2667e95f3f96d948ad -r45617764a63d5573bfb942b039f2854ed25ba15d
--- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision f148379112a69d1c52027f2667e95f3f96d948ad)
+++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 45617764a63d5573bfb942b039f2854ed25ba15d)
@@ -60,7 +60,7 @@
readonly property int progressbarHeight : 30
- readonly property int progressbarInfusionHeight : 5
+ readonly property int progressbarFluidHeight: 5
readonly property int sliderTextMargin : 20
Index: sources/gui/qml/main.qml
===================================================================
diff -u -r5127d2235320d63f9342179395c35bffc1c57528 -r45617764a63d5573bfb942b039f2854ed25ba15d
--- sources/gui/qml/main.qml (.../main.qml) (revision 5127d2235320d63f9342179395c35bffc1c57528)
+++ sources/gui/qml/main.qml (.../main.qml) (revision 45617764a63d5573bfb942b039f2854ed25ba15d)
@@ -170,16 +170,16 @@
// 9 - Others
Text { // TEST : Application version should be moved into the information screen later.
color: Colors.textMain
- x: 1172
- y: 767
- width: 104
- height: 27
- text: Qt.application.version
+ anchors {
+ right: parent.right
+ margins: 10
+ bottom: parent.bottom
+ }
horizontalAlignment: Text.AlignRight
- anchors.bottom: parent.bottom
- anchors.bottomMargin: 6
- anchors.right: parent.right
- anchors.rightMargin: 4
+ verticalAlignment: Text.AlignBottom
+
+ height: Variables.mainMenuHeight
+ text: Qt.application.version
font.pixelSize: 14
}
}
Index: sources/gui/qml/pages/treatment/TreatmentStart.qml
===================================================================
diff -u -r8f6f7c11390e3ed6d918f1717d8e8b7ae5b7e5c6 -r45617764a63d5573bfb942b039f2854ed25ba15d
--- sources/gui/qml/pages/treatment/TreatmentStart.qml (.../TreatmentStart.qml) (revision 8f6f7c11390e3ed6d918f1717d8e8b7ae5b7e5c6)
+++ sources/gui/qml/pages/treatment/TreatmentStart.qml (.../TreatmentStart.qml) (revision 45617764a63d5573bfb942b039f2854ed25ba15d)
@@ -34,8 +34,8 @@
property int rightColumnX : 875
property int row1Y : 100
- property int row2Y : 320
- property int row3Y : 570
+ property int row2Y : 290 // 320
+ property int row3Y : 540 // 570
property int lineLength : 450
property int leftLinesX : 0
@@ -88,16 +88,24 @@
valueEx : 0
}
Line { x: rightLinesX; y: row1LineY; length: lineLength }
- TreatmentFluid { id: _fluidManagementTouchArea
+ TreatmentFluid { id: _SalineTouchArea
+ // TODO : Another component should be inherited from this for Saline
+ buttonText: qsTr("START BOLUS")
+
x : rightColumnX
y : row2Y
width : _flowsTouchArea.width
+ title : qsTr("SALINE BOLUS")
}
Line { x: rightLinesX; y: row2LineY; length: lineLength; }
- TreatmentInfusion { id: _solutionInfusionTouchArea
+ TreatmentFluid { id: _heparinTouchArea
+ // TODO : Another component should be inherited from this for Heparin
+ buttonText: qsTr("PAUSE DELIVERY")
+
x : rightColumnX
y : row3Y
width : _flowsTouchArea.width
+ title : qsTr("HEPARIN")
}
// ---------- Center
Index: sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml
===================================================================
diff -u -rcd7de5f6d239a11615ba8c6c03339a10996486ca -r45617764a63d5573bfb942b039f2854ed25ba15d
--- sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml (.../TreatmentFluid.qml) (revision cd7de5f6d239a11615ba8c6c03339a10996486ca)
+++ sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml (.../TreatmentFluid.qml) (revision 45617764a63d5573bfb942b039f2854ed25ba15d)
@@ -32,11 +32,18 @@
isTouchable: false
title: qsTr("FLUID MANAGEMENT")
titleVSpacing: 40
- TouchRect {
- y : 60
+
+ property int rowTextSpacing : 10
+ property int volumeTextWidth: 60
+
+ // may need to be removed later when created separate Saline/Heparin object
+ property string buttonText: ""
+
+ TouchRect { id: _startButton
+ y : 45
width : 340
height : 55
- text.text: qsTr("START BOLUS (100 mL)")
+ text.text: buttonText
text.font {
weight: Font.DemiBold
pixelSize : 20
@@ -45,4 +52,115 @@
animated: true
duration: 100
}
+
+ ProgressBar { id: _fluidProgressBar
+ anchors {
+ top: _startButton.bottom
+ topMargin: 50
+ }
+ width : parent.width
+ height : Variables.progressbarFluidHeight
+ minText.visible : false
+ maxText.visible : false
+ marker.visible : false
+
+ value : 0
+
+ // TEST begin : simulation code
+ minimum : 0 // TEST : only test values
+ maximum : 100 // TEST : only test values
+ NumberAnimation on value {
+ duration: 10000
+ from : _fluidProgressBar.minimum
+ to : _fluidProgressBar.maximum
+ //loops: Animation.Infinite
+ onFinished: {
+ _cumulativeValue.valueLast += _fluidProgressBar.value
+ restart()
+ }
+ }
+ onValueChanged: {
+ _cumulativeValue.value = _cumulativeValue.valueLast + _fluidProgressBar.value
+ }
+ // TEST end
+
+ Text { id: _fluidText
+ anchors {
+ left : parent.left
+ bottom : parent.bottom
+ bottomMargin: 15
+ }
+ width: parent.width
+ text: qsTr("Volume Delivered")
+ font.pixelSize: Fonts.fontPixelFluidText
+ color: Colors.fluidText
+ Text { id: _fluidVolume
+ width: volumeTextWidth
+ anchors {
+ right: parent.right
+ baseline: parent.baseline
+ }
+ text: qsTr("(100 mL)")
+ font.pixelSize: Fonts.fontPixelFluidVolume
+ color: Colors.fluidUnit
+ }
+ Text { id: _fluidUnit
+ anchors {
+ right: parent.right
+ rightMargin: volumeTextWidth + rowTextSpacing
+ baseline: parent.baseline
+ }
+ text: qsTr("mL")
+ font.pixelSize: Fonts.fontPixelFluidUnit
+ color: Colors.fluidUnit
+ }
+ Text { id: _fluidValue
+ anchors {
+ right: _fluidUnit.left
+ rightMargin: rowTextSpacing
+ baseline: parent.baseline
+ }
+ horizontalAlignment: Text.AlignRight
+ text: _fluidProgressBar.value
+ width: 60
+ font.pixelSize: Fonts.fontPixelFluidValue
+ color: Colors.fluidText
+ }
+ }
+ }
+ Text { id: _cumulativeText
+ anchors {
+ left : parent.left
+ top : _fluidProgressBar.bottom
+ topMargin : 15
+ }
+ width: parent.width
+ text: qsTr("Cumulative Delivery")
+ font.pixelSize: Fonts.fontPixelFluidText
+ color: Colors.fluidText
+ Text { id: _cumulativeUnit
+ anchors {
+ right: parent.right
+ rightMargin: volumeTextWidth + rowTextSpacing
+ baseline: parent.baseline
+ }
+ text: qsTr("mL")
+ font.pixelSize: Fonts.fontPixelFluidUnit
+ color: Colors.fluidUnit
+ }
+ Text { id: _cumulativeValue
+ property int valueLast : 0 // needs to be bound to a model to keep cumulative value
+ property int value : 0 // needs to be bound to a model to keep cumulative value
+ anchors {
+ right: _cumulativeUnit.left
+ rightMargin: rowTextSpacing
+ baseline: parent.baseline
+ }
+ horizontalAlignment: Text.AlignRight
+ text: value
+ width: 60
+ font.pixelSize: Fonts.fontPixelFluidValue
+ color: Colors.fluidText
+ }
+ }
}
Fisheye: Tag 45617764a63d5573bfb942b039f2854ed25ba15d refers to a dead (removed) revision in file `sources/gui/qml/pages/treatment/sections/TreatmentInfusion.qml'.
Fisheye: No comparison available. Pass `N' to diff?
Index: sources/gui/qml/pages/treatment/sections/TreatmentPressure.qml
===================================================================
diff -u -reea63d68fc0fb269f8dec64d99f488bcad117220 -r45617764a63d5573bfb942b039f2854ed25ba15d
--- sources/gui/qml/pages/treatment/sections/TreatmentPressure.qml (.../TreatmentPressure.qml) (revision eea63d68fc0fb269f8dec64d99f488bcad117220)
+++ sources/gui/qml/pages/treatment/sections/TreatmentPressure.qml (.../TreatmentPressure.qml) (revision 45617764a63d5573bfb942b039f2854ed25ba15d)
@@ -48,11 +48,13 @@
orientation: TouchArea.Orientation.Horizontal
title: qsTr("PRESSURE") + " " + qsTr("(mmHg)")
+ titleVSpacing: 100
+
VTreatmentPressureOcclusion { id: vTreatmentPressureOcclusion }
RangeBar { id: _arterialRangeBar
x: 0
- y: 75
+ y: titleVSpacing
width : 175
height : 15
rangebar.color: Colors.pressuresArterialBar
@@ -79,7 +81,7 @@
RangeBar { id: _venousRangeBar
x: 200
- y: 75
+ y: titleVSpacing
width : 175
height : 15
rangebar.color: Colors.pressuresVenousBar
Index: sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml
===================================================================
diff -u -rcd7de5f6d239a11615ba8c6c03339a10996486ca -r45617764a63d5573bfb942b039f2854ed25ba15d
--- sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml (.../TreatmentVitals.qml) (revision cd7de5f6d239a11615ba8c6c03339a10996486ca)
+++ sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml (.../TreatmentVitals.qml) (revision 45617764a63d5573bfb942b039f2854ed25ba15d)
@@ -33,6 +33,8 @@
isTouchable: false
orientation: TouchArea.Orientation.Vertical
title: qsTr("VITALS")
+ titleVSpacing: 40
+
components: [
TextRect { id: _bloodPressure
labelHeight: 60