Index: sources/gui/qml/pages/treatment/sections/TreatmentTime.qml =================================================================== diff -u -r4a6abe765f03feae8100ec660aa04aa218d4dfa3 -r3afad151e41be500dd32045b7ddce9e10c19dc96 --- sources/gui/qml/pages/treatment/sections/TreatmentTime.qml (.../TreatmentTime.qml) (revision 4a6abe765f03feae8100ec660aa04aa218d4dfa3) +++ sources/gui/qml/pages/treatment/sections/TreatmentTime.qml (.../TreatmentTime.qml) (revision 3afad151e41be500dd32045b7ddce9e10c19dc96) @@ -14,11 +14,9 @@ // Qt import QtQuick 2.12 -import QtQuick.Controls 2.12 -import QtQuick.Shapes 1.12 // Project -import Gui.Actions 0.1; +import VTreatmentTime 0.1; // Qml imports import "qrc:/globals" @@ -27,7 +25,8 @@ /*! * \brief Treatment Screen Treatment Time Remaining section */ -Rectangle { id: _treatmentTime +Rectangle { id: _root + objectName: "TreatmentTime" property int minimum : 0 property int maximum : vTreatmentTime.time_Total property int progressValue : vTreatmentTime.time_Elapsed @@ -40,17 +39,19 @@ height: _circle.height color: "transparent" + VTreatmentTime { id: vTreatmentTime } + ProgressCircle { id: _circle - minimum: _treatmentTime.minimum - maximum: _treatmentTime.maximum + minimum: _root.minimum + maximum: _root.maximum anchors.centerIn : parent - value: _treatmentTime.progressValue + value: _root.progressValue } TimeText { id: _timeText anchors.centerIn : parent - seconds : _treatmentTime.timeTextValue + seconds : _root.timeTextValue } Rectangle { id: _timeTitleRect @@ -82,7 +83,7 @@ MouseArea { id: _mouseArea anchors.fill: parent onClicked: { - _treatmentTime.clicked() + _root.clicked() } } }