application

Clone Tools

Stats

Commits this week: 0
Total Committers: 14
Last Commit: 17 Dec 20
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 minutes ago
All Commits Reviews
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Thursday 17 Dec 2020
1:19 pm

Behrouz NematiPour

Merge branch 'DEN-5830_AlarmDesign' into 2020_EOY_DEMO

Options
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
    /sources/gui/qml/components/MuteButton.qml
    • -0
    • +1
    /sources/gui/qml/components/NotificationBar.qml
    • -1
    • +4
    /sources/gui/qml/components/TouchRect.qml
    • -0
    • +1
    /sources/gui/qml/dialogs/NotificationDialog.qml
Tuesday 15 Dec 2020
10:12 pm

Behrouz NematiPour

Merge branch 'DEN-5830_AlarmDesign' into 2020_EOY_DEMO

Options
    • -11
    • +13
    /sources/canbus/MessageInterpreter.cpp
    • -6
    • +9
    /sources/view/hd/alarm/VAlarmStatus.cpp
9:45 pm

Behrouz NematiPour

DEN-5833: Implementation

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

Options
    • -1
    • +9
    /sources/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
    /sources/view/hd/alarm/VAlarmStatus.cpp
3:35 pm

Peter Lucia <plucia@diality.com>

DEN-5515, DEN-5516: Moved bluetooth setup before UI application start in run.sh, fixed start treatment messaging

Options
    • -2
    • +2
    /denali.pro.user
    • -3
    • +6
    /scripts/run.sh
    • -1
    • +1
    /sources/gui/qml/pages/treatment/TreatmentCreate.qml
    • -5
    • +2
    /sources/gui/qml/pages/treatment/TreatmentStack.qml
10:53 am

Peter Lucia <plucia@diality.com>

Merge DEN-4860_BLE into 2020_EOY_DEMO

Options
    • -1
    • +14
    /denali.pro
    • -11
    • +11
    /denali.pro.user
    • -7
    • +10
    /denali.qrc
    • -8
    • +7
    /sources/canbus/MessageDispatcher.cpp
    • -7
    • +7
    /sources/canbus/MessageGlobals.h
    • -7
    • +17
    /sources/canbus/MessageInterpreter.cpp
    • -0
    • +4
    /sources/gui/GuiGlobals.cpp
    • -7
    • +29
    /sources/gui/GuiGlobals.h
    • -0
    • +117
    /sources/gui/qml/components/pretreatment/ConfirmTreatmentTable.qml
    • -0
    • +117
    /sources/gui/qml/components/pretreatment/SliderCreateTreatment.qml
    • -0
    • +180
    /sources/gui/qml/components/pretreatment/TopMenuBarCreateTreatment.qml
    • -0
    • +2
    /sources/gui/qml/globals/Fonts.qml
    • -0
    • +6
    /sources/gui/qml/globals/Variables.qml
    • -24
    • +32
    /sources/gui/qml/main.qml
    • -1
    • +2
    /sources/gui/qml/pages/treatment/TreatmentBegin.qml
  16. … 10 more files in changeset.
10:17 am

Peter Lucia <plucia@diality.com>

Merge master into DEN-4860_BLE

Options
    • -0
    • +12
    /denali.pro
    • -1
    • +1
    /denali.pro.user
    • -1
    • +7
    /denali.qrc
    • -19
    • +33
    /main.cpp
    • -1
    • +1
    /sources/bluetooth/BLEScanner.cpp
    • -0
    • +28
    /sources/canbus/MessageDispatcher.cpp
    • -1
    • +11
    /sources/canbus/MessageGlobals.h
    • -1
    • +15
    /sources/canbus/MessageInterpreter.cpp
    • -0
    • +3
    /sources/gui/GuiGlobals.cpp
    • -71
    • +85
    /sources/gui/GuiGlobals.h
    • -0
    • +1
    /sources/gui/qml/globals/Fonts.qml
    • -11
    • +48
    /sources/gui/qml/globals/Variables.qml
    • -1
    • +0
    /sources/gui/qml/pages/SettingsHome.qml
    • -1
    • +0
    /sources/gui/qml/pages/treatment/TreatmentBegin.qml
    • -2
    • +0
    /sources/gui/qml/pages/treatment/TreatmentCreate.qml
  16. … 9 more files in changeset.
9:47 am

Peter Lucia <plucia@diality.com>

DEN-5515, DEN-5516: Disabled verbose bluetooth debugging

