feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlProfiler: Centralize trace/window/range times

Browse Source 
Avoid keeping multiple, potentially diverging copies of the same time
information and make sure all the times are consistent with each other.

Stating the times as properties allows us to use bindings in more
places, too.

Change-Id: I9cdd4f561ac22ad795939594ba340b1fbc070e9a
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
This commit is contained in:
Ulf Hermann
2014-10-14 16:44:45 +02:00
committed by Ulf Hermann
parent ec118e04a3
commit 70102410df
25 changed files with 457 additions and 428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/qmlprofiler/qml/TimeDisplay.qml
View File

@@ -36,16 +36,9 @@ Canvas {
objectName: "TimeDisplay"
contextType: "2d"
property real startTime : 0
property real endTime : 0
Connections {
target: zoomControl
onRangeChanged: {
startTime = zoomControl.startTime();
endTime = zoomControl.endTime();
requestPaint();
}
onRangeChanged: requestPaint();
}
onPaint: {
@@ -55,7 +48,7 @@ Canvas {
context.fillStyle = "white";
context.fillRect(0, 0, width, height);
var totalTime = Math.max(1, endTime - startTime);
var totalTime = Math.max(1, zoomControl.rangeDuration);
var spacing = width / totalTime;
var initialBlockLength = 120;
@@ -64,8 +57,8 @@ Canvas {
var pixelsPerSection = pixelsPerBlock / 5;
var blockCount = width / pixelsPerBlock;
var realStartTime = Math.floor(startTime/timePerBlock) * timePerBlock;
var startPos = (startTime - realStartTime) * spacing;
var realStartTime = Math.floor(zoomControl.rangeStart / timePerBlock) * timePerBlock;
var startPos = (zoomControl.rangeStart - realStartTime) * spacing;
var timePerPixel = timePerBlock/pixelsPerBlock;
@@ -98,7 +91,6 @@ Canvas {
function clear()
{
startTime = endTime = 0;
requestPaint();
}
@@ -106,16 +98,15 @@ Canvas {
{
var round = 1;
var barrier = 1;
var range = endTime - startTime;
var units = ["μs", "ms", "s"];
for (var i = 0; i < units.length; ++i) {
barrier *= 1000;
if (range < barrier)
if (zoomControl.rangeDuration < barrier)
round *= 1000;
else if (range < barrier * 10)
else if (zoomControl.rangeDuration < barrier * 10)
round *= 100;
else if (range < barrier * 100)
else if (zoomControl.rangeDuration < barrier * 100)
round *= 10;
if (t < barrier * 1000)
return Math.floor(t / (barrier / round)) / round + units[i];