application

sources

Clone Tools

Stats

Commits this week: 1
Total Committers: 14
Last Commit: 16 Dec
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 14 Jan 2020
2:45 pm

Behrouz NematiPour

http://dvm-linux02:8060/cru/UI-DEN-1396-1#c919

- Added classes details description.

- Added another define while I was adding description, I found out it's better to have another define so all the interface required would be as defines.

Options
    • -1
    • +1
    ./applicationcontroller.cpp
    • -0
    • +7
    ./storage/filehandler.h
    • -6
    • +20
    ./storage/logger.h
    • -0
    • +3
    ./storage/storageglobals.h
    • -0
    • +20
    ./storage/usbwatcher.h
1:56 pm

Behrouz NematiPour

Revision 56d00a8, line 98

- Added space between functions.

Options
    • -0
    • +2
    ./canbus/caninterface.h
Monday 13 Jan 2020
3:11 pm

Behrouz NematiPour

DEN-1437 : Implementation

- Added console out coloring for Error logs to be able to debug easier.

Options
    • -0
    • +8
    ./storage/logger.cpp
2:34 pm

Behrouz NematiPour

DEN-1437 : Implementation

- Updated the Logo with the transparent version provided by K:D.

- Added darker version of the Logo d to be used on the Treatment screen top menu bar.

- Added Line Component to be used in the Treatment screen as section separator.

- Updated main menu component to have :

. Extra right most side item (Treatment settings button)

. Added drop up/down animation for the menu hide/show.

. Added a position feature to the component so it can be positioned on top of the screen or at the bottom of the screen.

- Added Orientation to the TouchArea Component.

- Moved USB, Export buttons into the Settings home screen.

- Moved LogoD object from main.qml to the TreatmentHome screen.

- Added the Treatment Top Menu Bar in the Treatment Stack screen.

- Improved the TextRect component.

Options
    • -0
    • +29
    ./gui/qml/components/Background.qml
    • -29
    • +0
    ./gui/qml/components/BackgroundRect.qml
    • -0
    • +37
    ./gui/qml/components/Line.qml
    • -10
    • +78
    ./gui/qml/components/MainMenu.qml
    • -4
    • +11
    ./gui/qml/components/TextRect.qml
    • -16
    • +25
    ./gui/qml/components/TouchArea.qml
    • -0
    • +2
    ./gui/qml/globals/Colors.qml
    • -0
    • +3
    ./gui/qml/globals/Fonts.qml
    • -3
    • +0
    ./gui/qml/main.qml
    • -0
    • +21
    ./gui/qml/pages/SettingsHome.qml
    • -0
    • +9
    ./gui/qml/pages/TreatmentHome.qml
    • -0
    • +12
    ./gui/qml/pages/TreatmentStack.qml
    • -40
    • +127
    ./gui/qml/pages/TreatmentStart.qml
  14. … 3 more files in changeset.
Saturday 11 Jan 2020
7:05 pm

Behrouz NematiPour

DEN-1437 : Implementation

- Changed 2019-2019 in copyright to 2019-2020.

Options
    • -1
    • +1
    ./applicationcontroller.cpp
    • -1
    • +1
    ./applicationcontroller.h
    • -1
    • +1
    ./applicationpost.cpp
    • -1
    • +1
    ./applicationpost.h
    • -1
    • +1
    ./canbus/caninterface.cpp
    • -1
    • +1
    ./canbus/caninterface.h
    • -1
    • +1
    ./canbus/frameinterface.cpp
    • -1
    • +1
    ./canbus/frameinterface.h
    • -1
    • +1
    ./canbus/messagebuilder.cpp
    • -1
    • +1
    ./canbus/messagebuilder.h
    • -1
    • +1
    ./canbus/messagedispatcher.cpp
    • -1
    • +1
    ./canbus/messagedispatcher.h
    • -1
    • +1
    ./canbus/messageglobals.h
    • -1
    • +1
    ./canbus/messageinterpreter.cpp
    • -1
    • +1
    ./canbus/messageinterpreter.h
  16. … 45 more files in changeset.
7:04 pm

Behrouz NematiPour

DEN-1437 : Implementation

