Index: leahi.pro =================================================================== diff -u -rc4a72b20ccc74172b5c5cc6f440f53dc5693908f -re08fda600a9ee3cb4ca6b7f46cd8fdaf9db4c4c3 --- leahi.pro (.../leahi.pro) (revision c4a72b20ccc74172b5c5cc6f440f53dc5693908f) +++ leahi.pro (.../leahi.pro) (revision e08fda600a9ee3cb4ca6b7f46cd8fdaf9db4c4c3) @@ -60,6 +60,7 @@ sources/model/td \ sources/model/td/data \ sources/model/td/data/treatment \ + sources/model/td/data/pretreatment \ sources/model/td/data/treatmentlog \ sources/model/td/data/pretreatment \ sources/model/td/alarm \ @@ -157,6 +158,8 @@ sources/model/confirm/MDuetConfirmTDi.h \ sources/model/dd/adjustment/settings/MAdjustDDSerialNumberResponse.h \ sources/model/dd/adjustment/settings/MAdjustDDVersionsResponse.h \ + sources/model/dd/adjustment/settings/MAdjustRoWaterModeResponse.h \ + sources/model/dd/adjustment/settings/MRoWaterModeResponse.h \ sources/model/dd/data/MDDBloodLeakData.h \ sources/model/dd/data/MDDConcentratePumpData.h \ sources/model/dd/data/MDDConductivityData.h \ @@ -181,6 +184,7 @@ sources/model/td/adjustment/settings/MAdjustTDSerialNumberResponse.h \ sources/model/td/adjustment/settings/MAdjustTDVersionsRequest.h \ sources/model/td/adjustment/settings/MAdjustTDVersionsResponse.h \ + sources/model/td/adjustment/settings/MAdjustTDAlarmVolumeResponse.h \ sources/model/td/adjustment/settings/MTDAdvancedInstitutionalRecordResponse.h \ sources/model/td/adjustment/treatment/MTreatmentAdjustAutoSubResponse.h \ sources/model/td/adjustment/treatment/MTreatmentAdjustHDFResponse.h \ @@ -232,6 +236,9 @@ sources/model/td/data/treatmentlog/MTreatmentLogAlarmData.h \ sources/model/td/data/treatmentlog/MTreatmentLogEventData.h \ sources/model/td/data/treatmentlog/MTreatmentLogAvrgeData.h \ + \ # ---------- Models - TD - Data - Pre-Treatment + sources/model/td/data/pretreatment/MPreTreatmentStatesData.h \ + sources/model/td/data/pretreatment/MPreTreatmentDisposablesPrimeData.h \ \ # ---------- Models - TD - Adjustment - In-Treatment //// ----- @LEAHIZED sources/model/td/adjustment/treatment/MTreatmentAdjustBloodPrimeResponse.h \ sources/model/td/adjustment/treatment/MTreatmentAdjustBloodFlowRateResponse.h \ @@ -274,6 +281,7 @@ sources/view/fp/data/VFPTemperatureData.h \ sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.h \ sources/view/settings/VAdvancedInstitutionalRecord.h \ + sources/view/settings/VRoWaterMode.h \ sources/view/settings/VCalibrationSettings.h \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentAutoSub.h \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentHDF.h \ @@ -294,6 +302,7 @@ sources/view/td/data/VTDSyringePumpData.h \ \ # ---------- Views - TD - Data - Pre-Treatment sources/view/td/data/pretreatment/VPreTreatmentStatesData.h \ + sources/view/td/data/pretreatment/VPreTreatmentDisposablesPrimeData.h \ \ # ---------- Views - TD - Data - In-Treatment sources/view/td/data/treatment/VTDTreatmentStatesData.h \ sources/view/td/data/treatment/VTreatmentBloodFlow.h \ @@ -333,7 +342,7 @@ \ # ---------- Views - TD - Adjustment - Pre-Treatment sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.h \ sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.h \ - sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.h \ + sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.h \ \ # ---------- Views - TD - Adjustment - Post-Treatment sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.h \ sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h \ @@ -374,7 +383,6 @@ sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.h \ sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.h \ sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.h \ - sources/model/dg/adjustment/settings/MDuetRoWaterDG.h \ \ # ---------- Models - Alarm sources/model/hd/alarm/MAlarmStatusData.h \ sources/model/hd/alarm/MAlarmTriggered.h \ @@ -385,8 +393,6 @@ \ # ---------- Models - HD - Adjustment sources/model/hd/adjustment/MAdjustRequestsBase.h \ sources/model/hd/adjustment/settings/MAdjustHDRequests.h \ - \ # ---------- Models - HD - Adjustment - Settings - sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.h \ \ # ---------- Models - HD - Adjustment - Pre-Treatment sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.h \ @@ -407,7 +413,6 @@ \ # ---------- Models - HD - Data - Pre-Treatment - Progress sources/model/hd/data/pretreatment/MPreTreatmentSelfTestNoCartridgeData.h \ sources/model/hd/data/pretreatment/MPreTreatmentSelfTestDryData.h \ - sources/model/hd/data/pretreatment/MPreTreatmentDisposablesPrimeData.h \ \ # ---------- Models - HD - Data sources/model/hd/data/MHDDebugText.h \ sources/model/hd/data/MHDGeneralEvent.h \ @@ -468,7 +473,6 @@ sources/view/settings/VAdjustmentServiceMode.h \ sources/view/settings/VAdjustmentServiceDates.h \ sources/view/settings/VAdjustmentDGCleaningUsage.h \ - sources/view/settings/VDuetRoWaterDG.h \ sources/view/settings/VCloudSync.h \ sources/view/settings/VHDUsageInfo.h \ sources/view/settings/VAdjustmentInstitutionalRecord.h \ @@ -500,7 +504,6 @@ \ # ---------- Views - HD - Data - Pre-Treatment - Progress sources/view/hd/data/pretreatment/VPreTreatmentSelfTestNoCartridgeData.h \ sources/view/hd/data/pretreatment/VPreTreatmentSelfTestDryData.h \ - sources/view/hd/data/pretreatment/VPreTreatmentDisposablesPrimeData.h \ \ # ---------- Views - HD - Data sources/view/hd/data/post/VHDPOSTData.h \ sources/view/hd/data/VHDAccelerometerData.h \ @@ -545,6 +548,8 @@ sources/model/confirm/MDuetConfirmTDi.cpp \ sources/model/dd/adjustment/settings/MAdjustDDSerialNumberResponse.cpp \ sources/model/dd/adjustment/settings/MAdjustDDVersionsResponse.cpp \ + sources/model/dd/adjustment/settings/MAdjustRoWaterModeResponse.cpp \ + sources/model/dd/adjustment/settings/MRoWaterModeResponse.cpp \ sources/model/dd/data/MDDBloodLeakData.cpp \ sources/model/dd/data/MDDConcentratePumpData.cpp \ sources/model/dd/data/MDDConductivityData.cpp \ @@ -642,6 +647,9 @@ sources/model/td/data/treatmentlog/MTreatmentLogAlarmData.cpp \ sources/model/td/data/treatmentlog/MTreatmentLogEventData.cpp \ sources/model/td/data/treatmentlog/MTreatmentLogAvrgeData.cpp \ + \ # ---------- Models - Data - States + sources/model/td/data/pretreatment/MPreTreatmentStatesData.cpp \ + sources/model/td/data/pretreatment/MPreTreatmentDisposablesPrimeData.cpp \ \ # ---------- Models - TD - Adjustment - In-Treatment sources/model/td/adjustment/treatment/MTreatmentAdjustBloodPrimeResponse.cpp \ sources/model/td/adjustment/treatment/MTreatmentAdjustBloodFlowRateResponse.cpp \ @@ -676,7 +684,6 @@ sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.cpp \ sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.cpp \ sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.cpp \ - sources/model/dg/adjustment/settings/MDuetRoWaterDG.cpp \ \ # ---------- Models - Alarm sources/model/hd/alarm/MAlarmStatusData.cpp \ sources/model/hd/alarm/MAlarmMapping.cpp \ @@ -689,6 +696,7 @@ sources/model/td/adjustment/settings/MAdjustTDDateTimeResponse.cpp \ sources/model/td/adjustment/settings/MTDInstitutionalRecordResponse.cpp \ sources/model/td/adjustment/settings/MAdjustTDInstitutionalRecordResponse.cpp \ + sources/model/td/adjustment/settings/MAdjustTDAlarmVolumeResponse.cpp \ \ # ---------- Models - TD - Adjustment - Pre-Treatment sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.cpp \ sources/model/td/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.cpp \ @@ -701,8 +709,6 @@ sources/model/td/adjustment/treatment/MTreatmentAdjustRecirculateResponse.cpp \ \ # ---------- Models - DD - Adjustment - Settings sources/model/dd/adjustment/settings/MAdjustDDDateTimeResponse.cpp \ - \ # ---------- Models - HD - Adjustment - Settings - sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.cpp \ \ # ---------- Models - HD - Adjustment - Pre-Treatment sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.cpp \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp \ @@ -730,7 +736,6 @@ sources/model/hd/data/post/MHDRTCEpochData.cpp \ sources/model/hd/data/MHDUsageInfoResponse.cpp \ \ # ---------- Models - HD - Data - Pre-Treatment - sources/model/hd/data/pretreatment/MPreTreatmentDisposablesPrimeData.cpp \ sources/model/hd/data/pretreatment/MPreTreatmentSelfTestNoCartridgeData.cpp \ sources/model/hd/data/pretreatment/MPreTreatmentSelfTestDryData.cpp \ \ # ---------- Models - DG - Adjustment - Settings @@ -766,6 +771,7 @@ \ # ---------- Views - TD - States Data sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.cpp \ sources/view/settings/VAdvancedInstitutionalRecord.cpp \ + sources/view/settings/VRoWaterMode.cpp \ sources/view/settings/VCalibrationSettings.cpp \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentAutoSub.cpp \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentHDF.cpp \ @@ -786,6 +792,7 @@ sources/view/td/data/VTDSyringePumpData.cpp \ \ # ---------- Views - TD - Data - Pre-Treatment sources/view/td/data/pretreatment/VPreTreatmentStatesData.cpp \ + sources/view/td/data/pretreatment/VPreTreatmentDisposablesPrimeData.cpp \ \ # ---------- Views - TD - Data - In-Treatment sources/view/td/data/treatment/VTDTreatmentStatesData.cpp \ sources/view/td/data/treatment/VTreatmentBloodFlow.cpp \ @@ -825,7 +832,7 @@ \ # ---------- Views - TD - Adjustment - Pre-Treatment sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.cpp \ sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.cpp \ - sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.cpp \ + sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.cpp \ \ # ---------- Views - TD - Adjustment - Post-Treatment sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustDisposablesRemovalConfirm.cpp \ sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp \ @@ -846,7 +853,6 @@ sources/view/settings/VAdjustmentAlarmVolume.cpp \ sources/view/settings/VAdjustmentServiceMode.cpp \ sources/view/settings/VAdjustmentServiceDates.cpp \ - sources/view/settings/VDuetRoWaterDG.cpp \ sources/view/settings/VCloudSync.cpp \ sources/view/settings/VAdjustmentDGCleaningUsage.cpp \ sources/view/settings/VHDUsageInfo.cpp \ @@ -879,7 +885,6 @@ \ # ---------- Views - HD - Data - Pre-Treatment sources/view/hd/data/pretreatment/VPreTreatmentSelfTestNoCartridgeData.cpp \ sources/view/hd/data/pretreatment/VPreTreatmentSelfTestDryData.cpp \ - sources/view/hd/data/pretreatment/VPreTreatmentDisposablesPrimeData.cpp \ \ # ---------- Views - HD - Data - In-Treatment sources/view/hd/data/treatment/VTreatmentDialysateFlow.cpp \ sources/view/hd/data/treatment/VTreatmentHeparinData.cpp \ Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -rc4a72b20ccc74172b5c5cc6f440f53dc5693908f -re08fda600a9ee3cb4ca6b7f46cd8fdaf9db4c4c3 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision c4a72b20ccc74172b5c5cc6f440f53dc5693908f) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision e08fda600a9ee3cb4ca6b7f46cd8fdaf9db4c4c3) @@ -79,7 +79,7 @@ {Gui::GuiActionType::ID_Vitals , 3 * 4 }, // 3 parameters each 4bytes {Gui::GuiActionType::ID_Ultrafiltration , 4 * 4 }, // 4 parameters each 4bytes {Gui::GuiActionType::ID_IsolatedUF , 6 * 4 }, // 6 parameters each 4bytes - {Gui::GuiActionType::ID_Heparin , 2 * 4 }, // 2 parameters each 4bytes + {Gui::GuiActionType::ID_Heparin , 3 * 4 }, // 2 parameters each 4bytes {Gui::GuiActionType::ID_Rinseback , 7 * 4 }, // 6 parameters each 4bytes {Gui::GuiActionType::ID_Recirculate , 1 * 4 }, // 1 parameters each 4bytes {Gui::GuiActionType::ID_BloodPrime , 4 * 4 }, // 4 parameters each 4bytes @@ -129,7 +129,7 @@ {Gui::GuiActionType::ID_HDUsageInfoRsp , 4 * 4 + 2 }, // 4 parameters each 4bytes + 1 parameter 2 bytes //TD Data Messages {Gui::GuiActionType::ID_TDVoltageData , 8 * 4 }, // 8 parameters each 4bytes - {Gui::GuiActionType::ID_TDValvesData , 3 * 4 + 7*2 }, // 5 parameters each 4bytes + 2 parametres 2 bytes + {Gui::GuiActionType::ID_TDValvesData , 3 * 4 + 5*2 }, // 5 parameters each 4bytes + 2 parametres 2 bytes {Gui::GuiActionType::ID_TDEjectorData , 4 * 4 }, // 4 parameters each 4bytes {Gui::GuiActionType::ID_TDSwitchesData , 1 * 4 }, // 3 parameters each 4bytes {Gui::GuiActionType::ID_TDBatteryData , 2 * 4 }, // 2 parameters each 4bytes @@ -248,7 +248,7 @@ // Pre-Treatment Disposable Priming {Gui::GuiActionType::ID_AdjustDisposablesPrimeReq , 0 * 4 }, // 0 parameter {Gui::GuiActionType::ID_AdjustDisposablesPrimeRsp , 2 * 4 }, // 2 parameters each 4bytes - {Gui::GuiActionType::ID_DisposablesPrimeData , 2 * 4 }, // 2 parameters each 4bytes + {Gui::GuiActionType::ID_DisposablesPrimeData , 4 * 4 }, // 2 parameters each 4bytes // Pre-Treatment Patient Connection Begin {Gui::GuiActionType::ID_AdjustPatientConnectionBeginReq , 0 * 4 }, // 0 parameter {Gui::GuiActionType::ID_AdjustPatientConnectionBeginRsp , 2 * 4 }, // 2 parameters each 4bytes @@ -348,9 +348,10 @@ {Gui::GuiActionType::ID_AdjustDGCleaningUsageReq , 0 * 4 }, // 0 parameter {Gui::GuiActionType::ID_AdjustDGCleaningUsageRsp , 10 * 4 }, //10 parameters each 4bytes // ---- RO Water - {Gui::GuiActionType::ID_DuetRoWaterStatDGq , 0 * 4 }, // 0 parameter each 4bytes - {Gui::GuiActionType::ID_DuetRoWaterModeUIi , 1 * 4 }, // 1 parameter each 4bytes - {Gui::GuiActionType::ID_DuetRoWaterModeDGr , 3 * 4 }, // 3 parameters each 4bytes + {Gui::GuiActionType::ID_RoWaterModeReq , 0 * 4 }, // 1 parameter each 4bytes + {Gui::GuiActionType::ID_RoWaterModeRsp , 3 * 4 }, // 3 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustRoWaterModeReq , 1 * 4 }, // 1 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustRoWaterModeRsp , 2 * 4 }, // 2 parameter each 4bytes // ---- {Gui::GuiActionType::ID_RawData , 255 }, {Gui::GuiActionType::ID_Acknow , 0 }, Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml =================================================================== diff -u -r9c15c403ee00b776def3aaf8bfb32a3f8c6f2792 -re08fda600a9ee3cb4ca6b7f46cd8fdaf9db4c4c3 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml (.../PreTreatmentCreateContent.qml) (revision 9c15c403ee00b776def3aaf8bfb32a3f8c6f2792) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml (.../PreTreatmentCreateContent.qml) (revision e08fda600a9ee3cb4ca6b7f46cd8fdaf9db4c4c3) @@ -120,7 +120,7 @@ vPostTreatmentAdjustmentTreatmentLog.patientID = vTreatmentCreate.patientID vTreatmentCreate.finalConfirmation = vFinalConfirmation ? 1 : 0 - if ( ! PreTreatmentCreatePatientPrescription.isHDFFeatured ) { + if ( ! _preTreatmentCreatePatientPrescription.isHDFFeatured ) { vTreatmentCreate.substitutionFluidVolume = 0 vTreatmentCreate.hdfTreatmentMode = 0 } @@ -142,6 +142,8 @@ function onDidValidationPass ( ) { activateAndRefresh() // refresh values on validation clearErrors() + + if ( _headerbarPrescription.visible) _headerbarPrescription.close() } } Index: sources/view/settings/VSettings.cpp =================================================================== diff -u -rb110ee732fe1306669f71d9c17ed4714e1f03ee2 -re08fda600a9ee3cb4ca6b7f46cd8fdaf9db4c4c3 --- sources/view/settings/VSettings.cpp (.../VSettings.cpp) (revision b110ee732fe1306669f71d9c17ed4714e1f03ee2) +++ sources/view/settings/VSettings.cpp (.../VSettings.cpp) (revision e08fda600a9ee3cb4ca6b7f46cd8fdaf9db4c4c3) @@ -199,11 +199,12 @@ initConnectionsSettings(); } -VSettings::TKeysList VSettings::updateReplacements(const QString &vGroup, const QStringList &vKeys) +VSettings::TKeysList VSettings::updateReplacements(const QString &vGroup, + const QStringList &vKeys) { TKeysList keysList; for ( quint16 keyIndex = 0; keyIndex < vKeys.count(); keyIndex++ ) { - QRegExp regx("\\{\\s*\\d+\\s*:\\s*\\d+\\s*:\\s*\\w*\\s*:\\s*\\d*\\s*\\}"); + QRegExp regx("\\{\\s*\\d+\\s*:\\s*\\d+\\s*:\\s*\\w+\\s*:\\s*\\d+\\s*\\}"); QString key = vKeys[keyIndex]; int replacementCount = key.count(regx); QStringList keyList; @@ -215,10 +216,20 @@ keyList += ""; // value placeholder key.remove(0, pos + regx.matchedLength()); QStringList lst = blk.split(":"); - quint16 id = lst[0].toUInt(); - quint16 ix = lst[1].toUInt(); - QString ex = lst[2] ; - quint16 rd = lst[3].toUInt(); + if ( lst.size() != 4 ) + continue; + + bool okId = false; + bool okIx = false; + bool okRd = false; + + quint16 id = lst[0].trimmed().toUInt(&okId); + quint16 ix = lst[1].trimmed().toUInt(&okIx); + QString ex = lst[2].trimmed(); + quint16 rd = lst[3].trimmed().toUInt(&okRd); + + if ( ! okId || ! okIx || ! okRd ) + continue; TLocation loc; loc.group = vGroup ; loc.keyIndex = keyIndex ;