Fisheye on application/sources/view/vtreatmentbloodflow.h

application (bugfix/DEN-16597-UI-BN-S114): Bamboo Commit: Updated the Copyright with the current year and replaced tabs with 4 spaces

Dara Navaei — Mon, 31 Aug 2020 14:05:55 -0700

Dara Navaei committed 56e378f on branch master, 2020_EOY_DEMO and 253 more in application

Bamboo Commit: Updated the Copyright with the current year and replaced tabs with 4 spaces

· /main.cpp

(-2, +2)

| History

| Source

| Diff

· /scripts/autostart

(-9, +12)

| History

| Source

| Diff

· /scripts/copy.sh

(-1, +1)

| History

| Source

| Diff

· /scripts/run.sh

(-3, +3)

| History

| Source

| Diff

· /scripts/setup.sh

(-1, +1)

| History

| Source

| Diff

· /sources/abstract/singleton.h

(-3, +3)

| History

| Source

| Diff

· /sources/applicationcontroller.cpp

(-2, +2)

| History

| Source

| Diff

· /sources/applicationcontroller.h

(-2, +2)

| History

| Source

| Diff

· /sources/applicationpost.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/applicationpost.h

(-3, +3)

| History

| Source

| Diff

· /sources/canbus/caninterface.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/caninterface.h

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/frameinterface.cpp

(-2, +2)

| History

| Source

| Diff

· /sources/canbus/frameinterface.h

(-3, +3)

| History

| Source

| Diff

· /sources/canbus/messageacknowmodel.cpp

(-4, +4)

| History

| Source

| Diff

… 242 more files in changeset.