- TextRect : is actually a rectangle with title/ lable / extra lable whcih is going to be used in the Treatment screen (Blood/Dialysate Flows).

- TextArea : is a contaoner Rectangle with title. which is used in Treatment an contains TextTecs(s).

- BackgroundRect : is a simple rectangle which is used for a background rect to have colors and borders.

- Added required common constant values for Colors and Fonts and Values.

Options
    • -0
    • +29
    ./gui/qml/components/BackgroundRect.qml
    • -0
    • +81
    ./gui/qml/components/TextRect.qml
    • -0
    • +81
    ./gui/qml/components/TouchArea.qml
    • -1
    • +7
    ./gui/qml/globals/Colors.qml
    • -3
    • +9
    ./gui/qml/globals/Fonts.qml
    • -1
    • +4
    ./gui/qml/globals/Variables.qml
    • -0
    • +366
    ./gui/qml/pages/TreatmentStart (test).qml
    • -293
    • +22
    ./gui/qml/pages/TreatmentStart.qml
  9. … 2 more files in changeset.
Thursday 09 Jan 2020
11:17 am

Dara Navaei

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

Options
    • -1
    • +1
    ./canbus/frameinterface.cpp
    • -1
    • +1
    ./canbus/frameinterface.h
    • -1
    • +1
    ./canbus/messagebuilder.cpp
    • -1
    • +1
    ./canbus/messagebuilder.h
    • -1
    • +1
    ./canbus/messagedispatcher.cpp
    • -1
    • +1
    ./canbus/messagedispatcher.h
    • -1
    • +1
    ./canbus/messageglobals.h
    • -1
    • +1
    ./canbus/messageinterpreter.cpp
    • -1
    • +1
    ./canbus/messageinterpreter.h
    • -1
    • +1
    ./utility/crc.cpp
    • -1
    • +1
    ./utility/format.cpp
    • -1
    • +1
    ./utility/format.h
    • -1
    • +1
    ./utility/types.h
  14. … 1 more file in changeset.
11:08 am

Behrouz NematiPour

Merge branch 'master' into DEN-1090_MessageHandler

Options
    • -1
    • +1
    ./applicationcontroller.cpp
    • -1
    • +1
    ./applicationcontroller.h
    • -1
    • +1
    ./canbus/caninterface.cpp
    • -1
    • +1
    ./canbus/caninterface.h
    • -1
    • +1
    ./gui/guicontroller.cpp
    • -1
    • +1
    ./gui/guicontroller.h
    • -1
    • +1
    ./gui/guiglobals.cpp
    • -1
    • +1
    ./gui/guiglobals.h
    • -1
    • +1
    ./gui/guiview.cpp
    • -1
    • +1
    ./gui/guiview.h
    • -1
    • +1
    ./gui/qml/components/ModalDialog.qml
    • -1
    • +1
    ./gui/qml/components/TouchRect.qml
    • -1
    • +1
    ./gui/qml/main.qml
    • -1
    • +1
    ./gui/qml/pages/SettingsHome.qml
    • -1
    • +1
    ./gui/qml/pages/TreatmentStart.qml
  16. … 5 more files in changeset.
Wednesday 08 Jan 2020
11:39 pm

Behrouz NematiPour

DEN-1617 : Implementation - Alarm Logging and Acknowledgment

- Added a unit test project for miscellaneous test which is not covered on feature based unit tests.

- Added a simple unit test to test the coverage.

Options
    • -1
    • +0
    ./applicationcontroller.cpp
    • -1
    • +7
    ./storage/filehandler.cpp
    • -2
    • +4
    ./utility/types.h
  4. … 6 more files in changeset.
3:35 am

Behrouz NematiPour

DEN-1617 : Implementation - Alarm Logging and Acknowledgment

- Added unit tests for logging

- Added unit tests for Alarm message.

- Tested the logging and export with more than 150MB log and it took ~10 sec to copy so added some feature to disable USB/Export buttons during export.

- Instead of using QtCuncorrent which is asynchronous moved logger to a thread to take advantage of the Signal/Slot queue between threads to have events logged in order.

- Move USB/Export buttons on Treatment Screen.

- Moved export from file handler into Logger.

