Clone
Tools

 

michael garthwaite <mgarthwaite@diality.com> in application

About

15 commits
Last Week All Time
Commits: 0 15

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 
Thursday 03 Mar 2022
2:46 pm

Michael Garthwaite

Merge branch 'DEN-12121-sw_dev-sprint-65' into develop

Options
2:45 pm

Michael Garthwaite

DEN-12121: Adjustments to Dianogistic Dialog to fit new FW versions better. Moved Pressures to have a bit more room for 5 digit values.

Options
    • -4
    • +6
    /sources/gui/qml/dialogs/DiagnosticsDialog.qml
Wednesday 02 Mar 2022
5:41 pm

Michael Garthwaite

Merge branch 'DEN-12121-sw_dev-sprint-65' into develop

Options
    • -3
    • +2
    /sources/canbus/MessageGlobals.h
    • -0
    • +1
    /sources/gui/GuiGlobals.h
    • -2
    • +1
    /sources/gui/qml/main.qml
5:41 pm

Michael Garthwaite

DEN-12121: Updates per code review

Options
    • -3
    • +2
    /sources/canbus/MessageGlobals.h
    • -0
    • +1
    /sources/gui/GuiGlobals.h
    • -0
    • +1
    /sources/gui/qml/AlarmItem.qml
    • -1
    • +1
    /sources/gui/qml/dialogs/DiagnosticsDialog.qml
    • -2
    • +1
    /sources/gui/qml/main.qml
    • -3
    • +3
    /sources/model/dg/data/MDGConductivityData.h
    • -3
    • +3
    /sources/model/hd/data/MHDAirBubbleData.h
    • -3
    • +3
    /sources/model/hd/data/MHDAirTrapData.h
    • -3
    • +3
    /sources/model/hd/data/MHDBloodLeakData.h
Monday 28 Feb 2022
4:43 pm

Michael Garthwaite

DEN-12121: Updated Models and views to latest messaging protocol. Fixed BLD to show detect counter. Updated get version to display compatibility revision.

Options
    • -4
    • +6
    /sources/gui/qml/dialogs/DiagnosticsDialog.qml
    • -24
    • +28
    /sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.cpp
    • -24
    • +27
    /sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.h
    • -24
    • +28
    /sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.cpp
    • -24
    • +27
    /sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.h
    • -0
    • +4
    /sources/model/hd/data/treatment/MTreatmentStatesData.cpp
    • -0
    • +2
    /sources/model/hd/data/treatment/MTreatmentStatesData.h
    • -24
    • +28
    /sources/view/settings/VAdjustmentVersions.cpp
    • -18
    • +20
    /sources/view/settings/VAdjustmentVersions.h
Thursday 24 Feb 2022
6:24 pm

Michael Garthwaite

Merge branch 'DEN-12121-sw_dev-sprint-65' into develop

Options
    • -0
    • +16
    /denali.pro
    • -1
    • +1
    /denali.pro.user
    • -1
    • +4
    /sources/canbus/MessageGlobals.h
    • -0
    • +4
    /sources/canbus/MessageInterpreter.cpp
    • -2
    • +4
    /sources/gui/GuiGlobals.h
    • -2
    • +10
    /sources/gui/qml/main.qml
    • -1
    • +21
    /sources/model/MModel.h
6:22 pm

Michael Garthwaite

DEN-12121: Further linkage for updating values on screen relating to DEN-12118

Options
    • -1
    • +4
    /sources/canbus/MessageGlobals.h
    • -3
    • +1
    /sources/gui/qml/dialogs/DiagnosticsDialog.qml
    • -0
    • +12
    /sources/model/MModel.h
2:55 pm

Michael Garthwaite

DEN-12121: Updates per system team's feedback for DEN-12118

Options
    • -15
    • +15
    /sources/gui/qml/dialogs/DiagnosticsDialog.qml
10:36 am

Michael Garthwaite

DEN-12121: Implemented QML updates, proper view links for QML, and remaining implementation for new messages to the QML stack. All relate to DEN-12118.

Options
    • -0
    • +4
    /sources/gui/GuiGlobals.cpp
    • -54
    • +101
    /sources/gui/qml/dialogs/DiagnosticsDialog.qml
    • -2
    • +10
    /sources/gui/qml/main.qml
    • -0
    • +1
    /sources/model/dg/data/MDGValvesStatesData.h
    • -3
    • +3
    /sources/model/hd/alarm/MAlarmMapping.cpp
    • -0
    • +4
    /sources/view/VView.h
    • -1
    • +1
    /sources/view/dg/data/VDGConductivityData.cpp
    • -0
    • +1
    /sources/view/dg/data/VDGValvesStatesData.cpp
    • -12
    • +13
    /sources/view/dg/data/VDGValvesStatesData.h
    • -0
    • +26
    /sources/view/hd/data/VHDAirBubbleData.cpp
    • -3
    • +43
    /sources/view/hd/data/VHDAirBubbleData.h
    • -0
    • +26
    /sources/view/hd/data/VHDAirTrapData.cpp
    • -3
    • +43
    /sources/view/hd/data/VHDAirTrapData.h
    • -2
    • +2
    /sources/view/hd/data/VHDBloodLeakData.cpp
    • -3
    • +3
    /sources/view/hd/data/VHDBloodLeakData.h
Wednesday 23 Feb 2022
6:25 pm

Michael Garthwaite

Merge branch 'staging' into DEN-12121-sw_dev-sprint-65

