application

sources

Clone Tools

Stats

Commits this week: 0
Total Committers: 14
Last Commit: 20 Nov
Commits this week: 0

Lines of code count not available

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Thursday 30 Jul 2020
3:03 am

Behrouz NematiPour

Merge master into Logging (#1 successful build and run)

Options
    • -4
    • +4
    ./applicationcontroller.cpp
    • -3
    • +4
    ./applicationcontroller.h
    • -5
    • +4
    ./canbus/messageinterpreter.cpp
    • -3
    • +3
    ./canbus/messageinterpreter.h
    • -3
    • +4
    ./gui/guicontroller.h
    • -3
    • +56
    ./gui/qml/pages/SettingsHome.qml
    • -0
    • +16
    ./model/hd/adjustment/MTreatmentAdjustRequests.h
    • -0
    • +76
    ./model/hd/alarm/MAlarmStatusData.cpp
    • -2
    • +4
    ./model/hd/alarm/MAlarmStatusData.h
    • -4
    • +4
    ./view/valarmstatus.cpp
2:08 am

Behrouz NematiPour

Resolve the merge conflicts of master into logging (#1 pass)

- This the first pass of the merging otherwise the code cannot be merged and committed.

- Next need to look at the code completely and see what has been merged and resolved automatically by git.

Options
    • -12
    • +25
    ./applicationcontroller.cpp
    • -14
    • +21
    ./applicationcontroller.h
    • -13
    • +14
    ./canbus/caninterface.cpp
    • -13
    • +14
    ./canbus/caninterface.h
    • -9
    • +10
    ./canbus/frameinterface.cpp
    • -9
    • +10
    ./canbus/messageacknowmodel.cpp
    • -9
    • +10
    ./canbus/messageacknowmodel.h
    • -9
    • +10
    ./canbus/messagebuilder.cpp
    • -9
    • +10
    ./canbus/messagebuilder.h
    • -12
    • +13
    ./canbus/messagedispatcher.cpp
    • -9
    • +18
    ./canbus/messagedispatcher.h
    • -9
    • +12
    ./canbus/messageglobals.h
    • -10
    • +18
    ./canbus/messageinterpreter.cpp
    • -9
    • +10
    ./canbus/messageinterpreter.h
    • -10
    • +32
    ./gui/guicontroller.cpp
  16. … 57 more files in changeset.
Tuesday 28 Jul 2020
11:58 am

Behrouz NematiPour

4246: Merge Newly added Squish API Messages into Dial-In

- Has not been merged yet but preparing for.

Options
    • -9
    • +9
    ./gui/qml/pages/ManagerHome.qml
    • -1
    • +2
    ./gui/qml/pages/SettingsHome.qml
    • -0
    • +3
    ./maintimer.cpp
    • -6
    • +18
    ./model/hd/adjustment/MTreatmentAdjustRequests.h
    • -0
    • +9
    ./model/hd/data/MTreatmentFlowsData.h
    • -0
    • +6
    ./model/hd/data/MTreatmentOutletFlowData.h
    • -1
    • +6
    ./model/hd/data/MTreatmentPressureOcclusionData.h
    • -0
    • +6
    ./model/hd/data/MTreatmentTimeData.h
    • -0
    • +6
    ./storage/filehandler.cpp
    • -0
    • +3
    ./storage/logger.cpp
    • -0
    • +2
    ./view/dg/data/VDGValvesStatesData.h
  12. … 5 more files in changeset.
Friday 24 Jul 2020
1:27 am

Behrouz NematiPour

3883: Coverage

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -2
    • +4
    ./canbus/caninterface.cpp
    • -2
    • +4
    ./canbus/messagebuilder.cpp
    • -2
    • +2
    ./canbus/messageinterpreter.cpp
    • -1
    • +1
    ./canbus/messageinterpreter.h
    • -1
    • +4
    ./storage/DriveWatcher.cpp
    • -4
    • +3
    ./storage/logger.cpp
  7. … 4 more files in changeset.
Sunday 19 Jul 2020
8:08 pm

Behrouz NematiPour

DEN-3881: Unit Testing

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -32
    • +24
    ./canbus/messageinterpreter.cpp
    • -1
    • +1
    ./canbus/messageinterpreter.h
    • -1
    • +1
    ./model/hd/adjustment/MTreatmentAdjustRequests.h
  4. … 3 more files in changeset.
12:47 pm

Behrouz NematiPour

SRSUI 669: Current Duration

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -0
    • +1
    ./gui/qml/pages/treatment/TreatmentStack.qml
4:08 am

Behrouz NematiPour

DEN-4002: Implementation 2 [SRSUI 476: Log files rotation]

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -6
    • +9
    ./canbus/messageinterpreter.cpp
    • -2
    • +3
    ./storage/DriveWatcher.cpp
    • -0
    • +2
    ./storage/DriveWatcher.h
    • -2
    • +5
    ./storage/logger.cpp
    • -0
    • +2
    ./storage/logger.h
Saturday 18 Jul 2020
10:42 pm

Behrouz NematiPour

DEN-4002: Implementation 2 [SRSUI 476: Log files rotation]

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -1
    • +1
    ./applicationcontroller.cpp
    • -1
    • +1
    ./maintimer.h
    • -3
    • +3
    ./storage/DriveWatcher.cpp
    • -1
    • +0
    ./storage/filehandler.cpp
    • -33
    • +68
    ./storage/logger.cpp
    • -17
    • +16
    ./storage/logger.h
7:47 pm

Behrouz NematiPour

DEN-4002: Implementation 2 [SRSUI 476: Log files rotation]

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -1
    • +1
    ./canbus/messagedispatcher.cpp
    • -2
    • +5
    ./canbus/messageinterpreter.cpp
    • -6
    • +36
    ./maintimer.cpp
    • -1
    • +1
    ./maintimer.h
Friday 17 Jul 2020
10:24 pm

Behrouz NematiPour

DEN-4002: Implementation 2 [SRSUI 476: Log files rotation]

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -6
    • +6
    ./applicationcontroller.cpp
    • -3
    • +3
    ./canbus/caninterface.cpp
    • -3
    • +3
    ./canbus/frameinterface.cpp
    • -1
    • +1
    ./canbus/messageacknowmodel.cpp
    • -5
    • +5
    ./canbus/messagebuilder.cpp
    • -4
    • +4
    ./canbus/messagedispatcher.cpp
    • -7
    • +24
    ./canbus/messageinterpreter.cpp
    • -1
    • +2
    ./canbus/messageinterpreter.h
    • -1
    • +1
    ./gui/guiglobals.cpp
    • -1
    • +1
    ./model/MAbstract.h
    • -3
    • +5
    ./model/dg/data/MDGDrainPumpData.h
    • -3
    • +5
    ./model/dg/data/MDGHeatersData.h
    • -3
    • +5
    ./model/dg/data/MDGLoadCellReadingsData.h
    • -3
    • +5
    ./model/dg/data/MDGOperationModeData.h
    • -3
    • +5
    ./model/dg/data/MDGPressuresData.h
  16. … 33 more files in changeset.
Thursday 16 Jul 2020
7:12 pm

Behrouz NematiPour

DEN-4002: Implementation 2 [SRSUI 476: Log files rotation]

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -0
    • +24
    ./maintimer.cpp
    • -1
    • +2
    ./maintimer.h
    • -2
    • +45
    ./storage/filehandler.cpp
    • -0
    • +3
    ./storage/filehandler.h
    • -5
    • +49
    ./storage/logger.cpp
    • -14
    • +25
    ./storage/logger.h
    • -0
    • +16
    ./utility/format.cpp
    • -0
    • +1
    ./utility/format.h
12:27 pm

Behrouz NematiPour

DEN-4002 : Implementation 2

- Improvements of log text and so .

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -1
    • +1
    ./canbus/messageacknowmodel.h
    • -1
    • +1
    ./canbus/messagedispatcher.cpp
    • -38
    • +32
    ./canbus/messageinterpreter.cpp
    • -0
    • +2
    ./canbus/messageinterpreter.h
    • -2
    • +2
    ./gui/qml/main.qml
    • -6
    • +22
    ./model/hd/adjustment/MTreatmentAdjustRequests.h
    • -1
    • +1
    ./model/hd/adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.h
    • -1
    • +1
    ./model/hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.h
    • -1
    • +0
    ./model/hd/data/MTreatmentOutletFlowData.h
Monday 13 Jul 2020
11:24 am

Behrouz NematiPour

FW Support for HD/DG Debug Text & HDOpMode.

- Added a newly added channel to the list of listened channels eChlid_DG_UI = 0x070

- The MessageBuilder::getActionId implementation has been improved.

- New Messages has been added and enum/length defined as well.

- Message interpreter code has been improved to be easily modifiable.

- Changed the message ID enum ID_PowerOffBroadcast to ID_ShuttingDown.

- Added HDOperationMode to the setting screen.

- Made the floating point rounding optional by a #define and disabled the rounding for now.

- Inherit the MPowerOff Model from MAbstract as a new design.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -0
    • +1
    ./canbus/frameinterface.cpp
    • -5
    • +5
    ./canbus/messagebuilder.cpp
    • -1
    • +1
    ./canbus/messagebuilder.h
    • -36
    • +42
    ./canbus/messageglobals.h
    • -60
    • +37
    ./canbus/messageinterpreter.cpp
    • -1
    • +0
    ./canbus/messageinterpreter.h
    • -1
    • +2
    ./gui/guiglobals.cpp
    • -3
    • +16
    ./gui/guiglobals.h
    • -3
    • +3
    ./gui/qml/main.qml
    • -2
    • +27
    ./gui/qml/pages/SettingsHome.qml
    • -0
    • +6
    ./model/MAbstract.cpp
    • -2
    • +2
    ./model/MAbstract.h
    • -0
    • +35
    ./model/MDGDebugText.cpp
    • -0
    • +53
    ./model/MDGDebugText.h
    • -0
    • +35
    ./model/MHDDebugText.cpp
  16. … 17 more files in changeset.
Thursday 09 Jul 2020
8:52 am

Peter Lucia <plucia@diality.com>

Improved readability of main.h

Options
    • -61
    • +114
    ./main.h
Wednesday 08 Jul 2020
5:35 pm

Peter Lucia <plucia@diality.com>

Added infusion solution bolus to create treatment, selection capability of touchrect, fixed scroll bar.

Options
    • -0
    • +18
    ./gui/qml/components/TouchRect.qml
    • -0
    • +1
    ./gui/qml/globals/Colors.qml
    • -1
    • +0
    ./gui/qml/globals/Variables.qml
    • -64
    • +132
    ./gui/qml/pages/treatment/TreatmentCreate.qml
  5. … 1 more file in changeset.
Tuesday 07 Jul 2020
12:53 pm

Peter Lucia <plucia@diality.com>

Merge master into Create Treatment branch

Options
    • -10
    • +25
    ./gui/qml/globals/Fonts.qml
    • -12
    • +38
    ./gui/qml/globals/Variables.qml
    • -2
    • +20
    ./gui/qml/pages/treatment/TreatmentCreate.qml
    • -21
    • +139
    ./gui/qml/pages/treatment/TreatmentStack.qml
  5. … 2 more files in changeset.
12:22 pm

Dara Navaei

Updated the Copyright with the current year and replaced tabs with 4 spaces

Options
    • -10
    • +11
    ./abstract/singleton.h
    • -10
    • +11
    ./applicationcontroller.cpp
    • -10
    • +11
    ./applicationcontroller.h
    • -10
    • +11
    ./applicationpost.cpp
    • -10
    • +11
    ./applicationpost.h
    • -13
    • +14
    ./canbus/caninterface.cpp
    • -13
    • +14
    ./canbus/caninterface.h
    • -9
    • +10
    ./canbus/frameinterface.cpp
    • -9
    • +10
    ./canbus/frameinterface.h
    • -9
    • +10
    ./canbus/messageacknowmodel.cpp
    • -9
    • +10
    ./canbus/messageacknowmodel.h
    • -9
    • +10
    ./canbus/messagebuilder.cpp
    • -9
    • +10
    ./canbus/messagebuilder.h
    • -9
    • +10
    ./canbus/messagedispatcher.cpp
    • -9
    • +10
    ./canbus/messagedispatcher.h
  16. … 184 more files in changeset.
10:17 am

Peter Lucia <plucia@diality.com>

Updated Create Treatment page

Options
    • -0
    • +70
    ./gui/qml/components/SliderCreateTreatment.qml
    • -0
    • +2
    ./gui/qml/globals/Variables.qml
    • -52
    • +89
    ./gui/qml/pages/treatment/TreatmentCreate.qml
    • -1
    • +1
    ./gui/qml/pages/treatment/TreatmentStack.qml
  5. … 2 more files in changeset.
Monday 06 Jul 2020
7:36 pm

Peter Lucia <plucia@diality.com>

Ensuring slider updates selected flow rate.

Options
    • -2
    • +11
    ./gui/qml/pages/treatment/TreatmentCreate.qml
3:18 pm

Peter Lucia <plucia@diality.com>

Updated alarm status messages and added newlines for long messages.

Options
    • -11
    • +11
    ./model/malarmstatus.cpp
2:29 pm

Behrouz NematiPour

DEN-3880 : Implementation

- Added application name and version in the log.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -1
    • +1
    ./storage/logger.cpp
    • -0
    • +1
    ./view/dg/data/VDGValvesStatesData.cpp
  3. … 1 more file in changeset.
12:44 pm

Behrouz NematiPour

DEN-3874 : HW Support [Per Peman's Email]

- Reversed the ValvesState view order.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -12
    • +12
    ./view/dg/data/VDGValvesStatesData.cpp
11:42 am

Peter Lucia <plucia@diality.com>

Updated spacing in Fonts.qml

Options
    • -1
    • +1
    ./gui/qml/globals/Fonts.qml
2:15 am

Behrouz NematiPour

DEN-3874 : HW Support [Per Peman's Email]

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -1
    • +1
    ./canbus/messageinterpreter.cpp
    • -1
    • +1
    ./main.h
  3. … 6 more files in changeset.
12:42 am

Behrouz NematiPour

DEN-3874 : HW Support [Per Peman's Email]

- Unified All the Data messages to use the newly created parent model MAbstract.

- Cleaned up the logging class.

- Removed log_once macros.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -2
    • +3
    ./canbus/caninterface.cpp
    • -2
    • +3
    ./canbus/messagebuilder.cpp
    • -257
    • +29
    ./canbus/messageinterpreter.cpp
    • -25
    • +13
    ./canbus/messageinterpreter.h
    • -1
    • +1
    ./gui/qml/pages/SettingsHome.qml
    • -7
    • +18
    ./model/MAbstract.cpp
    • -0
    • +1
    ./model/MAbstract.h
    • -1
    • +1
    ./model/dg/data/MDGDrainPumpData.h
    • -17
    • +11
    ./model/hd/adjustment/MTreatmentAdjustBloodDialysateResponse.cpp
    • -15
    • +15
    ./model/hd/adjustment/MTreatmentAdjustBloodDialysateResponse.h
    • -16
    • +11
    ./model/hd/adjustment/MTreatmentAdjustDurationResponse.cpp
    • -15
    • +15
    ./model/hd/adjustment/MTreatmentAdjustDurationResponse.h
    • -1
    • +1
    ./model/hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.h
    • -6
    • +4
    ./model/hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.cpp
    • -12
    • +12
    ./model/hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.h
  16. … 17 more files in changeset.
Saturday 04 Jul 2020
9:21 pm

Behrouz NematiPour

DEN-3874 : HW Support [Per Peman's Email]

- Another try to make the code more clean.

- Qml doesn't accept enums with first letter non-capital [id => ID_]

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -1
    • +1
    ./applicationcontroller.cpp
    • -1
    • +1
    ./canbus/messagebuilder.cpp
    • -7
    • +7
    ./canbus/messagedispatcher.cpp
    • -5
    • +5
    ./canbus/messagedispatcher.h
    • -36
    • +36
    ./canbus/messageglobals.h
    • -64
    • +64
    ./canbus/messageinterpreter.cpp
    • -1
    • +1
    ./gui/guicontroller.cpp
    • -46
    • +46
    ./gui/guiglobals.h
    • -1
    • +4
    ./gui/qml/main.qml
    • -1
    • +1
    ./gui/qml/pages/ManagerHome.qml
    • -0
    • +47
    ./model/MAbstract.cpp
    • -3
    • +51
    ./model/MAbstract.h
    • -9
    • +5
    ./model/dg/data/MDGDrainPumpData.cpp
    • -5
    • +7
    ./model/dg/data/MDGDrainPumpData.h
    • -11
    • +6
    ./model/dg/data/MDGHeatersData.cpp
  16. … 17 more files in changeset.
Thursday 02 Jul 2020
9:47 pm

Behrouz NematiPour

DEN-3874 : HW Support [Per Peman's Email]

- Just to keep the code. Needs clean up.

- Don't forget Logs (DG, HD is different)

- So many more.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Options
    • -1
    • +1
    ./applicationcontroller.cpp
    • -1
    • +1
    ./applicationcontroller.h
    • -1
    • +1
    ./canbus/messagebuilder.cpp
    • -7
    • +7
    ./canbus/messagedispatcher.cpp
    • -5
    • +5
    ./canbus/messagedispatcher.h
    • -29
    • +40
    ./canbus/messageglobals.h
    • -98
    • +89
    ./canbus/messageinterpreter.cpp
    • -5
    • +4
    ./canbus/messageinterpreter.h
    • -1
    • +1
    ./gui/guicontroller.cpp
    • -1
    • +1
    ./gui/guicontroller.h
    • -3
    • +13
    ./gui/guiglobals.cpp
    • -37
    • +43
    ./gui/guiglobals.h
    • -4
    • +18
    ./gui/qml/main.qml
    • -6
    • +305
    ./gui/qml/pages/ManagerHome.qml
    • -78
    • +20
    ./gui/qml/pages/SettingsHome.qml
  16. … 127 more files in changeset.
Wednesday 01 Jul 2020
2:10 pm

Peter Lucia <plucia@diality.com>

Added back SquishQt comment

Options
    • -1
    • +1
    ./gui/qml/components/NotificationBar.qml
2:09 pm

Peter Lucia <plucia@diality.com>

Fixed MouseArea z order, removed unused sound item

Options
    • -24
    • +24
    ./gui/qml/components/SettingsItem.qml
    • -1
    • +6
    ./gui/qml/pages/Diagnostics.qml
    • -7
    • +5
    ./gui/qml/pages/SettingsHome.qml
1:54 pm

Peter Lucia <plucia@diality.com>

Aligned colors

Options
    • -4
    • +4
    ./gui/qml/globals/Colors.qml