sources

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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
    ./gui/qml/components/Circle.qml
    • -13
    • +4
    ./gui/qml/components/ModalDialog.qml
    • -0
    • +43
    ./gui/qml/components/ProgressCircle.qml
    • -0
    • +83
    ./gui/qml/components/TimeText.qml
    • -2
    • +3
    ./gui/qml/pages/treatment/TreatmentStart.qml
    • -77
    • +18
    ./gui/qml/pages/treatment/sections/TreatmentTime.qml
  1. … 2 more files in changeset.
DEN-1927 : Implementation (2 of 4)

- TreatmentTime click event fixed

- Clean up

    • -26
    • +13
    ./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 .

    • -52
    • +14
    ./gui/qml/pages/treatment/TreatmentStart.qml
    • -0
    • +148
    ./gui/qml/pages/treatment/sections/TreatmentTime.qml
  1. … 2 more files in changeset.
DEN-1927 : Implementation (2 of 4)

- The first implementation of the Circular ProgressCircle

    • -1
    • +52
    ./gui/qml/pages/treatment/TreatmentStart.qml
DEN-1927 : Implementation (2 of 4)

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

    • -42
    • +0
    ./gui/qml/pages/TreatmentCreate.qml
    • -366
    • +0
    ./gui/qml/pages/TreatmentStart (test).qml
    • -323
    • +0
    ./gui/qml/pages/TreatmentStart.qml
    • -0
    • +42
    ./gui/qml/pages/treatment/TreatmentCreate.qml
    • -0
    • +77
    ./gui/qml/pages/treatment/TreatmentHome.qml
    • -0
    • +46
    ./gui/qml/pages/treatment/TreatmentStack.qml
    • -0
    • +105
    ./gui/qml/pages/treatment/TreatmentStart.qml
    • -0
    • +50
    ./gui/qml/pages/treatment/sections/TreatmentFlows.qml
    • -0
    • +50
    ./gui/qml/pages/treatment/sections/TreatmentFluid.qml
    • -0
    • +89
    ./gui/qml/pages/treatment/sections/TreatmentInfusion.qml
    • -0
    • +102
    ./gui/qml/pages/treatment/sections/TreatmentPressure.qml
    • -0
    • +53
    ./gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml
    • -0
    • +56
    ./gui/qml/pages/treatment/sections/TreatmentVitals.qml
  1. … 1 more file in changeset.
DEN-1927 : Implementation (2 of 4)

- Added Solution Infusion progressBar.

    • -11
    • +86
    ./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
    ./canbus/messageinterpreter.cpp
    • -11
    • +11
    ./gui/qml/components/ProgressBar.qml
    • -72
    • +0
    ./gui/qml/components/ProgressMarker.qml
    • -0
    • +95
    ./gui/qml/components/RangeBar.qml
    • -0
    • +78
    ./gui/qml/components/RangeMarker.qml
    • -34
    • +118
    ./gui/qml/pages/SettingsHome.qml
  1. … 1 more file in changeset.
DEN-1927 : Implementation (2 of 4)

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

- Updated components accordingly.

    • -86
    • +21
    ./gui/qml/components/ProgressBar.qml
    • -0
    • +79
    ./gui/qml/components/RangeRect.qml
    • -16
    • +20
    ./gui/qml/pages/TreatmentStart.qml
  1. … 1 more file in changeset.
DEN-1927 : Implementation (2 of 4)

- Added ProgressRect.qml

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

    • -47
    • +58
    ./gui/qml/components/ProgressBar.qml
    • -12
    • +16
    ./gui/qml/components/ProgressMarker.qml
    • -0
    • +46
    ./gui/qml/components/ProgressRect.qml
  1. … 1 more file in changeset.
DEN-1927 : Implementation (2 of 4)

- Fixed the Dialysate Flow issue

DEN-1927 : Implementation (2 of 4)

- the ProgressBar has been implemented (for UltraFiltration)

    • -0
    • +129
    ./gui/qml/components/ProgressBar.qml
    • -0
    • +68
    ./gui/qml/components/ProgressMarker.qml
  1. … 1 more file in changeset.