Options
    • -2
    • +4
    /denali.pro
    • -8
    • +8
    /sources/canbus/MessageInterpreter.cpp
    • -7
    • +7
    /sources/gui/GuiGlobals.h
    • -10
    • +8
    /sources/gui/qml/dialogs/DiagnosticsDialog.qml
    • -3
    • +3
    /sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackComplete.qml
    • -7
    • +8
    /sources/model/MModel.h
    • -3
    • +3
    /sources/model/hd/data/treatment/MTreatmentRinsebackData.cpp
    • -3
    • +3
    /sources/model/hd/data/treatment/MTreatmentRinsebackData.h
    • -3
    • +3
    /sources/view/hd/data/treatment/VTreatmentRinsebackData.cpp
    • -3
    • +3
    /sources/view/hd/data/treatment/VTreatmentRinsebackData.h
6:24 pm

Michael Garthwaite

DEN-12121: Implemented Model and Views for BloodLeak, AirBubble, AirTrap and DG Conductvity for DEN-12118. Removed ODi and ODo in diagnostic dialog. Added isCompleted field in Rinseback Model for DEN-9932.

Options
    • -1
    • +16
    /denali.pro
    • -1
    • +1
    /denali.pro.user
    • -0
    • +4
    /sources/canbus/MessageInterpreter.cpp
    • -2
    • +4
    /sources/gui/GuiGlobals.h
    • -6
    • +2
    /sources/gui/qml/dialogs/DiagnosticsDialog.qml
    • -0
    • +1
    /sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackComplete.qml
    • -0
    • +8
    /sources/model/MModel.h
    • -0
    • +57
    /sources/model/dg/data/MDGConductivityData.cpp
    • -0
    • +90
    /sources/model/dg/data/MDGConductivityData.h
    • -0
    • +45
    /sources/model/hd/data/MHDAirBubbleData.cpp
    • -0
    • +84
    /sources/model/hd/data/MHDAirBubbleData.h
    • -0
    • +45
    /sources/model/hd/data/MHDAirTrapData.cpp
    • -0
    • +84
    /sources/model/hd/data/MHDAirTrapData.h
    • -0
    • +78
    /sources/model/hd/data/MHDBloodLeakData.cpp
    • -3
    • +75
    /sources/model/hd/data/MHDBloodLeakData.h
  16. … 12 more files in changeset.
Thursday 17 Feb 2022
8:46 am

Michael Garthwaite

Updates per code review.

Options
    • -1
    • +1
    /sources/model/hd/data/treatment/MTreatmentBloodFlowData.cpp
8:43 am

Michael Garthwaite

DEN-12121: skeleton model and file for blood leak sensor for DEN-12118.

Options
    • -0
    • +1
    /denali.pro
    • -0
    • +37
    /sources/model/hd/data/MHDBloodLeakData.h
Wednesday 16 Feb 2022
12:51 pm

Michael Garthwaite

DEN-11980: Updates and fixes per code review.

Options
    • -2
    • +2
    /denali.pro
    • -1
    • +1
    /sources/model/MModel.h
    • -11
    • +9
    /sources/model/hd/data/treatment/MTreatmentBloodFlowData.cpp
    • -2
    • +2
    /sources/model/hd/data/treatment/MTreatmentBloodFlowData.h
    • -0
    • +67
    /sources/model/hd/data/treatment/MTreatmentDialysateFlowData.cpp
    • -0
    • +95
    /sources/model/hd/data/treatment/MTreatmentDialysateFlowData.h
    • -69
    • +0
    /sources/model/hd/data/treatment/MTreatmentInletFlowData.cpp
    • -95
    • +0
    /sources/model/hd/data/treatment/MTreatmentInletFlowData.h
    • -1
    • +1
    /sources/view/hd/data/treatment/VTreatmentBloodFlow.cpp
    • -1
    • +1
    /sources/view/hd/data/treatment/VTreatmentDialysateFlow.h
Wednesday 09 Feb 2022
5:16 pm

Michael Garthwaite

DEN-11980: Split Flows Data Model to Blood Flow data and Inlet Data Models. Updated Views to reflect new message protocol for Blood Flow and Inlet Flow. Updated Diagnostic Dialog to reflect new message values.

Options
    • -2
    • +4
    /denali.pro
    • -1
    • +1
    /denali.pro.user
    • -4
    • +2
    /sources/gui/qml/dialogs/DiagnosticsDialog.qml
    • -1
    • +2
    /sources/model/MModel.h
    • -0
    • +72
    /sources/model/hd/data/treatment/MTreatmentBloodFlowData.cpp
    • -0
    • +98
    /sources/model/hd/data/treatment/MTreatmentBloodFlowData.h
    • -91
    • +0
    /sources/model/hd/data/treatment/MTreatmentFlowsData.cpp
    • -165
    • +0
    /sources/model/hd/data/treatment/MTreatmentFlowsData.h
    • -0
    • +69
    /sources/model/hd/data/treatment/MTreatmentInletFlowData.cpp
    • -0
    • +95
    /sources/model/hd/data/treatment/MTreatmentInletFlowData.h
    • -1
    • +1
    /sources/view/hd/data/treatment/VTreatmentBloodFlow.cpp
    • -2
    • +2
    /sources/view/hd/data/treatment/VTreatmentBloodFlow.h
    • -1
    • +0
    /sources/view/hd/data/treatment/VTreatmentDialysateFlow.cpp
    • -2
    • +1
    /sources/view/hd/data/treatment/VTreatmentDialysateFlow.h