Index: main.cpp =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r8c92a0d2fc6cb6475f502153dcbb0dacc7660021 --- main.cpp (.../main.cpp) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ main.cpp (.../main.cpp) (revision 8c92a0d2fc6cb6475f502153dcbb0dacc7660021) @@ -544,7 +544,7 @@ //! - Qt Application initialization and parameters settings // Qt Core Application parameters settings - QApplication::setApplicationName(QLatin1String("Denali")); + QApplication::setApplicationName(QLatin1String("Leahi")); QApplication::setOrganizationName(QLatin1String("Diality Inc.")); //! - Check the required font(s) present and can be loaded Index: sources/AlarmGenerator.cpp =================================================================== diff -u -r712f4c8a1b2382919300895b4422b831471044a3 -r8c92a0d2fc6cb6475f502153dcbb0dacc7660021 --- sources/AlarmGenerator.cpp (.../AlarmGenerator.cpp) (revision 712f4c8a1b2382919300895b4422b831471044a3) +++ sources/AlarmGenerator.cpp (.../AlarmGenerator.cpp) (revision 8c92a0d2fc6cb6475f502153dcbb0dacc7660021) @@ -29,7 +29,7 @@ // namespace using namespace Gui; -Model::MAlarmStatus AlarmGenerator::_model; +Model::MAlarmTriggered AlarmGenerator::_model; /*! * \brief AlarmGenerator::setBits @@ -55,24 +55,25 @@ * \details generates the ALARM_ID_TD_COMM_TIMEOUT alarm. * \return The AlarmStatusData filled with appropriate data for the alarm. */ +// AUTOGEN ISSUE const AlarmStatusData AlarmGenerator::ALARM_ID_TD_COMM_TIMEOUT() { AlarmStatusData data; - data.mState = GuiAlarmPriority::ALARM_PRIORITY_HIGH; // Alarm priority - data.mTop = GuiAlarmID::ALARM_ID_TD_COMM_TIMEOUT; // Alarm ID - data.mMuteTimeout = 0; // Alarm timeout - data.mFlags = setBits(NO_BUTTON); // No button since there is no communicate. - _model.data(data); + data.malarmState = GuiAlarmPriority::ALARM_PRIORITY_HIGH; // Alarm priority + data.malarmTop = GuiAlarmID::ALARM_ID_TD_COMM_TIMEOUT; // Alarm ID + data.msilenceExpiresIn = 0; // Alarm timeout + data.malarmsFlags = 0; //setBits(NO_BUTTON); // No button since there is no communicate. + //_model.data(data); return data; } -const AlarmStatusData AlarmGenerator::ALARM_ID_NO_ALARM() +const AlarmTriggeredData AlarmGenerator::ALARM_ID_NO_ALARM() { - AlarmStatusData data; - data.mState = GuiAlarmPriority::ALARM_PRIORITY_NONE; // Alarm priority - data.mTop = GuiAlarmID::ALARM_ID_NO_ALARM; // Alarm ID - data.mMuteTimeout = 0; // Alarm timeout - data.mFlags = setBits(NO_BUTTON); // No button since there is no communicate. - _model.data(data); + AlarmTriggeredData data; + //data.mState = GuiAlarmPriority::ALARM_PRIORITY_NONE; // Alarm priority + //data.mTop = GuiAlarmID::ALARM_ID_NO_ALARM; // Alarm ID + //data.mMuteTimeout = 0; // Alarm timeout + //data.mFlags = setBits(NO_BUTTON); // No button since there is no communicate. + //_model.data(data); return data; } Index: sources/AlarmGenerator.h =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r8c92a0d2fc6cb6475f502153dcbb0dacc7660021 --- sources/AlarmGenerator.h (.../AlarmGenerator.h) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/AlarmGenerator.h (.../AlarmGenerator.h) (revision 8c92a0d2fc6cb6475f502153dcbb0dacc7660021) @@ -19,6 +19,7 @@ #include // Project +#include "MAlarmTriggered.h" #include "MAlarmStatusData.h" // forward declarations @@ -33,7 +34,7 @@ // friends friend class ::tst_messaging; - static Model::MAlarmStatus _model; + static Model::MAlarmTriggered _model; // typedef /*! \brief quint16 depends on the Alarm_State_Flag_Bit_Positions length. @@ -61,6 +62,6 @@ // static const AlarmStatusData (); // is the enum from GuiAlarmID like ALARM_ID_TD_COMM_TIMEOUT static const AlarmStatusData ALARM_ID_TD_COMM_TIMEOUT(); - static const AlarmStatusData ALARM_ID_NO_ALARM(); + static const AlarmTriggeredData ALARM_ID_NO_ALARM(); }; Index: sources/ApplicationController.cpp =================================================================== diff -u -rf2e4eba6e85c5d36537be782926f23cc9dc01037 -r8c92a0d2fc6cb6475f502153dcbb0dacc7660021 --- sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision f2e4eba6e85c5d36537be782926f23cc9dc01037) +++ sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision 8c92a0d2fc6cb6475f502153dcbb0dacc7660021) @@ -27,7 +27,6 @@ #include "Settings.h" #include "MSettings.h" #include "BluetoothInterface.h" -#include "VAdjustmentVersions.h" /*! * \brief ApplicationController::ApplicationController @@ -366,6 +365,8 @@ else { mData += static_cast(GuiActionData::NoData); } + + // AUTOGEN ISSUE onActionTransmit(GuiActionType::ID_TDCheckIn, mData); #endif } @@ -481,9 +482,10 @@ void ApplicationController::postDoneRequest() { - AdjustUIPostFinalResultRequestData data; - data.mResult = _post.isDone(); - emit didAdjustment(data); + // AUTOGEN ISSUE + //AdjustUIPostFinalResultRequestData data; + //data.mResult = _post.isDone(); + //emit didAdjustment(data); } /*! @@ -507,7 +509,8 @@ */ void ApplicationController::onSettingsUpdate() { - onActionReceive(SettingsData()); + // AUTOGEN ISSUE + //onActionReceive(SettingsData()); /// POST /// //call initialization functions when setting's ready. @@ -659,8 +662,9 @@ * \details Sends a version request */ void ApplicationController::versionsRequest() { - AdjustVersionsRequestData adjustVersionsRequestData; - emit didAdjustment(adjustVersionsRequestData); + // AUTOGEN ISSUE + //AdjustVersionsRequestData adjustVersionsRequestData; + //emit didAdjustment(adjustVersionsRequestData); LOG_DEBUG("POSTVersionReq Sent"); } @@ -669,8 +673,9 @@ * \details Sends an institutional record request */ void ApplicationController::institutionalRequest() { - AdjustInstitutionalRequestData adjustInstitutionalRequestData; - emit didAdjustment(adjustInstitutionalRequestData); + // AUTOGEN ISSUE + //AdjustInstitutionalRequestData adjustInstitutionalRequestData; + //emit didAdjustment(adjustInstitutionalRequestData); LOG_DEBUG("POSTInstitutionalRecordReq Sent"); } Index: sources/ApplicationController.h =================================================================== diff -u -rf2e4eba6e85c5d36537be782926f23cc9dc01037 -r8c92a0d2fc6cb6475f502153dcbb0dacc7660021 --- sources/ApplicationController.h (.../ApplicationController.h) (revision f2e4eba6e85c5d36537be782926f23cc9dc01037) +++ sources/ApplicationController.h (.../ApplicationController.h) (revision 8c92a0d2fc6cb6475f502153dcbb0dacc7660021) @@ -19,10 +19,12 @@ // Project #include "main.h" // Doxygen : do not remove -#include "MModel.h" +//#include "MModel.h" +#include "MModelAutoGen.h" #include "ApplicationPost.h" -#include "GuiGlobals.h" -#include "MessageGlobals.h" +#include "GuiGlobalsAutoGen.h" +//#include "GuiGlobalsAutoGen.h" +#include "MessageGlobalsAutoGen.h" #include "DeviceGlobals.h" // define @@ -197,10 +199,10 @@ ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS ACTION_RECEIVE_MODEL_BRIDGE_DEFINITIONS - ACTION_RECEIVE_PRIVATE_SLOT_NOEMIT(UIPostFinalResultHDRequestData) { - postDoneRequest(); - emit didActionReceive(vData); - } + //ACTION_RECEIVE_PRIVATE_SLOT_NOEMIT(UIPostFinalResultHDRequestData) { + // postDoneRequest(); + // emit didActionReceive(vData); + //} // TODO: do the same for Settings. SAFE_CALL(startPOST) Index: sources/ApplicationPost.h =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r8c92a0d2fc6cb6475f502153dcbb0dacc7660021 --- sources/ApplicationPost.h (.../ApplicationPost.h) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/ApplicationPost.h (.../ApplicationPost.h) (revision 8c92a0d2fc6cb6475f502153dcbb0dacc7660021) @@ -18,7 +18,7 @@ #include // Project -#include "GuiGlobals.h" +#include "GuiGlobalsAutoGen.h" /*! * \brief The ApplicationPost class Index: sources/Threads.cpp =================================================================== diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -r8c92a0d2fc6cb6475f502153dcbb0dacc7660021 --- sources/Threads.cpp (.../Threads.cpp) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ sources/Threads.cpp (.../Threads.cpp) (revision 8c92a0d2fc6cb6475f502153dcbb0dacc7660021) @@ -19,7 +19,7 @@ #include // Application -#include "MessageGlobals.h" +#include "MessageGlobalsAutoGen.h" /*! * \details All the Thread has been and shall be defined in here Index: sources/bluetooth/BluetoothInterface.cpp =================================================================== diff -u -rf2e4eba6e85c5d36537be782926f23cc9dc01037 -r8c92a0d2fc6cb6475f502153dcbb0dacc7660021 --- sources/bluetooth/BluetoothInterface.cpp (.../BluetoothInterface.cpp) (revision f2e4eba6e85c5d36537be782926f23cc9dc01037) +++ sources/bluetooth/BluetoothInterface.cpp (.../BluetoothInterface.cpp) (revision 8c92a0d2fc6cb6475f502153dcbb0dacc7660021) @@ -674,7 +674,7 @@ NOTIFY_DETAILS_CHANGE if (vCharacteristic.uuid() == QBluetoothUuid(QBluetoothUuid::BloodPressureMeasurement)) { - interpretBloodPressure(vValue); + //interpretBloodPressure(vValue); // AUTOGEN ISSUE } qDebug() << "---------" << vCharacteristic.name() << vValue; } @@ -1180,46 +1180,6 @@ } /*! - * \brief BluetoothInterface::notifyBloodPressure - * \details The main notifier of the Vital measurement. - * \param vModel - The Blood pressure model of type MUIBloodPressure - */ -void BluetoothInterface::notifyBloodPressure(const MUIBloodPressure &vModel) -{ - UIBloodPressureData data = vModel.data(); - emit didActionReceive(data); - LOG_APPED_UI(vModel.toString()); -} - -/*! - * \brief BluetoothInterface::mimic - * \details A mimic function to simulate the vital measured values. - * \param vSystolic - Systolic Viral value - * \param vDiastolic - Diastolic Viral value - * \param vPulseRate - Pulse Rate Viral value - */ -void BluetoothInterface::mimic(quint16 vSystolic , - quint16 vDiastolic , - quint16 vPulseRate ) { - MUIBloodPressure model(vSystolic , - vDiastolic , - vPulseRate ); - notifyBloodPressure(model); -} - -/*! - * \brief BluetoothInterface::interpretBloodPressure - * \details Interpreting the blood pressure message QByteArray vData and extracting the values of Systolic, Diastolic, HeartRate. - * \param vData - the received QByteArray of data. - */ -void BluetoothInterface::interpretBloodPressure(const QByteArray &vData) -{ - MUIBloodPressure model; - model.fromByteArray(vData); - notifyBloodPressure(model); -} - -/*! * \brief BluetoothInterface::interpretInformation * \details Interpreting the Remote device information QByteArray vData, currently just consoles out. */ Index: sources/bluetooth/BluetoothInterface.h =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r8c92a0d2fc6cb6475f502153dcbb0dacc7660021 --- sources/bluetooth/BluetoothInterface.h (.../BluetoothInterface.h) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/bluetooth/BluetoothInterface.h (.../BluetoothInterface.h) (revision 8c92a0d2fc6cb6475f502153dcbb0dacc7660021) @@ -24,7 +24,7 @@ // Project #include "main.h" // Doxygen : do not remove #include "MBluetooth.h" -#include "MUIBloodPressureData.h" +//#include "MUIBloodPressureData.h" #include "DeviceModels.h" // Define @@ -82,9 +82,6 @@ public: bool isValid( ) const { return _isValid ; } void valid(bool vValid) { _isValid = vValid; } - void mimic(quint16 vSystolic , - quint16 vDiastolic , - quint16 vPulseRate ); protected: void timerEvent(QTimerEvent *event) override; @@ -164,14 +161,11 @@ void printCharacteristics (QLowEnergyService *vService); void notifyStateChange (const BluetoothData &vData); - void notifyBloodPressure (const MUIBloodPressure &vModel); - void interpretBloodPressure (const QByteArray &vData); void interpretInformation (); void interpretBattery (const QByteArray &vData); signals: void didStateChange (const BluetoothData &vData); - void didActionReceive (const UIBloodPressureData &vData); void didDeviceChange (const BluetoothDeviceData &vDevice); void didDeviceSelect (const BluetoothDeviceData &vDevice); Index: sources/canbus/CanInterface.cpp =================================================================== diff -u -rf2e4eba6e85c5d36537be782926f23cc9dc01037 -r8c92a0d2fc6cb6475f502153dcbb0dacc7660021 --- sources/canbus/CanInterface.cpp (.../CanInterface.cpp) (revision f2e4eba6e85c5d36537be782926f23cc9dc01037) +++ sources/canbus/CanInterface.cpp (.../CanInterface.cpp) (revision 8c92a0d2fc6cb6475f502153dcbb0dacc7660021) @@ -23,7 +23,7 @@ // Project #include "Logger.h" -#include "MessageGlobals.h" +#include "MessageGlobalsAutoGen.h" #include "FrameInterface.h" // namespace Index: sources/canbus/CanInterface.h =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r8c92a0d2fc6cb6475f502153dcbb0dacc7660021 --- sources/canbus/CanInterface.h (.../CanInterface.h) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/canbus/CanInterface.h (.../CanInterface.h) (revision 8c92a0d2fc6cb6475f502153dcbb0dacc7660021) @@ -20,7 +20,7 @@ // Project #include "main.h" // Doxygen : do not remove -#include "MessageGlobals.h" +#include "MessageGlobalsAutoGen.h" // Define #define _CanInterface Can::CanInterface::I() Index: sources/canbus/FrameInterface.h =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r8c92a0d2fc6cb6475f502153dcbb0dacc7660021 --- sources/canbus/FrameInterface.h (.../FrameInterface.h) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/canbus/FrameInterface.h (.../FrameInterface.h) (revision 8c92a0d2fc6cb6475f502153dcbb0dacc7660021) @@ -20,7 +20,7 @@ // Project #include "main.h" // Doxygen : do not remove -#include "MessageGlobals.h" +#include "MessageGlobalsAutoGen.h" // Define #define _FrameInterface Can::FrameInterface::I() Index: sources/canbus/MessageAcknowModel.h =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r8c92a0d2fc6cb6475f502153dcbb0dacc7660021 --- sources/canbus/MessageAcknowModel.h (.../MessageAcknowModel.h) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/canbus/MessageAcknowModel.h (.../MessageAcknowModel.h) (revision 8c92a0d2fc6cb6475f502153dcbb0dacc7660021) @@ -19,7 +19,7 @@ // Project #include "main.h" // Doxygen : do not remove -#include "MessageGlobals.h" +#include "MessageGlobalsAutoGen.h" // Define #define _MessageAcknowModel Can::MessageAcknowModel::I() Index: sources/canbus/MessageBuilder.h =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r8c92a0d2fc6cb6475f502153dcbb0dacc7660021 --- sources/canbus/MessageBuilder.h (.../MessageBuilder.h) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/canbus/MessageBuilder.h (.../MessageBuilder.h) (revision 8c92a0d2fc6cb6475f502153dcbb0dacc7660021) @@ -18,8 +18,8 @@ #include // Project -#include "GuiGlobals.h" -#include "MessageGlobals.h" +#include "GuiGlobalsAutoGen.h" +#include "MessageGlobalsAutoGen.h" // forward declaration class tst_messaging; Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -rf2e4eba6e85c5d36537be782926f23cc9dc01037 -r8c92a0d2fc6cb6475f502153dcbb0dacc7660021 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision f2e4eba6e85c5d36537be782926f23cc9dc01037) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 8c92a0d2fc6cb6475f502153dcbb0dacc7660021) @@ -220,616 +220,625 @@ _interpreter.updateUnhandledMessages(); } -// ---------------------------------------------------------------------------------------------------- +// AUTOEGEN ISSUE +void MessageDispatcher::onAdjustment(Model::MUIUFPauseResumeRequest::Data const&) {} +void MessageDispatcher::onAdjustment(Model::MUIInitiateTreatmentWorkflow::Data const&) {} +void MessageDispatcher::onAdjustment(Model::MUITreatmentParamsConfirmed::Data const&) {} +void MessageDispatcher::onAdjustment(Model::MUIUltrafiltrationVolumeTOValidate::Data const&) {} +void MessageDispatcher::onAdjustment(Model::MUITreatmentParamsTOValidate::Data const&) {} +void MessageDispatcher::onAdjustment(Model::MFWVersionsRequest const&) {} +// AUTOEGEN ISSUE -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Blood/Dialysate Adjustment Denali message. - * \param vData - Data model contains Blood Flow Rate - and Dialysate Flow Rate - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustBloodDialysateRequestData &vData) -{ - QVariantList mData; - mData += vData.bloodFlow; - mData += vData.dialysateFlow; - onActionTransmit(GuiActionType::ID_AdjustBloodDialysateReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the treatment duration Adjustment Denali message. - * \param vData - Data model contains treatment duration adjustment value in minutes - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustDurationRequestData &vData) -{ - QVariantList mData; - mData += vData.duration; - onActionTransmit(GuiActionType::ID_AdjustDurationReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Ultrafiltration State Adjustment Denali message. - * \param vData - Data model contains treatment ultrafiltration state adjustment - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustUltrafiltrationStateRequestData &vData) -{ - QVariantList mData; - mData += vData.requestedState; - actionTransmit(GuiActionType::ID_AdjustUltrafiltrationStateReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Ultrafiltration Adjustment Denali message. - * \param vData - Data model contains treatment ultrafiltration adjustment volume - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustUltrafiltrationEditRequestData &vData) -{ - QVariantList mData; - mData += vData.volume; - onActionTransmit(GuiActionType::ID_AdjustUltrafiltrationEditReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Ultrafiltration Adjustment User Selected Option Denali message. - * \param vData - Data model contains treatment ultrafiltration adjustment volume and user selected option. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustUltrafiltrationConfirmRequestData &vData) -{ - QVariantList mData; - mData += vData.volume; - mData += vData.option; - onActionTransmit(GuiActionType::ID_AdjustUltrafiltrationConfirmReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Alarm Request Silence message. - * \param vData - Data model contains the silence request information. - * \return void - */ -void MessageDispatcher::onAdjustment(const AlarmSilenceRequestData &vData) -{ - QVariantList mData; - mData += vData.silence; - onActionTransmit(GuiActionType::ID_AlarmSilenceReq, mData); -} - -/** - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the User Action Denali message. - * \param vData - Data model contains User Action on the alarm dialog. - * \return void - */ -void MessageDispatcher::onAdjustment(const AlarmUserActionRequestData &vData) -{ - QVariantList mData; - mData += vData.action; - onActionTransmit(GuiActionType::ID_AlarmUserActionReq, mData); -} - -/** - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Alarm Active List Request denali message. - * \param vData - Data model contains Alarm Active List payload. - * \return void - */ -void MessageDispatcher::onAdjustment(const AlarmActiveListRequestData &) -{ - QVariantList mData; - onActionTransmit(GuiActionType::ID_AlarmActiveListReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the DG Set Date Time Denali message. - * \details This method transmits the request to set the alarm volume. - * \param vData - Data model contains the alarm volume - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustHDAlarmVolumeRequestData &vData) -{ - QVariantList mData; - mData += vData.volume2HD(); - onActionTransmit(GuiActionType::ID_AlarmVolumeSetReq, mData); -} - -/** - * \details This method transmits the Saline Bolus Adjustment Denali message. - * \param vData - Data model contains treatment Saline Bolus adjustment state. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustSalineRequestData &vData) -{ - QVariantList mData; - mData += vData.requestedState; - onActionTransmit(GuiActionType::ID_AdjustSalineReq, mData); -} - -/** - * \details This method transmits the Heparin Adjustment Denali message. - * \param vData - Data model contains treatment Heparin adjustment state. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustHeparinRequestData &vData) -{ - QVariantList mData; - mData += vData.requestedState; - onActionTransmit(GuiActionType::ID_AdjustHeparinReq, mData); -} - -/** - * \details This method transmits the Rinseback Adjustment Denali message. - * \param vData - Data model contains treatment Rinseback adjustment state. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustRinsebackRequestData &vData) -{ - QVariantList mData; - mData += vData.requestedState; - onActionTransmit(GuiActionType::ID_AdjustRinsebackReq, mData); -} - -/** - * \details This method transmits the Recirculate Adjustment Denali message. - * \param vData - Data model contains treatment Recirculate adjustment state. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustRecirculateRequestData &vData) -{ - QVariantList mData; - mData += vData.requestedState; - onActionTransmit(GuiActionType::ID_AdjustRecirculateReq, mData); -} - -/** - * \details This method transmits the Treatment End Adjustment Denali message. - * \param vData - Data model contains treatment end adjustment state. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustTreatmentEndRequestData &vData) -{ - QVariantList mData; - mData += vData.requestedState; - onActionTransmit(GuiActionType::ID_AdjustTreatmentEndReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the HD Version Denali message. - * \param vData - Data model contains HD Version state. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustVersionsRequestData &vData) -{ - QVariantList mData; - mData += QVariant::fromValue(vData.ver_major); - mData += QVariant::fromValue(vData.ver_minor); - mData += QVariant::fromValue(vData.ver_micro); - mData += QVariant::fromValue(vData.ver_revis); - mData += QVariant::fromValue(vData.ver_comp ); - onActionTransmit(GuiActionType::ID_AdjustVersionsUIReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the HD Version Denali message. - * \param vData - Data model contains HD Version state. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustVersionsResponseData &vData) -{ - QVariantList mData; - mData += QVariant::fromValue(vData.ver_major); - mData += QVariant::fromValue(vData.ver_minor); - mData += QVariant::fromValue(vData.ver_micro); - mData += QVariant::fromValue(vData.ver_revis); - mData += QVariant::fromValue(vData.ver_comp ); - onActionTransmit(GuiActionType::ID_AdjustVersionsUIRsp, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the DG Set Date Time Denali message. - * \param vData - Data model contains the epoch time - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustServiceDatesRequestData &) -{ - QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustServiceDatesReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Disposables Removal Confirm Adjustment Denali message. - * \param vData - Data model contains Service Mode adjustment. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustServiceModeRequestData &) -{ - QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustServiceModeReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Pressures Limits Adjustment Denali message. - * \param vData - Data model contains treatment Pressures Limits adjustment. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustPressuresLimitsRequestData &vData) -{ - QVariantList mData; - mData += vData.mArterialPressureLimitWindow ; - mData += vData.mVenousPressureLimitWindow ; - mData += vData.mVenousPressureLimitAsymtrc ; - onActionTransmit(GuiActionType::ID_AdjustPressuresLimitsReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the InitTreatment request message. - * \param vData - Data model contains the init treatment request information. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustInitTreatmentRequestData &vData) -{ - QVariantList mData; - mData += vData.requestedState; - onActionTransmit(GuiActionType::ID_AdjustInitTreatmentReq, mData); -} - -/** - * \details This method transmits the Treatment Parameter request message. - * \param vData - Data model contains treatment parameter adjustment data structure - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustParametersValidationRequestData &vData) -{ - QVariantList mData; - mData += vData.mBloodFlowRate ; - mData += vData.mDialysateFlowRate ; - mData += vData.mTreatmentDuration ; - mData += vData.mSalineBolusVolume ; - mData += vData.mHeparinStopTime ; - mData += vData.mHeparinType ; - mData += vData.mAcidConcentrate ; - mData += vData.mBicarbonateConcentrate ; - mData += vData.mDialyzerType ; - mData += vData.mBloodPressureMeasureInterval ; - mData += vData.mRinsebackFlowRate ; - mData += vData.mRinsebackVolume ; - mData += vData.mArterialPressureLimitWindow ; - mData += vData.mVenousPressureLimitWindow ; - mData += vData.mVenousPressureLimitAsymtrc ; - mData += vData.mTrancembrncPressureLimitWindow ; - mData += vData.mDialysateTemp ; - mData += vData.mHeparinDispensingRate ; - mData += vData.mHeparinBolusVolume ; - - onActionTransmit(GuiActionType::ID_AdjustParametersValidationReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Confirm Treatment request message. - * \param vData - Data model contains the confirm treatment request - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustParametersConfirmRequestData &vData) -{ - QVariantList mData; - mData += vData.requestedState; - onActionTransmit(GuiActionType::ID_AdjustParametersConfirmReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Water Sample Adjustment Denali message. - * \param vData - Data model contains Water Sample adjustment. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustWaterSampleRequestData &vData) -{ - QVariantList mData; - mData += vData.requestedState; - onActionTransmit(GuiActionType::ID_AdjustWaterSampleReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Water Sample Result Adjustment Denali message. - * \param vData - Data model contains Water Sample Result adjustment. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustWaterSampleResultRequestData &vData) -{ - QVariantList mData; - mData += vData.requestedState; - onActionTransmit(GuiActionType::ID_AdjustWaterSampleResultReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Consumables Confirm Adjustment Denali message. - * \param vData - Data model contains Consumables Confirm adjustment. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustConsumablesConfirmRequestData &) -{ - QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustConsumablesConfirmReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Disposables Confirm Adjustment Denali message. - * \param vData - Data model contains Disposables Confirm adjustment. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustDisposablesConfirmRequestData &) -{ - QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustDisposablesConfirmReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Disposables Prime Adjustment Denali message. - * \param vData - Data model contains Disposables Prime adjustment. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustDisposablesPrimeRequestData &) -{ - QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustDisposablesPrimeReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Patient Connection Begin Adjustment Denali message. - * \param vData - Data model contains Patient Connection Begin adjustment. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustPatientConnectionBeginRequestData &) -{ - QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustPatientConnectionBeginReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Ultrafiltration Adjustment Denali message. - * \param vData - Data model contains treatment ultrafiltration adjustment volume - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustUltrafiltrationInitRequestData &vData) -{ - QVariantList mData; - mData += vData.volume; - onActionTransmit(GuiActionType::ID_AdjustUltrafiltrationInitReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Patient Connection Confirm Adjustment Denali message. - * \param vData - Data model contains Patient Connection Confirm adjustment. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustPatientConnectionConfirmRequestData &) -{ - QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustPatientConnectionConfirmReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Start Treatment Adjustment Denali message. - * \param vData - Data model contains Start Treatment adjustment. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustStartTreatmentRequestData &) -{ - QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustStartTreatmentReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Patient Disconnection Notify Adjustment Denali message. - * \param vData - Data model contains Patient Disconnection Notify adjustment. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustPatientDisconnectionNotifyRequestData &) -{ - QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustPatientDisconnectNotifyReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Patient Disconnection Confirm Adjustment Denali message. - * \param vData - Data model contains Patient Disconnection Confirm adjustment. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustPatientDisconnectionConfirmRequestData &) -{ - QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustPatientDisconnectConfirmReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Disposables Removal Confirm Adjustment Denali message. - * \param vData - Data model contains Disposables Removal Confirm adjustment. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustDisposablesRemovalConfirmRequestData &) -{ - QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustDisposablesRemovalConfirmReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Treatment Log Adjustment Denali message. - * \param vData - Data model contains Treatment Log adjustment. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustTreatmentLogRequestData &) -{ - QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustTreatmentLogReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the HD Set Date Time Denali message. - * \param vData - Data model contains the epoch time - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustHDDateTimeRequestData &vData) -{ - QVariantList mData; - mData += vData.mEpoch ; - onActionTransmit(GuiActionType::ID_AdjustHDDateTimeReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the DG Set Date Time Denali message. - * \param vData - Data model contains the epoch time - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustDGDateTimeRequestData &vData) -{ - QVariantList mData; - mData += vData.mEpoch ; - onActionTransmit(GuiActionType::ID_AdjustDGDateTimeReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the DG Cleaning Usage request message. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustDGCleaningUsageRequestData &) -{ - QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustDGCleaningUsageReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Disinfect request Denali message. - * \param vData - Data model contains the epoch time - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustDisinfectStartRequestData &vData) -{ - QVariantList mData; - mData += vData.mState; - onActionTransmit(GuiActionType::ID_AdjustDisinfectStartReq, mData); -} - -/*! - * \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; - onActionTransmit(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 - */ -void MessageDispatcher::onAdjustment(const AdjustUIPostFinalResultRequestData &vData) -{ - QVariantList mData; - mData += vData.mResult; - onActionTransmit(GuiActionType::ID_UIPostFinalResultData, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the UI Generic User Confirmation result. - * \param vData - Data model contains the Generic User Confirmation result. - * \return void - */ -void MessageDispatcher::onAdjustment(const DuetConfirmUIrData &vData) -{ - QVariantList mData; - mData += vData.mId; - mData += vData.mConfirm; - onActionTransmit(GuiActionType::ID_DuetConfirmUIr, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the UI RO Water Mode adjustment request. - * \param vData - Data model contains the UI RO Water Mode adjustment request data. - * \return void - */ -void MessageDispatcher::onAdjustment(const DuetRoWaterModeUIiData &vData) -{ - QVariantList mData; - mData += vData.mStatus; - onActionTransmit(GuiActionType::ID_DuetRoWaterModeUIi, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the HD Usage Info Denali message. - * \param vData - - * \return void - */ -void MessageDispatcher::onAdjustment(const HDUsageInfoRequestData &) -{ - QVariantList mData; - onActionTransmit(GuiActionType::ID_HDUsageInfoReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the HD institutional record request to HD. - * \param vData - - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustInstitutionalRequestData &) -{ - QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustInstitutionalRecordReq, mData); -} - -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Disposables Removal Confirm Adjustment Denali message. - * \param vData - Data model contains Service Mode adjustment. - * \return void - */ -void MessageDispatcher::onAdjustment(const AdjustHDResetInSrvcRequestData &) -{ - QVariantList mData; - onActionTransmit(GuiActionType::ID_ResetHDInServiceModeReq, mData); -} // ---------------------------------------------------------------------------------------------------- +// AUTOGEN ISSUE +///*! +// * \brief MessageDispatcher::onAdjustment +// * \details This method transmits the Blood/Dialysate Adjustment Denali message. +// * \param vData - Data model contains Blood Flow Rate +// and Dialysate Flow Rate +// * \return void +// */ +//void MessageDispatcher::onAdjustment(const AdjustBloodDialysateRequestData &vData) +//{ +// QVariantList mData; +// mData += vData.bloodFlow; +// mData += vData.dialysateFlow; +// onActionTransmit(GuiActionType::ID_AdjustBloodDialysateReq, mData); +//} +// +///*! +// * \brief MessageDispatcher::onAdjustment +// * \details This method transmits the treatment duration Adjustment Denali message. +// * \param vData - Data model contains treatment duration adjustment value in minutes +// * \return void +// */ +//void MessageDispatcher::onAdjustment(const AdjustDurationRequestData &vData) +//{ +// QVariantList mData; +// mData += vData.duration; +// onActionTransmit(GuiActionType::ID_AdjustDurationReq, mData); +//} +// +///*! +// * \brief MessageDispatcher::onAdjustment +// * \details This method transmits the Ultrafiltration State Adjustment Denali message. +// * \param vData - Data model contains treatment ultrafiltration state adjustment +// * \return void +// */ +//void MessageDispatcher::onAdjustment(const AdjustUltrafiltrationStateRequestData &vData) +//{ +// QVariantList mData; +// mData += vData.requestedState; +// actionTransmit(GuiActionType::ID_AdjustUltrafiltrationStateReq, mData); +//} +// +///*! +// * \brief MessageDispatcher::onAdjustment +// * \details This method transmits the Ultrafiltration Adjustment Denali message. +// * \param vData - Data model contains treatment ultrafiltration adjustment volume +// * \return void +// */ +//void MessageDispatcher::onAdjustment(const AdjustUltrafiltrationEditRequestData &vData) +//{ +// QVariantList mData; +// mData += vData.volume; +// onActionTransmit(GuiActionType::ID_AdjustUltrafiltrationEditReq, mData); +//} +// +///*! +// * \brief MessageDispatcher::onAdjustment +// * \details This method transmits the Ultrafiltration Adjustment User Selected Option Denali message. +// * \param vData - Data model contains treatment ultrafiltration adjustment volume and user selected option. +// * \return void +// */ +//void MessageDispatcher::onAdjustment(const AdjustUltrafiltrationConfirmRequestData &vData) +//{ +// QVariantList mData; +// mData += vData.volume; +// mData += vData.option; +// onActionTransmit(GuiActionType::ID_AdjustUltrafiltrationConfirmReq, mData); +//} +// +///*! +// * \brief MessageDispatcher::onAdjustment +// * \details This method transmits the Alarm Request Silence message. +// * \param vData - Data model contains the silence request information. +// * \return void +// */ +//void MessageDispatcher::onAdjustment(const AlarmSilenceRequestData &vData) +//{ +// QVariantList mData; +// mData += vData.silence; +// onActionTransmit(GuiActionType::ID_AlarmSilenceReq, mData); +//} +// +///** +// * \brief MessageDispatcher::onAdjustment +// * \details This method transmits the User Action Denali message. +// * \param vData - Data model contains User Action on the alarm dialog. +// * \return void +// */ +//void MessageDispatcher::onAdjustment(const AlarmUserActionRequestData &vData) +//{ +// QVariantList mData; +// mData += vData.action; +// onActionTransmit(GuiActionType::ID_AlarmUserActionReq, mData); +//} +// +///** +// * \brief MessageDispatcher::onAdjustment +// * \details This method transmits the Alarm Active List Request denali message. +// * \param vData - Data model contains Alarm Active List payload. +// * \return void +// */ +//void MessageDispatcher::onAdjustment(const AlarmActiveListRequestData &) +//{ +// QVariantList mData; +// onActionTransmit(GuiActionType::ID_AlarmActiveListReq, mData); +//} +// +///*! +// * \brief MessageDispatcher::onAdjustment +// * \details This method transmits the DG Set Date Time Denali message. +// * \details This method transmits the request to set the alarm volume. +// * \param vData - Data model contains the alarm volume +// * \return void +// */ +//void MessageDispatcher::onAdjustment(const AdjustHDAlarmVolumeRequestData &vData) +//{ +// QVariantList mData; +// mData += vData.volume2HD(); +// onActionTransmit(GuiActionType::ID_AlarmVolumeSetReq, mData); +//} +// +///** +// * \details This method transmits the Saline Bolus Adjustment Denali message. +// * \param vData - Data model contains treatment Saline Bolus adjustment state. +// * \return void +// */ +//void MessageDispatcher::onAdjustment(const AdjustSalineRequestData &vData) +//{ +// QVariantList mData; +// mData += vData.requestedState; +// onActionTransmit(GuiActionType::ID_AdjustSalineReq, mData); +//} +// +///** +// * \details This method transmits the Heparin Adjustment Denali message. +// * \param vData - Data model contains treatment Heparin adjustment state. +// * \return void +// */ +//void MessageDispatcher::onAdjustment(const AdjustHeparinRequestData &vData) +//{ +// QVariantList mData; +// mData += vData.requestedState; +// onActionTransmit(GuiActionType::ID_AdjustHeparinReq, mData); +//} +// +///** +// * \details This method transmits the Rinseback Adjustment Denali message. +// * \param vData - Data model contains treatment Rinseback adjustment state. +// * \return void +// */ +//void MessageDispatcher::onAdjustment(const AdjustRinsebackRequestData &vData) +//{ +// QVariantList mData; +// mData += vData.requestedState; +// onActionTransmit(GuiActionType::ID_AdjustRinsebackReq, mData); +//} +// +///** +// * \details This method transmits the Recirculate Adjustment Denali message. +// * \param vData - Data model contains treatment Recirculate adjustment state. +// * \return void +// */ +//void MessageDispatcher::onAdjustment(const AdjustRecirculateRequestData &vData) +//{ +// QVariantList mData; +// mData += vData.requestedState; +// onActionTransmit(GuiActionType::ID_AdjustRecirculateReq, mData); +//} +// +///** +// * \details This method transmits the Treatment End Adjustment Denali message. +// * \param vData - Data model contains treatment end adjustment state. +// * \return void +// */ +//void MessageDispatcher::onAdjustment(const AdjustTreatmentEndRequestData &vData) +//{ +// QVariantList mData; +// mData += vData.requestedState; +// onActionTransmit(GuiActionType::ID_AdjustTreatmentEndReq, mData); +//} +// +///*! +// * \brief MessageDispatcher::onAdjustment +// * \details This method transmits the HD Version Denali message. +// * \param vData - Data model contains HD Version state. +// * \return void +// */ +//void MessageDispatcher::onAdjustment(const AdjustVersionsRequestData &vData) +//{ +// QVariantList mData; +// mData += QVariant::fromValue(vData.ver_major); +// mData += QVariant::fromValue(vData.ver_minor); +// mData += QVariant::fromValue(vData.ver_micro); +// mData += QVariant::fromValue(vData.ver_revis); +// mData += QVariant::fromValue(vData.ver_comp ); +// onActionTransmit(GuiActionType::ID_AdjustVersionsUIReq, mData); +//} +// +///*! +// * \brief MessageDispatcher::onAdjustment +// * \details This method transmits the HD Version Denali message. +// * \param vData - Data model contains HD Version state. +// * \return void +// */ +//void MessageDispatcher::onAdjustment(const AdjustVersionsResponseData &vData) +//{ +// QVariantList mData; +// mData += QVariant::fromValue(vData.ver_major); +// mData += QVariant::fromValue(vData.ver_minor); +// mData += QVariant::fromValue(vData.ver_micro); +// mData += QVariant::fromValue(vData.ver_revis); +// mData += QVariant::fromValue(vData.ver_comp ); +// onActionTransmit(GuiActionType::ID_AdjustVersionsUIRsp, mData); +//} +// +///*! +// * \brief MessageDispatcher::onAdjustment +// * \details This method transmits the DG Set Date Time Denali message. +// * \param vData - Data model contains the epoch time +// * \return void +// */ +//void MessageDispatcher::onAdjustment(const AdjustServiceDatesRequestData &) +//{ +// QVariantList mData; +// onActionTransmit(GuiActionType::ID_AdjustServiceDatesReq, mData); +//} +// +///*! +// * \brief MessageDispatcher::onAdjustment +// * \details This method transmits the Disposables Removal Confirm Adjustment Denali message. +// * \param vData - Data model contains Service Mode adjustment. +// * \return void +// */ +//void MessageDispatcher::onAdjustment(const AdjustServiceModeRequestData &) +//{ +// QVariantList mData; +// onActionTransmit(GuiActionType::ID_AdjustServiceModeReq, mData); +//} +// +///*! +// * \brief MessageDispatcher::onAdjustment +// * \details This method transmits the Pressures Limits Adjustment Denali message. +// * \param vData - Data model contains treatment Pressures Limits adjustment. +// * \return void +// */ +//void MessageDispatcher::onAdjustment(const AdjustPressuresLimitsRequestData &vData) +//{ +// QVariantList mData; +// mData += vData.mArterialPressureLimitWindow ; +// mData += vData.mVenousPressureLimitWindow ; +// mData += vData.mVenousPressureLimitAsymtrc ; +// onActionTransmit(GuiActionType::ID_AdjustPressuresLimitsReq, mData); +//} +// +///*! +// * \brief MessageDispatcher::onAdjustment +// * \details This method transmits the InitTreatment request message. +// * \param vData - Data model contains the init treatment request information. +// * \return void +// */ +//void MessageDispatcher::onAdjustment(const AdjustInitTreatmentRequestData &vData) +//{ +// QVariantList mData; +// mData += vData.requestedState; +// onActionTransmit(GuiActionType::ID_AdjustInitTreatmentReq, mData); +//} +// +///** +// * \details This method transmits the Treatment Parameter request message. +// * \param vData - Data model contains treatment parameter adjustment data structure +// * \return void +// */ +//void MessageDispatcher::onAdjustment(const AdjustParametersValidationRequestData &vData) +//{ +// QVariantList mData; +// mData += vData.mBloodFlowRate ; +// mData += vData.mDialysateFlowRate ; +// mData += vData.mTreatmentDuration ; +// mData += vData.mSalineBolusVolume ; +// mData += vData.mHeparinStopTime ; +// mData += vData.mHeparinType ; +// mData += vData.mAcidConcentrate ; +// mData += vData.mBicarbonateConcentrate ; +// mData += vData.mDialyzerType ; +// mData += vData.mBloodPressureMeasureInterval ; +// mData += vData.mRinsebackFlowRate ; +// mData += vData.mRinsebackVolume ; +// mData += vData.mArterialPressureLimitWindow ; +// mData += vData.mVenousPressureLimitWindow ; +// mData += vData.mVenousPressureLimitAsymtrc ; +// mData += vData.mTrancembrncPressureLimitWindow ; +// mData += vData.mDialysateTemp ; +// mData += vData.mHeparinDispensingRate ; +// mData += vData.mHeparinBolusVolume ; +// +// onActionTransmit(GuiActionType::ID_AdjustParametersValidationReq, mData); +//} +// +///*! +// * \brief MessageDispatcher::onAdjustment +// * \details This method transmits the Confirm Treatment request message. +// * \param vData - Data model contains the confirm treatment request +// * \return void +// */ +//void MessageDispatcher::onAdjustment(const AdjustParametersConfirmRequestData &vData) +//{ +// QVariantList mData; +// mData += vData.requestedState; +// onActionTransmit(GuiActionType::ID_AdjustParametersConfirmReq, mData); +//} +// +///*! +// * \brief MessageDispatcher::onAdjustment +// * \details This method transmits the Water Sample Adjustment Denali message. +// * \param vData - Data model contains Water Sample adjustment. +// * \return void +// */ +//void MessageDispatcher::onAdjustment(const AdjustWaterSampleRequestData &vData) +//{ +// QVariantList mData; +// mData += vData.requestedState; +// onActionTransmit(GuiActionType::ID_AdjustWaterSampleReq, mData); +//} +// +///*! +// * \brief MessageDispatcher::onAdjustment +// * \details This method transmits the Water Sample Result Adjustment Denali message. +// * \param vData - Data model contains Water Sample Result adjustment. +// * \return void +// */ +//void MessageDispatcher::onAdjustment(const AdjustWaterSampleResultRequestData &vData) +//{ +// QVariantList mData; +// mData += vData.requestedState; +// onActionTransmit(GuiActionType::ID_AdjustWaterSampleResultReq, mData); +//} +// +///*! +// * \brief MessageDispatcher::onAdjustment +// * \details This method transmits the Consumables Confirm Adjustment Denali message. +// * \param vData - Data model contains Consumables Confirm adjustment. +// * \return void +// */ +//void MessageDispatcher::onAdjustment(const AdjustConsumablesConfirmRequestData &) +//{ +// QVariantList mData; +// onActionTransmit(GuiActionType::ID_AdjustConsumablesConfirmReq, mData); +//} +// +///*! +// * \brief MessageDispatcher::onAdjustment +// * \details This method transmits the Disposables Confirm Adjustment Denali message. +// * \param vData - Data model contains Disposables Confirm adjustment. +// * \return void +// */ +//void MessageDispatcher::onAdjustment(const AdjustDisposablesConfirmRequestData &) +//{ +// QVariantList mData; +// onActionTransmit(GuiActionType::ID_AdjustDisposablesConfirmReq, mData); +//} +// +///*! +// * \brief MessageDispatcher::onAdjustment +// * \details This method transmits the Disposables Prime Adjustment Denali message. +// * \param vData - Data model contains Disposables Prime adjustment. +// * \return void +// */ +//void MessageDispatcher::onAdjustment(const AdjustDisposablesPrimeRequestData &) +//{ +// QVariantList mData; +// onActionTransmit(GuiActionType::ID_AdjustDisposablesPrimeReq, mData); +//} +// +///*! +// * \brief MessageDispatcher::onAdjustment +// * \details This method transmits the Patient Connection Begin Adjustment Denali message. +// * \param vData - Data model contains Patient Connection Begin adjustment. +// * \return void +// */ +//void MessageDispatcher::onAdjustment(const AdjustPatientConnectionBeginRequestData &) +//{ +// QVariantList mData; +// onActionTransmit(GuiActionType::ID_AdjustPatientConnectionBeginReq, mData); +//} +// +///*! +// * \brief MessageDispatcher::onAdjustment +// * \details This method transmits the Ultrafiltration Adjustment Denali message. +// * \param vData - Data model contains treatment ultrafiltration adjustment volume +// * \return void +// */ +//void MessageDispatcher::onAdjustment(const AdjustUltrafiltrationInitRequestData &vData) +//{ +// QVariantList mData; +// mData += vData.volume; +// onActionTransmit(GuiActionType::ID_AdjustUltrafiltrationInitReq, mData); +//} +// +///*! +// * \brief MessageDispatcher::onAdjustment +// * \details This method transmits the Patient Connection Confirm Adjustment Denali message. +// * \param vData - Data model contains Patient Connection Confirm adjustment. +// * \return void +// */ +//void MessageDispatcher::onAdjustment(const AdjustPatientConnectionConfirmRequestData &) +//{ +// QVariantList mData; +// onActionTransmit(GuiActionType::ID_AdjustPatientConnectionConfirmReq, mData); +//} +// +///*! +// * \brief MessageDispatcher::onAdjustment +// * \details This method transmits the Start Treatment Adjustment Denali message. +// * \param vData - Data model contains Start Treatment adjustment. +// * \return void +// */ +//void MessageDispatcher::onAdjustment(const AdjustStartTreatmentRequestData &) +//{ +// QVariantList mData; +// onActionTransmit(GuiActionType::ID_AdjustStartTreatmentReq, mData); +//} +// +///*! +// * \brief MessageDispatcher::onAdjustment +// * \details This method transmits the Patient Disconnection Notify Adjustment Denali message. +// * \param vData - Data model contains Patient Disconnection Notify adjustment. +// * \return void +// */ +//void MessageDispatcher::onAdjustment(const AdjustPatientDisconnectionNotifyRequestData &) +//{ +// QVariantList mData; +// onActionTransmit(GuiActionType::ID_AdjustPatientDisconnectNotifyReq, mData); +//} +// +///*! +// * \brief MessageDispatcher::onAdjustment +// * \details This method transmits the Patient Disconnection Confirm Adjustment Denali message. +// * \param vData - Data model contains Patient Disconnection Confirm adjustment. +// * \return void +// */ +//void MessageDispatcher::onAdjustment(const AdjustPatientDisconnectionConfirmRequestData &) +//{ +// QVariantList mData; +// onActionTransmit(GuiActionType::ID_AdjustPatientDisconnectConfirmReq, mData); +//} +// +///*! +// * \brief MessageDispatcher::onAdjustment +// * \details This method transmits the Disposables Removal Confirm Adjustment Denali message. +// * \param vData - Data model contains Disposables Removal Confirm adjustment. +// * \return void +// */ +//void MessageDispatcher::onAdjustment(const AdjustDisposablesRemovalConfirmRequestData &) +//{ +// QVariantList mData; +// onActionTransmit(GuiActionType::ID_AdjustDisposablesRemovalConfirmReq, mData); +//} +// +///*! +// * \brief MessageDispatcher::onAdjustment +// * \details This method transmits the Treatment Log Adjustment Denali message. +// * \param vData - Data model contains Treatment Log adjustment. +// * \return void +// */ +//void MessageDispatcher::onAdjustment(const AdjustTreatmentLogRequestData &) +//{ +// QVariantList mData; +// onActionTransmit(GuiActionType::ID_AdjustTreatmentLogReq, mData); +//} +// +///*! +// * \brief MessageDispatcher::onAdjustment +// * \details This method transmits the HD Set Date Time Denali message. +// * \param vData - Data model contains the epoch time +// * \return void +// */ +//void MessageDispatcher::onAdjustment(const AdjustHDDateTimeRequestData &vData) +//{ +// QVariantList mData; +// mData += vData.mEpoch ; +// onActionTransmit(GuiActionType::ID_AdjustHDDateTimeReq, mData); +//} +// +///*! +// * \brief MessageDispatcher::onAdjustment +// * \details This method transmits the DG Set Date Time Denali message. +// * \param vData - Data model contains the epoch time +// * \return void +// */ +//void MessageDispatcher::onAdjustment(const AdjustDGDateTimeRequestData &vData) +//{ +// QVariantList mData; +// mData += vData.mEpoch ; +// onActionTransmit(GuiActionType::ID_AdjustDGDateTimeReq, mData); +//} +// +///*! +// * \brief MessageDispatcher::onAdjustment +// * \details This method transmits the DG Cleaning Usage request message. +// * \return void +// */ +//void MessageDispatcher::onAdjustment(const AdjustDGCleaningUsageRequestData &) +//{ +// QVariantList mData; +// onActionTransmit(GuiActionType::ID_AdjustDGCleaningUsageReq, mData); +//} +// +///*! +// * \brief MessageDispatcher::onAdjustment +// * \details This method transmits the Disinfect request Denali message. +// * \param vData - Data model contains the epoch time +// * \return void +// */ +//void MessageDispatcher::onAdjustment(const AdjustDisinfectStartRequestData &vData) +//{ +// QVariantList mData; +// mData += vData.mState; +// onActionTransmit(GuiActionType::ID_AdjustDisinfectStartReq, mData); +//} +// +///*! +// * \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; +// onActionTransmit(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 +// */ +//void MessageDispatcher::onAdjustment(const AdjustUIPostFinalResultRequestData &vData) +//{ +// QVariantList mData; +// mData += vData.mResult; +// onActionTransmit(GuiActionType::ID_UIPostFinalResultData, mData); +//} +// +///*! +// * \brief MessageDispatcher::onAdjustment +// * \details This method transmits the UI Generic User Confirmation result. +// * \param vData - Data model contains the Generic User Confirmation result. +// * \return void +// */ +//void MessageDispatcher::onAdjustment(const DuetConfirmUIrData &vData) +//{ +// QVariantList mData; +// mData += vData.mId; +// mData += vData.mConfirm; +// onActionTransmit(GuiActionType::ID_DuetConfirmUIr, mData); +//} +// +///*! +// * \brief MessageDispatcher::onAdjustment +// * \details This method transmits the UI RO Water Mode adjustment request. +// * \param vData - Data model contains the UI RO Water Mode adjustment request data. +// * \return void +// */ +//void MessageDispatcher::onAdjustment(const DuetRoWaterModeUIiData &vData) +//{ +// QVariantList mData; +// mData += vData.mStatus; +// onActionTransmit(GuiActionType::ID_DuetRoWaterModeUIi, mData); +//} +// +///*! +// * \brief MessageDispatcher::onAdjustment +// * \details This method transmits the HD Usage Info Denali message. +// * \param vData - +// * \return void +// */ +//void MessageDispatcher::onAdjustment(const HDUsageInfoRequestData &) +//{ +// QVariantList mData; +// onActionTransmit(GuiActionType::ID_HDUsageInfoReq, mData); +//} +// +///*! +// * \brief MessageDispatcher::onAdjustment +// * \details This method transmits the HD institutional record request to HD. +// * \param vData - +// * \return void +// */ +//void MessageDispatcher::onAdjustment(const AdjustInstitutionalRequestData &) +//{ +// QVariantList mData; +// onActionTransmit(GuiActionType::ID_AdjustInstitutionalRecordReq, mData); +//} +// +///*! +// * \brief MessageDispatcher::onAdjustment +// * \details This method transmits the Disposables Removal Confirm Adjustment Denali message. +// * \param vData - Data model contains Service Mode adjustment. +// * \return void +// */ +//void MessageDispatcher::onAdjustment(const AdjustHDResetInSrvcRequestData &) +//{ +// QVariantList mData; +// onActionTransmit(GuiActionType::ID_ResetHDInServiceModeReq, mData); +//} +// ---------------------------------------------------------------------------------------------------- /*! * \brief MessageDispatcher::actionTransmit Index: sources/canbus/MessageDispatcher.h =================================================================== diff -u -rf2e4eba6e85c5d36537be782926f23cc9dc01037 -r8c92a0d2fc6cb6475f502153dcbb0dacc7660021 --- sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision f2e4eba6e85c5d36537be782926f23cc9dc01037) +++ sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision 8c92a0d2fc6cb6475f502153dcbb0dacc7660021) @@ -20,6 +20,7 @@ // Project #include "main.h" // Doxygen : do not remove #include "MessageBuilder.h" +//#include "MessageInterpreter.h" #include "MessageInterpreter.h" // define @@ -107,66 +108,6 @@ // List of the transmit(request) only, messages which require acknowledge back(AckBack). QList _needsAcknow { - GuiActionType::ID_TDCheckIn , - // CONFIRM - GuiActionType::ID_DuetConfirmUIr , - // POST - GuiActionType::ID_UIPostFinalResultData , - // Alarm - GuiActionType::ID_AlarmUserActionReq , - GuiActionType::ID_AlarmSilenceReq , - GuiActionType::ID_AlarmActiveListReq , - GuiActionType::ID_AlarmVolumeSetReq , - // Pre-Treatment - GuiActionType::ID_AdjustInitTreatmentReq , - GuiActionType::ID_AdjustWaterSampleReq , - GuiActionType::ID_AdjustWaterSampleResultReq , - GuiActionType::ID_AdjustConsumablesConfirmReq , - GuiActionType::ID_AdjustDisposablesConfirmReq , - GuiActionType::ID_AdjustDisposablesPrimeReq , - GuiActionType::ID_AdjustPatientConnectionBeginReq , - GuiActionType::ID_AdjustUltrafiltrationInitReq , - GuiActionType::ID_AdjustPatientConnectionConfirmReq , - GuiActionType::ID_AdjustStartTreatmentReq , - // In-Treatment - GuiActionType::ID_AdjustBloodDialysateReq , - GuiActionType::ID_AdjustDurationReq , - GuiActionType::ID_AdjustUltrafiltrationStateReq , - GuiActionType::ID_AdjustUltrafiltrationEditReq , - GuiActionType::ID_AdjustUltrafiltrationConfirmReq , - GuiActionType::ID_AdjustSalineReq , - GuiActionType::ID_AdjustHeparinReq , - GuiActionType::ID_AdjustPressuresLimitsReq , - // End-Treatment - GuiActionType::ID_AdjustRinsebackReq , - GuiActionType::ID_AdjustRecirculateReq , - GuiActionType::ID_AdjustTreatmentEndReq , - // Post-Treatment - GuiActionType::ID_AdjustPatientDisconnectNotifyReq , - GuiActionType::ID_AdjustPatientDisconnectConfirmReq , - GuiActionType::ID_AdjustDisposablesRemovalConfirmReq , - // Disinfect - GuiActionType::ID_AdjustDisinfectModeReq , - GuiActionType::ID_AdjustDisinfectStartReq , - // DG Cleaning - GuiActionType::ID_AdjustDGCleaningUsageReq , - // Settings - GuiActionType::ID_AdjustServiceModeReq , - GuiActionType::ID_AdjustVersionsUIReq , - GuiActionType::ID_AdjustVersionsUIRsp , - GuiActionType::ID_AdjustServiceDatesReq , - GuiActionType::ID_AdjustHDDateTimeReq , - GuiActionType::ID_AdjustDGDateTimeReq , - GuiActionType::ID_HDUsageInfoReq , - GuiActionType::ID_AdjustInstitutionalRecordReq , - // Treatment Log - GuiActionType::ID_AdjustTreatmentLogReq , - GuiActionType::ID_TreatmentLogAvrgeData , - GuiActionType::ID_TreatmentLogAlarmData , - GuiActionType::ID_TreatmentLogEventData , - - // HD reset request in service mode - GuiActionType::ID_ResetHDInServiceModeReq , }; public slots: @@ -266,7 +207,8 @@ ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS_NOEMIT ACTION_RECEIVE_MODEL_BRIDGE_DEFINITIONS - ACTION_RECEIVE_PRIVATE_SLOT(UIPostFinalResultHDRequestData) + // AUTOGEN ISSUE + //ACTION_RECEIVE_PRIVATE_SLOT(UIPostFinalResultHDRequestData) }; } Fisheye: Tag 8c92a0d2fc6cb6475f502153dcbb0dacc7660021 refers to a dead (removed) revision in file `sources/canbus/MessageGlobals.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8c92a0d2fc6cb6475f502153dcbb0dacc7660021 refers to a dead (removed) revision in file `sources/canbus/MessageInterpreter.cpp'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/canbus/MessageInterpreter.h =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r8c92a0d2fc6cb6475f502153dcbb0dacc7660021 --- sources/canbus/MessageInterpreter.h (.../MessageInterpreter.h) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/canbus/MessageInterpreter.h (.../MessageInterpreter.h) (revision 8c92a0d2fc6cb6475f502153dcbb0dacc7660021) @@ -18,8 +18,8 @@ #include // Project -#include "MessageGlobals.h" -#include "MModel.h" +#include "MessageGlobalsAutoGen.h" +#include "MModelAutoGen.h" // forward declaration class tst_messaging; @@ -62,8 +62,8 @@ void printUnhandled (const Message &vMessage ) const; - bool interpretMessage_HD (const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__; - bool interpretMessage_DG (const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__; + bool interpretMessage_TD (const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__; + bool interpretMessage_DD (const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__; // ----- Debug bool canbusFaultCountData (const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__; Index: sources/cloudsync/CloudSyncController.cpp =================================================================== diff -u -rd862dfcd402206e33b314c458e41c13b684a4565 -r8c92a0d2fc6cb6475f502153dcbb0dacc7660021 --- sources/cloudsync/CloudSyncController.cpp (.../CloudSyncController.cpp) (revision d862dfcd402206e33b314c458e41c13b684a4565) +++ sources/cloudsync/CloudSyncController.cpp (.../CloudSyncController.cpp) (revision 8c92a0d2fc6cb6475f502153dcbb0dacc7660021) @@ -21,7 +21,6 @@ #include "ApplicationController.h" #include "DeviceController.h" #include "FileHandler.h" -#include "TreatmentLog.h" #include "crc.h" SINGLETON_DISABLE(CloudSyncController) @@ -114,8 +113,8 @@ this , SLOT( onFactoryReset (bool))); connect(&_DeviceController , SIGNAL(didDecommissioning (bool)), this , SLOT( onDecommissioning (bool))); - connect(&_TreatmentLog , SIGNAL(didPendingTxr (const QString &)), - this , SLOT( onPendingTxr (const QString &))); + //connect(&_TreatmentLog , SIGNAL(didPendingTxr (const QString &)), + // this , SLOT( onPendingTxr (const QString &))); connect(this , SIGNAL(didInitComplete ()), this , SLOT( onInitComplete ()),Qt::QueuedConnection); // it has to be queued connection, don't remove it. } @@ -762,6 +761,10 @@ // preparing the message // Same parameters will be sent for these messages for now, so data is not changed. + Q_UNUSED(vAction) + Q_UNUSED(vData) + // AUTOGEN ISSUE + /* switch (vAction) { case GuiActionType::ID_TDOpModeData : { // ---------------------------------------------------------------------------------------- @@ -791,6 +794,7 @@ default: break; } + */ } void CloudSyncController::sendPendingTxr(const QString &vFileName) @@ -1237,6 +1241,10 @@ // if both values received initDeviceInfoWait(); + Q_UNUSED(vAction) + Q_UNUSED(vData) + // AUTOGEN ISSUE + /* if ( vAction == GuiActionType::ID_AdjustSerialTDRsp ) { if ( vData.count() ) { _deviceInfoHD = vData[eDeviceInfo_Ix].toString(); @@ -1256,6 +1264,7 @@ saveDeviceInfoTimeOut(); ok = true; } + */ return ok; } Index: sources/device/DeviceView.cpp =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r8c92a0d2fc6cb6475f502153dcbb0dacc7660021 --- sources/device/DeviceView.cpp (.../DeviceView.cpp) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/device/DeviceView.cpp (.../DeviceView.cpp) (revision 8c92a0d2fc6cb6475f502153dcbb0dacc7660021) @@ -20,7 +20,7 @@ #include "ApplicationController.h" #include "GuiController.h" #include "DeviceController.h" -#include "GuiGlobals.h" +#include "GuiGlobalsAutoGen.h" #include "encryption.h" #include "MWifiNetwork.h" Index: sources/device/DeviceView.h =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r8c92a0d2fc6cb6475f502153dcbb0dacc7660021 --- sources/device/DeviceView.h (.../DeviceView.h) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/device/DeviceView.h (.../DeviceView.h) (revision 8c92a0d2fc6cb6475f502153dcbb0dacc7660021) @@ -20,7 +20,8 @@ // Project #include "main.h" // Doxygen : do not remove -#include "VView.h" +//#include "VView.h" +#include "VViewAutoGen.h" #include "DeviceGlobals.h" #include "DeviceModels.h" Index: sources/gui/GuiController.cpp =================================================================== diff -u -rf2e4eba6e85c5d36537be782926f23cc9dc01037 -r8c92a0d2fc6cb6475f502153dcbb0dacc7660021 --- sources/gui/GuiController.cpp (.../GuiController.cpp) (revision f2e4eba6e85c5d36537be782926f23cc9dc01037) +++ sources/gui/GuiController.cpp (.../GuiController.cpp) (revision 8c92a0d2fc6cb6475f502153dcbb0dacc7660021) @@ -193,6 +193,8 @@ // which does not require HD approval in GuiController // Process the GuiView Request. // It can be processed in GuiController take action and notify GuiView + // AUTOGEN ISSUE + /* switch (vAction) { case GuiActionType::ID_PowerOff: //qApp->quit(); @@ -212,6 +214,7 @@ break; } + */ return false; } @@ -351,7 +354,7 @@ void GuiController::onFailedTransmit(Sequence) { AlarmStatusData data = AlarmGenerator::ALARM_ID_TD_COMM_TIMEOUT(); - LOG_APPED_MSG(GuiActions::ID_AlarmStatus, AlarmGenerator::toString()); + LOG_APPED_MSG(GuiActions::ID_AlarmStatusData, AlarmGenerator::toString()); //DEBUG qDebug() << " A" << _MessageAcknowModel.count(); emit didActionReceive(data); } Index: sources/gui/GuiController.h =================================================================== diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -r8c92a0d2fc6cb6475f502153dcbb0dacc7660021 --- sources/gui/GuiController.h (.../GuiController.h) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ sources/gui/GuiController.h (.../GuiController.h) (revision 8c92a0d2fc6cb6475f502153dcbb0dacc7660021) @@ -19,9 +19,10 @@ // Project #include "main.h" // Doxygen : do not remove -#include "MModel.h" -#include "GuiGlobals.h" -#include "MessageGlobals.h" +//#include "MModel.h" +#include "MModelAutoGen.h" +#include "GuiGlobalsAutoGen.h" +#include "MessageGlobalsAutoGen.h" #include "DeviceGlobals.h" // define @@ -126,7 +127,7 @@ ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS_PUBLIC ACTION_RECEIVE_MODEL_BRIDGE_DEFINITIONS - ACTION_RECEIVE_PRIVATE_SLOT(UIPostFinalResultHDRequestData) + //ACTION_RECEIVE_PRIVATE_SLOT(UIPostFinalResultHDRequestData) }; } Fisheye: Tag 8c92a0d2fc6cb6475f502153dcbb0dacc7660021 refers to a dead (removed) revision in file `sources/gui/GuiGlobals.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8c92a0d2fc6cb6475f502153dcbb0dacc7660021 refers to a dead (removed) revision in file `sources/gui/GuiGlobals.h'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/gui/GuiView.h =================================================================== diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -r8c92a0d2fc6cb6475f502153dcbb0dacc7660021 --- sources/gui/GuiView.h (.../GuiView.h) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ sources/gui/GuiView.h (.../GuiView.h) (revision 8c92a0d2fc6cb6475f502153dcbb0dacc7660021) @@ -20,7 +20,7 @@ // Project #include "main.h" -#include "GuiGlobals.h" +#include "GuiGlobalsAutoGen.h" // define Index: sources/gui/qml/AlarmItem.qml =================================================================== diff -u -rf2e4eba6e85c5d36537be782926f23cc9dc01037 -r8c92a0d2fc6cb6475f502153dcbb0dacc7660021 --- sources/gui/qml/AlarmItem.qml (.../AlarmItem.qml) (revision f2e4eba6e85c5d36537be782926f23cc9dc01037) +++ sources/gui/qml/AlarmItem.qml (.../AlarmItem.qml) (revision 8c92a0d2fc6cb6475f502153dcbb0dacc7660021) @@ -19,7 +19,6 @@ // Project // C++ imports import VAlarmStatus 0.1 -import VAlarmActiveList 0.1 // Qml imports import "qrc:/globals" Index: sources/gui/qml/main.qml =================================================================== diff -u -r712f4c8a1b2382919300895b4422b831471044a3 -r8c92a0d2fc6cb6475f502153dcbb0dacc7660021 --- sources/gui/qml/main.qml (.../main.qml) (revision 712f4c8a1b2382919300895b4422b831471044a3) +++ sources/gui/qml/main.qml (.../main.qml) (revision 8c92a0d2fc6cb6475f502153dcbb0dacc7660021) @@ -22,107 +22,17 @@ import Gui.Actions 0.1 // View classes -import VGeneralEvent 0.1 -import VHDAccelerometer 0.1 -import VHDSyringePump 0.1 -import VHDBloodLeak 0.1 -import VHDAirBubble 0.1 import VTDAirTrap 0.1 -import VTDVoltage 0.1 import VTDBloodPump 0.1 import VTDValves 0.1 -import VTDBattery 0.1 import VTDSwitches 0.1 -import VTDEjector 0.1 -import VTDTemperature 0.1 -// POST -import VHDPOSTData 0.1 -import VDGPOSTData 0.1 +import VTDOPMode 0.1 // Device -import VDevice 0.1 +//import VDevice 0.1 // Settings -import VSettings 0.1 -import VLocalization 0.1 -import VAdjustmentVersions 0.1 -import VAdjustmentServiceMode 0.1 -import VAdjustmentServiceDates 0.1 -import VDateTime 0.1 -import VAdjustmentAlarmVolume 0.1 -import VBluetooth 0.1 -import VDuetRoWaterDG 0.1 -import VCloudSync 0.1 -import VHDUsageInfo 0.1 -import VAdjustmentInstitutionalRecord 0.1 -// States views -import VTDOpMode 0.1 //// ----- @LEAHIZED -import VPreTreatmentStates 0.1 -import VHDTreatmentStates 0.1 -import VPostTreatmentStates 0.1 -// Treatment - Common -import VTreatmentVitals 0.1 -// In-Treatment - Data -import VTreatmentBloodFlow 0.1 -import VTreatmentDialysateFlow 0.1 -import VTreatmentPressureOcclusion 0.1 -import VTreatmentUltrafiltration 0.1 -import VTreatmentTime 0.1 -import VTreatmentRinseback 0.1 -import VTreatmentRecirculate 0.1 -import VTreatmentBloodPrime 0.1 -import VTreatmentStop 0.1 -import VTreatmentRanges 0.1 -// Pre-Treatment -import VPreTreatmentAdjustmentInitTreatment 0.1 -import VDGFilterFlush 0.1 -import VPreTreatmentAdjustmentWaterSample 0.1 -import VPreTreatmentAdjustmentConsumablesConfirm 0.1 -import VPreTreatmentSelfTestNoCartridge 0.1 -import VPreTreatmentAdjustmentDisposablesConfirm 0.1 -import VPreTreatmentSelfTestDry 0.1 -import VPreTreatmentAdjustmentDisposablesPrime 0.1 -import VPreTreatmentDisposablesPrime 0.1 -import VPreTreatmentAdjustmentPatientConnectionBegin 0.1 -import VPreTreatmentAdjustmentUltrafiltrationInit 0.1 -import VPreTreatmentAdjustmentPatientConnectionConfirm 0.1 -import VPreTreatmentAdjustmentStartTreatment 0.1 -// --- -import VDGDrainPump 0.1 -import VDGHeaters 0.1 -import VDGLoadCellReadings 0.1 -import VDGOperationMode 0.1 -import VDGPressures 0.1 -import VDGROPump 0.1 -import VDGReservoir 0.1 -import VDGTemperatures 0.1 -import VDGValvesStates 0.1 -import VTreatmentCreate 0.1 -import VDGAccelerometer 0.1 -import VDGConductivity 0.1 -// In-Treatment - Adjustemnt -import VTreatmentAdjustmentDuration 0.1 -import VTreatmentAdjustmentFlows 0.1 -import VTreatmentAdjustmentUltrafiltrationState 0.1 -import VTreatmentAdjustmentUltrafiltrationEdit 0.1 -import VTreatmentAdjustmentUltrafiltrationConfirm 0.1 -import VTreatmentAdjustmentPressuresLimits 0.1 -import VTreatmentAdjustmentSaline 0.1 -import VTreatmentAdjustmentHeparin 0.1 -import VTreatmentAdjustmentRinseback 0.1 -import VTreatmentAdjustmentRecirculate 0.1 -import VTreatmentAdjustmentEnd 0.1 -// Post-Treatmnt -import VPostTreatmentAdjustmentPatientDisconnectionConfirm 0.1 -import VPostTreatmentAdjustmentDisposablesRemovalConfirm 0.1 -import VPostTreatmentAdjustmentTreatmentLog 0.1 -// Disinfection -import VDisinfectAdjustDisinfect 0.1 -import VAdjustDGCleaningUsage 0.1 -// Confirm -import VConfirm 0.1 - // Qml imports import "qrc:/globals" import "qrc:/pages" @@ -138,126 +48,6 @@ width : Variables.applicationWidth height: Variables.applicationHeight - VConfirm { id: vConfirm } - - VHDPOSTData { id: vHDPOSTData } - VDGPOSTData { id: vDGPOSTData } - - VDevice { id: vDevice } - VSettings { id: vSettings } - VLocalization { id: vLocalization } - VAdjustmentVersions { id: vAdjustmentVersions } - VAdjustmentServiceMode { id: vAdjustmentServiceMode } - VAdjustmentServiceDates { id: vAdjustmentServiceDates } - VDateTime { id: vDateTime } - VAdjustmentAlarmVolume { id: vAdjustmentAlarmVolume } - VBluetooth { id: vBluetooth } - VDuetRoWaterDG { id: vDuetRoWaterDG } - VCloudSync { id: vCloudSync } - VHDUsageInfo { id: vHDUsageInfo } - VAdjustmentInstitutionalRecord { id: vAdjustmentInstitutionalRecord } - //VAdjustIn - // ---- States - VTDOpMode { id: vTDOpMode - onStandbyChanged: { - if(vTDOpMode.standby) { - vTreatmentVitals.doReset() - } - } - } - VPreTreatmentStates { id: vPreTreatmentStates } - VHDTreatmentStates { id: vHDTreatmentStates } - VPostTreatmentStates { id: vPostTreatmentStates } - - VTreatmentBloodFlow { id: vTreatmentBloodFlow } - VTreatmentVitals { id: vTreatmentVitals - interval : vTreatmentCreate.bloodPressureMeasureInterval - enableDialog: vTDOpMode.inTreatment && vHDTreatmentStates.txTreatment - // As long as UI is in In-Tx BP/HR is updated and the dialog will pop up on interval. - onEnableDialogChanged : { - if ( vTreatmentVitals.enableDialog ) { - vTreatmentVitals.doTimerStart() - } - else { - vTreatmentVitals.doTimerStop() - } - } - } - - VGeneralEvent { id: vGeneralEvent } - VHDAccelerometer { id: vHDAccelerometer } - VHDSyringePump { id: vHDSyringePump } - VHDAirBubble { id: vHDAirBubble } - VHDBloodLeak { id: vHDBloodLeak } - VTDAirTrap { id: vTDAirTrap } - VTDVoltage { id: vTDVoltage } - VTDBloodPump { id: vTDBloodPump } - VTDValves { id: vTDValves } - VTDBattery { id: vTDBattery } - VTDSwitches { id: vTDSwitches } - VTDEjector { id: vTDEjector } - VTDTemperature { id: vTDTemperature } - - VTreatmentDialysateFlow { id: vTreatmentDialysateFlow } - VTreatmentPressureOcclusion { id: vTreatmentPressureOcclusion } - VTreatmentUltrafiltration { id: vTreatmentUltrafiltration } - VTreatmentTime { id: vTreatmentTime } - VTreatmentBloodPrime { id: vTreatmentBloodPrime } - VTreatmentRinseback { id: vTreatmentRinseback } - VTreatmentRecirculate { id: vTreatmentRecirculate } - VTreatmentStop { id: vTreatmentStop } - // ---- DG - VDGDrainPump { id: vDGDrainPump } - VDGHeaters { id: vDGHeaters } - VDGLoadCellReadings { id: vDGLoadCellReadings } - VDGOperationMode { id: vDGOperationMode } - VDGPressures { id: vDGPressures } - VDGROPump { id: vDGROPump } - VDGReservoir { id: vDGReservoir } - VDGTemperatures { id: vDGTemperatures } - VDGValvesStates { id: vDGValvesStates } - VDGAccelerometer { id: vDGAccelerometer } - VDGConductivity { id: vDGConductivity } - // --- Pre-Treatment Progress Data - VPreTreatmentAdjustmentInitTreatment { id: vPreTreatmentAdjustmentInitTreatment } - VDGFilterFlush { id: vDGFilterFlush } - VPreTreatmentAdjustmentWaterSample { id: vPreTreatmentAdjustmentWaterSample } - VPreTreatmentAdjustmentConsumablesConfirm { id: vPreTreatmentAdjustmentConsumablesConfirm } - VPreTreatmentSelfTestNoCartridge { id: vPreTreatmentSelfTestNoCartridge } - VPreTreatmentAdjustmentDisposablesConfirm { id: vPreTreatmentAdjustmentDisposablesConfirm } - VPreTreatmentSelfTestDry { id: vPreTreatmentSelfTestDry } - VPreTreatmentAdjustmentDisposablesPrime { id: vPreTreatmentAdjustmentDisposablesPrime } - VPreTreatmentDisposablesPrime { id: vPreTreatmentDisposablesPrime } - VPreTreatmentAdjustmentPatientConnectionBegin { id: vPreTreatmentAdjustmentPatientConnectionBegin } - VPreTreatmentAdjustmentUltrafiltrationInit { id: vPreTreatmentAdjustmentUltrafiltrationInit } - VPreTreatmentAdjustmentPatientConnectionConfirm { id: vPreTreatmentAdjustmentPatientConnectionConfirm } - VPreTreatmentAdjustmentStartTreatment { id: vPreTreatmentAdjustmentStartTreatment } - - // --- - VTreatmentAdjustmentDuration { id: vTreatmentAdjustmentDuration } - VTreatmentAdjustmentFlows { id: vTreatmentAdjustmentFlows } - VTreatmentCreate { id: vTreatmentCreate } - - VTreatmentRanges { id: vTreatmentRanges } - VTreatmentAdjustmentSaline { id: vTreatmentAdjustmentSaline } - VTreatmentAdjustmentUltrafiltrationState { id: vTreatmentAdjustmentUltrafiltrationState } - VTreatmentAdjustmentUltrafiltrationEdit { id: vTreatmentAdjustmentUltrafiltrationEdit } - VTreatmentAdjustmentUltrafiltrationConfirm { id: vTreatmentAdjustmentUltrafiltrationConfirm } - VTreatmentAdjustmentPressuresLimits { id: vTreatmentAdjustmentPressuresLimits } - VTreatmentAdjustmentHeparin { id: vTreatmentAdjustmentHeparin } - VTreatmentAdjustmentRinseback { id: vTreatmentAdjustmentRinseback } - VTreatmentAdjustmentRecirculate { id: vTreatmentAdjustmentRecirculate } - VTreatmentAdjustmentEnd { id: vTreatmentAdjustmentEnd } - - // --- Post Treatment - VPostTreatmentAdjustmentPatientDisconnectionConfirm { id: vPostTreatmentAdjustmentPatientDisconnectionConfirm } - VPostTreatmentAdjustmentDisposablesRemovalConfirm { id: vPostTreatmentAdjustmentDisposablesRemovalConfirm } - VPostTreatmentAdjustmentTreatmentLog { id: vPostTreatmentAdjustmentTreatmentLog } - - // --- Disinfection - VDisinfectAdjustDisinfect { id: vDisinfectAdjustDisinfect } - VAdjustDGCleaningUsage { id: vAdjustDGCleaningUsage } - Background {} // ----- Follow the below Z order ----- @@ -293,6 +83,10 @@ } } + VTDOPMode { id: vTDOpMode + } + + Connections { target: vTDOpMode function onStandbyWaitDisinfectChanged ( vValue ) { _mainMenu.isTreatment() } } @@ -450,7 +244,7 @@ // keyboard should always be before AlarmItem to not to covet it. KeyboardItem { id: _keyboard } - AlarmItem { id: _alarmItem ; z: 996 } + //AlarmItem { id: _alarmItem ; z: 996 } PowerItem { id: _powerItem ; z: 997 } ConfirmDialog { id: _confirmDialog ; z: 998 } DiagnosticsDialog { id: _diagnosticsDialog; z: 999 } Index: sources/gui/qml/pages/MainStack.qml =================================================================== diff -u -r2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9 -r8c92a0d2fc6cb6475f502153dcbb0dacc7660021 --- sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision 2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9) +++ sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision 8c92a0d2fc6cb6475f502153dcbb0dacc7660021) @@ -43,20 +43,20 @@ stackView.initialItem : _root.initialItem // Standby / Disinfection - DisinfectStack { id: _disinfectStack } - // Pre Treatment - PreTreatmentCreateStack { id: _preTreatmentCreateStack } - PreTreatmentStack { id: _preTreatmentStack } - // In TreatmentStack - TreatmentStack { id: _treatmentStack } + //DisinfectStack { id: _disinfectStack } + //// Pre Treatment + //PreTreatmentCreateStack { id: _preTreatmentCreateStack } + //PreTreatmentStack { id: _preTreatmentStack } + //// In TreatmentStack + //TreatmentStack { id: _treatmentStack } - // End Treatment - EndTreatmentRinsebackStack { id: _endTreatmentRinsebackStack } - EndTreatmentRecirculateStack { id: _endTreatmentRecirculateStack } - EndTreatmentEndStack { id: _endTreatmentEndStack } + //// End Treatment + //EndTreatmentRinsebackStack { id: _endTreatmentRinsebackStack } + //EndTreatmentRecirculateStack { id: _endTreatmentRecirculateStack } + //EndTreatmentEndStack { id: _endTreatmentEndStack } - // Post Treatment - PostTreatmentStack { id: _postTreatmentStack } + //// Post Treatment + //PostTreatmentStack { id: _postTreatmentStack } ScreenItem { id: _serviceModeScreen PlaceHolderText { screenName: qsTr("SERVICE MODE") } Fisheye: Tag 8c92a0d2fc6cb6475f502153dcbb0dacc7660021 refers to a dead (removed) revision in file `sources/gui/qml/pages/settings/SettingsBluetoothCuff.qml'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/gui/qml/pages/settings/SettingsStack.qml =================================================================== diff -u -rf2e4eba6e85c5d36537be782926f23cc9dc01037 -r8c92a0d2fc6cb6475f502153dcbb0dacc7660021 --- sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision f2e4eba6e85c5d36537be782926f23cc9dc01037) +++ sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 8c92a0d2fc6cb6475f502153dcbb0dacc7660021) @@ -268,7 +268,6 @@ SettingsInformation { id: _settingsInformation } SettingsVolumeBrightness { id: _settingsVolumeBrightness } SettingsWiFi { id: _settingsWiFi } - SettingsBluetoothCuff { id: _settingsBluetooth } SettingsDGCleaning { id: _settingsDGCleaning } SettingsDGScheduling { id: _settingsDGScheduling } SettingsServicePassword { id: _servicePassword } Index: sources/model/MAbstractDynamic.cpp =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r8c92a0d2fc6cb6475f502153dcbb0dacc7660021 --- sources/model/MAbstractDynamic.cpp (.../MAbstractDynamic.cpp) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/model/MAbstractDynamic.cpp (.../MAbstractDynamic.cpp) (revision 8c92a0d2fc6cb6475f502153dcbb0dacc7660021) @@ -16,8 +16,9 @@ // Qt // Project -#include "GuiGlobals.h" +#include "GuiGlobalsAutoGen.h" + using namespace Model; QVariantList MAbstractDynamic::parameters() const { Fisheye: Tag 8c92a0d2fc6cb6475f502153dcbb0dacc7660021 refers to a dead (removed) revision in file `sources/model/MModel.h'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/model/hd/adjustment/MAdjustRequestsBase.h =================================================================== diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -r8c92a0d2fc6cb6475f502153dcbb0dacc7660021 --- sources/model/hd/adjustment/MAdjustRequestsBase.h (.../MAdjustRequestsBase.h) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ sources/model/hd/adjustment/MAdjustRequestsBase.h (.../MAdjustRequestsBase.h) (revision 8c92a0d2fc6cb6475f502153dcbb0dacc7660021) @@ -19,7 +19,7 @@ #include //project -#include "MessageGlobals.h" +#include "MessageGlobalsAutoGen.h" #define ROUND_FLOATS Fisheye: Tag 0899b5382fb5836c0e2d8e17ffd543594f5f7802 refers to a dead (removed) revision in file `sources/model/hd/alarm/MAlarmActiveList.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0899b5382fb5836c0e2d8e17ffd543594f5f7802 refers to a dead (removed) revision in file `sources/model/hd/alarm/MAlarmActiveList.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0899b5382fb5836c0e2d8e17ffd543594f5f7802 refers to a dead (removed) revision in file `sources/model/hd/alarm/MAlarmMapping.cpp'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/storage/Logger.cpp =================================================================== diff -u -rd862dfcd402206e33b314c458e41c13b684a4565 -r8c92a0d2fc6cb6475f502153dcbb0dacc7660021 --- sources/storage/Logger.cpp (.../Logger.cpp) (revision d862dfcd402206e33b314c458e41c13b684a4565) +++ sources/storage/Logger.cpp (.../Logger.cpp) (revision 8c92a0d2fc6cb6475f502153dcbb0dacc7660021) @@ -337,7 +337,7 @@ QString fileName; if ( ! gLogLongName ) { fileName = _logFileNameDate - + _fileSeparator + "denali"; + + _fileSeparator + "Leahi"; } else { fileName = _logFileNameDate @@ -531,7 +531,7 @@ void Logger::onActionReceive(GuiActionType vAction, const QVariantList &vData) { switch (vAction) { - case GuiActionType::ID_TDOpModeData : { + case GuiActionType::ID_TDOPModeData : { if ( vData.length() >= 2 ) { bool ok = true; quint32 opMode = vData[0].toUInt(&ok); if ( ! ok ) return; @@ -577,14 +577,15 @@ } break; - case GuiActionType::ID_AdjustSerialTDRsp : { - if ( vData.length() >= 1 ) { - QString tdSerial= vData[0].toString(); - if ( tdSerial.trimmed().isEmpty() ) tdSerial = "Unknown"; - _logFileNameTDSN = tdSerial; - } - } - break; + // AUTOGEN ISSUE + //case GuiActionType::ID_AdjustSerialTDRsp : { + // if ( vData.length() >= 1 ) { + // QString tdSerial= vData[0].toString(); + // if ( tdSerial.trimmed().isEmpty() ) tdSerial = "Unknown"; + // _logFileNameTDSN = tdSerial; + // } + //} + //Sbreak; default: break; Index: sources/storage/Logger.h =================================================================== diff -u -r8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2 -r8c92a0d2fc6cb6475f502153dcbb0dacc7660021 --- sources/storage/Logger.h (.../Logger.h) (revision 8a8e17d51f3dc3f83ab7b284a4da1c9cabce59d2) +++ sources/storage/Logger.h (.../Logger.h) (revision 8c92a0d2fc6cb6475f502153dcbb0dacc7660021) @@ -22,7 +22,7 @@ // Project #include "main.h" // Doxygen : do not remove #include "StorageGlobals.h" -#include "GuiGlobals.h" +#include "GuiGlobalsAutoGen.h" // Define #define _Logger Storage::Logger::I() Fisheye: Tag 8c92a0d2fc6cb6475f502153dcbb0dacc7660021 refers to a dead (removed) revision in file `sources/storage/TreatmentLog.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8c92a0d2fc6cb6475f502153dcbb0dacc7660021 refers to a dead (removed) revision in file `sources/storage/TreatmentLog.h'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/view/VAdjustmentResponseBase.h =================================================================== diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -r8c92a0d2fc6cb6475f502153dcbb0dacc7660021 --- sources/view/VAdjustmentResponseBase.h (.../VAdjustmentResponseBase.h) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ sources/view/VAdjustmentResponseBase.h (.../VAdjustmentResponseBase.h) (revision 8c92a0d2fc6cb6475f502153dcbb0dacc7660021) @@ -19,13 +19,9 @@ // Project #include "main.h" // Doxygen : do not remove -#include "VView.h" -#include "MAdjustHDRequests.h" -#include "MAdjustDGRequests.h" -#include "MPreTreatmentAdjustRequests.h" -#include "MTreatmentAdjustRequests.h" -#include "MPostTreatmentAdjustRequests.h" -#include "GuiGlobals.h" +//#include "VView.h" +#include "VViewAutoGen.h" +#include "GuiGlobalsAutoGen.h" #include "MSettings.h" // forward declarations Index: sources/view/VEventSpy.cpp =================================================================== diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -r8c92a0d2fc6cb6475f502153dcbb0dacc7660021 --- sources/view/VEventSpy.cpp (.../VEventSpy.cpp) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ sources/view/VEventSpy.cpp (.../VEventSpy.cpp) (revision 8c92a0d2fc6cb6475f502153dcbb0dacc7660021) @@ -20,7 +20,7 @@ #include // Project -#include "GuiGlobals.h" +#include "GuiGlobalsAutoGen.h" #include "FileHandler.h" #include "DeviceController.h" #include "BluetoothInterface.h" Index: sources/view/VGeneralEvent.cpp =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r8c92a0d2fc6cb6475f502153dcbb0dacc7660021 --- sources/view/VGeneralEvent.cpp (.../VGeneralEvent.cpp) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/view/VGeneralEvent.cpp (.../VGeneralEvent.cpp) (revision 8c92a0d2fc6cb6475f502153dcbb0dacc7660021) @@ -45,6 +45,8 @@ * \details received response model data handler * \param vData - model data */ +// AUTOGEN ISSUE +/* void View::VGeneralEvent::onActionReceive(const HDGeneralEventData &vData) { QDateTime dateTime = QDateTime::currentDateTime(); @@ -70,33 +72,5 @@ ); } } +*/ -/*! - * \brief View::VGeneralEvent::onActionReceive - * \details received response model data handler - * \param vData - model data - */ -void View::VGeneralEvent::onActionReceive(const DGGeneralEventData &vData) -{ - QDateTime dateTime = QDateTime::currentDateTime(); - - dgEventID ( vData.mEventID ); - dgFieldDescriptor1 ( vData.mFieldDescriptor1 ); - dgDataFieldU1 ( vData.mDataFieldU1 ); - dgDataFieldS1 ( vData.mDataFieldS1 ); - dgDataFieldF1 ( vData.mDataFieldF1 ); - dgDataFieldB1 ( vData.mDataFieldB1 ); - dgFieldDescriptor2 ( vData.mFieldDescriptor2 ); - dgDataFieldU2 ( vData.mDataFieldU2 ); - dgDataFieldS2 ( vData.mDataFieldS2 ); - dgDataFieldF2 ( vData.mDataFieldF2 ); - dgDataFieldB2 ( vData.mDataFieldB2 ); - - GET_VALUE(dgValue) - - if( vData.mEventID == eReset ) - dgReset(QString("%1,%2") - .arg(dateTime.toString(_resetFormat)) - .arg(Format::toHexString(_dgValue.toUInt(), true, 4)) - ); -} Index: sources/view/VGeneralEvent.h =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r8c92a0d2fc6cb6475f502153dcbb0dacc7660021 --- sources/view/VGeneralEvent.h (.../VGeneralEvent.h) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/view/VGeneralEvent.h (.../VGeneralEvent.h) (revision 8c92a0d2fc6cb6475f502153dcbb0dacc7660021) @@ -19,9 +19,8 @@ // Project #include "main.h" // Doxygen : do not remove -#include "VView.h" -#include "MHDGeneralEvent.h" -#include "MDGGeneralEvent.h" +//#include "VView.h" +#include "VViewAutoGen.h" // namespace namespace View { @@ -78,7 +77,8 @@ PROPERTY( QString , dgReset ,"") VIEW_DEC_CLASS(VGeneralEvent ) - VIEW_DEC_SLOT (HDGeneralEventData ) - VIEW_DEC_SLOT (DGGeneralEventData ) + // AUTOGEN ISSUE + //VIEW_DEC_SLOT (HDGeneralEventData ) + //VIEW_DEC_SLOT (DGGeneralEventData ) }; } Fisheye: Tag 8c92a0d2fc6cb6475f502153dcbb0dacc7660021 refers to a dead (removed) revision in file `sources/view/VTreatmentCreate.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8c92a0d2fc6cb6475f502153dcbb0dacc7660021 refers to a dead (removed) revision in file `sources/view/VView.h'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/view/confirm/VConfirm.cpp =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r8c92a0d2fc6cb6475f502153dcbb0dacc7660021 --- sources/view/confirm/VConfirm.cpp (.../VConfirm.cpp) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/view/confirm/VConfirm.cpp (.../VConfirm.cpp) (revision 8c92a0d2fc6cb6475f502153dcbb0dacc7660021) @@ -33,67 +33,6 @@ } /*! - * \brief View::VConfirm::setConfirmCommand - * \param vCommand - confirm command - */ -void View::VConfirm::setConfirmCommand(const DuetConfirmHDiData &vData) -{ - command ( vData.mCommand ); - GuiConfirmCommand cmd = static_cast( _command ); - - visible( ( cmd == GuiConfirmCommand::GENERIC_CONFIRM_CMD_REQUEST_OPEN || cmd == GuiConfirmCommand::GENERIC_CONFIRM_CMD_REJECT ) ); - - switch ( cmd ) { - case GuiConfirmCommand::GENERIC_CONFIRM_CMD_REQUEST_OPEN : - adjustment_Reason ( GuiConfirmId::GENERIC_CONFIRM_ID_NONE ); - adjustment_Accepted ( false ); // it has not been accepted yet. - isTimeout ( false ); - isReject ( false ); - isAccept ( false ); - break; - case GuiConfirmCommand::GENERIC_CONFIRM_CMD_TIMEOUT_CLOSE : - adjustment_Reason ( GuiConfirmId::GENERIC_CONFIRM_ID_NONE ); // there is no need to display the timeout reason and just hides the dialog. - adjustment_Accepted ( false ); - isTimeout ( true ); - isReject ( false ); - isAccept ( false ); - break; - case GuiConfirmCommand::GENERIC_CONFIRM_CMD_REJECT : - adjustment_Reason ( vData.mReason ); // there is no need to display the timeout reason and just hides the dialog. - adjustment_Accepted ( false ); - isTimeout ( false ); - isReject ( true ); - isAccept ( false ); - break; - case GuiConfirmCommand::GENERIC_CONFIRM_CMD_ACCEPT_CLOSE : - adjustment_Reason ( GuiConfirmId::GENERIC_CONFIRM_ID_NONE ); // there is no need to display the timeout reason and just hides the dialog. - adjustment_Accepted ( true ); - isTimeout ( false ); - isReject ( false ); - isAccept ( true ); - break; - case GuiConfirmCommand::NUM_OF_GENERIC_CONFIRM_COMMAND : /* No code */ break; - } - needConfirm ( cmd == GuiConfirmCommand::GENERIC_CONFIRM_CMD_REQUEST_OPEN ); -} - -/*! - * \brief View::VConfirm::setConfirmId - * \param vId - confirm id - */ -void View::VConfirm::setConfirmId(const DuetConfirmHDiData &vData) -{ - titleByID (); - messageByID (); - confirmByID (); - // FIXME: - having issue changing the caption by isRejected, disabled for now. - cancelByID ( /*! isReject()*/ ); - // cancel ( tr("CLOSE" ) ); - - id ( vData.mId ); -} - -/*! * \brief View::VConfirm::setPowerOffCommand */ void View::VConfirm::setPowerOffCommand() @@ -126,50 +65,17 @@ } /*! - * \brief VConfirm::onActionReceive - * \details received response model data handler - * \param vData - model data - */ -void View::VConfirm::onActionReceive(const DuetConfirmHDiData &vData) -{ - isPowerOff(false ); - - setConfirmCommand ( vData ); - setConfirmId ( vData ); - - // *** 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 ); - - // DEBUG: qDebug() << _id << _command << adjustment_Reason() << _title << _message << _isReject; -} - -void View::VConfirm::onActionReceive(const PowerOffData &vData) -{ - isPowerOff(true ); - - setPowerOffCommand ( ); - setPowerOffId ( ); - - poweroff(vData.mStatus); - - // *** 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 ); - - // DEBUG: qDebug() << _id << _command << adjustment_Reason() << _title << _message << _isReject; -} - -/*! * \brief View::VConfirm::doConfirm * \details the invocable slot to send user's Confirmation */ void View::VConfirm::doConfirm(bool vConfirm) { + Q_UNUSED(vConfirm) needConfirm ( false ); - DuetConfirmUIrData data; - data.mId = id(); - data.mConfirm = vConfirm; - emit didAdjustment(data); + // AUTOGEN ISSUE + //DuetConfirmUIrData data; + //data.mId = id(); + //data.mConfirm = vConfirm; + //emit didAdjustment(data); } void View::VConfirm::onActionReceive(const SettingsData &) { Index: sources/view/confirm/VConfirm.h =================================================================== diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -r8c92a0d2fc6cb6475f502153dcbb0dacc7660021 --- sources/view/confirm/VConfirm.h (.../VConfirm.h) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ sources/view/confirm/VConfirm.h (.../VConfirm.h) (revision 8c92a0d2fc6cb6475f502153dcbb0dacc7660021) @@ -19,8 +19,6 @@ // Project #include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" -#include "MDuetConfirmHDi.h" -#include "MAdjustPowerOff.h" #include "MSettings.h" namespace View { @@ -73,28 +71,19 @@ IDBASED (QString , confirm ,tr("CONFIRM" ), confirms, id) IDBASED (QString , cancel ,tr("CANCEL" ), confirms, id) - void setConfirmCommand (const DuetConfirmHDiData &vData); - void setConfirmId (const DuetConfirmHDiData &vData); - void setPowerOffCommand (); void setPowerOffId (); VIEW_DEC_CLASS (VConfirm ) - VIEW_DEC_SLOT (DuetConfirmHDiData ) - VIEW_DEC_SLOT (PowerOffData ) + // AUTOGEN ISSUE + //VIEW_DEC_SLOT (PowerOffData ) VIEW_DEC_SLOT (SettingsData ) public slots: void doConfirm(bool vConfirm); signals: - /*! - * \brief didAdjustment - * \details the notification signal to send the user's Confirmation - * \param vData - data model includes request information - */ - void didAdjustment(const DuetConfirmUIrData &vData); }; } Fisheye: Tag 0899b5382fb5836c0e2d8e17ffd543594f5f7802 refers to a dead (removed) revision in file `sources/view/hd/alarm/VAlarmActiveList.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0899b5382fb5836c0e2d8e17ffd543594f5f7802 refers to a dead (removed) revision in file `sources/view/hd/alarm/VAlarmActiveList.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8c92a0d2fc6cb6475f502153dcbb0dacc7660021 refers to a dead (removed) revision in file `sources/view/settings/VAdjustmentAlarmVolume.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8c92a0d2fc6cb6475f502153dcbb0dacc7660021 refers to a dead (removed) revision in file `sources/view/settings/VAdjustmentAlarmVolume.h'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8c92a0d2fc6cb6475f502153dcbb0dacc7660021 refers to a dead (removed) revision in file `sources/view/settings/VAdjustmentVersions.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 8c92a0d2fc6cb6475f502153dcbb0dacc7660021 refers to a dead (removed) revision in file `sources/view/settings/VAdjustmentVersions.h'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/view/settings/VBluetooth.h =================================================================== diff -u -r2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9 -r8c92a0d2fc6cb6475f502153dcbb0dacc7660021 --- sources/view/settings/VBluetooth.h (.../VBluetooth.h) (revision 2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9) +++ sources/view/settings/VBluetooth.h (.../VBluetooth.h) (revision 8c92a0d2fc6cb6475f502153dcbb0dacc7660021) @@ -19,9 +19,9 @@ // Project #include "main.h" // Doxygen : do not remove -#include "VView.h" +//#include "VView.h" +#include "VViewAutoGen.h" #include "MBluetooth.h" -#include "MUIBloodPressureData.h" // forward declarations class tst_views; Index: sources/view/settings/VCloudSync.h =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r8c92a0d2fc6cb6475f502153dcbb0dacc7660021 --- sources/view/settings/VCloudSync.h (.../VCloudSync.h) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/view/settings/VCloudSync.h (.../VCloudSync.h) (revision 8c92a0d2fc6cb6475f502153dcbb0dacc7660021) @@ -18,7 +18,8 @@ #include // Project #include "main.h" // Doxygen : do not remove -#include +//#include +#include "VViewAutoGen.h" // forward declarations class tst_views; Index: sources/view/settings/VDateTime.cpp =================================================================== diff -u -r2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9 -r8c92a0d2fc6cb6475f502153dcbb0dacc7660021 --- sources/view/settings/VDateTime.cpp (.../VDateTime.cpp) (revision 2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9) +++ sources/view/settings/VDateTime.cpp (.../VDateTime.cpp) (revision 8c92a0d2fc6cb6475f502153dcbb0dacc7660021) @@ -106,8 +106,9 @@ status("Setting date and time ..."); dateTimeUI(dateTimeLocalStr ); - dateTimeHD(epochUTC_sec ); - dateTimeDG(epochUTC_sec ); + Q_UNUSED(epochUTC_sec) + //dateTimeHD(epochUTC_sec ); + //dateTimeDG(epochUTC_sec ); //DEBUG: QDateTime convertBack; //DEBUG: convertBack.setSecsSinceEpoch(epochUTC_sec); @@ -140,51 +141,52 @@ * set the epoch * \param vData (AdjustHDDateTimeResponseData) - the response data */ -void VDateTime::onActionReceive(const AdjustHDDateTimeResponseData &vData) -{ - _acceptHD = vData.mAccepted ? SUCCEED : FAILED; - _reasonHD = vData.mReason ; - updateStatus(); -} +// AUTOGEN ISSUE +//void VDateTime::onActionReceive(const AdjustHDDateTimeResponseData &vData) +//{ +// _acceptHD = vData.mAccepted ? SUCCEED : FAILED; +// _reasonHD = vData.mReason ; +// updateStatus(); +//} +// +///*! +// * \brief VDateTime::onActionReceive +// * Called when we receive a response back from the DG after requesting to +// * set the epoch +// * \param vResponse (AdjustDGDateTimeResponseData) - the response +// */ +//void VDateTime::onActionReceive(const AdjustDGDateTimeResponseData &vData) +//{ +// _acceptDG = vData.mAccepted ? SUCCEED : FAILED; +// _reasonDG = vData.mReason ; +// updateStatus(); +//} +// +///*! +// * \brief VDateTime::dateTimeHD +// * \details Requests HD to set the date/time +// * \param epoch - the epoch parameter which FW understands to set date/time +// */ +//void VDateTime::dateTimeHD(quint32 epoch) +//{ +// AdjustHDDateTimeRequestData data; +// data.mEpoch = epoch; +// emit didAdjustment(data); +//} +// +///*! +// * \brief VDateTime::dateTimeDG +// * \details Requests DG to set the date/time +// * \param epoch - the epoch parameter which FW understands to set date/time +// */ +//void VDateTime::dateTimeDG(quint32 epoch) +//{ +// AdjustDGDateTimeRequestData data; +// data.mEpoch = epoch; +// emit didAdjustment(data); +//} /*! - * \brief VDateTime::onActionReceive - * Called when we receive a response back from the DG after requesting to - * set the epoch - * \param vResponse (AdjustDGDateTimeResponseData) - the response - */ -void VDateTime::onActionReceive(const AdjustDGDateTimeResponseData &vData) -{ - _acceptDG = vData.mAccepted ? SUCCEED : FAILED; - _reasonDG = vData.mReason ; - updateStatus(); -} - -/*! - * \brief VDateTime::dateTimeHD - * \details Requests HD to set the date/time - * \param epoch - the epoch parameter which FW understands to set date/time - */ -void VDateTime::dateTimeHD(quint32 epoch) -{ - AdjustHDDateTimeRequestData data; - data.mEpoch = epoch; - emit didAdjustment(data); -} - -/*! - * \brief VDateTime::dateTimeDG - * \details Requests DG to set the date/time - * \param epoch - the epoch parameter which FW understands to set date/time - */ -void VDateTime::dateTimeDG(quint32 epoch) -{ - AdjustDGDateTimeRequestData data; - data.mEpoch = epoch; - emit didAdjustment(data); -} - -/*! * \brief VDateTime::dateTimeUI * \details starts the shell script in a process defined in Storage::Date_Time_Set_Sh to update the device date/time */ @@ -270,19 +272,20 @@ * \details received response model data handler * \param vData - model data */ -void VDateTime::onActionReceive(const HDRTCEpochData &vData) -{ - // Doing a single update of the HD-UI RTC sync on start-up - static bool _hasDoneHDSyncRTC = false; - if ( !_hasDoneHDSyncRTC ) { - QDateTime hdRTCTime_localZone; // Default timespec is Qt::localTime / local time zoned - hdRTCTime_localZone.setSecsSinceEpoch(vData.mEpoch); - - const QString newDateTimeString = hdRTCTime_localZone.toString(_Settings.getDatetimeFormat()); - dateTimeUI(newDateTimeString); - - _hasDoneHDSyncRTC = true; // indicate HD-UI RTC sync'd - - //DEBUG: qDebug() << "Sync HD->UI RTC | HD Epoch: " << vData.mEpoch << " | HD datetime (local zone): " << hdRTCTime_localZone.toString(_Settings.getDatetimeFormat()) <<" | local datetime : " << newDateTimeString; - } -} +// AUTOGEN ISSUE +//void VDateTime::onActionReceive(const HDRTCEpochData &vData) +//{ +// // Doing a single update of the HD-UI RTC sync on start-up +// static bool _hasDoneHDSyncRTC = false; +// if ( !_hasDoneHDSyncRTC ) { +// QDateTime hdRTCTime_localZone; // Default timespec is Qt::localTime / local time zoned +// hdRTCTime_localZone.setSecsSinceEpoch(vData.mEpoch); +// +// const QString newDateTimeString = hdRTCTime_localZone.toString(_Settings.getDatetimeFormat()); +// dateTimeUI(newDateTimeString); +// +// _hasDoneHDSyncRTC = true; // indicate HD-UI RTC sync'd +// +// //DEBUG: qDebug() << "Sync HD->UI RTC | HD Epoch: " << vData.mEpoch << " | HD datetime (local zone): " << hdRTCTime_localZone.toString(_Settings.getDatetimeFormat()) <<" | local datetime : " << newDateTimeString; +// } +//} Index: sources/view/settings/VDateTime.h =================================================================== diff -u -r2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9 -r8c92a0d2fc6cb6475f502153dcbb0dacc7660021 --- sources/view/settings/VDateTime.h (.../VDateTime.h) (revision 2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9) +++ sources/view/settings/VDateTime.h (.../VDateTime.h) (revision 8c92a0d2fc6cb6475f502153dcbb0dacc7660021) @@ -22,11 +22,7 @@ // Project #include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" -#include "MAdjustHDDateTimeResponse.h" -#include "MAdjustDGDateTimeResponse.h" -#include "MHDRTCEpochData.h" - // forward declarations class tst_views; @@ -75,8 +71,8 @@ quint8 _reasonDG = 0; quint8 _reasonUI = 0; - void dateTimeHD(quint32 epoch); - void dateTimeDG(quint32 epoch); + //void dateTimeHD(quint32 epoch); + //void dateTimeDG(quint32 epoch); void dateTimeUI(const QString &vDateTime); QString status(DateTimeSetStatus vStatus, quint8 vReason); @@ -100,9 +96,6 @@ PROPERTY(QString, timezone , "" ) VIEW_DEC_CLASS(VDateTime) - VIEW_DEC_SLOT (AdjustHDDateTimeResponseData) - VIEW_DEC_SLOT (AdjustDGDateTimeResponseData) - VIEW_DEC_SLOT (HDRTCEpochData) void greeting(quint16 vMilitaryTime); @@ -119,7 +112,5 @@ void onSetDateUIErrored(QProcess::ProcessError error); signals: - void didAdjustment(const AdjustHDDateTimeRequestData); - void didAdjustment(const AdjustDGDateTimeRequestData); }; } Index: sources/view/settings/VLocalization.h =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r8c92a0d2fc6cb6475f502153dcbb0dacc7660021 --- sources/view/settings/VLocalization.h (.../VLocalization.h) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/view/settings/VLocalization.h (.../VLocalization.h) (revision 8c92a0d2fc6cb6475f502153dcbb0dacc7660021) @@ -19,7 +19,8 @@ // Project #include "main.h" // Doxygen : do not remove -#include "VView.h" +//#include "VView.h" +#include "VViewAutoGen.h" #include "MSettings.h" // namespace Index: sources/view/settings/VSettings.h =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r8c92a0d2fc6cb6475f502153dcbb0dacc7660021 --- sources/view/settings/VSettings.h (.../VSettings.h) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/view/settings/VSettings.h (.../VSettings.h) (revision 8c92a0d2fc6cb6475f502153dcbb0dacc7660021) @@ -21,7 +21,8 @@ // Project #include "main.h" #include "MSettings.h" -#include "VView.h" +//#include "VView.h" +#include "VViewAutoGen.h" #include "StorageGlobals.h" #include "GuiController.h"