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

  1. … 34 more files in changeset.
Bamboo Commit: Updated the Copyright with the current year and replaced tabs with 4 spaces

  1. … 242 more files in changeset.
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

    • -4
    • +2
    ./hd/adjustment/MTreatmentAdjustRequests.h
  1. … 77 more files in changeset.
DEN-3605: Made requested changes from code review

  1. … 16 more files in changeset.
DEN-4690: Doxygenization

- Fixed a code typo

  1. … 3 more files in changeset.
DEN-4690: Doxygenization

- Doxygenization

- File Names Camel Case

- Spell Checks

  1. … 197 more files in changeset.
DEN-4445: Code Review 0

  1. … 7 more files in changeset.
DEN-4445: Code Review 0

  1. … 4 more files in changeset.
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.

  1. … 10 more files in changeset.
DEN-3884: Code Review 0

- fixed typos

    • -3
    • +3
    ./hd/adjustment/MTreatmentAdjustRequests.h
  1. … 20 more files in changeset.
Fixed treatment parameter signals, improved code documentation, interpretMessage formatting adjustments.

  1. … 5 more files in changeset.
Updated unit tests, fixed arterial and venous conversions to signed int.

  1. … 7 more files in changeset.
Updated unit tests. Fixed treatment parameter length check and made arterial and venous ints signed instead of unsigned.

  1. … 5 more files in changeset.
Moved == operator to uni ttests & updated views unit test. Added CreateTreatmentReq case to interpretMessage

  1. … 2 more files in changeset.
Updated unit tests, improved code testability

  1. … 4 more files in changeset.
DEN-4441: Implementation/Ultrafiltration

- Also did the :

- DEN-4442: Unit Testing

- DEN-4443: Integration Testing

- DEN-4444: Code Coverage

    • -1
    • +3
    ./hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.h
  1. … 30 more files in changeset.
DEN-4441: Implementation

- removed extra E in log as a work around the issue with the adjustment models which have not yet inherited from MAbstract.

- in the section notification if the image is empty then assign the image place to the text to be align at the left most of the section.

- added a reason text by default in the response base class.

  1. … 2 more files in changeset.
DEN-4441: Implementation

- added functionalities.

- Qml

- Views

- ...

  1. … 20 more files in changeset.
DEN-4441: Implementation

- Added required Models for 3 messages: req, res, data.

    • -3
    • +22
    ./hd/adjustment/MTreatmentAdjustRequests.h
    • -0
    • +44
    ./hd/adjustment/MTreatmentAdjustSalineResponse.cpp
    • -0
    • +61
    ./hd/adjustment/MTreatmentAdjustSalineResponse.h
    • -0
    • +43
    ./hd/data/MTreatmentSalineData.cpp
    • -0
    • +63
    ./hd/data/MTreatmentSalineData.h
  1. … 1 more file in changeset.
Merge with Logging2of3

  1. … 24 more files in changeset.
DEN-3883: Coverage

  1. … 13 more files in changeset.
Squashed commit of the following:

commit 5331f4838ac4d591fd26120f471f89c226863734

Author: Peter Lucia <plucia@diality.com>

Date: Thu Jul 30 12:52:48 2020 -0700

Began adding qml slots for when validation fails

commit 63c55a131a04f17a9306ff25988e686b1edbbc2a

Author: Peter Lucia <plucia@diality.com>

Date: Thu Jul 30 12:22:58 2020 -0700

Parsing FW validation response

commit b17f0bfe38526a16e02e7e5bcf295939e24fd659

Author: Peter Lucia <plucia@diality.com>

Date: Thu Jul 30 10:05:05 2020 -0700

Handling create treatment response message

commit a57d0fe761842df3e29136d78194b1d5b3ba18af

Author: Peter Lucia <plucia@diality.com>

Date: Wed Jul 29 13:22:44 2020 -0700

Fixed resetting of treatment parameters.

commit aab29013cf0691a7f61e4f531400f4943c6d3bf8

Author: Peter Lucia <plucia@diality.com>

Date: Wed Jul 29 11:24:10 2020 -0700

Improved UI side parameter selection validation.

commit edb0f66f1bc9c954ff1f51f375b0bdfd8b125859

Author: Peter Lucia <plucia@diality.com>

Date: Tue Jul 28 15:44:11 2020 -0700

Improved default parameter inactive / active colors

commit f2677a919a885333c8e34f8340593fbabc56f823

Author: Peter Lucia <plucia@diality.com>

Date: Tue Jul 28 15:11:38 2020 -0700

Ensuring treatment parameters indicate when they are adjusted or unset.

commit 5e83584957eab076c2ebe7d546362a461bbfbaa8

Author: Peter Lucia <plucia@diality.com>

Date: Tue Jul 28 09:55:23 2020 -0700

Added arterial and venous pressure limits

commit a1b67a61af501334847c8514360cf82348e2c65c

Author: Peter Lucia <plucia@diality.com>

Date: Mon Jul 27 17:56:55 2020 -0700

Using VCreateTreatment cpp / h class to determine new treatment ranges

commit 738cb12bc9b4400ab815b17c43228ad5e532db33

Author: Peter Lucia <plucia@diality.com>