Options
    • -1
    • +1
    /sources/bluetooth/BLEScanner.cpp
    • -2
    • +2
    /sources/view/VVitals.cpp
9:44 am

Peter Lucia <plucia@diality.com>

DEN-5515, DEN-5516: Added bluetooth setup to run.sh

Options
    • -0
    • +5
    /scripts/run.sh
Monday 14 Dec 2020
7:03 pm

Behrouz NematiPour

Merge branch 'DEN-5751_Pre-TreatmentUltrafiltration' into 2020_EOY_DEMO

Options
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
    /sources/gui/qml/components/NotificationBar.qml
    • -1
    • +1
    /sources/gui/qml/globals/Variables.qml
    • -10
    • +14
    /sources/gui/qml/pages/treatment/TreatmentBegin.qml
    • -2
    • +17
    /sources/gui/qml/pages/treatment/TreatmentStack.qml
2:55 pm

Peter Lucia <plucia@diality.com>

DEN-5515, DEN-5516: Setup in-treatment bp/hr measurement alerts

- Replaced some instances of qDebug with LOG_DEBUG

- Docstring fixes, cleanup

Options
    • -1
    • +5
    /sources/bluetooth/BLEScanner.cpp
    • -3
    • +9
    /sources/gui/GuiGlobals.h
    • -0
    • +2
    /sources/gui/qml/pages/treatment/TreatmentCreate.qml
    • -1
    • +2
    /sources/view/VAlert.cpp
    • -3
    • +4
    /sources/view/VAlert.h
    • -5
    • +10
    /sources/view/VTreatmentBegin.cpp
    • -5
    • +6
    /sources/view/VTreatmentCreate.cpp
    • -1
    • +110
    /sources/view/VVitals.cpp
    • -5
    • +20
    /sources/view/VVitals.h
1:44 pm

Behrouz NematiPour

Merge branch 'DEN-5751_Pre-TreatmentUltrafiltration' into 2020_EOY_DEMO

Options
    • -1
    • +1
    /sources/gui/GuiGlobals.h
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
    /sources/gui/GuiGlobals.h
    • -1
    • +2
    /sources/gui/qml/pages/treatment/TreatmentPrime.qml
1:39 pm

Behrouz NematiPour

Merge branch 'DEN-5751_Pre-TreatmentUltrafiltration' into 2020_EOY_DEMO

Options
    • -2
    • +6
    /denali.pro
    • -1
    • +1
    /denali.pro.user
    • -0
    • +13
    /sources/canbus/MessageDispatcher.cpp
    • -0
    • +1
    /sources/canbus/MessageDispatcher.h
    • -3
    • +8
    /sources/canbus/MessageGlobals.h
    • -4
    • +2
    /sources/canbus/MessageInterpreter.cpp
    • -15
    • +24
    /sources/gui/GuiGlobals.h
    • -0
    • +2
    /sources/gui/qml/main.qml
    • -3
    • +13
    /sources/model/MModel.h
    • -0
    • +28
    /sources/model/hd/adjustment/MTreatmentAdjustRequests.h
12:33 pm

Behrouz NematiPour

DEN-5833: Implementation

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

Options
    • -6
    • +5
    /sources/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
    /sources/model/hd/alarm/MAlarmStatusData.cpp
9:16 am

Peter Lucia <plucia@diality.com>

DEN-5516, 5514 - BLE Interface updates

- When reconnecting to the last paired device on startup, ensure we repeatedly try to connect to it by updating the BLE connection type

- Docstring additions

- Keeping some code in case it is needed for future use with other BLE devices

Options
    • -3
    • +13
    /sources/bluetooth/BLEScanner.cpp
    • -2
    • +3
    /sources/view/VBluetooth.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
    /sources/gui/qml/main.qml
Friday 11 Dec 2020
6:06 pm

Behrouz NematiPour

DEN-5833: Implementation

- The message 63 has been tested

Options
    • -1
    • +1
    /denali.pro.user
    • -25
    • +26
    /sources/gui/qml/main.qml
    • -1
    • +15
    /sources/view/hd/alarm/VAlarmStatus.cpp
    • -0
    • +1
    /sources/view/hd/alarm/VAlarmStatus.h
3:47 pm

Behrouz NematiPour

DEN-5833: Implementation

- Added the message 63 (req/rsp)

