Index: leahi.pro
===================================================================
diff -u -r8d7a40bfbd30d596b4450965597d2e3f2f61326d -rdc4a0cbb5eb3a967755f4ba40d8407032723c957
--- leahi.pro (.../leahi.pro) (revision 8d7a40bfbd30d596b4450965597d2e3f2f61326d)
+++ leahi.pro (.../leahi.pro) (revision dc4a0cbb5eb3a967755f4ba40d8407032723c957)
@@ -264,6 +264,7 @@
sources/view/fp/data/VFPTemperatureData.h \
sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.h \
sources/view/settings/VAdvancedInstitutionalRecord.h \
+ sources/view/settings/VCalibrationSettings.h \
sources/view/td/data/VTDAirBubbleData.h \
sources/view/td/data/VTDAirPumpData.h \
sources/view/td/data/VTDAirTrapData.h \
@@ -744,6 +745,7 @@
\ # ---------- Views - TD - States Data
sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.cpp \
sources/view/settings/VAdvancedInstitutionalRecord.cpp \
+ sources/view/settings/VCalibrationSettings.cpp \
sources/view/td/data/VTDAirBubbleData.cpp \
sources/view/td/data/VTDAirPumpData.cpp \
sources/view/td/data/VTDAirTrapData.cpp \
Index: leahi.qrc
===================================================================
diff -u -r00c17b6d803722f8338cc3202257d361bb0ad186 -rdc4a0cbb5eb3a967755f4ba40d8407032723c957
--- leahi.qrc (.../leahi.qrc) (revision 00c17b6d803722f8338cc3202257d361bb0ad186)
+++ leahi.qrc (.../leahi.qrc) (revision dc4a0cbb5eb3a967755f4ba40d8407032723c957)
@@ -30,6 +30,7 @@
sources/gui/qml/pages/settings/SettingsAdvancedMode.qml
sources/gui/qml/pages/settings/SettingsFeatureConfigurations.qml
sources/gui/qml/pages/settings/SettingsAdvancedInstitutional.qml
+ sources/gui/qml/pages/settings/SettingsCalibrationSettings.qml
sources/gui/qml/dialogs/ConfirmDialog.qml
@@ -46,6 +47,7 @@
sources/gui/qml/dialogs/PatientIdEntry.qml
sources/gui/qml/dialogs/DryDemoDialog.qml
sources/gui/qml/dialogs/ConfirmPasswordDialog.qml
+ sources/gui/qml/dialogs/CalibrationDialog.qml
sources/gui/qml/dialogs/diagnostics/DiagnosticsDialog.qml
Index: sources/canbus/MessageGlobals.h
===================================================================
diff -u -r54b9a7699a46c0fde39b4d1a20b9f362bab435af -rdc4a0cbb5eb3a967755f4ba40d8407032723c957
--- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 54b9a7699a46c0fde39b4d1a20b9f362bab435af)
+++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision dc4a0cbb5eb3a967755f4ba40d8407032723c957)
@@ -78,7 +78,7 @@
{Gui::GuiActionType::ID_Saline , 4 * 4 }, // 4 parameters each 4bytes
{Gui::GuiActionType::ID_Vitals , 3 * 4 }, // 3 parameters each 4bytes
{Gui::GuiActionType::ID_Ultrafiltration , 4 * 4 }, // 4 parameters each 4bytes
- {Gui::GuiActionType::ID_IsolatedUF , 4 * 4 }, // 4 parameters each 4bytes
+ {Gui::GuiActionType::ID_IsolatedUF , 6 * 4 }, // 6 parameters each 4bytes
{Gui::GuiActionType::ID_Heparin , 2 * 4 }, // 2 parameters each 4bytes
{Gui::GuiActionType::ID_Rinseback , 7 * 4 }, // 6 parameters each 4bytes
{Gui::GuiActionType::ID_Recirculate , 1 * 4 }, // 1 parameters each 4bytes
@@ -192,6 +192,10 @@
{Gui::GuiActionType::ID_AdjustUltrafiltrationStateRsp , 2 * 4 }, // 2 parameter each 4bytes
// ----
+ {Gui::GuiActionType::ID_AdjustIsoUFStateReq , 1 * 4 }, // 1 parameter each 4bytes
+ {Gui::GuiActionType::ID_AdjustIsoUFStateRsp , 2 * 4 }, // 2 parameter each 4bytes
+
+ // ----
{Gui::GuiActionType::ID_AdjustUltrafiltrationEditReq , 1 * 4 }, // 1 parameter each 4bytes
{Gui::GuiActionType::ID_AdjustUltrafiltrationEditRsp , 4 * 4 }, // 4 parameters each 4bytes
Index: sources/gui/GuiGlobals.cpp
===================================================================
diff -u -r8d7a40bfbd30d596b4450965597d2e3f2f61326d -rdc4a0cbb5eb3a967755f4ba40d8407032723c957
--- sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 8d7a40bfbd30d596b4450965597d2e3f2f61326d)
+++ sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision dc4a0cbb5eb3a967755f4ba40d8407032723c957)
@@ -56,6 +56,7 @@
#include "VInstitutionalRecord.h"
#include "VAdjustmentAdvancedInstitutionalRecord.h"
#include "VAdvancedInstitutionalRecord.h"
+#include "VCalibrationSettings.h"
// states data
#include "VTDOpModeData.h"
#include "VPreTreatmentStatesData.h"
Index: sources/gui/qml/main.qml
===================================================================
diff -u -r8d7a40bfbd30d596b4450965597d2e3f2f61326d -rdc4a0cbb5eb3a967755f4ba40d8407032723c957
--- sources/gui/qml/main.qml (.../main.qml) (revision 8d7a40bfbd30d596b4450965597d2e3f2f61326d)
+++ sources/gui/qml/main.qml (.../main.qml) (revision dc4a0cbb5eb3a967755f4ba40d8407032723c957)
@@ -58,6 +58,7 @@
import VCloudSync 0.1
import VHDUsageInfo 0.1
import VInstitutionalRecord 0.1
+import VCalibrationSettings 0.1
import VAdjustmentInstitutionalRecord 0.1
import VAdvancedInstitutionalRecord 0.1
import VAdjustmentAdvancedInstitutionalRecord 0.1
@@ -204,6 +205,8 @@
VInstitutionalRecord { id: vInstitutionalRecord }
VAdjustmentAdvancedInstitutionalRecord { id: vAdjustmentAdvancedInstitutionalRecord }
VAdvancedInstitutionalRecord { id: vAdvancedInstitutionalRecord }
+ VCalibrationSettings { id: vCalibrationSettings }
+
//VAdjustIn
// ---- States
VTDOpMode { id: vTDOpMode
Index: sources/gui/qml/pages/treatment/TreatmentStack.qml
===================================================================
diff -u -re7a26aa8823fdabbfb21fe75ea9a581c7d0513b4 -rdc4a0cbb5eb3a967755f4ba40d8407032723c957
--- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision e7a26aa8823fdabbfb21fe75ea9a581c7d0513b4)
+++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision dc4a0cbb5eb3a967755f4ba40d8407032723c957)
@@ -53,6 +53,9 @@
stackView.initialItem : _treatmentHome
+ stackView.onCurrentItemChanged: if ( stackView.currentItem != _endTreatmentRinsebackStack &&
+ stackView.currentItem != _endTreatmentRecirculateStack ) { _headerBar.activeStack = stackView }
+
readonly property bool isTreatmentPaused : vTDTreatmentStates.txStop
readonly property bool isSBInProgress : ( vTDTreatmentStates.sbRunning || vTDTreatmentStates.sbWaitPump )
readonly property bool isTreatmentEnd : vTDTreatmentStates.txEnd
Index: sources/gui/qml/pages/treatment/sections/TreatmentTime.qml
===================================================================
diff -u -r6c075a49d02dbe9a3c7636a7b01bceab597b000b -rdc4a0cbb5eb3a967755f4ba40d8407032723c957
--- sources/gui/qml/pages/treatment/sections/TreatmentTime.qml (.../TreatmentTime.qml) (revision 6c075a49d02dbe9a3c7636a7b01bceab597b000b)
+++ sources/gui/qml/pages/treatment/sections/TreatmentTime.qml (.../TreatmentTime.qml) (revision dc4a0cbb5eb3a967755f4ba40d8407032723c957)
@@ -63,8 +63,6 @@
width : _circle.width
height : _circle.height
- onIsCompleteChanged: _rinsebackCompleteDialog.isTxCompleted = _root.isComplete
-
signal clicked()
ProgressCircle { id: _circle
Index: sources/view/VView.h
===================================================================
diff -u -r8d7a40bfbd30d596b4450965597d2e3f2f61326d -rdc4a0cbb5eb3a967755f4ba40d8407032723c957
--- sources/view/VView.h (.../VView.h) (revision 8d7a40bfbd30d596b4450965597d2e3f2f61326d)
+++ sources/view/VView.h (.../VView.h) (revision dc4a0cbb5eb3a967755f4ba40d8407032723c957)
@@ -146,6 +146,7 @@
REGISTER_TYPE( VInstitutionalRecord ) \
REGISTER_TYPE( VAdjustmentAdvancedInstitutionalRecord ) \
REGISTER_TYPE( VAdvancedInstitutionalRecord ) \
+ REGISTER_TYPE( VCalibrationSettings ) \
/* Alarm */ \
REGISTER_TYPE( VAlarmStatus ) \
REGISTER_TYPE( VAlarmActiveList ) \
Index: sources/view/td/data/treatment/VTDTreatmentStatesData.cpp
===================================================================
diff -u -r3bbcc27ab7584e84e87a9d005c14a6e04188d0c0 -rdc4a0cbb5eb3a967755f4ba40d8407032723c957
--- sources/view/td/data/treatment/VTDTreatmentStatesData.cpp (.../VTDTreatmentStatesData.cpp) (revision 3bbcc27ab7584e84e87a9d005c14a6e04188d0c0)
+++ sources/view/td/data/treatment/VTDTreatmentStatesData.cpp (.../VTDTreatmentStatesData.cpp) (revision dc4a0cbb5eb3a967755f4ba40d8407032723c957)
@@ -163,14 +163,12 @@
ENUM_CHECK ( GuiRinsebackStates, RINSEBACK_PAUSED_STATE )
ENUM_CHECK ( GuiRinsebackStates, RINSEBACK_STOP_STATE )
ENUM_CHECK ( GuiRinsebackStates, RINSEBACK_RUN_ADDITIONAL_STATE )
- ENUM_CHECK ( GuiRinsebackStates, RINSEBACK_RECONNECT_PATIENT_STATE )
ENUM_CHECK_C( GuiRinsebackStates, NUM_OF_RINSEBACK_STATES ) }
ENUM_READ ( GuiRinsebackStates, RINSEBACK_STOP_INIT_STATE , rbInit );
ENUM_READ ( GuiRinsebackStates, RINSEBACK_RUN_STATE , rbRun );
ENUM_READ ( GuiRinsebackStates, RINSEBACK_PAUSED_STATE , rbPaused );
ENUM_READ ( GuiRinsebackStates, RINSEBACK_STOP_STATE , rbStop );
ENUM_READ ( GuiRinsebackStates, RINSEBACK_RUN_ADDITIONAL_STATE , rbAdditional );
- ENUM_READ ( GuiRinsebackStates, RINSEBACK_RECONNECT_PATIENT_STATE , rbReconnect );
}
txRinseback ( mRinseback ); // it's the main rinseback event so moved last to have all the sub-rinseback-states updated prior to.
Index: sources/view/td/data/treatment/VTDTreatmentStatesData.h
===================================================================
diff -u -r3bbcc27ab7584e84e87a9d005c14a6e04188d0c0 -rdc4a0cbb5eb3a967755f4ba40d8407032723c957
--- sources/view/td/data/treatment/VTDTreatmentStatesData.h (.../VTDTreatmentStatesData.h) (revision 3bbcc27ab7584e84e87a9d005c14a6e04188d0c0)
+++ sources/view/td/data/treatment/VTDTreatmentStatesData.h (.../VTDTreatmentStatesData.h) (revision dc4a0cbb5eb3a967755f4ba40d8407032723c957)
@@ -98,7 +98,6 @@
PROPERTY( bool , rbPaused , false) ///< RINSEBACK_PAUSED_STATE = 2 # Rinseback paused state of the rinseback sub-mode state machine
PROPERTY( bool , rbStop , false) ///< RINSEBACK_STOP_STATE = 3 # Rinseback stopped (done) state of the rinseback sub-mode state machine
PROPERTY( bool , rbAdditional , false) ///< RINSEBACK_RUN_ADDITIONAL_STATE = 4 # Additional rinseback volume (10 mL) state of the rinseback sub-mode state machine
- PROPERTY( bool , rbReconnect , false) ///< RINSEBACK_RECONNECT_PATIENT_STATE = 5 # Rinseback reconnect state of the rinseback sub-mode state machine
// Recirculate states
PROPERTY( bool , rcDisconnect , true ) ///< TREATMENT_RECIRC_DISCONNECT_PATIENT_STATE = 0 # Disconnect patient state of the treatment re-circulate sub-mode state machine