Fisheye on application/sources/gui/guiglobals.h

application (bugfix/DEN-16597-UI-BN-S114): Merge branch 'master' into DEN-1090_MessageHandler

Behrouz NematiPour — Thu, 09 Jan 2020 11:08:09 -0800

Behrouz NematiPour committed c933552 on branch master, 2020_EOY_DEMO and 276 more in application

Merge branch 'master' into DEN-1090_MessageHandler

· /main.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/applicationcontroller.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/applicationcontroller.h

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/caninterface.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/caninterface.h

(-1, +1)

| History

| Source

| Diff

· /sources/gui/guicontroller.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/gui/guicontroller.h

(-1, +1)

| History

| Source

| Diff

· /sources/gui/guiglobals.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/gui/guiglobals.h

(-1, +1)

| History

| Source

| Diff

· /sources/gui/guiview.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/gui/guiview.h

(-1, +1)

| History

| Source

| Diff

· /sources/gui/qml/components/ModalDialog.qml

(-1, +1)

| History

| Source

| Diff

· /sources/gui/qml/components/TouchRect.qml

(-1, +1)

| History

| Source

| Diff

· /sources/gui/qml/main.qml

(-1, +1)

| History

| Source

| Diff

· /sources/gui/qml/pages/SettingsHome.qml

(-1, +1)

| History

| Source

| Diff

… 5 more files in changeset.

application (bugfix/DEN-16597-UI-BN-S114): Updated the Copyright with the current year and replaced tabs with 4 spaces

Dara Navaei — Wed, 01 Jan 2020 00:00:03 -0800

Dara Navaei committed 62efc6d on branch master, 2020_EOY_DEMO and 276 more in application

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

· /main.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/applicationcontroller.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/applicationcontroller.h

(-1, +1)

| History

| Source

| Diff

· /sources/applicationpost.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/applicationpost.h

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/caninterface.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/caninterface.h

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/messagehandler.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/messagehandler.h

(-1, +1)

| History

| Source

| Diff

· /sources/configuration/display.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/configuration/display.h

(-1, +1)

| History

| Source

| Diff

· /sources/configuration/sound.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/configuration/sound.h

(-1, +1)

| History

| Source

| Diff

· /sources/gui/guiactions.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/gui/guiactions.h

(-1, +1)

| History

| Source

| Diff

… 38 more files in changeset.

application (bugfix/DEN-16597-UI-BN-S114): DEN-1090 : UI Message Handler / Error Handler...

Behrouz NematiPour — Thu, 26 Dec 2019 20:40:57 -0800

Behrouz NematiPour committed 188d761 on branch master, 2020_EOY_DEMO and 276 more in application

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.

· /denali.pro	(-1, +2)	\| History	\| Source	\| Diff
· /sources/canbus/messageinterpreter.cpp	(-1, +11)	\| History	\| Source	\| Diff
· /sources/gui/guiglobals.h	(-2, +11)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/TreatmentStart.qml	(-0, +8)	\| History	\| Source	\| Diff
· /sources/utility/types.cpp	(-0, +30)	\| History	\| Source	\| Diff
· /sources/utility/types.h	(-1, +16)	\| History	\| Source	\| Diff
· /unittests/tst_canbus.cpp	(-12, +21)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): DEN-1090 : UI Message Handler / Error Handler...

Behrouz NematiPour — Mon, 16 Dec 2019 21:19:58 -0800

Behrouz NematiPour committed fee7fab on branch master, 2020_EOY_DEMO and 276 more in application

DEN-1090 : UI Message Handler / Error Handler

- Fixed application close which wasn't closing Can Device connection.

- Changed to date to 2019 in copyright section.

- In MessageInterpreter, named getBloodFlowData method parameters to the meaningful data names.

- Moved fromVariant method to Format utility class.

- Added Code documentation and description.

· /main.cpp

(-2, +6)

| History

| Source

| Diff

· /sources/applicationcontroller.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/applicationcontroller.h

(-1, +1)

| History

| Source

| Diff

· /sources/applicationpost.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/applicationpost.h

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/caninterface.cpp

(-39, +46)

| History

| Source

| Diff

· /sources/canbus/caninterface.h

(-7, +26)

| History

| Source

| Diff

· /sources/canbus/messagebuilder.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/messagebuilder.h

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/messagedispatcher.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/messagedispatcher.h

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/messageglobals.h

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/messagehandler.cpp