application (bugfix/DEN-16597-UI-BN-S114): Resolve the merge conflicts of master into logging (#1 pass)...

Behrouz NematiPour — Thu, 30 Jul 2020 02:08:31 -0700

Behrouz NematiPour committed d2035a8 on branch master, 2020_EOY_DEMO and 257 more in application

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.

· /denali.pro

(-1, +1)

| History

| Source

| Diff

· /denali.pro.user

(-55, +242)

| History

| Source

| Diff

· /main.cpp

(-10, +19)

| History

| Source

| Diff

· /sources/applicationcontroller.cpp

(-12, +25)

| History

| Source

| Diff

· /sources/applicationcontroller.h

(-14, +21)

| History

| Source

| Diff

· /sources/canbus/caninterface.cpp

(-13, +14)

| History

| Source

| Diff

· /sources/canbus/caninterface.h

(-13, +14)

| History

| Source

| Diff

· /sources/canbus/frameinterface.cpp

(-9, +10)

| History

| Source

| Diff

· /sources/canbus/messageacknowmodel.cpp

(-9, +10)

| History

| Source

| Diff

· /sources/canbus/messageacknowmodel.h

(-9, +10)

| History

| Source

| Diff

· /sources/canbus/messagebuilder.cpp

(-9, +10)

| History

| Source

| Diff

· /sources/canbus/messagebuilder.h

(-9, +10)

| History

| Source

| Diff

· /sources/canbus/messagedispatcher.cpp

(-12, +13)

| History

| Source

| Diff

· /sources/canbus/messagedispatcher.h

(-9, +18)

| History

| Source

| Diff

· /sources/canbus/messageglobals.h

(-9, +12)

| History

| Source

| Diff

… 57 more files in changeset.

application (bugfix/DEN-16597-UI-BN-S114): Updated the Copyright with the current year and replaced tabs with 4 spaces

Dara Navaei — Tue, 07 Jul 2020 12:22:46 -0700

Dara Navaei committed 44a85c9 on branch master, 2020_EOY_DEMO and 258 more in application

Updated the Copyright with the current year and replaced tabs with 4 spaces

· /cppcheck.sh

(-0, +15)

| History

| Source

| Diff

· /main.cpp

(-10, +11)

| History

| Source

| Diff

· /scripts/copy.sh

(-11, +13)

| History

| Source

| Diff

· /scripts/run.sh

(-12, +13)

| History

| Source

| Diff

· /scripts/setup.sh

(-10, +12)

| History

| Source

| Diff

· /sources/abstract/singleton.h

(-10, +11)

| History

| Source

| Diff

· /sources/applicationcontroller.cpp

(-10, +11)

| History

| Source

| Diff

· /sources/applicationcontroller.h

(-10, +11)

| History

| Source

| Diff

· /sources/applicationpost.cpp

(-10, +11)

| History

| Source

| Diff

· /sources/applicationpost.h

(-10, +11)

| History

| Source

| Diff

· /sources/canbus/caninterface.cpp

(-13, +14)

| History

| Source

| Diff

· /sources/canbus/caninterface.h

(-13, +14)

| History

| Source

| Diff

· /sources/canbus/frameinterface.cpp

(-9, +10)

| History

| Source

| Diff

· /sources/canbus/frameinterface.h

(-9, +10)

| History

| Source

| Diff

· /sources/canbus/messageacknowmodel.cpp

(-9, +10)

| History

| Source

| Diff

… 184 more files in changeset.

application (bugfix/DEN-16597-UI-BN-S114): DEN-3874 : HW Support [Per Peman's Email]...

Behrouz NematiPour — Thu, 02 Jul 2020 21:47:57 -0700

Behrouz NematiPour committed 6ae83fa on branch master, 2020_EOY_DEMO and 257 more in application

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

· /denali.pro

(-77, +145)

| History

| Source

| Diff

· /denali.pro.user

(-1, +1)

| History

| Source

| Diff

· /sources/applicationcontroller.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/applicationcontroller.h

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/messagebuilder.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/messagedispatcher.cpp

(-7, +7)

| History

| Source

| Diff

· /sources/canbus/messagedispatcher.h

(-5, +5)

| History

| Source

| Diff

· /sources/canbus/messageglobals.h

(-29, +40)

| History

| Source

| Diff

· /sources/canbus/messageinterpreter.cpp

(-98, +89)

| History

| Source

| Diff

· /sources/canbus/messageinterpreter.h

(-5, +4)

| History

| Source

| Diff

· /sources/gui/guicontroller.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/gui/guicontroller.h

(-1, +1)

| History

| Source

| Diff

· /sources/gui/guiglobals.cpp

(-3, +13)

| History

| Source

| Diff

· /sources/gui/guiglobals.h

(-37, +43)

| History

| Source

| Diff

· /sources/gui/qml/main.qml

(-4, +18)

| History

| Source

| Diff

… 127 more files in changeset.

application (bugfix/DEN-16597-UI-BN-S114): DEN-3164 : Code Review 0...

Behrouz NematiPour — Thu, 07 May 2020 03:54:43 -0700

Behrouz NematiPour committed b798668 on branch master, 2020_EOY_DEMO and 262 more in application

DEN-3164 : Code Review 0

- Corrected the copyright comment Doxygen tags.

- Corrected the copyright template Doxygen tags.

- Added check for fall through in switch statements to project.

- Added method comments in tst_messaging, unit test class.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

· /copyright

(-4, +4)

| History

| Source

| Diff

· /denali.pro

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/caninterface.cpp

(-3, +3)

| History

| Source

| Diff

· /sources/canbus/frameinterface.cpp

(-4, +4)

| History

| Source

| Diff

· /sources/canbus/frameinterface.h

(-4, +4)

| History

| Source

| Diff

· /sources/canbus/messageacknowmodel.cpp

(-4, +4)

| History

| Source

| Diff

· /sources/canbus/messageacknowmodel.h

(-4, +4)

| History

| Source

| Diff

· /sources/canbus/messagebuilder.cpp

(-4, +4)

| History

| Source

| Diff

· /sources/canbus/messagebuilder.h

(-4, +4)

| History

| Source

| Diff

· /sources/canbus/messagedispatcher.cpp

(-4, +4)

| History

| Source

| Diff

· /sources/canbus/messagedispatcher.h

(-4, +4)

| History

| Source

| Diff

· /sources/canbus/messageglobals.h

(-4, +4)

| History

| Source

| Diff

· /sources/canbus/messageinterpreter.cpp

(-4, +4)

| History

| Source

| Diff

· /sources/canbus/messageinterpreter.h

(-4, +4)

| History

| Source

| Diff

· /sources/gui/guiglobals.cpp

(-4, +4)

| History

| Source

| Diff

… 69 more files in changeset.

application (bugfix/DEN-16597-UI-BN-S114): DEN-3024_TreatmentDurationAdjustment...

Behrouz NematiPour — Wed, 29 Apr 2020 02:11:12 -0700

Behrouz NematiPour committed 95c671a on branch master, 2020_EOY_DEMO and 262 more in application

DEN-3024_TreatmentDurationAdjustment

- Adding comment for command line arguments

- Updating Slider handler position in real-time when minimum/maximum changes

- Added another type of properties as a trigger to always trig the UI even the value is the same as before. And also removed the false/true of the end of each PROPERTY #define from all the view classes and updated the GUI's QML codes accordingly.

- Removed the Heparin cumulative Delivery.

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

· /main.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/gui/qml/components/Slider.qml

(-0, +10)

| History

| Source

| Diff

· /sources/gui/qml/main.qml

(-2, +2)

| History

| Source

| Diff

· /sources/gui/qml/pages/treatment/TreatmentStart.qml

(-0, +1)

| History

| Source

| Diff

· /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml

(-7, +8)

| History

| Source

| Diff

· /sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml

(-2, +2)

| History

| Source

| Diff

· /sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml

(-0, +3)

| History

| Source

| Diff

· /sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml

(-0, +9)

| History

| Source

| Diff

· /sources/main.h

(-4, +10)

| History

| Source

| Diff

· /sources/view/valarmstatus.h

(-14, +14)

| History

| Source

| Diff

· /sources/view/vpoweroff.cpp

(-1, +1)

| History

| Source

| Diff

· /sources/view/vpoweroff.h

(-1, +2)

| History

| Source

| Diff

· /sources/view/vtreatmentadjustmentsresponse.cpp

(-23, +24)

| History

| Source

| Diff

· /sources/view/vtreatmentadjustmentsresponse.h

(-12, +18)

| History

| Source

| Diff

· /sources/view/vtreatmentbloodflow.h

(-7, +7)

| History

| Source

| Diff

… 5 more files in changeset.

application (bugfix/DEN-16597-UI-BN-S114): DEN-2087 : UI Blood/Dialysate Flow Rate Adjustment...

Behrouz NematiPour — Tue, 24 Mar 2020 02:43:22 -0700

Behrouz NematiPour committed 3bdf58e on branch master, 2020_EOY_DEMO and 268 more in application

DEN-2087 : UI Blood/Dialysate Flow Rate Adjustment

- Some Code Clean up

__________________________________________________________________________________

Behrouz NematiPour

bNematiPour@diality.com

· /sources/canbus/messageglobals.h	(-0, +2)	\| History	\| Source	\| Diff
· /sources/canbus/messageinterpreter.cpp	(-2, +2)	\| History	\| Source	\| Diff
· /sources/canbus/messageinterpreter.h	(-17, +18)	\| History	\| Source	\| Diff
· /sources/gui/guiglobals.cpp	(-0, +1)	\| History	\| Source	\| Diff
· /sources/gui/qml/globals/Variables.qml	(-0, +1)	\| History	\| Source	\| Diff
· /sources/model/mtreatmentflows.cpp	(-1, +1)	\| History	\| Source	\| Diff
· /sources/model/mtreatmentflows.h	(-6, +6)	\| History	\| Source	\| Diff
· /sources/view/valarmstatus.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/view/vpoweroff.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/view/vtreatmentbloodflow.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/view/vtreatmentdialysateflow.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/view/vtreatmenttime.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/view/vtreatmentultrafiltration.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/view/vview.h	(-1, +2)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): Unit Tests and Debugging and scripts to update devices easier...

Behrouz NematiPour — Fri, 13 Mar 2020 00:30:26 -0700

Behrouz NematiPour committed b166776 on branch master, 2020_EOY_DEMO and 270 more in application

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

· /scripts/copy.sh	(-0, +171)	\| History	\| Source
· /scripts/setup.sh	(-0, +46)	\| History	\| Source
· /scripts/setupSD.sh	(-25, +0)	\| History	\| Source	\| Diff
· /sources/main.h	(-2, +4)	\| History	\| Source	\| Diff
· /sources/view/valarmstatus.h	(-14, +14)	\| History	\| Source	\| Diff
· /sources/view/vpoweroff.h	(-1, +1)	\| History	\| Source	\| Diff
· /sources/view/vtreatmentbloodflow.h	(-7, +7)	\| History	\| Source	\| Diff
· /sources/view/vtreatmentdialysateflow.h	(-7, +7)	\| History	\| Source	\| Diff
· /sources/view/vtreatmenttime.h	(-3, +3)	\| History	\| Source	\| Diff
· /sources/view/vtreatmentultrafiltration.h	(-7, +7)	\| History	\| Source	\| Diff

application (bugfix/DEN-16597-UI-BN-S114): DEN-2088 : Implementation...

Behrouz NematiPour — Tue, 10 Mar 2020 01:06:03 -0700

Behrouz NematiPour committed 595ed1f on branch master, 2020_EOY_DEMO and 270 more in application

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

· /denali.pro

(-18, +32)

| History

| Source

| Diff

· /sources/applicationcontroller.h

(-1, +1)

| History

| Source

| Diff

· /sources/canbus/messageinterpreter.cpp

(-35, +51)

| History

| Source

| Diff

· /sources/canbus/messageinterpreter.h

(-22, +18)

| History

| Source

| Diff

· /sources/gui/guicontroller.h

(-1, +1)

| History

| Source

| Diff

· /sources/gui/guiglobals.cpp

(-9, +5)

| History

| Source

| Diff

· /sources/gui/qml/main.qml

(-21, +27)

| History

| Source

| Diff

· /sources/gui/qml/pages/SettingsHome.qml

(-19, +19)

| History

| Source

| Diff

· /sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml

(-2, +2)

| History

| Source

| Diff

· /sources/gui/view/valarmstatus.cpp

(-49, +0)

| History

| Source

| Diff

· /sources/gui/view/valarmstatus.h

(-57, +0)

| History

| Source

| Diff

· /sources/gui/view/vtreatmentflows.cpp

(-54, +0)

| History

| Source

| Diff

· /sources/gui/view/vtreatmentflows.h

(-59, +0)

| History

| Source

| Diff

· /sources/gui/view/vtreatmenttime.cpp

(-38, +0)

| History

| Source

| Diff

· /sources/gui/view/vtreatmenttime.h

(-48, +0)

| History

| Source

| Diff

… 30 more files in changeset.