application

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-3883: Coverage

- DGCheckIn message

    • -0
    • +2
    /sources/canbus/messageinterpreter.cpp
DEN-3883: Coverage

    • -20
    • +14
    /sources/canbus/messageinterpreter.cpp
    • -0
    • +1
    /sources/gui/qml/pages/SettingsHome.qml
    • -65
    • +67
    /sources/model/hd/alarm/MAlarmStatusData.cpp
    • -2
    • +9
    /sources/model/hd/alarm/MAlarmStatusData.h
Added handling of treatment parameter FW response

    • -32
    • +12
    /sources/view/VCreateTreatment.cpp
DEN-3883: Coverage

DEN-4246: Merge Newly added Squish API Messages into Dial-In

- made some logs more readable.

    • -1
    • +1
    /sources/canbus/messageinterpreter.cpp
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.

    • binary
    /resources/images/alarm.png
    • binary
    /resources/images/bell-off.png
    • binary
    /resources/images/bell.png
    • -0
    • +27
    /sources/canbus/messageinterpreter.cpp
  1. … 31 more files in changeset.
DEN-4246: Merge Newly added Squish API Messages into Dial-In

DEN-4246: Merge Newly added Squish API Messages into Dial-In

    • -63
    • +60
    /sources/canbus/messageinterpreter.cpp
Merge master into Logging (#1 successful build and run)

    • -5
    • +4
    /sources/canbus/messageinterpreter.cpp
    • -3
    • +56
    /sources/gui/qml/pages/SettingsHome.qml
    • -0
    • +76
    /sources/model/hd/alarm/MAlarmStatusData.cpp
    • -2
    • +4
    /sources/model/hd/alarm/MAlarmStatusData.h
Resolve the merge conflicts of master into logging (#1 pass)

- This the first pass of the merging otherwise the code cannot be merged and committed.

- Next need to look at the code completely and see what has been merged and resolved automatically by git.

    • -12
    • +25
    /sources/applicationcontroller.cpp
    • -14
    • +21
    /sources/applicationcontroller.h
    • -13
    • +14
    /sources/canbus/caninterface.cpp
    • -9
    • +10
    /sources/canbus/messageacknowmodel.cpp
    • -9
    • +10
    /sources/canbus/messageacknowmodel.h
    • -12
    • +13
    /sources/canbus/messagedispatcher.cpp
    • -9
    • +18
    /sources/canbus/messagedispatcher.h
  1. … 57 more files in changeset.
4246: Merge Newly added Squish API Messages into Dial-In

- Has not been merged yet but preparing for.

    • -9
    • +9
    /sources/gui/qml/pages/ManagerHome.qml
    • -1
    • +2
    /sources/gui/qml/pages/SettingsHome.qml
    • -0
    • +9
    /sources/model/hd/data/MTreatmentFlowsData.h
    • -0
    • +6
    /sources/model/hd/data/MTreatmentTimeData.h
    • -0
    • +2
    /sources/view/dg/data/VDGValvesStatesData.h
Fixing the Project Folder

3883: Coverage

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -2
    • +2
    /sources/canbus/messageinterpreter.cpp
DEN-3881: Unit Testing

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -32
    • +24
    /sources/canbus/messageinterpreter.cpp
SRSUI 669: Current Duration

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

DEN-4002: Implementation 2 [SRSUI 476: Log files rotation]

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -6
    • +9
    /sources/canbus/messageinterpreter.cpp
DEN-4002: Implementation 2 [SRSUI 476: Log files rotation]

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

DEN-4002: Implementation 2 [SRSUI 476: Log files rotation]

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -2
    • +5
    /sources/canbus/messageinterpreter.cpp
DEN-4002: Implementation 2 [SRSUI 476: Log files rotation]

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -1
    • +1
    /sources/canbus/messageacknowmodel.cpp
    • -7
    • +24
    /sources/canbus/messageinterpreter.cpp
    • -3
    • +5
    /sources/model/dg/data/MDGDrainPumpData.h
    • -3
    • +5
    /sources/model/dg/data/MDGHeatersData.h
  1. … 33 more files in changeset.
DEN-4002: Implementation 2 [SRSUI 476: Log files rotation]

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

DEN-4002 : Implementation 2

- Improvements of log text and so .

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -38
    • +32
    /sources/canbus/messageinterpreter.cpp
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

    • -36
    • +42
    /sources/canbus/messageglobals.h
    • -60
    • +37
    /sources/canbus/messageinterpreter.cpp
    • -2
    • +27
    /sources/gui/qml/pages/SettingsHome.qml
    • -0
    • +35
    /sources/model/MDGDebugText.cpp
  1. … 17 more files in changeset.
Improved readability of main.h

Added infusion solution bolus to create treatment, selection capability of touchrect, fixed scroll bar.

    • -0
    • +18
    /sources/gui/qml/components/TouchRect.qml
    • -1
    • +0
    /sources/gui/qml/globals/Variables.qml
Merge master into Create Treatment branch

    • -10
    • +25
    /sources/gui/qml/globals/Fonts.qml
    • -12
    • +38
    /sources/gui/qml/globals/Variables.qml
    • -21
    • +139
    /sources/gui/qml/pages/treatment/TreatmentStack.qml
Updated the Copyright with the current year and replaced tabs with 4 spaces

    • -10
    • +11
    /sources/applicationcontroller.cpp
    • -10
    • +11
    /sources/applicationcontroller.h
    • -13
    • +14
    /sources/canbus/caninterface.cpp
    • -9
    • +10
    /sources/canbus/messageacknowmodel.cpp
  1. … 184 more files in changeset.
Put back missing period for Alarm Not Recognized in tst_models.cpp

Updated Create Treatment page

    • -0
    • +70
    /sources/gui/qml/components/SliderCreateTreatment.qml
    • -0
    • +2
    /sources/gui/qml/globals/Variables.qml
Ensuring slider updates selected flow rate.

Updated alarm status messages and added newlines for long messages.