Index: etc/reports/alarms/AlarmMapping.csv =================================================================== diff -u -r5a3c8d31fb220eb82f4f1d5c1ea063f05cb43287 -r2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9 --- etc/reports/alarms/AlarmMapping.csv (.../AlarmMapping.csv) (revision 5a3c8d31fb220eb82f4f1d5c1ea063f05cb43287) +++ etc/reports/alarms/AlarmMapping.csv (.../AlarmMapping.csv) (revision 2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9) @@ -89,7 +89,7 @@ 88,"DD balance chamber state1 fill end pressure not in range." 89,"DD balance chamber state2 fill start pressure not in range." 90,"DD balance chamber state2 fill end pressure not in range." - 91,"Available alarms." + 91,"DD generate dialysate hydraulics chamber ngative pressure out of range." 92,"Available alarms." 93,"Available alarms." 94,"DD balance chamber state1 fill initiated and pressure drop is not in range." Index: etc/reports/alarms/AlarmMapping.py =================================================================== diff -u -r5a3c8d31fb220eb82f4f1d5c1ea063f05cb43287 -r2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9 --- etc/reports/alarms/AlarmMapping.py (.../AlarmMapping.py) (revision 5a3c8d31fb220eb82f4f1d5c1ea063f05cb43287) +++ etc/reports/alarms/AlarmMapping.py (.../AlarmMapping.py) (revision 2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9) @@ -90,7 +90,7 @@ 88 : "DD balance chamber state1 fill end pressure not in range." 89 : "DD balance chamber state2 fill start pressure not in range." 90 : "DD balance chamber state2 fill end pressure not in range." - 91 : "Available alarms." + 91 : "DD generate dialysate hydraulics chamber ngative pressure out of range." 92 : "Available alarms." 93 : "Available alarms." 94 : "DD balance chamber state1 fill initiated and pressure drop is not in range." Index: leahi.pro.user =================================================================== diff -u -rf2e4eba6e85c5d36537be782926f23cc9dc01037 -r2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9 --- leahi.pro.user (.../leahi.pro.user) (revision f2e4eba6e85c5d36537be782926f23cc9dc01037) +++ leahi.pro.user (.../leahi.pro.user) (revision 2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9) @@ -1,6 +1,6 @@ - + EnvironmentId @@ -292,6 +292,7 @@ Qt4ProjectManager.Qt4RunConfiguration: /home/denali/Public/luis/application/leahi.pro true + -Kk true true true @@ -478,45 +479,45 @@ RemoteLinux.DirectUploadStep /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali + /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali + /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali - /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali - /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali + /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali - /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali + /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali - /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali + 192.168.10.138 + 192.168.10.186 + 192.168.137.36 192.168.10.228 + 192.168.137.30 + 192.168.137.210 192.168.10.167 - 192.168.137.25 - 192.168.137.36 192.168.10.228 - 192.168.10.138 + 192.168.137.25 192.168.10.186 - 192.168.137.210 - 192.168.137.30 + 192.168.40.23 + 192.168.137.26 + 192.168.137.3 + 192.168.137.170 + 192.168.137.247 192.168.137.125 192.168.137.202 - 192.168.137.247 192.168.10.159 192.168.137.170 - 192.168.10.186 - 192.168.137.3 - 192.168.40.23 - 192.168.137.170 - 192.168.137.26 /home/root @@ -541,66 +542,66 @@ /opt/b2qt/3.1.18/sysroots + /opt/b2qt/3.1.18/sysroots/x86_64-pokysdk-linux /opt/b2qt/3.1.18/sysroots + /opt/b2qt/3.1.18/sysroots/x86_64-pokysdk-linux + /opt/b2qt/3.1.18/sysroots/x86_64-pokysdk-linux /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots - /opt/b2qt/3.1.18/sysroots/x86_64-pokysdk-linux /opt/b2qt/3.1.18/sysroots - /opt/b2qt/3.1.18/sysroots/x86_64-pokysdk-linux /opt/b2qt/3.1.18/sysroots - /opt/b2qt/3.1.18/sysroots/x86_64-pokysdk-linux /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots - /opt/b2qt/3.1.18/sysroots/x86_64-pokysdk-linux - /opt/b2qt/3.1.18/sysroots/x86_64-pokysdk-linux /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots + /opt/b2qt/3.1.18/sysroots/x86_64-pokysdk-linux + /opt/b2qt/3.1.18/sysroots/x86_64-pokysdk-linux - 2023-01-17T18:06:25.579 - 2023-02-02T19:40:15.813 - 2023-02-02T02:13:54.596 - 2023-02-01T03:23:15.710 - 2023-01-17T18:18:03.749 2023-02-02T09:06:00.862 2023-01-18T17:47:08.797 - 2023-02-02T01:52:20.307 + 2023-02-01T03:23:15.710 + 2023-01-17T18:18:03.749 2023-02-02T02:30:48.337 + 2023-02-02T01:52:20.307 + 2023-02-02T19:40:15.813 + 2023-01-17T18:06:25.579 + 2023-02-02T02:13:54.596 + 2023-01-18T20:13:36.296 + 2023-01-24T17:29:54.849 + 2023-02-01T05:00:56.449 + 2023-02-02T02:40:56.627 + 2023-01-27T09:45:11.898 + 2023-02-02T02:26:33.738 2023-02-02T02:07:25.922 2023-02-02T01:46:50.167 - 2023-02-02T02:26:33.738 2023-01-24T18:19:13.179 2023-01-27T10:15:15.423 - 2023-01-18T20:13:36.296 - 2023-02-02T02:40:56.627 - 2023-01-24T17:29:54.849 - 2023-01-27T09:45:11.898 - 2023-02-01T05:00:56.449 - 2023-01-17T18:05:42.000 - 2023-02-02T19:39:36.000 - 2023-02-02T02:14:08.000 - 2023-02-01T03:23:28.000 - 2023-01-17T18:17:25.000 2023-02-02T09:05:22.000 2023-01-18T17:47:04.000 - 2023-02-02T01:52:16.000 + 2023-02-01T03:23:28.000 + 2023-01-17T18:17:25.000 2023-02-02T02:31:01.000 + 2023-02-02T01:52:16.000 + 2023-02-02T19:39:36.000 + 2023-01-17T18:05:42.000 + 2023-02-02T02:14:08.000 + 2023-01-18T20:13:33.000 + 2023-01-24T17:30:03.000 + 2023-02-01T05:00:51.000 + 2023-02-02T02:41:10.000 + 2023-01-27T09:44:58.000 + 2023-02-02T02:26:46.000 2023-02-02T02:07:21.000 2023-02-02T01:47:02.000 - 2023-02-02T02:26:46.000 2023-01-24T18:18:58.000 2023-01-27T10:15:08.000 - 2023-01-18T20:13:33.000 - 2023-02-02T02:41:10.000 - 2023-01-24T17:30:03.000 - 2023-01-27T09:44:58.000 - 2023-02-01T05:00:51.000 2 Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -rf2e4eba6e85c5d36537be782926f23cc9dc01037 -r2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision f2e4eba6e85c5d36537be782926f23cc9dc01037) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9) @@ -110,7 +110,7 @@ {Gui::GuiActionType::ID_HDUsageInfoRsp , 4 * 4 + 2 }, // 4 parameters each 4bytes + 1 parameter 2 bytes // ---- TODO : AFTER GIVING IT SOME THOUGHT, IT SEEMS WE CAN GET THESE LEN FROM THE MODEL AND DO NOT NEED TO HAVE THIS BUT NEED TO INVESTIGATE MORE. - {Gui::GuiActionType::ID_AlarmStatus , 4 * 4 + 2 }, // 4 parameters each 4bytes + 1 parameter 2bytes + {Gui::GuiActionType::ID_AlarmStatus , 4 * 3 + 2 }, // 3 parameters each 4bytes + 1 parameter 2bytes {Gui::GuiActionType::ID_AlarmTriggered , 8 * 4 }, // 5 parameters each 4bytes {Gui::GuiActionType::ID_AlarmCleared , 1 * 4 }, // 1 parameter each 4bytes {Gui::GuiActionType::ID_AlarmSilenceReq , 1 * 4 }, // 1 parameter each 1bytes @@ -226,8 +226,8 @@ // ---- Versions {Gui::GuiActionType::ID_AdjustVersionsUIReq ,1+1+1+2+4 }, // variable length parameters - {Gui::GuiActionType::ID_AdjustVersionsHDRsp ,1+1+1+2+1+1+1+1}, // variable length parameters - {Gui::GuiActionType::ID_AdjustVersionsDGRsp ,1+1+1+2+1+1+1+1}, // variable length parameters + {Gui::GuiActionType::ID_AdjustVersionsHDRsp ,3*1+2+4*1+4 }, // variable length parameters + {Gui::GuiActionType::ID_AdjustVersionsDGRsp ,3*1+2+4*1+4 }, // variable length parameters {Gui::GuiActionType::ID_AdjustSerialHDRsp , 1 * 1 }, // minimum 1 parameter 1 byte {Gui::GuiActionType::ID_AdjustSerialDGRsp , 1 * 1 }, // minimum 1 parameter 1 byte // ---- Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -rf2e4eba6e85c5d36537be782926f23cc9dc01037 -r2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision f2e4eba6e85c5d36537be782926f23cc9dc01037) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9) @@ -717,24 +717,25 @@ */ bool MessageInterpreter::logUnhandledMessage(const Message &vMessage) const { bool ok = false; - quint16 id = vMessage.actionId; - QString logString = QString("%1,").arg(id,4,16); - if (_messageList.contains(id)) { + quint16 msg_id = vMessage.actionId; + QString logString = QString("%1,").arg(msg_id,4,16); + QString can_id; + QString item = ""; + + identifySource(vMessage.can_id, &can_id); // Message Can Channel. + logString += can_id + ","; + // qDebug() << __FUNCTION__ << logString; + + if (_messageList.contains(msg_id)) { ok = true; - QStringList items = _messageList[id]; + QStringList items = _messageList[msg_id]; int index = 0; for ( int i = 0; i < items.count(); i++ ) { - QString item = items[i]; - if (i == 0) { - QString ID; - switch (identifySource(vMessage.can_id, &ID)) { - case Can_Source::eCan_TD: logString += ID + ",~" + item; break; - case Can_Source::eCan_DD: logString += ID + ",~" + item; break; - case Can_Source::eCan_DI: logString += ID + ",~" + item; break; - default : logString += ID + ",~" + item; break; - } + item = items[i]; + if (i == 0) { // Message Name/Identifier + logString += "~" + item; } - else { + else { // Message payload data if ( item == "F32" ) { Types::F32 param; if (! GetValue(vMessage.data, index, param )) logString += ",?"; @@ -777,12 +778,12 @@ } } } - LOG_APPED(logString); } else { if ( gDisableUnhandledReport ) { // if the unhandled message error has been disabled, return. - LOG_DEBUG(QString("Undefined unhandled message [%1]").arg(id, 0, 16)); + LOG_DEBUG(QString("Undefined unhandled message [%1]").arg(msg_id, 0, 16)); } } + LOG_APPED(logString + item); return ok; } Index: sources/gui/GuiGlobals.h =================================================================== diff -u -rf2e4eba6e85c5d36537be782926f23cc9dc01037 -r2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision f2e4eba6e85c5d36537be782926f23cc9dc01037) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9) @@ -117,7 +117,7 @@ ID_AdjustHDDateTimeRsp = 0x6E00, // 110 ID_AdjustDGDateTimeReq = 0x6F00, // 111 ID_AdjustDGDateTimeRsp = 0x7000, // 112 - ID_HDRTCEpochData = 0x0A00, // 10 + ID_HDRTCEpochData = 0x0A0F, // 10 //// ----- @CRAPIZED // State Messages ID_TDOpModeData = 0x1200, // 18 //// ----- @LEAHIZED @@ -126,13 +126,12 @@ ID_PostTreatmentStates = 0x7700, // 119 // ----- - ID_PowerOff = 0x0100, + ID_PowerOff = 0x010F, // 010F //// ----- @CRAPIZED ID_ShuttingDown = 0x0E00, ID_TreatmentTime = 0x0D00, ID_BloodFlow = 0x0500, ID_DialysateInletFlow = 0x0800, ID_DialysateOutletFlow = 0x0B00, - ID_TreatmentRanges = 0x1A00, // 26 ID_PressureOcclusion = 0x0900, ID_Saline = 0x2F00, // 47 ID_Heparin = 0x4D00, // 77 @@ -142,24 +141,24 @@ ID_TreatmentStop = 0x4900, // 73 // Alarm Messages - ID_AlarmStatus = 0x0200, - ID_AlarmTriggered = 0x0300, - ID_AlarmCleared = 0x0400, - ID_AlarmSilenceReq = 0x3200, // 50 - ID_AlarmUserActionReq = 0x4000, // 64 // there is no response since it is kind of the response to the ID_AlarmStatus from UI to HD - ID_AlarmActiveListReq = 0x9700, // 151 - ID_AlarmActiveListRsp = 0x9800, // 152 - ID_AlarmVolumeSetReq = 0x4E00, // 78 - ID_AlarmVolumeSetRsp = 0x7C00, // 124 + ID_AlarmStatus = 0x0100, // 01 //// ----- @LEAHIZED + ID_AlarmTriggered = 0x0200, // 02 //// ----- @LEAHIZED + ID_AlarmCleared = 0x0300, // 03 //// ----- @LEAHIZED + ID_AlarmSilenceReq = 0x0500, // 05 //// ----- @LEAHIZED + ID_AlarmUserActionReq = 0x0600, // 06 //// ----- @LEAHIZED + ID_AlarmActiveListReq = 0x0900, // 09 //// ----- @LEAHIZED + ID_AlarmActiveListRsp = 0x0A00, // 10 //// ----- @LEAHIZED + ID_AlarmVolumeSetReq = 0x0B00, // 11 //// ----- @LEAHIZED + ID_AlarmVolumeSetRsp = 0x0C00, // 12 //// ----- @LEAHIZED - // Pre-Treatment - // Pre-Treatment Initiate Treatment + // Create Rx ID_AdjustInitTreatmentReq = 0x4500, // 69 //// ----- @LEAHIZED ID_AdjustInitTreatmentRsp = 0x4600, // 70 //// ----- @LEAHIZED - // Pre-Treatment Parameters Validation/Confirm ID_AdjustParametersValidationReq = 0x3F00, // 63 //// ----- @LEAHIZED ID_AdjustParametersValidationRsp = 0x4000, // 64 //// ----- @LEAHIZED ID_AdjustParametersConfirmReq = 0x4400, // 68 //// ----- @LEAHIZED + ID_TreatmentRanges = 0x4300, // 67 //// ----- @LEAHIZED + // Pre-Treatment Water Sample ID_DGFilterFlushData = 0x6000, // 96 ID_AdjustWaterSampleReq = 0x5D00, // 93 @@ -177,7 +176,7 @@ // Pre-Treatment Disposable Priming ID_AdjustDisposablesPrimeReq = 0x3C00, // 60 ID_AdjustDisposablesPrimeRsp = 0x3D00, // 61 - ID_DisposablesPrimeData = 0x4300, // 67 + ID_DisposablesPrimeData = 0x43FF, // ?? //// ----- @CRAPIZED - FFed // Pre-Treatment Patient Connection Begin ID_AdjustPatientConnectionBeginReq = 0x6400, // 100 ID_AdjustPatientConnectionBeginRsp = 0x6500, // 101 @@ -253,7 +252,7 @@ // Post-Treatment // Patient Disconnect ID_AdjustPatientDisconnectNotifyReq = 0x4A00, // 74 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response - ID_AdjustPatientDisconnectConfirmReq = 0x0600, // 6 + ID_AdjustPatientDisconnectConfirmReq = 0x060F, // 060f //// ----- @CRAPIZED ID_AdjustPatientDisconnectConfirmRsp = 0x7E00, // 126 // Disposables Removal Index: sources/gui/qml/KeyboardItem.qml =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9 --- sources/gui/qml/KeyboardItem.qml (.../KeyboardItem.qml) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/gui/qml/KeyboardItem.qml (.../KeyboardItem.qml) (revision 2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9) @@ -47,11 +47,12 @@ // a gap beetween the bottom of the keyboard and the screen. // the rectangle _bottomFiller is to fill that gap Rectangle { id: _bottomFiller - height: Variables.minVGap + height: Variables.notificationHeight color: "black" // InputPanel background color. anchors.left: _root.left anchors.right: _root.right anchors.top: _root.bottom + visible: ! _alarmBar.visible } Component.onCompleted: { VirtualKeyboardSettings.locale = vLocalization.keyboardLocale; Index: sources/gui/qml/components/ConfirmTreatmentTable.qml =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9 --- sources/gui/qml/components/ConfirmTreatmentTable.qml (.../ConfirmTreatmentTable.qml) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/gui/qml/components/ConfirmTreatmentTable.qml (.../ConfirmTreatmentTable.qml) (revision 2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9) @@ -34,37 +34,16 @@ color: Colors.transparent radius: Variables.dialogRadius - Rectangle { - id: _treatment_profile_id - objectName: _root.objectName + "_treatment_profile_id" + Text { + id: _treatment_profile_name + objectName: _root.objectName + "_treatment_profile_name" height: 40 width: height anchors.top: _header.top anchors.left: _header.left anchors.topMargin: Variables.createTreatmentMargin anchors.leftMargin: Variables.createTreatmentMargin - color: Colors.createTrProfileID - radius: Variables.dialogRadius - - Text { - id: _treatment_profile_id_text - objectName: _treatment_profile_id.objectName + "_treatment_profile_id_text" - color: Colors.backgroundDialog - text: "1" - font.pixelSize: Fonts.fontPixelTextRectTitle - anchors.centerIn: _treatment_profile_id - font.bold: true - } - } - - Text { - id: _treatment_profile_name - objectName: _root.objectName + "_treatment_profile_name" - anchors.bottom: _treatment_profile_id.bottom - anchors.left: _treatment_profile_id.right - anchors.topMargin: Variables.createTreatmentMargin - anchors.leftMargin: 20 - text: qsTr("New Treatment") + text: qsTr("Custom Treatment") color: Colors.textMain font.pixelSize: Fonts.fontPixelCreateTreatment } Index: sources/gui/qml/components/MainMenu.qml =================================================================== diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -r2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9 --- sources/gui/qml/components/MainMenu.qml (.../MainMenu.qml) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ sources/gui/qml/components/MainMenu.qml (.../MainMenu.qml) (revision 2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9) @@ -96,10 +96,10 @@ Rectangle { id: _backgroundRect anchors.fill: parent color: Colors.backgroundMainMenu - // gradient: Gradient { - // GradientStop { position: 0; color: "#FEFEFE" } - // GradientStop { position: 1; color: "#0F2841" } - // } + gradient: Gradient { + GradientStop { position: 0.2; color: Qt.lighter(Colors.backgroundMain, 1.1) } + GradientStop { position: 0.8; color: Qt.darker (Colors.backgroundMain, 1.1) } + } } MouseArea { id: _clickPropagationDisabler Index: sources/gui/qml/components/StepIndicator.qml =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9 --- sources/gui/qml/components/StepIndicator.qml (.../StepIndicator.qml) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/gui/qml/components/StepIndicator.qml (.../StepIndicator.qml) (revision 2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9) @@ -38,7 +38,7 @@ property int diameter : 15 width : _gridSteps.width - height : _gridSteps.height // Variables.topBarMenuHeight + height : _gridSteps.height color : Colors.backgroundMain QtObject { id: _private Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -r2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9) @@ -96,14 +96,14 @@ readonly property int sliderTextMargin : 20 readonly property int treatmentSpacing : 80 // 60 - readonly property int notificationHeight : 60 + readonly property int notificationHeight : 100 //// ----- @LEAHIZED readonly property int notificationIconDiameter : 36 readonly property int checkListViewItemWidth : 350 readonly property int checkListViewItemHeight : 60 readonly property int pauseIconDiameter : 60 - readonly property int topBarMenuHeight : 100 + readonly property int topBarMenuHeight : 100 //// ----- @LEAHIZED readonly property int sliderCircleDiameter : 30 readonly property int pressuresProgressbarWidth : 725 Index: sources/gui/qml/main.qml =================================================================== diff -u -rf2e4eba6e85c5d36537be782926f23cc9dc01037 -r2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9 --- sources/gui/qml/main.qml (.../main.qml) (revision f2e4eba6e85c5d36537be782926f23cc9dc01037) +++ sources/gui/qml/main.qml (.../main.qml) (revision 2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9) @@ -14,7 +14,7 @@ */ // Qt -import QtQuick 2.12 +import QtQuick 2.12 // Project // C++ imports @@ -285,124 +285,152 @@ } // 9 - Others - Text { // TEST : Application version should be moved into the information screen later. - color : Colors.textMain - anchors { - top : parent.top - left : parent.left - leftMargin : 10 + Rectangle { //TODO:@LEAHI: make this the statusbar/headerbar component. + anchors.top: parent.top + width : Variables.applicationWidth + height : Variables.notificationHeight + color : Colors.backgroundMainMenu + gradient: Gradient { //TODO:@LEAHI: make this a component. + GradientStop { position: 0.2; color: Qt.lighter(Colors.backgroundMain, 1.1) } + GradientStop { position: 0.8; color: Qt.darker (Colors.backgroundMain, 1.1) } } - horizontalAlignment : Text.AlignRight - verticalAlignment : Text.AlignBottom - height : 15 - text : Qt.application.version //DEBUG: + "[" + _GuiView.platform + "]" - font.pixelSize: 14 - } - - Text { // TEST : Wireless IP - color : Colors.textMain - anchors { - top : parent.top - left : parent.left - leftMargin : 325 + Item { + width : 200 + anchors { + top : parent.top + left : parent.left + bottom : parent.bottom + margins : 10 + } + Column { + spacing : 0 + anchors.fill: parent + Text { + color : Colors.textMain + width : parent.width + height : parent.height * 3/5 + horizontalAlignment : Text.AlignHCenter + verticalAlignment : Text.AlignVCenter + text : vDateTime.time + font.pixelSize: 40 + } + Text { + color : Colors.textMain + width : parent.width + height : parent.height * 2/5 + horizontalAlignment : Text.AlignHCenter + verticalAlignment : Text.AlignVCenter + text : vDateTime.date + font.pixelSize: 25 + } + } } - horizontalAlignment : Text.Alignleft - verticalAlignment : Text.AlignBottom + Text { // TEST : Application version should be moved into the information screen later. + color : Colors.textMain + anchors { + top : parent.top + left : parent.left + leftMargin : 100 - height : 15 - text : "W:" // + vNetwork.wirelessIP // ===================== Device Controller: FIXME - font.pixelSize: 15 - } + } + horizontalAlignment : Text.AlignRight + verticalAlignment : Text.AlignBottom - Text { // TEST : Ethernet IP - color : Colors.textMain - anchors { - top : parent.top - left : parent.left - leftMargin : 475 + height : 15 + text : Qt.application.version //DEBUG: + "[" + _GuiView.platform + "]" + font.pixelSize: 14 } - horizontalAlignment : Text.Alignleft - verticalAlignment : Text.AlignBottom - height : 15 - text : "E:" // + vNetwork.ethernetIP // ===================== Device Controller: FIXME - font.pixelSize: 15 - } + Text { // TEST : Wireless IP + color : Colors.textMain + anchors { + top : parent.top + left : parent.left + leftMargin : 325 + } + horizontalAlignment : Text.Alignleft + verticalAlignment : Text.AlignBottom - Text { // TEST : BluetoothStatus - color : Colors.textMain - anchors { - top : parent.top - left : parent.left - leftMargin : 615 + height : 15 + text : "W:" // + vNetwork.wirelessIP // ===================== Device Controller: FIXME + font.pixelSize: 15 } - horizontalAlignment : Text.Alignleft - verticalAlignment : Text.AlignBottom - height : 15 - text : "B:" + vBluetooth.pairedAddr - font.pixelSize: 14 - } + Text { // TEST : Ethernet IP + color : Colors.textMain + anchors { + top : parent.top + left : parent.left + leftMargin : 475 + } + horizontalAlignment : Text.Alignleft + verticalAlignment : Text.AlignBottom - Text { // TEST : The treatment vital dialog countdown time - color : Colors.textMain - anchors { - top : parent.top - left : parent.left - leftMargin : 900 + height : 15 + text : "E:" // + vNetwork.ethernetIP // ===================== Device Controller: FIXME + font.pixelSize: 15 } - horizontalAlignment : Text.Alignleft - verticalAlignment : Text.AlignBottom - height : 15 - //DEBUG text : "Vital Timer: " + vTreatmentVitals.min_left + " : " + vTreatmentVitals.sec_left - font.pixelSize: 14 - } + Text { // TEST : BluetoothStatus + color : Colors.textMain + anchors { + top : parent.top + left : parent.left + leftMargin : 615 + } + horizontalAlignment : Text.Alignleft + verticalAlignment : Text.AlignBottom - Text { // TEST : Current Date/Time - color : Colors.textMain - anchors { - top : parent.top - left : parent.left - leftMargin : 1080 + height : 15 + text : "B:" + vBluetooth.pairedAddr + font.pixelSize: 14 } - horizontalAlignment : Text.Alignleft - verticalAlignment : Text.AlignBottom - height : 15 - text : vDateTime.current - font.pixelSize: 14 - } + Text { // TEST : The treatment vital dialog countdown time + color : Colors.textMain + anchors { + top : parent.top + left : parent.left + leftMargin : 900 + } + horizontalAlignment : Text.Alignleft + verticalAlignment : Text.AlignBottom - Text { // TEST : Current timezone - color : Colors.textMain - anchors { - top : parent.top - left : parent.left - leftMargin : 1220 + height : 15 + //DEBUG text : "Vital Timer: " + vTreatmentVitals.min_left + " : " + vTreatmentVitals.sec_left + font.pixelSize: 14 } - horizontalAlignment : Text.Alignleft - verticalAlignment : Text.AlignBottom - height : 15 - text : vDateTime.timezone - font.pixelSize: 14 - } + Text { // TEST : Current timezone + color : Colors.textMain + anchors { + top : parent.top + left : parent.left + leftMargin : 1220 + } + horizontalAlignment : Text.Alignleft + verticalAlignment : Text.AlignBottom - SDCProgressItem { id: _sdcProgressItem - // TODO: disable this later. this is only for diagnostic purpose. - onDoubleClicked : { - if ( _GuiView.dryDemoMode ) { - let dryDemoTempID = 99 - let id = vConfirm.id - vConfirm.id = dryDemoTempID - vConfirm.doConfirm( true ) - vConfirm.id = id + height : 15 + text : vDateTime.timezone + font.pixelSize: 14 + } + + SDCProgressItem { id: _sdcProgressItem + // TODO: disable this later. this is only for diagnostic purpose. + onDoubleClicked : { + if ( _GuiView.dryDemoMode ) { + let dryDemoTempID = 99 + let id = vConfirm.id + vConfirm.id = dryDemoTempID + vConfirm.doConfirm( true ) + vConfirm.id = id + } + else { + _diagnosticsDialog.open() + } } - else { - _diagnosticsDialog.open() - } } } @@ -429,8 +457,8 @@ } GuiView { id: _GuiView -// Component.onCompleted: { -// console.debug("GuiView - complete") -// } + // Component.onCompleted: { + // console.debug("GuiView - complete") + // } } } Index: sources/gui/qml/pages/MainStack.qml =================================================================== diff -u -rf2e4eba6e85c5d36537be782926f23cc9dc01037 -r2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9 --- sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision f2e4eba6e85c5d36537be782926f23cc9dc01037) +++ sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision 2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9) @@ -108,7 +108,7 @@ } MainHome { id: _mainHome - onStartTreatment : { } + onStartTreatment : { /*page( _treatmentStack )*/} onCreateTreatment : { vPreTreatmentAdjustmentInitTreatment.doInitiate( )} onVisibleChanged: { if (visible) { Index: sources/gui/qml/pages/TreatmentFlowBase.qml =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9 --- sources/gui/qml/pages/TreatmentFlowBase.qml (.../TreatmentFlowBase.qml) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/gui/qml/pages/TreatmentFlowBase.qml (.../TreatmentFlowBase.qml) (revision 2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9) @@ -81,6 +81,7 @@ StepNavigationTitleBar { id: _titleBar stepIndex : stackStepIndex // shall have a definition in the parent stack anchors.top : _root.top + anchors.topMargin: Variables.notificationHeight anchors.horizontalCenter : parent.horizontalCenter width : _root.width confirmEnabled : instruction ? instruction.lastStep : true @@ -93,7 +94,7 @@ visible: ! instructionBased anchors { top : _root.top - topMargin : titleTopMargin + topMargin : Variables.notificationHeight + titleTopMargin horizontalCenter: parent.horizontalCenter } text : qsTr("TreatmentFlowBase") Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision 2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9) @@ -167,11 +167,11 @@ label : qsTr("Blood Flow Rate") flickable : _flickable unit : Variables.unitTextFlowRate - minimum : vTreatmentRanges.bloodFlowRateMin - maximum : vTreatmentRanges.bloodFlowRateMax - step : vTreatmentRanges.bloodFlowRateRes - defaultValue: vTreatmentRanges.bloodFlowRateDef - valid : !vTreatmentCreate.bloodFlowRateRejectReason + minimum : vTreatmentRanges.bloodFlowRateMin + maximum : vTreatmentRanges.bloodFlowRateMax + step : vTreatmentRanges.bloodFlowRateRes + defaultValue: vTreatmentRanges.bloodFlowRateDef + valid : ! vTreatmentCreate.bloodFlowRateRejectReason onValueChanged : { // Reset the valid state to allow repositioning to the next invalid parameter if(!valid) { @@ -186,11 +186,11 @@ label : qsTr("Dialysate Flow Rate") flickable : _flickable unit : Variables.unitTextFlowRate - minimum : vTreatmentRanges.dialysateFlowRateMin - maximum : vTreatmentRanges.dialysateFlowRateMax - step : vTreatmentRanges.dialysateFlowRateRes - defaultValue: vTreatmentRanges.dialysateFlowRateDef - valid : !vTreatmentCreate.dialysateFlowRateRejectReason + minimum : vTreatmentRanges.dialysateFlowRateMin + maximum : vTreatmentRanges.dialysateFlowRateMax + step : vTreatmentRanges.dialysateFlowRateRes + defaultValue: vTreatmentRanges.dialysateFlowRateDef + valid : ! vTreatmentCreate.dialysateFlowRateRejectReason onValueChanged : { // Reset the valid state to allow repositioning to the next invalid parameter if(!valid) { Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml =================================================================== diff -u -rf2e4eba6e85c5d36537be782926f23cc9dc01037 -r2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml (.../PreTreatmentCreateStack.qml) (revision f2e4eba6e85c5d36537be782926f23cc9dc01037) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml (.../PreTreatmentCreateStack.qml) (revision 2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9) @@ -67,6 +67,7 @@ } title.text : qsTr("Patient ID") + title.topPadding : 100 // moving down the title to get closer to keyboard. header.backVisible : true header.confirmVisible : true header.confirmText.text : _pretreatmentPatientIDEntry.text ? qsTr("CONTINUE") : qsTr("SKIP") @@ -75,11 +76,11 @@ clip : true hasCursor : true - textInput .width : 450 + textInput.width : 450 text : vTreatmentCreate.patientID anchors { - top : parent.top - topMargin : topMarginContent + 120 // moved a little down to be more on center and close to keyboard top edge. + top : parent.title.bottom + topMargin : 50 horizontalCenter: parent.horizontalCenter } textInput.inputMethodHints : Qt.ImhPreferLowercase Index: sources/gui/qml/plugins/virtualkeyboard/styles/denali/style.qml =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9 --- sources/gui/qml/plugins/virtualkeyboard/styles/denali/style.qml (.../style.qml) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/gui/qml/plugins/virtualkeyboard/styles/denali/style.qml (.../style.qml) (revision 2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9) @@ -52,11 +52,9 @@ } keyboardDesignWidth : 2560 - keyboardDesignHeight : 800 - keyboardRelativeLeftMargin : 114 / keyboardDesignWidth - keyboardRelativeRightMargin : 114 / keyboardDesignWidth - keyboardRelativeTopMargin : 13 / keyboardDesignHeight - keyboardRelativeBottomMargin : 86 / keyboardDesignHeight + keyboardDesignHeight : 600 //// ------ @LEAHIZED + keyboardRelativeLeftMargin : 350 / keyboardDesignWidth //// ------ @LEAHIZED + keyboardRelativeRightMargin : 350 / keyboardDesignWidth //// ------ @LEAHIZED keyboardBackground: Rectangle { id: _keyboardBackground color: "black" Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -r5a3c8d31fb220eb82f4f1d5c1ea063f05cb43287 -r2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9 --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 5a3c8d31fb220eb82f4f1d5c1ea063f05cb43287) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9) @@ -124,7 +124,7 @@ /*0088*/case GuiAlarmID::ALARM_ID_DD_BC_STATE1_FILL_END_PRESSURE_OUT_OF_RANGE : { result = QObject::tr("DD balance chamber state1 fill end pressure not in range." ); break; } /* 88*/ /*0089*/case GuiAlarmID::ALARM_ID_DD_BC_STATE2_FILL_START_PRESSURE_OUT_OF_RANGE: { result = QObject::tr("DD balance chamber state2 fill start pressure not in range." ); break; } /* 89*/ /*0090*/case GuiAlarmID::ALARM_ID_DD_BC_STATE2_FILL_END_PRESSURE_OUT_OF_RANGE : { result = QObject::tr("DD balance chamber state2 fill end pressure not in range." ); break; } /* 90*/ -/*0091*/case GuiAlarmID::ALARM_ID_AVAILABLE_91 : { result = QObject::tr("Available alarms." ); break; } /* 91*/ +/*0091*/case GuiAlarmID::ALARM_ID_DD_GEND_HYD_CHAMBER_PRESS_OUT_OF_RANGE : { result = QObject::tr("DD generate dialysate hydraulics chamber ngative pressure out of range." ); break; } /* 91*/ /*0092*/case GuiAlarmID::ALARM_ID_AVAILABLE_92 : { result = QObject::tr("Available alarms." ); break; } /* 92*/ /*0093*/case GuiAlarmID::ALARM_ID_AVAILABLE_93 : { result = QObject::tr("Available alarms." ); break; } /* 93*/ /*0094*/case GuiAlarmID::ALARM_ID_DD_BC_STATE1_FILL_PRESSURE_DROP_OUT_OF_RANGE : { result = QObject::tr("DD balance chamber state1 fill initiated and pressure drop is not in range." ); break; } /* 94*/ Index: sources/model/hd/data/MTreatmentRangesData.h =================================================================== diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -r2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9 --- sources/model/hd/data/MTreatmentRangesData.h (.../MTreatmentRangesData.h) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ sources/model/hd/data/MTreatmentRangesData.h (.../MTreatmentRangesData.h) (revision 2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9) @@ -30,9 +30,9 @@ * \brief The MTreatmentRanges class * \details The treatment adjustment parameter ranges data model * - * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | - * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | - * |0x1A00| 0x020 | 6 | 1/60 Hz| Y | HD | UI | Treatment adjustment param ranges Data | + * | MSG | CAN ID | Ack | Src | Dst | Description | + * |:----:|:------:|:---:|:---:|:---:|:-----------: | + * |0x4300| 0x020 | Y | TD | UI | Treatment adjustment param ranges Data | * * | Payload || * | || @@ -49,7 +49,7 @@ * | || * | || * | typeText | Datum | - * | unitText | HD | + * | unitText | TD | * | infoText | TreatmentRanges | * */ Index: sources/view/hd/data/VTreatmentRanges.cpp =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9 --- sources/view/hd/data/VTreatmentRanges.cpp (.../VTreatmentRanges.cpp) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/view/hd/data/VTreatmentRanges.cpp (.../VTreatmentRanges.cpp) (revision 2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9) @@ -62,88 +62,102 @@ bool isConfigsOk = true; // assume configurations are valid + FROMVARIANT_WITHRETURN ( bloodFlowRateDef , "Blood Flow Rate Ranges" , "Blood_Flow_Rate_Def" , UInt , isConfigsOk ); FROMVARIANT_WITHRETURN ( bloodFlowRateMin , "Blood Flow Rate Ranges" , "Blood_Flow_Rate_Min" , UInt , isConfigsOk ); FROMVARIANT_WITHRETURN ( bloodFlowRateMax , "Blood Flow Rate Ranges" , "Blood_Flow_Rate_Max" , UInt , isConfigsOk ); FROMVARIANT_WITHRETURN ( bloodFlowRateRes , "Blood Flow Rate Ranges" , "Blood_Flow_Rate_Res" , UInt , isConfigsOk ); - FROMVARIANT_WITHRETURN ( bloodFlowRateDef , "Blood Flow Rate Ranges" , "Blood_Flow_Rate_Def" , UInt , isConfigsOk ); + FROMVARIANT_WITHRETURN ( dialysateFlowRateDef , "Dialysate Flow Rate Ranges" , "Dialysate_Flow_Rate_Def" , UInt , isConfigsOk ); FROMVARIANT_WITHRETURN ( dialysateFlowRateMin , "Dialysate Flow Rate Ranges" , "Dialysate_Flow_Rate_Min" , UInt , isConfigsOk ); FROMVARIANT_WITHRETURN ( dialysateFlowRateMax , "Dialysate Flow Rate Ranges" , "Dialysate_Flow_Rate_Max" , UInt , isConfigsOk ); FROMVARIANT_WITHRETURN ( dialysateFlowRateRes , "Dialysate Flow Rate Ranges" , "Dialysate_Flow_Rate_Res" , UInt , isConfigsOk ); - FROMVARIANT_WITHRETURN ( dialysateFlowRateDef , "Dialysate Flow Rate Ranges" , "Dialysate_Flow_Rate_Def" , UInt , isConfigsOk ); + FROMVARIANT_WITHRETURN ( treatmentDurationDef , "Treatment Duration Ranges" , "Treatment_Duration_Def" , UInt , isConfigsOk ); FROMVARIANT_WITHRETURN ( treatmentDurationMin , "Treatment Duration Ranges" , "Treatment_Duration_Min" , UInt , isConfigsOk ); FROMVARIANT_WITHRETURN ( treatmentDurationMax , "Treatment Duration Ranges" , "Treatment_Duration_Max" , UInt , isConfigsOk ); FROMVARIANT_WITHRETURN ( treatmentDurationRes , "Treatment Duration Ranges" , "Treatment_Duration_Res" , UInt , isConfigsOk ); - FROMVARIANT_WITHRETURN ( treatmentDurationDef , "Treatment Duration Ranges" , "Treatment_Duration_Def" , UInt , isConfigsOk ); - FROMVARIANT_WITHRETURN ( heparinDispensingRateMin , "Heparin Dispensing Rate Ranges" , "Heparin_Dispensing_Rate_Min" , Float , isConfigsOk ); - FROMVARIANT_WITHRETURN ( heparinDispensingRateMax , "Heparin Dispensing Rate Ranges" , "Heparin_Dispensing_Rate_Max" , Float , isConfigsOk ); - FROMVARIANT_WITHRETURN ( heparinDispensingRateRes , "Heparin Dispensing Rate Ranges" , "Heparin_Dispensing_Rate_Res" , Float , isConfigsOk ); - FROMVARIANT_WITHRETURN ( heparinDispensingRateDef , "Heparin Dispensing Rate Ranges" , "Heparin_Dispensing_Rate_Def" , Float , isConfigsOk ); + FROMVARIANT_WITHRETURN ( heparinDispensingRateDef , "Heparin Dispensing Rate Ranges" , "Heparin_Dispensing_Rate_Def" , Float , isConfigsOk ); + FROMVARIANT_WITHRETURN ( heparinDispensingRateMin , "Heparin Dispensing Rate Ranges" , "Heparin_Dispensing_Rate_Min" , Float , isConfigsOk ); + FROMVARIANT_WITHRETURN ( heparinDispensingRateMax , "Heparin Dispensing Rate Ranges" , "Heparin_Dispensing_Rate_Max" , Float , isConfigsOk ); + FROMVARIANT_WITHRETURN ( heparinDispensingRateRes , "Heparin Dispensing Rate Ranges" , "Heparin_Dispensing_Rate_Res" , Float , isConfigsOk ); - FROMVARIANT_WITHRETURN ( heparinBolusVolumeMin , "Heparin Bolus Volume Ranges" , "Heparin_Bolus_Volume_Min" , Float , isConfigsOk ); - FROMVARIANT_WITHRETURN ( heparinBolusVolumeMax , "Heparin Bolus Volume Ranges" , "Heparin_Bolus_Volume_Max" , Float , isConfigsOk ); - FROMVARIANT_WITHRETURN ( heparinBolusVolumeRes , "Heparin Bolus Volume Ranges" , "Heparin_Bolus_Volume_Res" , Float , isConfigsOk ); - FROMVARIANT_WITHRETURN ( heparinBolusVolumeDef , "Heparin Bolus Volume Ranges" , "Heparin_Bolus_Volume_Def" , Float , isConfigsOk ); + FROMVARIANT_WITHRETURN ( heparinBolusVolumeDef , "Heparin Bolus Volume Ranges" , "Heparin_Bolus_Volume_Def" , Float , isConfigsOk ); + FROMVARIANT_WITHRETURN ( heparinBolusVolumeMin , "Heparin Bolus Volume Ranges" , "Heparin_Bolus_Volume_Min" , Float , isConfigsOk ); + FROMVARIANT_WITHRETURN ( heparinBolusVolumeMax , "Heparin Bolus Volume Ranges" , "Heparin_Bolus_Volume_Max" , Float , isConfigsOk ); + FROMVARIANT_WITHRETURN ( heparinBolusVolumeRes , "Heparin Bolus Volume Ranges" , "Heparin_Bolus_Volume_Res" , Float , isConfigsOk ); + FROMVARIANT_WITHRETURN ( heparinStopTimeDef , "Heparin Stop Time Ranges" , "Heparin_Stop_Time_Def" , UInt , isConfigsOk ); FROMVARIANT_WITHRETURN ( heparinStopTimeMin , "Heparin Stop Time Ranges" , "Heparin_Stop_Time_Min" , UInt , isConfigsOk ); FROMVARIANT_WITHRETURN ( heparinStopTimeMax , "Heparin Stop Time Ranges" , "Heparin_Stop_Time_Max" , UInt , isConfigsOk ); FROMVARIANT_WITHRETURN ( heparinStopTimeRes , "Heparin Stop Time Ranges" , "Heparin_Stop_Time_Res" , UInt , isConfigsOk ); - FROMVARIANT_WITHRETURN ( heparinStopTimeDef , "Heparin Stop Time Ranges" , "Heparin_Stop_Time_Def" , UInt , isConfigsOk ); + FROMVARIANT_WITHRETURN ( salineBolusVolumeDef , "Saline Bolus Volume Ranges" , "Saline_Bolus_Volume_Def" , UInt , isConfigsOk ); FROMVARIANT_WITHRETURN ( salineBolusVolumeMin , "Saline Bolus Volume Ranges" , "Saline_Bolus_Volume_Min" , UInt , isConfigsOk ); FROMVARIANT_WITHRETURN ( salineBolusVolumeMax , "Saline Bolus Volume Ranges" , "Saline_Bolus_Volume_Max" , UInt , isConfigsOk ); FROMVARIANT_WITHRETURN ( salineBolusVolumeRes , "Saline Bolus Volume Ranges" , "Saline_Bolus_Volume_Res" , UInt , isConfigsOk ); - FROMVARIANT_WITHRETURN ( salineBolusVolumeDef , "Saline Bolus Volume Ranges" , "Saline_Bolus_Volume_Def" , UInt , isConfigsOk ); - heparinTypeOptions ( _Settings.keys(mCategory , "Heparin Type Options" )); - acidConcentrateOptions ( _Settings.keys(mCategory , "Acid Concentrate Options" )); - bicarbonateConcentrateOptions ( _Settings.keys(mCategory , "Bicarbonate Concentrate Options" )); - dialyzerTypeOptions ( _Settings.keys(mCategory , "Dialyzer Type Options" )); + heparinTypeOptions ( _Settings.keys(mCategory , "Heparin Type Options" )); + acidConcentrateOptions ( _Settings.keys(mCategory , "Acid Concentrate Options" )); + bicarbonateConcentrateOptions ( _Settings.keys(mCategory , "Bicarbonate Concentrate Options" )); + dialyzerTypeOptions ( _Settings.keys(mCategory , "Dialyzer Type Options" )); isConfigsOk = isConfigsOk && !_heparinTypeOptions .isEmpty(); isConfigsOk = isConfigsOk && !_acidConcentrateOptions .isEmpty(); isConfigsOk = isConfigsOk && !_bicarbonateConcentrateOptions.isEmpty(); isConfigsOk = isConfigsOk && !_dialyzerTypeOptions .isEmpty(); - FROMVARIANT_WITHRETURN ( dialysateTempMin , "Dialysate Temperature" , "Dialysate_Temperature_Min" , Float , isConfigsOk ); - FROMVARIANT_WITHRETURN ( dialysateTempMax , "Dialysate Temperature" , "Dialysate_Temperature_Max" , Float , isConfigsOk ); - FROMVARIANT_WITHRETURN ( dialysateTempRes , "Dialysate Temperature" , "Dialysate_Temperature_Res" , Float , isConfigsOk ); - FROMVARIANT_WITHRETURN ( dialysateTempDef , "Dialysate Temperature" , "Dialysate_Temperature_Def" , Float , isConfigsOk ); + FROMVARIANT_WITHRETURN ( dialysateTempDef , "Dialysate Temperature" , "Dialysate_Temperature_Def" , Float , isConfigsOk ); + FROMVARIANT_WITHRETURN ( dialysateTempMin , "Dialysate Temperature" , "Dialysate_Temperature_Min" , Float , isConfigsOk ); + FROMVARIANT_WITHRETURN ( dialysateTempMax , "Dialysate Temperature" , "Dialysate_Temperature_Max" , Float , isConfigsOk ); + FROMVARIANT_WITHRETURN ( dialysateTempRes , "Dialysate Temperature" , "Dialysate_Temperature_Res" , Float , isConfigsOk ); + FROMVARIANT_WITHRETURN ( TrancembrncPressureLimitWindowDef , "Trancememberance Pressure Ranges" , "Trancememberance_Adjust_Window_Def" , Int , isConfigsOk ); + FROMVARIANT_WITHRETURN ( TrancembrncPressureLimitWindowMin , "Trancememberance Pressure Ranges" , "Trancememberance_Adjust_Window_Min" , Int , isConfigsOk ); + FROMVARIANT_WITHRETURN ( TrancembrncPressureLimitWindowMax , "Trancememberance Pressure Ranges" , "Trancememberance_Adjust_Window_Max" , Int , isConfigsOk ); + FROMVARIANT_WITHRETURN ( TrancembrncPressureLimitWindowRes , "Trancememberance Pressure Ranges" , "Trancememberance_Adjust_Window_Res" , Int , isConfigsOk ); + + FROMVARIANT_WITHRETURN ( TrancembrncPressureMonitorMin , "Trancememberance Pressure Ranges" , "Trancememberance_Monitor_Min" , Int , isConfigsOk ); + FROMVARIANT_WITHRETURN ( TrancembrncPressureMonitorMax , "Trancememberance Pressure Ranges" , "Trancememberance_Monitor_Max" , Int , isConfigsOk ); + FROMVARIANT_WITHRETURN ( TrancembrncPressureMonitorRes , "Trancememberance Pressure Ranges" , "Trancememberance_Monitor_Res" , Int , isConfigsOk ); + + FROMVARIANT_WITHRETURN ( arterialPressureLimitWindowDef , "Arterial Blood Pressure Ranges" , "Arterial_Adjust_Window_Def" , Int , isConfigsOk ); FROMVARIANT_WITHRETURN ( arterialPressureLimitWindowMin , "Arterial Blood Pressure Ranges" , "Arterial_Adjust_Window_Min" , Int , isConfigsOk ); FROMVARIANT_WITHRETURN ( arterialPressureLimitWindowMax , "Arterial Blood Pressure Ranges" , "Arterial_Adjust_Window_Max" , Int , isConfigsOk ); FROMVARIANT_WITHRETURN ( arterialPressureLimitWindowRes , "Arterial Blood Pressure Ranges" , "Arterial_Adjust_Window_Res" , Int , isConfigsOk ); - FROMVARIANT_WITHRETURN ( arterialPressureLimitWindowDef , "Arterial Blood Pressure Ranges" , "Arterial_Adjust_Window_Def" , Int , isConfigsOk ); FROMVARIANT_WITHRETURN ( arterialPressureMonitorMin , "Arterial Blood Pressure Ranges" , "Arterial_Monitor_Min" , Int , isConfigsOk ); FROMVARIANT_WITHRETURN ( arterialPressureMonitorMax , "Arterial Blood Pressure Ranges" , "Arterial_Monitor_Max" , Int , isConfigsOk ); FROMVARIANT_WITHRETURN ( arterialPressureMonitorRes , "Arterial Blood Pressure Ranges" , "Arterial_Monitor_Res" , Int , isConfigsOk ); + FROMVARIANT_WITHRETURN ( venousPressureLimitWindowDef , "Venous Blood Pressure Ranges" , "Venous_Adjust_Window_Def" , Int , isConfigsOk ); FROMVARIANT_WITHRETURN ( venousPressureLimitWindowMin , "Venous Blood Pressure Ranges" , "Venous_Adjust_Window_Min" , Int , isConfigsOk ); FROMVARIANT_WITHRETURN ( venousPressureLimitWindowMax , "Venous Blood Pressure Ranges" , "Venous_Adjust_Window_Max" , Int , isConfigsOk ); FROMVARIANT_WITHRETURN ( venousPressureLimitWindowRes , "Venous Blood Pressure Ranges" , "Venous_Adjust_Window_Res" , Int , isConfigsOk ); - FROMVARIANT_WITHRETURN ( venousPressureLimitWindowDef , "Venous Blood Pressure Ranges" , "Venous_Adjust_Window_Def" , Int , isConfigsOk ); + FROMVARIANT_WITHRETURN ( venousPressureLimitAsymtrcDef , "Venous Blood Pressure Ranges" , "Venous_Adjust_Asymmetric_Def" , Int , isConfigsOk ); FROMVARIANT_WITHRETURN ( venousPressureLimitAsymtrcMin , "Venous Blood Pressure Ranges" , "Venous_Adjust_Asymmetric_Min" , Int , isConfigsOk ); FROMVARIANT_WITHRETURN ( venousPressureLimitAsymtrcMax , "Venous Blood Pressure Ranges" , "Venous_Adjust_Asymmetric_Max" , Int , isConfigsOk ); FROMVARIANT_WITHRETURN ( venousPressureLimitAsymtrcRes , "Venous Blood Pressure Ranges" , "Venous_Adjust_Asymmetric_Res" , Int , isConfigsOk ); - FROMVARIANT_WITHRETURN ( venousPressureLimitAsymtrcDef , "Venous Blood Pressure Ranges" , "Venous_Adjust_Asymmetric_Def" , Int , isConfigsOk ); FROMVARIANT_WITHRETURN ( venousPressureMonitorMin , "Venous Blood Pressure Ranges" , "Venous_Monitor_Min" , Int , isConfigsOk ); FROMVARIANT_WITHRETURN ( venousPressureMonitorMax , "Venous Blood Pressure Ranges" , "Venous_Monitor_Max" , Int , isConfigsOk ); FROMVARIANT_WITHRETURN ( venousPressureMonitorRes , "Venous Blood Pressure Ranges" , "Venous_Monitor_Res" , Int , isConfigsOk ); + FROMVARIANT_WITHRETURN ( bloodPressureMeasureIntervalDef , "Blood Pressure Measure Interval Ranges" , "Blood_Pressure_Measure_Interval_Def" , UInt , isConfigsOk ); FROMVARIANT_WITHRETURN ( bloodPressureMeasureIntervalMin , "Blood Pressure Measure Interval Ranges" , "Blood_Pressure_Measure_Interval_Min" , UInt , isConfigsOk ); FROMVARIANT_WITHRETURN ( bloodPressureMeasureIntervalMax , "Blood Pressure Measure Interval Ranges" , "Blood_Pressure_Measure_Interval_Max" , UInt , isConfigsOk ); FROMVARIANT_WITHRETURN ( bloodPressureMeasureIntervalRes , "Blood Pressure Measure Interval Ranges" , "Blood_Pressure_Measure_Interval_Res" , UInt , isConfigsOk ); - FROMVARIANT_WITHRETURN ( bloodPressureMeasureIntervalDef , "Blood Pressure Measure Interval Ranges" , "Blood_Pressure_Measure_Interval_Def" , UInt , isConfigsOk ); + FROMVARIANT_WITHRETURN ( rinsebackFlowRateDef , "Rinseback Flow Rate Ranges" , "Rinseback_Flow_Rate_Def" , UInt , isConfigsOk ); FROMVARIANT_WITHRETURN ( rinsebackFlowRateMin , "Rinseback Flow Rate Ranges" , "Rinseback_Flow_Rate_Min" , UInt , isConfigsOk ); FROMVARIANT_WITHRETURN ( rinsebackFlowRateMax , "Rinseback Flow Rate Ranges" , "Rinseback_Flow_Rate_Max" , UInt , isConfigsOk ); -// FROMVARIANT_WITHRETURN ( rinsebackFlowRateRes , "Rinseback Flow Rate Ranges" , "Rinseback_Flow_Rate_Res" , UInt , isConfigsOk ); - FROMVARIANT_WITHRETURN ( rinsebackFlowRateDef , "Rinseback Flow Rate Ranges" , "Rinseback_Flow_Rate_Def" , UInt , isConfigsOk ); + FROMVARIANT_WITHRETURN ( rinsebackFlowRateRes , "Rinseback Flow Rate Ranges" , "Rinseback_Flow_Rate_Res" , UInt , isConfigsOk ); + FROMVARIANT_WITHRETURN ( rinsebackFlowRateDef , "Rinseback Volume Ranges" , "Rinseback_Volume_Def" , UInt , isConfigsOk ); + FROMVARIANT_WITHRETURN ( rinsebackFlowRateMin , "Rinseback Volume Ranges" , "Rinseback_Volume_Min" , UInt , isConfigsOk ); + FROMVARIANT_WITHRETURN ( rinsebackFlowRateMax , "Rinseback Volume Ranges" , "Rinseback_Volume_Max" , UInt , isConfigsOk ); + FROMVARIANT_WITHRETURN ( rinsebackFlowRateRes , "Rinseback Volume Ranges" , "Rinseback_Volume_Res" , UInt , isConfigsOk ); + emit didTreatmentRangesDone( isConfigsOk ); } Index: sources/view/hd/data/VTreatmentRanges.h =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9 --- sources/view/hd/data/VTreatmentRanges.h (.../VTreatmentRanges.h) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/view/hd/data/VTreatmentRanges.h (.../VTreatmentRanges.h) (revision 2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9) @@ -36,7 +36,7 @@ { Q_OBJECT - // Real-time properties received from HD + // Real-time properties received from TD from TreatmentRangesData READONLY( quint32 , treatmentRanges_Duration_Min , 0) READONLY( quint32 , treatmentRanges_Duration_Max , 0) READONLY( float , treatmentRanges_Ultrafiltration_Volume_Min , 0) @@ -59,13 +59,15 @@ READONLY( QStringList , dialyzerTypeOptions ,{}) RANGESET( float , dialysateTemp , 0) + RANGESET( qint32 , TrancembrncPressureLimitWindow , 0) RANGESET( qint32 , arterialPressureLimitWindow , 0) RANGESET( qint32 , venousPressureLimitWindow , 0) RANGESET( qint32 , venousPressureLimitAsymtrc , 0) RANGESET( quint32 , bloodPressureMeasureInterval , 0) RANGESET( quint32 , rinsebackFlowRate , 0) // monitoring ranges + RANGESET( qint32 , TrancembrncPressureMonitor , 0) RANGESET( qint32 , arterialPressureMonitor , 0) RANGESET( qint32 , venousPressureMonitor , 0) Index: sources/view/settings/VBluetooth.h =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9 --- sources/view/settings/VBluetooth.h (.../VBluetooth.h) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/view/settings/VBluetooth.h (.../VBluetooth.h) (revision 2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9) @@ -20,7 +20,6 @@ // Project #include "main.h" // Doxygen : do not remove #include "VView.h" -#include "MAdjustHDSerialNumberResponse.h" #include "MBluetooth.h" #include "MUIBloodPressureData.h" Index: sources/view/settings/VDateTime.cpp =================================================================== diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -r2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9 --- sources/view/settings/VDateTime.cpp (.../VDateTime.cpp) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ sources/view/settings/VDateTime.cpp (.../VDateTime.cpp) (revision 2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9) @@ -254,6 +254,9 @@ { _currentDateTime = QDateTime::currentDateTime(); + time (_currentDateTime.toString(_Settings.timeFormat())); + date (_currentDateTime.toString(_Settings.dateFormat())); + current (_currentDateTime.toString(_Settings.getDatetimeFormat())); timezone(QTimeZone::systemTimeZone().abbreviation(_currentDateTime)); Index: sources/view/settings/VDateTime.h =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9 --- sources/view/settings/VDateTime.h (.../VDateTime.h) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/view/settings/VDateTime.h (.../VDateTime.h) (revision 2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9) @@ -93,6 +93,10 @@ PROPERTY(QString, current , "" ) PROPERTY(QString, greeting , "" ) + PROPERTY(QString, time , "" ) + PROPERTY(QString, date , "" ) + + PROPERTY(QString, timezone , "" ) VIEW_DEC_CLASS(VDateTime)