Activity application/sources/model

11:56 am

Behrouz NematiPour

More
d754084
changed 59 files
DEN-17147-leahi-ui-updates-on-denali-repo, feature/LEAH-1976-implement-a-simple-video-screen and 5 more UI-DEN-12031-2

DEN-12031: Models nested ifs : Changed some more model source files

Updated all model-source files

- -5
- +9
./hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesPrimeResponse.cpp
- History
- Source
- Diff
./hd/.../MPreTreatmentAdjustDisposablesPrimeResponse.cpp
- -5
- +8
./hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.cpp
- History
- Source
- Diff
./hd/.../MPreTreatmentAdjustInitTreatmentResponse.cpp
- -37
- +25
./hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp
- History
- Source
- Diff
./hd/.../MPreTreatmentAdjustParametersValidationResponse.cpp
- -5
- +9
./hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionBeginResponse.cpp
- History
- Source
- Diff
./hd/.../MPreTreatmentAdjustPatientConnectionBeginResponse.cpp
- -5
- +9
./hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionConfirmResponse.cpp
- History
- Source
- Diff
./hd/.../MPreTreatmentAdjustPatientConnectionConfirmResponse.cpp
- -5
- +9
./hd/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.cpp
- History
- Source
- Diff
./hd/.../MPreTreatmentAdjustStartTreatmentResponse.cpp
- -7
- +10
./hd/adjustment/pretreatment/MPreTreatmentAdjustUltrafiltrationInitResponse.cpp
- History
- Source
- Diff
./hd/.../MPreTreatmentAdjustUltrafiltrationInitResponse.cpp
- -5
- +9
./hd/adjustment/pretreatment/MPreTreatmentAdjustWaterSampleResponse.cpp
- History
- Source
- Diff
./hd/.../MPreTreatmentAdjustWaterSampleResponse.cpp
- -5
- +9
./hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.cpp
- History
- Source
- Diff
./hd/.../MAdjustHDAlarmVolumeResponse.cpp
- -5
- +9
./hd/adjustment/settings/MAdjustHDDateTimeResponse.cpp
- History
- Source
- Diff
./hd/.../MAdjustHDDateTimeResponse.cpp
- -55
- +34
./hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.cpp
- History
- Source
- Diff
./hd/.../MAdjustHDInstitutionalRecordResponse.cpp
- -5
- +9
./hd/adjustment/settings/MAdjustHDServiceDatesResponse.cpp
- History
- Source
- Diff
./hd/.../MAdjustHDServiceDatesResponse.cpp
- -5
- +9
./hd/adjustment/settings/MAdjustHDServiceModeResponse.cpp
- History
- Source
- Diff
./hd/.../MAdjustHDServiceModeResponse.cpp
- -19
- +16
./hd/adjustment/settings/MAdjustHDVersionsResponse.cpp
- History
- Source
- Diff
./hd/.../MAdjustHDVersionsResponse.cpp
- -9
- +11
./hd/adjustment/treatment/MTreatmentAdjustBloodDialysateResponse.cpp
- History
- Source
- Diff
./hd/.../MTreatmentAdjustBloodDialysateResponse.cpp
… 44 more files in changeset.

1:44 am

Behrouz NematiPour

More
d9b9df9
changed 23 files
DEN-17147-leahi-ui-updates-on-denali-repo, feature/LEAH-1976-implement-a-simple-video-screen and 5 more UI-LEAH-1924-3

LEAH-1937: UI: Translation

- Moved the translations next to application location in translations folder on target build and point to Projects/application/resources when build on VM.

- Defined the Settings_Category_Translations for the locale as translations/translation

- Moved the settings(locale) next to application location in settings folder on target build and point to /home/denali/Desktop when build on VM.

- Defined the Settings_Category_Locale for the locale as settings/locale

- Added the translation ts/qm with tagged words for Spanish and Germany.

- Removed the loadTranslation logic from the Application controller.

- set the keyboardlocal property to read from the vLocalizations.

- Made all the methods in the Setting class static and the class not instantiable.

- Modified the ConfigurationsDataList to the ParametersDataList to distinguish between the settings and configurations, as well as clarification on the DataList of the Treatement Parameters.

- Corrected the order of the translation, log, startgui.

- Separated the Settings read function and added two readLocale and ReadConfigurations to be able to call the readLocale earlier to get the localization values needed for the rest of the configurations and translations.

- -2
- +2
./settings/MSettings.cpp
- History
- Source
- Diff
./settings/MSettings.cpp
… 22 more files in changeset.

10:31 pm

Behrouz NematiPour

More
a75bc5b
changed 11 files
DEN-17147-leahi-ui-updates-on-denali-repo, feature/LEAH-1976-implement-a-simple-video-screen and 5 more UI-LEAH-1924-3

LEAH-1937: UI: Translation

- Removed not used NoCANBUS development settings.

- Added the two systemLocale and systemLanguage in the Settings singleton class, to be accessed by _Setting in one place.

- Renamed the isValid method in the Settings class to exists for clarity.

- Added local to the filename method in Settings to get the setting file name with the defined locale.

- Made the Category of the settings order to set eSettingsSystem at top, to get the locale first and then read the rest of the settings files according that setting.

- Separated the parse section from the read method to simplify the read function.

- Two big logic in Settings::read has changed:

1. the read won't read any conf file in the settings path anymore, since the order is not important and each file existance.

2. the Settings::read now reads a file and parse it after in oppose to read all files and the parse them. That is mainly because we need to make decision base on the content of the setting files (System.conf in this case for now)

