Index: etc/reports/alarms/AlarmMapping.csv =================================================================== diff -u -r1244c4ea38fdf2236ac2e4ce052e9da2200b43fa -r0404b2da32acb3eaf8d41ef627dd51252c80e9ba --- etc/reports/alarms/AlarmMapping.csv (.../AlarmMapping.csv) (revision 1244c4ea38fdf2236ac2e4ce052e9da2200b43fa) +++ etc/reports/alarms/AlarmMapping.csv (.../AlarmMapping.csv) (revision 0404b2da32acb3eaf8d41ef627dd51252c80e9ba) @@ -254,19 +254,19 @@ 253,"FW reserved for use." 254,"FW reserved for use." 255,"FW reserved for use." - 256,"FW reserved for use." - 257,"FW reserved for use." - 258,"FW reserved for use." - 259,"FW reserved for use." - 260,"FW reserved for use." - 261,"FW reserved for use." - 262,"FW reserved for use." - 263,"FW reserved for use." - 264,"FW reserved for use." - 265,"FW reserved for use." - 266,"FW reserved for use." - 267,"FW reserved for use." - 268,"FW reserved for use." + 256,"TD invalid tubing set." + 257,"TD install new blood tubing set." + 258,"TD no tubing set detected." + 259,"TD tubing set authentication timeout." + 260,"TD pressure too high to zero." + 261,"TD venous pressurization timeout." + 262,"TD venous pressure decay failure." + 263,"TD venous pressure leak." + 264,"TD venous pressure relief failure." + 265,"TD arterial pressurization timeout." + 266,"TD arterial pressure decay failure." + 267,"TD arterial pressure leak." + 268,"TD arterial pressure relief failure." 269,"FW reserved for use." 270,"FW reserved for use." 271,"FW reserved for use." Index: etc/reports/alarms/AlarmMapping.py =================================================================== diff -u -r1244c4ea38fdf2236ac2e4ce052e9da2200b43fa -r0404b2da32acb3eaf8d41ef627dd51252c80e9ba --- etc/reports/alarms/AlarmMapping.py (.../AlarmMapping.py) (revision 1244c4ea38fdf2236ac2e4ce052e9da2200b43fa) +++ etc/reports/alarms/AlarmMapping.py (.../AlarmMapping.py) (revision 0404b2da32acb3eaf8d41ef627dd51252c80e9ba) @@ -255,19 +255,19 @@ 253 : "FW reserved for use." 254 : "FW reserved for use." 255 : "FW reserved for use." - 256 : "FW reserved for use." - 257 : "FW reserved for use." - 258 : "FW reserved for use." - 259 : "FW reserved for use." - 260 : "FW reserved for use." - 261 : "FW reserved for use." - 262 : "FW reserved for use." - 263 : "FW reserved for use." - 264 : "FW reserved for use." - 265 : "FW reserved for use." - 266 : "FW reserved for use." - 267 : "FW reserved for use." - 268 : "FW reserved for use." + 256 : "TD invalid tubing set." + 257 : "TD install new blood tubing set." + 258 : "TD no tubing set detected." + 259 : "TD tubing set authentication timeout." + 260 : "TD pressure too high to zero." + 261 : "TD venous pressurization timeout." + 262 : "TD venous pressure decay failure." + 263 : "TD venous pressure leak." + 264 : "TD venous pressure relief failure." + 265 : "TD arterial pressurization timeout." + 266 : "TD arterial pressure decay failure." + 267 : "TD arterial pressure leak." + 268 : "TD arterial pressure relief failure." 269 : "FW reserved for use." 270 : "FW reserved for use." 271 : "FW reserved for use." Index: leahi.pro =================================================================== diff -u -rc1651f840faf3ed767fb19b76742b68401f96272 -r0404b2da32acb3eaf8d41ef627dd51252c80e9ba --- leahi.pro (.../leahi.pro) (revision c1651f840faf3ed767fb19b76742b68401f96272) +++ leahi.pro (.../leahi.pro) (revision 0404b2da32acb3eaf8d41ef627dd51252c80e9ba) @@ -405,8 +405,6 @@ sources/model/hd/adjustment/treatment/MTreatmentAdjustBloodDialysateResponse.h \ sources/model/hd/adjustment/treatment/MTreatmentAdjustHeparinResponse.h \ \ # ---------- Models - HD - Adjustment - Disinfeection - sources/model/hd/adjustment/disinfect/MDisinfectAdjustModeRequests.h \ - sources/model/hd/adjustment/disinfect/MDisinfectAdjustModeResponse.h \ sources/model/hd/adjustment/disinfect/MDisinfectAdjustStartResponse.h \ sources/model/hd/adjustment/disinfect/MDisinfectAdjustStartRequests.h \ \ # ---------- Models - HD - Data - Pre-Treatment - Progress @@ -718,7 +716,6 @@ sources/model/hd/adjustment/treatment/MTreatmentAdjustBloodDialysateResponse.cpp \ sources/model/hd/adjustment/treatment/MTreatmentAdjustHeparinResponse.cpp \ \ # ---------- Models - HD - Adjustment - Disinfection - sources/model/hd/adjustment/disinfect/MDisinfectAdjustModeResponse.cpp \ sources/model/hd/adjustment/disinfect/MDisinfectAdjustStartResponse.cpp \ \ # ---------- Models - HD - Data sources/model/hd/data/MHDDebugText.cpp \ Index: leahi.qrc =================================================================== diff -u -rc4a72b20ccc74172b5c5cc6f440f53dc5693908f -r0404b2da32acb3eaf8d41ef627dd51252c80e9ba --- leahi.qrc (.../leahi.qrc) (revision c4a72b20ccc74172b5c5cc6f440f53dc5693908f) +++ leahi.qrc (.../leahi.qrc) (revision 0404b2da32acb3eaf8d41ef627dd51252c80e9ba) @@ -289,7 +289,6 @@ sources/gui/qml/globals/Fonts.qml - sources/gui/qml/pages/disinfect/DisinfectBase.qml sources/gui/qml/pages/disinfect/DisinfectStack.qml Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -r9b81b18319ff46f1e48d5637a6a8938d2f7735c9 -r0404b2da32acb3eaf8d41ef627dd51252c80e9ba --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 9b81b18319ff46f1e48d5637a6a8938d2f7735c9) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 0404b2da32acb3eaf8d41ef627dd51252c80e9ba) @@ -972,19 +972,6 @@ /*! * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Disinfect mode request Denali message. - * \param vData - Data model contains the initiate/cancel boolean disinfection mode - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustDisinfectModeRequestData &vData) -{ - QVariantList mData; - mData += vData.mInititate; - actionTransmit(GuiActionType::ID_AdjustDisinfectModeReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment * \details This method transmits the UI power on self test final result * \param vData - Data model contains the final result of the UI POST * \return void Index: sources/canbus/MessageDispatcher.h =================================================================== diff -u -rdf61c476838011a343a6930fd5b30404629379bc -r0404b2da32acb3eaf8d41ef627dd51252c80e9ba --- sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision df61c476838011a343a6930fd5b30404629379bc) +++ sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision 0404b2da32acb3eaf8d41ef627dd51252c80e9ba) @@ -164,7 +164,6 @@ GuiActionType::ID_AdjustPatientDisconnectConfirmReq , GuiActionType::ID_AdjustDisposablesRemovalConfirmReq , // Disinfect - GuiActionType::ID_AdjustDisinfectModeReq , GuiActionType::ID_AdjustDisinfectStartReq , // DG Cleaning GuiActionType::ID_AdjustDGCleaningUsageReq , Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -re08fda600a9ee3cb4ca6b7f46cd8fdaf9db4c4c3 -r0404b2da32acb3eaf8d41ef627dd51252c80e9ba --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision e08fda600a9ee3cb4ca6b7f46cd8fdaf9db4c4c3) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 0404b2da32acb3eaf8d41ef627dd51252c80e9ba) @@ -340,8 +340,6 @@ {Gui::GuiActionType::ID_AdjustDDDateTimeRsp , 2 * 4 }, // 2 parameters each 4bytes // ---- Disinfect - {Gui::GuiActionType::ID_AdjustDisinfectModeReq , 1 * 4 }, // 1 parameter 4bytes - {Gui::GuiActionType::ID_AdjustDisinfectModeRsp , 2 * 4 }, // 2 parameters each 4bytes {Gui::GuiActionType::ID_AdjustDisinfectStartReq , 1 * 4 }, // 1 parameter 4bytes {Gui::GuiActionType::ID_AdjustDisinfectStartRsp , 2 * 4 }, // 2 parameters each 4bytes // ---- DG Cleaning Usage Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -r9b81b18319ff46f1e48d5637a6a8938d2f7735c9 -r0404b2da32acb3eaf8d41ef627dd51252c80e9ba --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 9b81b18319ff46f1e48d5637a6a8938d2f7735c9) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 0404b2da32acb3eaf8d41ef627dd51252c80e9ba) @@ -284,7 +284,6 @@ case Gui::GuiActionType::ID_AdjustDisposablesRemovalConfirmReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustDisposablesRemovalConfirmRequestData ); break; case Gui::GuiActionType::ID_AdjustTreatmentLogReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustTreatmentLogRequestData ); break; // Disinfection - case Gui::GuiActionType::ID_AdjustDisinfectModeReq : INTERPRET_TRANSMIT_MESSAGE(AdjustDisinfectModeRequestData ); break; case Gui::GuiActionType::ID_AdjustDisinfectStartReq : INTERPRET_TRANSMIT_MESSAGE(AdjustDisinfectStartRequestData ); break; // DG Cleaning case Gui::GuiActionType::ID_AdjustDGCleaningUsageReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustDGCleaningUsageRequestData ); break; @@ -586,7 +585,6 @@ case Gui::GuiActionType::ID_TreatmentLogAlarmData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TreatmentLogAlarmData ); break; case Gui::GuiActionType::ID_TreatmentLogEventData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_TreatmentLogEventData ); break; // ----- Disinfection - Adjust - case Gui::GuiActionType::ID_AdjustDisinfectModeRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDisinfectModeRsp ); break; case Gui::GuiActionType::ID_AdjustDisinfectStartRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDisinfectStartRsp ); break; // these need to be standard and use notify as well case Gui::GuiActionType::ID_AdjustUltrafiltrationEditRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustUltrafiltrationEditRsp ); break; Index: sources/gui/GuiGlobals.h =================================================================== diff -u -rc1651f840faf3ed767fb19b76742b68401f96272 -r0404b2da32acb3eaf8d41ef627dd51252c80e9ba --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision c1651f840faf3ed767fb19b76742b68401f96272) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 0404b2da32acb3eaf8d41ef627dd51252c80e9ba) @@ -354,10 +354,8 @@ ID_TreatmentLogEventData = 0x6B00, // 107 //// ----- @LEAHIZED // Disinfect - ID_AdjustDisinfectModeReq = 0x9A0F, // 154 //// ----- @CRAPIZED: had to change to avoid duplication - ID_AdjustDisinfectModeRsp = 0x9B0F, // 155 //// ----- @CRAPIZED: had to change to avoid duplication - ID_AdjustDisinfectStartReq = 0x7F0F, // 127 //// ----- @CRAPIZED: had to change to avoid duplication - ID_AdjustDisinfectStartRsp = 0x800F, // 128 //// ----- @CRAPIZED: had to change to avoid duplication + ID_AdjustDisinfectStartReq = 0xCC00, // 204 //// ----- @LEAHIZED + ID_AdjustDisinfectStartRsp = 0xCD00, // 205 //// ----- @LEAHIZED ID_AdjustDGCleaningUsageReq = 0xB80F, // 184 //// ----- @CRAPIZED: had to change to avoid duplication ID_AdjustDGCleaningUsageRsp = 0x8D0F, // 141 //// ----- @CRAPIZED: had to change to avoid duplication Index: sources/gui/qml/dialogs/EndTreatmentDialog.qml =================================================================== diff -u -readb45e4b85520ef4b92d81bb1f6abb0ee19c61d -r0404b2da32acb3eaf8d41ef627dd51252c80e9ba --- sources/gui/qml/dialogs/EndTreatmentDialog.qml (.../EndTreatmentDialog.qml) (revision eadb45e4b85520ef4b92d81bb1f6abb0ee19c61d) +++ sources/gui/qml/dialogs/EndTreatmentDialog.qml (.../EndTreatmentDialog.qml) (revision 0404b2da32acb3eaf8d41ef627dd51252c80e9ba) @@ -51,4 +51,9 @@ } } } + + Connections { target: vTDTreatmentStates + function onTxEndChanged ( vValue ) { if ( ! vValue && _root.visible) { close() }} + } + } Index: sources/gui/qml/pages/MainStack.qml =================================================================== diff -u -r99e596082b87afd73b06dae039d51e4a67cc5913 -r0404b2da32acb3eaf8d41ef627dd51252c80e9ba --- sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision 99e596082b87afd73b06dae039d51e4a67cc5913) +++ sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision 0404b2da32acb3eaf8d41ef627dd51252c80e9ba) @@ -43,7 +43,8 @@ stackView.initialItem : _root.initialItem // Standby / Disinfection - DisinfectStack { id: _disinfectStack } +// DisinfectStack { id: _disinfectStack } + // Pre Treatment PreTreatmentStack { id: _preTreatmentStack } @@ -81,8 +82,8 @@ function onHomeChanged ( vValue ) { page( _startupScreen , vValue )} function onStandbyChanged ( vValue ) { if ( vTDOpMode.standby ) _preTreatmentStack.clear(vValue) } function onStandbyStartChanged ( vValue ) { /* It depends on the subModes of the standBy. Handled by onHome. */ } - function onStandbyWaitTreatmentChanged ( vValue ) { if ( vValue ) vDisinfectAdjustDisinfect.hasCancel = false } - function onStandbyWaitDisinfectChanged ( vValue ) { page( _disinfectStack , vValue )} +// function onStandbyWaitTreatmentChanged ( vValue ) { if ( vValue ) vDisinfectAdjustDisinfect.hasCancel = false } +// function onStandbyWaitDisinfectChanged ( vValue ) { page( _disinfectStack , vValue )} function onPreTreatmentChanged ( vValue ) { page( _preTreatmentStack , vValue )} function onInTreatmentChanged ( vValue ) { page( _treatmentStack , vValue )} Fisheye: Tag 0404b2da32acb3eaf8d41ef627dd51252c80e9ba refers to a dead (removed) revision in file `sources/gui/qml/pages/disinfect/DisinfectBase.qml'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/gui/qml/pages/disinfect/DisinfectStack.qml =================================================================== diff -u -rcca603facdefb2879d5defb8fd335a978bd63cf5 -r0404b2da32acb3eaf8d41ef627dd51252c80e9ba --- sources/gui/qml/pages/disinfect/DisinfectStack.qml (.../DisinfectStack.qml) (revision cca603facdefb2879d5defb8fd335a978bd63cf5) +++ sources/gui/qml/pages/disinfect/DisinfectStack.qml (.../DisinfectStack.qml) (revision 0404b2da32acb3eaf8d41ef627dd51252c80e9ba) @@ -26,151 +26,151 @@ * \brief the post treatment prime stack screen */ StackItem { id: _root - objectName: "_DisinfectStack" +// objectName: "_DisinfectStack" - stackView.initialItem : null +// stackView.initialItem : null - property int stackStepIndex : 1 +// property int stackStepIndex : 1 - readonly property string disinfectTitle : qsTr("Disinfection") - readonly property string flushTitle : qsTr("Water Flush") - readonly property string heatActiveTitle : qsTr("Heat Disinfect with Active Cool") - readonly property string chemicalTitle : qsTr("Chemical Disinfect") - readonly property string chemFlushTitle : qsTr("Chemical Flush") - readonly property string roPermeateTitle : qsTr("RO Permeate Sample") - readonly property string heatPassiveTitle: qsTr("Heat Disinfect") +// readonly property string disinfectTitle : qsTr("Disinfection") +// readonly property string flushTitle : qsTr("Water Flush") +// readonly property string heatActiveTitle : qsTr("Heat Disinfect with Active Cool") +// readonly property string chemicalTitle : qsTr("Chemical Disinfect") +// readonly property string chemFlushTitle : qsTr("Chemical Flush") +// readonly property string roPermeateTitle : qsTr("RO Permeate Sample") +// readonly property string heatPassiveTitle: qsTr("Heat Disinfect") - function doDisinfectFlush () { vDisinfectAdjustDisinfect.doDisinfectFlush (); page( _disinfectFlush )} - function doDisinfectHeatActiveCool () { vDisinfectAdjustDisinfect.doDisinfectHeatActiveCool (); page( _disinfectHeatActiveCool )} - function doDisinfectChemical () { vDisinfectAdjustDisinfect.doDisinfectChemical (); page( _disinfectChemical )} - function doDisinfectChemFlush () { vDisinfectAdjustDisinfect.doDisinfectChemFlush (); page( _disinfectChemFlush )} - function doDisinfectROPermeate () { vDisinfectAdjustDisinfect.doDisinfectROPermeate (); page( _disinfectROPermeate )} - function doDisinfectHeatPassiveCool () { vDisinfectAdjustDisinfect.doDisinfectHeatPassiveCool (); page( _disinfectHeatPassiveCool )} +// function doDisinfectFlush () { vDisinfectAdjustDisinfect.doDisinfectFlush (); page( _disinfectFlush )} +// function doDisinfectHeatActiveCool () { vDisinfectAdjustDisinfect.doDisinfectHeatActiveCool (); page( _disinfectHeatActiveCool )} +// function doDisinfectChemical () { vDisinfectAdjustDisinfect.doDisinfectChemical (); page( _disinfectChemical )} +// function doDisinfectChemFlush () { vDisinfectAdjustDisinfect.doDisinfectChemFlush (); page( _disinfectChemFlush )} +// function doDisinfectROPermeate () { vDisinfectAdjustDisinfect.doDisinfectROPermeate (); page( _disinfectROPermeate )} +// function doDisinfectHeatPassiveCool () { vDisinfectAdjustDisinfect.doDisinfectHeatPassiveCool (); page( _disinfectHeatPassiveCool )} - function doDisinfectBack () { vDisinfectAdjustDisinfect.doDisinfectClear (); page( _disinfectHome )} - function doDisinfectConfirm () { vDisinfectAdjustDisinfect.doDisinfectConfirm (); } +// function doDisinfectBack () { vDisinfectAdjustDisinfect.doDisinfectClear (); page( _disinfectHome )} +// function doDisinfectConfirm () { vDisinfectAdjustDisinfect.doDisinfectConfirm (); } - function doDisplayReasonText (vPage) { - if ( vDisinfectAdjustDisinfect.adjustment_Accepted ){ vPage.reasonText = "" } - else { vPage.reasonText = vDisinfectAdjustDisinfect.text() } - } +// function doDisplayReasonText (vPage) { +// if ( vDisinfectAdjustDisinfect.adjustment_Accepted ){ vPage.reasonText = "" } +// else { vPage.reasonText = vDisinfectAdjustDisinfect.text() } +// } - DisinfectBase { id : _disinfectHome - objectName : "_disinfectHome" - property int stackStepIndex : 0 - header.stepNames : [ _root.disinfectTitle ] - title.text : _root.disinfectTitle +// DisinfectBase { id : _disinfectHome +// objectName : "_disinfectHome" +// property int stackStepIndex : 0 +// header.stepNames : [ _root.disinfectTitle ] +// title.text : _root.disinfectTitle - TouchGrid { - width : parent.width / 2 - itemWidth : 400 - colCount : 1 - colSpacing : 0 - itemsText : [ _root.flushTitle , _root.heatActiveTitle , _root.chemicalTitle , _root.chemFlushTitle , _root.roPermeateTitle , _root.heatPassiveTitle ] - onItemClicked : [ doDisinfectFlush , doDisinfectHeatActiveCool , doDisinfectChemical , doDisinfectChemFlush , doDisinfectROPermeate , doDisinfectHeatPassiveCool][vIndex]() - } - Image { id: _denaliDeviceImage - anchors.right : parent.right - anchors.verticalCenter : parent.verticalCenter - anchors.rightMargin : Variables.minVGap2 * 4 - fillMode : Image.PreserveAspectFit - width : Variables.denaliDeviceDiameter - height : Variables.denaliDeviceDiameter - source : "qrc:/images/iDenaliDevice" - } - header.backVisible : vDisinfectAdjustDisinfect .hasCancel // if initiated by User from setting can be canceled. - onBackClicked : { vDisinfectAdjustDisinfect .doDisinfectCancel () } - } +// TouchGrid { +// width : parent.width / 2 +// itemWidth : 400 +// colCount : 1 +// colSpacing : 0 +// itemsText : [ _root.flushTitle , _root.heatActiveTitle , _root.chemicalTitle , _root.chemFlushTitle , _root.roPermeateTitle , _root.heatPassiveTitle ] +// onItemClicked : [ doDisinfectFlush , doDisinfectHeatActiveCool , doDisinfectChemical , doDisinfectChemFlush , doDisinfectROPermeate , doDisinfectHeatPassiveCool][vIndex]() +// } +// Image { id: _denaliDeviceImage +// anchors.right : parent.right +// anchors.verticalCenter : parent.verticalCenter +// anchors.rightMargin : Variables.minVGap2 * 4 +// fillMode : Image.PreserveAspectFit +// width : Variables.denaliDeviceDiameter +// height : Variables.denaliDeviceDiameter +// source : "qrc:/images/iDenaliDevice" +// } +// header.backVisible : vDisinfectAdjustDisinfect .hasCancel // if initiated by User from setting can be canceled. +// onBackClicked : { vDisinfectAdjustDisinfect .doDisinfectCancel () } +// } - DisinfectBase { id : _disinfectFlush - objectName : "_disinfectFlush" - header.stepNames : [ _root.disinfectTitle , _root.flushTitle ] - title.text : _root.flushTitle - instructionBased : true - header.backVisible : true - header.confirmVisible : true - onBackClicked : doDisinfectBack () - onConfirmClicked : doDisinfectConfirm () - } +// DisinfectBase { id : _disinfectFlush +// objectName : "_disinfectFlush" +// header.stepNames : [ _root.disinfectTitle , _root.flushTitle ] +// title.text : _root.flushTitle +// instructionBased : true +// header.backVisible : true +// header.confirmVisible : true +// onBackClicked : doDisinfectBack () +// onConfirmClicked : doDisinfectConfirm () +// } - DisinfectBase { id : _disinfectHeatActiveCool - objectName : "_disinfectHeatActiveCool" - header.stepLineLength : 200 - header.stepNames : [ _root.disinfectTitle , _root.heatActiveTitle ] - title.text : _root.heatActiveTitle - instructionBased : true - header.backVisible : true - header.confirmVisible : true - onBackClicked : doDisinfectBack () - onConfirmClicked : doDisinfectConfirm () - } +// DisinfectBase { id : _disinfectHeatActiveCool +// objectName : "_disinfectHeatActiveCool" +// header.stepLineLength : 200 +// header.stepNames : [ _root.disinfectTitle , _root.heatActiveTitle ] +// title.text : _root.heatActiveTitle +// instructionBased : true +// header.backVisible : true +// header.confirmVisible : true +// onBackClicked : doDisinfectBack () +// onConfirmClicked : doDisinfectConfirm () +// } - DisinfectBase { id : _disinfectChemical - objectName : "_disinfectChemical" - header.stepNames : [ _root.disinfectTitle , _root.chemicalTitle ] - title.text : _root.chemicalTitle - instructionBased : true - header.backVisible : true - header.confirmVisible : true - onBackClicked : doDisinfectBack () - onConfirmClicked : doDisinfectConfirm () - } +// DisinfectBase { id : _disinfectChemical +// objectName : "_disinfectChemical" +// header.stepNames : [ _root.disinfectTitle , _root.chemicalTitle ] +// title.text : _root.chemicalTitle +// instructionBased : true +// header.backVisible : true +// header.confirmVisible : true +// onBackClicked : doDisinfectBack () +// onConfirmClicked : doDisinfectConfirm () +// } - DisinfectBase { id : _disinfectChemFlush - objectName : "_disinfectChemFlush" - header.stepNames : [ _root.disinfectTitle , _root.chemFlushTitle ] - title.text : _root.chemFlushTitle - instructionBased : true - header.backVisible : true - header.confirmVisible : true - onBackClicked : doDisinfectBack () - onConfirmClicked : doDisinfectConfirm () - } +// DisinfectBase { id : _disinfectChemFlush +// objectName : "_disinfectChemFlush" +// header.stepNames : [ _root.disinfectTitle , _root.chemFlushTitle ] +// title.text : _root.chemFlushTitle +// instructionBased : true +// header.backVisible : true +// header.confirmVisible : true +// onBackClicked : doDisinfectBack () +// onConfirmClicked : doDisinfectConfirm () +// } - DisinfectBase { id : _disinfectROPermeate - objectName : "_disinfectROPermeate" - header.stepNames : [ _root.disinfectTitle , _root.roPermeateTitle ] - title.text : _root.roPermeateTitle - instructionBased : true - header.backVisible : true - header.confirmVisible : true - onBackClicked : doDisinfectBack () - onConfirmClicked : doDisinfectConfirm () - } +// DisinfectBase { id : _disinfectROPermeate +// objectName : "_disinfectROPermeate" +// header.stepNames : [ _root.disinfectTitle , _root.roPermeateTitle ] +// title.text : _root.roPermeateTitle +// instructionBased : true +// header.backVisible : true +// header.confirmVisible : true +// onBackClicked : doDisinfectBack () +// onConfirmClicked : doDisinfectConfirm () +// } - DisinfectBase { id : _disinfectHeatPassiveCool - objectName : "_disinfectHeatPassiveCool" - header.stepNames : [ _root.disinfectTitle , _root.heatPassiveTitle ] - title.text : _root.heatPassiveTitle - instructionBased : true - header.backVisible : true - header.confirmVisible : true - onBackClicked : doDisinfectBack () - onConfirmClicked : doDisinfectConfirm () - } +// DisinfectBase { id : _disinfectHeatPassiveCool +// objectName : "_disinfectHeatPassiveCool" +// header.stepNames : [ _root.disinfectTitle , _root.heatPassiveTitle ] +// title.text : _root.heatPassiveTitle +// instructionBased : true +// header.backVisible : true +// header.confirmVisible : true +// onBackClicked : doDisinfectBack () +// onConfirmClicked : doDisinfectConfirm () +// } // ----- Navigation - Connections { target: vTDOpMode - function onStandbyWaitDisinfectChanged ( vValue ) { page( _disinfectHome , vValue )} // initialItem - } +// Connections { target: vTDOpMode +// function onStandbyWaitDisinfectChanged ( vValue ) { page( _disinfectHome , vValue )} // initialItem +// } - // ----- Responses - Connections { target: vDisinfectAdjustDisinfect - function onAdjustment_DisinfectModeTriggered ( vValue ) { doDisplayReasonText( _disinfectHome )} - function onAdjustment_DisinfectStartFlushTriggered ( vValue ) { doDisplayReasonText( _disinfectFlush )} - function onAdjustment_DisinfectStartHeatActiveTriggered ( vValue ) { doDisplayReasonText( _disinfectHeatActiveCool )} - function onAdjustment_DisinfectStartChemicalTriggered ( vValue ) { doDisplayReasonText( _disinfectChemical )} - function onAdjustment_DisinfectStartChemFlushTriggered ( vValue ) { doDisplayReasonText( _disinfectChemFlush )} - function onAdjustment_DisinfectStartROPermeateTriggered ( vValue ) { doDisplayReasonText( _disinfectROPermeate )} - function onAdjustment_DisinfectStartHeatPassiveTriggered ( vValue ) { doDisplayReasonText( _disinfectHeatPassiveCool)} - } +// // ----- Responses +// Connections { target: vDisinfectAdjustDisinfect +// function onAdjustment_DisinfectModeTriggered ( vValue ) { doDisplayReasonText( _disinfectHome )} +// function onAdjustment_DisinfectStartFlushTriggered ( vValue ) { doDisplayReasonText( _disinfectFlush )} +// function onAdjustment_DisinfectStartHeatActiveTriggered ( vValue ) { doDisplayReasonText( _disinfectHeatActiveCool )} +// function onAdjustment_DisinfectStartChemicalTriggered ( vValue ) { doDisplayReasonText( _disinfectChemical )} +// function onAdjustment_DisinfectStartChemFlushTriggered ( vValue ) { doDisplayReasonText( _disinfectChemFlush )} +// function onAdjustment_DisinfectStartROPermeateTriggered ( vValue ) { doDisplayReasonText( _disinfectROPermeate )} +// function onAdjustment_DisinfectStartHeatPassiveTriggered ( vValue ) { doDisplayReasonText( _disinfectHeatPassiveCool)} +// } - onVisibleChanged: { - if (visible) { - _mainMenu.hidden = true - } - else { - stackView.initialItem = null - } - } +// onVisibleChanged: { +// if (visible) { +// _mainMenu.hidden = true +// } +// else { +// stackView.initialItem = null +// } +// } } Index: sources/gui/qml/pages/settings/SettingsDGCleaning.qml =================================================================== diff -u -r1286d74bd015276aab604808be2766136091c125 -r0404b2da32acb3eaf8d41ef627dd51252c80e9ba --- sources/gui/qml/pages/settings/SettingsDGCleaning.qml (.../SettingsDGCleaning.qml) (revision 1286d74bd015276aab604808be2766136091c125) +++ sources/gui/qml/pages/settings/SettingsDGCleaning.qml (.../SettingsDGCleaning.qml) (revision 0404b2da32acb3eaf8d41ef627dd51252c80e9ba) @@ -89,16 +89,16 @@ childrenWidth: parent.width / 3 children: [ TouchRect { text.text: qsTr("Proceed to Cleaning Mode") - onClicked: { vDisinfectAdjustDisinfect .doDisinfectInitiate () } +// onClicked: { vDisinfectAdjustDisinfect .doDisinfectInitiate () } } ] } // ----- Responses - Connections { target: vDisinfectAdjustDisinfect - function onAdjustment_DisinfectModeTriggered ( vValue ) { - if ( vDisinfectAdjustDisinfect.adjustment_Accepted ){ _root.notificationText = "" } - else { _root.notificationText = vDisinfectAdjustDisinfect.text() } - } - } +// Connections { target: vDisinfectAdjustDisinfect +// function onAdjustment_DisinfectModeTriggered ( vValue ) { +// if ( vDisinfectAdjustDisinfect.adjustment_Accepted ){ _root.notificationText = "" } +// else { _root.notificationText = vDisinfectAdjustDisinfect.text() } +// } +// } } Index: sources/model/MModel.h =================================================================== diff -u -rc63c041f361045518ede1c8df212517159a662a5 -r0404b2da32acb3eaf8d41ef627dd51252c80e9ba --- sources/model/MModel.h (.../MModel.h) (revision c63c041f361045518ede1c8df212517159a662a5) +++ sources/model/MModel.h (.../MModel.h) (revision 0404b2da32acb3eaf8d41ef627dd51252c80e9ba) @@ -192,9 +192,7 @@ #include "MTreatmentLogEventData.h" // Disinfection -#include "MDisinfectAdjustModeRequests.h" #include "MDisinfectAdjustStartRequests.h" -#include "MDisinfectAdjustModeResponse.h" #include "MDisinfectAdjustStartResponse.h" #include "MAdjustDGCleaningUsageResponse.h" @@ -464,7 +462,6 @@ REGISTER_METATYPE( AdjustPatientConnectionConfirmRequestData ) \ REGISTER_METATYPE( AdjustStartTreatmentRequestData ) \ /* Disinfection */ \ - REGISTER_METATYPE( AdjustDisinfectModeRequestData ) \ REGISTER_METATYPE( AdjustDisinfectStartRequestData ) \ /* DGCleaningUsage */ \ REGISTER_METATYPE( AdjustDGCleaningUsageRequestData ) \ @@ -526,7 +523,6 @@ REGISTER_METATYPE( AdjustPatientConnectionConfirmResponseData ) \ REGISTER_METATYPE( AdjustStartTreatmentResponseData ) \ /* Disinfect */ \ - REGISTER_METATYPE( AdjustDisinfectModeResponseData ) \ REGISTER_METATYPE( AdjustDisinfectStartResponseData ) \ REGISTER_METATYPE( AdjustDGCleaningUsageResponseData ) \ \ @@ -710,7 +706,6 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustPatientConnectionConfirmResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustStartTreatmentResponseData ) \ /* Disinfect */ \ - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDisinfectModeResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDisinfectStartResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDGCleaningUsageResponseData ) \ \ @@ -826,7 +821,6 @@ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustPatientConnectionConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustStartTreatmentRequestData ) \ /* Disinfection */ \ - ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDisinfectModeRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDisinfectStartRequestData ) \ /* DG Cleaning Usage */ \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustDGCleaningUsageRequestData ) \ @@ -972,7 +966,6 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustPatientConnectionConfirmResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustStartTreatmentResponseData ) \ /* Disinfect */ \ - ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDisinfectModeResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDisinfectStartResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDGCleaningUsageResponseData ) \ \ @@ -1052,7 +1045,6 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustPatientConnectionConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustStartTreatmentRequestData ) \ /* Disinfection */ \ - ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDisinfectModeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDisinfectStartRequestData ) \ /* DG Cleaning Usage */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDGCleaningUsageRequestData ) \ @@ -1132,7 +1124,6 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustPatientConnectionConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustStartTreatmentRequestData ) \ /* Disinfection */ \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDisinfectModeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDisinfectStartRequestData ) \ /* DG Cleaning Usage */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDGCleaningUsageRequestData ) \ @@ -1212,7 +1203,6 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustPatientConnectionConfirmRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustStartTreatmentRequestData ) \ /* Disinfection */ \ - ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDisinfectModeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDisinfectStartRequestData ) \ /* DG Cleaning Usage */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDGCleaningUsageRequestData ) \ @@ -1379,7 +1369,6 @@ ACTION_RECEIVE_SIGNAL( AdjustPatientConnectionConfirmResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustStartTreatmentResponseData ) \ /* Disinfect */ \ - ACTION_RECEIVE_SIGNAL( AdjustDisinfectModeResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustDisinfectStartResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustDGCleaningUsageResponseData ) \ \ Fisheye: Tag 0404b2da32acb3eaf8d41ef627dd51252c80e9ba refers to a dead (removed) revision in file `sources/model/hd/adjustment/disinfect/MDisinfectAdjustModeRequests.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0404b2da32acb3eaf8d41ef627dd51252c80e9ba refers to a dead (removed) revision in file `sources/model/hd/adjustment/disinfect/MDisinfectAdjustModeResponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0404b2da32acb3eaf8d41ef627dd51252c80e9ba refers to a dead (removed) revision in file `sources/model/hd/adjustment/disinfect/MDisinfectAdjustModeResponse.h'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/model/hd/adjustment/disinfect/MDisinfectAdjustStartRequests.h =================================================================== diff -u -rf2e4eba6e85c5d36537be782926f23cc9dc01037 -r0404b2da32acb3eaf8d41ef627dd51252c80e9ba --- sources/model/hd/adjustment/disinfect/MDisinfectAdjustStartRequests.h (.../MDisinfectAdjustStartRequests.h) (revision f2e4eba6e85c5d36537be782926f23cc9dc01037) +++ sources/model/hd/adjustment/disinfect/MDisinfectAdjustStartRequests.h (.../MDisinfectAdjustStartRequests.h) (revision 0404b2da32acb3eaf8d41ef627dd51252c80e9ba) @@ -40,7 +40,7 @@ * * | MSG | CAN ID | Type | Ack | Src | Dest | Description | * |:----:|:------:|:----:|:---:|:---:|:----:|:-----------:| - * |0x7F00| 0x100 | Req | Y | UI | HD | Flush, Heat/Chemical Disinfect Request | + * |0xCC00| 0x100 | Req | Y | UI | TD | Flush, Heat/Chemical Disinfect Request | * * | Payload || * | || Index: sources/model/hd/adjustment/disinfect/MDisinfectAdjustStartResponse.h =================================================================== diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -r0404b2da32acb3eaf8d41ef627dd51252c80e9ba --- sources/model/hd/adjustment/disinfect/MDisinfectAdjustStartResponse.h (.../MDisinfectAdjustStartResponse.h) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ sources/model/hd/adjustment/disinfect/MDisinfectAdjustStartResponse.h (.../MDisinfectAdjustStartResponse.h) (revision 0404b2da32acb3eaf8d41ef627dd51252c80e9ba) @@ -32,7 +32,7 @@ * * | MSG | CAN ID | Type | Ack | Src | Dest | Description | * |:----:|:------:|:----:|:---:|:---:|:----:|:---------: | - * |0x8000| 0x020 | Rsp | Y | HD | UI | Flush, Heat/Chemical Disinfect Response | + * |0xCD00| 0x020 | Rsp | Y | TD | UI | Flush, Heat/Chemical Disinfect Response | * * | Payload || * | || @@ -46,7 +46,7 @@ * | || * | || * | typeText | Event | - * | unitText | HD | + * | unitText | TD | * | infoText | AdjustDisinfect | * */ Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -r1244c4ea38fdf2236ac2e4ce052e9da2200b43fa -r0404b2da32acb3eaf8d41ef627dd51252c80e9ba --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 1244c4ea38fdf2236ac2e4ce052e9da2200b43fa) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 0404b2da32acb3eaf8d41ef627dd51252c80e9ba) @@ -289,19 +289,19 @@ /*0253*/case GuiAlarmID::ALARM_ID_FW_RESERVED_253 : { result = QObject::tr("FW reserved for use." ); break; } /* 253*/ /*0254*/case GuiAlarmID::ALARM_ID_FW_RESERVED_254 : { result = QObject::tr("FW reserved for use." ); break; } /* 254*/ /*0255*/case GuiAlarmID::ALARM_ID_FW_RESERVED_255 : { result = QObject::tr("FW reserved for use." ); break; } /* 255*/ -/*0256*/case GuiAlarmID::ALARM_ID_FW_RESERVED_256 : { result = QObject::tr("FW reserved for use." ); break; } /* 256*/ -/*0257*/case GuiAlarmID::ALARM_ID_FW_RESERVED_257 : { result = QObject::tr("FW reserved for use." ); break; } /* 257*/ -/*0258*/case GuiAlarmID::ALARM_ID_FW_RESERVED_258 : { result = QObject::tr("FW reserved for use." ); break; } /* 258*/ -/*0259*/case GuiAlarmID::ALARM_ID_FW_RESERVED_259 : { result = QObject::tr("FW reserved for use." ); break; } /* 259*/ -/*0260*/case GuiAlarmID::ALARM_ID_FW_RESERVED_260 : { result = QObject::tr("FW reserved for use." ); break; } /* 260*/ -/*0261*/case GuiAlarmID::ALARM_ID_FW_RESERVED_261 : { result = QObject::tr("FW reserved for use." ); break; } /* 261*/ -/*0262*/case GuiAlarmID::ALARM_ID_FW_RESERVED_262 : { result = QObject::tr("FW reserved for use." ); break; } /* 262*/ -/*0263*/case GuiAlarmID::ALARM_ID_FW_RESERVED_263 : { result = QObject::tr("FW reserved for use." ); break; } /* 263*/ -/*0264*/case GuiAlarmID::ALARM_ID_FW_RESERVED_264 : { result = QObject::tr("FW reserved for use." ); break; } /* 264*/ -/*0265*/case GuiAlarmID::ALARM_ID_FW_RESERVED_265 : { result = QObject::tr("FW reserved for use." ); break; } /* 265*/ -/*0266*/case GuiAlarmID::ALARM_ID_FW_RESERVED_266 : { result = QObject::tr("FW reserved for use." ); break; } /* 266*/ -/*0267*/case GuiAlarmID::ALARM_ID_FW_RESERVED_267 : { result = QObject::tr("FW reserved for use." ); break; } /* 267*/ -/*0268*/case GuiAlarmID::ALARM_ID_FW_RESERVED_268 : { result = QObject::tr("FW reserved for use." ); break; } /* 268*/ +/*0256*/case GuiAlarmID::ALARM_ID_TD_INVALID_TUBING_SET : { result = QObject::tr("TD invalid tubing set." ); break; } /* 256*/ +/*0257*/case GuiAlarmID::ALARM_ID_TD_INSTALL_NEW_BLOOD_TUBING_SET : { result = QObject::tr("TD install new blood tubing set." ); break; } /* 257*/ +/*0258*/case GuiAlarmID::ALARM_ID_TD_TUBING_SET_NOT_DETECTED : { result = QObject::tr("TD no tubing set detected." ); break; } /* 258*/ +/*0259*/case GuiAlarmID::ALARM_ID_TD_TUBING_SET_AUTHENTICATION_TIMEOUT : { result = QObject::tr("TD tubing set authentication timeout." ); break; } /* 259*/ +/*0260*/case GuiAlarmID::ALARM_ID_TD_PRESSURE_TOO_HIGH_TO_ZERO : { result = QObject::tr("TD pressure too high to zero." ); break; } /* 260*/ +/*0261*/case GuiAlarmID::ALARM_ID_TD_VENOUS_PRESSURIZATION_TIMEOUT : { result = QObject::tr("TD venous pressurization timeout." ); break; } /* 261*/ +/*0262*/case GuiAlarmID::ALARM_ID_TD_VENOUS_PRESSURE_DECAY : { result = QObject::tr("TD venous pressure decay failure." ); break; } /* 262*/ +/*0263*/case GuiAlarmID::ALARM_ID_TD_VENOUS_PRESSURE_LEAK : { result = QObject::tr("TD venous pressure leak." ); break; } /* 263*/ +/*0264*/case GuiAlarmID::ALARM_ID_TD_VENOUS_PRESSURE_RELIEF : { result = QObject::tr("TD venous pressure relief failure." ); break; } /* 264*/ +/*0265*/case GuiAlarmID::ALARM_ID_TD_ARTERIAL_PRESSURIZATION_TIMEOUT : { result = QObject::tr("TD arterial pressurization timeout." ); break; } /* 265*/ +/*0266*/case GuiAlarmID::ALARM_ID_TD_ARTERIAL_PRESSURE_DECAY : { result = QObject::tr("TD arterial pressure decay failure." ); break; } /* 266*/ +/*0267*/case GuiAlarmID::ALARM_ID_TD_ARTERIAL_PRESSURE_LEAK : { result = QObject::tr("TD arterial pressure leak." ); break; } /* 267*/ +/*0268*/case GuiAlarmID::ALARM_ID_TD_ARTERIAL_PRESSURE_RELIEF : { result = QObject::tr("TD arterial pressure relief failure." ); break; } /* 268*/ /*0269*/case GuiAlarmID::ALARM_ID_FW_RESERVED_269 : { result = QObject::tr("FW reserved for use." ); break; } /* 269*/ /*0270*/case GuiAlarmID::ALARM_ID_FW_RESERVED_270 : { result = QObject::tr("FW reserved for use." ); break; } /* 270*/ /*0271*/case GuiAlarmID::ALARM_ID_FW_RESERVED_271 : { result = QObject::tr("FW reserved for use." ); break; } /* 271*/ Index: sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r0404b2da32acb3eaf8d41ef627dd51252c80e9ba --- sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp (.../VDisinfectAdjustDisinfect.cpp) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp (.../VDisinfectAdjustDisinfect.cpp) (revision 0404b2da32acb3eaf8d41ef627dd51252c80e9ba) @@ -24,9 +24,6 @@ * \details All the class signal/slot connections are defined here. */ void View::VDisinfectAdjustDisinfect::initConnections() { - ADJUST_VIEW_CONNECTION(AdjustDisinfectModeRequestData); - ACTION_VIEW_CONNECTION(AdjustDisinfectModeResponseData); - ADJUST_VIEW_CONNECTION(AdjustDisinfectStartRequestData); ACTION_VIEW_CONNECTION(AdjustDisinfectStartResponseData); } @@ -36,130 +33,69 @@ * \details received response model data handler * \param vData - model data */ -void View::VDisinfectAdjustDisinfect::onActionReceive(const AdjustDisinfectModeResponseData &vData) -{ - adjustment_Accepted ( vData.mAccepted ); - adjustment_Reason ( vData.mReason ); - - hasCancel ( vData.mAccepted ); - - // *** 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_DisinfectMode(true); - -} - -/*! - * \brief VDisinfectAdjustDisinfect::onActionReceive - * \details received response model data handler - * \param vData - model data - */ void View::VDisinfectAdjustDisinfect::onActionReceive(const AdjustDisinfectStartResponseData &vData) { adjustment_Accepted ( vData.mAccepted ); adjustment_Reason ( vData.mReason ); - // *** 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. *** - switch ( _data.mState ) { - case GuiDisinfectDGStates::DD_DISINFECT_FLUSH_STATE : adjustment_DisinfectStartFlush (true); break; - // FIXENUM: case GuiDisinfectDGStates::DD_DISINFECT_HEAT_STATE_ACTIVE_COOL : adjustment_DisinfectStartHeatActive (true); break; - // FIXENUM: case GuiDisinfectDGStates::DD_DISINFECT_CHEM_STATE : adjustment_DisinfectStartChemical (true); break; - // FIXENUM: case GuiDisinfectDGStates::DD_DISINFECT_CHEM_FLUSH_STATE : adjustment_DisinfectStartChemFlush (true); break; - case GuiDisinfectDGStates::DD_DISINFECT_RO_PERMEATE_SAMPLE_STATE: adjustment_DisinfectStartROPermeate (true); break; - // FIXENUM: case GuiDisinfectDGStates::DD_DISINFECT_HEAT_STATE_PASSIVE_COOL : adjustment_DisinfectStartHeatPassive (true); break; - default: break; - } -} -/*! - * \brief View::VDisinfectAdjustDisinfect::doDisinfectInitiate - * \details Requests the Disinfection mode - */ -void View::VDisinfectAdjustDisinfect::doDisinfectInitiate() -{ - hasCancel(true); - AdjustDisinfectModeRequestData vData; - vData.mInititate = Model::MAdjustDisinfectModeReq::eInitiate; - emit didAdjustment(vData); + adjustment(true); } /*! - * \brief View::VDisinfectAdjustDisinfect::doDisinfectCancel - * \details Requests the Disinfection mode cancellation. - */ -void View::VDisinfectAdjustDisinfect::doDisinfectCancel() -{ - AdjustDisinfectModeRequestData vData; - vData.mInititate = Model::MAdjustDisinfectModeReq::eCancel; - emit didAdjustment(vData); -} + * \brief View::VDisinfectAdjustDisinfect::doSkip + * \details the invocable slot to send user's Disinfect Skip Request -/*! - * \brief View::VDisinfectAdjustDisinfect::doDisinfectClear */ -void View::VDisinfectAdjustDisinfect::doDisinfectClear() +void View::VDisinfectAdjustDisinfect::doSkip() { - _data.mState = GuiDisinfectDGStates::DD_DISINFECT_NOT_RUNNING_STATE; + _data.mState = GuiDisinfectDGStates::DD_DISINFECT_FLUSH_STATE; + emit didAdjustment(_data); } /*! - * \brief View::VDisinfectAdjustDisinfect::doDisinfectFlush + * \brief View::VDisinfectAdjustDisinfect::doFlush * \details the invocable slot to send user's Disinfect Flush Request */ -void View::VDisinfectAdjustDisinfect::doDisinfectFlush() +void View::VDisinfectAdjustDisinfect::doFlush() { _data.mState = GuiDisinfectDGStates::DD_DISINFECT_FLUSH_STATE; + emit didAdjustment(_data); } /*! - * \brief View::VDisinfectAdjustDisinfect::doDisinfectHeatActiveCool - * \details the invocable slot to send user's Disinfect Heat Request with active cool + * \brief View::VDisinfectAdjustDisinfect::doHeat + * \details the invocable slot to send user's Disinfect Heat Request */ -void View::VDisinfectAdjustDisinfect::doDisinfectHeatActiveCool() +void View::VDisinfectAdjustDisinfect::doHeat() { - // FIXENUM: _data.mState = GuiDisinfectDGStates::DD_DISINFECT_HEAT_STATE_ACTIVE_COOL; -} - -/*! - * \brief View::VDisinfectAdjustDisinfect::doDisinfectChemical - * \details the invocable slot to send user's Disinfect Chemical Request - */ -void View::VDisinfectAdjustDisinfect::doDisinfectChemical() -{ // FIXENUM: _data.mState = GuiDisinfectDGStates::DD_DISINFECT_CHEM_STATE; + emit didAdjustment(_data); + } /*! - * \brief View::VDisinfectAdjustDisinfect::doDisinfectChemFlush - * \details the invocable slot to send user's Disinfect Chemical Flush Request + * \brief View::VDisinfectAdjustDisinfect::doHeatCitric + * \details the invocable slot to send user's Disinfect Heat with citric acid Request */ -void View::VDisinfectAdjustDisinfect::doDisinfectChemFlush() +void View::VDisinfectAdjustDisinfect::doHeatCitric() { // FIXENUM: _data.mState = GuiDisinfectDGStates::DD_DISINFECT_CHEM_FLUSH_STATE; + emit didAdjustment(_data); + } /*! - * \brief View::VDisinfectAdjustDisinfect::doDisinfectROPermeate - * \details the invocable slot to send user's Disinfect RO Permeate Request + * \brief View::VDisinfectAdjustDisinfect::doSubstitutionPort + * \details the invocable slot to send user's Disinfect Substitution port Request */ -void View::VDisinfectAdjustDisinfect::doDisinfectROPermeate() +void View::VDisinfectAdjustDisinfect::doSubstitutionPort() { _data.mState = GuiDisinfectDGStates::DD_DISINFECT_RO_PERMEATE_SAMPLE_STATE; -} + emit didAdjustment(_data); -/*! - * \brief View::VDisinfectAdjustDisinfect::doDisinfectHeatPassiveCool - * \details the invocable slot to send user's Disinfect Heat Request with passive cool - */ -void View::VDisinfectAdjustDisinfect::doDisinfectHeatPassiveCool() -{ - // FIXENUM: _data.mState = GuiDisinfectDGStates::DD_DISINFECT_HEAT_STATE_PASSIVE_COOL; } -void View::VDisinfectAdjustDisinfect::doDisinfectConfirm() -{ - emit didAdjustment(_data); -} + Index: sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r0404b2da32acb3eaf8d41ef627dd51252c80e9ba --- sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h (.../VDisinfectAdjustDisinfect.h) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h (.../VDisinfectAdjustDisinfect.h) (revision 0404b2da32acb3eaf8d41ef627dd51252c80e9ba) @@ -19,9 +19,7 @@ // Project #include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" -#include "MDisinfectAdjustModeRequests.h" #include "MDisinfectAdjustStartRequests.h" -#include "MDisinfectAdjustModeResponse.h" #include "MDisinfectAdjustStartResponse.h" namespace View { @@ -41,41 +39,20 @@ friend class ::tst_views; AdjustDisinfectStartRequestData _data; + TRIGGER( bool , adjustment , 0 ) - TRIGGER ( bool , adjustment_DisinfectMode , 0) - TRIGGER ( bool , adjustment_DisinfectStartFlush , 0) - TRIGGER ( bool , adjustment_DisinfectStartHeatActive , 0) - TRIGGER ( bool , adjustment_DisinfectStartChemical , 0) - TRIGGER ( bool , adjustment_DisinfectStartChemFlush , 0) - TRIGGER ( bool , adjustment_DisinfectStartROPermeate , 0) - TRIGGER ( bool , adjustment_DisinfectStartHeatPassive, 0) - - PROPERTY( bool , hasCancel , 0) - VIEW_DEC_CLASS(VDisinfectAdjustDisinfect) - VIEW_DEC_SLOT(AdjustDisinfectModeResponseData) VIEW_DEC_SLOT(AdjustDisinfectStartResponseData) public slots: - void doDisinfectInitiate (); - void doDisinfectCancel (); - void doDisinfectClear (); - void doDisinfectFlush (); - void doDisinfectHeatActiveCool (); - void doDisinfectChemical (); - void doDisinfectChemFlush (); - void doDisinfectROPermeate (); - void doDisinfectConfirm (); - void doDisinfectHeatPassiveCool (); + void doSkip (); + void doFlush (); + void doHeat (); + void doHeatCitric (); + void doSubstitutionPort (); signals: - /*! - * \brief didAdjustment - * \details the notification signal to send the user's Disinfect Mode Request - * \param vData - data model includes request information - */ - void didAdjustment(const AdjustDisinfectModeRequestData &vData); /*! * \brief didAdjustment