application

sources

Clone Tools

Stats

Commits this week: 1
Total Committers: 14
Last Commit: 22 Dec 20
Commits this week: 1

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 minutes ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Tuesday 22 Dec 2020
10:00 am

Behrouz NematiPour

Resolved merge issue

Options
    • -1
    • +0
    ./canbus/MessageInterpreter.cpp
9:53 am

Behrouz NematiPour

Merge branch 'DEN-5751_Pre-TreatmentUltrafiltration' into demo_test

Options
    • -4
    • +6
    ./gui/qml/globals/Variables.qml
9:48 am

Behrouz NematiPour

Merge branch 'DEN-5830_AlarmDesign' into demo_test

Options
    • -1
    • +9
    ./canbus/MessageInterpreter.cpp
  2. … 1 more file in changeset.
9:28 am

Behrouz NematiPour

DEN-5833: Implementation

- Added a UI "AlarmGenerator" class to handle the HD_COMM_TIMEOUT and later the BLE Cuff alarm (PRS 395).

Options
    • -0
    • +75
    ./AlarmGenerator.cpp
    • -0
    • +55
    ./AlarmGenerator.h
    • -6
    • +2
    ./gui/GuiController.cpp
    • -8
    • +9
    ./view/hd/alarm/VAlarmStatus.cpp
  5. … 1 more file in changeset.
Thursday 17 Dec 2020
1:19 pm

Behrouz NematiPour

DEN-5833: Implementation

- added a touch expanding area for the TouchArea so regardless of its visual size it can have expanded touchable area.

- the touch expanding for the mute button set to 25 so it can have a bigger touch area that its size which is little.

Options
    • -1
    • +1
    ./gui/qml/components/MuteButton.qml
    • -0
    • +1
    ./gui/qml/components/NotificationBar.qml
    • -1
    • +4
    ./gui/qml/components/TouchRect.qml
    • -0
    • +1
    ./gui/qml/dialogs/NotificationDialog.qml
Wednesday 16 Dec 2020
3:07 pm

Behrouz NematiPour

DEN-5754: Implementation

- cherry picked a fix from DEN-5830_AlarmDesign@51accb for the Treatment End message which has no payload.

- Also made the interpretMessage() for received messages to be more identical to the DEN-5830_AlarmDesign to hopefully help merging easier.

Options
    • -7
    • +20
    ./canbus/MessageInterpreter.cpp
2:55 pm

Behrouz NematiPour

DEN-6022: The ultrafiltration inconsistency

- Had a conversation with Syseng(Nic) and Fweng(Sean) and decided to have the fix somehow more understandable but there is no actual fix and if that happens it would be the FW bug.

- The modification is that the main progress bar will always has VTreatmentUltratiltration.minimum as minimum (current;y always zero) and VTreatmentUltratiltration.maximum as maximum.

- The UI always expects to get the vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Min (adjustable min and slider min) greater than vTreatmentUltrafiltration.ultrafiltration_RefUFVol (current uf volume delivered and current value on the progress bar) and so close to eachother.

- Removed the precision from VTreatmentUltrafiltration and moved into the Variables.

Options
    • -4
    • +6
    ./gui/qml/globals/Variables.qml
    • -2
    • +2
    ./gui/qml/pages/treatment/TreatmentBegin.qml
    • -1
    • +1
    ./gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml
    • -27
    • +17
    ./gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml
    • -2
    • +1
    ./gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml
    • -2
    • +1
    ./gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml
    • -2
    • +1
    ./gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml
    • -6
    • +2
    ./view/hd/data/VTreatmentUltrafiltration.h
Tuesday 15 Dec 2020
9:45 pm

Behrouz NematiPour

DEN-5833: Implementation

- Added a MACRO for convenience of empty payload messages handling.

Options
    • -1
    • +9
    ./canbus/MessageInterpreter.cpp
9:12 pm

Behrouz NematiPour

DEN-5833: Implementation

- Fixed the bug that alarm ID zero which is the clear the alarm indication wasn't updating the properties, so caused to alarm_ID changed notification signal not to raise and GUI wasn't getting updated.

Options
    • -6
    • +6
    ./view/hd/alarm/VAlarmStatus.cpp
6:33 pm

Behrouz NematiPour

DEN-5754: Implementation

- Fixed a bug caused by a typo

Options
    • -1
    • +1
    ./gui/qml/pages/treatment/TreatmentStack.qml
11:31 am

Behrouz NematiPour

Merge branch 'DEN-5751_Pre-TreatmentUltrafiltration' into demo_test

