application

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge master into DEN-3605_Create_Treatment. Fixed remaining merge conflicts

Merge master into DEN-3605_Create_Treatment

    • -10
    • +15
    /sources/canbus/messageglobals.h
    • -99
    • +108
    /sources/canbus/messageinterpreter.cpp
    • -3
    • +3
    /sources/gui/qml/components/Slider.qml
  1. … 20 more files in changeset.
Bamboo Commit: Updated the Copyright with the current year and replaced tabs with 4 spaces

    • -4
    • +4
    /sources/canbus/messageacknowmodel.cpp
  1. … 242 more files in changeset.
Merge branch 'DEN-4438_SalineBolus'

DEN-4690: Doxygenization

- Filename changed to Camel Case

- Diagrams updated

- Figured out how to set macro references in doxygen and updated the code dox

- Figured out how to draw diagrams in doxygen and updated the code dox

    • -16
    • +16
    /sources/canbus/FrameInterface.h
    • -1
    • +1
    /sources/canbus/MessageInterpreter.cpp
  1. … 69 more files in changeset.
DEN-3605: Continued addressing Peman's comments to remove newline characters

DEN-3605: Continued addressing Peman's comments to remove newline characters.

DEN-3605: Addressed code review comments

DEN-3605: Addressed code review comments

DEN-3605: Made requested changes from code review

    • -65
    • +36
    /sources/view/VCreateTreatment.cpp
DEN-4690: Doxygenization

- Fixed a code typo

DEN-4690: Doxygenization

- Doxygenization

- File Names Camel Case

- Spell Checks

    • -0
    • +426
    /sources/ApplicationController.cpp
    • -0
    • +106
    /sources/ApplicationController.h
    • -0
    • +38
    /sources/ApplicationPost.cpp
    • -0
    • +30
    /sources/ApplicationPost.h
    • -0
    • +125
    /sources/MainTimer.cpp
    • -0
    • +50
    /sources/MainTimer.h
    • -0
    • +97
    /sources/Threads.cpp
    • -0
    • +96
    /sources/abstract/singleton.h._
    • -426
    • +0
    /sources/applicationcontroller.cpp
    • -106
    • +0
    /sources/applicationcontroller.h
  1. … 197 more files in changeset.
DEN-4445: Code Review 0

DEN-4445: Code Review 0

EMC Support and SD-Card Notification

    • binary
    /resources/images/microsd.png
    • -5
    • +5
    /sources/gui/qml/pages/ManagerHome.qml
    • -15
    • +0
    /sources/gui/qml/pages/SettingsHome.qml
    • -14
    • +21
    /sources/storage/DriveWatcher.cpp
  1. … 3 more files in changeset.
DEN-4445: Code Review 0

    • -1
    • +0
    /sources/view/hd/data/VTreatmentSalineData.h
    • -1
    • +0
    /sources/view/vtreatmentadjustmentultrafiltrationconfirm.h
Merge branch 'EMC_Support_CombineDebugScreens' into DEN-4438_SalineBolus

EMC Support - Code Coverage / Integration Testing

EMC Support

    • -0
    • +55
    /sources/gui/qml/components/DebugDataColumn.qml
    • -271
    • +204
    /sources/gui/qml/pages/ManagerHome.qml
    • -184
    • +0
    /sources/gui/qml/pages/SettingsHome.qml
    • -0
    • +135
    /sources/view/VEventSpy.cpp
    • -0
    • +61
    /sources/view/VEventSpy.h
DEN-3884: Code Review 0

Merge branch 'DEN-3875_Logging_2of3' into DEN-4438_SalineBolus

- DEN-3884: Code Review 0 applied to on going Code Review of Saline Bolus as well.

    • -14
    • +19
    /sources/canbus/messageinterpreter.cpp
    • -1
    • +1
    /sources/view/vtreatmentadjustmentresponsebase.h
    • -3
    • +3
    /sources/view/vtreatmentadjustmentultrafiltrationconfirm.h
DEN-3884: Code Review 0

- fixed typos

    • -133
    • +133
    /sources/canbus/caninterface.h
  1. … 13 more files in changeset.
DEN-3884: Code Review 0

    • -421
    • +421
    /sources/canbus/caninterface.cpp
    • -16
    • +16
    /sources/canbus/messageinterpreter.cpp
    • -15
    • +3
    /sources/gui/qml/pages/ManagerHome.qml
    • -4
    • +4
    /sources/view/vtreatmentadjustmentultrafiltrationconfirm.h
  1. … 7 more files in changeset.
DEN-4443: Integration Testing

- Demo feedback was ok with disabling the Treatment Time as well so I add that too.

Fixed treatment parameter signals, improved code documentation, interpretMessage formatting adjustments.

    • -62
    • +70
    /sources/canbus/messageinterpreter.cpp
Improved unit test coverage, added filepath parameter to saveNewTreatment

Updated unit tests, fixed arterial and venous conversions to signed int.

    • -4
    • +4
    /sources/model/mtreatmentparameters.cpp
Added unit test for treatment parameters response data's fromVariantList

Fixed treatment parameter data lengths and error indices

Updated unit tests. Fixed treatment parameter length check and made arterial and venous ints signed instead of unsigned.

    • -2
    • +3
    /sources/model/mtreatmentparameters.cpp