Options
    • -5
    • +13
    ./applicationcontroller.cpp
    • -1
    • +2
    ./applicationcontroller.h
    • -0
    • +14
    ./gui/guicontroller.cpp
    • -0
    • +3
    ./gui/guicontroller.h
    • -0
    • +13
    ./gui/guiview.cpp
    • -0
    • +3
    ./gui/guiview.h
    • -2
    • +6
    ./gui/qml/components/ExportButton.qml
    • -0
    • +6
    ./gui/qml/components/USBButton.qml
    • -21
    • +0
    ./gui/qml/pages/TreatmentHome.qml
    • -0
    • +19
    ./gui/qml/pages/TreatmentStart.qml
    • -18
    • +1
    ./storage/filehandler.cpp
    • -6
    • +2
    ./storage/filehandler.h
    • -18
    • +84
    ./storage/logger.cpp
    • -13
    • +40
    ./storage/logger.h
    • -0
    • +2
    ./threads.cpp
  16. … 8 more files in changeset.
Tuesday 07 Jan 2020
4:54 pm

Behrouz NematiPour

DEN-1617 : Implementation - Alarm Logging and Acknowledgment

- Ooooooopppps !

- Forgot a not in some classes.

Options
    • -1
    • +1
    ./applicationcontroller.cpp
    • -1
    • +1
    ./canbus/frameinterface.cpp
    • -1
    • +1
    ./canbus/messagedispatcher.cpp
    • -1
    • +1
    ./gui/guicontroller.cpp
    • -2
    • +3
    ./storage/usbwatcher.cpp
1:31 pm

Behrouz NematiPour

DEN-1617 : Implementation - Alarm Logging and Acknowledgment

- Added threading to other classes (Application / Gui controller, ...) and restructured the threading to meed the Qt limitation.

- Documented the code

- Ran cppCheck again

- Cleaned the includes and using namespace (They have left after so many changes and some were useless.)

- Added _init flag for init methods so not to be able to call them twice.

- Added another init method with the thread parameter to be able to pass the thread of the class and also be able to use the class without any thread for unit tests.

- Created a Threads namespace to gather all the threads in one place.

- Update the unit tests as well. [to make it work with the new structure/threading.]

Options
    • -3
    • +88
    ./applicationcontroller.cpp
    • -8
    • +12
    ./applicationcontroller.h
    • -19
    • +0
    ./canbus/alarminterpreter.cpp
    • -41
    • +0
    ./canbus/alarminterpreter.h
    • -29
    • +60
    ./canbus/caninterface.cpp
    • -7
    • +18
    ./canbus/caninterface.h
    • -21
    • +56
    ./canbus/frameinterface.cpp
    • -9
    • +16
    ./canbus/frameinterface.h
    • -7
    • +6
    ./canbus/messagebuilder.cpp
    • -18
    • +17
    ./canbus/messagebuilder.h
    • -17
    • +56
    ./canbus/messagedispatcher.cpp
    • -10
    • +23
    ./canbus/messagedispatcher.h
    • -20
    • +0
    ./canbus/messageglobals.cpp
    • -18
    • +13
    ./canbus/messageglobals.h
    • -23
    • +49
    ./canbus/messageinterpreter.cpp
  16. … 21 more files in changeset.
Sunday 05 Jan 2020
10:17 pm

Behrouz NematiPour

DEN-1617 : Implementation - Alarm Logging and Acknowledgment

- Added Threading for :

. Can Frame

. Can Message

. USB Watcher

- Changed the File Handler implementation

- Changed the Singleton from pointer to static reference

// TODO :

- We still need to work on threading on other classes

- We need to have a singleton parent class

- Some code has been added to debug can interface (We still have swap frames)

- Thread Objects need to be gathered all together in one place to be handled easily.