Options
    • -0
    • +13
    ./canbus/MessageDispatcher.cpp
    • -0
    • +1
    ./canbus/MessageDispatcher.h
    • -3
    • +8
    ./canbus/MessageGlobals.h
    • -0
    • +3
    ./canbus/MessageInterpreter.cpp
    • -16
    • +25
    ./gui/GuiGlobals.h
    • -0
    • +2
    ./gui/qml/main.qml
    • -3
    • +13
    ./model/MModel.h
    • -0
    • +28
    ./model/hd/adjustment/MTreatmentAdjustRequests.h
  9. … 2 more files in changeset.
Monday 14 Dec 2020
7:02 pm

Behrouz NematiPour

DEN-5754: Implementation

- linked the pre-treatment ultrafiltration adjustment with the in-treatment ultrafiltration section and the adjustment flow.

- added the rejection reason text to the pTx uf adj screen.

Options
    • -1
    • +1
    ./gui/qml/components/NotificationBar.qml
    • -1
    • +1
    ./gui/qml/globals/Variables.qml
    • -10
    • +14
    ./gui/qml/pages/treatment/TreatmentBegin.qml
    • -2
    • +17
    ./gui/qml/pages/treatment/TreatmentStack.qml
1:43 pm

Behrouz NematiPour

DEN-5754: Implementation

- Fixed the message id of the ID_ConfirmTreatmentReq from 58 to 59

- Enabled the priming button for now since there is no FW implementation.

Options
    • -1
    • +1
    ./gui/GuiGlobals.h
    • -1
    • +2
    ./gui/qml/pages/treatment/TreatmentPrime.qml
12:33 pm

Behrouz NematiPour

DEN-5833: Implementation

- Moved version and sd-card icon to to not to cover others.

Options
    • -6
    • +5
    ./gui/qml/main.qml
11:57 am

Behrouz NematiPour

DEN-5754: Implementation

- Removed the unused flag of ALARM_ID_TEMPERATURE_SENSORS_INCONSISTENT

Options
    • -1
    • +0
    ./model/hd/alarm/MAlarmStatusData.cpp
Sunday 13 Dec 2020
9:20 pm

Behrouz NematiPour

DEN-5754: Implementation

- Removed the semi-colon at the end of the imports.

Options
    • -24
    • +24
    ./gui/qml/main.qml
Friday 11 Dec 2020
6:06 pm

Behrouz NematiPour

DEN-5833: Implementation

- The message 63 has been tested

Options
    • -25
    • +26
    ./gui/qml/main.qml
    • -1
    • +15
    ./view/hd/alarm/VAlarmStatus.cpp
    • -0
    • +1
    ./view/hd/alarm/VAlarmStatus.h
  4. … 1 more file in changeset.
3:47 pm

Behrouz NematiPour

DEN-5833: Implementation

- Added the message 63 (req/rsp)

Options
    • -13
    • +13
    ./canbus/MessageDispatcher.cpp
    • -0
    • +2
    ./canbus/MessageDispatcher.h
    • -1
    • +2
    ./canbus/MessageGlobals.h
    • -13
    • +20
    ./canbus/MessageInterpreter.cpp
    • -1
    • +2
    ./gui/GuiGlobals.h
    • -7
    • +4
    ./gui/qml/main.qml
    • -5
    • +10
    ./model/MModel.h
    • -7
    • +8
    ./model/hd/adjustment/MTreatmentAdjustRequests.h
    • -0
    • +41
    ./model/hd/alarm/MAlarmClearedCondition.cpp
    • -0
    • +79
    ./model/hd/alarm/MAlarmClearedCondition.h
    • -4
    • +4
    ./view/hd/alarm/VAlarmStatus.cpp
    • -4
    • +4
    ./view/hd/alarm/VAlarmStatus.h
  13. … 2 more files in changeset.
Thursday 10 Dec 2020
10:04 pm

Behrouz NematiPour

DEN-5833: Implementation

- moved version and SD-Card icon to top which were covering the alarm bar.

- added list icon on the notification bar

- implemented the basics of the alarm list dialog.

- tweaked the Notification default coloring

-

Options
    • -4
    • +28
    ./gui/qml/components/NotificationBar.qml
    • -0
    • +100
    ./gui/qml/dialogs/AlarmListDialog.qml
    • -3
    • +3
    ./gui/qml/dialogs/NotificationDialog.qml
    • -2
    • +2
    ./gui/qml/globals/Colors.qml
    • -1
    • +2
    ./gui/qml/globals/Variables.qml
    • -26
    • +51
    ./gui/qml/main.qml
  7. … 6 more files in changeset.
