Index: etc/reports/cppcheck/cppcheck.err =================================================================== diff -u -r9bc48695cdb977a80d3279cacdc101d5164f1b4b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- etc/reports/cppcheck/cppcheck.err (.../cppcheck.err) (revision 9bc48695cdb977a80d3279cacdc101d5164f1b4b) +++ etc/reports/cppcheck/cppcheck.err (.../cppcheck.err) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -1,4 +1,4 @@ -04/21/2025 17:38 +04/22/2025 21:26 Behrouz NematiPour /home/denali/Public/luis/application/sources/canbus/MessageAcknowModel.h:58:9: performance: When an object of a class is created, the constructors of all member variables are called consecutively in the order the variables are declared, even if you don't explicitly write them to the initialization list. You could avoid assigning '_sequence' a value by passing the value to the constructor in the initialization list. [useInitializationList] _sequence = vSequence ; @@ -93,7 +93,7 @@ When you see this message it is always safe to reduce the variable scope 1 level. [variableScope] static int oH,oM,oS; int cH,cM,cS; ^ -/home/denali/Public/luis/application/sources/canbus/MessageInterpreter.cpp:557:9: style: Statements following return, break, continue, goto or throw will never be executed. [unreachableCode] +/home/denali/Public/luis/application/sources/canbus/MessageInterpreter.cpp:579:9: style: Statements following return, break, continue, goto or throw will never be executed. [unreachableCode] LOG_APPED(QString("DG,CheckIn," + QVariant(vData).toStringList().join(','))); break; ^ /home/denali/Public/luis/application/sources/cloudsync/CloudSyncController.cpp:310:10: style: The if condition is the same as the previous if condition [duplicateCondition] Index: etc/reports/cppcheck/cppcheck.log =================================================================== diff -u -r9bc48695cdb977a80d3279cacdc101d5164f1b4b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- etc/reports/cppcheck/cppcheck.log (.../cppcheck.log) (revision 9bc48695cdb977a80d3279cacdc101d5164f1b4b) +++ etc/reports/cppcheck/cppcheck.log (.../cppcheck.log) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -1,4 +1,4 @@ -04/21/2025 17:38 +04/22/2025 21:26 Behrouz NematiPour (information) Couldn't find path given by -I '/home/denali/Public/luis/application/sources/wifi/' Checking /home/denali/Public/luis/application/main.cpp ... @@ -567,7 +567,7 @@ Includes: -I/home/denali/Public/luis/application/sources/ -I/home/denali/Public/luis/application/sources/bluetooth/ -I/home/denali/Public/luis/application/sources/canbus/ -I/home/denali/Public/luis/application/sources/cloudsync/ -I/home/denali/Public/luis/application/sources/device/ -I/home/denali/Public/luis/application/sources/gui/ -I/home/denali/Public/luis/application/sources/model/ -I/home/denali/Public/luis/application/sources/storage/ -I/home/denali/Public/luis/application/sources/utility/ -I/home/denali/Public/luis/application/sources/view/ Platform:Native Checking /home/denali/Public/luis/application/sources/model/hd/alarm/MAlarmActiveList.cpp: Q_PROPERTY=1;Q_ENUM=1... -81/217 files checked 52% done +81/217 files checked 51% done Checking /home/denali/Public/luis/application/sources/model/hd/alarm/MAlarmCleared.cpp ... Defines:Q_PROPERTY=1;Q_ENUM=1 Undefines: Index: leahi.pro =================================================================== diff -u -r2bef7b8a25a76a4597aa833955c57fd1c4884de7 -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- leahi.pro (.../leahi.pro) (revision 2bef7b8a25a76a4597aa833955c57fd1c4884de7) +++ leahi.pro (.../leahi.pro) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -158,7 +158,6 @@ sources/model/hd/alarm/MAlarmStatusData.h \ sources/model/hd/alarm/MAlarmTriggered.h \ sources/model/hd/alarm/MAlarmCleared.h \ - sources/model/hd/alarm/MAlarmClearedCondition.h \ sources/model/hd/alarm/MAlarmActiveList.h \ \ # ---------- Models - States Data sources/model/hd/data/MHDOperationModeData.h \ @@ -435,7 +434,6 @@ sources/model/hd/alarm/MAlarmMapping.cpp \ sources/model/hd/alarm/MAlarmTriggered.cpp \ sources/model/hd/alarm/MAlarmCleared.cpp \ - sources/model/hd/alarm/MAlarmClearedCondition.cpp \ sources/model/hd/alarm/MAlarmActiveList.cpp \ \ # ---------- Models - Data - States sources/model/hd/data/MHDOperationModeData.cpp \ Index: leahi.pro.user =================================================================== diff -u -r9bc48695cdb977a80d3279cacdc101d5164f1b4b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- leahi.pro.user (.../leahi.pro.user) (revision 9bc48695cdb977a80d3279cacdc101d5164f1b4b) +++ leahi.pro.user (.../leahi.pro.user) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -1,6 +1,6 @@ - + EnvironmentId @@ -109,7 +109,7 @@ true - "" "" + "" 0 %{ActiveProject:ProjectDirectory}/imake.sh %{sourceDir} ProjectExplorer.ProcessStep @@ -464,18 +464,17 @@ true RemoteLinux.DirectUploadStep - /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali + /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali - /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Release/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali @@ -484,8 +483,19 @@ /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali + /home/denali/Projects/tmp/build/build-denali-Qt_5_15_10_iMX8-Debug/denali + 192.168.10.186 + 192.168.137.3 + 192.168.137.26 + 192.168.137.170 + 192.168.137.24 + 192.168.40.23 + 192.168.137.202 + 192.168.137.36 + 192.168.137.125 + 192.168.137.247 192.168.10.228 192.168.10.228 192.168.10.138 @@ -494,18 +504,8 @@ 192.168.10.186 192.168.10.167 192.168.137.170 - 192.168.137.25 192.168.137.30 - 192.168.10.186 - 192.168.137.3 - 192.168.40.23 - 192.168.137.24 - 192.168.137.26 - 192.168.137.170 - 192.168.137.36 - 192.168.137.125 - 192.168.137.202 - 192.168.137.247 + 192.168.137.25 /home/root @@ -530,70 +530,70 @@ /home/root - /opt/b2qt/3.1.18/sysroots/x86_64-pokysdk-linux - /opt/b2qt/3.1.18/sysroots/x86_64-pokysdk-linux /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots - /opt/b2qt/3.1.18/sysroots/x86_64-pokysdk-linux /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots + /opt/b2qt/3.1.18/sysroots/x86_64-pokysdk-linux + /opt/b2qt/3.1.18/sysroots/x86_64-pokysdk-linux /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots + /opt/b2qt/3.1.18/sysroots/x86_64-pokysdk-linux /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots /opt/b2qt/3.1.18/sysroots - 2023-01-17T18:06:25.579 + 2023-01-18T20:13:36.296 + 2023-02-02T02:40:56.627 + 2023-02-01T05:00:56.449 + 2023-01-27T09:45:11.898 + 2023-02-02T02:05:29.947 + 2023-01-24T17:29:54.849 + 2023-02-02T01:46:50.167 + 2023-02-01T03:23:15.710 + 2023-02-02T02:07:25.922 + 2023-02-02T02:26:33.738 2023-01-17T18:18:03.749 + 2023-01-17T18:06:25.579 2023-02-02T09:06:00.862 2023-02-02T01:52:20.307 2023-01-24T18:19:13.179 2023-01-18T17:47:08.797 2023-02-02T19:40:15.813 2023-01-27T10:15:15.423 - 2023-02-02T02:13:54.596 2023-02-02T02:30:48.337 - 2023-01-18T20:13:36.296 - 2023-02-02T02:40:56.627 - 2023-01-24T17:29:54.849 - 2023-02-02T02:05:29.947 - 2023-02-01T05:00:56.449 - 2023-01-27T09:45:11.898 - 2023-02-01T03:23:15.710 - 2023-02-02T02:07:25.922 - 2023-02-02T01:46:50.167 - 2023-02-02T02:26:33.738 + 2023-02-02T02:13:54.596 - 2023-01-17T18:05:42.000 + 2023-01-18T20:13:33.000 + 2023-02-02T02:41:10.000 + 2023-02-01T05:00:51.000 + 2023-01-27T09:44:58.000 + 2023-02-02T02:05:42.000 + 2023-01-24T17:30:03.000 + 2023-02-02T01:47:02.000 + 2023-02-01T03:23:28.000 + 2023-02-02T02:07:21.000 + 2023-02-02T02:26:46.000 2023-01-17T18:17:25.000 + 2023-01-17T18:05:42.000 2023-02-02T09:05:22.000 2023-02-02T01:52:16.000 2023-01-24T18:18:58.000 2023-01-18T17:47:04.000 2023-02-02T19:39:36.000 2023-01-27T10:15:08.000 - 2023-02-02T02:14:08.000 2023-02-02T02:31:01.000 - 2023-01-18T20:13:33.000 - 2023-02-02T02:41:10.000 - 2023-01-24T17:30:03.000 - 2023-02-02T02:05:42.000 - 2023-02-01T05:00:51.000 - 2023-01-27T09:44:58.000 - 2023-02-01T03:23:28.000 - 2023-02-02T02:07:21.000 - 2023-02-02T01:47:02.000 - 2023-02-02T02:26:46.000 + 2023-02-02T02:14:08.000 2 Index: sources/ApplicationController.cpp =================================================================== diff -u -r9bc48695cdb977a80d3279cacdc101d5164f1b4b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision 9bc48695cdb977a80d3279cacdc101d5164f1b4b) +++ sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -75,11 +75,8 @@ */ void ApplicationController::quit() { - // disabled coco begin validated: Application termination is not correctly done in coco!!! - // it has been tested and works perfectly fine in normal run. quitThread(); // validated } -// disabled coco end /*! * \brief ApplicationController::initConnections @@ -194,15 +191,11 @@ */ void ApplicationController::quitThread() { - // disabled coco begin validated: Application termination is not correctly done in coco!!! - // it has been tested and works perfectly fine in normal run. - if ( ! _thread ) return; // runs in thread moveToThread(qApp->thread()); // validated } -// disabled coco end /*! * \brief ApplicationController::onFailedTransmit @@ -254,11 +247,8 @@ */ void ApplicationController::onUSBDriveMount () { - // disabled coco begin validated: This needs user interaction to plug-in USB device - // has been tested manually emit didUSBDriveMount(); } -// disabled coco end /*! * \brief ApplicationController::onUSBDriveRemove @@ -267,11 +257,8 @@ */ void ApplicationController::onUSBDriveUmount() { - // disabled coco begin validated: This needs user interaction to plug-in USB device - // has been tested manually emit didUSBDriveUmount(); } -// disabled coco end /*! * \brief ApplicationController::onUSBDriveRemove @@ -314,11 +301,8 @@ */ void ApplicationController::onSDCardSpaceTooLow(quint8 vAvailablePercent) { - // disabled coco begin validated: This needs user interaction to plug-in SD Card - // has been tested manually emit didSDCardSpaceTooLow(vAvailablePercent); } -// disabled coco end /*! * \brief ApplicationController::onExportLog @@ -351,8 +335,6 @@ */ void ApplicationController::onExport() { - // disabled coco begin validated: This needs user interaction to plug-in USB device - // has been tested manually emit didExport(); } @@ -361,7 +343,6 @@ // DEBUG: qDebug() << "1" << vIndex << vFileName << vPercent; emit didExportStat(vIndex, vFileName, vPercent); } -// disabled coco end /*! * \brief ApplicationController::checkIn @@ -374,9 +355,6 @@ #ifndef DISABLE_KEEP_ALIVE QVariantList mData; int mFakeDataLen = gFakeData.length(); - // coco begin validated: This is a fake data generator for CANBus missing/swapped frames Testing - // will never be executed on the product - // has been tested manually if (mFakeDataLen) { if (gFakeSeqAtBegin) { createFakeSeqAtBeginLongMessage(mData, mFakeDataLen); @@ -385,7 +363,6 @@ createFakeSequencedLongMessage (mData, mFakeDataLen); } } - // disabled coco end else { mData += static_cast(GuiActionData::NoData); } @@ -401,9 +378,6 @@ */ void ApplicationController::createFakeSequencedLongMessage(QVariantList &vData, const int vFakeDataLen) { - // disabled coco begin validated: This is a fake data generator for CANBus missing/swapped frames Testing - // will never be executed on the product - // has been tested manually QByteArray data; if (vFakeDataLen == 1 && gFakeData == QByteArray::fromHex(gFakeData_default)) { static quint16 txCount = 0; @@ -447,7 +421,6 @@ vData += gFakeData; } } -// disabled coco end /*! * \brief ApplicationController::createFakeSequencedAtBeginLongMessage @@ -457,9 +430,6 @@ */ void ApplicationController::createFakeSeqAtBeginLongMessage(QVariantList &vData, const int vFakeDataLen) { - // disabled coco begin validated: This is a fake data generator for CANBus missing/swapped frames Testing - // will never be executed on the product - // has been tested manually QByteArray data; if (vFakeDataLen == 1 && gFakeData == QByteArray::fromHex(gFakeData_default)) { static quint32 txCount = 0; @@ -508,9 +478,7 @@ vData += gFakeData; } } -// disabled coco end - void ApplicationController::postDoneRequest() { AdjustUIPostFinalResultRequestData data; Index: sources/ApplicationController.h =================================================================== diff -u -r2bef7b8a25a76a4597aa833955c57fd1c4884de7 -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/ApplicationController.h (.../ApplicationController.h) (revision 2bef7b8a25a76a4597aa833955c57fd1c4884de7) +++ sources/ApplicationController.h (.../ApplicationController.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -88,8 +88,8 @@ void alarmTrigger (Gui::GuiAlarmID vAlarmID, bool vSend = false, bool vSingle = false); private slots: // Should be private for thread safety and is connected internally. - void onActionReceive (GuiActionType vAction, const QVariantList &vData); // UI <= HD/DG - void onActionTransmit(GuiActionType vAction, const QVariantList &vData); // UI => HD/DG + void onActionReceive (GuiActionType vAction, const QVariantList &vData); // UI <= TD/DD + void onActionTransmit(GuiActionType vAction, const QVariantList &vData); // UI => TD/DD void onMainTimerTimeout(); @@ -143,8 +143,8 @@ void didPOSTCloudSyncData (const QString &vNetAddress); signals: - void didActionReceive (GuiActionType vAction, const QVariantList &vData); // UI <= HD/DG - void didActionTransmit(GuiActionType vAction, const QVariantList &vData); // UI => HD/DG + void didActionReceive (GuiActionType vAction, const QVariantList &vData); // UI <= TD/DD + void didActionTransmit(GuiActionType vAction, const QVariantList &vData); // UI => TD/DD void didFailedTransmit(Sequence seq); void didUSBDriveMount (); Index: sources/MainTimer.cpp =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/MainTimer.cpp (.../MainTimer.cpp) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/MainTimer.cpp (.../MainTimer.cpp) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -36,9 +36,6 @@ */ bool MainTimer::init() { - // disabled coco begin validated: This is a fake data generator for CANBus missing/swapped frames Testing - // will never be executed on the product - // has been tested manually if (gFakeInterval) { startTimer(gFakeInterval); } @@ -78,8 +75,6 @@ static int oH,oM,oS; int cH,cM,cS; QDateTime::currentDateTime().date().getDate(&cy, &cm, &cd); - // disabled coco begin validated: Decided to not to check each second - // has been tested manually if (vIncludeTime) { QTime currentTime = QDateTime::currentDateTime().time(); cH = currentTime.hour(); @@ -102,7 +97,6 @@ oM = cM; oS = cS; } - // disabled coco end } else return false; Index: sources/Threads.cpp =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/Threads.cpp (.../Threads.cpp) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/Threads.cpp (.../Threads.cpp) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -71,13 +71,9 @@ */ void quitThread(QThread &vThread) { - // disabled coco begin validated: Application termination is not correctly done in coco!!! - // it has been tested and works perfectly fine in normal run. - // runs in main thread vThread.quit(); // validated vThread.wait(); // validated } - // disabled coco end /*! * \brief quitThreads @@ -87,8 +83,6 @@ */ void quitThreads() { - // disabled coco begin validated: Application termination is not correctly done in coco!!! - // it has been tested and works perfectly fine in normal run. quitThread(_CloudSync_Thread ); quitThread(_CanFrame_Thread ); quitThread(_CanAcknow_Thread ); @@ -100,5 +94,4 @@ quitThread(_Gui_Thread ); quitThread(_Logger_Thread ); } - // disabled coco end } Index: sources/bluetooth/BluetoothInterface.cpp =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/bluetooth/BluetoothInterface.cpp (.../BluetoothInterface.cpp) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/bluetooth/BluetoothInterface.cpp (.../BluetoothInterface.cpp) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -90,11 +90,8 @@ if ( _agent ) _agent ->deleteLater(); quitDevice(); - // disabled coco begin validated: Application termination is not correctly done in coco!!! - // it has been tested and works perfectly fine in normal run. quitThread(); // validated } -// disabled coco end /*! @@ -122,15 +119,10 @@ */ void BluetoothInterface::quitThread() { - // disabled coco begin validated: Application termination is not correctly done in coco!!! - // it has been tested and works perfectly fine in normal run. - if ( ! _thread ) return; - // runs in thread moveToThread(qApp->thread()); // validated } -// disabled coco end // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // // ~~~~~~~~~~ THREAD SAFE state change notifications.~~~~~~~~~~ // Index: sources/canbus/CanInterface.cpp =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/canbus/CanInterface.cpp (.../CanInterface.cpp) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/canbus/CanInterface.cpp (.../CanInterface.cpp) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -47,9 +47,7 @@ if ( _init ) return false; _init = true; - // disabled coco begin validated: Manually tested since required to disable and enable the CANBus if ( ! initDevice() ) return false; - // disabled coco end if ( ! testDevice() ) return false; initConnections(); @@ -73,9 +71,7 @@ */ bool CanInterface::init(QThread &vThread) { - // disabled coco begin validated: Manually tested since required to disable and enable the CANBus if ( ! init() ) return false; - // disabled coco end initThread(vThread); return true; } @@ -87,11 +83,8 @@ */ void CanInterface::quit() { - // disabled coco begin validated: Application termination is not correctly done in coco!!! - // it has been tested and works perfectly fine in normal run. quitThread(); // verified } -// disabled coco end /*! * \brief CanInterface status @@ -109,7 +102,6 @@ * \param vEnabled - Enable console output if true */ void CanInterface::enableConsoleOut(bool vEnabled) { - // disabled coco begin validated: This code meant to be used only for debugging and tested manually if (_enableConsoleOut == vEnabled) return; _enableConsoleOut = vEnabled; if (_enableConsoleOut) { @@ -118,7 +110,6 @@ LOG_DEBUG("Console out CanInterface disabled"); } } -// disabled coco end /*! * \brief CanInterface connections definition @@ -127,9 +118,7 @@ */ void CanInterface::initConnections() { - // disabled coco begin validated: Manually tested since required to disable and enable the CANBus if (_canDevice) { - // disabled coco end connect(_canDevice, SIGNAL( framesReceived()), this , SLOT (onFrameReceive ())); @@ -168,15 +157,11 @@ */ void CanInterface::quitThread() { - // disabled coco begin validated: Application termination is not correctly done in coco!!! - // it has been tested and works perfectly fine in normal run. - if (! _thread) return; // runs in thread moveToThread(qApp->thread()); // verified } -// disabled coco end /*! * \brief CanInterface::createDevice @@ -187,13 +172,11 @@ { QString mError; _canDevice = QCanBus::instance()->createDevice(_canType, _canInterface, &mError); - // disabled coco begin validated: Manually tested since required to disable and enable the CANBus if (!_canDevice) { status(tr("Device Creation"), mError); LOG_DEBUG(status()); return false; } - // disabled coco end _canDevice->setConfigurationParameter(QCanBusDevice::CanFdKey , _canFDKey ); _canDevice->setConfigurationParameter(QCanBusDevice::BitRateKey , _canBitRate ); return true; @@ -222,9 +205,7 @@ */ void CanInterface::quitDevice() { - // disabled coco begin validated: Manually tested since required to disable and enable the CANBus if (!_canDevice) return; - // disabled coco end _canDevice->disconnectDevice(); delete _canDevice; _canDevice = nullptr; @@ -261,9 +242,7 @@ */ bool CanInterface::transmit(const QCanBusFrame &vFrame) { - // disabled coco begin validated: Manually tested since required to disable and enable the CANBus if( !_canDevice ) return false; - //disabled coco end return _canDevice->writeFrame(vFrame); } @@ -275,7 +254,6 @@ */ void CanInterface::consoleOut(const QCanBusFrame &vFrame, const QString &vFrameCount) { - // disabled coco begin validated: This code is only for debugging purposes and had been tested manually. if ( ! _enableConsoleOut ) return; const QString time = QString::fromLatin1("%1.%2 ") @@ -292,7 +270,6 @@ // the fprintf is used for the colored output fprintf(stderr, "%s %s %s %i %s\n", vFrameCount.toLatin1().constData(), time.toLatin1().constData(), flags.toLatin1().constData(), vFrame.frameId(), view.toLatin1().constData()); } -// disabled coco end /*! * \brief CanInterface::rxCount @@ -323,11 +300,8 @@ */ FrameCount CanInterface::erCount() { - // disabled coco begin validated: CANBus error handling has been tested manually. - // since it requires massive can messages sent/received to catch the error Types::safeIncrement(_erFrameCount); return _erFrameCount; - // disabled coco end } /*! @@ -338,8 +312,6 @@ */ QString CanInterface::frameFlags(const QCanBusFrame &vFrame) { - // disabled coco begin validated: CANBus error handling has been tested manually. - // since it requires massive can messages sent/received to catch the error QString result = QLatin1String(" --- "); if (vFrame.hasBitrateSwitch()) @@ -350,7 +322,6 @@ result[3] = QLatin1Char('L'); return result; - // disabled coco end } /*! @@ -360,8 +331,6 @@ */ void CanInterface::onFrameError(QCanBusDevice::CanBusError vError) { - // disabled coco begin validated: CANBus error handling has been tested manually. - // since it requires massive can messages sent/received to catch the error erCount(); switch (vError) { case QCanBusDevice::ReadError: @@ -382,7 +351,6 @@ } emit didFrameError(_canStatus); } -// disabled coco end /*! * \brief CanInterface::onFrameWritten @@ -405,16 +373,12 @@ */ void CanInterface::onFrameReceive () { - // disabled coco begin validated: Manually tested since required to disable and enable the CANBus if (!_canDevice) return; - // disabled coco end while (_canDevice->framesAvailable()) { const QCanBusFrame frame = _canDevice->readFrame(); rxCount(); - // disabled coco begin validated: This code is only for debugging purposes and had been tested manually. if ( _enableConsoleOut ) consoleOut(frame, QString("Rx:%1").arg(_rxFrameCount)); - // disabled coco end emit didFrameReceive(frame); } } @@ -429,9 +393,7 @@ { bool ok = transmit(vFrame); txCount(); - // disabled coco begin validated: This code is only for debugging purposes and had been tested manually. if ( _enableConsoleOut ) consoleOut(vFrame, QString("Tx:%1").arg(_txFrameCount)); - // disabled coco end emit didFrameTransmit(ok); } Index: sources/canbus/FrameInterface.cpp =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/canbus/FrameInterface.cpp (.../FrameInterface.cpp) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/canbus/FrameInterface.cpp (.../FrameInterface.cpp) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -74,11 +74,8 @@ */ void FrameInterface::quit() { - // disabled coco begin validated: Application termination is not correctly done in coco!!! - // it has been tested and works perfectly fine in normal run. quitThread(); // validated } -// disabled coco end /*! * \brief FrameInterface connections definition @@ -123,15 +120,11 @@ */ void FrameInterface::quitThread() { - // disabled coco begin validated: Application termination is not correctly done in coco!!! - // it has been tested and works perfectly fine in normal run. - if ( ! _thread ) return; // runs in thread moveToThread(qApp->thread()); // validated } -// disabled coco end /*! * \brief FrameInterface::transmitFrame @@ -172,12 +165,12 @@ FrameInterface::ChannelGroup channelGroup = ChannelGroup::eChannel_Unknown; switch (vFrameId) { - case eDialin_HD: - case eHD_Dialin: - case eDialin_DG: - case eDG_Dialin: - case eDialin_UI: - case eUI_Dialin: + case eDialin_TD : + case eTD_Dialin : + case eDialin_DD : + case eDD_Dialin : + case eDialin_UI : + case eUI_Dialin : if ( gDisableDialinUnhandled ) { channelGroup = ChannelGroup::eChannel_Ignores; } else { @@ -187,45 +180,41 @@ ok = ! gDisableDialinUnhandled; // if ok is true then it will be interpreted as unhandled messages. break; - case eChlid_HD_DG : - channelGroup = ChannelGroup::eChannel_Ignores; - break; - // disabled coco begin validated: The HD/DG communication has not been defined and implemented yet. - case eChlid_DG_HD : - // disabled coco end - // this channel is used for DG CheckIn for HW support and testing for now. + // these channels will be used for testing for now. + case eChlid_TD_DD : + case eChlid_DD_TD : + case eChlid_DD_FP : + case eChlid_FP_DD : //channelGroup = ChannelGroup::eChannel_Ignores; //break; - case eChlid_HD_UI : - case eChlid_HD_Alarm : - case eChlid_HD_Sync : - // disabled coco begin validated: The UI/DG communication has not been defined and implemented yet. - case eChlid_DG_Alarm : - case eChlid_DG_UI : - case eChlid_DG_Sync : - // disabled coco end - //case eChlid_DG_UI : // has duplicate value as eChlid_DG_Alarm + case eChlid_TD_UI : + case eChlid_TD_Alarm : + case eChlid_TD_Sync : + //case eChlid_DD_UI : // has duplicate value as eChlid_DD_Sync + case eChlid_DD_Alarm : + case eChlid_DD_Sync : + //case eChlid_FP_UI : // Only in α, will be removed in ꞵ + case eChlid_FP_Alarm : // Only in α, will be removed in ꞵ + case eChlid_FP_Sync : // Only in α, will be removed in ꞵ channelGroup = ChannelGroup::eChannel_Listens; break; - // disabled coco begin validated: The UI Alarm and Sync messages has not been defined and implemented yet. - case eChlid_UI_Alarm : - case eChlid_UI_Sync : - //case eChlid_UI_DG : + case eChlid_UI_Alarm : + case eChlid_UI_Sync : + case eChlid_UI_TD : + //case eChlid_UI_DD : // has duplicate value as eChlid_UI_Sync channelGroup = ChannelGroup::eChannel_Outputs; break; - // disabled coco end + default: ok = false; break; } - // disabled coco begin validated: manually tested if (vOK) *vOK = ok; if (vDebugChanngel) *vDebugChanngel = debugChannel; - // disabled coco end return channelGroup; } @@ -317,15 +306,11 @@ void FrameInterface::trnsmtHead() { if ( _txFrameList.isEmpty() ) { - // disabled coco begin validated: This is a fake data generator for CANBus missing/swapped frames Testing - // will never be executed on the product and shall be removed after the CANBus issues has been resolved. - // has been tested manually if ( gSendEmptyKeepAwake ) { transmitFrame(eChlid_LOWEST,QByteArray()); // Keep the CANBus awake. return; } } - // disabled coco end else { Frame frame = _txFrameList.first(); transmitFrame(frame.can_Id, frame.data); @@ -356,7 +341,6 @@ */ void FrameInterface::appendHead(Can_Id vCan_Id, const QByteArray &vData) { - // disabled coco begin validated: has been manually tested by sending over 4000 frames and not received by any other node. //DEBUG qDebug() << "F " << _txFrameList.count(); if (_txFrameList.count() >= _txFrameList_Max) { static quint32 i = 0; @@ -366,7 +350,6 @@ if ( i < UINT32_MAX - 1 ) i++ ; else i = 0; return; - // disabled coco end } Frame frame = Frame(vCan_Id, vData); Index: sources/canbus/MessageAcknowModel.cpp =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/canbus/MessageAcknowModel.cpp (.../MessageAcknowModel.cpp) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/canbus/MessageAcknowModel.cpp (.../MessageAcknowModel.cpp) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -72,11 +72,8 @@ void MessageAcknowModel::quit() { qDeleteAll(_acknowList); - // disabled coco begin validated: Application termination is not correctly done in coco!!! - // it has been tested and works perfectly fine in normal run. quitThread(); // validated } -// disabled coco end /*! * \brief MessageAcknowModel::initConnections @@ -116,15 +113,11 @@ */ void MessageAcknowModel::quitThread() { - // disabled coco begin validated: Application termination is not correctly done in coco!!! - // it has been tested and works perfectly fine in normal run. - if ( ! _thread ) return; // runs in thread moveToThread(qApp->thread()); // validated } -// disabled coco end /*! * \brief MessageAcknowModel::onAcknowTransmit Index: sources/canbus/MessageBuilder.cpp =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/canbus/MessageBuilder.cpp (.../MessageBuilder.cpp) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/canbus/MessageBuilder.cpp (.../MessageBuilder.cpp) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -289,7 +289,6 @@ * \param vEnabled */ void MessageBuilder::enableConsoleOut(bool vEnabled) { - // disabled coco begin validated: This code meant to be used only for debugging and tested manually if (_enableConsoleOut == vEnabled) return; _enableConsoleOut = vEnabled; if (_enableConsoleOut) { @@ -298,7 +297,6 @@ LOG_DEBUG("Console out MessageBuilder disabled"); } } -// disabled coco end /*! * \brief MessageBuilder::hasSyncByte @@ -443,7 +441,6 @@ return; } QByteArray view; - // disabled coco begin validated: printPayload and specially vUseColor is for debugging purposes and has been validated manually. if (vUseColor) { QList byteList; byteList = vPayload.toHex('.').split('.'); @@ -470,7 +467,6 @@ // the fprintf is used for the colored output fprintf(stderr, "%s\n", view.constData()); } - // disabled coco end } /*! Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -75,11 +75,8 @@ */ void MessageDispatcher::quit() { - // disabled coco begin validated: Application termination is not correctly done in coco!!! - // it has been tested and works perfectly fine in normal run. quitThread(); // validated } -// disabled coco end /*! * \brief Message Handler connections definition @@ -137,15 +134,11 @@ */ void MessageDispatcher::quitThread() { - // disabled coco begin validated: Application termination is not correctly done in coco!!! - // it has been tested and works perfectly fine in normal run. - if ( ! _thread ) return; // runs in thread moveToThread(qApp->thread()); // validated } -// disabled coco end /*! * \brief MessageDispatcher::onFrameReceive @@ -160,10 +153,8 @@ void MessageDispatcher::onFrameReceive(Can_Id vCan_Id, const QByteArray &vPayload) { // Append a message to the list - // disabled coco begin validated: if empty (first condition) is true, it must never check for the complete (second condition) // because if the list is empty there is no last() item if (_messageList[vCan_Id].isEmpty() || _messageList[vCan_Id].last().isComplete()) { - // disabled coco end _messageList[vCan_Id].append(Message()); } @@ -205,10 +196,8 @@ */ void MessageDispatcher::onFailedTransmit(Sequence vSequence) { - // disabled coco begin validated: Is a placeholder and has not been implemented yet emit didFailedTransmit(vSequence); } -// disabled coco end /*! * \brief MessageDispatcher::onActionTransmit @@ -353,21 +342,6 @@ onActionTransmit(GuiActionType::ID_AlarmVolumeSetReq, mData); } -/*! - * \brief MessageDispatcher::onAdjustment - * \details This method transmits the Alarm Acknowledge Request message. - * \param vData - Data model contains the user acknowledge request information. - * \return void - */ -/* // disabled coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now. -void MessageDispatcher::onAdjustment(const AlarmClearedConditionRequestData &vData) -{ - QVariantList mData; - mData += vData.alarmID; - onActionTransmit(GuiActionType::ID_AlarmClearedConditionReq, mData); -} -// disabled coco end */ - /** * \details This method transmits the Saline Bolus Adjustment Denali message. * \param vData - Data model contains treatment Saline Bolus adjustment state. @@ -894,13 +868,11 @@ #endif } - // disabled coco begin validated: Has been tested manually but in this function this cannot be false because the message interpreter is doing the same validation. // still checking here in case the logic has changed therefore buildFrame should still validate the message for developer safety. if ( ! _builder.buildFrames(vActionId, mData, frameList, mSequence) ) { LOG_DEBUG(QString("Incorrect Message cannot be built")); // TODO : LogInfo Improvement return; } - // disabled coco end if (mNeedsAcknow) { // NOTE : here vSequence should be used which is not negative // because when we get the Acknow it is not the negative @@ -1027,12 +999,10 @@ checkAcknowTransmit(vMessage, srcText); // then if needs acknow send it immediately. } - // disabled coco begin validated: Has been validated manually. If MessageInterpreter::interpretMessage fails, this also returns false if ( _interpreter.interpretMessage( vMessage, mData ) ) { ok = true; emit didActionReceive(vMessage.actionId, mData); } - // disabled coco end _messageList[vMessage.can_id].removeLast(); return ok; @@ -1045,15 +1015,13 @@ */ Sequence MessageDispatcher::rxCount() { - // disabled coco begin validated: has been manually validated since it requires so many received messages to reset the seq if ( _rxSequence < SEQUENCE_MAX ) { ++_rxSequence; } else { _rxSequence = 1; } return _rxSequence; } -// disabled coco end /*! * \brief MessageDispatcher::txCount @@ -1062,15 +1030,13 @@ */ Sequence MessageDispatcher::txCount() { - // disabled coco begin validated: has been manually validated since it requires so many received messages to reset the seq if ( _txSequence < SEQUENCE_MAX ) { ++_txSequence; } else { _txSequence = 1; } return _txSequence; } -// disabled coco end /*! * \brief MessageDispatcher::needsAcknow @@ -1093,12 +1059,16 @@ { bool ok = true; switch(vCan_Id) { // list if the channels UI shall not Ack - case eChlid_HD_DG : // 0x008, ///< HD => DG - case eChlid_DG_HD : // 0x010, ///< DG => HD - case eDialin_HD : // 0x400, ///< dialin => HD - case eHD_Dialin : // 0x401, ///< HD => dialin - case eDialin_DG : // 0x402, ///< dialin => DG - case eDG_Dialin : // 0x403, ///< DG => dialin + case eChlid_TD_DD : + case eChlid_DD_TD : + case eChlid_DD_FP : + case eChlid_FP_DD : + case eDialin_TD : + case eTD_Dialin : + case eDialin_DD : + case eDD_Dialin : + case eDialin_FP : + case eFP_Dialin : ok = false; break; default: break; Index: sources/canbus/MessageDispatcher.h =================================================================== diff -u -r2bef7b8a25a76a4597aa833955c57fd1c4884de7 -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision 2bef7b8a25a76a4597aa833955c57fd1c4884de7) +++ sources/canbus/MessageDispatcher.h (.../MessageDispatcher.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -116,7 +116,6 @@ // Alarm GuiActionType::ID_AlarmUserActionReq , GuiActionType::ID_AlarmSilenceReq , - GuiActionType::ID_AlarmClearedConditionReq , GuiActionType::ID_AlarmActiveListReq , GuiActionType::ID_AlarmVolumeSetReq , // Pre-Treatment @@ -185,7 +184,7 @@ void initThread(QThread &vThread); void quitThread(); - void actionTransmit (GuiActionType vActionId, const QVariantList &vData, Sequence vSequence = 0, Can_Id vCanId = Can::Can_Id::eChlid_UI_HD); + void actionTransmit (GuiActionType vActionId, const QVariantList &vData, Sequence vSequence = 0, Can_Id vCanId = Can::Can_Id::eChlid_UI_TD); void framesTransmit (Can_Id vCan_Id, const FrameList &vFrameList); bool needsAcknow (GuiActionType vActionId); Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r2bef7b8a25a76a4597aa833955c57fd1c4884de7 -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 2bef7b8a25a76a4597aa833955c57fd1c4884de7) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -113,8 +113,6 @@ {Gui::GuiActionType::ID_AlarmStatus , 4 * 4 + 2 }, // 4 parameters each 4bytes + 1 parameter 2bytes {Gui::GuiActionType::ID_AlarmTriggered , 8 * 4 }, // 5 parameters each 4bytes {Gui::GuiActionType::ID_AlarmCleared , 1 * 4 }, // 1 parameter each 4bytes - {Gui::GuiActionType::ID_AlarmClearedConditionReq , 1 * 4 }, // 1 parameter each 4bytes // the same message 63:0x3F00 - {Gui::GuiActionType::ID_AlarmClearedConditionRsp , 1 * 4 }, // 1 parameter each 4bytes // the same message 63:0x3F00 {Gui::GuiActionType::ID_AlarmSilenceReq , 1 * 4 }, // 1 parameter each 1bytes {Gui::GuiActionType::ID_AlarmUserActionReq , 1 * 4 }, // 1 parameter each 4bytes {Gui::GuiActionType::ID_AlarmActiveListReq , 0 * 4 }, // 0 parameter each 4bytes @@ -318,35 +316,41 @@ // Broadcasts //// Alarm - eChlid_HD_Alarm = 0x001, ///< HD alarm broadcast - eChlid_DG_Alarm = 0x002, ///< DG alarm broadcast + eChlid_TD_Alarm = 0x001, ///< TD alarm broadcast + eChlid_DD_Alarm = 0x002, ///< DD alarm broadcast + eChlid_FP_Alarm = 0x003, ///< FP alarm broadcast eChlid_UI_Alarm = 0x004, ///< UI alarm broadcast [Out] //// Sync - eChlid_HD_Sync = 0x040, ///< HD sync broadcast - eChlid_DG_Sync = 0x080, ///< DG sync broadcast - eChlid_UI_Sync = 0x200, ///< UI sync broadcast [Out] + eChlid_TD_Sync = 0x100, ///< HD sync broadcast + eChlid_DD_Sync = 0x101, ///< DD sync broadcast + eChlid_FP_Sync = 0x102, ///< DD sync broadcast + eChlid_UI_Sync = 0x103, ///< UI sync broadcast [Out] // UI not listening - eChlid_HD_DG = 0x008, ///< HD => DG - eChlid_DG_HD = 0x010, ///< DG => HD + eChlid_TD_DD = 0x010, ///< TD => DD + eChlid_DD_TD = 0x011, ///< DD => TD + eChlid_DD_FP = 0x021, ///< DD => FP + eChlid_FP_DD = 0x020, ///< FP => DD // UI is listening - eChlid_HD_UI = 0x020, ///< HD => UI - eChlid_UI_HD = 0x100, ///< UI => HD [Out] + eChlid_TD_UI = 0x040, ///< TD => UI + eChlid_UI_TD = 0x041, ///< UI => TD [Out] // UI listens occasionally - eChlid_DG_UI = 0x070, ///< DG => UI - eChlid_UI_DG = 0x110, ///< UI => DG [Out] + eChlid_DD_UI = eChlid_DD_Sync , ///< DD => UI + eChlid_UI_DD = eChlid_UI_Sync , ///< UI => DD [Out] // Dialing channel has been requested by V&V team for CANBus testing // and clarify the source of the unexpected channel message // UI still does not do anything with the messages on these channels. - eDialin_HD = 0x400, ///< dialin => HD - eHD_Dialin = 0x401, ///< HD => dialin - eDialin_DG = 0x402, ///< dialin => DG - eDG_Dialin = 0x403, ///< DG => dialin - eDialin_UI = 0x404, ///< dialin => UI - eUI_Dialin = 0x405, ///< UI => dialin + eDialin_TD = 0x400, ///< dialin => TD + eTD_Dialin = 0x401, ///< TD => dialin + eDialin_DD = 0x402, ///< dialin => DD + eDD_Dialin = 0x403, ///< DD => dialin + eDialin_FP = 0x404, ///< dialin => FP + eFP_Dialin = 0x405, ///< FP => dialin + eDialin_UI = 0x406, ///< dialin => UI + eUI_Dialin = 0x407, ///< UI => dialin }; /*! @@ -355,9 +359,10 @@ */ enum Can_Source { eCan_Unknown = -1, - eCan_HD = 0, - eCan_DG = 1, - eCan_DI = 2, + eCan_TD = 0, + eCan_DD = 1, + eCan_FP = 2, + eCan_DI = 3, }; /*! @@ -374,20 +379,16 @@ bool initialized = false; bool isEmpty () { - // disabled coco begin validated:Has been validated manually. // Since the crc is part of the data and there is no message without crc // initialized flag and data.length() == 0 became the same. // It is preferred to keep it as is so that the initialization is independent of data. return !initialized || !data.length(); - // disabled coco end } bool isComplete() { - // disabled coco begin validated:Has been validated manually. // Since the crc is part of the data and there is no message without crc // then a message would never be empty. // It is preferred to keep it as is so that the initialization is independent of data. return !isEmpty() && data.length() == length; - // disabled coco end } }; Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -r2bef7b8a25a76a4597aa833955c57fd1c4884de7 -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 2bef7b8a25a76a4597aa833955c57fd1c4884de7) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -75,11 +75,11 @@ if ( ! isValidMessage(vMessage, vIdCheck) ) return ok; ok = tModel.fromByteArray(vMessage.data); tModel.toVariantList(vData); - // disabled coco begin validated : Tested manually. This code will never go false + // This code will never go false // because the isValidMessage is catching errors. // only is checking here for developer safety if logic has changed. if ( ! ok ) return false; - // disabled coco end + emit didActionReceive(tModel.data()); LOG_APPED_MSG(vIdCheck, tModel.toString()); DEBUG_SIGNAL(vIdCheck, typeid(TModel).name()) @@ -197,7 +197,7 @@ { bool ok = true; if (vCanId == Can::Can_Id::eChlid_NONE ) - vCanId = Can::Can_Id::eChlid_UI_HD ; + vCanId = Can::Can_Id::eChlid_UI_TD ; vPayload.clear(); int length = vData.length(); @@ -274,15 +274,13 @@ case Gui::GuiActionType::ID_AlarmSilenceReq : INTERPRET_TRANSMIT_MESSAGE(AlarmSilenceRequestData ); break; case Gui::GuiActionType::ID_AlarmUserActionReq : INTERPRET_TRANSMIT_MESSAGE(AlarmUserActionRequestData ); break; case Gui::GuiActionType::ID_AlarmVolumeSetReq : INTERPRET_TRANSMIT_MESSAGE(AdjustHDAlarmVolumeRequestData ); break; - // disabled coco begin validated: Manually tested. This model class is a placeholder for the message 63(0x3F00) and there is no use case for this now. - case Gui::GuiActionType::ID_AlarmClearedConditionReq : INTERPRET_TRANSMIT_MESSAGE(AlarmClearedConditionRequestData ); break; + // This model class is a placeholder for the message 63(0x3F00) and there is no use case for this now. case Gui::GuiActionType::ID_AlarmActiveListReq : INTERPRET_TRSMT_MT_MESSAGE(AlarmActiveListRequestData ); break; case Gui::GuiActionType::ID_AlarmTriggered : INTERPRET_TRANSMIT_MESSAGE(AlarmTriggeredRequestData ); break; // HD reset in service mode case Gui::GuiActionType::ID_ResetHDInServiceModeReq : INTERPRET_TRSMT_MT_MESSAGE(AdjustHDResetInSrvcRequestData ); break; - // disabled coco end default: QString mActionIdHexString = Format::toHexString(vActionId); LOG_DEBUG(tr("Unknown transmit Message with ID '%1'").arg(mActionIdHexString)); @@ -301,26 +299,35 @@ Can_Source MessageInterpreter::identifySource(Can_Id vCanId, QString *vText) { switch (vCanId) { - case eChlid_HD_DG : // 0x008, ///< HD => DG - case eChlid_HD_UI : // 0x020, ///< HD => UI - case eChlid_HD_Alarm: // 0x001, ///< HD alarm broadcast - case eChlid_HD_Sync : // 0x040, ///< HD sync broadcast - if (vText) *vText = "HD"; - return Can_Source::eCan_HD; + case eChlid_TD_DD : + case eChlid_TD_UI : + case eChlid_TD_Alarm: + case eChlid_TD_Sync : + if (vText) *vText = "TD"; + return Can_Source::eCan_TD; - case eChlid_DG_HD : // 0x010, ///< DG => HD - case eChlid_DG_UI : // 0x070, ///< DG => UI - case eChlid_DG_Alarm: // 0x002, ///< DG alarm broadcast - case eChlid_DG_Sync : // 0x080, ///< DG sync broadcast - if (vText) *vText = "DG"; - return Can_Source::eCan_DG; + case eChlid_DD_TD : + //case eChlid_DD_UI : // has duplicate value as eChlid_DD_Sync + case eChlid_DD_Alarm: + case eChlid_DD_Sync : + if (vText) *vText = "DD"; + return Can_Source::eCan_DD; - case eDialin_HD : // 0x400, ///< dialin => HD - case eHD_Dialin : // 0x401, ///< HD => dialin - case eDialin_DG : // 0x402, ///< dialin => DG - case eDG_Dialin : // 0x403, ///< DG => dialin - case eDialin_UI : // 0x404, ///< dialin => UI - case eUI_Dialin : // 0x405, ///< UI => dialin + case eChlid_DD_FP : + //case eChlid_FP_UI : + case eChlid_FP_Alarm: + case eChlid_FP_Sync : + if (vText) *vText = "FP"; + return Can_Source::eCan_FP; + + case eDialin_TD : + case eTD_Dialin : + case eDialin_DD : + case eDD_Dialin : + case eDialin_FP : + case eFP_Dialin : + case eDialin_UI : + case eUI_Dialin : if (vText) *vText = "DI"; return Can_Source::eCan_DI; @@ -332,32 +339,45 @@ /*! * \brief MessageInterpreter::identifyDestination - * \details Identifies the destination of the message regarding the channel id for the acknowledges + * \details Identifies the destination of the message regarding the channel id for the ACKNOWLEDGES * \return the destination of the message in enum * \sa can::Can_Source * \sa can::Can_Id */ Can_Id MessageInterpreter::identifyDestination(Can_Id vCanId, QString *vText) { + //// + //TODO: let's decide if UI should ack anything other than direct recieved message ( [ TD, DD ] => UI ) + //// switch (vCanId) { - case eChlid_HD_UI : // 0x020, ///< HD => UI - case eChlid_HD_Alarm: // 0x001, ///< HD alarm broadcast - case eChlid_HD_Sync : // 0x040, ///< HD sync broadcast - if (vText) *vText = "HD"; - return Can_Id::eChlid_UI_HD; + case eChlid_TD_UI : + case eChlid_TD_Alarm: + case eChlid_TD_Sync : + if (vText) *vText = "TD"; + return Can_Id::eChlid_UI_TD; - case eChlid_DG_UI : // 0x070, ///< DG => UI - case eChlid_DG_Alarm: // 0x002, ///< DG alarm broadcast - case eChlid_DG_Sync : // 0x080, ///< DG sync broadcast - if (vText) *vText = "DG"; - return Can_Id::eChlid_UI_DG; + //case eChlid_DD_UI : // has duplicate value as eChlid_DD_Sync + case eChlid_DD_Alarm: + case eChlid_DD_Sync : + if (vText) *vText = "DD"; + return Can_Id::eChlid_UI_DD; - case eDialin_HD : // 0x400, ///< dialin => HD - case eHD_Dialin : // 0x401, ///< HD => dialin - case eDialin_DG : // 0x402, ///< dialin => DG - case eDG_Dialin : // 0x403, ///< DG => dialin - case eDialin_UI : // 0x404, ///< dialin => UI - case eUI_Dialin : // 0x405, ///< UI => dialin + // FP is not designed to directly communicate with UI + //case eChlid_DD_FP : + //case eChlid_FP_UI : + //case eChlid_FP_Alarm: + //case eChlid_FP_Sync : + // if (vText) *vText = "FP"; + // return Can_Id::eChlid_UI_Sync; + + case eDialin_TD : + case eTD_Dialin : + case eDialin_DD : + case eDD_Dialin : + case eDialin_FP : + case eFP_Dialin : + case eDialin_UI : + case eUI_Dialin : if (vText) *vText = "DI"; return Can_Id::eChlid_UI_Sync; @@ -391,8 +411,8 @@ if ( ! gLogUnhandledOnly ) { switch (identifySource(vMessage.can_id)) { - case Can_Source::eCan_HD: ok = interpretMessage_HD(vMessage, vData); break; - case Can_Source::eCan_DG: ok = interpretMessage_DG(vMessage, vData); break; + case Can_Source::eCan_TD: ok = interpretMessage_HD(vMessage, vData); break; + case Can_Source::eCan_DD: ok = interpretMessage_DG(vMessage, vData); break; default : printUnhandled (vMessage ); break; // ok is false, the individual interpreters for ?HD/DG should not be called, and it should be done here. } } @@ -522,10 +542,8 @@ case Gui::GuiActionType::ID_AlarmTriggered : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AlarmTriggered ); break; case Gui::GuiActionType::ID_AlarmCleared : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AlarmCleared ); break; case Gui::GuiActionType::ID_AlarmVolumeSetRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AlarmVolumeSetRsp ); break; - // disabled coco begin validated: Manually tested. This model class is a placeholder for the message 63(0x3F00) and there is no use case for this now. - case Gui::GuiActionType::ID_AlarmClearedConditionRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AlarmClearedConditionRsp ); break; + // This model class is a placeholder for the message 63(0x3F00) and there is no use case for this now. case Gui::GuiActionType::ID_AlarmActiveListRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AlarmActiveListRsp ); break; - // disabled coco end // unhandled messages: these will only be logged as received message // there has nothing been defined for these messages. @@ -614,9 +632,8 @@ int index = 0; Types::U32 mCanBUSFaultCount; ok = GetValue(vMessage.data, index, mCanBUSFaultCount); - // disabled coco begin validated : developer safety if for any reason length of CanBUSFaultCount set to 0 + // developer safety if for any reason length of CanBUSFaultCount set to 0 if (ok) { - // disabled coco end vData += mCanBUSFaultCount.value; } return ok; @@ -711,8 +728,8 @@ if (i == 0) { QString ID; switch (identifySource(vMessage.can_id, &ID)) { - case Can_Source::eCan_HD: logString += ID + ",~" + item; break; - case Can_Source::eCan_DG: logString += ID + ",~" + item; break; + case Can_Source::eCan_TD: logString += ID + ",~" + item; break; + case Can_Source::eCan_DD: logString += ID + ",~" + item; break; case Can_Source::eCan_DI: logString += ID + ",~" + item; break; default : logString += ID + ",~" + item; break; } Index: sources/cloudsync/CloudSyncController.cpp =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/cloudsync/CloudSyncController.cpp (.../CloudSyncController.cpp) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/cloudsync/CloudSyncController.cpp (.../CloudSyncController.cpp) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -73,11 +73,8 @@ */ void CloudSyncController::quit() { - // disabled coco begin validated: CloudSync termination is not correctly done in coco!!! - // it has been tested and works perfectly fine in normal run. quitThread(); // validated } -// disabled coco end /*! * \brief CloudSyncController::doRegister @@ -148,15 +145,11 @@ */ void CloudSyncController::quitThread() { - // disabled coco begin validated: CloudSync termination is not correctly done in coco!!! - // it has been tested and works perfectly fine in normal run. - if ( ! _thread ) return; // runs in thread moveToThread(qApp->thread()); // validated } -// disabled coco end /*! * \brief CloudSyncController::timerEvent Index: sources/device/DeviceController.cpp =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/device/DeviceController.cpp (.../DeviceController.cpp) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/device/DeviceController.cpp (.../DeviceController.cpp) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -158,15 +158,11 @@ */ void DeviceController::quitThread() { - // disabled coco begin validated: Application termination is not correctly done in coco!!! - // it has been tested and works perfectly fine in normal run. - if ( ! _thread ) return; // runs in thread moveToThread(qApp->thread()); // validated } -// disabled coco end /*! * \brief DeviceController::usbSeek @@ -178,7 +174,6 @@ */ bool DeviceController::usbSeek(QString &vDevice) { - // disabled coco begin validated: Needed User Interaction so tested manually // This function cannot be tested on any device other than target // because only on device the usb is /dev/sdX# and others are mmcblk___ // but on VM and normal Linuxes all drives are /dev/sdX# and cannot be identified as USB. @@ -197,7 +192,6 @@ } vDevice = device; return false; - // disabled coco end } /*! @@ -438,8 +432,6 @@ */ void DeviceController::usbError(const QString &vDevice) { - // disabled coco begin validated: This needs user interaction to plug-in/out the USB device - // has been tested manually QString error; static QString lastError; switch (errno) { @@ -458,7 +450,6 @@ lastError = error; } } -// disabled coco end /*! * \brief DeviceController::onUSBDriveUmount @@ -467,11 +458,8 @@ */ void DeviceController::onUSBDriveUmount() { - // disabled coco begin validated: This needs user interaction to plug-in/out the USB device - // has been tested manually _umounted = true; } -// disabled coco end /*! * \brief DeviceController::usbMount @@ -505,15 +493,12 @@ */ void DeviceController::usbRemove() { - // disabled coco begin validated: This needs user interaction to plug-out the USB device - // has been tested manually usbUmount(USB_Mount_Point); _umounted = false; _removed = true; LOG_DEBUG("USB drive removed"); emit didUSBDriveRemove(); } -// disabled coco end /*! * \brief DeviceController::checkError Index: sources/gui/GuiController.cpp =================================================================== diff -u -r2bef7b8a25a76a4597aa833955c57fd1c4884de7 -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/gui/GuiController.cpp (.../GuiController.cpp) (revision 2bef7b8a25a76a4597aa833955c57fd1c4884de7) +++ sources/gui/GuiController.cpp (.../GuiController.cpp) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -56,11 +56,8 @@ */ void GuiController::quit() { - // disabled coco begin validated: Application termination is not correctly done in coco!!! - // it has been tested and works perfectly fine in normal run. quitThread(); // validated } -// disabled coco end /*! * \brief GuiController::initConnections @@ -121,8 +118,6 @@ */ void GuiController::initThread(QThread &vThread) { - // disabled coco begin validated: Application termination is not correctly done in coco!!! - // it has been tested and works perfectly fine in normal run. // runs in main thread Q_ASSERT_X(QThread::currentThread() == qApp->thread() , __func__, "The Class initialization must be done in Main Thread" ); _thread = &vThread; @@ -131,7 +126,6 @@ _thread->start(); moveToThread(_thread); } -// disabled coco end /*! * \brief GuiController::quitThread @@ -140,14 +134,11 @@ */ void GuiController::quitThread() { - // disabled coco begin validated: Application termination is not correctly done in coco!!! - // it has been tested and works perfectly fine in normal run. if ( ! _thread ) return; // runs in thread moveToThread(qApp->thread()); // validated } -// disabled coco end /*! * \brief GuiController initializer @@ -176,10 +167,9 @@ */ void GuiController::doActionTransmit(GuiActionType vAction, const QVariantList &vData) { - // disabled coco begin validated: This is a sample code and currently does nothing + // This is a sample code and currently does nothing // The handleTransmit is a place holder and currently has not been used. if (! handleTransmit(vAction, vData)) { - // disabled coco end emit didActionTransmit(vAction, vData); } } @@ -195,7 +185,7 @@ */ bool GuiController::handleTransmit(GuiActionType vAction, const QVariantList &vData) { - // disabled coco begin validated: This is a sample code and currently does nothing + // This is a sample code and currently does nothing Q_UNUSED(vAction) Q_UNUSED(vData) @@ -224,7 +214,6 @@ } return false; } -// disabled coco end /*! * \brief Action commanded by HD @@ -247,11 +236,9 @@ */ void GuiController::onUSBDriveMount() { - // disabled coco begin validated: This needs user interaction to plug-in USB device - // has been tested manually + // This needs user interaction to plug-in USB device emit didUSBDriveMount(); } -// disabled coco end /*! * \brief GuiController::doUSBDriveUmount @@ -260,11 +247,9 @@ */ void GuiController::doUSBDriveUmount() { - // disabled coco begin validated: This needs user interaction to plug-out the USB device - // has been tested manually + // This needs user interaction to plug-out the USB device emit didUSBDriveUmount(); } -// disabled coco end /*! * \brief GuiController::onUSBDriveRemove @@ -308,11 +293,9 @@ */ void GuiController::onSDCardSpaceTooLow(quint8 vAvailablePercent) { - // disabled coco begin validated: This needs to fill up the SD-Card and test with human interactions. - // has been tested manually + // This needs to fill up the SD-Card and test with human interactions. emit didSDCardSpaceTooLow(vAvailablePercent); } -// disabled coco end /*! * \brief GuiController::onExport Index: sources/gui/GuiController.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/gui/GuiController.h (.../GuiController.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/gui/GuiController.h (.../GuiController.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -68,7 +68,7 @@ bool handleTransmit(GuiActionType vAction, const QVariantList &vData); public slots: - void doActionTransmit(GuiActionType vAction, const QVariantList &vData); // UI => HD/DG + void doActionTransmit(GuiActionType vAction, const QVariantList &vData); // UI => TD/DD void doUSBDriveUmount (); // UI => OS void doExportLog (const GuiStringIndexMap &vExportList); // UI => OS @@ -95,8 +95,8 @@ void onPOSTPass (bool vPass); signals: - void didActionReceive (GuiActionType vAction, const QVariantList &vData); // UI <= HD/DG - void didActionTransmit(GuiActionType vAction, const QVariantList &vData); // UI => HD/DG + void didActionReceive (GuiActionType vAction, const QVariantList &vData); // UI <= HD/DD + void didActionTransmit(GuiActionType vAction, const QVariantList &vData); // UI => TD/DD void didUSBDriveMount (); void didUSBDriveUmount(); Index: sources/gui/GuiGlobals.cpp =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -181,9 +181,8 @@ registerQmlTypes(); QObject::connect(_viewer, &MainView::statusChanged, qApp, [=](MainView::Status vStatus) { - // disabled coco begin validated: this portion of the code is handling application initialization + // this portion of the code is handling application initialization // and if not initialized correctly will terminate the application . - // So it had been manually tested. bool ok = vStatus == MainView::Ready; if (ok) { _viewer->show(); @@ -194,7 +193,6 @@ } QCoreApplication::exit(-1); } - // disabled coco end }, Qt::QueuedConnection ); LOG_DEBUG("MainView Starting"); Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r9bc48695cdb977a80d3279cacdc101d5164f1b4b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 9bc48695cdb977a80d3279cacdc101d5164f1b4b) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -75,8 +75,7 @@ ID_HDGeneralEvent = 0xA400, ID_DGGeneralEvent = 0xA500, - ID_DGCheckIn = 0x0600, - ID_TDCheckIn = 0x0700, + ID_TDCheckIn = 0x1000, // 16 //// ----- @LEAHIZED // Generic Confirmation ID_DuetConfirmHDi = 0xBA00, // 186 @@ -104,7 +103,6 @@ ID_AdjustSerialHDRsp = 0x9900, // 153 ID_AdjustSerialDGRsp = 0x8800, // 136 - // Service Information ID_AdjustServiceDatesReq = 0x8900, // 137 ID_AdjustServiceDatesHDRsp = 0x8A00, // 138 @@ -122,7 +120,7 @@ ID_HDRTCEpochData = 0x0A00, // 10 // State Messages - ID_HDOperationModeData = 0x2500, // 37 + ID_HDOperationModeData = 0x1200, // 18 //// ----- @LEAHIZED ID_PreTreatmentStates = 0x5C00, // 92 ID_TreatmentStates = 0x0F00, // 15 ID_PostTreatmentStates = 0x7700, // 119 @@ -147,8 +145,6 @@ ID_AlarmStatus = 0x0200, ID_AlarmTriggered = 0x0300, ID_AlarmCleared = 0x0400, - ID_AlarmClearedConditionReq = 0x3F00, // 63 // the same code is used for every unit to send and receive over the CANBus - ID_AlarmClearedConditionRsp = 0x3F00, // 63 // the same code is used for every unit to send and receive over the CANBus ID_AlarmSilenceReq = 0x3200, // 50 ID_AlarmUserActionReq = 0x4000, // 64 // there is no response since it is kind of the response to the ID_AlarmStatus from UI to HD ID_AlarmActiveListReq = 0x9700, // 151 @@ -232,7 +228,7 @@ ID_AdjustHeparinRsp = 0x4C00, // 76 // Ultrafiltration - ID_AdjustUltrafiltrationStateReq = 0x1000, // 16 + ID_AdjustUltrafiltrationStateReq = 0x100F, // 16 //// ----- @CRAPIZED: had to change to avoid duplication ID_AdjustUltrafiltrationStateRsp = 0x4100, // 65 ID_AdjustUltrafiltrationEditReq = 0x1100, // 17 Index: sources/gui/GuiView.cpp =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/gui/GuiView.cpp (.../GuiView.cpp) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/gui/GuiView.cpp (.../GuiView.cpp) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -110,11 +110,9 @@ void GuiView::doActionTransmit(GuiActionType vAction, const QVariantList &vData) { // TODO : Remove this code later when Investigated thoroughly. - // disabled coco begin validated: This code later needs to be removed when Investigated thoroughly. - // has been tested manually + // This code later needs to be removed when Investigated thoroughly. emit didActionTransmit(vAction, vData); } -// disabled coco end /*! * \brief GuiView::doActionTransmit @@ -128,13 +126,11 @@ void GuiView::doActionTransmit(GuiActionType vAction, const QVariant &vData) { // TODO : Remove this code later when Investigated thoroughly. - // disabled coco begin validated: This code later needs to be removed when Investigated thoroughly. - // has been tested manually + // This code later needs to be removed when Investigated thoroughly. QVariantList mData; mData += vData; emit didActionTransmit(vAction, mData); } -// disabled coco end /*! * \brief GuiView::doUSBDriveMount @@ -143,13 +139,10 @@ */ void GuiView::onUSBDriveMount () { - // disabled coco begin validated: This needs user interaction to plug-in USB device - // has been tested manually usbIsReady (true ); usbIsRemoved(false); emit didUSBDriveMount (); } -// disabled coco end /*! * \brief GuiView::doUSBDriveUmount @@ -158,14 +151,11 @@ */ void GuiView::doUSBDriveUmount() { - // disabled coco begin validated: This needs user interaction to plug-in USB device - // has been tested manually usbIsReady (false); usbIsRemoved(false); exportRunning(false); emit didUSBDriveUmount(); } -// disabled coco end /*! * \brief GuiView::doUSBDriveRemove @@ -174,14 +164,11 @@ */ void GuiView::onUSBDriveRemove() { - // disabled coco begin validated: This needs user interaction to plug-in USB device - // has been tested manually usbIsReady (false); usbIsRemoved(true ); exportRunning(false); emit didUSBDriveRemove(); } -// disabled coco end /*! * \brief GuiView::onSDCardStateChange @@ -192,16 +179,13 @@ */ void GuiView::onSDCardStateChange(bool vIsReady, bool vIsReadOnly) { - // disabled coco begin validated: This needs user interaction to plug-in USB device - // has been tested manually //DEBUG:0: qDebug() << " ***** GuiView " << Storage::SDCard_Base_Path_Name << vIsReady; sdIsReady (vIsReady ); sdIsReadOnly(vIsReadOnly); if (! vIsReady || vIsReadOnly) exportRunning(false); //DEBUG:0: qDebug() << __FUNCTION__ << _sdIsReady << _sdIsReadOnly; } -// disabled coco end /*! * \brief GuiController::doSDCardSpaceTooLow @@ -210,11 +194,8 @@ */ void GuiView::onSDCardSpaceTooLow(quint8 vAvailablePercent) { - // disabled coco begin validated: This needs to fill up the SD-Card and test with human interactions. - // has been tested manually sdTooLowPecent(vAvailablePercent); } -// disabled coco end /*! * \brief GuiView::onExport Index: sources/gui/GuiView.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/gui/GuiView.h (.../GuiView.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/gui/GuiView.h (.../GuiView.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -42,9 +42,6 @@ { Q_OBJECT - // disabled coco begin validated: This needs user interaction to plug-in/out SD Card - // has been tested manually - PROPERTY(QString, platform , QGuiApplication::platformName()) PROPERTY(bool , sdIsReady , false ) @@ -57,7 +54,6 @@ // this property will be set if the sd-card space gets lower than required amount in percent that has been defined in DeviceController. PROPERTY(qint8 , sdTooLowPecent, -1 ) // -1 means the event never happened - // disabled coco end #ifdef BUILD_FOR_DESKTOP PROPERTY(bool , usbIsReady , true ) @@ -125,8 +121,8 @@ void onPOSTPass (bool vPassed); public slots: // is public since will be used in the UI and is in the same thread. - void doActionTransmit(GuiActionType vAction, const QVariantList &vData); // UI => HD/DG - void doActionTransmit(GuiActionType vAction, const QVariant &vData); // UI => HD/DG + void doActionTransmit(GuiActionType vAction, const QVariantList &vData); // UI => TD/DD + void doActionTransmit(GuiActionType vAction, const QVariant &vData); // UI => TD/DD void doUSBDriveUmount(); void doExportLog (); @@ -146,8 +142,8 @@ void doGenerateQRImage (const QString &vText ); signals: - void didActionReceive (GuiActionType vAction, const QVariantList &vData); // UI <= HD/DG - void didActionTransmit(GuiActionType vAction, const QVariantList &vData); // UI => HD/DG + void didActionReceive (GuiActionType vAction, const QVariantList &vData); // UI <= HD/DD + void didActionTransmit(GuiActionType vAction, const QVariantList &vData); // UI => TD/DD void didUSBDriveMount (); void didUSBDriveUmount(); Index: sources/gui/qml/AlarmItem.qml =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/gui/qml/AlarmItem.qml (.../AlarmItem.qml) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/gui/qml/AlarmItem.qml (.../AlarmItem.qml) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -48,10 +48,6 @@ readonly property alias alarm_AlarmID : vAlarmStatus.alarm_AlarmID readonly property alias hasAlarm : vAlarmStatus.hasAlarm - function clearAlarm() { - vAlarmStatus.doClearCondition() - } - function alarmMinimize() { // The has alarm check has been added here to let other components call this function, // without worrying about the alarmDialog popoing up without an alarm present. Index: sources/gui/qml/components/MainMenu.qml =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/gui/qml/components/MainMenu.qml (.../MainMenu.qml) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/gui/qml/components/MainMenu.qml (.../MainMenu.qml) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -96,7 +96,12 @@ Rectangle { id: _backgroundRect anchors.fill: parent color: Colors.backgroundMainMenu + // gradient: Gradient { + // GradientStop { position: 0; color: "#FEFEFE" } + // GradientStop { position: 1; color: "#0F2841" } + // } } + MouseArea { id: _clickPropagationDisabler anchors.fill: parent } @@ -122,6 +127,7 @@ height : parent.height text.text : isItemVisible(index) ? modelData : "" // didn't change the visibility to preserve the button location and just didn't display the title and highlihgt bar. border.width: 0 + pixelSize : 40 //// ----- @LEAHIZED onPressed: { emit_itemPressed(index) } Index: sources/gui/qml/globals/Colors.qml =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -32,13 +32,13 @@ readonly property color transparent : "Transparent" // No Color readonly property color separatorLine : "#5f809d" - readonly property color backgroundMain : "#1A344D" + readonly property color backgroundMain : "#1A344D" //// ----- @LEAHIZED readonly property color backgroundButtonNormal : transparent readonly property color backgroundButtonSelect : "#438FEB" readonly property color backgroundButtonSelectDark : "#135088" // "#214773" readonly property color backgroundDialog : "#254670" readonly property color backgroundMenu : "#14314C" - readonly property color backgroundMainMenu : "#0D2639" + readonly property color backgroundMainMenu : "#0F2841" //// ----- @LEAHIZED readonly property color backgroundDottedMenu : "#64809D" readonly property color backgroundSlider : "#195187" @@ -63,7 +63,7 @@ readonly property color textTickMark : "#438FEB" readonly property color textInvalid : red - readonly property color borderButton : "#4290EC" //K:D //"#438FEB" + readonly property color borderButton : "#4696F7" //// ----- @LEAHIZED readonly property color borderButtonHalfDarker : Qt.darker(borderButton, 1.50) readonly property color borderButtonSelected : "#db8f00" readonly property color borderButtonUnselected : "#53667d" Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -25,8 +25,8 @@ QtObject { readonly property int keybardAnimationDuration : 200 - readonly property int applicationWidth : 1280 - readonly property int applicationHeight : 800 + readonly property int applicationWidth : 1920 //// ----- @LEAHIZED + readonly property int applicationHeight : 1080 //// ----- @LEAHIZED readonly property int buttonSpacing : 150 readonly property int dialogIconHeight : 50 readonly property int dialogIconWidth : 50 @@ -35,7 +35,7 @@ readonly property int headerButtonsMargin : 35 readonly property int confirmButtonWidth : 155 - readonly property int mainMenuHeight : 70 + readonly property int mainMenuHeight : 100 //// ----- @LEAHIZED readonly property int minVGap : 15 readonly property int minVGap2 : 30 @@ -57,11 +57,11 @@ readonly property int touchRectWidth : 512 //K:D //425 readonly property int touchRectHeight : 85 //K:D //70 - readonly property int touchRectRadius : 45 + readonly property int touchRectRadius : 15 readonly property int titleBottomPadding : 25 - readonly property int columnSpacing : 25 //K:D //20 + readonly property int columnSpacing : 60 //// ----- @LEAHIZED readonly property int dialogMargin : mainMenuHeight * 2 readonly property int dialogWidth : applicationWidth - dialogMargin @@ -107,7 +107,7 @@ readonly property int sliderCircleDiameter : 30 readonly property int pressuresProgressbarWidth : 725 - + readonly property int gridSelectionButtonHeight : 100 readonly property int gridSelectionButtonWidth : 375 Index: sources/gui/qml/main.qml =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/gui/qml/main.qml (.../main.qml) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/gui/qml/main.qml (.../main.qml) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -264,8 +264,8 @@ disable : _GuiView.manufactSetup || _GuiView.updateSetup hidden : true // it should be hidden by default since the landing screen changed to init and it does not have the main menu until the POST passes. - titles : [ qsTr("Treatment") , qsTr("Manager") , qsTr("Settings") ] - visibleItems : [ true , false , true ] + titles : [ qsTr("Treatment") , qsTr("Prescriptions") , qsTr("Settings") ] + visibleItems : [ true , true , true ] Component.onCompleted : { _settingsStack.visible = false _managerStack .visible = false Index: sources/gui/qml/pages/MainHome.qml =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/gui/qml/pages/MainHome.qml (.../MainHome.qml) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/gui/qml/pages/MainHome.qml (.../MainHome.qml) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -38,25 +38,33 @@ ImageLogoD { id: _headerLogo } // Definitions + TitleText { id: _titleText + anchors.top: parent.top + anchors.topMargin: 200 //// ----- @LEAHIZED: Move to Variables.qml + width: parent.width + text : vDateTime.greeting + font.pixelSize: 40 //// ----- @LEAHIZED: Move to Variables.qml + + } Column { spacing: Variables.columnSpacing anchors.centerIn: parent - TitleText { id: _titleText - anchors.horizontalCenter: parent.horizontalCenter - width: parent.width - text : vDateTime.greeting - } - // TODO: Removed for phase 1 - // TouchRect { id : _startTreatmentRect - // anchors.horizontalCenter: parent.horizontalCenter - // text.text: qsTr("START TREATMENT") - // onClicked: startTreatment() - // } TouchRect { id : _createTreatmentRect anchors.horizontalCenter: parent.horizontalCenter - text.text: qsTr("CREATE TREATMENT") + text.text: qsTr("Create Treatment") onClicked: createTreatment() + width : 435 //// ----- @LEAHIZED: Move to Variables.qml + height : 92 //// ----- @LEAHIZED: Move to Variables.qml + pixelSize : 30 //// ----- @LEAHIZED: Move to Variables.qml } + TouchRect { id : _startTreatmentRect + anchors.horizontalCenter: parent.horizontalCenter + text.text: qsTr("Start Treatment") + onClicked: startTreatment() + width : 435 //// ----- @LEAHIZED: Move to Variables.qml + height : 92 //// ----- @LEAHIZED: Move to Variables.qml + pixelSize : 30 //// ----- @LEAHIZED: Move to Variables.qml + } } NotificationBarSmall { id: _notification Index: sources/gui/qml/pages/ManagerStack.qml =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/gui/qml/pages/ManagerStack.qml (.../ManagerStack.qml) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/gui/qml/pages/ManagerStack.qml (.../ManagerStack.qml) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -31,7 +31,7 @@ stackView.initialItem : _managerHome ScreenItem { id: _managerHome - PlaceHolderText { screenName: qsTr("Treatment Management") } + PlaceHolderText { screenName: qsTr("Prescriptions") } onVisibleChanged: if (visible) _mainMenu.hidden = true } Index: sources/gui/qml/pages/settings/SettingsHome.qml =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/gui/qml/pages/settings/SettingsHome.qml (.../SettingsHome.qml) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/gui/qml/pages/settings/SettingsHome.qml (.../SettingsHome.qml) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -45,25 +45,6 @@ itemWidth : 325 } - // Test Codes - Row { - spacing : Variables.minVGap2 - anchors { - top : parent.top - left: parent.left - topMargin : 35 - leftMargin : 35 - } - TouchRect { id : _clearAlarmCondition - visible : false // TODO : phase 1 doesn't have this feature (disinfection schedule) - objectName: "_clearAlarmCondition" - width : 300 - height : Variables.logoDiameter - text.text: qsTr("Clear Alarm Condition") - onClicked: _alarmItem.clearAlarm() - } - } - // The Main menu need to hide in case we have any alarm, if not the menu is covered by keyboard but the alram does not. // So what happens is alarm shows up on keyboard but a little higher (main menu height) and it makes the UI not nice. // In the Sub Settings Screens we hide the main menu since those have back button, Index: sources/model/MAbstract.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/MAbstract.h (.../MAbstract.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/MAbstract.h (.../MAbstract.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -67,8 +67,8 @@ enum class Unit_Enum { eUI, - eHD, - eDG, + eTD, + eDD, eDV, }; @@ -88,8 +88,8 @@ static const UnitMap _unitText_make() { static const UnitMap map { {MAbstract::Unit_Enum::eUI, "UI"}, - {MAbstract::Unit_Enum::eHD, "HD"}, - {MAbstract::Unit_Enum::eDG, "DG"}, + {MAbstract::Unit_Enum::eTD, "TD"}, + {MAbstract::Unit_Enum::eDD, "DD"}, {MAbstract::Unit_Enum::eDV, "DV"} }; return map; Index: sources/model/MModel.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/MModel.h (.../MModel.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/MModel.h (.../MModel.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -26,7 +26,6 @@ #include "MAlarmStatusData.h" #include "MAlarmTriggered.h" #include "MAlarmCleared.h" -#include "MAlarmClearedCondition.h" #include "MAlarmActiveList.h" #include "MAdjustHDAlarmVolumeResponse.h" @@ -339,9 +338,6 @@ REGISTER_METATYPE( AlarmStatusData ) \ REGISTER_METATYPE( AlarmTriggeredData ) \ REGISTER_METATYPE( AlarmClearedData ) \ - /* disabled coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now. - REGISTER_METATYPE( AlarmClearedConditionData ) \ - disabled coco end */ \ REGISTER_METATYPE( DGROPumpData ) \ REGISTER_METATYPE( DGPressuresData ) \ REGISTER_METATYPE( DGDrainPumpData ) \ @@ -392,9 +388,6 @@ REGISTER_METATYPE( AlarmSilenceRequestData ) \ REGISTER_METATYPE( AlarmUserActionRequestData ) \ REGISTER_METATYPE( AlarmActiveListRequestData ) \ - /* disabled coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now. - REGISTER_METATYPE( AlarmClearedConditionRequestData ) \ - disabled coco end*/ \ REGISTER_METATYPE( AdjustBloodDialysateRequestData ) \ REGISTER_METATYPE( AdjustDurationRequestData ) \ REGISTER_METATYPE( AdjustUltrafiltrationStateRequestData ) \ @@ -524,9 +517,6 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AlarmStatusData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AlarmTriggeredData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AlarmClearedData ) \ - /* disabled coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now. - ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AlarmClearedConditionData ) \ - disabled coco end */ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGROPumpData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGPressuresData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, DGDrainPumpData ) \ @@ -657,10 +647,6 @@ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AdjustHDResetInSrvcRequestData ) \ - /* disabled coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now. - ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AlarmClearedConditionRequestData ) \ - disabled coco end */ \ - //===============================================================================// /*! \def ACTION_RECEIVE_MODEL_BRIDGE_DEFINITIONS @@ -724,9 +710,6 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AlarmStatusData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AlarmTriggeredData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AlarmClearedData ) \ - /* disabled coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now. - ACTION_RECEIVE_BRIDGE_DEFINITION( AlarmClearedConditionData ) \ - disabled coco end */ \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGROPumpData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGPressuresData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( DGDrainPumpData ) \ @@ -856,9 +839,6 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustInstitutionalRequestData ) \ /* HD reset in service mode */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustHDResetInSrvcRequestData ) \ - /* disabled coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now. - ADJUST_TRANSMT_BRIDGE_DEFINITION( AlarmClearedConditionRequestData ) \ - disabled coco end */ \ #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS_NOEMIT \ /* Request ----------------------- NoEmit -------------------------- */ \ @@ -920,10 +900,6 @@ /* HD reset in service mode */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustHDResetInSrvcRequestData ) \ - /* disabled coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now. - ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AlarmClearedConditionRequestData ) \ - disabled coco end */ \ - #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS_PUBLIC \ /* Request ----------------------- public -------------------------- */ \ /* CONFIRM */ \ @@ -983,9 +959,6 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustInstitutionalRequestData ) \ /* HD reset in service mode */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustHDResetInSrvcRequestData ) \ - /* disabled coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now. - ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AlarmClearedConditionRequestData ) \ - disabled coco end */ \ //== MessageInterpreter Signal Definition =======================================// #define ACTION_RECEIVE_SIGNALS \ @@ -1030,7 +1003,6 @@ ACTION_RECEIVE_SIGNAL( AlarmStatusData ) \ ACTION_RECEIVE_SIGNAL( AlarmTriggeredData ) \ ACTION_RECEIVE_SIGNAL( AlarmClearedData ) \ - ACTION_RECEIVE_SIGNAL( AlarmClearedConditionData ) \ /* Treatment Log */ \ ACTION_RECEIVE_SIGNAL( TreatmentLogAvrgeData ) \ ACTION_RECEIVE_SIGNAL( TreatmentLogAlarmData ) \ Index: sources/model/confirm/MDuetConfirmHDi.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/confirm/MDuetConfirmHDi.h (.../MDuetConfirmHDi.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/confirm/MDuetConfirmHDi.h (.../MDuetConfirmHDi.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -66,7 +66,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eEvent ; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("Confirm" ) ; } struct Data { Index: sources/model/dg/adjustment/settings/MAdjustDGCleaningUsageResponse.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/dg/adjustment/settings/MAdjustDGCleaningUsageResponse.h (.../MAdjustDGCleaningUsageResponse.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/dg/adjustment/settings/MAdjustDGCleaningUsageResponse.h (.../MAdjustDGCleaningUsageResponse.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -80,7 +80,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eEvent ; } - Unit_Enum unitText () const override { return Unit_Enum::eDG ; } + Unit_Enum unitText () const override { return Unit_Enum::eDD ; } QString infoText () const override { return QString("DGCleaningUsage") ; } struct Data { Index: sources/model/dg/adjustment/settings/MAdjustDGDateTimeResponse.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/dg/adjustment/settings/MAdjustDGDateTimeResponse.h (.../MAdjustDGDateTimeResponse.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/dg/adjustment/settings/MAdjustDGDateTimeResponse.h (.../MAdjustDGDateTimeResponse.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -64,7 +64,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eEvent ; } - Unit_Enum unitText () const override { return Unit_Enum::eDG ; } + Unit_Enum unitText () const override { return Unit_Enum::eDD ; } QString infoText () const override { return QString("AdjustDGDateTime") ; } struct Data { Index: sources/model/dg/adjustment/settings/MAdjustDGRequests.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/dg/adjustment/settings/MAdjustDGRequests.h (.../MAdjustDGRequests.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/dg/adjustment/settings/MAdjustDGRequests.h (.../MAdjustDGRequests.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -47,16 +47,14 @@ class MAdjustDGDateTimeReq : public MModel { public: quint32 mEpoch; - // disabled coco begin validated : Has been validated manually. QString toString() { return toString({mEpoch}); } - // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("AdjustDGDateTime", vParameters); } - static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_DG; } + static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_DD; } }; /*! @@ -81,7 +79,7 @@ return MModel::toString("DGCleaningUsage", vParameters); } - static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_DG; } + static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_DD; } }; } Index: sources/model/dg/adjustment/settings/MAdjustDGSerialNumberResponse.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/dg/adjustment/settings/MAdjustDGSerialNumberResponse.h (.../MAdjustDGSerialNumberResponse.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/dg/adjustment/settings/MAdjustDGSerialNumberResponse.h (.../MAdjustDGSerialNumberResponse.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -58,7 +58,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eEvent; } - Unit_Enum unitText () const override { return Unit_Enum::eDG ; } + Unit_Enum unitText () const override { return Unit_Enum::eDD ; } QString infoText () const override { return QString("Serial"); } struct Data { Index: sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.h (.../MAdjustDGServiceDatesResponse.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/dg/adjustment/settings/MAdjustDGServiceDatesResponse.h (.../MAdjustDGServiceDatesResponse.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -63,7 +63,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eEvent ; } - Unit_Enum unitText () const override { return Unit_Enum::eDG ; } + Unit_Enum unitText () const override { return Unit_Enum::eDD ; } QString infoText () const override { return QString("ServiceDates") ; } struct Data { Index: sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.h (.../MAdjustDGVersionsResponse.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.h (.../MAdjustDGVersionsResponse.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -79,7 +79,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eEvent ; } - Unit_Enum unitText () const override { return Unit_Enum::eDG ; } + Unit_Enum unitText () const override { return Unit_Enum::eDD ; } QString infoText () const override { return QString("VersionRsp") ; } struct Data { Index: sources/model/dg/adjustment/settings/MDuetRoWaterDG.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/dg/adjustment/settings/MDuetRoWaterDG.h (.../MDuetRoWaterDG.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/dg/adjustment/settings/MDuetRoWaterDG.h (.../MDuetRoWaterDG.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -60,7 +60,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eEvent ; } - Unit_Enum unitText () const override { return Unit_Enum::eDG ; } + Unit_Enum unitText () const override { return Unit_Enum::eDD ; } QString infoText () const override { return QString("QueryRoWater") ; } struct Data { @@ -111,7 +111,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eEvent ; } - Unit_Enum unitText () const override { return Unit_Enum::eDG ; } + Unit_Enum unitText () const override { return Unit_Enum::eDD ; } QString infoText () const override { return QString("AdjustRoWater") ; } struct Data { @@ -158,7 +158,7 @@ return MModel::toString("AdjustRoWater", vParameters); } - static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_DG; } + static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_DD; } }; } Index: sources/model/dg/data/MDGAccelerometerData.cpp =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/dg/data/MDGAccelerometerData.cpp (.../MDGAccelerometerData.cpp) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/dg/data/MDGAccelerometerData.cpp (.../MDGAccelerometerData.cpp) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -14,10 +14,6 @@ */ #include "MDGAccelerometerData.h" -// disabled coco begin validated: -// FIXME: this model was only for the Diagnostic use, and has been removed, -// Should be removed from the UI Software if not being used anymore - using namespace Model; QVariantList MDGAccelerometer::parameters() const { @@ -45,12 +41,12 @@ if ( ! GetValue(vByteArray, index, _data.mXTilt )) goto lError; if ( ! GetValue(vByteArray, index, _data.mYTilt )) goto lError; if ( ! GetValue(vByteArray, index, _data.mZTilt )) goto lError; - + return true; lError: if(vIndex) { *vIndex = index; } - + return false; } @@ -67,5 +63,3 @@ data.mZTilt = _data.mZTilt .value; return data; } - -// disabled coco end Index: sources/model/dg/data/MDGAccelerometerData.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/dg/data/MDGAccelerometerData.h (.../MDGAccelerometerData.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/dg/data/MDGAccelerometerData.h (.../MDGAccelerometerData.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -25,10 +25,6 @@ // forward declarations class tst_models; -// disabled coco begin validated: -// FIXME: this model was only for the Diagnostic use, and has been removed, -// Should be removed from the UI Software if not being used anymore - namespace Model { /*! @@ -84,7 +80,7 @@ public: Type_Enum typeText() const override { return Type_Enum::eDatum; } - Unit_Enum unitText() const override { return Unit_Enum::eDG ; } + Unit_Enum unitText() const override { return Unit_Enum::eDD ; } QString infoText() const override { return QString("Accel") ; } struct Data { @@ -108,5 +104,3 @@ } typedef Model::MDGAccelerometer::Data DGAccelerometerData; - -// disabled coco end Index: sources/model/dg/data/MDGConductivityData.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/dg/data/MDGConductivityData.h (.../MDGConductivityData.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/dg/data/MDGConductivityData.h (.../MDGConductivityData.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -86,7 +86,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eDatum ; } - Unit_Enum unitText () const override { return Unit_Enum::eDG ; } + Unit_Enum unitText () const override { return Unit_Enum::eDD ; } QString infoText () const override { return QString("Conductivity"); } struct Data{ Index: sources/model/dg/data/MDGDebugText.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/dg/data/MDGDebugText.h (.../MDGDebugText.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/dg/data/MDGDebugText.h (.../MDGDebugText.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -59,7 +59,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eDatum; } - Unit_Enum unitText () const override { return Unit_Enum::eDG ; } + Unit_Enum unitText () const override { return Unit_Enum::eDD ; } QString infoText () const override { return QString("Debug") ; } struct Data { Index: sources/model/dg/data/MDGDrainPumpData.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/dg/data/MDGDrainPumpData.h (.../MDGDrainPumpData.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/dg/data/MDGDrainPumpData.h (.../MDGDrainPumpData.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -77,7 +77,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eDatum ; } - Unit_Enum unitText () const override { return Unit_Enum::eDG ; } + Unit_Enum unitText () const override { return Unit_Enum::eDD ; } QString infoText () const override { return QString("DrainPump"); } struct Data { Index: sources/model/dg/data/MDGGeneralEvent.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/dg/data/MDGGeneralEvent.h (.../MDGGeneralEvent.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/dg/data/MDGGeneralEvent.h (.../MDGGeneralEvent.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -59,7 +59,7 @@ public: Type_Enum typeText() const override { return Type_Enum::eEvent ; } - Unit_Enum unitText() const override { return Unit_Enum::eDG ; } + Unit_Enum unitText() const override { return Unit_Enum::eDD ; } QString infoText() const override { return QString("General" ) ; } struct Data { Index: sources/model/dg/data/MDGHeatersData.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/dg/data/MDGHeatersData.h (.../MDGHeatersData.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/dg/data/MDGHeatersData.h (.../MDGHeatersData.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -86,7 +86,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eDatum ; } - Unit_Enum unitText () const override { return Unit_Enum::eDG ; } + Unit_Enum unitText () const override { return Unit_Enum::eDD ; } QString infoText () const override { return QString("Heaters"); } struct Data { Index: sources/model/dg/data/MDGLoadCellReadingsData.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/dg/data/MDGLoadCellReadingsData.h (.../MDGLoadCellReadingsData.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/dg/data/MDGLoadCellReadingsData.h (.../MDGLoadCellReadingsData.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -68,7 +68,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eDatum ; } - Unit_Enum unitText () const override { return Unit_Enum::eDG ; } + Unit_Enum unitText () const override { return Unit_Enum::eDD ; } QString infoText () const override { return QString("LoadCell"); } struct Data { Index: sources/model/dg/data/MDGOperationModeData.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/dg/data/MDGOperationModeData.h (.../MDGOperationModeData.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/dg/data/MDGOperationModeData.h (.../MDGOperationModeData.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -64,7 +64,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eDatum; } - Unit_Enum unitText () const override { return Unit_Enum::eDG ; } + Unit_Enum unitText () const override { return Unit_Enum::eDD ; } QString infoText () const override { return QString("OpMode"); } struct Data { Index: sources/model/dg/data/MDGPressuresData.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/dg/data/MDGPressuresData.h (.../MDGPressuresData.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/dg/data/MDGPressuresData.h (.../MDGPressuresData.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -70,7 +70,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eDatum ; } - Unit_Enum unitText () const override { return Unit_Enum::eDG ; } + Unit_Enum unitText () const override { return Unit_Enum::eDD ; } QString infoText () const override { return QString("Pressures"); } struct Data { Index: sources/model/dg/data/MDGROPumpData.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/dg/data/MDGROPumpData.h (.../MDGROPumpData.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/dg/data/MDGROPumpData.h (.../MDGROPumpData.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -72,7 +72,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eDatum; } - Unit_Enum unitText () const override { return Unit_Enum::eDG ; } + Unit_Enum unitText () const override { return Unit_Enum::eDD ; } QString infoText () const override { return QString("ROPump"); } struct Data { Index: sources/model/dg/data/MDGReservoirData.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/dg/data/MDGReservoirData.h (.../MDGReservoirData.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/dg/data/MDGReservoirData.h (.../MDGReservoirData.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -83,7 +83,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eDatum ; } - Unit_Enum unitText () const override { return Unit_Enum::eDG ; } + Unit_Enum unitText () const override { return Unit_Enum::eDD ; } QString infoText () const override { return QString("Reservoir"); } struct Data { Index: sources/model/dg/data/MDGTemperaturesData.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/dg/data/MDGTemperaturesData.h (.../MDGTemperaturesData.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/dg/data/MDGTemperaturesData.h (.../MDGTemperaturesData.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -110,7 +110,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eDatum ; } - Unit_Enum unitText () const override { return Unit_Enum::eDG ; } + Unit_Enum unitText () const override { return Unit_Enum::eDD ; } QString infoText () const override { return QString("Temperatures"); } struct Data { Index: sources/model/dg/data/MDGValvesStatesData.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/dg/data/MDGValvesStatesData.h (.../MDGValvesStatesData.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/dg/data/MDGValvesStatesData.h (.../MDGValvesStatesData.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -112,7 +112,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eDatum ; } - Unit_Enum unitText () const override { return Unit_Enum::eDG ; } + Unit_Enum unitText () const override { return Unit_Enum::eDD ; } QString infoText () const override { return QString("ValvesStates"); } struct Data { Index: sources/model/dg/data/post/MDGPostFinalResultData.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/dg/data/post/MDGPostFinalResultData.h (.../MDGPostFinalResultData.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/dg/data/post/MDGPostFinalResultData.h (.../MDGPostFinalResultData.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -64,7 +64,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eDatum ;} - Unit_Enum unitText () const override { return Unit_Enum::eDG ;} + Unit_Enum unitText () const override { return Unit_Enum::eDD ;} QString infoText () const override { return QString("POSTDone") ;} struct Data { Index: sources/model/dg/data/post/MDGPostSingleResultData.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/dg/data/post/MDGPostSingleResultData.h (.../MDGPostSingleResultData.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/dg/data/post/MDGPostSingleResultData.h (.../MDGPostSingleResultData.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -66,7 +66,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eDatum ;} - Unit_Enum unitText () const override { return Unit_Enum::eDG ;} + Unit_Enum unitText () const override { return Unit_Enum::eDD ;} QString infoText () const override { return QString("POSTItem") ;} struct Data { Index: sources/model/dg/data/pretreatment/MDGFilterFlushData.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/dg/data/pretreatment/MDGFilterFlushData.h (.../MDGFilterFlushData.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/dg/data/pretreatment/MDGFilterFlushData.h (.../MDGFilterFlushData.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -64,7 +64,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eDatum ; } - Unit_Enum unitText () const override { return Unit_Enum::eDG ; } + Unit_Enum unitText () const override { return Unit_Enum::eDD ; } QString infoText () const override { return QString("FilterFlush"); } struct Data { Index: sources/model/hd/adjustment/MAdjustPowerOff.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/adjustment/MAdjustPowerOff.h (.../MAdjustPowerOff.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/adjustment/MAdjustPowerOff.h (.../MAdjustPowerOff.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -48,7 +48,7 @@ class MPowerOff : public MAbstract { public: Type_Enum typeText () const override { return Type_Enum::eEvent; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("PowerOff"); } QVariantList parameters() const override; Index: sources/model/hd/adjustment/MAdjustRequestsBase.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/adjustment/MAdjustRequestsBase.h (.../MAdjustRequestsBase.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/adjustment/MAdjustRequestsBase.h (.../MAdjustRequestsBase.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -69,7 +69,7 @@ * it can be modified by the specific message which inherits the MModel. * \return Can::Can_Id */ - static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_HD; } + static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_TD; } }; Index: sources/model/hd/adjustment/disinfect/MDisinfectAdjustModeResponse.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/adjustment/disinfect/MDisinfectAdjustModeResponse.h (.../MDisinfectAdjustModeResponse.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/adjustment/disinfect/MDisinfectAdjustModeResponse.h (.../MDisinfectAdjustModeResponse.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -65,7 +65,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eEvent ; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("DisinfectMode" ) ; } struct Data { Index: sources/model/hd/adjustment/disinfect/MDisinfectAdjustStartRequests.h =================================================================== diff -u -r2bef7b8a25a76a4597aa833955c57fd1c4884de7 -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/adjustment/disinfect/MDisinfectAdjustStartRequests.h (.../MDisinfectAdjustStartRequests.h) (revision 2bef7b8a25a76a4597aa833955c57fd1c4884de7) +++ sources/model/hd/adjustment/disinfect/MDisinfectAdjustStartRequests.h (.../MDisinfectAdjustStartRequests.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -51,12 +51,10 @@ public: GuiDisinfectDGStates mState = GuiDisinfectDGStates::DD_DISINFECT_NOT_RUNNING_STATE; - // disabled coco begin validated : Has been validated manually. - // This object is used statically for now, kept the logic for later usage. QString toString() { return toString({mState}); } - // disabled coco end + static QString toString(const QVariantList &vParameters) { return MModel::toString("DisinfectStart", vParameters); } Index: sources/model/hd/adjustment/disinfect/MDisinfectAdjustStartResponse.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/adjustment/disinfect/MDisinfectAdjustStartResponse.h (.../MDisinfectAdjustStartResponse.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/adjustment/disinfect/MDisinfectAdjustStartResponse.h (.../MDisinfectAdjustStartResponse.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -65,7 +65,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eEvent ; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("DisinfectStart" ) ; } struct Data { Index: sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustDisposablesRemovalConfirmResponse.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustDisposablesRemovalConfirmResponse.h (.../MPostTreatmentAdjustDisposablesRemovalConfirmResponse.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustDisposablesRemovalConfirmResponse.h (.../MPostTreatmentAdjustDisposablesRemovalConfirmResponse.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -66,7 +66,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eEvent ; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("AdjustDisposablesRemovalConfirm") ; } struct Data { Index: sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustPatientDisconnectionConfirmResponse.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustPatientDisconnectionConfirmResponse.h (.../MPostTreatmentAdjustPatientDisconnectionConfirmResponse.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustPatientDisconnectionConfirmResponse.h (.../MPostTreatmentAdjustPatientDisconnectionConfirmResponse.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -66,7 +66,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eEvent ; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("AdjustPatientDisconnectionConfirm") ; } struct Data { Index: sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.h (.../MPostTreatmentAdjustTreatmentLogResponse.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.h (.../MPostTreatmentAdjustTreatmentLogResponse.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -134,7 +134,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eEvent ; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("AdjustTreatmentLog") ; } struct Data { Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.h (.../MPreTreatmentAdjustDisposablesConfirmResponse.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesConfirmResponse.h (.../MPreTreatmentAdjustDisposablesConfirmResponse.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -66,7 +66,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eEvent ; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("AdjustDisposablesConfirm") ; } struct Data { Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesPrimeResponse.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesPrimeResponse.h (.../MPreTreatmentAdjustDisposablesPrimeResponse.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustDisposablesPrimeResponse.h (.../MPreTreatmentAdjustDisposablesPrimeResponse.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -66,7 +66,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eEvent ; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("AdjustDisposablesPrime") ; } struct Data { Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.h (.../MPreTreatmentAdjustInitTreatmentResponse.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.h (.../MPreTreatmentAdjustInitTreatmentResponse.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -64,7 +64,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eEvent ; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("InitTreatment" ); } struct Data { Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.h (.../MPreTreatmentAdjustParametersValidationResponse.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.h (.../MPreTreatmentAdjustParametersValidationResponse.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -94,7 +94,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eEvent; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("ParametersValidation"); } struct Data { Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionBeginResponse.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionBeginResponse.h (.../MPreTreatmentAdjustPatientConnectionBeginResponse.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionBeginResponse.h (.../MPreTreatmentAdjustPatientConnectionBeginResponse.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -66,7 +66,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eEvent ; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("AdjustPatientConnectionBegin") ; } struct Data { Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionConfirmResponse.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionConfirmResponse.h (.../MPreTreatmentAdjustPatientConnectionConfirmResponse.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustPatientConnectionConfirmResponse.h (.../MPreTreatmentAdjustPatientConnectionConfirmResponse.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -66,7 +66,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eEvent ; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("AdjustPatientConnectionConfirm") ; } struct Data { Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h (.../MPreTreatmentAdjustRequests.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h (.../MPreTreatmentAdjustRequests.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -54,12 +54,9 @@ eInitiate = 1, }; Options requestedState = eUnknown; - // disabled coco begin validated : Has been validated manually. - // This object is used statically for now, kept the logic for later usage. QString toString() { return toString({requestedState}); } - // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("InitTreatment", vParameters); } @@ -115,8 +112,6 @@ float mHeparinBolusVolume = 0; // mL float mDialysateTemp = 0; // Celsius - // disabled coco begin validated : Has been validated manually. - // This object is used statically for now, kept the logic for later usage. QString toString() { return toString({ mBloodFlowRate , @@ -138,7 +133,6 @@ mDialysateTemp , }); } - // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("ValidateParameters", vParameters); } @@ -164,12 +158,10 @@ eConfirm = 1 }; Options requestedState = eConfirm; - // disabled coco begin validated : Has been validated manually. - // This object is used statically for now, kept the logic for later usage. QString toString() { return toString({requestedState}); } - // disabled coco end + static QString toString(const QVariantList &vParameters) { return MModel::toString("ConfirmParameters", vParameters); } @@ -195,12 +187,10 @@ eStart = 1, }; Options requestedState = eStop; - // disabled coco begin validated : Has been validated manually. - // This object is used statically for now, kept the logic for later usage. QString toString() { return toString({requestedState}); } - // disabled coco end + static QString toString(const QVariantList &vParameters) { return MModel::toString("WaterSample", vParameters); } @@ -227,12 +217,10 @@ ePassed = 1, }; Options requestedState = eUnknown; - // disabled coco begin validated : Has been validated manually. - // This object is used statically for now, kept the logic for later usage. QString toString() { return toString({requestedState}); } - // disabled coco end + static QString toString(const QVariantList &vParameters) { return MModel::toString("WaterSampleResult", vParameters); } @@ -253,12 +241,10 @@ */ class MAdjustConsumablesConfirmReq : public MModel { public: - // disabled coco begin validated : Has been validated manually. - // This object is used statically for now, kept the logic for later usage. QString toString() { return toString({}); } - // disabled coco end + static QString toString(const QVariantList &vParameters) { return MModel::toString("ConsumablesConfirm", vParameters); } @@ -279,12 +265,10 @@ */ class MAdjustDisposablesConfirmReq : public MModel { public: - // disabled coco begin validated : Has been validated manually. - // This object is used statically for now, kept the logic for later usage. QString toString() { return toString({}); } - // disabled coco end + static QString toString(const QVariantList &vParameters) { return MModel::toString("DisposablesConfirm", vParameters); } @@ -305,12 +289,10 @@ */ class MAdjustDisposablesPrimeReq : public MModel { public: - // disabled coco begin validated : Has been validated manually. - // This object is used statically for now, kept the logic for later usage. QString toString() { return toString({}); } - // disabled coco end + static QString toString(const QVariantList &vParameters) { return MModel::toString("DisposablesPrime", vParameters); } @@ -331,12 +313,10 @@ */ class MAdjustPatientConnectionBeginReq : public MModel { public: - // disabled coco begin validated : Has been validated manually. - // This object is used statically for now, kept the logic for later usage. QString toString() { return toString({}); } - // disabled coco end + static QString toString(const QVariantList &vParameters) { return MModel::toString("PatientConnectionBegin", vParameters); } @@ -358,12 +338,10 @@ class MAdjustUltrafiltrationInitReq : public MModel { public: float volume = 0; - // disabled coco begin validated : Has been validated manually. - // This object is used statically for now, kept the logic for later usage. QString toString() { return toString({volume}); } - // disabled coco end + static QString toString(const QVariantList &vParameters) { return MModel::toString("AdjustUFInit", vParameters); } @@ -384,12 +362,10 @@ */ class MAdjustPatientConnectionConfirmReq : public MModel { public: - // disabled coco begin validated : Has been validated manually. - // This object is used statically for now, kept the logic for later usage. QString toString() { return toString({}); } - // disabled coco end + static QString toString(const QVariantList &vParameters) { return MModel::toString("PatientConnectionConfirm", vParameters); } @@ -410,12 +386,10 @@ */ class MAdjustStartTreatmentReq : public MModel { public: - // disabled coco begin validated : Has been validated manually. - // This object is used statically for now, kept the logic for later usage. QString toString() { return toString({}); } - // disabled coco end + static QString toString(const QVariantList &vParameters) { return MModel::toString("StartTreatment", vParameters); } Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.h (.../MPreTreatmentAdjustStartTreatmentResponse.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustStartTreatmentResponse.h (.../MPreTreatmentAdjustStartTreatmentResponse.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -64,7 +64,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eEvent ; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("AdjustStartTreatment") ; } struct Data { Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustUltrafiltrationInitResponse.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustUltrafiltrationInitResponse.h (.../MPreTreatmentAdjustUltrafiltrationInitResponse.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustUltrafiltrationInitResponse.h (.../MPreTreatmentAdjustUltrafiltrationInitResponse.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -66,7 +66,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eEvent ; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("AdjustUFInit"); } struct Data { Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustWaterSampleResponse.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustWaterSampleResponse.h (.../MPreTreatmentAdjustWaterSampleResponse.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustWaterSampleResponse.h (.../MPreTreatmentAdjustWaterSampleResponse.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -66,7 +66,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eEvent ; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("AdjustWaterSample") ; } struct Data { Index: sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.h (.../MAdjustHDAlarmVolumeResponse.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.h (.../MAdjustHDAlarmVolumeResponse.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -64,7 +64,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eEvent ; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("AdjustHDAlarmVolume") ; } struct Data { Index: sources/model/hd/adjustment/settings/MAdjustHDDateTimeResponse.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/adjustment/settings/MAdjustHDDateTimeResponse.h (.../MAdjustHDDateTimeResponse.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/adjustment/settings/MAdjustHDDateTimeResponse.h (.../MAdjustHDDateTimeResponse.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -64,7 +64,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eEvent ; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("AdjustHDDateTime") ; } struct Data { Index: sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.h (.../MAdjustHDInstitutionalRecordResponse.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/adjustment/settings/MAdjustHDInstitutionalRecordResponse.h (.../MAdjustHDInstitutionalRecordResponse.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -113,7 +113,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eEvent ; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("InstitutionalRecord") ; } struct Data { Index: sources/model/hd/adjustment/settings/MAdjustHDRequests.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/adjustment/settings/MAdjustHDRequests.h (.../MAdjustHDRequests.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/adjustment/settings/MAdjustHDRequests.h (.../MAdjustHDRequests.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -50,11 +50,9 @@ class MAdjustHDDateTimeReq : public MModel { public: quint32 mEpoch; - // disabled coco begin validated : Has been validated manually. QString toString() { return toString({mEpoch}); } - // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("AdjustHDDateTime", vParameters); } @@ -91,12 +89,9 @@ _volume = vVolume; } - // disabled coco begin validated : Has been validated manually. - // This object is used statically for now, kept the logic for later usage. QString toString() { return toString( { _volume } ); } - // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("AdjustHDAlarmVolume", vParameters); } @@ -128,8 +123,6 @@ quint16 ver_revis = QString("%1").arg(VER_REVIS ).toUInt(); quint32 ver_comp = QString("%1").arg(SW_COMPATIBILITY_REV).toUInt(); - // disabled coco begin validated : Has been validated manually. - // This object is used statically for now, kept the logic for later usage. QString toString() { return toString({ ver_major , ver_minor , @@ -138,7 +131,6 @@ ver_comp , }); } - // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("POSTInfReq", vParameters); } @@ -169,7 +161,7 @@ static QString toString(const QVariantList &vParameters) { return MModel::toString("VersionRsp", vParameters); } - static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_HD; } + static Can::Can_Id canid () { return Can::Can_Id::eChlid_UI_TD; } }; @@ -189,12 +181,9 @@ class MAdjustServiceDatesReq : public MModel { public: - // disabled coco begin validated : Has been validated manually. - // This object is used statically for now, kept the logic for later usage. QString toString() { return toString({}); } - // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("ServiceDates", vParameters); } @@ -219,17 +208,14 @@ class MAdjustServiceModeReq : public MModel { public: - // disabled coco begin validated : Has been validated manually. - // This object is used statically for now, kept the logic for later usage. QString toString() { return toString({}); } - // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("ServiceMode", vParameters); } - static Can::Can_Id canid () { return Can::eChlid_UI_HD; } + static Can::Can_Id canid () { return Can::eChlid_UI_TD; } }; @@ -251,12 +237,9 @@ quint32 mResult; - // disabled coco begin validated : Has been validated manually. - // This object is used statically for now, kept the logic for later usage. QString toString() { return toString( { mResult } ); } - // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("UIPOSTDone", vParameters); } @@ -278,12 +261,9 @@ class MHDUsageInfoReq : public MModel { public: - // disabled coco begin validated : Has been validated manually. - // This object is used statically for now, kept the logic for later usage. QString toString() { return toString({}); } - // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("HDUsageInfoReq", vParameters); } @@ -307,17 +287,14 @@ class MAdjustInstitutionalRecordReq : public MModel { public: - // disabled coco begin validated : Has been validated manually. - // This object is used statically for now, kept the logic for later usage. QString toString() { return toString({}); } - // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("InstitutionalRecord", vParameters); } - static Can::Can_Id canid () { return Can::eChlid_UI_HD; } + static Can::Can_Id canid () { return Can::eChlid_UI_TD; } }; /*! @@ -336,17 +313,14 @@ class MAdjustHDResetInSrvceModeReq : public MModel { public: - // disabled coco begin validated : Has been validated manually. - // This object is used statically for now, kept the logic for later usage. QString toString() { return toString({}); } - // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("HDResetInServiceMode", vParameters); } - static Can::Can_Id canid () { return Can::eChlid_UI_HD; } + static Can::Can_Id canid () { return Can::eChlid_UI_TD; } }; } Index: sources/model/hd/adjustment/settings/MAdjustHDSerialNumberResponse.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/adjustment/settings/MAdjustHDSerialNumberResponse.h (.../MAdjustHDSerialNumberResponse.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/adjustment/settings/MAdjustHDSerialNumberResponse.h (.../MAdjustHDSerialNumberResponse.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -58,7 +58,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eEvent; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("Serial"); } struct Data { Index: sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.h (.../MAdjustHDServiceDatesResponse.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/adjustment/settings/MAdjustHDServiceDatesResponse.h (.../MAdjustHDServiceDatesResponse.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -63,7 +63,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eEvent ; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("ServiceDates") ; } struct Data { Index: sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.h (.../MAdjustHDServiceModeResponse.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/adjustment/settings/MAdjustHDServiceModeResponse.h (.../MAdjustHDServiceModeResponse.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -63,7 +63,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eEvent ; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("ServiceMode") ; } struct Data { Index: sources/model/hd/adjustment/settings/MAdjustHDVersionsRequest.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/adjustment/settings/MAdjustHDVersionsRequest.h (.../MAdjustHDVersionsRequest.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/adjustment/settings/MAdjustHDVersionsRequest.h (.../MAdjustHDVersionsRequest.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -61,7 +61,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eEvent ; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("VersionReq") ; } struct Data { Index: sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.h (.../MAdjustHDVersionsResponse.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.h (.../MAdjustHDVersionsResponse.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -79,7 +79,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eEvent ; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("VersionRsp") ; } struct Data { Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustBloodDialysateResponse.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/adjustment/treatment/MTreatmentAdjustBloodDialysateResponse.h (.../MTreatmentAdjustBloodDialysateResponse.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/adjustment/treatment/MTreatmentAdjustBloodDialysateResponse.h (.../MTreatmentAdjustBloodDialysateResponse.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -68,7 +68,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eEvent ; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("AdjustBloodDialysate"); } struct Data { Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustDurationResponse.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/adjustment/treatment/MTreatmentAdjustDurationResponse.h (.../MTreatmentAdjustDurationResponse.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/adjustment/treatment/MTreatmentAdjustDurationResponse.h (.../MTreatmentAdjustDurationResponse.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -69,7 +69,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eEvent ; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("AdjustDuration"); } struct Data { Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustEndResponse.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/adjustment/treatment/MTreatmentAdjustEndResponse.h (.../MTreatmentAdjustEndResponse.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/adjustment/treatment/MTreatmentAdjustEndResponse.h (.../MTreatmentAdjustEndResponse.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -66,7 +66,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eEvent ; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("AdjustTxEnd") ; } struct Data { Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustHeparinResponse.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/adjustment/treatment/MTreatmentAdjustHeparinResponse.h (.../MTreatmentAdjustHeparinResponse.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/adjustment/treatment/MTreatmentAdjustHeparinResponse.h (.../MTreatmentAdjustHeparinResponse.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -66,7 +66,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eEvent ; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("AdjustHeparin") ; } struct Data { Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.h (.../MTreatmentAdjustPressuresLimitsResponse.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/adjustment/treatment/MTreatmentAdjustPressuresLimitsResponse.h (.../MTreatmentAdjustPressuresLimitsResponse.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -72,7 +72,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eEvent ; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("AdjustPressuresLimits") ; } struct Data { Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustRecirculateResponse.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/adjustment/treatment/MTreatmentAdjustRecirculateResponse.h (.../MTreatmentAdjustRecirculateResponse.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/adjustment/treatment/MTreatmentAdjustRecirculateResponse.h (.../MTreatmentAdjustRecirculateResponse.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -66,7 +66,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eEvent ; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("AdjustRecirculate") ; } struct Data { Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -50,12 +50,9 @@ class MAdjustPowerOffReq : public MModel { public: quint8 state; - // disabled coco begin validated : Has been validated manually. - // This object is used statically for now, kept the logic for later usage. QString toString() { return toString({state}); } - // disabled coco end explicit MAdjustPowerOffReq(quint8 vState) : state(vState) { } static QString toString(const QVariantList &vParameters) { @@ -82,12 +79,9 @@ quint32 mId = 0; /*!< Request ID */ quint32 mConfirm = 0; /*!< user confirm */ - // disabled coco begin validated : Has been validated manually. - // This object is used statically for now, kept the logic for later usage. QString toString() { return toString({mId, mConfirm}); } - // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("Confirm", vParameters); @@ -113,12 +107,9 @@ public: quint32 bloodFlow = 0; quint32 dialysateFlow = 0; - // disabled coco begin validated : Has been validated manually. - // This object is used statically for now, kept the logic for later usage. QString toString() { return toString({bloodFlow , dialysateFlow}); } - // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("AdjustBloodDialysate", vParameters); } @@ -140,12 +131,9 @@ class MAdjustDurationReq : public MModel { public: quint32 duration = 0; - // disabled coco begin validated : Has been validated manually. - // This object is used statically for now, kept the logic for later usage. QString toString() { return toString({duration}); } - // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("AdjustDuration", vParameters); } @@ -168,12 +156,9 @@ public: GuiUFCommands requestedState = GuiUFCommands::UF_CMD_PAUSE; // the requested state. Initially it's running => paused. - // disabled coco begin validated : Has been validated manually. - // This object is used statically for now, kept the logic for later usage. QString toString() { return toString({requestedState}); } - // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("AdjustUFState", vParameters); } @@ -195,12 +180,9 @@ class MAdjustUltrafiltrationEditReq : public MModel { public: float volume = 0; - // disabled coco begin validated : Has been validated manually. - // This object is used statically for now, kept the logic for later usage. QString toString() { return toString({volume}); } - // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("AdjustUFEdit", vParameters); } @@ -231,12 +213,9 @@ float volume = 0; Options option = eDuration; - // disabled coco begin validated : Has been validated manually. - // This object is used statically for now, kept the logic for later usage. QString toString() { return toString({volume , option}); } - // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("AdjustUFConfirm", vParameters); } @@ -262,12 +241,9 @@ class MAdjustSalineReq : public MModel { public: GuiSalineCommands requestedState = GuiSalineCommands::SALINE_CMD_STOP; // the requested state. Initially it's Stop => start. - // disabled coco begin validated : Has been validated manually. - // This object is used statically for now, kept the logic for later usage. QString toString() { return toString({requestedState}); } - // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("AdjustSaline", vParameters); } @@ -293,12 +269,9 @@ class MAdjustHeparinReq : public MModel { public: GuiHeparinCommands requestedState = GuiHeparinCommands::HEPARIN_CMD_PAUSE ; // the requested state. Initially it's running with Initial Bolus. - // disabled coco begin validated : Has been validated manually. - // This object is used statically for now, kept the logic for later usage. QString toString() { return toString({requestedState}); } - // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("AdjustHeparin", vParameters); } @@ -328,16 +301,13 @@ qint32 mVenousPressureLimitWindow = 0; ///< (S32) Venous Pressure Limit Window (mmHg) qint32 mVenousPressureLimitAsymtrc = 0; ///< (S32) Venous Pressure Limit Asymmetric(mmHg) - // disabled coco begin validated : Has been validated manually. - // This object is used statically for now, kept the logic for later usage. QString toString() { return toString ({ mArterialPressureLimitWindow , mVenousPressureLimitWindow , mVenousPressureLimitAsymtrc }); } - // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("AdjustPressuresLimits", vParameters); } @@ -363,12 +333,9 @@ class MAdjustRinsebackReq : public MModel { public: GuiRinsebackCommands requestedState = GuiRinsebackCommands::REQUESTED_USER_ACTION_RINSEBACK_CONFIRM_START; // the requested state. - // disabled coco begin validated : Has been validated manually. - // This object is used statically for now, kept the logic for later usage. QString toString() { return toString({requestedState}); } - // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("AdjustRinseback", vParameters); } @@ -394,12 +361,9 @@ class MAdjustRecirculateReq : public MModel { public: GuiRecirculateCommands requestedState = GuiRecirculateCommands::REQUESTED_USER_ACTION_TX_RECIRC_RECONNECT; // the requested state. - // disabled coco begin validated : Has been validated manually. - // This object is used statically for now, kept the logic for later usage. QString toString() { return toString({requestedState}); } - // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("AdjustRecirculate", vParameters); } @@ -425,12 +389,9 @@ class MAdjustTreatmentEndReq : public MModel { public: GuiTreatmentEndCommands requestedState = GuiTreatmentEndCommands::REQUESTED_USER_ACTION_TX_END_RINSEBACK_START; // the requested state. - // disabled coco begin validated : Has been validated manually. - // This object is used statically for now, kept the logic for later usage. QString toString() { return toString({requestedState}); } - // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("AdjustTxEnd", vParameters); } @@ -454,48 +415,15 @@ class MAlarmSilenceReq : public MModel { public: quint32 silence = 1; - // disabled coco begin validated : Has been validated manually. - // This object is used statically for now, kept the logic for later usage. QString toString() { return toString({silence}); } - // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("AlarmSilence", vParameters); } }; /*! - * \brief The MAlarmClearedConditionReq class - * \details The model to tell HD an alarm has been acknowledged - * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | - * |:----:|:----------:|:-----:|:----:|:---:|:---:|:----:|:------------------------:| - * |0x3F00| 0x001,2,4 | N/A | Cmd | Y | UI | HD | Alarm Condition Cleared | - * - * | Payload || - * | || - * | #1:(U32) | \ref alarmID | - * - */ -// disabled coco begin validated: Manually tested. This model class is a placeholder for the message 63(0x3F00) and there is no use case for this now. -class MAlarmClearedConditionReq : public MModel { -public: - GuiAlarmID alarmID = GuiAlarmID::ALARM_ID_NO_ALARM; - // disabled coco begin validated : Has been validated manually. - // This object is used statically for now, kept the logic for later usage. - QString toString() { - return toString({alarmID}); - } - // disabled coco end - // coco begin validate : - static QString toString(const QVariantList &vParameters) { - return MModel::toString("AlarmCondition", vParameters); - } -}; -// disabled coco end - -/*! * \brief The MAlarmUserActionReq class * \details The model to tell HD an alarm action has been made by user * @@ -511,12 +439,9 @@ class MAlarmUserActionReq : public MModel { public: GuiAlarmUserActions action; - // disabled coco begin validated : Has been validated manually. - // This object is used statically for now, kept the logic for later usage. QString toString() { return toString({action}); } - // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("AlarmUserAction", vParameters); } @@ -539,5 +464,4 @@ typedef Model:: MAdjustPressuresLimitsReq AdjustPressuresLimitsRequestData; // Alarms typedef Model:: MAlarmSilenceReq AlarmSilenceRequestData; -typedef Model:: MAlarmClearedConditionReq AlarmClearedConditionRequestData; typedef Model:: MAlarmUserActionReq AlarmUserActionRequestData; Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustRinsebackResponse.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/adjustment/treatment/MTreatmentAdjustRinsebackResponse.h (.../MTreatmentAdjustRinsebackResponse.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/adjustment/treatment/MTreatmentAdjustRinsebackResponse.h (.../MTreatmentAdjustRinsebackResponse.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -66,7 +66,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eEvent ; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("AdjustRinseback") ; } struct Data { Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustSalineResponse.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/adjustment/treatment/MTreatmentAdjustSalineResponse.h (.../MTreatmentAdjustSalineResponse.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/adjustment/treatment/MTreatmentAdjustSalineResponse.h (.../MTreatmentAdjustSalineResponse.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -68,7 +68,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eEvent ; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("AdjustSaline") ; } struct Data { Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationStateResponse.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationStateResponse.h (.../MTreatmentAdjustUltrafiltrationStateResponse.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/adjustment/treatment/MTreatmentAdjustUltrafiltrationStateResponse.h (.../MTreatmentAdjustUltrafiltrationStateResponse.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -66,7 +66,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eEvent ; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("AdjustUFState"); } struct Data { Index: sources/model/hd/alarm/MAlarmActiveList.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/alarm/MAlarmActiveList.h (.../MAlarmActiveList.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/alarm/MAlarmActiveList.h (.../MAlarmActiveList.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -43,12 +43,9 @@ */ class MAlarmActiveListReq : public MModel { public: - // disabled coco begin validated : Has been validated manually. - // This object is used statically for now, kept the logic for later usage. QString toString() { return toString({}); } - // disabled coco end static QString toString(const QVariantList &vParameters) { return MModel::toString("AlarmActiveList", vParameters); } @@ -112,7 +109,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eEvent ; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("AlarmActiveList"); } struct Data { Index: sources/model/hd/alarm/MAlarmCleared.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/alarm/MAlarmCleared.h (.../MAlarmCleared.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/alarm/MAlarmCleared.h (.../MAlarmCleared.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -61,7 +61,7 @@ public: Type_Enum typeText() const override { return Type_Enum::eEvent ; } - Unit_Enum unitText() const override { return Unit_Enum::eHD ; } + Unit_Enum unitText() const override { return Unit_Enum::eTD ; } QString infoText() const override { return QString("AlarmCleared") ; } struct Data { Fisheye: Tag 11560b63360025c294edabc6f5f6da97ad1f20c3 refers to a dead (removed) revision in file `sources/model/hd/alarm/MAlarmClearedCondition.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 11560b63360025c294edabc6f5f6da97ad1f20c3 refers to a dead (removed) revision in file `sources/model/hd/alarm/MAlarmClearedCondition.h'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/model/hd/alarm/MAlarmStatusData.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/alarm/MAlarmStatusData.h (.../MAlarmStatusData.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/alarm/MAlarmStatusData.h (.../MAlarmStatusData.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -71,7 +71,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eDatum ; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("AlarmStatus") ; } struct Data { Index: sources/model/hd/alarm/MAlarmTriggered.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/alarm/MAlarmTriggered.h (.../MAlarmTriggered.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/alarm/MAlarmTriggered.h (.../MAlarmTriggered.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -66,7 +66,7 @@ public: Type_Enum typeText() const override { return Type_Enum::eEvent ; } - Unit_Enum unitText() const override { return Unit_Enum::eHD ; } + Unit_Enum unitText() const override { return Unit_Enum::eTD ; } QString infoText() const override { return QString("AlarmTriggered") ; } struct Data { @@ -129,10 +129,7 @@ */ class MAlarmTriggeredReq : public MModel { public: - // disabled coco begin validated: Has been validated manually. - // This object is used statically for now, kept the logic for later usage. QString toString(); - // disabled coco end static QString toString(const QVariantList &vParameters); static Can::Can_Id canid (); }; Index: sources/model/hd/data/MHDAccelerometerData.cpp =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/data/MHDAccelerometerData.cpp (.../MHDAccelerometerData.cpp) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/data/MHDAccelerometerData.cpp (.../MHDAccelerometerData.cpp) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -14,10 +14,6 @@ */ #include "MHDAccelerometerData.h" -// disabled coco begin validated: -// FIXME: this model was only for the Diagnostic use, and has been removed, -// Should be removed from the UI Software if not being used anymore - using namespace Model; QVariantList MHDAccelerometer::parameters() const { @@ -47,10 +43,10 @@ if ( ! GetValue(vByteArray, index, _data.mZTilt )) goto lError; return true ; - + lError: if(vIndex) { *vIndex = index; } - + return false ; } @@ -67,5 +63,3 @@ data.mZTilt = _data.mZTilt .value; return data; } - -// disabled coco end Index: sources/model/hd/data/MHDAccelerometerData.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/data/MHDAccelerometerData.h (.../MHDAccelerometerData.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/data/MHDAccelerometerData.h (.../MHDAccelerometerData.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -25,10 +25,6 @@ // forward declarations class tst_models; -// disabled coco begin validated: -// FIXME: this model was only for the Diagnostic use, and has been removed, -// Should be removed from the UI Software if not being used anymore - namespace Model { /*! @@ -84,7 +80,7 @@ public: Type_Enum typeText() const override { return Type_Enum::eDatum; } - Unit_Enum unitText() const override { return Unit_Enum::eHD ; } + Unit_Enum unitText() const override { return Unit_Enum::eTD ; } QString infoText() const override { return QString("Accel") ; } struct Data { @@ -108,5 +104,3 @@ } typedef Model::MHDAccelerometer::Data HDAccelerometerData; - -// disabled coco end Index: sources/model/hd/data/MHDAirBubbleData.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/data/MHDAirBubbleData.h (.../MHDAirBubbleData.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/data/MHDAirBubbleData.h (.../MHDAirBubbleData.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -65,7 +65,7 @@ public: Type_Enum typeText() const override { return Type_Enum::eDatum ; } - Unit_Enum unitText() const override { return Unit_Enum::eHD ; } + Unit_Enum unitText() const override { return Unit_Enum::eTD ; } QString infoText() const override { return QString("AirBubble"); } Index: sources/model/hd/data/MHDAirTrapData.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/data/MHDAirTrapData.h (.../MHDAirTrapData.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/data/MHDAirTrapData.h (.../MHDAirTrapData.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -69,7 +69,7 @@ public: Type_Enum typeText() const override { return Type_Enum::eDatum ; } - Unit_Enum unitText() const override { return Unit_Enum::eHD ; } + Unit_Enum unitText() const override { return Unit_Enum::eTD ; } QString infoText() const override { return QString("AirTrap") ; } Index: sources/model/hd/data/MHDBloodLeakData.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/data/MHDBloodLeakData.h (.../MHDBloodLeakData.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/data/MHDBloodLeakData.h (.../MHDBloodLeakData.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -70,7 +70,7 @@ public: Type_Enum typeText() const override { return Type_Enum::eDatum ; } - Unit_Enum unitText() const override { return Unit_Enum::eHD ; } + Unit_Enum unitText() const override { return Unit_Enum::eTD ; } QString infoText() const override { return QString("BloodLeak") ; } struct Data { Index: sources/model/hd/data/MHDDebugText.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/data/MHDDebugText.h (.../MHDDebugText.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/data/MHDDebugText.h (.../MHDDebugText.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -59,7 +59,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eDatum; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("Debug") ; } struct Data { Index: sources/model/hd/data/MHDGeneralEvent.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/data/MHDGeneralEvent.h (.../MHDGeneralEvent.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/data/MHDGeneralEvent.h (.../MHDGeneralEvent.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -59,7 +59,7 @@ public: Type_Enum typeText() const override { return Type_Enum::eEvent ; } - Unit_Enum unitText() const override { return Unit_Enum::eHD ; } + Unit_Enum unitText() const override { return Unit_Enum::eTD ; } QString infoText() const override { return QString("General" ) ; } struct Data { Index: sources/model/hd/data/MHDOperationModeData.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/data/MHDOperationModeData.h (.../MHDOperationModeData.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/data/MHDOperationModeData.h (.../MHDOperationModeData.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -64,7 +64,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eDatum; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("OpMode"); } struct Data { Index: sources/model/hd/data/MHDSyringePumpData.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/data/MHDSyringePumpData.h (.../MHDSyringePumpData.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/data/MHDSyringePumpData.h (.../MHDSyringePumpData.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -85,7 +85,7 @@ public: Type_Enum typeText() const override { return Type_Enum::eDatum ; } - Unit_Enum unitText() const override { return Unit_Enum::eHD ; } + Unit_Enum unitText() const override { return Unit_Enum::eTD ; } QString infoText() const override { return QString("Syringe"); } struct Data { Index: sources/model/hd/data/MHDUsageInfoResponse.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/data/MHDUsageInfoResponse.h (.../MHDUsageInfoResponse.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/data/MHDUsageInfoResponse.h (.../MHDUsageInfoResponse.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -70,7 +70,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eDatum; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("HDUsageInfo"); } struct Data { Index: sources/model/hd/data/MTreatmentRangesData.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/data/MTreatmentRangesData.h (.../MTreatmentRangesData.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/data/MTreatmentRangesData.h (.../MTreatmentRangesData.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -72,7 +72,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eDatum ; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("TreatmentRanges"); } struct Data { Index: sources/model/hd/data/post/MHDPostFinalResultData.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/data/post/MHDPostFinalResultData.h (.../MHDPostFinalResultData.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/data/post/MHDPostFinalResultData.h (.../MHDPostFinalResultData.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -64,7 +64,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eDatum ;} - Unit_Enum unitText () const override { return Unit_Enum::eHD ;} + Unit_Enum unitText () const override { return Unit_Enum::eTD ;} QString infoText () const override { return QString("POSTDone") ;} struct Data { Index: sources/model/hd/data/post/MHDPostSingleResultData.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/data/post/MHDPostSingleResultData.h (.../MHDPostSingleResultData.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/data/post/MHDPostSingleResultData.h (.../MHDPostSingleResultData.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -66,7 +66,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eDatum ;} - Unit_Enum unitText () const override { return Unit_Enum::eHD ;} + Unit_Enum unitText () const override { return Unit_Enum::eTD ;} QString infoText () const override { return QString("POSTItem") ;} struct Data { Index: sources/model/hd/data/post/MHDRTCEpochData.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/data/post/MHDRTCEpochData.h (.../MHDRTCEpochData.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/data/post/MHDRTCEpochData.h (.../MHDRTCEpochData.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -63,7 +63,7 @@ public: Type_Enum typeText() const override { return Type_Enum::eDatum ; } - Unit_Enum unitText() const override { return Unit_Enum::eHD ; } + Unit_Enum unitText() const override { return Unit_Enum::eTD ; } QString infoText() const override { return QString("HDRTCEpoch") ; } Index: sources/model/hd/data/post/MUIPostFinalResultHDRequest.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/data/post/MUIPostFinalResultHDRequest.h (.../MUIPostFinalResultHDRequest.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/data/post/MUIPostFinalResultHDRequest.h (.../MUIPostFinalResultHDRequest.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -62,7 +62,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eEvent ;} - Unit_Enum unitText () const override { return Unit_Enum::eHD ;} + Unit_Enum unitText () const override { return Unit_Enum::eTD ;} QString infoText () const override { return QString("UIPOSTDoneReq" ) ;} struct Data { Index: sources/model/hd/data/posttreatment/MPostTreatmentStatesData.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/data/posttreatment/MPostTreatmentStatesData.h (.../MPostTreatmentStatesData.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/data/posttreatment/MPostTreatmentStatesData.h (.../MPostTreatmentStatesData.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -66,7 +66,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eDatum ; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("PostTreatmentStates"); } struct Data { Index: sources/model/hd/data/pretreatment/MPreTreatmentDisposablesPrimeData.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/data/pretreatment/MPreTreatmentDisposablesPrimeData.h (.../MPreTreatmentDisposablesPrimeData.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/data/pretreatment/MPreTreatmentDisposablesPrimeData.h (.../MPreTreatmentDisposablesPrimeData.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -60,7 +60,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eDatum ; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("DisposablesPrime"); } struct Data { Index: sources/model/hd/data/pretreatment/MPreTreatmentSelfTestDryData.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/data/pretreatment/MPreTreatmentSelfTestDryData.h (.../MPreTreatmentSelfTestDryData.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/data/pretreatment/MPreTreatmentSelfTestDryData.h (.../MPreTreatmentSelfTestDryData.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -63,7 +63,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eDatum ; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("SelfTestDry"); } struct Data { Index: sources/model/hd/data/pretreatment/MPreTreatmentSelfTestNoCartridgeData.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/data/pretreatment/MPreTreatmentSelfTestNoCartridgeData.h (.../MPreTreatmentSelfTestNoCartridgeData.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/data/pretreatment/MPreTreatmentSelfTestNoCartridgeData.h (.../MPreTreatmentSelfTestNoCartridgeData.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -63,7 +63,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eDatum ; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("SelfTestNoCartridge"); } struct Data { Index: sources/model/hd/data/pretreatment/MPreTreatmentStatesData.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/data/pretreatment/MPreTreatmentStatesData.h (.../MPreTreatmentStatesData.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/data/pretreatment/MPreTreatmentStatesData.h (.../MPreTreatmentStatesData.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -91,7 +91,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eDatum ; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("PreTreatmentStates"); } struct Data { Index: sources/model/hd/data/treatment/MTreatmentBloodFlowData.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/data/treatment/MTreatmentBloodFlowData.h (.../MTreatmentBloodFlowData.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/data/treatment/MTreatmentBloodFlowData.h (.../MTreatmentBloodFlowData.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -77,7 +77,7 @@ QVariantList parameters() const override; public: Type_Enum typeText () const override { return Type_Enum::eDatum; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("BloodFlow"); } struct Data { Index: sources/model/hd/data/treatment/MTreatmentBloodPrimeData.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/data/treatment/MTreatmentBloodPrimeData.h (.../MTreatmentBloodPrimeData.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/data/treatment/MTreatmentBloodPrimeData.h (.../MTreatmentBloodPrimeData.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -64,7 +64,7 @@ public: Type_Enum typeText() const override { return Type_Enum::eDatum ; } - Unit_Enum unitText() const override { return Unit_Enum::eHD ; } + Unit_Enum unitText() const override { return Unit_Enum::eTD ; } QString infoText() const override { return QString("BloodPrime") ; } struct Data { Index: sources/model/hd/data/treatment/MTreatmentDialysateFlowData.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/data/treatment/MTreatmentDialysateFlowData.h (.../MTreatmentDialysateFlowData.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/data/treatment/MTreatmentDialysateFlowData.h (.../MTreatmentDialysateFlowData.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -79,7 +79,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eDatum; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("DialysateFlow"); } struct Data { Index: sources/model/hd/data/treatment/MTreatmentHeparinData.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/data/treatment/MTreatmentHeparinData.h (.../MTreatmentHeparinData.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/data/treatment/MTreatmentHeparinData.h (.../MTreatmentHeparinData.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -66,7 +66,7 @@ public: Type_Enum typeText() const override { return Type_Enum::eDatum ; } - Unit_Enum unitText() const override { return Unit_Enum::eHD ; } + Unit_Enum unitText() const override { return Unit_Enum::eTD ; } QString infoText() const override { return QString("Heparin") ; } struct Data { Index: sources/model/hd/data/treatment/MTreatmentOutletFlowData.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/data/treatment/MTreatmentOutletFlowData.h (.../MTreatmentOutletFlowData.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/data/treatment/MTreatmentOutletFlowData.h (.../MTreatmentOutletFlowData.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -86,7 +86,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eDatum ; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("OutletFlow"); } struct Data { Index: sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.h (.../MTreatmentPressureOcclusionData.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/data/treatment/MTreatmentPressureOcclusionData.h (.../MTreatmentPressureOcclusionData.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -84,7 +84,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eDatum ; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("Occlusion"); } struct Data { Index: sources/model/hd/data/treatment/MTreatmentRecirculateData.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/data/treatment/MTreatmentRecirculateData.h (.../MTreatmentRecirculateData.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/data/treatment/MTreatmentRecirculateData.h (.../MTreatmentRecirculateData.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -66,7 +66,7 @@ public: Type_Enum typeText() const override { return Type_Enum::eDatum ; } - Unit_Enum unitText() const override { return Unit_Enum::eHD ; } + Unit_Enum unitText() const override { return Unit_Enum::eTD ; } QString infoText() const override { return QString("Recirculate") ; } struct Data { Index: sources/model/hd/data/treatment/MTreatmentRinsebackData.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/data/treatment/MTreatmentRinsebackData.h (.../MTreatmentRinsebackData.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/data/treatment/MTreatmentRinsebackData.h (.../MTreatmentRinsebackData.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -74,7 +74,7 @@ public: Type_Enum typeText() const override { return Type_Enum::eDatum ; } - Unit_Enum unitText() const override { return Unit_Enum::eHD ; } + Unit_Enum unitText() const override { return Unit_Enum::eTD ; } QString infoText() const override { return QString("Rinseback") ; } struct Data { Index: sources/model/hd/data/treatment/MTreatmentSalineData.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/data/treatment/MTreatmentSalineData.h (.../MTreatmentSalineData.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/data/treatment/MTreatmentSalineData.h (.../MTreatmentSalineData.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -68,7 +68,7 @@ public: Type_Enum typeText() const override { return Type_Enum::eDatum ; } - Unit_Enum unitText() const override { return Unit_Enum::eHD ; } + Unit_Enum unitText() const override { return Unit_Enum::eTD ; } QString infoText() const override { return QString("Saline") ; } struct Data { Index: sources/model/hd/data/treatment/MTreatmentStatesData.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/data/treatment/MTreatmentStatesData.h (.../MTreatmentStatesData.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/data/treatment/MTreatmentStatesData.h (.../MTreatmentStatesData.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -91,7 +91,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eDatum ; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("TreatmentStates"); } struct Data { Index: sources/model/hd/data/treatment/MTreatmentStopData.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/data/treatment/MTreatmentStopData.h (.../MTreatmentStopData.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/data/treatment/MTreatmentStopData.h (.../MTreatmentStopData.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -64,7 +64,7 @@ public: Type_Enum typeText() const override { return Type_Enum::eDatum ; } - Unit_Enum unitText() const override { return Unit_Enum::eHD ; } + Unit_Enum unitText() const override { return Unit_Enum::eTD ; } QString infoText() const override { return QString("Stop" ) ; } struct Data { Index: sources/model/hd/data/treatment/MTreatmentTimeData.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/data/treatment/MTreatmentTimeData.h (.../MTreatmentTimeData.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/data/treatment/MTreatmentTimeData.h (.../MTreatmentTimeData.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -66,7 +66,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eDatum ; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("TreatmentTime"); } struct Data { Index: sources/model/hd/data/treatmentlog/MTreatmentLogAlarmData.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/data/treatmentlog/MTreatmentLogAlarmData.h (.../MTreatmentLogAlarmData.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/data/treatmentlog/MTreatmentLogAlarmData.h (.../MTreatmentLogAlarmData.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -68,7 +68,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eDatum ; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("TreatmentLogAlarm") ; } struct Data { Index: sources/model/hd/data/treatmentlog/MTreatmentLogAvrgeData.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/data/treatmentlog/MTreatmentLogAvrgeData.h (.../MTreatmentLogAvrgeData.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/data/treatmentlog/MTreatmentLogAvrgeData.h (.../MTreatmentLogAvrgeData.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -72,7 +72,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eDatum ; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("TreatmentLogAvrge") ; } struct Data { Index: sources/model/hd/data/treatmentlog/MTreatmentLogEventData.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/model/hd/data/treatmentlog/MTreatmentLogEventData.h (.../MTreatmentLogEventData.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/model/hd/data/treatmentlog/MTreatmentLogEventData.h (.../MTreatmentLogEventData.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -68,7 +68,7 @@ public: Type_Enum typeText () const override { return Type_Enum::eDatum ; } - Unit_Enum unitText () const override { return Unit_Enum::eHD ; } + Unit_Enum unitText () const override { return Unit_Enum::eTD ; } QString infoText () const override { return QString("TreatmentLogEvent") ; } struct Data { Index: sources/storage/FileHandler.cpp =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/storage/FileHandler.cpp (.../FileHandler.cpp) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/storage/FileHandler.cpp (.../FileHandler.cpp) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -43,9 +43,7 @@ { static uint count; static QString mCritical; - // disabled coco begin validated : This has been manually test. Needs file system access to produce errors for hundred times. if (mCritical != vMessage || !(count % 1000)) { - // disabled coco end count = 0; mCritical = vMessage; QTextStream err(stderr); @@ -73,14 +71,12 @@ QFile::OpenMode openMode = vAppend ? QFile::Text | QFile::Append : QFile::Text | QFile::WriteOnly; - // disabled coco begin validated : This has been manually test. Needs file system access to make file the way it cannot be opened for writing. if (! file.open(openMode)) { QString msg = QString("Cannot open file for write (%1). Possible corrupted file system.").arg(vFileName); // here cannot use LOG_XXXX because if the folder cannot be created then the log cannot be written. errOut (msg); return false; } - // disabled coco end QTextStream out(&file); out << vContent; out.flush(); @@ -141,15 +137,12 @@ */ int FileHandler::copyFolder(const QString &vSource, const QString &vDestination) { - // disabled coco begin validated: This needs user interaction to export to USB device - // has been tested manually since currently it is the only place it has been used. QString cmd = "cp"; QStringList arguments; arguments << "-r" << vSource << vDestination; int result = QProcess::execute(cmd, arguments); return result; } -// disabled coco end /*! * \brief FileHandler::moveFolder @@ -161,15 +154,12 @@ */ int FileHandler::moveFolder(const QString &vSource, const QString &vDestination) { - // disabled coco begin validated: This needs user interaction to check the file system - // has been tested manually since currently it is the only place it has been used. QString cmd = "mv"; QStringList arguments; arguments << vSource << vDestination; int result = QProcess::execute(cmd, arguments); return result; } -// disabled coco end /*! * \brief FileHandler::removeFolder @@ -182,15 +172,12 @@ */ int FileHandler::removeFolder(const QString &vFolder) { - // disabled coco begin validated: This needs user interaction to check the file system - // has been tested manually since currently it is the only place it has been used. QString cmd = "rm"; QStringList arguments; arguments << "-frd" << vFolder; int result = QProcess::execute(cmd, arguments); return result; } -// disabled coco end /*! * \brief FileHandler::removeFiles @@ -211,7 +198,6 @@ for (const auto &info : infoList) { QDateTime fileTime = info.lastModified(); QString fileName = info.absoluteFilePath(); - // disabled coco begin validated : This has been manually tested since requires to change in file system to reproduce the error. if (fileTime.isValid()) { if (fileTime.date() <= vDateOlderThan) { if (QFile::remove(fileName)) { @@ -226,7 +212,6 @@ else { errOut(QString("Cannot get last modified date of file : ") + fileName); } - // disabled coco end } } return countRemoved; @@ -329,8 +314,6 @@ * if vRetainPercent is used then it contains list of the file(s) to be removed. */ QFileInfoList FileHandler::find(const QString &vPath, QStringList vNameFilters, quint8 vRetainPercent) { - // disabled coco begin validated: Manually tested. Needs to fill up the storage to test some functionalities like vRetainPercent - QFileInfoList fileInfoList; // if all the files need to retain then no file shall be listed in the remove list. if ( vRetainPercent == 100 ) return fileInfoList; @@ -393,7 +376,6 @@ // ; return fileInfoList; } -// disabled coco end /*! * \brief FileHandler::find @@ -404,8 +386,6 @@ * if vRetainPercent is used then it contains list of the file(s) to be removed. */ QFileInfoList FileHandler::find(const QString &vPath, QStringList vNameFilters) { - // disabled coco begin validated: Needs to manually create specific folder with specific files to check the functionality - // manually tested QFileInfoList fileInfoList; QDir dir(vPath); if (!dir.exists()) return fileInfoList; @@ -420,17 +400,14 @@ ); return fileInfoList; } -// disabled coco end quint64 FileHandler::totalSize(const QFileInfoList &vFileInfoList) { - // disabled coco begin validated: Manually tested. requires list of files on file system to test and requires manual specific files for test. quint64 total = 0; for (auto it = vFileInfoList.crbegin(); it != vFileInfoList.crend(); ++it) { total += it->size(); } return total; } -// disabled coco end /*! * \brief FileHandler::subFolders Index: sources/storage/Logger.cpp =================================================================== diff -u -r9bc48695cdb977a80d3279cacdc101d5164f1b4b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/storage/Logger.cpp (.../Logger.cpp) (revision 9bc48695cdb977a80d3279cacdc101d5164f1b4b) +++ sources/storage/Logger.cpp (.../Logger.cpp) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -73,13 +73,10 @@ */ bool Logger::init(QThread &vThread) { - // disabled coco begin validated: Application is not running in multi-threaded mode for testing - // it has been tested and works perfectly fine in normal run. if ( ! init() ) return false; initThread(vThread); return true; } -// disabled coco end /*! * \brief Logger::postInit @@ -119,11 +116,8 @@ */ void Logger::quit() { - // disabled coco begin validated: Application termination is not correctly done in coco!!! - // it has been tested and works perfectly fine in normal run. quitThread(); // validated } -// disabled coco end /*! * \brief Logger::initConnections @@ -171,17 +165,14 @@ */ void Logger::initThread(QThread &vThread) { - // disabled coco begin validated: Application is not running in multi-threaded mode for testing - // it has been tested and works perfectly fine in normal run. - // runs in main thread Q_ASSERT_X(QThread::currentThread() == qApp->thread() , __func__, "The Class initialization must be done in Main Thread" ); _thread = &vThread; _thread->setObjectName(QString("%1_Thread").arg(metaObject()->className())); connect(qApp, SIGNAL(aboutToQuit()), this, SLOT(quit())); _thread->start(); moveToThread(_thread); } -// disabled coco end + /*! * \brief Logger::quitThread * \details Moves this object to main thread to be handled by QApplication @@ -521,8 +512,6 @@ */ void Logger::onExportLogs() { - // disabled coco begin validated: This needs user interaction to export to USB device - // has been tested manually LOG_DEBUG(QString("Export %1 ended: %2").arg(_logNames[_exportLogsType]).arg(_exportLogsWatcher.result())); //DEBUG: qDebug()<< "_exportLogsWatcher.result()" << _exportLogsWatcher.result(); @@ -532,7 +521,6 @@ } emit didExportLogs(); } -// disabled coco end /*! * \brief CloudSyncController::onActionReceive @@ -668,15 +656,12 @@ */ bool Logger::concurrentRemoveLogs(LogType vLogType) { - // disabled coco begin validated: This needs user interaction to check the old files deleted - // has been tested manually LOG_DEBUG("Remove Logs Starting"); emit didRemoveLogs(true); QFuture mFuture = QtConcurrent::run(this, &Logger::removeLogs, vLogType); _removeLogsWatcher.setFuture(mFuture); return true; } -// disabled coco end /*! * \brief Logger::onRemoveLogs @@ -712,8 +697,6 @@ */ void Logger::onSDCardSpaceChange(bool vReady, qint64 vTotal, qint64 vAvailable, quint8 vPercent) { - // disabled coco begin validated: This needs user interaction to change the SD card files system. - // has been tested manually Q_UNUSED(vTotal ) Q_UNUSED(vAvailable ) if ( ! vReady ) return; @@ -723,9 +706,7 @@ concurrentRemoveLogs(); } } -// disabled coco end - /*! * \brief Logger::onSettingsPartitionStateChange * \details handle the state change of the settings partition @@ -751,8 +732,6 @@ */ void Logger::onSettingsPartitionSpaceChange(bool vReady, qint64 vTotal, qint64 vAvailable, quint8 vPercent) { - // disabled coco begin validated: This needs user interaction to change the SD card files system. - // has been tested manually Q_UNUSED(vTotal ) Q_UNUSED(vAvailable ) if ( ! vReady ) return; @@ -762,16 +741,13 @@ concurrentRemoveLogs(eLogTrtmt); } } -// disabled coco end - /*! * \brief Logger::enableConsoleOut * \details Enables or Disables the console output and logs the status * \param vEnabled - Enable console output if true */ void Logger::enableConsoleOut(bool vEnabled) { - // disabled coco begin validated: This code meant to be used only for debugging and tested manually if (_enableConsoleOut == vEnabled) return; _enableConsoleOut = vEnabled; if (_enableConsoleOut) { @@ -780,7 +756,6 @@ LOG_DEBUG("Console out Logging disabled"); } } -// disabled coco end /*! * \brief Logger::logPath Index: sources/view/VAdjustmentResponseBase.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/view/VAdjustmentResponseBase.h (.../VAdjustmentResponseBase.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/view/VAdjustmentResponseBase.h (.../VAdjustmentResponseBase.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -55,18 +55,15 @@ QMap _rejects; - // disabled coco begin validated: // The adjustment_Reason property as quint32 is not used directly in GUI // it will be used as QString text. - // has been manually tested that it works perfectly fine if used. // this property changed to trigger since it has been found out during tests that the reason could be same but has to be shown again. TRIGGER ( quint32 , adjustment_Reason , 0) - // disabled coco end PROPERTY( bool , adjustment_Accepted , 0) Q_PROPERTY(QString adjustment_ReasonText READ text NOTIFY adjustment_ReasonTriggered) - + VIEW_DEC_CLASS(VAdjustmentResponseBase) VIEW_DEC_SLOT (SettingsData ) Index: sources/view/VEventSpy.cpp =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/view/VEventSpy.cpp (.../VEventSpy.cpp) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/view/VEventSpy.cpp (.../VEventSpy.cpp) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -42,11 +42,9 @@ void VEventSpy::initConnections() { - // disabled coco begin validated: this code has been manually tested. // This should never happen with the current design and usage. // put here for developer safety if (Gui::_viewer) { - // disabled coco end QObject::connect(Gui::_viewer , SIGNAL( eventSpy(QEvent*)), this , SLOT(onEventSpy(QEvent*))); } @@ -62,7 +60,6 @@ QEvent::Type mType = vEvent->type(); switch (mType) { - // disabled coco begin validated: this code has been manually tested. // the only intention of this code is to be used for EMC testing and has been tested and is working fine. // Mouse case QEvent::Type::MouseButtonDblClick : mouseEventSpy(vEvent, "mD"); break; @@ -80,7 +77,6 @@ // Keyboard case QEvent::Type::KeyPress : keybdEventSpy(vEvent ); break; - // disabled coco end default : break; @@ -97,7 +93,6 @@ * \param vEvent - mouse event * \param vTypeName - mouse button type name */ -// disabled coco begin validated: this code has been manually tested. // the only intention of this code is to be used for EMC testing and has been tested and is working fine. void VEventSpy::mouseEventSpy(QEvent *vEvent, const QString &vTypeName) { @@ -138,24 +133,20 @@ .arg(y, 4, 10, QChar('0'))); #endif } -// disabled coco end -// disabled coco begin validated: this code has been manually tested. -// the only intention of this code is to be used for EMC testing and has been tested and is working fine. +// the only intention of this code is to be used for EMC testing. /*! * \brief VEventSpy::doMouseReset * \details mouse event count reset */ void VEventSpy::doMouseReset() { mouseCount(0); } -// disabled coco end /*! * \brief VEventSpy::touchEventSpy * \param vEvent - touch event * \param vTypeName - The type of the QEvent which has been shortened e.g. tB: TouchBegin */ -// disabled coco begin validated: this code has been manually tested. -// the only intention of this code is to be used for EMC testing and has been tested and is working fine. +// the only intention of this code is to be used for EMC testing. void VEventSpy::touchEventSpy(QEvent *vEvent, const QString &vTypeName) { QTouchEvent *touchEvent = static_cast(vEvent); @@ -181,20 +172,15 @@ } LOG_DEBUG( vTypeName + logString ); } -// disabled coco end -// disabled coco begin validated: this code has been manually tested. -// the only intention of this code is to be used for EMC testing and has been tested and is working fine. +// the only intention of this code is to be used for EMC. /*! * \brief VEventSpy::doTouchReset * \details touch event counter reset */ void VEventSpy::doTouchReset() { touchCount(0); } -// disabled coco end - -// disabled coco begin validated: this code has been manually tested. -// the only intention of this code is to be used for testing and has been tested and is working fine. +// the only intention of this code is to be used for testing. /*! * \brief VEventSpy::keybdEventSpy * \param vEvent @@ -238,4 +224,3 @@ break; } } -// disabled coco end Index: sources/view/VEventSpy.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/view/VEventSpy.h (.../VEventSpy.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/view/VEventSpy.h (.../VEventSpy.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -39,14 +39,11 @@ // singleton SINGLETON(VEventSpy) - // disabled coco begin validated: this code has been manually tested. - // the only intention of this code is to be used for EMC testing and has been tested and is working fine. PROPERTY( quint64 , touchCount , 0 ) PROPERTY( quint64 , touchPoints , 0 ) PROPERTY( quint64 , mouseCount , 0 ) PROPERTY( QPoint , mousePoint , QPoint() ) - // disabled coco end private: void initConnections(); Index: sources/view/confirm/VConfirm.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/view/confirm/VConfirm.h (.../VConfirm.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/view/confirm/VConfirm.h (.../VConfirm.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -52,12 +52,9 @@ // ********** DYNAMIC PROPERTIES: The properties which need to be updated by each confirm message received. ********** // READONLY( bool , needConfirm , false) - // disabled coco begin validated: // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI - // has been manually tested that it works perfectly fine TRIGGER ( bool , adjustment , 0) - // disabled coco end PROPERTY(quint32 , id , 0) PROPERTY(quint32 , command , 0) Index: sources/view/dg/data/VDGAccelerometerData.cpp =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/view/dg/data/VDGAccelerometerData.cpp (.../VDGAccelerometerData.cpp) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/view/dg/data/VDGAccelerometerData.cpp (.../VDGAccelerometerData.cpp) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -17,10 +17,6 @@ // Project #include "GuiController.h" -// disabled coco begin validated: -// FIXME: this model was only for the Diagnostic use, and has been removed, -// Should be removed from the UI Software if not being used anymore - VIEW_DEF(VDGAccelerometer, DGAccelerometerData) void VDGAccelerometer::onActionReceive(const DGAccelerometerData &vData) { @@ -34,5 +30,3 @@ yTilt (vData.mYTilt ); zTilt (vData.mZTilt ); } - -// disabled coco end Index: sources/view/dg/data/VDGAccelerometerData.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/view/dg/data/VDGAccelerometerData.h (.../VDGAccelerometerData.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/view/dg/data/VDGAccelerometerData.h (.../VDGAccelerometerData.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -22,10 +22,6 @@ #include "VView.h" #include "MDGAccelerometerData.h" -// disabled coco begin validated: -// FIXME: this model was only for the Diagnostic use, and has been removed, -// Should be removed from the UI Software if not being used anymore - // namespace namespace View { @@ -52,5 +48,3 @@ VIEW_DEC(VDGAccelerometer, DGAccelerometerData) }; } - -// disabled coco end Index: sources/view/dg/data/post/VDGPOSTData.h =================================================================== diff -u -r9bc48695cdb977a80d3279cacdc101d5164f1b4b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/view/dg/data/post/VDGPOSTData.h (.../VDGPOSTData.h) (revision 9bc48695cdb977a80d3279cacdc101d5164f1b4b) +++ sources/view/dg/data/post/VDGPOSTData.h (.../VDGPOSTData.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -39,12 +39,10 @@ // friends friend class ::tst_views; - // disabled coco begin validated: // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI - // has been manually tested that it works perfectly fine TRIGGER ( bool , adjustment , 0) - // disabled coco end + CONSTANT(quint32 , itemCount , /*GuiDDPOSTStates::DG_POST_STATE_COMPLETED -*/ 1 ) PROPERTY(bool , start , 0) Index: sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h (.../VCommonAdjustmentVitals.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h (.../VCommonAdjustmentVitals.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -40,12 +40,9 @@ int _counter_sec = 0; int _counter_min = 0; - // disabled coco begin validated: // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI - // has been manually tested that it works perfectly fine TRIGGER( bool , adjustment , 0) - // disabled coco end // Vitals data // constant range variables / units / ... Index: sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustDisposablesRemovalConfirm.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustDisposablesRemovalConfirm.h (.../VPostTreatmentAdjustDisposablesRemovalConfirm.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustDisposablesRemovalConfirm.h (.../VPostTreatmentAdjustDisposablesRemovalConfirm.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -37,12 +37,9 @@ // friends friend class ::tst_views; - // disabled coco begin validated: // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI - // has been manually tested that it works perfectly fine TRIGGER( bool , adjustment , 0) - // disabled coco end VIEW_DEC_CLASS_ADJUSTMENT(VPostTreatmentAdjustmentDisposablesRemovalConfirm, AdjustDisposablesRemovalConfirmResponseData) Index: sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.h (.../VPostTreatmentAdjustPatientDisconnectionConfirm.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.h (.../VPostTreatmentAdjustPatientDisconnectionConfirm.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -37,12 +37,9 @@ // friends friend class ::tst_views; - // disabled coco begin validated: // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI - // has been manually tested that it works perfectly fine TRIGGER( bool , adjustment , 0) - // disabled coco end VIEW_DEC_CLASS_ADJUSTMENT(VPostTreatmentAdjustmentPatientDisconnectionConfirm, AdjustPatientDisconnectionConfirmResponseData) Index: sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h (.../VPostTreatmentAdjustTreatmentLog.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h (.../VPostTreatmentAdjustTreatmentLog.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -43,12 +43,9 @@ // friends friend class ::tst_views; - // disabled coco begin validated: // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI - // has been manually tested that it works perfectly fine TRIGGER( bool , adjustment , 0) - // disabled coco end PROPERTY(bool , heparinDispensingRateOff , true) PROPERTY(bool , heparinBolusVolumeOff , true) Index: sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentConsumablesConfirm.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentConsumablesConfirm.h (.../VPreTreatmentAdjustmentConsumablesConfirm.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentConsumablesConfirm.h (.../VPreTreatmentAdjustmentConsumablesConfirm.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -36,12 +36,9 @@ // friends friend class ::tst_views; - // disabled coco begin validated: // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI - // has been manually tested that it works perfectly fine TRIGGER( bool , adjustment , 0) - // disabled coco end VIEW_DEC_CLASS(VPreTreatmentAdjustmentConsumablesConfirm) Index: sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.h (.../VPreTreatmentAdjustmentDisposablesConfirm.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.h (.../VPreTreatmentAdjustmentDisposablesConfirm.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -37,12 +37,9 @@ // friends friend class ::tst_views; - // disabled coco begin validated: // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI - // has been manually tested that it works perfectly fine TRIGGER( bool , adjustment , 0) - // disabled coco end VIEW_DEC_CLASS_ADJUSTMENT(VPreTreatmentAdjustmentDisposablesConfirm, AdjustDisposablesConfirmResponseData) Index: sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesPrime.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesPrime.h (.../VPreTreatmentAdjustmentDisposablesPrime.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesPrime.h (.../VPreTreatmentAdjustmentDisposablesPrime.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -37,12 +37,9 @@ // friends friend class ::tst_views; - // disabled coco begin validated: // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI - // has been manually tested that it works perfectly fine TRIGGER( bool , adjustment , 0) - // disabled coco end VIEW_DEC_CLASS_ADJUSTMENT(VPreTreatmentAdjustmentDisposablesPrime, AdjustDisposablesPrimeResponseData) Index: sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentInitTreatment.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentInitTreatment.h (.../VPreTreatmentAdjustmentInitTreatment.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentInitTreatment.h (.../VPreTreatmentAdjustmentInitTreatment.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -37,12 +37,9 @@ // friends friend class ::tst_views; - // disabled coco begin validated: // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI - // has been manually tested that it works perfectly fine TRIGGER( bool , adjustment , 0) - // disabled coco end VIEW_DEC_CLASS_ADJUSTMENT(VPreTreatmentAdjustmentInitTreatment, AdjustInitTreatmentResponseData) Index: sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionBegin.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionBegin.h (.../VPreTreatmentAdjustmentPatientConnectionBegin.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionBegin.h (.../VPreTreatmentAdjustmentPatientConnectionBegin.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -37,12 +37,9 @@ // friends friend class ::tst_views; - // disabled coco begin validated: // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI - // has been manually tested that it works perfectly fine TRIGGER( bool , adjustment , 0) - // disabled coco end VIEW_DEC_CLASS_ADJUSTMENT(VPreTreatmentAdjustmentPatientConnectionBegin, AdjustPatientConnectionBeginResponseData) Index: sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionConfirm.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionConfirm.h (.../VPreTreatmentAdjustmentPatientConnectionConfirm.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentPatientConnectionConfirm.h (.../VPreTreatmentAdjustmentPatientConnectionConfirm.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -37,12 +37,9 @@ // friends friend class ::tst_views; - // disabled coco begin validated: // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI - // has been manually tested that it works perfectly fine TRIGGER( bool , adjustment , 0) - // disabled coco end VIEW_DEC_CLASS_ADJUSTMENT(VPreTreatmentAdjustmentPatientConnectionConfirm, AdjustPatientConnectionConfirmResponseData) Index: sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.h (.../VPreTreatmentAdjustmentStartTreatment.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.h (.../VPreTreatmentAdjustmentStartTreatment.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -37,12 +37,9 @@ // friends friend class ::tst_views; - // disabled coco begin validated: // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI - // has been manually tested that it works perfectly fine TRIGGER( bool , adjustment , 0) - // disabled coco end VIEW_DEC_CLASS_ADJUSTMENT(VPreTreatmentAdjustmentStartTreatment, AdjustStartTreatmentResponseData) Index: sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentUltrafiltrationInit.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentUltrafiltrationInit.h (.../VPreTreatmentAdjustmentUltrafiltrationInit.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentUltrafiltrationInit.h (.../VPreTreatmentAdjustmentUltrafiltrationInit.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -39,12 +39,9 @@ AdjustUltrafiltrationInitRequestData _data; - // disabled coco begin validated: // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI - // has been manually tested that it works perfectly fine TRIGGER( bool , adjustment , 0) - // disabled coco end // Treatment Ultrafiltration data PROPERTY( float , volume , 0) Index: sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.h (.../VPreTreatmentAdjustmentWaterSample.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/view/hd/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.h (.../VPreTreatmentAdjustmentWaterSample.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -37,12 +37,9 @@ // friends friend class ::tst_views; - // disabled coco begin validated: // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI - // has been manually tested that it works perfectly fine TRIGGER( bool , adjustment , 0) - // disabled coco end VIEW_DEC_CLASS_ADJUSTMENT(VPreTreatmentAdjustmentWaterSample, AdjustWaterSampleResponseData) Index: sources/view/hd/adjustment/treatment/VTreatmentAdjustmentDuration.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/view/hd/adjustment/treatment/VTreatmentAdjustmentDuration.h (.../VTreatmentAdjustmentDuration.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentDuration.h (.../VTreatmentAdjustmentDuration.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -39,12 +39,9 @@ AdjustDurationRequestData _data; - // disabled coco begin validated: // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI - // has been manually tested that it works perfectly fine TRIGGER( bool , adjustment , 0) - // disabled coco end // Treatment Duration data PROPERTY( quint32 , duration , 0) Index: sources/view/hd/adjustment/treatment/VTreatmentAdjustmentEnd.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/view/hd/adjustment/treatment/VTreatmentAdjustmentEnd.h (.../VTreatmentAdjustmentEnd.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentEnd.h (.../VTreatmentAdjustmentEnd.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -39,12 +39,9 @@ AdjustTreatmentEndRequestData _data; - // disabled coco begin validated: // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI - // has been manually tested that it works perfectly fine TRIGGER( bool , adjustment , 0 ) - // disabled coco end VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentEnd, AdjustTreatmentEndResponseData) Index: sources/view/hd/adjustment/treatment/VTreatmentAdjustmentFlows.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/view/hd/adjustment/treatment/VTreatmentAdjustmentFlows.h (.../VTreatmentAdjustmentFlows.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentFlows.h (.../VTreatmentAdjustmentFlows.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -39,12 +39,9 @@ AdjustBloodDialysateRequestData _data; - // disabled coco begin validated: // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI - // has been manually tested that it works perfectly fine TRIGGER( bool , adjustment , 0) - // disabled coco end // Treatment Blood/Dialysate Flow data PROPERTY( quint32 , bloodFlow_FlowSetPoint , 0) Index: sources/view/hd/adjustment/treatment/VTreatmentAdjustmentHeparin.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/view/hd/adjustment/treatment/VTreatmentAdjustmentHeparin.h (.../VTreatmentAdjustmentHeparin.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentHeparin.h (.../VTreatmentAdjustmentHeparin.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -39,12 +39,9 @@ AdjustHeparinRequestData _data; - // disabled coco begin validated: // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI - // has been manually tested that it works perfectly fine TRIGGER( bool , adjustment , 0 ) - // disabled coco end VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentHeparin, AdjustHeparinResponseData) Index: sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRecirculate.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRecirculate.h (.../VTreatmentAdjustmentRecirculate.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRecirculate.h (.../VTreatmentAdjustmentRecirculate.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -39,12 +39,9 @@ AdjustRecirculateRequestData _data; - // disabled coco begin validated: // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI - // has been manually tested that it works perfectly fine TRIGGER( bool , adjustment , 0 ) - // disabled coco end VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentRecirculate, AdjustRecirculateResponseData) Index: sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRinseback.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRinseback.h (.../VTreatmentAdjustmentRinseback.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentRinseback.h (.../VTreatmentAdjustmentRinseback.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -39,12 +39,9 @@ AdjustRinsebackRequestData _data; - // disabled coco begin validated: // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI - // has been manually tested that it works perfectly fine TRIGGER( bool , adjustment , 0 ) - // disabled coco end VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentRinseback, AdjustRinsebackResponseData) Index: sources/view/hd/adjustment/treatment/VTreatmentAdjustmentSaline.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/view/hd/adjustment/treatment/VTreatmentAdjustmentSaline.h (.../VTreatmentAdjustmentSaline.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentSaline.h (.../VTreatmentAdjustmentSaline.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -39,12 +39,9 @@ AdjustSalineRequestData _data; - // disabled coco begin validated: // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI - // has been manually tested that it works perfectly fine TRIGGER( bool , adjustment , 0 ) - // disabled coco end PROPERTY( qint32 , target , 0 ) Index: sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.h (.../VTreatmentAdjustmentUltrafiltrationConfirm.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationConfirm.h (.../VTreatmentAdjustmentUltrafiltrationConfirm.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -39,21 +39,14 @@ AdjustUltrafiltrationConfirmRequestData _data; - // disabled coco begin validated: // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI - // has been manually tested that it works perfectly fine TRIGGER( bool , adjustment , 0) - // disabled coco end // Treatment Ultrafiltration data PROPERTY( float , volume , 0) - // disabled coco begin validated: Manually validated - // Duration is not used since will be passed each second by TreatmentTime message PROPERTY( quint32 , duration , 0) - // Rate has not been decided to be used anywhere yet. PROPERTY( float , rate , 0) - // disabled coco end VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentUltrafiltrationConfirm, AdjustUltrafiltrationConfirmResponseData) Index: sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationEdit.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationEdit.h (.../VTreatmentAdjustmentUltrafiltrationEdit.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationEdit.h (.../VTreatmentAdjustmentUltrafiltrationEdit.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -39,12 +39,9 @@ AdjustUltrafiltrationEditRequestData _data; - // disabled coco begin validated: // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI - // has been manually tested that it works perfectly fine TRIGGER( bool , adjustment , 0) - // disabled coco end // Treatment Ultrafiltration data PROPERTY( float , volume , 0) Index: sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationState.cpp =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationState.cpp (.../VTreatmentAdjustmentUltrafiltrationState.cpp) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationState.cpp (.../VTreatmentAdjustmentUltrafiltrationState.cpp) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -29,8 +29,6 @@ adjustment_Accepted ( vData.mAccepted ); adjustment_Reason ( vData.mReason ); - state ( vData.mUFState ); - // *** 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. *** // *** use this trigger to make sure you have all the properties with updated values *** Index: sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationState.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationState.h (.../VTreatmentAdjustmentUltrafiltrationState.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/view/hd/adjustment/treatment/VTreatmentAdjustmentUltrafiltrationState.h (.../VTreatmentAdjustmentUltrafiltrationState.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -39,21 +39,10 @@ AdjustUltrafiltrationStateRequestData _data; - // disabled coco begin validated: // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI - // has been manually tested that it works perfectly fine TRIGGER( bool , adjustment , 0) - // disabled coco end - // disabled coco begin validated: Manually tested - // This property should not be used in QML since it need exposed enum - // exposed enum usage in QML is not suggested since QML will not error out on any issue - // kept for consistency and debugging use cases - // Look at the VHDTreatmentStates ultrafiltration properties - PROPERTY( qint32 , state , 0) - // disabled coco end - VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentUltrafiltrationState, AdjustUltrafiltrationStateResponseData) // ---------- Pause Ultrafiltration Index: sources/view/hd/alarm/VAlarmActiveList.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/view/hd/alarm/VAlarmActiveList.h (.../VAlarmActiveList.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/view/hd/alarm/VAlarmActiveList.h (.../VAlarmActiveList.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -41,12 +41,9 @@ QMap _alarmTitles; - // disabled coco begin validated: // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI - // has been manually tested that it works perfectly fine TRIGGER( bool , adjustment , 0) - // disabled coco end PROPERTY( quint32, a0ID , 0 ) PROPERTY( quint32, a1ID , 0 ) Index: sources/view/hd/alarm/VAlarmStatus.cpp =================================================================== diff -u -r2bef7b8a25a76a4597aa833955c57fd1c4884de7 -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision 2bef7b8a25a76a4597aa833955c57fd1c4884de7) +++ sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -25,9 +25,6 @@ ACTION_VIEW_CONNECTION(SettingsData ); ADJUST_VIEW_CONNECTION(AlarmSilenceRequestData ); ADJUST_VIEW_CONNECTION(AlarmUserActionRequestData ); - /* // disabled coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now. - ADJUST_VIEW_CONNECTION(AlarmClearedConditionRequestData ); - // disabled coco end */ } /*! @@ -86,36 +83,17 @@ } /*! - * \brief VAlarmStatus::doClearCondition - * \details Send out a request to notify alarm condition is cleared - * \note this is an example of how to do the clear condition - * later it may require to have a parameter or it needs to be different slots - * currently there is no use case for this - */ -void View::VAlarmStatus::doClearCondition() -{ - // disabled coco begin validated: Manually tested. This model class is a placeholder for the message 63(0x3F00) and there is no use case for this now. - AlarmClearedConditionRequestData data; - data.alarmID = GuiAlarmID::ALARM_ID_TD_COMM_TIMEOUT; - emit didAdjustment(data); -} -// disabled coco end - -/*! * \brief VAlarmStatus::onActionReceive * \details the message received handler * \param vData - Data of the received message */ void VAlarmStatus::onActionReceive(const AlarmStatusData &vData) { GuiAlarmID alarmID = static_cast(vData.mTop); - // disabled coco begin validated: the gDisableTimeout has meant to only being used for debugging purposes. - // has been manually tested during debugging which works fine as expected. if (alarmID == GuiAlarmID::ALARM_ID_TD_COMM_TIMEOUT && gDisableTimeout) { LOG_DEBUG(tr("Suppressing HD communication timeout.")); return; } - // disabled coco end //// ------ HIDE THE DIALOG - if has NO the alarm ------ // DENBUG-182: Phantom Alarm Screen Appears After Clearing Last Alarm Index: sources/view/hd/alarm/VAlarmStatus.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/view/hd/alarm/VAlarmStatus.h (.../VAlarmStatus.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/view/hd/alarm/VAlarmStatus.h (.../VAlarmStatus.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -63,7 +63,6 @@ // ********** DYNAMIC PROPERTIES: The properties which need to be updated by each alarm message received. ********** // READONLY( bool , hasAlarm , false) - // disabled coco begin validated: Has been validated manually PROPERTY( quint32 , alarm_Priority , 0) PROPERTY( quint32 , alarm_AlarmID , 0) PROPERTY( quint32 , alarm_EscalateIn , 0) @@ -82,7 +81,6 @@ // 3 reserved flags are here... // PROPERTY( bool , alarm_Flag_noMinimize , false) PROPERTY( bool , alarm_Flag_alarmsCondition , false) - // disabled coco end // ********** STATIC PROPERTIES: The properties which need to be updated by each alarm message received. ********** // Q_PROPERTY(QString title READ title NOTIFY alarm_AlarmIDChanged ) @@ -97,7 +95,6 @@ ADJUST_TRANSMT_SIGNAL ( AlarmSilenceRequestData ) ADJUST_TRANSMT_SIGNAL ( AlarmUserActionRequestData ) - ADJUST_TRANSMT_SIGNAL ( AlarmClearedConditionRequestData ) private: QString title (); @@ -117,6 +114,5 @@ void doUserActionEnd (); void doUserActionOk (); void doSilence (); - void doClearCondition (); }; } Index: sources/view/hd/data/VHDAccelerometerData.cpp =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/view/hd/data/VHDAccelerometerData.cpp (.../VHDAccelerometerData.cpp) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/view/hd/data/VHDAccelerometerData.cpp (.../VHDAccelerometerData.cpp) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -17,10 +17,6 @@ // Project #include "GuiController.h" -// disabled coco begin validated: -// FIXME: this model was only for the Diagnostic use, and has been removed, -// Should be removed from the UI Software if not being used anymore - VIEW_DEF(VHDAccelerometer, HDAccelerometerData) void VHDAccelerometer::onActionReceive(const HDAccelerometerData &vData) { @@ -34,4 +30,3 @@ yTilt (vData.mYTilt ); zTilt (vData.mZTilt ); } -// disabled coco end Index: sources/view/hd/data/VHDAccelerometerData.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/view/hd/data/VHDAccelerometerData.h (.../VHDAccelerometerData.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/view/hd/data/VHDAccelerometerData.h (.../VHDAccelerometerData.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -22,10 +22,6 @@ #include "VView.h" #include "MHDAccelerometerData.h" -// disabled coco begin validated: -// FIXME: this model was only for the Diagnostic use, and has been removed, -// Should be removed from the UI Software if not being used anymore - // namespace namespace View { @@ -52,5 +48,3 @@ VIEW_DEC(VHDAccelerometer, HDAccelerometerData) }; } - -// disabled coco end Index: sources/view/hd/data/post/VHDPOSTData.h =================================================================== diff -u -r9bc48695cdb977a80d3279cacdc101d5164f1b4b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/view/hd/data/post/VHDPOSTData.h (.../VHDPOSTData.h) (revision 9bc48695cdb977a80d3279cacdc101d5164f1b4b) +++ sources/view/hd/data/post/VHDPOSTData.h (.../VHDPOSTData.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -39,12 +39,9 @@ // friends friend class ::tst_views; - // disabled coco begin validated: // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI - // has been manually tested that it works perfectly fine TRIGGER ( bool , adjustment , 0) - // disabled coco end // the last "test" item is the item just before the complete state. // UI doesn't care about the the complete or fail state in Single post messages, Index: sources/view/hd/data/treatment/VHDTreatmentStatesData.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/view/hd/data/treatment/VHDTreatmentStatesData.h (.../VHDTreatmentStatesData.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/view/hd/data/treatment/VHDTreatmentStatesData.h (.../VHDTreatmentStatesData.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -39,14 +39,11 @@ { Q_OBJECT - // disabled coco begin validated: Manually tested // This property should not be used in QML since it need exposed enum // exposed enum usage in QML is not suggested since QML will not error out on any issue - // kept for consistency and debugging use cases PROPERTY( quint32, subMode , 0) PROPERTY( quint32, ufState , 0) PROPERTY( quint32, salineState , 0) - // disabled coco end // these groups of properties are mutually exclusive // and if one becomes true the other ones become false at the same time @@ -59,7 +56,6 @@ // ---- Treatment states // ---- Treatment states - Basics - // disabled coco begin validated: Manually tested // not used yet since the Treatment Start/stop/end has not been implemented yet. PROPERTY( bool , txStart , false) ///< TREATMENT_START_STATE = 0 # Start treatment - initialize treatment and go to blood prime state PROPERTY( bool , txBloodPrime , false) ///< TREATMENT_BLOOD_PRIME_STATE = 1 # Prime blood-side of dialyzer with gradual ramp for 1 min. while dialyzer is bypassed. No dialysis or UF taking place. No treatment time. @@ -69,7 +65,6 @@ PROPERTY( bool , txRinseback , false) ///< TREATMENT_RINSEBACK_STATE = 4 # Perform rinseback with saline. Dialyzer bypassed. Dialysate recirculating PROPERTY( bool , txRecirculate , false) ///< TREATMENT_RECIRC_STATE = 5 # Recirculate saline and dialysate while patient disconnected. Blood lines open and shunted. Dialyzer is bypassed PROPERTY( bool , txEnd , false) ///< TREATMENT_END_STATE = 6 # Dialysis has ended. Blood pump slowed. Dialyzer is bypassed. Dialysate is recirculated. User can rinseback - // disabled coco end // ---- Ultrafiltration states PROPERTY( bool , ufPaused , false) ///< UF_PAUSED_STATE = 1 # Paused state of the ultrafiltration state machine Index: sources/view/hd/data/treatment/VTreatmentUltrafiltration.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/view/hd/data/treatment/VTreatmentUltrafiltration.h (.../VTreatmentUltrafiltration.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/view/hd/data/treatment/VTreatmentUltrafiltration.h (.../VTreatmentUltrafiltration.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -36,9 +36,7 @@ { Q_OBJECT - // disabled coco begin validated : Manually validated PROPERTY( float, minimum , 0.000 ) // no message to update this value and is 0 for now. - // disabled coco end PROPERTY( float, maximum , 0.600 ) PROPERTY( float, ultrafiltration_RefUFVol , 0) Index: sources/view/settings/VAdjustmentAlarmVolume.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/view/settings/VAdjustmentAlarmVolume.h (.../VAdjustmentAlarmVolume.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/view/settings/VAdjustmentAlarmVolume.h (.../VAdjustmentAlarmVolume.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -40,12 +40,9 @@ AdjustHDAlarmVolumeRequestData _data; - // disabled coco begin validated: // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI - // has been manually tested that it works perfectly fine TRIGGER( bool , adjustment , 0) - // disabled coco end // HD AlarmVolume data PROPERTY( quint8 , hdAlarmVolume , 5) //TODO Needs to get maxVolume from MAdjustHDAlarmVolumeReq Index: sources/view/settings/VAdjustmentInstitutionalRecord.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/view/settings/VAdjustmentInstitutionalRecord.h (.../VAdjustmentInstitutionalRecord.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/view/settings/VAdjustmentInstitutionalRecord.h (.../VAdjustmentInstitutionalRecord.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -72,12 +72,9 @@ - // disabled coco begin validated: // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI - // has been manually tested that it works perfectly fine TRIGGER( bool , adjustment , 0) - // disabled coco end PROPERTY(quint32 , minBloodFlowMLPM , 0 ) PROPERTY(quint32 , maxBloodFlowMLPM , 0 ) Index: sources/view/settings/VAdjustmentServiceDates.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/view/settings/VAdjustmentServiceDates.h (.../VAdjustmentServiceDates.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/view/settings/VAdjustmentServiceDates.h (.../VAdjustmentServiceDates.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -40,13 +40,10 @@ const QString _serviceDateFormat = "yyyy/MM/dd"; - // disabled coco begin validated: // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI - // has been manually tested that it works perfectly fine TRIGGER( bool , adjustmentHD , 0) TRIGGER( bool , adjustmentDG , 0) - // disabled coco end // Service seconds PROPERTY( quint8 , hdLastServiceEpoch, 0) Index: sources/view/settings/VAdjustmentServiceMode.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/view/settings/VAdjustmentServiceMode.h (.../VAdjustmentServiceMode.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/view/settings/VAdjustmentServiceMode.h (.../VAdjustmentServiceMode.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -37,12 +37,9 @@ friend class ::tst_views; - // disabled coco begin validated: // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI - // has been manually tested that it works perfectly fine TRIGGER( bool , adjustment , 0) - // disabled coco end VIEW_DEC_CLASS_ADJUSTMENT(VAdjustmentServiceMode, AdjustServiceModeResponseData) Index: sources/view/settings/VAdjustmentVersions.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/view/settings/VAdjustmentVersions.h (.../VAdjustmentVersions.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/view/settings/VAdjustmentVersions.h (.../VAdjustmentVersions.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -47,13 +47,10 @@ const QString _dgVerDeviceFormat = "%1.%2.%3.%4.%5"; const QString _dgVerFPGAFormat = "%1.%2.%3.%4"; - // disabled coco begin validated: // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI - // has been manually tested that it works perfectly fine TRIGGER( bool , adjustmentHD , 0) TRIGGER( bool , adjustmentDG , 0) - // disabled coco end // HD Versions data PROPERTY( quint8 , hdVerMajor , 0) Index: sources/view/settings/VDateTime.cpp =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/view/settings/VDateTime.cpp (.../VDateTime.cpp) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/view/settings/VDateTime.cpp (.../VDateTime.cpp) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -240,9 +240,9 @@ */ void VDateTime::greeting(quint16 vMilitaryTime) { - if ( eMorningMin /* 05:00 AM */ <= vMilitaryTime && vMilitaryTime < eMorningMax /* 12:00 PM */ ) { greeting(tr("Good Morning" )); return; } - if ( eAfternoonMin /* 12:00 PM */ <= vMilitaryTime && vMilitaryTime < eAfternoonMax /* 18:00 PM */ ) { greeting(tr("Good Afternoon")); return; } - /* 18:00 PM */ /* 05:00 AM */ greeting(tr("Good Evening" )); + if ( eMorningMin /* 05:00 AM */ <= vMilitaryTime && vMilitaryTime < eMorningMax /* 12:00 PM */ ) { greeting(tr("Good Morning!" )); return; } + if ( eAfternoonMin /* 12:00 PM */ <= vMilitaryTime && vMilitaryTime < eAfternoonMax /* 18:00 PM */ ) { greeting(tr("Good Afternoon!")); return; } + /* 18:00 PM */ /* 05:00 AM */ greeting(tr("Good Evening!" )); } /*! Index: sources/view/settings/VHDUsageInfo.h =================================================================== diff -u -rccba568494c6b7214116f818a0ac89d0fa3ba81b -r11560b63360025c294edabc6f5f6da97ad1f20c3 --- sources/view/settings/VHDUsageInfo.h (.../VHDUsageInfo.h) (revision ccba568494c6b7214116f818a0ac89d0fa3ba81b) +++ sources/view/settings/VHDUsageInfo.h (.../VHDUsageInfo.h) (revision 11560b63360025c294edabc6f5f6da97ad1f20c3) @@ -39,12 +39,9 @@ HDUsageInfoRequestData _data; - // disabled coco begin validated: // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI - // has been manually tested that it works perfectly fine TRIGGER( bool , adjustment , 0) - // disabled coco end //HD Usage Information PROPERTY(QString , totalTxHours , "")