Options
    • -17
    • +12
    ./applicationcontroller.cpp
    • -1
    • +1
    ./applicationcontroller.h
    • -38
    • +84
    ./canbus/caninterface.cpp
    • -1
    • +6
    ./canbus/caninterface.h
    • -8
    • +30
    ./canbus/frameinterface.cpp
    • -2
    • +3
    ./canbus/frameinterface.h
    • -10
    • +38
    ./canbus/messagedispatcher.cpp
    • -2
    • +3
    ./canbus/messagedispatcher.h
    • -0
    • +20
    ./canbus/messageglobals.cpp
    • -0
    • +5
    ./canbus/messageglobals.h
    • -10
    • +6
    ./gui/guicontroller.cpp
    • -1
    • +1
    ./gui/guicontroller.h
    • -12
    • +12
    ./gui/guiview.cpp
    • -20
    • +8
    ./main.h
    • -3
    • +0
    ./maintimer.cpp
  16. … 7 more files in changeset.
Saturday 04 Jan 2020
9:05 pm

Behrouz NematiPour

DEN-1617 : Implementation - Alarm Logging and Acknowledgment

- Added Threading structure for USBWatcher and FileHandler

Options
    • -2
    • +5
    ./applicationcontroller.cpp
    • -2
    • +0
    ./applicationcontroller.h
    • -0
    • +16
    ./main.h
    • -51
    • +18
    ./storage/filehandler.cpp
    • -31
    • +6
    ./storage/filehandler.h
    • -23
    • +28
    ./storage/logger.cpp
    • -16
    • +26
    ./storage/logger.h
    • -0
    • +6
    ./storage/storageglobals.cpp
    • -0
    • +6
    ./storage/storageglobals.h
    • -6
    • +24
    ./storage/usbwatcher.cpp
    • -4
    • +5
    ./storage/usbwatcher.h
  12. … 1 more file in changeset.
Thursday 02 Jan 2020
10:37 pm

Behrouz NematiPour

DEN-1617 : Implementation - Alarm Logging and Acknowledgment

- Alarm Logging has been added

- Some other changes has been done to the code and messaging.

- Acknowledgment is not done [ Had an agreement with Sean for design but needs more time and we need to do it all together.]

Options
    • -0
    • +95
    ./abstract/singleton.h
    • -4
    • +5
    ./applicationcontroller.cpp
    • -1
    • +6
    ./applicationcontroller.h
    • -0
    • +19
    ./canbus/alarminterpreter.cpp
    • -0
    • +41
    ./canbus/alarminterpreter.h
    • -0
    • +4
    ./canbus/caninterface.cpp
    • -0
    • +1
    ./canbus/frameinterface.cpp
    • -0
    • +1
    ./canbus/messagebuilder.cpp
    • -0
    • +1
    ./canbus/messagedispatcher.cpp
    • -4
    • +5
    ./canbus/messageglobals.h
    • -116
    • +242
    ./canbus/messageinterpreter.cpp
    • -10
    • +30
    ./canbus/messageinterpreter.h
    • -0
    • +3
    ./gui/guicontroller.cpp
    • -3
    • +6
    ./gui/guiglobals.cpp
    • -15
    • +80
    ./gui/guiglobals.h
  16. … 22 more files in changeset.
Wednesday 01 Jan 2020
12:00 am

Dara Navaei

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

Options
    • -1
    • +1
    ./applicationcontroller.cpp
    • -1
    • +1
    ./applicationcontroller.h
    • -1
    • +1
    ./applicationpost.cpp
    • -1
    • +1
    ./applicationpost.h
    • -1
    • +1
    ./canbus/caninterface.cpp
    • -1
    • +1
    ./canbus/caninterface.h
    • -1
    • +1
    ./canbus/messagehandler.cpp
    • -1
    • +1
    ./canbus/messagehandler.h
    • -1
    • +1
    ./configuration/display.cpp
    • -1
    • +1
    ./configuration/display.h
    • -1
    • +1
    ./configuration/sound.cpp
    • -1
    • +1
    ./configuration/sound.h
    • -1
    • +1
    ./gui/guiactions.cpp
    • -1
    • +1
    ./gui/guiactions.h
    • -1
    • +1
    ./gui/guicontroller.cpp
  16. … 38 more files in changeset.
Thursday 26 Dec 2019
8:47 pm

Behrouz NematiPour

Merge branch 'DEN-1090_MessageHandler' into DEN-1396_LogHandler

Options
    • -10
    • +10
    ./gui/guiglobals.h
8:40 pm

