Index: leahi.pro
===================================================================
diff -u -re07cde120d7476c4add90c4f86cf55af9ea830de -r50d6907ed1bef8273ad246a823073153016997e1
--- leahi.pro (.../leahi.pro) (revision e07cde120d7476c4add90c4f86cf55af9ea830de)
+++ leahi.pro (.../leahi.pro) (revision 50d6907ed1bef8273ad246a823073153016997e1)
@@ -263,6 +263,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/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.h \
sources/view/td/data/VTDAirBubbleData.h \
sources/view/td/data/VTDAirPumpData.h \
@@ -741,6 +742,7 @@
\ # ---------- Views - TD - States Data
sources/view/settings/VAdjustmentAdvancedInstitutionalRecord.cpp \
sources/view/settings/VAdvancedInstitutionalRecord.cpp \
+ sources/view/settings/VCalibrationSettings.cpp \
sources/view/td/adjustment/treatment/VTreatmentAdjustmentPressuresWidening.cpp \
sources/view/td/data/VTDAirBubbleData.cpp \
sources/view/td/data/VTDAirPumpData.cpp \
Index: leahi.qrc
===================================================================
diff -u -r0ce9ad2246ce63e9fcb706c0025ccf2a6ee88199 -r50d6907ed1bef8273ad246a823073153016997e1
--- leahi.qrc (.../leahi.qrc) (revision 0ce9ad2246ce63e9fcb706c0025ccf2a6ee88199)
+++ leahi.qrc (.../leahi.qrc) (revision 50d6907ed1bef8273ad246a823073153016997e1)
@@ -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
Index: sources/gui/GuiGlobals.cpp
===================================================================
diff -u -r59a1b4dceeb629ed08a434775d819ce108fe894b -r50d6907ed1bef8273ad246a823073153016997e1
--- sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 59a1b4dceeb629ed08a434775d819ce108fe894b)
+++ sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 50d6907ed1bef8273ad246a823073153016997e1)
@@ -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 -re255d4633b338f4f46c3a2fad5a62f982ebfcd18 -r50d6907ed1bef8273ad246a823073153016997e1
--- sources/gui/qml/main.qml (.../main.qml) (revision e255d4633b338f4f46c3a2fad5a62f982ebfcd18)
+++ sources/gui/qml/main.qml (.../main.qml) (revision 50d6907ed1bef8273ad246a823073153016997e1)
@@ -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
@@ -203,6 +204,8 @@
VInstitutionalRecord { id: vInstitutionalRecord }
VAdjustmentAdvancedInstitutionalRecord { id: vAdjustmentAdvancedInstitutionalRecord }
VAdvancedInstitutionalRecord { id: vAdvancedInstitutionalRecord }
+ VCalibrationSettings { id: vCalibrationSettings }
+
//VAdjustIn
// ---- States
VTDOpMode { id: vTDOpMode
Index: sources/gui/qml/pages/settings/SettingsCalibrationSettings.qml
===================================================================
diff -u
--- sources/gui/qml/pages/settings/SettingsCalibrationSettings.qml (revision 0)
+++ sources/gui/qml/pages/settings/SettingsCalibrationSettings.qml (revision 50d6907ed1bef8273ad246a823073153016997e1)
@@ -0,0 +1,138 @@
+// Qt
+import QtQuick 2.15
+import QtGraphicalEffects 1.12
+
+// Qml imports
+import "qrc:/globals"
+import "qrc:/components"
+import "qrc:/compounds"
+
+
+SettingsBase { id: _root
+ property var fieldList : []
+
+ itemIndex : SettingsStack.CalibrationSettings
+
+ confirmVisible : false
+
+ Component.onCompleted: _root.updateList (SettingsCalibrationSettings.Pressure)
+
+ enum CalibrationSensor {
+ Pressure = 0,
+ Temperature = 1
+ }
+
+ BaseComboBox { id: _componentComboBox
+ anchors.top : _root.top
+ anchors.topMargin : Variables.headerButtonsMargin
+ anchors.horizontalCenter : parent.horizontalCenter
+ height : Variables.contentHeight
+ currentIndex : 0
+ model : [
+ "Pressure Sensors" ,
+ "Temperature" ,
+ "Filters"
+ ]
+
+ onActivated: _root.updateList(currentIndex)
+ }
+
+ function updateList(vCurrentIndex) {
+ fieldList = []
+
+ switch(vCurrentIndex) {
+ case SettingsCalibrationSettings.Pressure:
+ fieldList.push("Gain")
+ fieldList.push("Offset")
+ fieldList.push("Offset")
+ fieldList.push("Offset")
+
+ break
+ case SettingsCalibrationSettings.Temperature:
+ fieldList.push("3f34")
+ fieldList.push("34f43")
+ break
+
+ default:
+ break
+ }
+
+ // Notify QML that the array changed
+ fieldList = fieldList
+ }
+
+ component HeaderText: Text { id: _headerText
+ property string title : ""
+ anchors.verticalCenter : parent.verticalCenter
+ leftPadding : Variables.defaultMargin * 2
+ text : _headerText.title
+ color : Colors.white
+ font.pixelSize : Fonts.fontPixelTextRectTitle
+ font.weight : Font.Medium
+ }
+
+ contentItem: Item { id: _contentItem
+ anchors.fill : parent
+ readonly property int contentWith: _listView.width - Variables.defaultMargin * 2 // added margin to have scroll bar show on right
+
+ Rectangle { id: _header
+ color : Colors.treatmentSectionHeader
+ height : Variables.institutionaltContainerHeight
+ width : _contentItem.contentWith
+ radius : 8.5
+
+ Row { id: _headerRow
+ width : _contentItem.width
+ height : Variables.institutionaltContainerHeight
+
+ HeaderText { id: _parameters; title: qsTr("Description"); width: _contentItem.width * 0.2 }
+ HeaderText { id: _minimum; title: qsTr("Component"); width: _contentItem.width * 0.2 }
+
+ Row { id: _headerComponentRow
+ width : _contentItem.width * 0.6
+ height : Variables.institutionaltContainerHeight
+
+ Repeater { id: _repeater
+ model : _root.fieldList
+
+ delegate: HeaderText {
+ title : modelData
+ height : Variables.institutionaltContainerHeight
+ width : _headerComponentRow.width / _root.fieldList.length
+ verticalAlignment : Text.AlignVCenter
+ }
+ }
+ }
+ }
+
+ layer.enabled : true
+ layer.effect: DropShadow {
+ id: _dropShadow
+ horizontalOffset: 0
+ verticalOffset : 3
+ radius : 3.0
+ samples : 7
+ color : "#50000000"
+ source : _header
+ anchors.fill : _header
+ }
+ }
+
+ ListView { id: _listView
+ anchors {
+ top :_header.bottom
+ topMargin : 10
+ left : parent.left
+ right : parent.right
+ bottom : parent.bottom
+ }
+ boundsBehavior : Flickable.StopAtBounds
+ clip : true
+// model : vInstitutionalRecord.model
+ spacing : anchors.topMargin
+ flickableDirection : Flickable.VerticalFlick
+
+ }
+
+ }
+}
Index: sources/gui/qml/pages/settings/SettingsStack.qml
===================================================================
diff -u -rbdf090c85ac9b272d1c693025542e8a5fac5a7e5 -r50d6907ed1bef8273ad246a823073153016997e1
--- sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision bdf090c85ac9b272d1c693025542e8a5fac5a7e5)
+++ sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 50d6907ed1bef8273ad246a823073153016997e1)
@@ -74,6 +74,7 @@
readonly property bool visibleAdvancedInstitutional : loggedIn
readonly property bool visibleLocalization : loggedIn
readonly property bool visibleAdvancedModes : loggedIn
+ readonly property bool visibleCalibrationSettings : true// loggedIn
readonly property string settingsTitle : _GuiView.manufactSetup ? qsTr("Manufacturing Setup") : _GuiView.updateSetup
? qsTr("Software Update") : qsTr("Device Settings")
@@ -100,6 +101,7 @@
AdvancedInstitutional ,
FeatureConfigurations ,
AdvancedMode ,
+ CalibrationSettings ,
Home
}
property var itemsText : [
@@ -124,6 +126,7 @@
qsTr("Advanced Institutional Settings" ), // AdvancedInstitutional
qsTr("Feature Configurations" ), // FeatureConfigurations
qsTr("Advanced Mode" ), // Advanced Modes
+ qsTr("Calibration Settings" ), // Calibration Settings
settingsTitle , // settings home
]
@@ -149,6 +152,7 @@
visibleAdvancedInstitutional , // AdvancedInstitutional
visibleFeatureConfigurations , // FeatureConfigurations
visibleAdvancedModes , // Advanced Modes
+ visibleCalibrationSettings , // Calibration Settings
false , // leave last and false align with settings home
]
@@ -260,6 +264,10 @@
push( _settingAdvancedMode )
break
+ case SettingsStack.CalibrationSettings:
+ push( _settingCalibrationSettings )
+ break
+
default:
console.debug("Unknown Index", vIndex)
break
@@ -286,6 +294,7 @@
SettingsLocalization { id: _settingLocalization }
SettingsFeatureConfigurations { id: _settingsFeatureConfigurations}
SettingsAdvancedMode { id: _settingAdvancedMode }
+ SettingsCalibrationSettings { id: _settingCalibrationSettings }
function gotoServiceMode( vservice ) {
//DEBUG console.log (" 0 ---------- ", _GuiView.manufactMode, _GuiView.manufactSetup, vservice, stackView.initialItem, stackView.currentItem, stackView.depth)
Index: sources/view/VView.h
===================================================================
diff -u -r59a1b4dceeb629ed08a434775d819ce108fe894b -r50d6907ed1bef8273ad246a823073153016997e1
--- sources/view/VView.h (.../VView.h) (revision 59a1b4dceeb629ed08a434775d819ce108fe894b)
+++ sources/view/VView.h (.../VView.h) (revision 50d6907ed1bef8273ad246a823073153016997e1)
@@ -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/settings/VCalibrationSettings.cpp
===================================================================
diff -u
--- sources/view/settings/VCalibrationSettings.cpp (revision 0)
+++ sources/view/settings/VCalibrationSettings.cpp (revision 50d6907ed1bef8273ad246a823073153016997e1)
@@ -0,0 +1,85 @@
+#include "VCalibrationSettings.h"
+
+// Project
+#include "GuiController.h"
+#include "format.h"
+
+VIEW_DEF_CLASS_ADJUSTMENT(VCalibrationSettings)
+
+void View::VCalibrationSettings::initConnections()
+{
+// ADJUST_VIEW_CONNECTION(InstitutionalRequestData)
+// ACTION_VIEW_CONNECTION(InstitutionalRecordResponseData)
+// ACTION_VIEW_CONNECTION(SettingsData);
+// ACTION_VIEW_CONNECTION(AdjustInstitutionalRecordResponseData)
+
+ _calibrationList.setRoleNames({
+ { eRole_Title , "title" },
+
+ });
+
+ initModel();
+}
+
+void View::VCalibrationSettings::initModel()
+{
+ _calibrationList.insertRow( eBloodFlowRate, {{ eRole_Title, tr("Blood Flow Rate") }});
+ _calibrationList.insertRow( eDialysateFlowRate, {{ eRole_Title, tr("Dialysate Flow Rate") }});
+ _calibrationList.insertRow( eTreatmentDuration, {{ eRole_Title, tr("Treatment Duration") }});
+ _calibrationList.insertRow( eHeparinBolusVolume, {{ eRole_Title, tr("Heparin Bolus Volume") }});
+ _calibrationList.insertRow( eHeparinDispenseRate, {{ eRole_Title, tr("Heparin Dispense Rate") }});
+ _calibrationList.insertRow( eHeparinStopTime, {{ eRole_Title, tr("Heparin Stop Time") }});
+ _calibrationList.insertRow( eDialysateTemperature, {{ eRole_Title, tr("Dialysate Temperature") }});
+ _calibrationList.insertRow( eAcidCompositionPotassium, {{ eRole_Title, tr("Acid Composition ([K+])") }});
+ _calibrationList.insertRow( eAcidCompositionCalcium, {{ eRole_Title, tr("Acid Composition ([Ca2+])") }});
+ _calibrationList.insertRow( eBicarbFinalDialysateComposition, {{ eRole_Title, tr("Bicarb. Final Dialysate Composition") }});
+ _calibrationList.insertRow( eSodiumFinalDialysateComposition, {{ eRole_Title, tr("Sodium Final Dialysate Composition") }});
+ _calibrationList.insertRow( eFluidBolusVolume, {{ eRole_Title, tr("Fluid Bolus Volume") }});
+ _calibrationList.insertRow( eArterialPressureLimit, {{ eRole_Title, tr("Arterial Pressure Limit") }});
+ _calibrationList.insertRow( eVenousPressureLimit, {{ eRole_Title, tr("Venous Pressure Limit") }});
+ _calibrationList.insertRow( eVenousAsymPressureLimit, {{ eRole_Title, tr("Venous Asym Pressure Limit") }});
+ _calibrationList.insertRow( eTMPWindowLimit, {{ eRole_Title, tr("TMP Window Limit") }});
+ _calibrationList.insertRow( eUFVolume, {{ eRole_Title, tr("UF Volume") }});
+ _calibrationList.insertRow( eVitalsInterval, {{ eRole_Title, tr("Vitals Interval") }});
+ _calibrationList.insertRow( eRinsebackVolume, {{ eRole_Title, tr("Rinseback Volume") }});
+ _calibrationList.insertRow( eRinsebackFlowRate, {{ eRole_Title, tr("Rinseback Flow Rate") }});
+ _calibrationList.insertRow( eSubstitutionVolume, {{ eRole_Title, tr("Substitution Volume") }});
+}
+
+//void View::VInstitutionalRecord::onActionReceive(const InstitutionalRecordResponseData &vData)
+//{
+// adjustment_Accepted ( vData.mAccepted );
+// adjustment_Reason ( vData.mReason );
+
+// _institutionalList.updateData( eBloodFlowRate, eRole_MinVal, vData.mBloodFlowMin );
+// _institutionalList.updateData( eBloodFlowRate, eRole_MaxVal, vData.mBloodFlowMax );
+// _institutionalList.updateData( eBloodFlowRate, eRole_DefVal, vData.mBloodFlowDef );
+
+
+
+// // *** has to be the last to let the information to be set and then emit the signal ***
+// // *** otherwise will use the Previous values before being set. ***
+// adjustment ( true );
+//}
+
+
+//void View::VInstitutionalRecord::onActionReceive(const AdjustInstitutionalRecordResponseData &vData)
+//{
+// _institutionalList.updateData(eBloodFlowRate, eRole_RejectionMin, vData.mBloodFlowRateMinRejectionReason );
+// _institutionalList.updateData(eBloodFlowRate, eRole_RejectionMax, vData.mBloodFlowRateMaxRejectionReason );
+// _institutionalList.updateData(eBloodFlowRate, eRole_RejectionDef, vData.mBloodFlowRateDefRejectionReason );
+// _institutionalList.updateData(eDialysateFlowRate, eRole_RejectionMin, vData.mDialysateFlowRateMinRejectionReason );
+// _institutionalList.updateData(eDialysateFlowRate, eRole_RejectionMax, vData.mDialysateFlowRateMaxRejectionReason );
+// _institutionalList.updateData(eDialysateFlowRate, eRole_RejectionDef, vData.mDialysateFlowRateDefRejectionReason );
+// _institutionalList.updateData(eTreatmentDuration, eRole_RejectionMin, vData.mTreatmentDurationMinRejectionReason );
+// _institutionalList.updateData(eTreatmentDuration, eRole_RejectionMax, vData.mTreatmentDurationMaxRejectionReason );
+// _institutionalList.updateData(eTreatmentDuration, eRole_RejectionDef, vData.mTreatmentDurationDefRejectionReason );
+// _institutionalList.updateData(eHeparinBolusVolume, eRole_RejectionMin, vData.mHeparinBolusVolumeMinRejectionReason );
+// _institutionalList.updateData(eHeparinBolusVolume, eRole_RejectionMax, vData.mHeparinBolusVolumeMaxRejectionReason );
+// _institutionalList.updateData(eHeparinBolusVolume, eRole_RejectionDef, vData.mHeparinBolusVolumeDefRejectionReason );
+// _institutionalList.updateData(eHeparinDispenseRate, eRole_RejectionMin, vData.mHeparinDispensingRateMinRejectionReason );
+// _institutionalList.updateData(eHeparinDispenseRate, eRole_RejectionMax, vData.mHeparinDispensingRateMaxRejectionReason );
+// _institutionalList.updateData(eHeparinDispenseRate, eRole_RejectionDef, vData.mHeparinDispensingRateDefRejectionReason );
+// _institutionalList.updateData(eHeparinStopTime, eRole_RejectionMin, vData.mHeparinStopTimeMinRejectionReason );
+
+//}
Index: sources/view/settings/VCalibrationSettings.h
===================================================================
diff -u
--- sources/view/settings/VCalibrationSettings.h (revision 0)
+++ sources/view/settings/VCalibrationSettings.h (revision 50d6907ed1bef8273ad246a823073153016997e1)
@@ -0,0 +1,120 @@
+#pragma once
+
+// Qt
+#include
+
+// Project
+#include "main.h" // Doxygen : do not remove
+#include "VAdjustmentResponseBase.h"
+//#include "MAdjustTDInstitutionalRecordResponse.h"
+#include "MListModel.h"
+#include "MSettings.h"
+//#include "MTDInstitutionalRecordResponse.h"
+
+namespace View {
+
+/*!
+ * \brief The VCalibrationSettings class
+ * \details View for Model's Data representation.
+ *
+ * \sa Model::VAdjustmentResponseBase
+ *
+ */
+class VCalibrationSettings : public VAdjustmentResponseBase {
+ Q_OBJECT
+
+ // friends
+ friend class ::tst_views;
+
+
+
+ enum {
+ eRole_Title = Qt::UserRole + 1 ,
+ eRole_Units ,
+ eRole_Min ,
+ eRole_Max ,
+ eRole_Step ,
+ eRole_Decimal ,
+ eRole_MinVal ,
+ eRole_MaxVal ,
+ eRole_DefVal ,
+ eRole_RejectionMin ,
+ eRole_RejectionMax ,
+ eRole_RejectionDef ,
+ eRole_CanOff ,
+ } DataRole;
+
+ enum {
+ eBloodFlowRate ,
+ eDialysateFlowRate ,
+ eTreatmentDuration ,
+ eHeparinBolusVolume ,
+ eHeparinDispenseRate ,
+ eHeparinStopTime ,
+ eDialysateTemperature ,
+ eAcidCompositionPotassium ,
+ eAcidCompositionCalcium ,
+ eBicarbFinalDialysateComposition ,
+ eSodiumFinalDialysateComposition ,
+ eFluidBolusVolume ,
+ eArterialPressureLimit ,
+ eVenousPressureLimit ,
+ eVenousAsymPressureLimit ,
+ eTMPWindowLimit ,
+ eUFVolume ,
+ eVitalsInterval ,
+ eRinsebackVolume ,
+ eRinsebackFlowRate ,
+ eSubstitutionVolume
+ } Records;
+
+ // The property adjustment_Triggered has to be always true
+ // and to always trigger the change event to work as a notifier for GUI
+ TRIGGER( bool , adjustment , 0)
+
+// RANGESET( quint32 , bloodFlowRate , 0)
+// RANGESET( quint32 , dialysateFlowRate , 0)
+// RANGESET( quint32 , treatmentDuration , 0)
+// RANGESET( float , heparinBolusVolume , 0)
+// RANGESET( float , heparinDispensingRate , 0)
+// RANGESET( quint32 , heparinStopTime , 0)
+// RANGESET( float , dialysateTemp , 0)
+// RANGESET( float , acidConcentratePotassium , 0)
+// RANGESET( float , acidConcentrateCalcium , 0)
+// RANGESET( quint32 , fluidBolusVolume , 0)
+// RANGESET( quint32 , bicarbFinalDialysateComposition , 0)
+// RANGESET( quint32 , sodiumFinalDialysateComposition , 0)
+// RANGESET( qint32 , arterialPressureLimitWindow , 0)
+// RANGESET( qint32 , venousPressureLimitWindow , 0)
+// RANGESET( qint32 , venousPressureLimitAsymtrc , 0)
+// RANGESET( qint32 , trancembrncPressureLimitWindow , 0)
+// RANGESET( float , ultrafiltrationVolume , 0)
+// RANGESET( quint32 , rinsebackVolume , 0)
+// RANGESET( quint32 , rinsebackFlowRate , 0)
+// RANGESET( float , substitutionVolume , 0)
+
+ Q_PROPERTY(MListModel* model READ model NOTIFY didModelChange)
+
+ VIEW_DEC_CLASS(VCalibrationSettings);
+// VIEW_DEC_CLASS_ADJUSTMENT(VCalibrationSettings, InstitutionalRecordResponseData )
+// VIEW_DEC_SLOT(SettingsData )
+// VIEW_DEC_SLOT(AdjustInstitutionalRecordResponseData )
+
+private:
+ MListModel* model () { return &_calibrationList; }
+ MListModel _calibrationList;
+ void initModel();
+
+public slots:
+// void doAdjustment() {
+// InstitutionalRequestData data;
+// emit didAdjustment(data);
+// }
+
+// void clearRejectionReason(const int &vRow, const int &vRange);
+
+signals:
+// void didAdjustment(const InstitutionalRequestData &vData);
+ void didModelChange();
+};
+}
Index: sources/view/td/data/treatment/VTDTreatmentStatesData.cpp
===================================================================
diff -u -r27a83d5f4e60279c58e3edcf0ed5730f70e3c1b5 -r50d6907ed1bef8273ad246a823073153016997e1
--- sources/view/td/data/treatment/VTDTreatmentStatesData.cpp (.../VTDTreatmentStatesData.cpp) (revision 27a83d5f4e60279c58e3edcf0ed5730f70e3c1b5)
+++ sources/view/td/data/treatment/VTDTreatmentStatesData.cpp (.../VTDTreatmentStatesData.cpp) (revision 50d6907ed1bef8273ad246a823073153016997e1)
@@ -68,13 +68,11 @@
ENUM_CHECK_O( GuiSalineStates, vData.mSalineState ) {
ENUM_CHECK ( GuiSalineStates, FLUID_BOLUS_IDLE_STATE )
ENUM_CHECK ( GuiSalineStates, FLUID_BOLUS_WAIT_FOR_PUMPS_STOP_STATE )
- ENUM_CHECK ( GuiSalineStates, FLUID_BOLUS_SALINE_IN_PROGRESS_STATE )
- ENUM_CHECK ( GuiSalineStates, FLUID_BOLUS_SUBSITUTE_IN_PROGRESS_STATE )
+ ENUM_CHECK ( GuiSalineStates, FLUID_BOLUS_IN_PROGRESS_STATE )
ENUM_CHECK_C( GuiSalineStates, NUM_OF_FLUID_BOLUS_STATES ) }
ENUM_READ ( GuiSalineStates, FLUID_BOLUS_IDLE_STATE , sbIdle );
ENUM_READ ( GuiSalineStates, FLUID_BOLUS_WAIT_FOR_PUMPS_STOP_STATE , sbWaitPump );
- ENUM_READ ( GuiSalineStates, FLUID_BOLUS_SALINE_IN_PROGRESS_STATE , sbRunning );
- ENUM_READ ( GuiSalineStates, FLUID_BOLUS_SUBSITUTE_IN_PROGRESS_STATE , sbSubstitutionRunning );
+ ENUM_READ ( GuiSalineStates, FLUID_BOLUS_IN_PROGRESS_STATE , sbRunning );
// Heparin States
_heparin = false;
Index: sources/view/td/data/treatment/VTDTreatmentStatesData.h
===================================================================
diff -u -r27a83d5f4e60279c58e3edcf0ed5730f70e3c1b5 -r50d6907ed1bef8273ad246a823073153016997e1
--- sources/view/td/data/treatment/VTDTreatmentStatesData.h (.../VTDTreatmentStatesData.h) (revision 27a83d5f4e60279c58e3edcf0ed5730f70e3c1b5)
+++ sources/view/td/data/treatment/VTDTreatmentStatesData.h (.../VTDTreatmentStatesData.h) (revision 50d6907ed1bef8273ad246a823073153016997e1)
@@ -75,7 +75,6 @@
PROPERTY( bool , sbIdle , true ) ///< SALINE_BOLUS_STATE_IDLE = 0 # No saline bolus delivery is in progress
PROPERTY( bool , sbWaitPump , false) ///< SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP = 1 # Wait for pumps to stop before starting bolus
PROPERTY( bool , sbRunning , false) ///< SALINE_BOLUS_STATE_IN_PROGRESS = 2 # A saline bolus delivery is in progress
- PROPERTY( bool , sbSubstitutionRunning , false) ///< FLUID_BOLUS_SUBSITUTE_IN_PROGRESS_STATE = 3 # A substitution delivery is in progress
// ---- Heparin states
PROPERTY( bool , hpOff , true ) ///< HEPARIN_STATE_OFF = 0 # No heparin delivery is in progress