application

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
DEN-2087 : UI Blood/Dialysate Flow Rate Adjustment

- Code Optimization

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

DEN-2087 : UI Blood/Dialysate Flow Rate Adjustment

- As an example of adding a view in the Application, Pressure/Occlusion data has been added.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -0
    • +28
    /sources/view/vtreatmentpressureocclusion.cpp
    • -0
    • +39
    /sources/view/vtreatmentpressureocclusion.h
DEN-2087 : UI Blood/Dialysate Flow Rate Adjustment

- Some Code Clean up

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -2
    • +2
    /sources/canbus/messageinterpreter.cpp
    • -17
    • +18
    /sources/canbus/messageinterpreter.h
    • -0
    • +1
    /sources/gui/qml/globals/Variables.qml
    • -1
    • +1
    /sources/view/vtreatmentdialysateflow.h
    • -1
    • +1
    /sources/view/vtreatmentultrafiltration.h
DEN-2087 : UI Blood/Dialysate Flow Rate Adjustment

- An Example of adding a model into the Application (Adding a Denali Message (Model)).

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -2
    • +32
    /sources/canbus/messageinterpreter.cpp
    • -0
    • +52
    /sources/model/mtreatmentpressureocclusion.cpp
    • -0
    • +56
    /sources/model/mtreatmentpressureocclusion.h
No longer need to delete the latex directory since I disabled doxygen from generating latex files in the Doxyfile, added pro.user files to .gitignore

Added script to generate documentation with doxygen.

DEN-2087_BloodDialysateFlowAdjustment

- Added TreatmentAdjustmentBase as the base screen for all the Treatment Adjustment screens.

- Removing unnecessary imports

- Added TickMarks component for Slider (ranges).

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -1
    • +0
    /sources/gui/qml/components/BackButton.qml
    • -1
    • +0
    /sources/gui/qml/components/Circle.qml
    • -1
    • +0
    /sources/gui/qml/components/MainMenu.qml
    • -3
    • +1
    /sources/gui/qml/components/ModalDialog.qml
    • -1
    • +0
    /sources/gui/qml/components/ProgressRect.qml
    • -1
    • +0
    /sources/gui/qml/components/RangeBar.qml
    • -1
    • +0
    /sources/gui/qml/components/RangeMarker.qml
    • -1
    • +0
    /sources/gui/qml/components/ScreenItem.qml
    • -15
    • +24
    /sources/gui/qml/components/Slider.qml
    • -2
    • +2
    /sources/gui/qml/components/StackItem.qml
    • -1
    • +0
    /sources/gui/qml/components/TextRect.qml
  1. … 27 more files in changeset.
DEN-2087_BloodDialysateFlowAdjustment

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • binary
    /resources/images/Close.png
    • -0
    • +46
    /sources/gui/qml/components/CloseButton.qml
    • -0
    • +38
    /sources/gui/qml/components/ConfirmButton.qml
    • -2
    • +3
    /sources/gui/qml/components/ModalDialog.qml
    • -0
    • +74
    /sources/gui/qml/components/ModelessDialog.qml.WIP
    • -23
    • +19
    /sources/gui/qml/components/ProgressBar.qml
    • -0
    • +48
    /sources/gui/qml/components/ProgressBarEx.qml
    • -3
    • +9
    /sources/gui/qml/components/ProgressRect.qml
    • -5
    • +15
    /sources/gui/qml/components/RangeRect.qml
    • -0
    • +114
    /sources/gui/qml/components/Slider.qml
    • -1
    • +3
    /sources/gui/qml/components/TouchRect.qml
  1. … 12 more files in changeset.
Merge branch 'DEN-1434_InTreatment'

Unit Tests and Debugging and scripts to update devices easier

- During the test figured out that since we have two kind of messages :

1 - data messages which will notify GUI only on variable change

2 - but also we have command messages which has to always notify the GUI

So added a parameter in PROPERTY definition to define the type of property.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -7
    • +7
    /sources/view/vtreatmentdialysateflow.h
    • -7
    • +7
    /sources/view/vtreatmentultrafiltration.h
Logger unit test fixed.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

Code Review Comments

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -2
    • +6
    /sources/canbus/messageinterpreter.cpp
Code Review Comments

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -0
    • +6
    /sources/canbus/messageinterpreter.cpp
Code Review Comments

- Dara also mentioned I need to have copyright at the beginning of the scripts.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -0
    • +11
    /sources/canbus/messageinterpreter.cpp