Behrouz NematiPour

DEN-1090 : UI Message Handler / Error Handler

- Incomplete merge of the added feature for First parameter of the BloodFlow has to be unsigned int and changed to S32.

- Updated the unit tests.

Options
    • -1
    • +11
    ./canbus/messageinterpreter.cpp
    • -2
    • +11
    ./gui/guiglobals.h
    • -0
    • +8
    ./gui/qml/pages/TreatmentStart.qml
    • -0
    • +30
    ./utility/types.cpp
    • -1
    • +16
    ./utility/types.h
  6. … 2 more files in changeset.
4:17 pm

Behrouz NematiPour

Merge branch 'DEN-1090_MessageHandler' into DEN-1396_LogHandler

- Added the changes to the BloodFlow first parameter form unsigned to signed to be updated.

Options
    • -3
    • +3
    ./canbus/messageinterpreter.cpp
    • -2
    • +2
    ./gui/qml/pages/TreatmentStart.qml
4:02 pm

Behrouz NematiPour

DEN-1090 : UI Message Handler / Error Handler

- First parameter of the BloodFlow has to be unsigned int and changed to S32.

Options
    • -3
    • +7
    ./canbus/messageinterpreter.cpp
    • -4
    • +4
    ./canbus/messageinterpreter.h
    • -7
    • +8
    ./gui/qml/pages/TreatmentStart.qml
3:52 pm

Behrouz NematiPour

DEN-1396 : UI Log Handler

MISC :

- Updated the Singleton defines to delete the instance.

- Added/moved the floatCompare in the types.cpp and created the file to do so.

LOGGING :

- Implemented logging

- Added LOG_EVENT / LOG_DATUM / LOG_ERROR in code instead of qDebug() as sample of the log event .

- Added export to USB feature.

- Added "Export Button"

Options
    • -0
    • +9
    ./applicationcontroller.cpp
    • -0
    • +2
    ./applicationcontroller.h
    • -2
    • +6
    ./canbus/caninterface.cpp
    • -3
    • +4
    ./canbus/frameinterface.cpp
    • -6
    • +7
    ./canbus/messagebuilder.cpp
    • -2
    • +3
    ./canbus/messagedispatcher.cpp
    • -1
    • +1
    ./canbus/messageglobals.h
    • -4
    • +15
    ./canbus/messageinterpreter.cpp
    • -0
    • +5
    ./gui/guicontroller.cpp
    • -0
    • +3
    ./gui/guicontroller.h
    • -1
    • +2
    ./gui/guiglobals.cpp
    • -0
    • +9
    ./gui/guiview.cpp
    • -0
    • +3
    ./gui/guiview.h
    • -0
    • +47
    ./gui/qml/components/ExportButton.qml
    • -5
    • +0
    ./gui/qml/components/USBButton.qml
  16. … 11 more files in changeset.
Monday 23 Dec 2019
8:54 pm

Behrouz NematiPour

DEN-1396 : UI Log Handler

- Added USB Drive Mount/Umount/Removed detection

- Added USB Drive mounting process error handling

- Added USB Button

- Made File Handler a singleton class which is connected to Main Timer to detect USB insertion and remove.

- Added series of connections in ApplicationController, Guicontroller, GuiView, FileHandler.

- Updated TouchRect to be able to notify user for reaction by fading in/out.

- Modified and added button colors for normal and selected.

- Added disabled functionality to the TouchRect

- Added USB button as a test into Home Screen.

Options
    • -3
    • +25
    ./applicationcontroller.cpp
    • -1
    • +7
    ./applicationcontroller.h
    • -0
    • +21
    ./gui/guicontroller.cpp
    • -0
    • +10
    ./gui/guicontroller.h
    • -0
    • +23
    ./gui/guiview.cpp
    • -0
    • +7
    ./gui/guiview.h
    • -1
    • +1
    ./gui/qml/components/MainMenu.qml
    • -9
    • +53
    ./gui/qml/components/TouchRect.qml
    • -0
    • +51
    ./gui/qml/components/USBButton.qml
    • -15
    • +16
    ./gui/qml/globals/Colors.qml
    • -1
    • +1
    ./gui/qml/pages/SettingsHome.qml
    • -0
    • +2
    ./gui/qml/pages/TreatmentHome.qml
    • -32
    • +92
    ./storage/filehandler.cpp
    • -7
    • +31
    ./storage/filehandler.h
  15. … 2 more files in changeset.