- Renamed the Settings::save to saveSystem for clarification, since that is the only writable setting, and that does not have locale too.

- -0
- +3
./settings/MSettings.cpp
- History
- Source
- Diff
./settings/MSettings.cpp
- -2
- +5
./settings/MSettings.h
- History
- Source
- Diff
./settings/MSettings.h
… 9 more files in changeset.

2:43 pm

Amir Manesh <amanesh@diality.com>

More
720d105
changed 8 files
DEN-17147-leahi-ui-updates-on-denali-repo, feature/LEAH-1976-implement-a-simple-video-screen and 5 more UI-DEN-12031-2

DEN-12031: Models nested ifs : Changed some more model source files

Finalized the model changes

- -1
- +1
./dg/adjustment/settings/MDuetRoWaterDG.cpp
- History
- Source
- Diff
./dg/adjustment/.../MDuetRoWaterDG.cpp
- -14
- +14
./dg/data/MDGValvesStatesData.cpp
- History
- Source
- Diff
./dg/data/MDGValvesStatesData.cpp
- -2
- +7
./hd/adjustment/MAdjustPowerOff.cpp
- History
- Source
- Diff
./hd/adjustment/MAdjustPowerOff.cpp
- -3
- +8
./hd/alarm/MAlarmCleared.cpp
- History
- Source
- Diff
./hd/alarm/MAlarmCleared.cpp
- -3
- +8
./hd/alarm/MAlarmClearedCondition.cpp
- History
- Source
- Diff
./hd/alarm/MAlarmClearedCondition.cpp
- -5
- +5
./hd/alarm/MAlarmStatusData.cpp
- History
- Source
- Diff
./hd/alarm/MAlarmStatusData.cpp
- -4
- +9
./hd/data/post/MHDPostFinalResultData.cpp
- History
- Source
- Diff
./hd/data/post/MHDPostFinalResultData.cpp
- -3
- +8
./hd/data/post/MHDRTCEpochData.cpp
- History
- Source
- Diff
./hd/data/post/MHDRTCEpochData.cpp

6:05 pm

Amir Manesh <amanesh@diality.com>

More
a09c1a9
changed 27 files
DEN-17147-leahi-ui-updates-on-denali-repo, feature/LEAH-1976-implement-a-simple-video-screen and 5 more UI-DEN-12031-2

DEN-12031: Models nested ifs : Changed some more model source files

- -7
- +10
./confirm/MDuetConfirmHDi.cpp
- History
- Source
- Diff
./confirm/MDuetConfirmHDi.cpp
- -21
- +17
./dg/adjustment/settings/MAdjustDGCleaningUsageResponse.cpp
- History
- Source
- Diff
./dg/.../MAdjustDGCleaningUsageResponse.cpp
- -5
- +9
./dg/adjustment/settings/MAdjustDGDateTimeResponse.cpp
- History
- Source
- Diff
./dg/.../MAdjustDGDateTimeResponse.cpp
- -5
- +9
./dg/adjustment/settings/MAdjustDGServiceDatesResponse.cpp
- History
- Source
- Diff
./dg/.../MAdjustDGServiceDatesResponse.cpp
- -19
- +16
./dg/adjustment/settings/MAdjustDGVersionsResponse.cpp
- History
- Source
- Diff
./dg/.../MAdjustDGVersionsResponse.cpp
- -7
- +11
./dg/adjustment/settings/MDuetRoWaterDG.cpp
- History
- Source
- Diff
./dg/adjustment/.../MDuetRoWaterDG.cpp
- -19
- +16
./dg/data/MDGAccelerometerData.cpp
- History
- Source
- Diff
./dg/data/MDGAccelerometerData.cpp
- -27
- +20
./dg/data/MDGConductivityData.cpp
- History
- Source
- Diff
./dg/data/MDGConductivityData.cpp
- -17
- +15
./dg/data/MDGDrainPumpData.cpp
- History
- Source
- Diff
./dg/data/MDGDrainPumpData.cpp
- -27
- +20
./dg/data/MDGHeatersData.cpp
- History
- Source
- Diff
./dg/data/MDGHeatersData.cpp
- -9
- +11
./dg/data/MDGLoadCellReadingsData.cpp
- History
- Source
- Diff
./dg/data/MDGLoadCellReadingsData.cpp
- -5
- +9
./dg/data/MDGOperationModeData.cpp
- History
- Source
- Diff
./dg/data/MDGOperationModeData.cpp
- -11
- +12
./dg/data/MDGPressuresData.cpp
- History
- Source
- Diff
./dg/data/MDGPressuresData.cpp
- -13
- +13
./dg/data/MDGROPumpData.cpp
- History
- Source
- Diff
./dg/data/MDGROPumpData.cpp
- -25
- +19
./dg/data/MDGReservoirData.cpp
- History
- Source
- Diff
./dg/data/MDGReservoirData.cpp
… 12 more files in changeset.

5:07 pm

Amir Manesh <amanesh@diality.com>

More
6fa5fe9
changed 1 file
DEN-17147-leahi-ui-updates-on-denali-repo, feature/LEAH-1976-implement-a-simple-video-screen and 5 more

DEN-12031: Models nested if

Replaced else conditions with goto lError:

- -12
- +11
./hd/alarm/MAlarmStatusData.cpp
- History
- Source
- Diff
./hd/alarm/MAlarmStatusData.cpp

2:59 am

Stats

Commits this week: 1

Commit Activity

52 week commits volume

Commits by day

Commits by hour

Commit calendar

Most active committers (90 days)