DEN-1714 : Implementation

- Updated the GuiAlarmID_Enum with FW new enums.

- Didn't aligned them since very soon in this sprint we are going to use a common repository.

DEN-1714 : Implementation

- Filled the comment in regards to Code Review comment.

DEN-1714 : Implementation

- Added cppcheck output.

- Added Linux signal handler to quit the application gracefully.

- Added manual coco validation. // coco begin validated:

  1. … 13 more files in changeset.
DEN-1714 : Implementation

- Fixed the CanBus unit tests by the new sequence number added to the messages.

- Removed none implemented classes because it was coming always as the low coverage.

  1. … 3 more files in changeset.
DEN-1714 : Implementation

- Added missing documentation

- Disabled the Acknow message debugging.

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

    • -0
    • +146
    ./canbus/messageacknowmodel.cpp
    • -0
    • +125
    ./canbus/messageacknowmodel.h
  1. … 2 more files in changeset.
DEN-1714 : Implementation

Merge branch 'master' into DEN-1710_Ack_Back

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

  1. … 16 more files in changeset.
Updated the Copyright with the current year and replaced tabs with 4 spaces

Merge branch 'master' into DEN-1396_LogHandler

  1. … 22 more files in changeset.
DEN-1714 : Implementation

  1. … 6 more files in changeset.
http://dvm-linux02:8060/cru/UI-DEN-1396-1#c919

- Added classes details description.

- Added another define while I was adding description, I found out it's better to have another define so all the interface required would be as defines.

Revision 56d00a8, line 98

- Added space between functions.

DEN-1437 : Implementation

- Added console out coloring for Error logs to be able to debug easier.

DEN-1437 : Implementation

- Updated the Logo with the transparent version provided by K:D.

- Added darker version of the Logo d to be used on the Treatment screen top menu bar.

- Added Line Component to be used in the Treatment screen as section separator.

- Updated main menu component to have :

. Extra right most side item (Treatment settings button)

. Added drop up/down animation for the menu hide/show.

. Added a position feature to the component so it can be positioned on top of the screen or at the bottom of the screen.

- Added Orientation to the TouchArea Component.

- Moved USB, Export buttons into the Settings home screen.

- Moved LogoD object from main.qml to the TreatmentHome screen.

- Added the Treatment Top Menu Bar in the Treatment Stack screen.

- Improved the TextRect component.

    • -0
    • +29
    ./gui/qml/components/Background.qml
    • -29
    • +0
    ./gui/qml/components/BackgroundRect.qml
    • -0
    • +37
    ./gui/qml/components/Line.qml
    • -10
    • +78
    ./gui/qml/components/MainMenu.qml
    • -16
    • +25
    ./gui/qml/components/TouchArea.qml
    • -40
    • +127
    ./gui/qml/pages/TreatmentStart.qml
  1. … 3 more files in changeset.
DEN-1437 : Implementation

- Changed 2019-2019 in copyright to 2019-2020.

  1. … 45 more files in changeset.
DEN-1437 : Implementation

- TextRect : is actually a rectangle with title/ lable / extra lable whcih is going to be used in the Treatment screen (Blood/Dialysate Flows).

- TextArea : is a contaoner Rectangle with title. which is used in Treatment an contains TextTecs(s).

- BackgroundRect : is a simple rectangle which is used for a background rect to have colors and borders.

- Added required common constant values for Colors and Fonts and Values.

    • -0
    • +29
    ./gui/qml/components/BackgroundRect.qml
    • -0
    • +81
    ./gui/qml/components/TextRect.qml
    • -0
    • +81
    ./gui/qml/components/TouchArea.qml
    • -0
    • +366
    ./gui/qml/pages/TreatmentStart (test).qml
    • -293
    • +22
    ./gui/qml/pages/TreatmentStart.qml
  1. … 2 more files in changeset.
Updated the Copyright with the current year and replaced tabs with 4 spaces

  1. … 1 more file in changeset.