Index: leahi.pro =================================================================== diff -u -r8fa5a167170e6b1c77551e8583e5ec3dcb8f45b0 -r6b0a4712aa142d35ca068e53830184f1b5395210 --- leahi.pro (.../leahi.pro) (revision 8fa5a167170e6b1c77551e8583e5ec3dcb8f45b0) +++ leahi.pro (.../leahi.pro) (revision 6b0a4712aa142d35ca068e53830184f1b5395210) @@ -61,6 +61,7 @@ sources/model/td/data \ sources/model/td/data/treatment \ sources/model/td/data/treatmentlog \ + sources/model/td/data/pretreatment \ sources/model/td/alarm \ sources/model/td/adjustment \ sources/model/td/adjustment/settings \ @@ -79,6 +80,7 @@ sources/view/td \ sources/view/td/data \ sources/view/td/data/treatment \ + sources/view/td/data/pretreatment \ sources/view/td/adjustment/treatment \ sources/view/td/adjustment/pretreatment \ sources/view/td/adjustment/posttreatment \ @@ -196,6 +198,7 @@ sources/model/td/data/MTDValvesData.h \ sources/model/td/data/MTDVoltageData.h \ sources/model/td/data/MWaterSampleData.h \ + sources/model/td/data/pretreatment/MPreTreatmentStatesData.h \ sources/model/td/data/treatment/MTreatmentBloodFlowData.h \ sources/model/td/data/treatment/MTreatmentBloodPrimeData.h \ sources/model/td/data/treatment/MTreatmentHDFData.h \ @@ -267,6 +270,7 @@ sources/view/fp/data/VFPTemperatureData.h \ sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.h \ sources/view/settings/VAdvancedInstitutionalRecord.h \ + sources/view/settings/VCalibrationSettings.h \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentAutoSub.h \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentHDF.h \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentHDFState.h \ @@ -283,6 +287,8 @@ sources/view/td/data/VTDVoltageData.h \ sources/view/td/data/VTreatmentRanges.h \ sources/view/td/data/VWaterSampleData.h \ + \ # ---------- Views - TD - Data - Pre-Treatment + sources/view/td/data/pretreatment/VPreTreatmentStatesData.h \ \ # ---------- Views - TD - Data - In-Treatment sources/view/td/data/treatment/VTDTreatmentStatesData.h \ sources/view/td/data/treatment/VTreatmentBloodFlow.h \ @@ -367,7 +373,6 @@ sources/model/hd/alarm/MAlarmCleared.h \ sources/model/hd/alarm/MAlarmActiveList.h \ \ # ---------- Models - States Data - sources/model/hd/data/pretreatment/MPreTreatmentStatesData.h \ sources/model/hd/data/posttreatment/MPostTreatmentStatesData.h \ \ # ---------- Models - HD - Adjustment sources/model/hd/adjustment/MAdjustRequestsBase.h \ @@ -484,7 +489,6 @@ \ # ---------- Views - HD - Adjustment - Disinfection sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h \ \ # ---------- Views - HD - Data - States - sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h \ sources/view/hd/data/posttreatment/VPostTreatmentStatesData.h \ \ # ---------- Views - HD - Data - Pre-Treatment - Progress sources/view/hd/data/pretreatment/VPreTreatmentSelfTestNoCartridgeData.h \ @@ -575,6 +579,7 @@ sources/model/td/data/MTDValvesData.cpp \ sources/model/td/data/MTDVoltageData.cpp \ sources/model/td/data/MWaterSampleData.cpp \ + sources/model/td/data/pretreatment/MPreTreatmentStatesData.cpp \ sources/model/td/data/treatment/MTreatmentBloodFlowData.cpp \ sources/model/td/data/treatment/MTreatmentBloodPrimeData.cpp \ sources/model/td/data/treatment/MTreatmentHDFData.cpp \ @@ -669,7 +674,6 @@ sources/model/hd/alarm/MAlarmCleared.cpp \ sources/model/hd/alarm/MAlarmActiveList.cpp \ \ # ---------- Models - Data - States - sources/model/hd/data/pretreatment/MPreTreatmentStatesData.cpp \ sources/model/hd/data/posttreatment/MPostTreatmentStatesData.cpp \ \ # ---------- Models - TD - Adjustment - Settings sources/model/td/adjustment/settings/MAdjustTDDateTimeResponse.cpp \ @@ -753,6 +757,7 @@ \ # ---------- Views - TD - States Data sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.cpp \ sources/view/settings/VAdvancedInstitutionalRecord.cpp \ + sources/view/settings/VCalibrationSettings.cpp \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentAutoSub.cpp \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentHDF.cpp \ sources/view/td/adjustment/treatment/VTreatmentAdjustmentHDFState.cpp \ @@ -769,6 +774,8 @@ sources/view/td/data/VTDVoltageData.cpp \ sources/view/td/data/VTreatmentRanges.cpp \ sources/view/td/data/VWaterSampleData.cpp \ + \ # ---------- Views - TD - Data - Pre-Treatment + sources/view/td/data/pretreatment/VPreTreatmentStatesData.cpp \ \ # ---------- Views - TD - Data - In-Treatment sources/view/td/data/treatment/VTDTreatmentStatesData.cpp \ sources/view/td/data/treatment/VTreatmentBloodFlow.cpp \ @@ -852,7 +859,6 @@ \ # ---------- Views - HD - Adjustment - Disinfection sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp \ \ # ---------- Views - HD - States Data - sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp \ sources/view/hd/data/posttreatment/VPostTreatmentStatesData.cpp \ \ # ---------- Views - HD - Data sources/view/hd/data/VHDAccelerometerData.cpp \ Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r85105bf140b9b7c4ffc8f0d176f5f01dd2261867 -r6b0a4712aa142d35ca068e53830184f1b5395210 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 85105bf140b9b7c4ffc8f0d176f5f01dd2261867) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 6b0a4712aa142d35ca068e53830184f1b5395210) @@ -90,7 +90,7 @@ {Gui::GuiActionType::ID_HDBloodLeakData , 4 * 4 }, // 4 parameters each 4bytes // ---- {Gui::GuiActionType::ID_TDOpModeData , 2 * 4 }, // 2 parameter each 4bytes - {Gui::GuiActionType::ID_PreTreatmentStates , 11 * 4 }, //11 parameters each 4bytes + {Gui::GuiActionType::ID_PreTreatmentStates , 8 * 4 }, // 8 parameters each 4bytes {Gui::GuiActionType::ID_TreatmentStates , 10 * 4 }, //10 parameters each 4bytes {Gui::GuiActionType::ID_PostTreatmentStates , 2 * 4 }, // 2 parameter each 4bytes Index: sources/gui/GuiGlobals.cpp =================================================================== diff -u -r8fa5a167170e6b1c77551e8583e5ec3dcb8f45b0 -r6b0a4712aa142d35ca068e53830184f1b5395210 --- sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 8fa5a167170e6b1c77551e8583e5ec3dcb8f45b0) +++ sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 6b0a4712aa142d35ca068e53830184f1b5395210) @@ -56,6 +56,7 @@ #include "VInstitutionalRecord.h" #include "VAdjustmentAdvancedInstitutionalRecord.h" #include "VAdvancedInstitutionalRecord.h" +#include "VCalibrationSettings.h" // states data #include "VTDOpModeData.h" #include "VPreTreatmentStatesData.h" Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r8fa5a167170e6b1c77551e8583e5ec3dcb8f45b0 -r6b0a4712aa142d35ca068e53830184f1b5395210 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 8fa5a167170e6b1c77551e8583e5ec3dcb8f45b0) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 6b0a4712aa142d35ca068e53830184f1b5395210) @@ -121,7 +121,7 @@ // State Messages ID_TDOpModeData = 0x1200, // 18 //// ----- @LEAHIZED - ID_PreTreatmentStates = 0x5C00, // 92 + ID_PreTreatmentStates = 0xB700, // 183 //// ----- @LEAHIZED ID_TreatmentStates = 0x3C00, // 60 //// ----- @LEAHIZED ID_PostTreatmentStates = 0x770F, // 119 //// ----- @CRAPIZED: had to change to avoid duplication Index: sources/gui/qml/main.qml =================================================================== diff -u -r8fa5a167170e6b1c77551e8583e5ec3dcb8f45b0 -r6b0a4712aa142d35ca068e53830184f1b5395210 --- sources/gui/qml/main.qml (.../main.qml) (revision 8fa5a167170e6b1c77551e8583e5ec3dcb8f45b0) +++ sources/gui/qml/main.qml (.../main.qml) (revision 6b0a4712aa142d35ca068e53830184f1b5395210) @@ -58,6 +58,7 @@ import VCloudSync 0.1 import VHDUsageInfo 0.1 import VInstitutionalRecord 0.1 +import VCalibrationSettings 0.1 import VAdjustmentInstitutionalRecord 0.1 import VAdvancedInstitutionalRecord 0.1 import VAdjustmentAdvancedInstitutionalRecord 0.1 @@ -207,6 +208,8 @@ VInstitutionalRecord { id: vInstitutionalRecord } VAdjustmentAdvancedInstitutionalRecord { id: vAdjustmentAdvancedInstitutionalRecord } VAdvancedInstitutionalRecord { id: vAdvancedInstitutionalRecord } + VCalibrationSettings { id: vCalibrationSettings } + //VAdjustIn // ---- States VTDOpMode { id: vTDOpMode Index: sources/view/VTreatmentCreate.h =================================================================== diff -u -r456da384df52c20ce45b2bec4317806ee11af1f6 -r6b0a4712aa142d35ca068e53830184f1b5395210 --- sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision 456da384df52c20ce45b2bec4317806ee11af1f6) +++ sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision 6b0a4712aa142d35ca068e53830184f1b5395210) @@ -76,7 +76,7 @@ QString _tdSerialNumber = ""; VALUESET(quint32 , treatmentModality , 0) - VALUESET(quint32 , hdfTreatmentMode , 0) + VALUESET(quint32 , hdfTreatmentMode , 1) // Default - Post Dilution VALUESET(quint32 , bloodFlowRate , 0) VALUESET(quint32 , dialysateFlowRate , 0) VALUESET(quint32 , treatmentDuration , 0) Index: sources/view/VView.h =================================================================== diff -u -r8fa5a167170e6b1c77551e8583e5ec3dcb8f45b0 -r6b0a4712aa142d35ca068e53830184f1b5395210 --- sources/view/VView.h (.../VView.h) (revision 8fa5a167170e6b1c77551e8583e5ec3dcb8f45b0) +++ sources/view/VView.h (.../VView.h) (revision 6b0a4712aa142d35ca068e53830184f1b5395210) @@ -146,6 +146,7 @@ REGISTER_TYPE( VInstitutionalRecord ) \ REGISTER_TYPE( VAdjustmentAdvancedInstitutionalRecord ) \ REGISTER_TYPE( VAdvancedInstitutionalRecord ) \ + REGISTER_TYPE( VCalibrationSettings ) \ /* Alarm */ \ REGISTER_TYPE( VAlarmStatus ) \ REGISTER_TYPE( VAlarmActiveList ) \