Options
    • -4
    • +6
    /denali.pro
    • -1
    • +1
    /denali.pro.user
    • -13
    • +13
    /sources/canbus/MessageDispatcher.cpp
    • -0
    • +2
    /sources/canbus/MessageDispatcher.h
    • -1
    • +2
    /sources/canbus/MessageGlobals.h
    • -13
    • +20
    /sources/canbus/MessageInterpreter.cpp
    • -1
    • +2
    /sources/gui/GuiGlobals.h
    • -7
    • +4
    /sources/gui/qml/main.qml
    • -5
    • +10
    /sources/model/MModel.h
    • -7
    • +8
    /sources/model/hd/adjustment/MTreatmentAdjustRequests.h
    • -0
    • +41
    /sources/model/hd/alarm/MAlarmClearedCondition.cpp
    • -0
    • +79
    /sources/model/hd/alarm/MAlarmClearedCondition.h
    • -4
    • +4
    /sources/view/hd/alarm/VAlarmStatus.cpp
    • -4
    • +4
    /sources/view/hd/alarm/VAlarmStatus.h
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
    • -1
    • +1
    /denali.pro.user
    • -0
    • +2
    /denali.qrc
    • binary
    /resources/images/AlarmBell.png
    • binary
    /resources/images/AlarmBellSilent.png
    • binary
    /resources/images/doted-list.png
    • binary
    /resources/images/list.png
    • -4
    • +28
    /sources/gui/qml/components/NotificationBar.qml
    • -0
    • +100
    /sources/gui/qml/dialogs/AlarmListDialog.qml
    • -3
    • +3
    /sources/gui/qml/dialogs/NotificationDialog.qml
    • -2
    • +2
    /sources/gui/qml/globals/Colors.qml
    • -1
    • +2
    /sources/gui/qml/globals/Variables.qml
    • -26
    • +51
    /sources/gui/qml/main.qml
7:19 pm

Behrouz NematiPour

DEN-5833: Implementation

- fix a naming bug.

Options
    • -1
    • +1
    /sources/canbus/MessageDispatcher.cpp
    • -1
    • +1
    /sources/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
    /sources/canbus/MessageGlobals.h
    • -1
    • +1
    /sources/gui/qml/main.qml
    • -2
    • +2
    /sources/model/hd/adjustment/MTreatmentAdjustRequests.h
    • -2
    • +2
    /sources/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
    /sources/gui/qml/components/NotificationBar.qml
    • -2
    • +2
    /sources/gui/qml/globals/Variables.qml
    • -33
    • +30
    /sources/gui/qml/main.qml
    • -12
    • +45
    /sources/view/hd/alarm/VAlarmStatus.cpp
    • -2
    • +5
    /sources/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
    /sources/canbus/MessageGlobals.h
    • -1
    • +4
    /sources/gui/qml/components/ImageLogoD.qml
    • -4
    • +7
    /sources/gui/qml/main.qml
    • -13
    • +13
    /sources/model/hd/adjustment/MTreatmentAdjustRequests.h
    • -38
    • +35
    /sources/view/hd/alarm/VAlarmStatus.cpp
    • -20
    • +17
    /sources/view/hd/alarm/VAlarmStatus.h
2:35 pm

Behrouz NematiPour

DEN-5833: Implementation

- Added User Action message response model.

Options
    • -1
    • +1
    /denali.pro.user
    • -0
    • +12
    /sources/canbus/MessageDispatcher.cpp
    • -0
    • +1
    /sources/canbus/MessageInterpreter.cpp
    • -0
    • +3
    /sources/gui/GuiGlobals.h
    • -13
    • +28
    /sources/model/MModel.h
    • -0
    • +28
    /sources/model/hd/adjustment/MTreatmentAdjustRequests.h
1:51 pm

Peter Lucia <plucia@diality.com>

DEN-5516, DEN-5514: Ensure connection to BP-Cuff is re-established after power cycle

Options
    • -39
    • +84
    /sources/bluetooth/BLEScanner.cpp
    • -0
    • +3
    /sources/bluetooth/BLEScanner.h
    • -16
    • +72
    /sources/view/VBluetooth.cpp
    • -4
    • +9
    /sources/view/VBluetooth.h
    • -0
    • +16
    /sources/view/VBluetoothDeviceInfo.cpp
    • -1
    • +2
    /sources/view/VBluetoothDeviceInfo.h
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
    /sources/gui/qml/dialogs/NotificationDialog.qml
    • -5
    • +11
    /sources/view/hd/alarm/VAlarmStatus.cpp