Index: sources/gui/qml/pages/pretreatment/PreTreatmentBase.qml =================================================================== diff -u -r8457901952a1d732c4688da471ae98e1d4f3024f -r4a2b83dcb56555861d2c741a8e8894e5b07e24bf --- sources/gui/qml/pages/pretreatment/PreTreatmentBase.qml (.../PreTreatmentBase.qml) (revision 8457901952a1d732c4688da471ae98e1d4f3024f) +++ sources/gui/qml/pages/pretreatment/PreTreatmentBase.qml (.../PreTreatmentBase.qml) (revision 4a2b83dcb56555861d2c741a8e8894e5b07e24bf) @@ -31,11 +31,44 @@ onVisibleChanged: if ( visible ) { _root.updateModel() } + /// --------TODO REMOVE -- DEMO testing progression --------------------------//// + // TODO remove -- testing progress ////////////////////////// + property int testCount : checkListStepNames.length + property int increment : timeCircleMaximum / checkListStepNames.length + property int step : 1 + + function resetTest() { + timeCircleProgressValue = 0 + step = 1 + checkList.setItemExt(0, true) + _progressTimer.start() + } + + function incrementTest() { + if (timeCircleProgressValue >= timeCircleMaximum ) { return } + timeCircleProgressValue = step * increment + + // fix setItemExt methods in checklist later.. i do not understand 😵‍💫 + checkList.setItemExt(step, true) + checkList.stepDone(step - 1) + step++ + } + + Timer { id: _progressTimer + interval : 1000 + running : ! isComplete + repeat : ! isComplete + onTriggered: incrementTest() + } + /// --------END REMOVE -----------------------------------------------------//// + + // update model for instruction based steps function updateModel () { let stepName = stepNames[stackStepIndex] if ( stepName === undefined ) stepName = "" - let group = vSettings.advancedMode ? vSettings.groupFormat.arg(stepName).arg("Advanced") : stepName + let group = vSettings.advancedMode ? vSettings.groupFormat.arg(stepName).arg("Advanced") : + _root.subStepName.length === 0 ? stepName : vSettings.groupFormat.arg(stepName).arg(_root.subStepName) let instructionsGroup = vSettings.instructions[group] if ( instructionsGroup !== undefined ) {