application

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Another CAN Messaging format for testing

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -17
    • +80
    /sources/applicationcontroller.cpp
    • -0
    • +1
    /sources/canbus/messageinterpreter.cpp
DEN-2088 Implementation

- Added OutletFlow

- Added TreatmentTime

- Added AlarmStatus

- Made adding model view simpler

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -133
    • +35
    /sources/canbus/messageinterpreter.cpp
    • -15
    • +7
    /sources/canbus/messageinterpreter.h
    • -8
    • +5
    /sources/gui/qml/components/ModalDialog.qml
  1. … 16 more files in changeset.
DEN-2088 : Implementation (3 of 4)

- Bloodflow , DialysateFlow models implemented and proper changes has been made

- Alerts, Dialysate out needs to be modified

- Pressure / Occlusion Data needs to be implemented.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -139
    • +52
    /sources/canbus/messageinterpreter.cpp
    • -130
    • +35
    /sources/gui/qml/pages/SettingsHome.qml
  1. … 5 more files in changeset.
Merge branch 'DEN-2086_DenaliCommunication' into DEN-1434_InTreatment

Merge branch 'DEN-1971_UIPowerOffTiming' into DEN-2086_DenaliCommunication

Regarding the Peter's code review comment

http://dvm-linux02:8060/cru/DEN-UI-2086-1#CFR-11853

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

DEN-2091 : CAN / Denali Communication Protocol [Modify Design]

Added the command line arguments help as a document in the code.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

DEN-2091 : CAN / Denali Communication Protocol [Modify Design]

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -17
    • +23
    /sources/canbus/caninterface.cpp
    • -14
    • +98
    /sources/canbus/frameinterface.cpp
    • -2
    • +5
    /sources/canbus/messageinterpreter.cpp
    • -1
    • +0
    /sources/gui/qml/components/ModalDialog.qml
  1. … 3 more files in changeset.
DEN-UI-1971 : Peman's comments

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -2
    • +1
    /sources/canbus/messageinterpreter.cpp
    • -1
    • +0
    /sources/gui/qml/components/ModalDialog.qml
DEN-1974 : Unit Testing / DEN-1975 : Integration Testing

- Modified application to be more testable for unit/integration tests.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -1
    • +5
    /sources/gui/qml/components/MainMenu.qml
DEN-1973 : Implementation

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -4
    • +19
    /sources/canbus/messageinterpreter.cpp
    • -0
    • +6
    /sources/gui/qml/dialogs/AutoHideInfo.qml
Final CleanUp of the Test

- to be able to use it as a reference to make it officially as part of the main code.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -40
    • +38
    /sources/canbus/frameinterface.cpp
Keep this test fro further reference

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

DEN-1973 : Implementation

- Added fadeout feature to the modaldialog

- Added a AutoHideInfo dialog

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -0
    • +23
    /sources/gui/qml/components/ModalDialog.qml
    • -0
    • +39
    /sources/gui/qml/dialogs/AutoHideInfo.qml
Last commit to close the testing

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Disabled the logging

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Swapped CAN ID of the HD Broadcast and UI

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

DEN-2089 : Test Current Design

- Added a Test log which has a different format and logs in the log/test folder.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

DEN-2089 : Test Current Design

- Added another test message which has the frame index in it. And the format is the way Firmware does to be easier to compare.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

DEN-2089 : Test Current Design

- Added a test code so reads the interval and data which needs to be sent from test.dat file next to the application denali and sends keepAlive message (0700) by that interval ans with that data.

- First line is interval in ms and second line is the data to be sent.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -0
    • +3
    /sources/canbus/messageinterpreter.cpp
DEN-1927 : Implementation (2 of 4)

- Fixed some typos found out during Design Reviews.

- Created and added Components out of the TreatmentTime Section.

- Created Circle.qml component

- Created TimeText.qml component

- Created ProgressCircle.qml

- Removed ModalDialog the blur background since it doesn't look good on target.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -0
    • +78
    /sources/gui/qml/components/Circle.qml
    • -13
    • +4
    /sources/gui/qml/components/ModalDialog.qml
    • -0
    • +43
    /sources/gui/qml/components/ProgressCircle.qml
    • -0
    • +83
    /sources/gui/qml/components/TimeText.qml
    • -7
    • +7
    /sources/gui/qml/components/TouchRect.qml
DEN-1927 : Implementation (2 of 4)

- TreatmentTime click event fixed

- Clean up

    • -26
    • +13
    /sources/gui/qml/pages/treatment/TreatmentStart.qml
DEN-1927 : Implementation (2 of 4)