DEN-2088 : Implementation

- Redesigned the model.cpp/h file

- Made View registration in one place and easier.

- Added views definition in main.qml (not all of them belong here and should be revised when debug screen (SettingHome) removed.)

- Added PowerOff Model

- Added PowerOff View

- Modified MessageInterpreter to apply the new PowerOff MV

- Added TreatmentFlows Model

- Added TreatmentOutletFlow Model

- Added TreatmentTime Model

- Improved TreatmentTime View

- Improved Types

- Added AlarmStatus Model

- Improved AlarmStatus View to be modified easier

- Improved TreatmentUltrafiltration View

- Added vview.h to be able to maintain view classes easier.

- Separated BloodFlow and DialysateFlow

- Updated Debug Screen (SettingHome) with the new views of the BloodFlow and DialysateFlow Views

- Updated TreatmentFlows section with the new views of the BloodFlow and DialysateFlow

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -35
    • +51
    /sources/canbus/messageinterpreter.cpp
    • -22
    • +18
    /sources/canbus/messageinterpreter.h
    • -19
    • +19
    /sources/gui/qml/pages/SettingsHome.qml
    • -54
    • +0
    /sources/gui/view/vtreatmentflows.cpp
    • -59
    • +0
    /sources/gui/view/vtreatmentflows.h
    • -38
    • +0
    /sources/gui/view/vtreatmenttime.cpp
  1. … 30 more files in changeset.
Another CAN Messaging format for testing

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -17
    • +80
    /sources/applicationcontroller.cpp
    • -0
    • +1
    /sources/canbus/messageinterpreter.cpp
DEN-2088 Implementation

- Added OutletFlow

- Added TreatmentTime

- Added AlarmStatus

- Made adding model view simpler

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -133
    • +35
    /sources/canbus/messageinterpreter.cpp
    • -15
    • +7
    /sources/canbus/messageinterpreter.h
    • -8
    • +5
    /sources/gui/qml/components/ModalDialog.qml
  1. … 16 more files in changeset.
DEN-2088 : Implementation (3 of 4)

- Bloodflow , DialysateFlow models implemented and proper changes has been made

- Alerts, Dialysate out needs to be modified

- Pressure / Occlusion Data needs to be implemented.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -139
    • +52
    /sources/canbus/messageinterpreter.cpp
    • -130
    • +35
    /sources/gui/qml/pages/SettingsHome.qml
  1. … 5 more files in changeset.
Merge branch 'DEN-2086_DenaliCommunication' into DEN-1434_InTreatment

Merge branch 'DEN-1971_UIPowerOffTiming' into DEN-2086_DenaliCommunication

Regarding the Peter's code review comment

http://dvm-linux02:8060/cru/DEN-UI-2086-1#CFR-11853

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

DEN-2091 : CAN / Denali Communication Protocol [Modify Design]

Added the command line arguments help as a document in the code.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

DEN-2091 : CAN / Denali Communication Protocol [Modify Design]

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -17
    • +23
    /sources/canbus/caninterface.cpp
    • -14
    • +98
    /sources/canbus/frameinterface.cpp
    • -2
    • +5
    /sources/canbus/messageinterpreter.cpp
    • -1
    • +0
    /sources/gui/qml/components/ModalDialog.qml
  1. … 3 more files in changeset.
DEN-UI-1971 : Peman's comments

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -2
    • +1
    /sources/canbus/messageinterpreter.cpp
    • -1
    • +0
    /sources/gui/qml/components/ModalDialog.qml
DEN-1974 : Unit Testing / DEN-1975 : Integration Testing

- Modified application to be more testable for unit/integration tests.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -1
    • +5
    /sources/gui/qml/components/MainMenu.qml
DEN-1973 : Implementation

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -4
    • +19
    /sources/canbus/messageinterpreter.cpp
    • -0
    • +6
    /sources/gui/qml/dialogs/AutoHideInfo.qml
Final CleanUp of the Test

- to be able to use it as a reference to make it officially as part of the main code.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -40
    • +38
    /sources/canbus/frameinterface.cpp
Keep this test fro further reference

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

DEN-1973 : Implementation

- Added fadeout feature to the modaldialog

- Added a AutoHideInfo dialog

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

    • -0
    • +23
    /sources/gui/qml/components/ModalDialog.qml
    • -0
    • +39
    /sources/gui/qml/dialogs/AutoHideInfo.qml
Last commit to close the testing

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com