Index: sources/gui/qml/main.qml =================================================================== diff -u -rcd7de5f6d239a11615ba8c6c03339a10996486ca -r3676cd80ff97ac0785547e29e63f54b95b53f9f8 --- sources/gui/qml/main.qml (.../main.qml) (revision cd7de5f6d239a11615ba8c6c03339a10996486ca) +++ sources/gui/qml/main.qml (.../main.qml) (revision 3676cd80ff97ac0785547e29e63f54b95b53f9f8) @@ -64,7 +64,6 @@ import VTreatmentBloodFlow 0.1; import VTreatmentDialysateFlow 0.1; import VTreatmentUltrafiltration 0.1; -import VTreatmentTime 0.1; import VAlarmStatus 0.1; import VPowerOff 0.1; @@ -104,7 +103,6 @@ VTreatmentBloodFlow { id: vTreatmentBloodFlow } VTreatmentDialysateFlow { id: vTreatmentDialysateFlow } VTreatmentUltrafiltration { id: vTreatmentUltrafiltration } - VTreatmentTime { id: vTreatmentTime } VAlarmStatus { id: vAlarmStatus } VPowerOff { id: vPowerOff onPoweroff_statusChanged: { Index: sources/gui/qml/pages/treatment/sections/TreatmentPressure.qml =================================================================== diff -u -rfe9182d85a7e707c5a476331e03ed493371f7f7f -r3676cd80ff97ac0785547e29e63f54b95b53f9f8 --- sources/gui/qml/pages/treatment/sections/TreatmentPressure.qml (.../TreatmentPressure.qml) (revision fe9182d85a7e707c5a476331e03ed493371f7f7f) +++ sources/gui/qml/pages/treatment/sections/TreatmentPressure.qml (.../TreatmentPressure.qml) (revision 3676cd80ff97ac0785547e29e63f54b95b53f9f8) @@ -16,7 +16,7 @@ import QtQuick 2.12 // Project -import VTreatmentPressureOcclusion 0.1; +import VTreatmentPressureOcclusion 0.1; // Qml imports import "qrc:/globals" Index: sources/gui/qml/pages/treatment/sections/TreatmentTime.qml =================================================================== diff -u -rcd7de5f6d239a11615ba8c6c03339a10996486ca -r3676cd80ff97ac0785547e29e63f54b95b53f9f8 --- sources/gui/qml/pages/treatment/sections/TreatmentTime.qml (.../TreatmentTime.qml) (revision cd7de5f6d239a11615ba8c6c03339a10996486ca) +++ sources/gui/qml/pages/treatment/sections/TreatmentTime.qml (.../TreatmentTime.qml) (revision 3676cd80ff97ac0785547e29e63f54b95b53f9f8) @@ -16,6 +16,7 @@ import QtQuick 2.12 // Project +import VTreatmentTime 0.1; // Qml imports import "qrc:/globals" @@ -37,6 +38,8 @@ height: _circle.height color: "transparent" + VTreatmentTime { id: vTreatmentTime } + ProgressCircle { id: _circle minimum: _treatmentTime.minimum maximum: _treatmentTime.maximum Index: sources/view/vview.h =================================================================== diff -u -rfe9182d85a7e707c5a476331e03ed493371f7f7f -r3676cd80ff97ac0785547e29e63f54b95b53f9f8 --- sources/view/vview.h (.../vview.h) (revision fe9182d85a7e707c5a476331e03ed493371f7f7f) +++ sources/view/vview.h (.../vview.h) (revision 3676cd80ff97ac0785547e29e63f54b95b53f9f8) @@ -46,14 +46,13 @@ //--------------------------------------------------------------------------------// // The child definition in cpp #define VIEW_DEF(vCLASS, vDATATYPE) \ -using namespace Gui ; \ using namespace View; \ vCLASS::vCLASS(QObject *parent) : QObject(parent) { \ initConnections(); \ } \ void vCLASS::initConnections() { \ ACTION_RECEIVE_BRIDGE_CONNECTION( \ - _GuiController, vDATATYPE); \ + Gui::_GuiController, vDATATYPE); \ } //--------------------------------------------------------------------------------// //--------- Please add the view type to the lists below to register them ---------//