pages

Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge master into Logging (#1 successful build and run)

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

    • -10
    • +11
    ./treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml
    • -10
    • +11
    ./treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml
    • -10
    • +11
    ./treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml
    • -10
    • +11
    ./treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml
    • -10
    • +11
    ./treatment/sections/TreatmentFlows.qml
    • -10
    • +11
    ./treatment/sections/TreatmentUltrafiltration.qml
    • -10
    • +11
    ./treatment/sections/TreatmentVitals.qml
  1. … 61 more files in changeset.
4246: Merge Newly added Squish API Messages into Dial-In

- Has not been merged yet but preparing for.

  1. … 14 more files in changeset.
SRSUI 669: Current Duration

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

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

  1. … 31 more files in changeset.
Added infusion solution bolus to create treatment, selection capability of touchrect, fixed scroll bar.

    • -64
    • +132
    ./treatment/TreatmentCreate.qml
  1. … 4 more files in changeset.
Merge master into Create Treatment branch

    • -21
    • +139
    ./treatment/TreatmentStack.qml
  1. … 4 more files in changeset.
Updated the Copyright with the current year and replaced tabs with 4 spaces

    • -10
    • +11
    ./treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml
    • -10
    • +11
    ./treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml
    • -10
    • +11
    ./treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml
  1. … 184 more files in changeset.
Updated Create Treatment page

  1. … 4 more files in changeset.
Ensuring slider updates selected flow rate.

DEN-3874 : HW Support [Per Peman's Email]

- Unified All the Data messages to use the newly created parent model MAbstract.

- Cleaned up the logging class.

- Removed log_once macros.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

  1. … 31 more files in changeset.
DEN-3874 : HW Support [Per Peman's Email]

- Another try to make the code more clean.

- Qml doesn't accept enums with first letter non-capital [id => ID_]

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

  1. … 31 more files in changeset.
DEN-3874 : HW Support [Per Peman's Email]

- Just to keep the code. Needs clean up.

- Don't forget Logs (DG, HD is different)

- So many more.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

  1. … 140 more files in changeset.
Fixed MouseArea z order, removed unused sound item

  1. … 1 more file in changeset.
DEN-3880 : Implementation

- Added Alarm Triggered Model

- Added Alarm Cleared Model

- Added Treatment State Model

- "UI," as Event Source to the Initialized and Some Other Event Messages for better logging

- Updated Ack messages and made them nicer for logging.

- Added DGCheckIn as a message to be logged.

- Stored Unit texts as a read only property in Variables qml file which had multiple definition multiple places.

- Changed the toString of models to use comma instead of parenthesis to be easily used in Excel as a CSV file format.

- Found a bug in TreatmentAdjustmentUltrafiltrationConfirm Screen slot which had volume defined as int that actually is a float value and causes the float to be truncated also the volume should be traslated int the VTreatmentAdjustmentUltrafiltratinConfirm to mL from Liter. Although HD wasn't using that value and was not complaining about it.

- Changed the current pew-set Volume value in the TreatmentAdjustmentUltrafiltrationEdit screen to be the current max value which is actually going to be changed by user.

- Changed to use the reference Volume to be used as the current collected volume in the Ultrafiltration section of the main treatment screen and the other Ultrafiltration adjustment screen that using it (Start. Paused, Edit).

- Added toString to the request models to be used for logging.

- Refactored the Message Interpreter response methods to be unique like the other improved latest methods (get<Method>s removed) [Reordered, Document cleanup, and so].

- Updated the manual in the MModel header for creating a model in regards to refactoring above.

- Updated Response Models in regards to the refactoring above.

- Made each byte space separator in Flags class in Types class for cleaner logging (will be used empty string in Alarm Status for logging).

- Changed the logging folder to be log folder (not event, error) and changed the log file extension for events/data to be .log and for errors to be .err.

- log file format modified to be CSV.

- Removed a not used fromByteArrayState method of mtreatmentadjustmentultrafiltrationconfirmresponse , mtreatmentadjustmentultrafiltrationeditresponse.

________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -10
    • +6
    ./treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml
    • -5
    • +5
    ./treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml
    • -4
    • +2
    ./treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml
    • -4
    • +2
    ./treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml
    • -3
    • +2
    ./treatment/sections/TreatmentFlows.qml
    • -2
    • +2
    ./treatment/sections/TreatmentVitals.qml
  1. … 55 more files in changeset.
Updates to support unit testing

  1. … 9 more files in changeset.
Merged master into UI Alarms.

  1. … 23 more files in changeset.
Removed unused import, renamed pressed to click

  1. … 2 more files in changeset.
DEN-3157 : Code Coverage

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

  1. … 13 more files in changeset.
DEN-3156 Integration Testing

- 90.849% (1916/2109)

________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

  1. … 4 more files in changeset.
DEN-3155 : Unit Testing

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -1
    • +1
    ./treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml
  1. … 2 more files in changeset.
DEN-3155 : Unit Testing

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -4
    • +6
    ./treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml
    • -1
    • +2
    ./treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml
    • -0
    • +1
    ./treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml
    • -0
    • +2
    ./treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml
  1. … 8 more files in changeset.
DEN-3158 : Code Review 0

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

  1. … 1 more file in changeset.
DEN-3628 : EMC Test Support

- Adding Temperature sensors values on the settings diagnostic page.

- Applied Code Review comments.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

  1. … 23 more files in changeset.
DEN-3628 : EMC Test Support

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -3
    • +0
    ./treatment/sections/TreatmentPressure.qml
  1. … 14 more files in changeset.
Added create custom treatment foundation

  1. … 2 more files in changeset.
Raising alarm when HD communication times out Added Settings base page with Sound and Diagnostic pages. Alarm design updates

    • -0
    • +175
    ./Diagnostics.qml
  1. … 21 more files in changeset.
DEN-3149 : Treatment Ultrafiltration Adjustment

- Updated regarding the demo notes

- Fixed some codes to pass the existing unit tests (other than Ultrafiltration which have to work on it anyway (it's regarding mL=>L))

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -2
    • +2
    ./treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml
DEN-3149 : Treatment Ultrafiltration Adjustment

- The third Code Review by myself

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

  1. … 21 more files in changeset.
DEN-3149 : Treatment Ultrafiltration Adjustment

- The first my myself.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -6
    • +7
    ./treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml
    • -4
    • +6
    ./treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml
    • -4
    • +6
    ./treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml
    • -1
    • +4
    ./treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml
    • -18
    • +0
    ./treatment/sections/TreatmentFluid.qml
    • -11
    • +8
    ./treatment/sections/TreatmentPressure.qml
  1. … 21 more files in changeset.