(-9, +37)

| History

| Source

| Diff

· /sources/canbus/messagehandler.h

(-12, +38)

| History

| Source

| Diff

· /sources/canbus/messageinterpreter.cpp

(-45, +118)

| History

| Source

| Diff

… 47 more files in changeset.

application (bugfix/DEN-16597-UI-BN-S114): DEN-1090 : UI Message Handler / Error Handler...

Behrouz NematiPour — Mon, 16 Dec 2019 14:22:59 -0800

Behrouz NematiPour committed 4c1551d on branch master, 2020_EOY_DEMO and 276 more in application

DEN-1090 : UI Message Handler / Error Handler

- Moved toHexString to a place more general so can be used everywhere.

- added command line switches to enable the can messages debugging easier.

- Added an Unhandled console out message.

- Added two other alarm message to the registered list but will console out the Unhandled message.

· /denali.pro	(-3, +5)	\| History	\| Source	\| Diff
· /main.cpp	(-2, +14)	\| History	\| Source	\| Diff
· /sources/canbus/messagebuilder.cpp	(-2, +3)	\| History	\| Source	\| Diff
· /sources/canbus/messagehandler.cpp	(-1, +3)	\| History	\| Source	\| Diff
· /sources/canbus/messageinterpreter.cpp	(-10, +26)	\| History	\| Source	\| Diff
· /sources/canbus/messageinterpreter.h	(-0, +1)	\| History	\| Source	\| Diff
· /sources/gui/guiglobals.cpp	(-9, +0)	\| History	\| Source	\| Diff
· /sources/gui/guiglobals.h	(-7, +8)	\| History	\| Source	\| Diff
· /sources/utility/format.cpp	(-0, +27)	\| History	\| Source
· /sources/utility/format.h	(-0, +28)	\| History	\| Source

application (bugfix/DEN-16597-UI-BN-S114): DEN-1090 : UI Message Handler / Error Handler...

Behrouz NematiPour — Mon, 16 Dec 2019 03:26:37 -0800

Behrouz NematiPour committed 460df09 on branch master, 2020_EOY_DEMO and 276 more in application

DEN-1090 : UI Message Handler / Error Handler

- Added CRC to the messages [added to the sent message and checked for the received message]

- Added ability to to enable/disable crc and keepAlive from project during build

- Added a feature to write the can messages in color formatted to the console in Can interface and Message Handler for easier debugging. Which can also be disabled by code.

- Added Animation to the TouchRect Touch to better understand if it has been touch.

- Added a demo/sample data text to display the corrent Blood Flow values on the StartTreatment Screen.

· /denali.pro

(-3, +20)

| History

| Source

| Diff

· /main.cpp

(-0, +2)

| History

| Source

| Diff

· /sources/canbus/caninterface.cpp

(-15, +13)

| History

| Source

| Diff

· /sources/canbus/caninterface.h

(-5, +5)

| History

| Source

| Diff

· /sources/canbus/messagebuilder.cpp

(-26, +85)

| History

| Source

| Diff

· /sources/canbus/messagebuilder.h

(-12, +21)

| History

| Source

| Diff

· /sources/canbus/messagedispatcher.cpp

(-19, +3)

| History

| Source

| Diff

· /sources/canbus/messagedispatcher.h

(-0, +1)

| History

| Source

| Diff

· /sources/canbus/messageglobals.h

(-15, +17)

| History

| Source

| Diff

· /sources/canbus/messageinterpreter.cpp

(-20, +130)

| History

| Source

| Diff

· /sources/canbus/messageinterpreter.h

(-1, +8)

| History

| Source

| Diff

· /sources/gui/guiglobals.cpp

(-0, +9)

| History

| Source

| Diff

· /sources/gui/guiglobals.h

(-1, +4)

| History

| Source

| Diff

· /sources/gui/qml/components/TouchRect.qml

(-0, +13)

| History

| Source

| Diff

· /sources/gui/qml/pages/SettingsHome.qml

(-0, +1)

| History

| Source

| Diff

… 4 more files in changeset.

application (bugfix/DEN-16597-UI-BN-S114): DEN-1090 : UI Message Handler / Error Handler...

Behrouz NematiPour — Fri, 13 Dec 2019 01:30:23 -0800

