Index: SDDs/MainTreatmentScreen.puml
===================================================================
diff -u -rbb90e0e1a56f55ec4b698ed5afeb74962319a4dc -r9048646630717f980a852df54349805ba63773e0
--- SDDs/MainTreatmentScreen.puml (.../MainTreatmentScreen.puml) (revision bb90e0e1a56f55ec4b698ed5afeb74962319a4dc)
+++ SDDs/MainTreatmentScreen.puml (.../MainTreatmentScreen.puml) (revision 9048646630717f980a852df54349805ba63773e0)
@@ -27,6 +27,7 @@
TD -> SW: MSG: [x4F: #3] \nTD treatment Set Points Data\n(U32) bloodFlow\n(U32) dialFlow\n(F32) dialTemp
SW -> UI: CMD: Update TX Set Points Data:\n(U32) bloodFlow\n(U32) dialFlow\n(F32) dialTemp
!include common_puml/Saline_Bolus_Data.puml
+ !include common_puml/Vitals_Data.puml
== Ultrafiltration ==
TD -> SW: MSG: [x3E: #4] \nTD Ultrafiltration Status Data\n(F32) setVolL\n(F32) tgtRateLHr\n(F32) volDelL\n(U32) ufState
SW -> UI: CMD: Update UF Status\n(F32) setVolL\n(F32) tgtRateLHr\n(F32) volDelL\n(U32) ufState
Index: leahi.pro
===================================================================
diff -u -rc1d0546e2d1a51ff919b2172ce647003359f0853 -r9048646630717f980a852df54349805ba63773e0
--- leahi.pro (.../leahi.pro) (revision c1d0546e2d1a51ff919b2172ce647003359f0853)
+++ leahi.pro (.../leahi.pro) (revision 9048646630717f980a852df54349805ba63773e0)
@@ -68,6 +68,10 @@
sources/model/dd/data \
sources/model/dd/adjustment \
sources/model/dd/adjustment/settings \
+ sources/model/fp \
+ sources/model/fp/data \
+ sources/model/fp/adjustment \
+ sources/model/fp/adjustment/settings \
sources/view \
sources/view/td \
sources/view/td/data \
@@ -77,6 +81,8 @@
sources/view/dd/data \
sources/view/confirm \
sources/view/settings \
+ sources/view/fp \
+ sources/view/fp/data \
\
sources/gui \
sources/utility \
@@ -130,6 +136,7 @@
common/AlarmDefs.h \
common/Compatible.h \
common/DDDefs.h \
+ common/FPDefs.h \
common/TDDefs.h \
common/MsgDefs.h \
\ # Main
@@ -155,6 +162,15 @@
sources/model/dd/data/MDDPressuresData.h \
sources/model/dd/data/MDDTemperaturesData.h \
sources/model/dd/data/MDDValvesStatesData.h \
+ sources/model/fp/adjustment/settings/MAdjustFPVersionsResponse.h \
+ sources/model/fp/data/MFPBoostPumpData.h \
+ sources/model/fp/data/MFPConductivityData.h \
+ sources/model/fp/data/MFPFlowData.h \
+ sources/model/fp/data/MFPLevelData.h \
+ sources/model/fp/data/MFPPressuresData.h \
+ sources/model/fp/data/MFPROPumpData.h \
+ sources/model/fp/data/MFPTemperatureData.h \
+ sources/model/fp/data/MFPValvesStatesData.h \
sources/model/td/adjustment/settings/MAdjustTDSerialNumberResponse.h \
sources/model/td/adjustment/settings/MAdjustTDVersionsRequest.h \
sources/model/td/adjustment/settings/MAdjustTDVersionsResponse.h \
@@ -199,6 +215,14 @@
sources/view/dd/data/VDDPressuresData.h \
sources/view/dd/data/VDDTemperaturesData.h \
sources/view/dd/data/VDDValvesStatesData.h \
+ sources/view/fp/data/VFPBoostPumpData.h \
+ sources/view/fp/data/VFPConductivityData.h \
+ sources/view/fp/data/VFPFlowData.h \
+ sources/view/fp/data/VFPLevelData.h \
+ sources/view/fp/data/VFPPressuresData.h \
+ sources/view/fp/data/VFPROPumpData.h \
+ sources/view/fp/data/VFPTemperatureData.h \
+ sources/view/fp/data/VFPValvesStatesData.h \
sources/view/hd/data/VTreatmentRanges.h \
sources/view/td/data/VTDAirBubbleData.h \
sources/view/td/data/VTDAirPumpData.h \
@@ -466,6 +490,15 @@
sources/model/dd/data/MDDPressuresData.cpp \
sources/model/dd/data/MDDTemperaturesData.cpp \
sources/model/dd/data/MDDValvesStatesData.cpp \
+ sources/model/fp/adjustment/settings/MAdjustFPVersionsResponse.cpp \
+ sources/model/fp/data/MFPBoostPumpData.cpp \
+ sources/model/fp/data/MFPConductivityData.cpp \
+ sources/model/fp/data/MFPFlowData.cpp \
+ sources/model/fp/data/MFPLevelData.cpp \
+ sources/model/fp/data/MFPPressuresData.cpp \
+ sources/model/fp/data/MFPROPumpData.cpp \
+ sources/model/fp/data/MFPTemperatureData.cpp \
+ sources/model/fp/data/MFPValvesStatesData.cpp \
sources/model/td/adjustment/settings/MAdjustTDSerialNumberResponse.cpp \
sources/model/td/adjustment/settings/MAdjustTDVersionsRequest.cpp \
sources/model/td/adjustment/settings/MAdjustTDVersionsResponse.cpp \
@@ -500,6 +533,14 @@
sources/view/dd/data/VDDPressuresData.cpp \
sources/view/dd/data/VDDTemperaturesData.cpp \
sources/view/dd/data/VDDValvesStatesData.cpp \
+ sources/view/fp/data/VFPBoostPumpData.cpp \
+ sources/view/fp/data/VFPConductivityData.cpp \
+ sources/view/fp/data/VFPFlowData.cpp \
+ sources/view/fp/data/VFPLevelData.cpp \
+ sources/view/fp/data/VFPPressuresData.cpp \
+ sources/view/fp/data/VFPROPumpData.cpp \
+ sources/view/fp/data/VFPTemperatureData.cpp \
+ sources/view/fp/data/VFPValvesStatesData.cpp \
sources/view/hd/data/post/VHDPOSTData.cpp \
sources/bluetooth/BluetoothInterface.cpp \
sources/cloudsync/CloudSyncController.cpp \
Index: leahi.qrc
===================================================================
diff -u -r40ddf63592b60608ae34aeb3099fe4e62ae45054 -r9048646630717f980a852df54349805ba63773e0
--- leahi.qrc (.../leahi.qrc) (revision 40ddf63592b60608ae34aeb3099fe4e62ae45054)
+++ leahi.qrc (.../leahi.qrc) (revision 9048646630717f980a852df54349805ba63773e0)
@@ -57,7 +57,6 @@
resources/images/diality-splash.png
resources/images/ArrowRight.png
resources/images/ArrowLeft.png
- resources/images/logo d Dark Transparent.png
resources/images/Close.png
resources/images/bell-on.png
resources/images/bell-off.png
@@ -97,14 +96,16 @@
resources/images/PauseOrange.png
resources/images/arrowsExpanding.png
resources/images/HomeBackground.png
- resources/images/Bluetooth.png
resources/images/CloudSync.png
resources/images/Information.png
resources/images/Storage.png
resources/images/help.png
resources/images/Menu_Dot.png
resources/images/ArrowLeftDisabled.png
resources/images/ArrowRightDisabled.png
+ resources/images/backspace.png
+ resources/images/Vitals.png
+ resources/images/Vitals_Red.png
sources/gui/qml/components/MainMenu.qml
@@ -143,7 +144,6 @@
sources/gui/qml/components/UltrafiltrationButton.qml
sources/gui/qml/components/ImageWave.qml
sources/gui/qml/components/ImageClock.qml
- sources/gui/qml/components/ImageLogoDDarkTransparent.qml
sources/gui/qml/components/DebugDataColumn.qml
sources/gui/qml/components/RangeSlider.qml
sources/gui/qml/components/MuteButton.qml
@@ -156,7 +156,6 @@
sources/gui/qml/components/FooterStatic.qml
sources/gui/qml/components/TimeEntry.qml
sources/gui/qml/components/Label.qml
- sources/gui/qml/components/EntryDialog.qml
sources/gui/qml/components/SliderArrows.qml
sources/gui/qml/components/QRCode.qml
sources/gui/qml/components/ContentArea.qml
@@ -166,6 +165,7 @@
sources/gui/qml/components/HeaderBarPopup.qml
sources/gui/qml/components/AlarmButtonRow.qml
sources/gui/qml/components/BaseComboBox.qml
+ sources/gui/qml/components/VitalsButton.qml
sources/gui/qml/compounds/PressureRangeSlider.qml
@@ -174,6 +174,7 @@
sources/gui/qml/compounds/CheckListView.qml
sources/gui/qml/compounds/TouchGrid.qml
sources/gui/qml/compounds/BPHREntry.qml
+ sources/gui/qml/compounds/NumPad.qml
sources/gui/qml/compounds/LabelUnitContainer.qml
sources/gui/qml/compounds/ValueAdjuster.qml
@@ -275,6 +276,8 @@
sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml
sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml
sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml
+ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitals.qml
+ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentVitalsInterval.qml
sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml
Index: sources/canbus/MessageGlobals.h
===================================================================
diff -u -rb80f8f84f21f86ad4c962a2c690447c572498e0b -r9048646630717f980a852df54349805ba63773e0
--- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision b80f8f84f21f86ad4c962a2c690447c572498e0b)
+++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 9048646630717f980a852df54349805ba63773e0)
@@ -77,6 +77,7 @@
{Gui::GuiActionType::ID_DialysateOutletFlow , 13 * 4 }, //13 parameters each 4bytes
{Gui::GuiActionType::ID_PressureOcclusion , 12 * 4 }, //12 parameters each 4bytes
{Gui::GuiActionType::ID_Saline , 4 * 4 }, // 4 parameters each 4bytes
+ {Gui::GuiActionType::ID_Vitals , 3 * 4 }, // 3 parameters each 4bytes
{Gui::GuiActionType::ID_Ultrafiltration , 4 * 4 }, // 4 parameters each 4bytes
{Gui::GuiActionType::ID_Heparin , 2 * 4 }, // 2 parameters each 4bytes
{Gui::GuiActionType::ID_Rinseback , 6 * 4 }, // 6 parameters each 4bytes
@@ -217,6 +218,10 @@
{Gui::GuiActionType::ID_AdjustSalineRsp , 3 * 4 }, // 3 parameters each 4bytes
// ----
+ {Gui::GuiActionType::ID_AdjustVitalsReq , 0 * 4 }, // 0 parameter each 4bytes
+ {Gui::GuiActionType::ID_AdjustVitalsRsp , 2 * 4 }, // 2 parameters each 4bytes
+
+ // ----
{Gui::GuiActionType::ID_AdjustHeparinReq , 1 * 4 }, // 1 parameter each 4bytes
{Gui::GuiActionType::ID_AdjustHeparinRsp , 2 * 4 }, // 3 parameters each 4bytes
Index: sources/canbus/MessageInterpreter.cpp
===================================================================
diff -u -rb80f8f84f21f86ad4c962a2c690447c572498e0b -r9048646630717f980a852df54349805ba63773e0
--- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision b80f8f84f21f86ad4c962a2c690447c572498e0b)
+++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 9048646630717f980a852df54349805ba63773e0)
@@ -200,7 +200,6 @@
vCanId = Can::Can_Id::eChlid_UI_TD ;
vPayload.clear();
int length = vData.length();
-
// DEBUG: LOG_EVENT(QString("0x%0").arg(vActionId, 4, 16,QChar('0')));
switch (vActionId) { // notice we are in transmit mode
case Gui::GuiActionType::ID_Acknow: // len: 0, can have zero len
@@ -250,6 +249,7 @@
case Gui::GuiActionType::ID_AdjustBloodDialysateReq : INTERPRET_TRANSMIT_MESSAGE(AdjustBloodDialysateRequestData ); break;
case Gui::GuiActionType::ID_AdjustPressuresLimitsReq : INTERPRET_TRANSMIT_MESSAGE(AdjustPressuresLimitsRequestData ); break;
case Gui::GuiActionType::ID_AdjustSalineReq : INTERPRET_TRANSMIT_MESSAGE(AdjustSalineRequestData ); break;
+ case Gui::GuiActionType::ID_AdjustVitalsReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustVitalsRequestData ); break;
case Gui::GuiActionType::ID_AdjustHeparinReq : INTERPRET_TRANSMIT_MESSAGE(AdjustHeparinRequestData ); break;
// in-treatment - ultrafiltration
case Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq : INTERPRET_TRANSMIT_MESSAGE(AdjustUltrafiltrationStateRequestData ); break;
@@ -514,6 +514,7 @@
case Gui::GuiActionType::ID_DialysateOutletFlow : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DialysateOutletFlow ); break;
case Gui::GuiActionType::ID_PressureOcclusion : ok = notify(vMessage, vData, Gui::GuiActionType::ID_PressureOcclusion ); break;
case Gui::GuiActionType::ID_Saline : ok = notify(vMessage, vData, Gui::GuiActionType::ID_Saline ); break;
+ case Gui::GuiActionType::ID_Vitals : ok = notify(vMessage, vData, Gui::GuiActionType::ID_Vitals ); break;
case Gui::GuiActionType::ID_Heparin : ok = notify(vMessage, vData, Gui::GuiActionType::ID_Heparin ); break;
case Gui::GuiActionType::ID_Rinseback : ok = notify(vMessage, vData, Gui::GuiActionType::ID_Rinseback ); break;
case Gui::GuiActionType::ID_Recirculate : ok = notify(vMessage, vData, Gui::GuiActionType::ID_Recirculate ); break;
@@ -526,6 +527,7 @@
case Gui::GuiActionType::ID_AdjustBloodDialysateRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustBloodDialysateRsp ); break;
case Gui::GuiActionType::ID_AdjustPressuresLimitsRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustPressuresLimitsRsp ); break;
case Gui::GuiActionType::ID_AdjustSalineRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustSalineRsp ); break;
+ case Gui::GuiActionType::ID_AdjustVitalsRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustVitalsRsp ); break;
case Gui::GuiActionType::ID_AdjustUltrafiltrationStateRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustUltrafiltrationStateRsp ); break;
case Gui::GuiActionType::ID_AdjustHeparinRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustHeparinRsp ); break;
case Gui::GuiActionType::ID_AdjustRinsebackRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustRinsebackRsp ); break;
Index: sources/gui/GuiGlobals.cpp
===================================================================
diff -u -rb80f8f84f21f86ad4c962a2c690447c572498e0b -r9048646630717f980a852df54349805ba63773e0
--- sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision b80f8f84f21f86ad4c962a2c690447c572498e0b)
+++ sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 9048646630717f980a852df54349805ba63773e0)
@@ -133,6 +133,7 @@
#include "VTreatmentAdjustmentUltrafiltrationEdit.h"
#include "VTreatmentAdjustmentUltrafiltrationConfirm.h"
#include "VTreatmentAdjustmentSaline.h"
+#include "VTreatmentAdjustmentVitals.h"
#include "VTreatmentAdjustmentHeparin.h"
#include "VTreatmentAdjustmentRinseback.h"
#include "VTreatmentAdjustmentRecirculate.h"
Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -rbea93d8daa7743d63fd5728f0d498d489da59c6c -r9048646630717f980a852df54349805ba63773e0
--- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision bea93d8daa7743d63fd5728f0d498d489da59c6c)
+++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 9048646630717f980a852df54349805ba63773e0)
@@ -100,6 +100,7 @@
ID_AdjustVersionsTDReq = 0x1500, // 21 // ID_TDVersionsRxq - TD Version request received //// ----- @LEAHIZED
ID_AdjustVersionsTDRsp = 0x0E00, // 14 //// ----- @LEAHIZED
ID_AdjustVersionsDDRsp = 0x0F00, // 15 //// ----- @LEAHIZED
+ ID_AdjustVersionsFPRsp = 0x5A00, // 90 //// ----- @LEAHIZED
ID_AdjustSerialTDRsp = 0x5100, // 81 //// ----- @LEAHIZED
ID_AdjustSerialDDRsp = 0x5200, // 82 //// ----- @LEAHIZED
@@ -165,7 +166,7 @@
ID_DGFilterFlushData = 0x600F, // ?? //// ----- @CRAPIZED: had to change to avoid duplication
ID_AdjustWaterSampleReq = 0x5D00, // 93
ID_AdjustWaterSampleRsp = 0x5E00, // 94
- ID_AdjustWaterSampleResultReq = 0x5F00, // 95 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response
+ ID_AdjustWaterSampleResultReq = 0x5F0F, // 95 //// ----- @CRAPIZED: had to change to avoid duplication
// 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
@@ -210,6 +211,16 @@
ID_DDGenDialysateData = 0x2F00, // 47 //// ----- @LEAHIZED
ID_DDBloodLeakData = 0x6000, // 96 //// ----- TODO: Payload subject to change given FW implementation
+ // FP Data Messages
+ ID_FPValvesStatesData = 0x3100, // 49 //// ----- @LEAHIZED
+ ID_FPROPumpData = 0x3200, // 50 //// ----- @LEAHIZED
+ ID_FPPressuresData = 0x3400, // 52 //// ----- @LEAHIZED
+ ID_FPLevelData = 0x3500, // 53 //// ----- @LEAHIZED
+ ID_FPFlowSensorData = 0x3600, // 54 //// ----- @LEAHIZED
+ ID_FPConductivityData = 0x3700, // 55 //// ----- @LEAHIZED
+ ID_FPTemperaturesData = 0x3900, // 57 //// ----- @LEAHIZED
+ ID_FPROBoosterPumpData = 0x5000, // 80 //// ----- @LEAHIZED
+
// HD Data Messages
ID_HDAccelerometerData = 0x3300, // 51
ID_HDSyringePumpData = 0x6900, // 105
@@ -235,8 +246,8 @@
ID_AdjustPressuresLimitsReq = 0x4600, // 70
ID_AdjustPressuresLimitsRsp = 0x4700, // 71
- ID_AdjustSalineReq = 0x5E00, // 94
- ID_AdjustSalineRsp = 0x5F00, // 95
+ ID_AdjustSalineReq = 0x5F00, // 95
+ ID_AdjustSalineRsp = 0x6000, // 96
ID_AdjustVitalsReq = 0x6300, // 99
ID_AdjustVitalsRsp = 0x6400, // 100
@@ -393,6 +404,9 @@
Q_ENUM(DD_Disinfect_States)
Q_ENUM(DD_Heat_UI_States)
Q_ENUM(DD_Valves)
+
+ #include "FPDefs.h"
+ Q_ENUM(FP_Valves)
};
// to be able to use the enum as signal/slot parameter
@@ -468,6 +482,9 @@
// DD Valves
typedef GuiActions::DD_Valves GuiDDValves;
+ // FP Valves
+ typedef GuiActions::FP_Valves GuiFPValves;
+
typedef QMap GuiStringIndexMap;
typedef QPair GuiStringIndexMapItem;
typedef QMapIterator GuiStringIndexMapIterator;
Index: sources/gui/qml/components/CloseButton.qml
===================================================================
diff -u -r16a8f25568b4636ebc31e76c86a8031940cc4ad7 -r9048646630717f980a852df54349805ba63773e0
--- sources/gui/qml/components/CloseButton.qml (.../CloseButton.qml) (revision 16a8f25568b4636ebc31e76c86a8031940cc4ad7)
+++ sources/gui/qml/components/CloseButton.qml (.../CloseButton.qml) (revision 9048646630717f980a852df54349805ba63773e0)
@@ -29,7 +29,7 @@
anchors {
top : parent.top
- left : parent.left
+ right : parent.right
margins : 35
}
Image { id : _image
Index: sources/gui/qml/components/HeaderBar.qml
===================================================================
diff -u -rbe918124565d9f0add371e25782804f19e0cba17 -r9048646630717f980a852df54349805ba63773e0
--- sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision be918124565d9f0add371e25782804f19e0cba17)
+++ sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision 9048646630717f980a852df54349805ba63773e0)
@@ -17,6 +17,8 @@
GradientStop { position: 0.8; color: Qt.darker (Colors.backgroundMain, 1.2) }
}
+ function vitalsRecorded() { _vitalsButton.pulseAnimation.start() }
+
MouseArea { id: _mouseArea
anchors.fill : parent
// TODO: disable this later. this is only for diagnostic purpose.
@@ -103,13 +105,23 @@
Row { id: _headerButtonRow
height : parent.height
- spacing : 30
+ spacing : 25
anchors {
verticalCenter: parent.verticalCenter
right : parent.right
rightMargin : _headerButtonRow.spacing
}
+ VitalsButton { id : _vitalsButton
+ extraSpace : _headerButtonRow.spacing
+ visible : vTDOpMode.preTreatment ||
+ vTDOpMode.inTreatment ||
+ vTDOpMode.postTreatment ||
+ vTDOpMode.validateParameters
+
+ onPressed : _treatmentAdjustmentVitals.open()
+ }
+
IconButton { id : _prescriptionButton
iconSize : Variables.headerIconDiameter
iconImageSource : "qrc:/images/iPrescription"
@@ -125,18 +137,10 @@
iconSize : Variables.headerIconDiameter
iconImageSource : "qrc:/images/iWifi"
extraSpace : _headerButtonRow.spacing
+
onPressed : _headerbarWifi.openDialog(_wifiButton)
}
- IconButton { id : _bluetoothButton
- iconSize : Variables.headerIconDiameter
- iconImageSource : "qrc:/images/iBluetooth"
- extraSpace : _headerButtonRow.spacing
- enabled : false
-
- onPressed : print("Bluetooth button pressed!")
- }
-
IconButton { id : _cloudSyncButton
iconSize : Variables.headerIconDiameter
iconImageSource : "qrc:/images/iCloudSync"
Index: sources/gui/qml/components/TextEntry.qml
===================================================================
diff -u -r16a8f25568b4636ebc31e76c86a8031940cc4ad7 -r9048646630717f980a852df54349805ba63773e0
--- sources/gui/qml/components/TextEntry.qml (.../TextEntry.qml) (revision 16a8f25568b4636ebc31e76c86a8031940cc4ad7)
+++ sources/gui/qml/components/TextEntry.qml (.../TextEntry.qml) (revision 9048646630717f980a852df54349805ba63773e0)
@@ -36,6 +36,8 @@
property alias text : _input.text
property bool hasCursor : true
property alias lengthMax : _input.maximumLength
+ property bool useQtNumPad : true
+ property bool showPlaceHolderText: false
readonly property alias isValid : _input.acceptableInput
@@ -63,7 +65,10 @@
if ( _root.hasCursor ) {
_input.selectAll()
}
- _keyboard.setVisible(true)
+
+ if (useQtNumPad) {
+ _keyboard.setVisible(true)
+ }
}
else {
editingFinished()
@@ -108,6 +113,17 @@
onFocusChanged : doFocus(focus)
}
+ Text { id: _placeHolderText
+ text : Variables.emptyEntry
+ anchors.centerIn : _input
+ horizontalAlignment : Text.AlignRight
+ font.pixelSize : Fonts.fontPixelValueControl
+ color : Colors.offWhite
+ visible : _input.text.length === 0 &&
+ ! _input.activeFocus &&
+ _root.showPlaceHolderText
+ }
+
Line { id : _line
visible : hasCursor
color : Colors.borderButtonHalfDarker
Index: sources/gui/qml/globals/Colors.qml
===================================================================
diff -u -r40ddf63592b60608ae34aeb3099fe4e62ae45054 -r9048646630717f980a852df54349805ba63773e0
--- sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 40ddf63592b60608ae34aeb3099fe4e62ae45054)
+++ sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 9048646630717f980a852df54349805ba63773e0)
@@ -137,6 +137,7 @@
readonly property color alarmTopBarNoneFg : white
readonly property color createTrProfileID : "#ffbb44"
+ readonly property color dropShadowDialogColor : "#4DFFF8E1"
readonly property color createTreatmentActive : "#3d8eef"
readonly property color createTreatmentInactive : backgroundRangeRect
Index: sources/gui/qml/globals/Fonts.qml
===================================================================
diff -u -r16a8f25568b4636ebc31e76c86a8031940cc4ad7 -r9048646630717f980a852df54349805ba63773e0
--- sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision 16a8f25568b4636ebc31e76c86a8031940cc4ad7)
+++ sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision 9048646630717f980a852df54349805ba63773e0)
@@ -56,7 +56,7 @@
readonly property int fontPixelFluidUnit : 22
readonly property int fontPixelFluidVolume : 16
- readonly property int fontPixelConfirm : 19
+ readonly property int fontPixelConfirm : 21
readonly property int fontPixelBack : 17
readonly property int fontPixelSliderMarker : 17
Index: sources/gui/qml/globals/Variables.qml
===================================================================
diff -u -r40ddf63592b60608ae34aeb3099fe4e62ae45054 -r9048646630717f980a852df54349805ba63773e0
--- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 40ddf63592b60608ae34aeb3099fe4e62ae45054)
+++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 9048646630717f980a852df54349805ba63773e0)
@@ -64,7 +64,7 @@
readonly property int touchRectWidth : 512 //K:D //425
readonly property int touchRectHeight : 85 //K:D //70
- readonly property int touchRectRadius : 15
+ readonly property int touchRectRadius : 10
readonly property int titleBottomPadding : 25
@@ -118,6 +118,8 @@
readonly property int sliderCircleDiameter : 30
readonly property int pressuresProgressbarWidth : 725
+ readonly property int numPadHeight : 675
+ readonly property int numPadWidth : 525
readonly property int treatmentFlowsComponentWidth : 150
readonly property int treatmentPressureTitleWidth : 125
@@ -181,13 +183,26 @@
readonly property int sliderAdjustButtonRightMargin : 50
readonly property int sliderAdjustPressAndHoldRefreshRate : 250
+ readonly property int adjustmentLabelUnitContainerHeight : 75
+ readonly property int adjustmentLabelUnitContainerWidth : 720
+
readonly property real sliderDefaultRoundTickMarkDiameter : 5
readonly property int sliderDefaultBodyHeight : 15
readonly property int circleButtonDefaultDiameter : 45
readonly property int noRejectReason : 0
+ readonly property int textBoxRadius : 5
+ readonly property int textBoxBorderWidth : 2
+ readonly property int adjustmentDialogWidth : applicationWidth * 0.7
+ readonly property int adjustmentDialogHeight : applicationHeight * 0.7
+ readonly property int adjustmentHeaderHeight : 120
+ readonly property int adjustmentButtonMargin : 30
+
+ readonly property int defaultButtonHeight : 60
+ readonly property int defaultButtonWidth : 244
+
// ---------- < PRS > Related Section ----------
// blood flow rate
readonly property int bloodFlowMin : 100 // PRS 30
@@ -248,7 +263,6 @@
// otherwise an extra RegExpValidator object will always created here.
readonly property var regExp_PatientID: /[A-Za-z0-9_\-\.]{1,64}/
-
readonly property string emptyEntry : "-- --"
readonly property string preTreatmentStepLabelCreate : qsTr("CREATE" )
Index: sources/gui/qml/main.qml
===================================================================
diff -u -rcc7aae88f15228ff37b840946818692e444718bf -r9048646630717f980a852df54349805ba63773e0
--- sources/gui/qml/main.qml (.../main.qml) (revision cc7aae88f15228ff37b840946818692e444718bf)
+++ sources/gui/qml/main.qml (.../main.qml) (revision 9048646630717f980a852df54349805ba63773e0)
@@ -124,6 +124,7 @@
import VTreatmentAdjustmentUltrafiltrationConfirm 0.1
import VTreatmentAdjustmentPressuresLimits 0.1
import VTreatmentAdjustmentSaline 0.1
+import VTreatmentAdjustmentVitals 0.1
import VTreatmentAdjustmentHeparin 0.1
import VTreatmentAdjustmentRinseback 0.1
import VTreatmentAdjustmentRecirculate 0.1
@@ -142,6 +143,7 @@
import "qrc:/globals"
import "qrc:/pages"
import "qrc:/pages/treatment"
+import "qrc:/pages/treatment/adjustments"
import "qrc:/pages/settings"
import "qrc:/components"
import "qrc:/dialogs"
@@ -275,6 +277,7 @@
VTreatmentRanges { id: vTreatmentRanges }
VTreatmentAdjustmentSaline { id: vTreatmentAdjustmentSaline }
+ VTreatmentAdjustmentVitals { id: vTreatmentAdjustmentVitals }
VTreatmentAdjustmentUltrafiltrationState { id: vTreatmentAdjustmentUltrafiltrationState }
VTreatmentAdjustmentUltrafiltrationEdit { id: vTreatmentAdjustmentUltrafiltrationEdit }
VTreatmentAdjustmentUltrafiltrationConfirm { id: vTreatmentAdjustmentUltrafiltrationConfirm }
@@ -360,6 +363,7 @@
HeaderbarStorage { id: _headerbarStorage }
HeaderbarSettings { id: _headerbarSettings }
HeaderbarInformation { id: _headerbarInformation }
+ TreatmentAdjustmentVitals { id: _treatmentAdjustmentVitals }
LockDialog { id: _lockDialog }
AlarmItem { id: _alarmItem ; z: 996 }
PowerItem { id: _powerItem ; z: 997 }
Index: sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml
===================================================================
diff -u -r54a8a895371d2fe6d40434fff420fa90fe5ce170 -r9048646630717f980a852df54349805ba63773e0
--- sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml (.../TreatmentSaline.qml) (revision 54a8a895371d2fe6d40434fff420fa90fe5ce170)
+++ sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml (.../TreatmentSaline.qml) (revision 9048646630717f980a852df54349805ba63773e0)
@@ -115,8 +115,8 @@
}
TouchRect { id: _startFluidButton
- width : _fluidProgressBar.width
- height : Variables.contentHeight + 10
+ width : Variables.defaultButtonWidth
+ height : Variables.defaultButtonHeight
radius : 9
text.textFormat : Text.RichText
text.text : buttonText
Index: sources/model/MModel.h
===================================================================
diff -u -rb80f8f84f21f86ad4c962a2c690447c572498e0b -r9048646630717f980a852df54349805ba63773e0
--- sources/model/MModel.h (.../MModel.h) (revision b80f8f84f21f86ad4c962a2c690447c572498e0b)
+++ sources/model/MModel.h (.../MModel.h) (revision 9048646630717f980a852df54349805ba63773e0)
@@ -52,6 +52,7 @@
#include "MTreatmentPressureOcclusionData.h"
#include "MTreatmentRangesData.h"
#include "MTreatmentSalineData.h"
+#include "MTreatmentVitalsData.h"
#include "MTreatmentHeparinData.h"
#include "MTreatmentRinsebackData.h"
#include "MTreatmentRecirculateData.h"
@@ -150,6 +151,7 @@
#include "MTreatmentAdjustUltrafiltrationEditResponse.h"
#include "MTreatmentAdjustUltrafiltrationConfirmResponse.h"
#include "MTreatmentAdjustSalineResponse.h"
+#include "MTreatmentAdjustVitalsResponse.h"
#include "MTreatmentAdjustHeparinResponse.h"
#include "MTreatmentAdjustRinsebackResponse.h"
#include "MTreatmentAdjustRecirculateResponse.h"
@@ -349,6 +351,7 @@
REGISTER_METATYPE( PowerOffData ) \
REGISTER_METATYPE( TreatmentRangesData ) \
REGISTER_METATYPE( TreatmentSalineData ) \
+ REGISTER_METATYPE( TreatmentVitalsData ) \
REGISTER_METATYPE( TreatmentHeparinData ) \
REGISTER_METATYPE( TreatmentRinsebackData ) \
REGISTER_METATYPE( TreatmentRecirculateData ) \
@@ -448,6 +451,7 @@
REGISTER_METATYPE( AdjustUltrafiltrationEditRequestData ) \
REGISTER_METATYPE( AdjustUltrafiltrationConfirmRequestData ) \
REGISTER_METATYPE( AdjustSalineRequestData ) \
+ REGISTER_METATYPE( AdjustVitalsRequestData ) \
REGISTER_METATYPE( AdjustHeparinRequestData ) \
REGISTER_METATYPE( AdjustRinsebackRequestData ) \
REGISTER_METATYPE( AdjustRecirculateRequestData ) \
@@ -487,6 +491,7 @@
REGISTER_METATYPE( AdjustUltrafiltrationEditResponseData ) \
REGISTER_METATYPE( AdjustUltrafiltrationConfirmResponseData ) \
REGISTER_METATYPE( AdjustSalineResponseData ) \
+ REGISTER_METATYPE( AdjustVitalsResponseData ) \
REGISTER_METATYPE( AdjustHeparinResponseData ) \
REGISTER_METATYPE( AdjustRinsebackResponseData ) \
REGISTER_METATYPE( AdjustRecirculateResponseData ) \
@@ -554,6 +559,7 @@
ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, PowerOffData ) \
ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentRangesData ) \
ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentSalineData ) \
+ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentVitalsData ) \
ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentHeparinData ) \
ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentRinsebackData ) \
ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentRecirculateData ) \
@@ -642,6 +648,7 @@
ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationEditResponseData ) \
ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationConfirmResponseData ) \
ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustSalineResponseData ) \
+ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustVitalsResponseData ) \
ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustHeparinResponseData ) \
ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustRinsebackResponseData ) \
ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustRecirculateResponseData ) \
@@ -681,6 +688,7 @@
ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustUltrafiltrationConfirmRequestData ) \
ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustParametersConfirmRequestData ) \
ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustSalineRequestData ) \
+ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustVitalsRequestData ) \
ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustHeparinRequestData ) \
ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustRinsebackRequestData ) \
ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustRecirculateRequestData ) \
@@ -771,6 +779,7 @@
ACTION_RECEIVE_BRIDGE_DEFINITION( PowerOffData ) \
ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentRangesData ) \
ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentSalineData ) \
+ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentVitalsData ) \
ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentHeparinData ) \
ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentRinsebackData ) \
ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentRecirculateData ) \
@@ -859,6 +868,7 @@
ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationEditResponseData ) \
ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustUltrafiltrationConfirmResponseData ) \
ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustSalineResponseData ) \
+ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustVitalsResponseData ) \
ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustHeparinResponseData ) \
ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustRinsebackResponseData ) \
ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustRecirculateResponseData ) \
@@ -921,6 +931,7 @@
ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUltrafiltrationEditRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustUltrafiltrationConfirmRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustSalineRequestData ) \
+ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustVitalsRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustHeparinRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustRinsebackRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustRecirculateRequestData ) \
@@ -981,6 +992,7 @@
ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUltrafiltrationEditRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustUltrafiltrationConfirmRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustSalineRequestData ) \
+ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustVitalsRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustHeparinRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustRinsebackRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustRecirculateRequestData ) \
@@ -1042,6 +1054,7 @@
ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustUltrafiltrationConfirmRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustPressuresLimitsRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustSalineRequestData ) \
+ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustVitalsRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustHeparinRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustRinsebackRequestData ) \
ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustRecirculateRequestData ) \
@@ -1092,6 +1105,7 @@
ACTION_RECEIVE_SIGNAL( PowerOffData ) \
ACTION_RECEIVE_SIGNAL( TreatmentRangesData ) \
ACTION_RECEIVE_SIGNAL( TreatmentSalineData ) \
+ ACTION_RECEIVE_SIGNAL( TreatmentVitalsData ) \
ACTION_RECEIVE_SIGNAL( TreatmentHeparinData ) \
ACTION_RECEIVE_SIGNAL( TreatmentRinsebackData ) \
ACTION_RECEIVE_SIGNAL( TreatmentRecirculateData ) \
@@ -1181,6 +1195,7 @@
ACTION_RECEIVE_SIGNAL( AdjustUltrafiltrationEditResponseData ) \
ACTION_RECEIVE_SIGNAL( AdjustUltrafiltrationConfirmResponseData ) \
ACTION_RECEIVE_SIGNAL( AdjustSalineResponseData ) \
+ ACTION_RECEIVE_SIGNAL( AdjustVitalsResponseData ) \
ACTION_RECEIVE_SIGNAL( AdjustHeparinResponseData ) \
ACTION_RECEIVE_SIGNAL( AdjustRinsebackResponseData ) \
ACTION_RECEIVE_SIGNAL( AdjustRecirculateResponseData ) \
Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h
===================================================================
diff -u -r21ce57716379c74355e4d268097b1b44bb59170c -r9048646630717f980a852df54349805ba63773e0
--- sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 21ce57716379c74355e4d268097b1b44bb59170c)
+++ sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 9048646630717f980a852df54349805ba63773e0)
@@ -62,15 +62,16 @@
/*!
* \brief The MDuetConfirmUIr class
- * \details The power off request model
+ * \details The confirm response model
*
* | MSG | CAN ID | Type | Ack | Src | Dst | Description |
* |:----:|:------:|:------:|:---:|:---:|:---:|:-----------: |
- * |0x0100| 0x020 | Rsp | Y | UI | HD | Confirm |
+ * |0xBB00| 0x020 | Rsp | Y | UI | TD | Confirm |
*
* | Payload ||
* | ||
- * | #1:(U08) | \ref state |
+ * | #1:(U32) | \ref mId |
+ * | #1:(U32) | \ref mConfirm |
*
*
*/
@@ -227,7 +228,7 @@
*
* | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description |
* |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:--------------------:|
- * |0x5E00| 0x100 | 9 | Req | Y | UI | TD | Saline Bolus Request |
+ * |0x5F00| 0x100 | 9 | Req | Y | UI | TD | Saline Bolus Request |
*
* | Payload ||
* | ||
Index: sources/view/VView.h
===================================================================
diff -u -rb80f8f84f21f86ad4c962a2c690447c572498e0b -r9048646630717f980a852df54349805ba63773e0
--- sources/view/VView.h (.../VView.h) (revision b80f8f84f21f86ad4c962a2c690447c572498e0b)
+++ sources/view/VView.h (.../VView.h) (revision 9048646630717f980a852df54349805ba63773e0)
@@ -226,6 +226,7 @@
REGISTER_TYPE( VTreatmentAdjustmentUltrafiltrationEdit ) \
REGISTER_TYPE( VTreatmentAdjustmentUltrafiltrationConfirm ) \
REGISTER_TYPE( VTreatmentAdjustmentSaline ) \
+ REGISTER_TYPE( VTreatmentAdjustmentVitals ) \
REGISTER_TYPE( VTreatmentAdjustmentHeparin ) \
REGISTER_TYPE( VTreatmentAdjustmentRinseback ) \
REGISTER_TYPE( VTreatmentAdjustmentRecirculate ) \