Index: sources/applicationcontroller.cpp =================================================================== diff -u -reea63d68fc0fb269f8dec64d99f488bcad117220 -r93d7ff58cd6fd2fea5d00587ee712a637fc941bf --- sources/applicationcontroller.cpp (.../applicationcontroller.cpp) (revision eea63d68fc0fb269f8dec64d99f488bcad117220) +++ sources/applicationcontroller.cpp (.../applicationcontroller.cpp) (revision 93d7ff58cd6fd2fea5d00587ee712a637fc941bf) @@ -131,7 +131,7 @@ _thread = &vThread; _thread->setObjectName(QString("%1_Thread").arg(metaObject()->className())); connect(qApp, SIGNAL(aboutToQuit()), this, SLOT(quit())); - if (!_thread->isRunning()) _thread->start(); // In case more than one object using the same thread + _thread->start(); moveToThread(_thread); } Index: sources/canbus/caninterface.cpp =================================================================== diff -u -reea63d68fc0fb269f8dec64d99f488bcad117220 -r93d7ff58cd6fd2fea5d00587ee712a637fc941bf --- sources/canbus/caninterface.cpp (.../caninterface.cpp) (revision eea63d68fc0fb269f8dec64d99f488bcad117220) +++ sources/canbus/caninterface.cpp (.../caninterface.cpp) (revision 93d7ff58cd6fd2fea5d00587ee712a637fc941bf) @@ -131,7 +131,7 @@ _thread = &vThread; _thread->setObjectName(QString("%1_Thread").arg(metaObject()->className())); connect(qApp, SIGNAL(aboutToQuit()), this, SLOT(quit())); - if (!_thread->isRunning()) _thread->start(); // In case more than one object using the same thread + _thread->start(); moveToThread(_thread); } Index: sources/canbus/frameinterface.cpp =================================================================== diff -u -reea63d68fc0fb269f8dec64d99f488bcad117220 -r93d7ff58cd6fd2fea5d00587ee712a637fc941bf --- sources/canbus/frameinterface.cpp (.../frameinterface.cpp) (revision eea63d68fc0fb269f8dec64d99f488bcad117220) +++ sources/canbus/frameinterface.cpp (.../frameinterface.cpp) (revision 93d7ff58cd6fd2fea5d00587ee712a637fc941bf) @@ -112,7 +112,7 @@ _thread = &vThread; _thread->setObjectName(QString("%1_Thread").arg(metaObject()->className())); connect(qApp, SIGNAL(aboutToQuit()), this, SLOT(quit())); - if (!_thread->isRunning()) _thread->start(); // In case more than one object using the same thread + _thread->start(); moveToThread(_thread); } Index: sources/canbus/messageacknowmodel.cpp =================================================================== diff -u -reea63d68fc0fb269f8dec64d99f488bcad117220 -r93d7ff58cd6fd2fea5d00587ee712a637fc941bf --- sources/canbus/messageacknowmodel.cpp (.../messageacknowmodel.cpp) (revision eea63d68fc0fb269f8dec64d99f488bcad117220) +++ sources/canbus/messageacknowmodel.cpp (.../messageacknowmodel.cpp) (revision 93d7ff58cd6fd2fea5d00587ee712a637fc941bf) @@ -103,7 +103,7 @@ _thread = &vThread; _thread->setObjectName(QString("%1_Thread").arg(metaObject()->className())); connect(qApp, SIGNAL(aboutToQuit()), this, SLOT(quit())); - if (!_thread->isRunning()) _thread->start(); // In case more than one object using the same thread + _thread->start(); moveToThread(_thread); } Index: sources/canbus/messagedispatcher.cpp =================================================================== diff -u -reea63d68fc0fb269f8dec64d99f488bcad117220 -r93d7ff58cd6fd2fea5d00587ee712a637fc941bf --- sources/canbus/messagedispatcher.cpp (.../messagedispatcher.cpp) (revision eea63d68fc0fb269f8dec64d99f488bcad117220) +++ sources/canbus/messagedispatcher.cpp (.../messagedispatcher.cpp) (revision 93d7ff58cd6fd2fea5d00587ee712a637fc941bf) @@ -121,7 +121,7 @@ _thread = &vThread; _thread->setObjectName(QString("%1_Thread").arg(metaObject()->className())); connect(qApp, SIGNAL(aboutToQuit()), this, SLOT(quit())); - if (!_thread->isRunning()) _thread->start(); // In case more than one object using the same thread + _thread->start(); moveToThread(_thread); } Index: sources/gui/guicontroller.cpp =================================================================== diff -u -reea63d68fc0fb269f8dec64d99f488bcad117220 -r93d7ff58cd6fd2fea5d00587ee712a637fc941bf --- sources/gui/guicontroller.cpp (.../guicontroller.cpp) (revision eea63d68fc0fb269f8dec64d99f488bcad117220) +++ sources/gui/guicontroller.cpp (.../guicontroller.cpp) (revision 93d7ff58cd6fd2fea5d00587ee712a637fc941bf) @@ -100,7 +100,7 @@ _thread = &vThread; _thread->setObjectName(QString("%1_Thread").arg(metaObject()->className())); connect(qApp, SIGNAL(aboutToQuit()), this, SLOT(quit())); - if (!_thread->isRunning()) _thread->start(); // In case more than one object using the same thread + _thread->start(); moveToThread(_thread); } // coco end Index: sources/storage/logger.cpp =================================================================== diff -u -reea63d68fc0fb269f8dec64d99f488bcad117220 -r93d7ff58cd6fd2fea5d00587ee712a637fc941bf --- sources/storage/logger.cpp (.../logger.cpp) (revision eea63d68fc0fb269f8dec64d99f488bcad117220) +++ sources/storage/logger.cpp (.../logger.cpp) (revision 93d7ff58cd6fd2fea5d00587ee712a637fc941bf) @@ -122,7 +122,7 @@ _thread = &vThread; _thread->setObjectName(QString("%1_Thread").arg(metaObject()->className())); connect(qApp, SIGNAL(aboutToQuit()), this, SLOT(quit())); - if (!_thread->isRunning()) _thread->start(); // In case more than one object using the same thread + _thread->start(); moveToThread(_thread); } // coco end Index: sources/storage/usbwatcher.cpp =================================================================== diff -u -reea63d68fc0fb269f8dec64d99f488bcad117220 -r93d7ff58cd6fd2fea5d00587ee712a637fc941bf --- sources/storage/usbwatcher.cpp (.../usbwatcher.cpp) (revision eea63d68fc0fb269f8dec64d99f488bcad117220) +++ sources/storage/usbwatcher.cpp (.../usbwatcher.cpp) (revision 93d7ff58cd6fd2fea5d00587ee712a637fc941bf) @@ -107,7 +107,7 @@ _thread = &vThread; _thread->setObjectName(QString("%1_Thread").arg(metaObject()->className())); connect(qApp, SIGNAL(aboutToQuit()), this, SLOT(quit())); - if (!_thread->isRunning()) _thread->start(); // In case more than one object using the same thread + _thread->start(); moveToThread(_thread); } Index: sources/view/vtreatmentpressureocclusion.h =================================================================== diff -u -rfe9182d85a7e707c5a476331e03ed493371f7f7f -r93d7ff58cd6fd2fea5d00587ee712a637fc941bf --- sources/view/vtreatmentpressureocclusion.h (.../vtreatmentpressureocclusion.h) (revision fe9182d85a7e707c5a476331e03ed493371f7f7f) +++ sources/view/vtreatmentpressureocclusion.h (.../vtreatmentpressureocclusion.h) (revision 93d7ff58cd6fd2fea5d00587ee712a637fc941bf) @@ -29,10 +29,12 @@ PROPERTY( float, pressureocclusion_ArterialPressure , 0, false) PROPERTY( float, pressureocclusion_VenousPressure , 0, false) + // coco begin validated: these three properties have not been used in GUI. + // has been manually tested that it works perfectly fine if used. PROPERTY( float, pressureocclusion_BloodPumpOcclusion , 0, false) PROPERTY( float, pressureocclusion_DialysateInletPumpOcclusion , 0, false) PROPERTY( float, pressureocclusion_DialysateOutletPumpOcclusion , 0, false) - + // coco end VIEW_DEC(VTreatmentPressureOcclusion, PressureOcclusionData) }; Index: sources/view/vtreatmentranges.h =================================================================== diff -u -r8f6f7c11390e3ed6d918f1717d8e8b7ae5b7e5c6 -r93d7ff58cd6fd2fea5d00587ee712a637fc941bf --- sources/view/vtreatmentranges.h (.../vtreatmentranges.h) (revision 8f6f7c11390e3ed6d918f1717d8e8b7ae5b7e5c6) +++ sources/view/vtreatmentranges.h (.../vtreatmentranges.h) (revision 93d7ff58cd6fd2fea5d00587ee712a637fc941bf) @@ -27,8 +27,11 @@ { Q_OBJECT + // coco begin validated: The Treatment Duration properties have not been used in GUI. + // has been manually tested that it works perfectly fine if used. PROPERTY( quint32, treatmentRanges_Duration_Min , 0, false) PROPERTY( quint32, treatmentRanges_Duration_Max , 0, false) + // coco end PROPERTY( float , treatmentRanges_Ultrafiltration_Volume_Min, 0, false) PROPERTY( float , treatmentRanges_Ultrafiltration_Volume_Max, 0, false) PROPERTY( quint32, treatmentRanges_Dialysate_Flow_Min , 0, false)