7:19 pm

Behrouz NematiPour

DEN-5833: Implementation

- fix a naming bug.

Options
    • -1
    • +1
    ./canbus/MessageDispatcher.cpp
    • -1
    • +1
    ./model/hd/adjustment/MTreatmentAdjustRequests.h
6:39 pm

Behrouz NematiPour

DEN-5833: Implementation

- Fixed the bug of silence logic which was reverse

- Fixed the bug that length of the silence message payload was incorrectly set to 4 instead of 1.

- changed the name of the MAlarmSilenceReq member variable to silence instead of state which now implies it is silent (1) or not (0).

Options
    • -1
    • +1
    ./canbus/MessageGlobals.h
    • -1
    • +1
    ./gui/qml/main.qml
    • -2
    • +2
    ./model/hd/adjustment/MTreatmentAdjustRequests.h
    • -2
    • +2
    ./view/hd/alarm/VAlarmStatus.cpp
6:17 pm

Behrouz NematiPour

DEN-5833: Implementation

- made the mute button click optional and currently enabled.

- made minimize on silent on the Notification Dialog optional and is disabled currently.

- made separate slots for each user actions instead of one for all with 4 parameter cause I think it's easier and more convenient to use this way.

- increased the Notification Bar height a little bit more.

Options
    • -2
    • +4
    ./gui/qml/components/NotificationBar.qml
    • -2
    • +2
    ./gui/qml/globals/Variables.qml
    • -33
    • +30
    ./gui/qml/main.qml
    • -12
    • +45
    ./view/hd/alarm/VAlarmStatus.cpp
    • -2
    • +5
    ./view/hd/alarm/VAlarmStatus.h
5:29 pm

Behrouz NematiPour

DEN-5833: Implementation

- Implementation of the message 64: 'Alarm User Action'

- Cleaned up the VAlarmStatus class.

Options
    • -0
    • +1
    ./canbus/MessageGlobals.h
    • -1
    • +4
    ./gui/qml/components/ImageLogoD.qml
    • -4
    • +7
    ./gui/qml/main.qml
    • -13
    • +13
    ./model/hd/adjustment/MTreatmentAdjustRequests.h
    • -38
    • +35
    ./view/hd/alarm/VAlarmStatus.cpp
    • -20
    • +17
    ./view/hd/alarm/VAlarmStatus.h
2:35 pm

Behrouz NematiPour

DEN-5833: Implementation

- Added User Action message response model.

Options
    • -0
    • +12
    ./canbus/MessageDispatcher.cpp
    • -0
    • +1
    ./canbus/MessageInterpreter.cpp
    • -0
    • +3
    ./gui/GuiGlobals.h
    • -13
    • +28
    ./model/MModel.h
    • -0
    • +28
    ./model/hd/adjustment/MTreatmentAdjustRequests.h
  6. … 1 more file in changeset.
12:35 pm

Behrouz NematiPour

DEN-5833: Implementation

- Fixed a bouncing bug of the message when sent for the first time with silenced flag on to show the alarm not maximized.

Options
    • -1
    • +12
    ./gui/qml/dialogs/NotificationDialog.qml
    • -5
    • +11
    ./view/hd/alarm/VAlarmStatus.cpp
Wednesday 09 Dec 2020
10:20 pm

Behrouz NematiPour

DEN-5833: Implementation

- Added 3 Alarm buttons

- created Mute Button

- created Up and Down Button (minimize/maximize)

- used FW alarm status flag enum (Alarm_State_Flag_Bit_Positions) instead of the UI version and removed UI one.

Code cleaned up

- modified and cleaned up Notification Dialog and Bar.

- modified Time Text component to be able to show sections with one zero only.

- cleaned up main.qml

Options
    • -1
    • +1
    ./canbus/MessageInterpreter.cpp
    • -19
    • +21
    ./gui/GuiGlobals.h
    • -1
    • +0
    ./gui/qml/components/ModalDialog.qml
    • -0
    • +60
    ./gui/qml/components/MuteButton.qml
    • -37
    • +27
    ./gui/qml/components/NotificationBar.qml
    • -3
    • +8
    ./gui/qml/components/TimeText.qml
    • -0
    • +37
    ./gui/qml/components/UpDownButton.qml
    • -40
    • +87
    ./gui/qml/dialogs/NotificationDialog.qml
    • -12
    • +55
    ./gui/qml/globals/Colors.qml
    • -6
    • +6
    ./gui/qml/globals/Variables.qml
    • -95
    • +75
    ./gui/qml/main.qml
    • -1
    • +0
    ./model/MModel.h
    • -2
    • +1
    ./model/hd/alarm/MAlarmStatusData.cpp
    • -18
    • +0
    ./model/hd/alarm/MAlarmStatusData.h
    • -22
    • +17
    ./view/hd/alarm/VAlarmStatus.cpp
  16. … 7 more files in changeset.