Behrouz NematiPour committed 1732e83 on branch master, 2020_EOY_DEMO and 276 more in application

DEN-1090 : UI Message Handler / Error Handler

- Modified enum to be enum class for clarification of the code.

- Added Message Interpreter

- Updated Message Builder to check CRC as a placeholder.

- Fixed Message Builder for messages with exactly 255 data length.

- Updated Message Builder methods scope for clarification of the code.

- Updated Message (Model) isComplete method.

- Updated Message Dispatcher to accept only command which has been defined for channel.

- Updated Message Dispatcher to remove the message from model when it has been transmitted.

· /denali.pro

(-18, +18)

| History

| Source

| Diff

· /main.cpp

(-0, +4)

| History

| Source

| Diff

· /sources/applicationcontroller.cpp

(-3, +3)

| History

| Source

| Diff

· /sources/canbus/caninterface.cpp

(-20, +38)

| History

| Source

| Diff

· /sources/canbus/caninterface.h

(-11, +14)

| History

| Source

| Diff

· /sources/canbus/messagebuilder.cpp

(-41, +52)

| History

| Source

| Diff

· /sources/canbus/messagebuilder.h

(-35, +35)

| History

| Source

| Diff

· /sources/canbus/messagedispatcher.cpp

(-1, +115)

| History

| Source

| Diff

· /sources/canbus/messagedispatcher.h

(-7, +36)

| History

| Source

| Diff

· /sources/canbus/messageglobals.h

(-10, +16)

| History

| Source

| Diff

· /sources/canbus/messagehandler.cpp

(-82, +48)

| History

| Source

| Diff

· /sources/canbus/messagehandler.h

(-14, +14)

| History

| Source

| Diff

· /sources/canbus/messageinterface.cpp

(-21, +0)

| History

| Source

| Diff

· /sources/canbus/messageinterface.h

(-37, +0)

| History

| Source

| Diff

· /sources/canbus/messageinterpreter.cpp

(-0, +113)

| History

| Source

… 4 more files in changeset.

application (bugfix/DEN-16597-UI-BN-S114): DEN-1090 : UI Message Handler / Error Handler...

Behrouz NematiPour — Mon, 09 Dec 2019 22:50:18 -0800

Behrouz NematiPour committed 272bb81 on branch master, 2020_EOY_DEMO and 276 more in application

DEN-1090 : UI Message Handler / Error Handler

- Changed the datatype interface between Message Interface and from Byte Array to Variant List for different type of parameter support. Also it gives the flexibility to have a Message Interpreter as messaging interface level.

- Added basic classes for Message interface.

- Moved Gui Actions in Gui Globals for simplicity.

· /denali.pro

(-2, +2)

| History

| Source

| Diff

· /main.cpp

(-1, +0)

| History

| Source

| Diff

· /sources/applicationcontroller.cpp

(-6, +6)

| History

| Source

| Diff

· /sources/applicationcontroller.h

(-5, +5)

| History

| Source

| Diff

· /sources/canbus/messagebuilder.h

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/messageglobals.h

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/messagehandler.cpp

(-13, +23)

| History

| Source

| Diff

· /sources/canbus/messagehandler.h

(-8, +4)

| History

| Source

| Diff

· /sources/canbus/messageinterface.cpp

(-0, +21)

| History

| Source

· /sources/canbus/messageinterface.h

(-0, +37)

| History

| Source

· /sources/gui/guiactions.cpp

(-24, +0)

| History

| Source

| Diff

· /sources/gui/guiactions.h

(-53, +0)

| History

| Source

| Diff

· /sources/gui/guicontroller.cpp

(-5, +5)

| History

| Source

| Diff

· /sources/gui/guicontroller.h

(-6, +6)

| History

| Source

| Diff

· /sources/gui/guiglobals.cpp

(-2, +14)

| History

| Source

| Diff

… 4 more files in changeset.

application (bugfix/DEN-16597-UI-BN-S114): Updated the Copyright with the current year and replaced tabs with 4 spaces

Dara Navaei — Tue, 03 Dec 2019 00:00:11 -0800

Dara Navaei committed 781e62c on branch master, 2020_EOY_DEMO and 276 more in application

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

· /main.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/applicationcontroller.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/applicationcontroller.h

(-1, +1)

| History

| Source

| Diff