- Added Treatment Time, Treatment Section.

- Added Ultrafiltration Message and updating the Treatment screen Ultrafiltration progressBar with values but the Max value is hard coded by 1000mL right now, since we don't have Treatment Prescriptions and so .

    • -0
    • +70
    /sources/canbus/messageinterpreter.cpp
    • -52
    • +14
    /sources/gui/qml/pages/treatment/TreatmentStart.qml
    • -0
    • +148
    /sources/gui/qml/pages/treatment/sections/TreatmentTime.qml
DEN-1927 : Implementation (2 of 4)

- The first implementation of the Circular ProgressCircle

DEN-1927 : Implementation (2 of 4)

- TreatmentStart was getting very big, so separated the sections.

    • -42
    • +0
    /sources/gui/qml/pages/TreatmentCreate.qml
    • -77
    • +0
    /sources/gui/qml/pages/TreatmentHome.qml
    • -46
    • +0
    /sources/gui/qml/pages/TreatmentStack.qml
    • -323
    • +0
    /sources/gui/qml/pages/TreatmentStart.qml
    • -0
    • +42
    /sources/gui/qml/pages/treatment/TreatmentCreate.qml
    • -0
    • +77
    /sources/gui/qml/pages/treatment/TreatmentHome.qml
    • -0
    • +46
    /sources/gui/qml/pages/treatment/TreatmentStack.qml
    • -0
    • +105
    /sources/gui/qml/pages/treatment/TreatmentStart.qml
    • -0
    • +50
    /sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml
    • -0
    • +50
    /sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml
    • -0
    • +56
    /sources/gui/qml/pages/treatment/sections/TreatmentVitals.qml
DEN-1927 : Implementation (2 of 4)

- Added Solution Infusion progressBar.

    • -1
    • +0
    /sources/canbus/messageinterpreter.cpp
    • -2
    • +1
    /sources/gui/qml/components/ProgressBar.qml
    • -19
    • +6
    /sources/gui/qml/components/RangeBar.qml
    • -0
    • +2
    /sources/gui/qml/globals/Variables.qml
    • -11
    • +86
    /sources/gui/qml/pages/TreatmentStart.qml
DEN-1927 : Implementation (2 of 4)

- Added Dialysate Outlet Flow data [added onto the setting home for testing]

- In regards to the added feature above, the previous DialysateFlow renamed to DialysateInletFlow.

- Added RangeBar.qml

- Renamed ProgressMaker to RangeMaker which makes more sense for its usability.

    • -20
    • +117
    /sources/canbus/messageinterpreter.cpp
    • -3
    • +14
    /sources/canbus/messageinterpreter.h
    • -11
    • +11
    /sources/gui/qml/components/ProgressBar.qml
    • -0
    • +95
    /sources/gui/qml/components/RangeBar.qml
    • -0
    • +78
    /sources/gui/qml/components/RangeMarker.qml
    • -2
    • +2
    /sources/gui/qml/components/RangeRect.qml
    • -7
    • +9
    /sources/gui/qml/globals/Variables.qml
    • -34
    • +118
    /sources/gui/qml/pages/SettingsHome.qml
    • -6
    • +50
    /sources/gui/qml/pages/TreatmentStart.qml
DEN-1927 : Implementation (2 of 4)

- Added RanceRect as the common containter of the range rect objects like progressBars.

- Updated components accordingly.

    • -86
    • +21
    /sources/gui/qml/components/ProgressBar.qml
    • -4
    • +5
    /sources/gui/qml/components/ProgressRect.qml
    • -0
    • +79
    /sources/gui/qml/components/RangeRect.qml
    • -1
    • +4
    /sources/gui/qml/globals/Variables.qml
    • -16
    • +20
    /sources/gui/qml/pages/TreatmentStart.qml
DEN-1927 : Implementation (2 of 4)

- Added ProgressRect.qml

- Made the ProgressBar more modularized to be used in other components.

    • -6
    • +0
    /sources/gui/qml/components/Background.qml
    • -47
    • +58
    /sources/gui/qml/components/ProgressBar.qml
    • -0
    • +46
    /sources/gui/qml/components/ProgressRect.qml
    • -1
    • +3
    /sources/gui/qml/globals/Variables.qml
    • -1
    • +7
    /sources/gui/qml/pages/TreatmentStart.qml
DEN-1927 : Implementation (2 of 4)

- Fixed the Dialysate Flow issue

    • -1
    • +1
    /sources/canbus/messageinterpreter.cpp
    • -1
    • +1
    /sources/gui/qml/pages/SettingsHome.qml