Index: leahi.pro
===================================================================
diff -u
--- leahi.pro (revision 0)
+++ leahi.pro (revision f78d9bb9892d87e0985b22236b07a96fef14e5c2)
@@ -0,0 +1,690 @@
+QT += qml quick serialbus concurrent charts bluetooth
+CONFIG += c++17 warn_on
+# CONFIG += disable-desktop
+# QMAKE_CXX = clazy
+QMAKE_CXXFLAGS += -Wall -Werror -Wextra -Wimplicit-fallthrough=3 # -save-temps # see .ii
+# -Wpedantic -Wconversion -Wshadow # these can't always be used, since it gives errors in Qt library.
+
+# Leahi Digi Board
+DEFINES += LEAHI_DIGI_BOARD
+
+TRANSLATIONS += \
+ resources/translations/translation_es.ts \
+ resources/translations/translation_de.ts
+
+#CONFIG += disable_crc
+disable_crc {
+ message( *** IMPORTANT : DISABLED CRC CHECK *** )
+ DEFINES += DISABLE_CRC
+}
+
+#CONFIG += disable_keepalive
+disable_keepalive {
+ message( *** IMPORTANT : DISABLED KEEP ALIVE *** )
+ DEFINES += DISABLE_KEEP_ALIVE
+}
+
+# added this section to detect which compiler is running
+# to decide device dependent decisions
+# by defining a MACRO
+# and use that MACRO for conditional build
+message($$QMAKESPEC)
+linux-g++ {
+ message("Building for desktop")
+ DEFINES += BUILD_FOR_DESKTOP
+}
+
+linux-oe-generic-g++ {
+ message("Building for target")
+ DEFINES += BUILD_FOR_TARGET
+}
+
+# The following define makes your compiler emit warnings if you use
+# any Qt feature that has been marked deprecated (the exact warnings
+# depend on your compiler). Refer to the documentation for the
+# deprecated API to know how to port your code away from it.
+DEFINES += QT_DEPRECATED_WARNINGS
+
+# You can also make your code fail to compile if it uses deprecated APIs.
+# In order to do so, uncomment the following line.
+# You can also select to disable deprecated APIs only up to a certain version of Qt.
+#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
+
+INCLUDEPATH += \
+ common \
+ sources \
+ sources/device \
+ sources/storage \
+ sources/gui \
+ sources/canbus \
+ sources/utility \
+ sources/wifi \
+ sources/bluetooth \
+ sources/cloudsync \
+ sources/abstract \
+ sources/model \
+ sources/model/confirm \
+ sources/model/settings \
+ sources/model/ui/data \
+ sources/model/hd/adjustment \
+ sources/model/hd/adjustment/disinfect \
+ sources/model/hd/adjustment/settings \
+ sources/model/hd/adjustment/pretreatment \
+ sources/model/hd/adjustment/treatment \
+ sources/model/hd/adjustment/posttreatment \
+ sources/model/hd/alarm \
+ sources/model/hd/data \
+ sources/model/hd/data/post \
+ sources/model/hd/data/pretreatment \
+ sources/model/hd/data/treatment \
+ sources/model/hd/data/posttreatment \
+ sources/model/hd/data/treatmentlog \
+ sources/model/dg/data \
+ sources/model/dg/data/post \
+ sources/model/dg/data/pretreatment \
+ sources/model/dg/data/disinfect \
+ sources/model/dg/adjustment \
+ sources/model/dg/adjustment/settings \
+ sources/view \
+ sources/view/confirm \
+ sources/view/settings \
+ sources/view/pretreatment \
+ sources/view/ui/data \
+ sources/view/hd/adjustment/common \
+ sources/view/hd/adjustment \
+ sources/view/hd/adjustment/pretreatment \
+ sources/view/hd/adjustment/treatment \
+ sources/view/hd/adjustment/posttreatment \
+ sources/view/hd/adjustment/disinfect \
+ sources/view/hd/alarm \
+ sources/view/hd/data \
+ sources/view/hd/data/post \
+ sources/view/hd/data/pretreatment \
+ sources/view/hd/data/treatment \
+ sources/view/hd/data/posttreatment \
+ sources/view/dg/data \
+ sources/view/dg/data/post \
+ sources/view/dg/data/pretreatment \
+ sources/view/dg/data/disinfect
+
+HEADERS += \
+ \ # common
+ common/AlarmDefs.h \
+ common/Compatible.h \
+ common/DGDefs.h \
+ common/HDDefs.h \
+ common/MsgDefs.h \
+ \ # Main
+ sources/main.h \
+ sources/Threads.h \
+ sources/MainTimer.h \
+ sources/AlarmGenerator.h \
+ sources/ApplicationPost.h \
+ sources/device/DeviceGlobals.h \
+ sources/device/DeviceError.h \
+ \ # Controllers
+ sources/ApplicationController.h \
+ sources/device/DeviceController.h \
+ sources/storage/Settings.h \
+ sources/storage/TreatmentLog.h \
+ sources/wifi/WifiInterface.h \
+ sources/bluetooth/BluetoothInterface.h \
+ sources/cloudsync/CloudSyncController.h \
+ \ # ---------- Models ----------
+ sources/model/MModel.h \
+ sources/model/MAbstract.h \
+ sources/model/MAbstractDynamic.h \
+ sources/device/DeviceModels.h \
+ \ # ---------- Models - confirm
+ sources/model/confirm/MDuetConfirmHDi.h \
+ \ # ---------- Models - POST
+ sources/model/dg/data/post/MDGPostFinalResultData.h \
+ sources/model/dg/data/post/MDGPostSingleResultData.h \
+ sources/model/hd/data/post/MHDPostFinalResultData.h \
+ sources/model/hd/data/post/MHDPostSingleResultData.h \
+ sources/model/hd/data/post/MUIPostFinalResultHDRequest.h \
+ \ # ---------- Models - settings
+ sources/model/settings/MSettings.h \
+ sources/model/settings/MWifiNetwork.h \
+ sources/model/settings/MBluetooth.h \
+ sources/model/ui/data/MUIBloodPressureData.h \
+ sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.h \
+ sources/model/dg/adjustment/settings/MAdjustDGSerialNumberResponse.h \
+ sources/model/hd/adjustment/settings/MAdjustHDSerialNumberResponse.h \
+ sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.h \
+ sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.h \
+ sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.h \
+ sources/model/dg/adjustment/settings/MDuetRoWaterDG.h \
+ \ # ---------- Models - Alarm
+ sources/model/hd/alarm/MAlarmStatusData.h \
+ sources/model/hd/alarm/MAlarmTriggered.h \
+ sources/model/hd/alarm/MAlarmCleared.h \
+ sources/model/hd/alarm/MAlarmClearedCondition.h \
+ sources/model/hd/alarm/MAlarmActiveList.h \
+ \ # ---------- Models - States Data
+ sources/model/hd/data/MHDOperationModeData.h \
+ sources/model/hd/data/pretreatment/MPreTreatmentStatesData.h \
+ sources/model/hd/data/treatment/MTreatmentStatesData.h \
+ sources/model/hd/data/posttreatment/MPostTreatmentStatesData.h \
+ \ # ---------- Models - HD - Adjustment
+ sources/model/hd/adjustment/MAdjustRequestsBase.h \
+ sources/model/hd/adjustment/MAdjustPowerOff.h \
+ sources/model/hd/adjustment/settings/MAdjustHDRequests.h \
+ \ # ---------- Models - HD - Adjustment - Settings
+ sources/model/hd/adjustment/settings/MAdjustHDVersionsRequest.h \
+ sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.h \
+ sources/model/hd/adjustment/settings/MAdjustHDDateTimeResponse.h \
+ 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 \
+ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.h \
+ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustWaterSampleResponse.h \
+ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.h \
+ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesPrimeResponse.h \
+ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionBeginResponse.h \
+ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustUltrafiltrationInitResponse.h \
+ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionConfirmResponse.h \
+ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.h \
+ \ # ---------- Models - HD - Adjustment - In-Treatment
+ sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h \
+ sources/model/hd/adjustment/treatment/MTreatmentAdjustDurationResponse.h \
+ sources/model/hd/adjustment/treatment/MTreatmentAdjustBloodDialysateResponse.h \
+ sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationStateResponse.h \
+ sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.h \
+ sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.h \
+ sources/model/hd/adjustment/treatment/MTreatmentAdjustSalineResponse.h \
+ sources/model/hd/adjustment/treatment/MTreatmentAdjustHeparinResponse.h \
+ sources/model/hd/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.h \
+ \ # ---------- Models - HD - Adjustment - End-Treatment
+ sources/model/hd/adjustment/treatment/MTreatmentAdjustRinsebackResponse.h \
+ sources/model/hd/adjustment/treatment/MTreatmentAdjustRecirculateResponse.h \
+ sources/model/hd/adjustment/treatment/MTreatmentAdjustEndResponse.h \
+ \ # ---------- Models - HD - Adjustment - Post-Treatment
+ sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustRequests.h \
+ sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.h \
+ sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustDisposablesRemovalConfirmResponse.h \
+ sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustPatientDisconnectionConfirmResponse.h \
+ \ # ---------- Models - HD - Adjustment - Disinfeection
+ sources/model/hd/adjustment/disinfect/MDisinfectAdjustModeRequests.h \
+ sources/model/hd/adjustment/disinfect/MDisinfectAdjustModeResponse.h \
+ sources/model/hd/adjustment/disinfect/MDisinfectAdjustStartResponse.h \
+ sources/model/hd/adjustment/disinfect/MDisinfectAdjustStartRequests.h \
+ \ # ---------- 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 \
+ sources/model/hd/data/MHDAccelerometerData.h \
+ sources/model/hd/data/MHDSyringePumpData.h \
+ sources/model/hd/data/MHDAirBubbleData.h \
+ sources/model/hd/data/MHDAirTrapData.h \
+ sources/model/hd/data/MHDBloodLeakData.h \
+ sources/model/hd/data/MTreatmentRangesData.h \
+ sources/model/hd/data/treatment/MTreatmentTimeData.h \
+ sources/model/hd/data/treatment/MTreatmentBloodFlowData.h \
+ sources/model/hd/data/treatment/MTreatmentDialysateFlowData.h \
+ sources/model/hd/data/treatment/MTreatmentOutletFlowData.h \
+ sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.h \
+ sources/model/hd/data/treatment/MTreatmentSalineData.h \
+ sources/model/hd/data/treatment/MTreatmentHeparinData.h \
+ sources/model/hd/data/treatment/MTreatmentRinsebackData.h \
+ sources/model/hd/data/treatment/MTreatmentRecirculateData.h \
+ sources/model/hd/data/treatment/MTreatmentBloodPrimeData.h \
+ sources/model/hd/data/treatment/MTreatmentStopData.h \
+ sources/model/hd/data/post/MHDRTCEpochData.h \
+ sources/model/hd/data/MHDUsageInfoResponse.h \
+ \ # ---------- Models - HD - Data - Treatment Log
+ sources/model/hd/data/treatmentlog/MTreatmentLogAlarmData.h \
+ sources/model/hd/data/treatmentlog/MTreatmentLogAvrgeData.h \
+ sources/model/hd/data/treatmentlog/MTreatmentLogEventData.h \
+ \ # ---------- Models - DG - Adjustment
+ sources/model/dg/adjustment/settings/MAdjustDGRequests.h \
+ sources/model/dg/adjustment/settings/MAdjustDGCleaningUsageResponse.h \
+ \ # ---------- Models - DG - Adjustment - Settings
+ sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.h \
+ sources/model/dg/adjustment/settings/MAdjustDGDateTimeResponse.h \
+ \ # ---------- Models - DG - Data - Pre-Treatment - Progress
+ sources/model/dg/data/pretreatment/MDGFilterFlushData.h \
+ \ # ---------- Models - DG - Data - Disinfect - Progress
+ \ # ---------- Models - DG - Data
+ sources/model/dg/data/MDGDebugText.h \
+ sources/model/dg/data/MDGGeneralEvent.h \
+ sources/model/dg/data/MDGDrainPumpData.h \
+ sources/model/dg/data/MDGHeatersData.h \
+ sources/model/dg/data/MDGLoadCellReadingsData.h \
+ sources/model/dg/data/MDGOperationModeData.h \
+ sources/model/dg/data/MDGPressuresData.h \
+ sources/model/dg/data/MDGReservoirData.h \
+ sources/model/dg/data/MDGROPumpData.h \
+ sources/model/dg/data/MDGTemperaturesData.h \
+ sources/model/dg/data/MDGValvesStatesData.h \
+ sources/model/dg/data/MDGAccelerometerData.h \
+ sources/model/dg/data/MDGConductivityData.h \
+ \ # CANBus
+ sources/canbus/CanInterface.h \
+ sources/canbus/FrameInterface.h \
+ \ # Denali Message
+ sources/canbus/MessageGlobals.h \
+ sources/canbus/MessageAcknowModel.h \
+ sources/canbus/MessageBuilder.h \
+ sources/canbus/MessageInterpreter.h \
+ sources/canbus/MessageDispatcher.h \
+ \ # Gui
+ sources/gui/GuiGlobals.h \
+ sources/gui/GuiView.h \
+ sources/gui/GuiController.h \
+ \ # ---------- Views ----------
+ sources/view/VTreatmentCreate.h \
+ sources/view/VEventSpy.h \
+ sources/view/VView.h \
+ sources/view/VGeneralEvent.h \
+ sources/device/DeviceView.h \
+ \ # ---------- Views - CONFIRM
+ sources/view/confirm/VConfirm.h \
+ \ # ---------- Views - POST
+ sources/view/dg/data/post/VDGPOSTData.h \
+ \ # ---------- Views - Settings
+ sources/view/settings/VDateTime.h \
+ sources/view/settings/VSettings.h \
+ sources/view/settings/VLocalization.h \
+ sources/view/settings/VBluetooth.h \
+ sources/view/settings/VNetworkModel.h \
+ sources/view/settings/VAdjustmentVersions.h \
+ sources/view/settings/VAdjustmentAlarmVolume.h \
+ 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 \
+ \ # ---------- Views - Alarm
+ sources/view/hd/alarm/VAlarmStatus.h \
+ sources/view/hd/alarm/VAlarmActiveList.h \
+ \ # ---------- Views - HD - Adjustment
+ sources/view/VAdjustmentResponseBase.h \
+ \ # ---------- Views - HD - Adjustment - common
+ sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h \
+ \ # ---------- Views - HD - Adjustment - Pre-Treatment
+ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentInitTreatment.h \
+ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.h \
+ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentConsumablesConfirm.h \
+ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.h \
+ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesPrime.h \
+ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionBegin.h \
+ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentUltrafiltrationInit.h \
+ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionConfirm.h \
+ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.h \
+ \ # ---------- Views - HD - Adjustment - In-Treatment
+ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentDuration.h \
+ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentFlows.h \
+ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationState.h \
+ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationEdit.h \
+ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.h \
+ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentSaline.h \
+ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentHeparin.h \
+ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.h \
+ \ # ---------- Views - HD - Adjustment - End-Treatment
+ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRinseback.h \
+ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRecirculate.h \
+ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentEnd.h \
+ \ # ---------- Views - HD - Adjustment - Post-Treatment
+ sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.h \
+ sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h \
+ sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustDisposablesRemovalConfirm.h \
+ \ # ---------- Views - HD - Adjustment - Disinfection
+ sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h \
+ \ # ---------- Views - HD - Data - States
+ sources/view/hd/data/VHDOperationModeData.h \
+ sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h \
+ sources/view/hd/data/treatment/VHDTreatmentStatesData.h \
+ sources/view/hd/data/posttreatment/VPostTreatmentStatesData.h \
+ \ # ---------- 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 \
+ sources/view/hd/data/VHDSyringePumpData.h \
+ sources/view/hd/data/VHDAirBubbleData.h \
+ sources/view/hd/data/VHDAirTrapData.h \
+ sources/view/hd/data/VHDBloodLeakData.h \
+ sources/view/hd/data/VTreatmentRanges.h \
+ sources/view/hd/data/treatment/VTreatmentTime.h \
+ sources/view/hd/data/treatment/VTreatmentBloodFlow.h \
+ sources/view/hd/data/treatment/VTreatmentDialysateFlow.h \
+ sources/view/hd/data/treatment/VTreatmentUltrafiltration.h \
+ sources/view/hd/data/treatment/VTreatmentPressureOcclusion.h \
+ sources/view/hd/data/treatment/VTreatmentSalineData.h \
+ sources/view/hd/data/treatment/VTreatmentHeparinData.h \
+ sources/view/hd/data/treatment/VTreatmentRinsebackData.h \
+ sources/view/hd/data/treatment/VTreatmentRecirculateData.h \
+ sources/view/hd/data/treatment/VTreatmentBloodPrimeData.h \
+ sources/view/hd/data/treatment/VTreatmentStopData.h \
+ \ # ---------- Views - DG - Data - Pre-Treatment - Progress
+ sources/view/dg/data/pretreatment/VDGFilterFlushData.h \
+ \ # ---------- Views - DG - Data - Disinfection - Progress
+ \ # ---------- Views - DG - States
+ \ # ---------- Views - DG - Data
+ sources/view/dg/data/VDGOperationModeData.h \
+ sources/view/dg/data/VDGDrainPumpData.h \
+ sources/view/dg/data/VDGHeatersData.h \
+ sources/view/dg/data/VDGLoadCellReadingsData.h \
+ sources/view/dg/data/VDGPressuresData.h \
+ sources/view/dg/data/VDGROPumpData.h \
+ sources/view/dg/data/VDGReservoirData.h \
+ sources/view/dg/data/VDGTemperaturesData.h \
+ sources/view/dg/data/VDGValvesStatesData.h \
+ sources/view/dg/data/VDGAccelerometerData.h \
+ sources/view/dg/data/VDGConductivityData.h \
+ \ # Storage
+ sources/storage/StorageGlobals.h \
+ sources/storage/Logger.h \
+ sources/storage/FileHandler.h \
+ \ # Utility
+ sources/utility/crc.h \
+ sources/utility/format.h \
+ sources/utility/types.h \
+ sources/utility/encryption.h \
+ sources/utility/qrcodegen.h
+
+SOURCES += \
+ \ # common
+ \ # Main
+ main.cpp \
+ sources/Threads.cpp \
+ sources/MainTimer.cpp \
+ sources/AlarmGenerator.cpp \
+ sources/ApplicationPost.cpp \
+ sources/device/DeviceError.cpp \
+ \ # Controllers
+ sources/ApplicationController.cpp \
+ sources/device/DeviceController.cpp \
+ sources/model/ui/data/MUIBloodPressureData.cpp \
+ sources/storage/Settings.cpp \
+ sources/storage/TreatmentLog.cpp \
+ sources/view/hd/data/post/VHDPOSTData.cpp \
+ sources/wifi/WifiInterface.cpp \
+ sources/bluetooth/BluetoothInterface.cpp \
+ sources/cloudsync/CloudSyncController.cpp \
+ \ # ---------- Models ----------
+ sources/model/MAbstract.cpp \
+ sources/model/MAbstractDynamic.cpp \
+ sources/device/DeviceModels.cpp \
+ \ # ---------- Models - CONFIRM
+ sources/model/confirm/MDuetConfirmHDi.cpp \
+ \ # ---------- Models - POST
+ sources/model/dg/data/post/MDGPostFinalResultData.cpp \
+ sources/model/dg/data/post/MDGPostSingleResultData.cpp \
+ sources/model/hd/data/post/MHDPostFinalResultData.cpp \
+ sources/model/hd/data/post/MHDPostSingleResultData.cpp \
+ sources/model/hd/data/post/MUIPostFinalResultHDRequest.cpp \
+ \ # ---------- Models - settings
+ sources/model/settings/MSettings.cpp \
+ sources/model/settings/MBluetooth.cpp \
+ sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.cpp \
+ sources/model/dg/adjustment/settings/MAdjustDGSerialNumberResponse.cpp \
+ sources/model/hd/adjustment/settings/MAdjustHDSerialNumberResponse.cpp \
+ sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.cpp \
+ sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.cpp \
+ sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.cpp \
+ sources/model/dg/adjustment/settings/MDuetRoWaterDG.cpp \
+ \ # ---------- Models - Alarm
+ sources/model/hd/alarm/MAlarmStatusData.cpp \
+ sources/model/hd/alarm/MAlarmMapping.cpp \
+ sources/model/hd/alarm/MAlarmTriggered.cpp \
+ sources/model/hd/alarm/MAlarmCleared.cpp \
+ sources/model/hd/alarm/MAlarmClearedCondition.cpp \
+ sources/model/hd/alarm/MAlarmActiveList.cpp \
+ \ # ---------- Models - Data - States
+ sources/model/hd/data/MHDOperationModeData.cpp \
+ sources/model/hd/data/pretreatment/MPreTreatmentStatesData.cpp \
+ sources/model/hd/data/treatment/MTreatmentStatesData.cpp \
+ sources/model/hd/data/posttreatment/MPostTreatmentStatesData.cpp \
+ \ # ---------- Models - HD - Adjustment
+ sources/model/hd/adjustment/MAdjustPowerOff.cpp \
+ \ # ---------- Models - HD - Adjustment - Settings
+ sources/model/hd/adjustment/settings/MAdjustHDVersionsRequest.cpp \
+ sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.cpp \
+ sources/model/hd/adjustment/settings/MAdjustHDDateTimeResponse.cpp \
+ 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 \
+ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustWaterSampleResponse.cpp \
+ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.cpp \
+ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesPrimeResponse.cpp \
+ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionBeginResponse.cpp \
+ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustUltrafiltrationInitResponse.cpp \
+ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionConfirmResponse.cpp \
+ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.cpp \
+ \ # ---------- Models - HD - Adjustment - In-Treatment
+ sources/model/hd/adjustment/treatment/MTreatmentAdjustDurationResponse.cpp \
+ sources/model/hd/adjustment/treatment/MTreatmentAdjustBloodDialysateResponse.cpp \
+ sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationStateResponse.cpp \
+ sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationEditResponse.cpp \
+ sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationConfirmResponse.cpp \
+ sources/model/hd/adjustment/treatment/MTreatmentAdjustSalineResponse.cpp \
+ sources/model/hd/adjustment/treatment/MTreatmentAdjustHeparinResponse.cpp \
+ sources/model/hd/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.cpp \
+ \ # ---------- Models - HD - Adjustment - End-Treatment
+ sources/model/hd/adjustment/treatment/MTreatmentAdjustRinsebackResponse.cpp \
+ sources/model/hd/adjustment/treatment/MTreatmentAdjustRecirculateResponse.cpp \
+ sources/model/hd/adjustment/treatment/MTreatmentAdjustEndResponse.cpp \
+ \ # ---------- Models - HD - Adjustment - Post-Treatment
+ sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp \
+ sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustDisposablesRemovalConfirmResponse.cpp \
+ sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustPatientDisconnectionConfirmResponse.cpp \
+ \ # ---------- Models - HD - Adjustment - Disinfection
+ sources/model/hd/adjustment/disinfect/MDisinfectAdjustModeResponse.cpp \
+ sources/model/hd/adjustment/disinfect/MDisinfectAdjustStartResponse.cpp \
+ \ # ---------- Models - HD - Data
+ sources/model/hd/data/MHDDebugText.cpp \
+ sources/model/hd/data/MHDGeneralEvent.cpp \
+ sources/model/hd/data/MHDAccelerometerData.cpp \
+ sources/model/hd/data/MHDSyringePumpData.cpp \
+ sources/model/hd/data/MHDAirBubbleData.cpp \
+ sources/model/hd/data/MHDAirTrapData.cpp \
+ sources/model/hd/data/MHDBloodLeakData.cpp \
+ sources/model/hd/data/MTreatmentRangesData.cpp \
+ sources/model/hd/data/treatment/MTreatmentTimeData.cpp \
+ sources/model/hd/data/treatment/MTreatmentBloodFlowData.cpp \
+ sources/model/hd/data/treatment/MTreatmentDialysateFlowData.cpp \
+ sources/model/hd/data/treatment/MTreatmentOutletFlowData.cpp \
+ sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.cpp \
+ sources/model/hd/data/treatment/MTreatmentSalineData.cpp \
+ sources/model/hd/data/treatment/MTreatmentHeparinData.cpp \
+ sources/model/hd/data/treatment/MTreatmentRinsebackData.cpp \
+ sources/model/hd/data/treatment/MTreatmentRecirculateData.cpp \
+ sources/model/hd/data/treatment/MTreatmentBloodPrimeData.cpp \
+ sources/model/hd/data/treatment/MTreatmentStopData.cpp \
+ 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 - HD - Data - Treatment Log
+ sources/model/hd/data/treatmentlog/MTreatmentLogAlarmData.cpp \
+ sources/model/hd/data/treatmentlog/MTreatmentLogAvrgeData.cpp \
+ sources/model/hd/data/treatmentlog/MTreatmentLogEventData.cpp \
+ \ # ---------- Models - DG - Adjustment
+ \ # ---------- Models - DG - Adjustment - Settings
+ sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.cpp \
+ sources/model/dg/adjustment/settings/MAdjustDGDateTimeResponse.cpp \
+ sources/model/dg/adjustment/settings/MAdjustDGCleaningUsageResponse.cpp \
+ \ # ---------- Models - DG - Data - Pre-Treatment - Progress
+ sources/model/dg/data/pretreatment/MDGFilterFlushData.cpp \
+ \ # ---------- Models - DG - Data - Disinfection - Progress
+ \ # ---------- Models - DG - Data
+ sources/model/dg/data/MDGDebugText.cpp \
+ sources/model/dg/data/MDGGeneralEvent.cpp \
+ sources/model/dg/data/MDGDrainPumpData.cpp \
+ sources/model/dg/data/MDGHeatersData.cpp \
+ sources/model/dg/data/MDGLoadCellReadingsData.cpp \
+ sources/model/dg/data/MDGOperationModeData.cpp \
+ sources/model/dg/data/MDGPressuresData.cpp \
+ sources/model/dg/data/MDGReservoirData.cpp \
+ sources/model/dg/data/MDGROPumpData.cpp \
+ sources/model/dg/data/MDGTemperaturesData.cpp \
+ sources/model/dg/data/MDGValvesStatesData.cpp \
+ sources/model/dg/data/MDGAccelerometerData.cpp \
+ sources/model/dg/data/MDGConductivityData.cpp \
+ \ # CANBus
+ sources/canbus/CanInterface.cpp \
+ sources/canbus/FrameInterface.cpp \
+ \ # Denali Message
+ sources/canbus/MessageAcknowModel.cpp \
+ sources/canbus/MessageBuilder.cpp \
+ sources/canbus/MessageDispatcher.cpp \
+ sources/canbus/MessageInterpreter.cpp \
+ \ # Gui
+ sources/gui/GuiGlobals.cpp \
+ sources/gui/GuiView.cpp \
+ sources/gui/GuiController.cpp \
+ \ # ---------- Views ----------
+ sources/view/VTreatmentCreate.cpp \
+ sources/view/VEventSpy.cpp \
+ sources/view/VGeneralEvent.cpp \
+ sources/device/DeviceView.cpp \
+ \ # ---------- Views - CONFIRM
+ sources/view/confirm/VConfirm.cpp \
+ \ # ---------- Views - POST
+ sources/view/dg/data/post/VDGPOSTData.cpp \
+ \ # ---------- Views - Alarm
+ sources/view/hd/alarm/VAlarmStatus.cpp \
+ sources/view/hd/alarm/VAlarmActiveList.cpp \
+ \ # ---------- Views - Settings
+ sources/view/settings/VSettings.cpp \
+ sources/view/settings/VLocalization.cpp \
+ sources/view/settings/VDateTime.cpp \
+ sources/view/settings/VBluetooth.cpp \
+ sources/view/settings/VNetworkModel.cpp \
+ sources/view/settings/VAdjustmentVersions.cpp \
+ 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 \
+ sources/view/settings/VAdjustmentInstitutionalRecord.cpp \
+ \ # ---------- Views - HD - Adjustment
+ sources/view/VAdjustmentResponseBase.cpp \
+ \ # ---------- Views - HD - Adjustment - common
+ sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp \
+ \ # ---------- Views - HD - Adjustment - Pre-Treatment
+ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentInitTreatment.cpp \
+ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.cpp \
+ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentConsumablesConfirm.cpp \
+ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.cpp \
+ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesPrime.cpp \
+ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionBegin.cpp \
+ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentUltrafiltrationInit.cpp \
+ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionConfirm.cpp \
+ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.cpp \
+ \ # ---------- Views - HD - Adjustment - In-Treatment
+ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentDuration.cpp \
+ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentFlows.cpp \
+ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationState.cpp \
+ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationEdit.cpp \
+ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.cpp \
+ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentSaline.cpp \
+ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentHeparin.cpp \
+ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentPressuresLimits.cpp \
+ \ # ---------- Views - HD - Adjustment - End-Treatment
+ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRinseback.cpp \
+ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRecirculate.cpp \
+ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentEnd.cpp \
+ \ # ---------- Views - HD - Adjustment - Post-Treatment
+ sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustDisposablesRemovalConfirm.cpp \
+ sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp \
+ sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.cpp \
+ \ # ---------- Views - HD - Adjustment - Disinfection
+ sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp \
+ \ # ---------- Views - HD - States Data
+ sources/view/hd/data/VHDOperationModeData.cpp \
+ sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp \
+ sources/view/hd/data/treatment/VHDTreatmentStatesData.cpp \
+ sources/view/hd/data/posttreatment/VPostTreatmentStatesData.cpp \
+ \ # ---------- Views - HD - Data
+ sources/view/hd/data/VHDAccelerometerData.cpp \
+ sources/view/hd/data/VHDSyringePumpData.cpp \
+ sources/view/hd/data/VHDAirBubbleData.cpp \
+ sources/view/hd/data/VHDAirTrapData.cpp \
+ sources/view/hd/data/VHDBloodLeakData.cpp \
+ \ # ---------- 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/VTreatmentRanges.cpp \
+ sources/view/hd/data/treatment/VTreatmentTime.cpp \
+ sources/view/hd/data/treatment/VTreatmentBloodFlow.cpp \
+ sources/view/hd/data/treatment/VTreatmentDialysateFlow.cpp \
+ sources/view/hd/data/treatment/VTreatmentUltrafiltration.cpp \
+ sources/view/hd/data/treatment/VTreatmentPressureOcclusion.cpp \
+ sources/view/hd/data/treatment/VTreatmentSalineData.cpp \
+ sources/view/hd/data/treatment/VTreatmentHeparinData.cpp \
+ \ # ---------- Views - HD - Data - End-Treatment
+ sources/view/hd/data/treatment/VTreatmentBloodPrimeData.cpp \
+ sources/view/hd/data/treatment/VTreatmentRinsebackData.cpp \
+ sources/view/hd/data/treatment/VTreatmentRecirculateData.cpp \
+ sources/view/hd/data/treatment/VTreatmentStopData.cpp \
+ \ # ---------- Views - DG - Data - Pre-Treatment - Progress
+ sources/view/dg/data/pretreatment/VDGFilterFlushData.cpp \
+ \ # ---------- Views - DG - Data - Disinfect - Progress
+ \ # ---------- Views - DG - States
+ \ # ---------- Views - DG - Data
+ sources/view/dg/data/VDGDrainPumpData.cpp \
+ sources/view/dg/data/VDGHeatersData.cpp \
+ sources/view/dg/data/VDGLoadCellReadingsData.cpp \
+ sources/view/dg/data/VDGOperationModeData.cpp \
+ sources/view/dg/data/VDGPressuresData.cpp \
+ sources/view/dg/data/VDGROPumpData.cpp \
+ sources/view/dg/data/VDGReservoirData.cpp \
+ sources/view/dg/data/VDGTemperaturesData.cpp \
+ sources/view/dg/data/VDGValvesStatesData.cpp \
+ sources/view/dg/data/VDGAccelerometerData.cpp \
+ sources/view/dg/data/VDGConductivityData.cpp \
+ \ # Storage
+ sources/storage/StorageGlobals.cpp \
+ sources/storage/FileHandler.cpp \
+ sources/storage/Logger.cpp \
+ \ # Utility
+ sources/utility/crc.cpp \
+ sources/utility/format.cpp \
+ sources/utility/types.cpp \
+ sources/utility/encryption.cpp \
+ sources/utility/qrcodegen.cpp
+
+RESOURCES += \
+ leahi.qrc
+
+DEFINES += \
+ VER_MAJOR="\\\"${majorVersion}\\\"" \
+ VER_MINOR="\\\"${minorVersion}\\\"" \
+ VER_MICRO="\\\"${microVersion}\\\"" \
+ VER_REVIS="\\\"${buildNumber}\\\"" \
+ VER_REVIS_DEV=\\\"$$system( date "+%m%d%H%M" )\\\" \
+ VER_APPLY=\\\"$$system( touch -m main.cpp )\\\" \
+ VER_BRANCH=\\\"$$system( git rev-parse --abbrev-ref HEAD )\\\"
+
+# Additional import path used to resolve QML modules in Qt Creator's code model
+QML_IMPORT_PATH =
+
+# Additional import path used to resolve QML modules just for Qt Quick Designer
+QML_DESIGNER_IMPORT_PATH =
+
+# Default rules for deployment.
+qnx: target.path = /tmp/$${TARGET}/bin
+else: unix:!android: target.path = /home/root
+!isEmpty(target.path): INSTALLS += target
+
+DISTFILES += \
+ README.md \
+ ui_build_history.log
Index: leahi.qrc
===================================================================
diff -u
--- leahi.qrc (revision 0)
+++ leahi.qrc (revision f78d9bb9892d87e0985b22236b07a96fef14e5c2)
@@ -0,0 +1,258 @@
+
+
+ sources/gui/qml/pages/MainStack.qml
+ sources/gui/qml/pages/MainHome.qml
+ sources/gui/qml/pages/ManagerStack.qml
+ sources/gui/qml/pages/UserConfirmation.qml
+ sources/gui/qml/pages/TreatmentFlowBase.qml
+
+
+ sources/gui/qml/pages/settings/SettingsBase.qml
+ sources/gui/qml/pages/settings/SettingsStack.qml
+ sources/gui/qml/pages/settings/SettingsHome.qml
+ sources/gui/qml/pages/settings/SettingsDateTime.qml
+ sources/gui/qml/pages/settings/SettingsWiFi.qml
+ sources/gui/qml/pages/settings/SettingsDGCleaning.qml
+ sources/gui/qml/pages/settings/SettingsDGScheduling.qml
+ sources/gui/qml/pages/settings/SettingsVolumeBrightness.qml
+ sources/gui/qml/pages/settings/SettingsBluetoothCuff.qml
+ sources/gui/qml/pages/settings/SettingsExportLogs.qml
+ sources/gui/qml/pages/settings/SettingsDeviceRegistration.qml
+ sources/gui/qml/pages/settings/SettingsInformation.qml
+ sources/gui/qml/pages/settings/SettingsROInput.qml
+ sources/gui/qml/pages/settings/SettingsRootSSHAccess.qml
+ sources/gui/qml/pages/settings/SettingsServicePassword.qml
+ sources/gui/qml/pages/settings/SettingsManufacturingSetup.qml
+ sources/gui/qml/pages/settings/SettingsFactoryReset.qml
+ sources/gui/qml/pages/settings/SettingsDecommission.qml
+ sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml
+ sources/gui/qml/pages/settings/SettingsLocalization.qml
+
+
+ sources/gui/qml/dialogs/ConfirmDialog.qml
+ sources/gui/qml/dialogs/AutoHideInfo.qml
+ sources/gui/qml/dialogs/NotificationDialog.qml
+ sources/gui/qml/dialogs/AlarmListDialog.qml
+ sources/gui/qml/dialogs/DiagnosticsDialog.qml
+
+
+ resources/images/Logo d.png
+ resources/images/Logo DialityT.png
+ resources/images/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
+ resources/images/Back.png
+ resources/images/PauseDarkBlue.png
+ resources/images/PauseLightBlue.png
+ resources/images/PauseGray.png
+ resources/images/Resume.png
+ resources/images/Clock-Minus.png
+ resources/images/Clock-Plus.png
+ resources/images/Wave-Minus.png
+ resources/images/Wave-Plus.png
+ resources/images/check.png
+ resources/images/chevron-down.png
+ resources/images/chevron-up.png
+ resources/images/list.png
+ resources/images/End.png
+ resources/images/Accelerate.png
+ resources/images/Decelerate.png
+ resources/images/Busy.png
+ resources/images/BusyDone.png
+ resources/images/BusyFail.png
+ resources/images/EjectEnabled.png
+ resources/images/EjectDisabled.png
+ resources/images/eye.png
+ resources/images/Omron-bp7000.png
+ resources/images/chevron-left.png
+ resources/images/chevron-right.png
+ resources/images/DenaliDevice.png
+
+
+ sources/gui/qml/components/MainMenu.qml
+ sources/gui/qml/components/TouchRect.qml
+ sources/gui/qml/components/TitleText.qml
+ sources/gui/qml/components/ImageLogoD.qml
+ sources/gui/qml/components/ScreenItem.qml
+ sources/gui/qml/components/StackItem.qml
+ sources/gui/qml/components/ModalDialog.qml
+ sources/gui/qml/components/BackButton.qml
+ sources/gui/qml/components/USBButton.qml
+ sources/gui/qml/components/ExportButton.qml
+ sources/gui/qml/components/TouchArea.qml
+ sources/gui/qml/components/TextRect.qml
+ sources/gui/qml/components/Background.qml
+ sources/gui/qml/components/Line.qml
+ sources/gui/qml/components/PlaceHolderText.qml
+ sources/gui/qml/components/ProgressBar.qml
+ sources/gui/qml/components/RangeMarker.qml
+ sources/gui/qml/components/ProgressRect.qml
+ sources/gui/qml/components/RangeRect.qml
+ sources/gui/qml/components/RangeBar.qml
+ sources/gui/qml/components/Circle.qml
+ sources/gui/qml/components/StepBullet.qml
+ sources/gui/qml/components/StepIndicator.qml
+ sources/gui/qml/components/TimeText.qml
+ sources/gui/qml/components/ProgressCircle.qml
+ sources/gui/qml/components/Slider.qml
+ sources/gui/qml/components/SliderCreateTreatment.qml
+ sources/gui/qml/components/ConfirmTreatmentTable.qml
+ sources/gui/qml/components/ConfirmTreatmentSubTable.qml
+ sources/gui/qml/components/GridSelection.qml
+ sources/gui/qml/components/ProgressBarEx.qml
+ sources/gui/qml/components/CloseButton.qml
+ sources/gui/qml/components/ConfirmButton.qml
+ sources/gui/qml/components/TickMarks.qml
+ sources/gui/qml/components/NotificationBar.qml
+ sources/gui/qml/components/NotificationBarSmall.qml
+ 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/ConfirmTreatmentTableEntry.qml
+ sources/gui/qml/components/DebugDataColumn.qml
+ sources/gui/qml/components/RangeSlider.qml
+ sources/gui/qml/components/MuteButton.qml
+ sources/gui/qml/components/UpDownButton.qml
+ sources/gui/qml/components/ImageText.qml
+ sources/gui/qml/components/WaitDone.qml
+ sources/gui/qml/components/TimeCircle.qml
+ sources/gui/qml/components/Footer.qml
+ sources/gui/qml/components/TextEntry.qml
+ sources/gui/qml/components/ScrollBar.qml
+ sources/gui/qml/compounds/Fader.qml
+ 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/compounds/PressureRangeSlider.qml
+ sources/gui/qml/compounds/StepNavigationTitleBar.qml
+ sources/gui/qml/compounds/InstructionView.qml
+ sources/gui/qml/compounds/CheckListView.qml
+ sources/gui/qml/compounds/TouchGrid.qml
+ sources/gui/qml/compounds/BPHREntry.qml
+
+
+ qtquickcontrols2.conf
+ sources/gui/qml/main.qml
+ sources/gui/qml/AlarmItem.qml
+ sources/gui/qml/PowerItem.qml
+ sources/gui/qml/KeyboardItem.qml
+ sources/gui/qml/SDCProgressItem.qml
+ sources/gui/qml/USBProgressItem.qml
+
+
+ sources/gui/qml/plugins/virtualkeyboard/styles/denali/images/backspace.svg
+ sources/gui/qml/plugins/virtualkeyboard/styles/denali/images/check.svg
+ sources/gui/qml/plugins/virtualkeyboard/styles/denali/images/enter.svg
+ sources/gui/qml/plugins/virtualkeyboard/styles/denali/images/globe.svg
+ sources/gui/qml/plugins/virtualkeyboard/styles/denali/images/handwriting.svg
+ sources/gui/qml/plugins/virtualkeyboard/styles/denali/images/hidekeyboard.svg
+ sources/gui/qml/plugins/virtualkeyboard/styles/denali/images/search.svg
+ sources/gui/qml/plugins/virtualkeyboard/styles/denali/images/selectionhandle.svg
+ sources/gui/qml/plugins/virtualkeyboard/styles/denali/images/shift-normal.svg
+ sources/gui/qml/plugins/virtualkeyboard/styles/denali/images/shift-active.svg
+ sources/gui/qml/plugins/virtualkeyboard/styles/denali/images/shift-capslock.svg
+ sources/gui/qml/plugins/virtualkeyboard/styles/denali/images/textmode.svg
+ sources/gui/qml/plugins/virtualkeyboard/styles/denali/style.qml
+ sources/gui/qml/plugins/virtualkeyboard/layouts/en_GB/dialpad.qml
+ sources/gui/qml/plugins/virtualkeyboard/layouts/en_GB/digits.qml
+ sources/gui/qml/plugins/virtualkeyboard/layouts/en_GB/handwriting.qml
+ sources/gui/qml/plugins/virtualkeyboard/layouts/en_GB/main.qml
+ sources/gui/qml/plugins/virtualkeyboard/layouts/en_GB/numbers.qml
+ sources/gui/qml/plugins/virtualkeyboard/layouts/en_GB/symbols.qml
+ sources/gui/qml/plugins/virtualkeyboard/layouts/en_US/dialpad.qml
+ sources/gui/qml/plugins/virtualkeyboard/layouts/en_US/digits.qml
+ sources/gui/qml/plugins/virtualkeyboard/layouts/en_US/handwriting.qml
+ sources/gui/qml/plugins/virtualkeyboard/layouts/en_US/main.qml
+ sources/gui/qml/plugins/virtualkeyboard/layouts/en_US/numbers.qml
+ sources/gui/qml/plugins/virtualkeyboard/layouts/en_US/symbols.qml
+ sources/gui/qml/plugins/virtualkeyboard/layouts/fallback/dialpad.qml
+ sources/gui/qml/plugins/virtualkeyboard/layouts/fallback/digits.qml
+ sources/gui/qml/plugins/virtualkeyboard/layouts/fallback/handwriting.qml
+ sources/gui/qml/plugins/virtualkeyboard/layouts/fallback/main.qml
+ sources/gui/qml/plugins/virtualkeyboard/layouts/fallback/numbers.qml
+ sources/gui/qml/plugins/virtualkeyboard/layouts/fallback/symbols.qml
+
+
+ sources/gui/qml/globals/Variables.qml
+ sources/gui/qml/globals/Colors.qml
+ sources/gui/qml/globals/qmldir
+ sources/gui/qml/globals/Fonts.qml
+
+
+ sources/gui/qml/pages/disinfect/DisinfectBase.qml
+ sources/gui/qml/pages/disinfect/DisinfectStack.qml
+
+
+ sources/gui/qml/pages/pretreatment/PreTreatmentBase.qml
+ sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml
+ sources/gui/qml/pages/pretreatment/PreTreatmentWaterSampleStack.qml
+ sources/gui/qml/pages/pretreatment/PreTreatmentConsumablesStack.qml
+ sources/gui/qml/pages/pretreatment/PreTreatmentDisposablesStack.qml
+ sources/gui/qml/pages/pretreatment/PreTreatmentPrimeStack.qml
+
+
+ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml
+ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml
+ sources/gui/qml/pages/pretreatment/create/PreTreatmentConfirm.qml
+
+
+ sources/gui/qml/pages/pretreatment/connection/PreTreatmentUltrafiltration.qml
+ sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml
+
+
+ sources/gui/qml/pages/treatment/TreatmentStack.qml
+ sources/gui/qml/pages/treatment/TreatmentHome.qml
+ sources/gui/qml/pages/treatment/TreatmentBloodPrime.qml
+ sources/gui/qml/pages/treatment/TreatmentUltrafiltrationItem.qml
+
+
+ sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml
+ sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml
+ sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml
+ sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml
+ sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml
+ sources/gui/qml/pages/treatment/sections/TreatmentTime.qml
+ sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml
+ sources/gui/qml/pages/treatment/sections/TreatmentHeparin.qml
+
+
+ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml
+ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml
+ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml
+ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml
+ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml
+ 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/endtreatment/EndTreatmentRinsebackStack.qml
+ sources/gui/qml/pages/endtreatment/EndTreatmentRecirculateStack.qml
+ sources/gui/qml/pages/endtreatment/EndTreatmentEndStack.qml
+ sources/gui/qml/pages/endtreatment/EndTreatmentBase.qml
+
+
+ sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackInit.qml
+ sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinseback.qml
+ sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackComplete.qml
+ sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentAdditional.qml
+ sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackReconnect.qml
+
+
+
+
+ sources/gui/qml/pages/posttreatment/PostTreatmentBase.qml
+ sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml
+ sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml
+
+
Index: sources/ApplicationController.cpp
===================================================================
diff -u -rf8c7febe2e4131b8c7e68fd9849027ba8596dbc6 -rf78d9bb9892d87e0985b22236b07a96fef14e5c2
--- sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision f8c7febe2e4131b8c7e68fd9849027ba8596dbc6)
+++ sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision f78d9bb9892d87e0985b22236b07a96fef14e5c2)
@@ -49,7 +49,7 @@
_init = true;
initConnections();
- LOG_DEBUG(tr("%1 Initialized").arg(metaObject()->className()));
+ LOG_DEBUG(QString("%1 Initialized").arg(metaObject()->className()));
return true;
}
@@ -526,14 +526,9 @@
*/
void ApplicationController::initSettings()
{
- // That is enough to call to the I function here to create the object in the thread that Settings is leaving in,
- // which currently is Application_Thread, since the Settings is created in that thread.
- _Settings;
-
QFuture mFuture = QtConcurrent::run( [=]() -> int { // made the call a lambda to make sure there is no function to accidentally being called, out of thread [developer safety].
//TODO The Settings shall be the Singleton SettingsController and modify the MSettings like the others.
- Storage::Settings settings;
- return settings.read();
+ return Storage::Settings::readConfigurations();
});
_settingsWatcher.setFuture(mFuture);
}
@@ -776,4 +771,3 @@
institutionalRequest (); // send HD the institutional record request
emit didPOSTPass (_post.isDone( )); // GuiController -> GuiView : didPOSTPass(bool)
}
-
Index: sources/storage/StorageGlobals.cpp
===================================================================
diff -u -rd9b9df9b23da89b4c27f4672ff6e7f570adcc48a -rf78d9bb9892d87e0985b22236b07a96fef14e5c2
--- sources/storage/StorageGlobals.cpp (.../StorageGlobals.cpp) (revision d9b9df9b23da89b4c27f4672ff6e7f570adcc48a)
+++ sources/storage/StorageGlobals.cpp (.../StorageGlobals.cpp) (revision f78d9bb9892d87e0985b22236b07a96fef14e5c2)
@@ -101,8 +101,13 @@
#ifdef BUILD_FOR_TARGET
//WARNING: This has to match with the crypt_setup.sh
- const char *Settings_Path_Init = "/home/root/.config/"; // this is the manufacturing or update setup and the user is root.
- const char *Settings_Path_Name = "/var/configurations/";
+ #ifdef LEAHI_DIGI_BOARD
+ const char *Settings_Path_Init = "/opt/leahi/configurations/"; // this is the manufacturing or update setup and the user is root.
+ const char *Settings_Path_Name = "/mnt/data/configurations/";
+ #else
+ const char *Settings_Path_Init = "/home/root/.config/"; // this is the manufacturing or update setup and the user is root.
+ const char *Settings_Path_Name = "/var/configurations/";
+ #endif
#else
// should be in the project application folder. [is tracking by git]
const char *Settings_Path_Init = "/home/denali/Projects/application/resources/settings/";
@@ -129,7 +134,11 @@
// CloudSync credentials
#ifdef BUILD_FOR_TARGET
- const char *CloudSync_Base_Path_Name = gUseRootHome ? "/home/root/.cloudSync/" : "/var/configurations/CloudSync/";
+ #ifdef LEAHI_DIGI_BOARD
+ const char *CloudSync_Base_Path_Name = gUseRootHome ? "/home/root/.cloudSync/" : "/mnt/data/configurations/CloudSync/";
+ #else
+ const char *CloudSync_Base_Path_Name = gUseRootHome ? "/home/root/.cloudSync/" : "/var/configurations/CloudSync/";
+ #endif
#else
// on VM it is a temporary file which is not being tracked
const char *CloudSync_Base_Path_Name = "/home/denali/Desktop/CloudSync/";
@@ -210,8 +219,11 @@
// Device Lockdown
const char *Device_Lockdown = "lockdown.sh";
+#ifdef LEAHI_DIGI_BOARD
+ const char *CloudSyncPath = "/mnt/data/configurations/CloudSync/credentials/";
+#else
const char *CloudSyncPath = "/var/configurations/CloudSync/credentials/";
-
+#endif
// USB unmount/ mount
const char *USB_Unmount = "usb_unmount.sh";
const char *USB_Mount = "usb_mount.sh";