Tuesday 08 Dec 2020
3:24 pm

Behrouz NematiPour

DEN-5754: Implementation

- Added the new MVC for initial UF Volume adjustment messages (79/80).

Options
    • -0
    • +13
    ./canbus/MessageDispatcher.cpp
    • -1
    • +1
    ./canbus/MessageDispatcher.h
    • -2
    • +2
    ./canbus/MessageGlobals.h
    • -0
    • +2
    ./canbus/MessageInterpreter.cpp
    • -1
    • +2
    ./gui/GuiGlobals.cpp
    • -2
    • +2
    ./gui/GuiGlobals.h
    • -0
    • +2
    ./gui/qml/main.qml
    • -4
    • +5
    ./gui/qml/pages/treatment/TreatmentBegin.qml
    • -2
    • +2
    ./gui/qml/pages/treatment/TreatmentPrime.qml
    • -3
    • +13
    ./model/MModel.h
    • -0
    • +28
    ./model/hd/adjustment/MTreatmentAdjustRequests.h
    • -0
    • +49
    ./model/hd/adjustment/MTreatmentAdjustUltrafiltrationInitResponse.cpp
    • -0
    • +86
    ./model/hd/adjustment/MTreatmentAdjustUltrafiltrationInitResponse.h
    • -2
    • +2
    ./view/VTreatmentCreate.cpp
    • -0
    • +1
    ./view/VView.h
  16. … 4 more files in changeset.
3:55 am

Behrouz NematiPour

DEN-5754: Implementation

- reviewed the pre-treatment screens and modified

- added the double range slider for Arterial and Venous

- modified the treatmentBegin(ultrafiltration)

- so many other tweaks.

Options
    • -0
    • +1
    ./canbus/MessageDispatcher.h
    • -3
    • +8
    ./canbus/MessageGlobals.h
    • -15
    • +24
    ./gui/GuiGlobals.h
    • -1
    • +1
    ./gui/qml/components/ConfirmTreatmentTable.qml
    • -0
    • +1
    ./gui/qml/components/ProgressCircle.qml
    • -4
    • +41
    ./gui/qml/components/RangeSlider.qml
    • -2
    • +2
    ./gui/qml/components/Slider.qml
    • -1
    • +1
    ./gui/qml/components/SliderCreateTreatment.qml
    • -1
    • +1
    ./gui/qml/components/TickMarks.qml
    • -1
    • +1
    ./gui/qml/components/TopMenuBarCreateTreatment.qml
    • -6
    • +8
    ./gui/qml/globals/Fonts.qml
    • -60
    • +77
    ./gui/qml/pages/treatment/TreatmentBegin.qml
    • -1
    • +0
    ./gui/qml/pages/treatment/TreatmentConfirm.qml
    • -131
    • +167
    ./gui/qml/pages/treatment/TreatmentCreate.qml
    • -102
    • +78
    ./gui/qml/pages/treatment/TreatmentPrime.qml
  16. … 4 more files in changeset.
Sunday 06 Dec 2020
9:04 pm

Behrouz NematiPour

DEN-5754: Implementation

- reformat and commented out the message id debug log.

Options
    • -1
    • +1
    ./canbus/MessageInterpreter.cpp
  2. … 1 more file in changeset.
Thursday 03 Dec 2020
4:07 pm

Behrouz NematiPour

DEN-5833: Implementation

- Updated the old Alarm model structure to used the notify in the Message Interpreter.

- Updated the Alarm Trigger,Clear,Status to inherit from MAbstract to be able to the above.

- Added a macro to make the request messages handling easier.

Options
    • -172
    • +32
    ./canbus/MessageInterpreter.cpp
    • -8
    • +0
    ./canbus/MessageInterpreter.h
    • -8
    • +5
    ./model/hd/alarm/MAlarmCleared.cpp
    • -12
    • +14
    ./model/hd/alarm/MAlarmCleared.h
    • -88
    • +79
    ./model/hd/alarm/MAlarmStatusData.cpp
    • -24
    • +31
    ./model/hd/alarm/MAlarmStatusData.h
    • -8
    • +5
    ./model/hd/alarm/MAlarmTriggered.cpp
    • -12
    • +15
    ./model/hd/alarm/MAlarmTriggered.h
  9. … 2 more files in changeset.