· /sources/applicationpost.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/applicationpost.h

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/caninterface.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/caninterface.h

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/messagehandler.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/messagehandler.h

(-1, +1)

| History

| Source

| Diff

· /sources/configuration/display.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/configuration/display.h

(-1, +1)

| History

| Source

| Diff

· /sources/configuration/sound.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/configuration/sound.h

(-1, +1)

| History

| Source

| Diff

· /sources/gui/guiactions.cpp

(-0, +15)

| History

| Source

| Diff

· /sources/gui/guiactions.h

(-1, +1)

| History

| Source

| Diff

… 38 more files in changeset.

application (bugfix/DEN-16597-UI-BN-S114): DEN-704 +review UI-DEN-704_HomeScreen...

Behrouz NematiPour — Sun, 24 Nov 2019 23:46:00 -0800

Behrouz NematiPour committed f623529 on branch master, 2020_EOY_DEMO and 277 more in application

DEN-704 +review UI-DEN-704_HomeScreen

- Made code ready for QtTest

- Commented out qDebugs for now to be removed from QtTest output

- cleaned up the code after running unit tests.

· /denali.pro	(-2, +26)	\| History	\| Source	\| Diff
· /main.cpp	(-5, +14)	\| History	\| Source	\| Diff
· /sources/applicationcontroller.cpp	(-4, +4)	\| History	\| Source	\| Diff
· /sources/canbus/caninterface.cpp	(-9, +17)	\| History	\| Source	\| Diff
· /sources/canbus/caninterface.h	(-4, +10)	\| History	\| Source	\| Diff
· /sources/canbus/messagehandler.cpp	(-10, +18)	\| History	\| Source	\| Diff
· /sources/canbus/messagehandler.h	(-1, +18)	\| History	\| Source	\| Diff
· /sources/gui/guiactions.h	(-0, +2)	\| History	\| Source	\| Diff
· /sources/gui/guicontroller.cpp	(-4, +4)	\| History	\| Source	\| Diff
· /sources/gui/guiglobals.cpp	(-1, +6)	\| History	\| Source	\| Diff
· /sources/gui/guiglobals.h	(-0, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/components/MainMenu.qml	(-1, +0)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/SettingsHome.qml	(-0, +16)	\| History	\| Source	\| Diff
· /sources/gui/qml/pages/TreatmentHome.qml	(-15, +0)	\| History	\| Source	\| Diff
· /sources/storage/filehandler.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /unittests/unittests.cpp	(-0, +136)	\| History	\| Source
· /unittests/unittests.h	(-0, +51)	\| History	\| Source

application (bugfix/DEN-16597-UI-BN-S114): DEN-608 : CAN Integration on UI...

Behrouz NematiPour — Mon, 28 Oct 2019 04:17:02 -0700

Behrouz NematiPour committed 9a3ee02 on branch master, 2020_EOY_DEMO and 278 more in application

DEN-608 : CAN Integration on UI

- Redesigned the code to be thread safe

- Implemented signal slots to connect all the classes from can to GUI and vice versa.

· /copyright

(-4, +4)

| History

| Source

| Diff

· /denali.pro

(-68, +74)

| History

| Source

| Diff

· /main.cpp

(-5, +23)

| History

| Source

| Diff

· /sources/applicationcontroller.cpp

(-25, +88)

| History

| Source

| Diff

· /sources/applicationcontroller.h

(-14, +28)

| History

| Source

| Diff

· /sources/canbus/canbus.cpp

(-23, +0)

| History

| Source

| Diff

· /sources/canbus/canbus.h

(-34, +0)

| History

| Source

| Diff

· /sources/canbus/caninterface.cpp

(-0, +176)

| History

| Source

· /sources/canbus/caninterface.h

(-0, +76)

| History

| Source

· /sources/canbus/messagehandler.cpp

(-0, +135)

| History

| Source

· /sources/canbus/messagehandler.h

(-0, +63)

| History

| Source

· /sources/gui/guiactions.h

(-7, +12)

| History

| Source

| Diff

· /sources/gui/guicontroller.cpp

(-45, +82)

| History

| Source

| Diff

· /sources/gui/guicontroller.h

(-15, +19)

| History

| Source

| Diff

· /sources/gui/guiglobals.cpp

(-0, +51)

| History

| Source

… 11 more files in changeset.