Friday 20 Dec 2019
6:06 pm

Behrouz NematiPour

DEN-1396 : UI Log Handler

- Added Detect/Mount USB drive (draft)

- It needs to be revised since it calls two part of the code that I don't know if it's reasonable.

Options
    • -2
    • +35
    ./storage/filehandler.cpp
    • -2
    • +4
    ./storage/filehandler.h
5:58 pm

Behrouz NematiPour

DEN-1434 : UI In-Treatment Screen (Monitoring)

- Added "PWM Duty Cycle" parameter to BloodFlow Monitoring command

Options
    • -4
    • +4
    ./canbus/messageglobals.h
    • -2
    • +17
    ./canbus/messageinterpreter.cpp
    • -4
    • +4
    ./canbus/messageinterpreter.h
    • -3
    • +11
    ./gui/guiglobals.h
    • -6
    • +15
    ./gui/qml/pages/TreatmentStart.qml
  6. … 1 more file in changeset.
Thursday 19 Dec 2019
3:00 pm

Behrouz NematiPour

DEN-1090 : UI Message Handler / Error Handler

- Fixed a typo

Options
    • -1
    • +1
    ./canbus/frameinterface.cpp
2:19 pm

Behrouz NematiPour

DEN-1090 : UI Message Handler / Error Handler

- Fixed Comment Spacing [Code Review]

Options
    • -5
    • +5
    ./canbus/messagebuilder.cpp
2:08 pm

Behrouz NematiPour

DEN-1090 : UI Message Handler / Error Handler

- Updated the constants by enums [Code Review]

Options
    • -1
    • +1
    ./canbus/frameinterface.cpp
    • -6
    • +6
    ./canbus/messagebuilder.cpp
    • -0
    • +5
    ./canbus/messageglobals.h
    • -1
    • +1
    ./canbus/messageinterpreter.cpp
3:37 am

Behrouz NematiPour

DEN-1090 : UI Message Handler / Error Handler

- Trying a solution to have separate unit tests for each feature.

- Changed the unittests class to tst_canbus since this is the unit test for implemented canbus messages and interaction.

- removed .pro.user from gitignore since denali.pro.user contains configurations for local unit tests setup and need to be cloned for the new ones.

- Fixed issues which has been found during the unit tests.

Options
    • -0
    • +1
    ./canbus/caninterface.cpp
    • -2
    • +2
    ./canbus/caninterface.h
    • -2
    • +2
    ./canbus/frameinterface.h
    • -7
    • +7
    ./canbus/messagebuilder.cpp
    • -0
    • +6
    ./canbus/messagedispatcher.h
    • -0
    • +1
    ./canbus/messageinterpreter.cpp
    • -0
    • +7
    ./utility/format.cpp
    • -3
    • +3
    ./utility/format.h
  9. … 8 more files in changeset.
Wednesday 18 Dec 2019
9:24 pm

Behrouz NematiPour

DEN-1090 : UI Message Handler / Error Handler

- renamed MessageHandler to FrameInterface to understand easier in SDD.

Options
    • -2
    • +2
    ./canbus/caninterface.cpp
    • -0
    • +168
    ./canbus/frameinterface.cpp
    • -0
    • +102
    ./canbus/frameinterface.h
    • -3
    • +3
    ./canbus/messagedispatcher.cpp
    • -168
    • +0
    ./canbus/messagehandler.cpp
    • -101
    • +0
    ./canbus/messagehandler.h
  7. … 4 more files in changeset.
1:36 pm

Behrouz NematiPour

DEN-1090 : UI Message Handler / Error Handler

- The keepAlive implementation was against the design.

Options
    • -0
    • +29
    ./applicationcontroller.cpp
    • -0
    • +3
    ./applicationcontroller.h
    • -29
    • +0
    ./canbus/messagedispatcher.cpp
    • -3
    • +0
    ./canbus/messagedispatcher.h