Date: Mon Jul 27 15:43:56 2020 -0700

Loading create treatment ranges from the file system

Added macro to convert variable name to string

Added debug | release #define

commit fbc9f08ea3163b617bda7f393bf3285b8b4e8d41

Author: Peter Lucia <plucia@diality.com>

Date: Wed Jul 22 16:54:55 2020 -0700

Cleanup old comments

commit edf1640d8e797ac1820d09d1de2ef78ed4713746

Author: Peter Lucia <plucia@diality.com>

Date: Wed Jul 22 16:35:32 2020 -0700

Moved save new treatment out of application controller

commit 191a70deefd31a614508a22a586dbd244ab67eed

Author: Peter Lucia <plucia@diality.com>

Date: Fri Jul 17 17:53:09 2020 -0700

In progress update for create treatment

commit f03e0bc116bafb36ac119d4c2d07bd57e20a5c33

Author: Peter Lucia <plucia@diality.com>

Date: Fri Jul 17 16:19:45 2020 -0700

In progress update for create treatment

commit 387a0099948bff42f2e49557f8136610c3443938

Author: Peter Lucia <plucia@diality.com>

Date: Fri Jul 17 14:53:08 2020 -0700

Saving newly created treatment to the log file

commit 28920a32fc6f8fe437c69364d3c8f059f16f7cc7

Author: Peter Lucia <plucia@diality.com>

Date: Fri Jul 17 14:49:15 2020 -0700

In progress update - application controller will save a newly created treatment to disk

commit 137d8d36144a143c7205b9c4620a88cc340670f4

Author: Peter Lucia <plucia@diality.com>

Date: Fri Jul 17 14:05:07 2020 -0700

In progress update of create treatment

commit f9131f48b9bd8580a93ca959540ce4ac97f228c3

Author: Peter Lucia <plucia@diality.com>

Date: Fri Jul 17 11:59:13 2020 -0700

In progress update for create treatment

commit 4b498f8f90ff7b2c8a057a3ef509bd86e1ea681c

Author: Peter Lucia <plucia@diality.com>

Date: Thu Jul 16 17:17:08 2020 -0700

Added cpp backend logic, top bar refinements.

    • -0
    • +4
    ./mtreatmentparameters.cpp
    • -0
    • +44
    ./mtreatmentparameters.h
    • -0
    • +148
    ./mtreatmentparametersresp.cpp
    • -0
    • +79
    ./mtreatmentparametersresp.h
  1. … 41 more files in changeset.
DEN-4246: Merge Newly added Squish API Messages into Dial-In

  1. … 8 more files in changeset.
Merge master into Logging (#1 successful build and run)

    • -0
    • +16
    ./hd/adjustment/MTreatmentAdjustRequests.h
  1. … 7 more files in changeset.
4246: Merge Newly added Squish API Messages into Dial-In

- Has not been merged yet but preparing for.

    • -6
    • +18
    ./hd/adjustment/MTreatmentAdjustRequests.h
    • -1
    • +6
    ./hd/data/MTreatmentPressureOcclusionData.h
  1. … 11 more files in changeset.
DEN-3881: Unit Testing

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -1
    • +1
    ./hd/adjustment/MTreatmentAdjustRequests.h
  1. … 5 more files in changeset.
DEN-4002: Implementation 2 [SRSUI 476: Log files rotation]

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -3
    • +5
    ./hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.h
  1. … 33 more files in changeset.
DEN-4002 : Implementation 2

- Improvements of log text and so .

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -6
    • +22
    ./hd/adjustment/MTreatmentAdjustRequests.h
    • -1
    • +1
    ./hd/adjustment/MTreatmentAdjustUltrafiltrationConfirmResponse.h
    • -1
    • +1
    ./hd/adjustment/MTreatmentAdjustUltrafiltrationEditResponse.h
  1. … 5 more files in changeset.
FW Support for HD/DG Debug Text & HDOpMode.

- Added a newly added channel to the list of listened channels eChlid_DG_UI = 0x070

- The MessageBuilder::getActionId implementation has been improved.

- New Messages has been added and enum/length defined as well.

- Message interpreter code has been improved to be easily modifiable.

- Changed the message ID enum ID_PowerOffBroadcast to ID_ShuttingDown.

- Added HDOperationMode to the setting screen.

- Made the floating point rounding optional by a #define and disabled the rounding for now.

- Inherit the MPowerOff Model from MAbstract as a new design.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -3
    • +5
    ./hd/adjustment/MTreatmentAdjustRequests.h
    • -29
    • +11
    ./hd/data/MHDOperationModeData.cpp
    • -22
    • +17
    ./hd/data/MHDOperationModeData.h
  1. … 19 more files in changeset.
Updated the Copyright with the current year and replaced tabs with 4 spaces

    • -9
    • +10
    ./mtreatmentadjustblooddialysateresponse.cpp
    • -9
    • +10
    ./mtreatmentadjustblooddialysateresponse.h
    • -9
    • +10
    ./mtreatmentadjustdurationresponse.cpp
    • -9
    • +10
    ./mtreatmentadjustdurationresponse.h
    • -9
    • +10
    ./mtreatmentadjustultrafiltrationconfirmresponse.cpp
  1. … 184 more files in changeset.