Skip to content
Snippets Groups Projects
Commit 72f6ca3e authored by andrey.daragan's avatar andrey.daragan
Browse files

Merge branch 'features-2989' into 'develop'

Features 2989

See merge request !40
parents bba9a5c3 e6c67a10
No related branches found
No related tags found
1 merge request!40Features 2989
......@@ -58,17 +58,11 @@ DapBusyIndicatorForm
interval: busyIndicatorDelay * (index)
onTriggered:
{
console.log("reset triggered, index: ", index)
parent.opacity = 1
parent.color = busyIndicatorDarkColor
parent.scale = busyPointMaxScale
reset2.start()
}
onRunningChanged:
{
if(running) console.log("reset start, index: ", index)
else console.log("reset stop, index: ", index)
}
}
//Timer of point transformation at one position
Timer
......@@ -77,16 +71,10 @@ DapBusyIndicatorForm
interval: busyIndicatorDelay
onTriggered:
{
console.log("reset2 triggered, index: ", index)
parent.opacity = 1
parent.color = busyIndicatorLightColor
parent.scale = busyPointMinScale
}
onRunningChanged:
{
if(running) console.log("reset2 start, index: ", index)
else console.log("reset2 stop, index: ", index)
}
}
//Timer of all busy indicator transformation
Timer
......@@ -95,7 +83,6 @@ DapBusyIndicatorForm
interval: busyIndicatorDelay * busyPointNum
onTriggered:
{
console.log("globalTimer triggered, index: ", index)
reset.start()
}
triggeredOnStart: true
......@@ -118,13 +105,5 @@ DapBusyIndicatorForm
}
}
}
onRunningChanged:
{
if(running)
{
console.log("running all")
}
else console.log("stop all")
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment