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

QmlProfiler: Use bindings instead of JS methods for RangeMover

Browse Source 
It's more intuitive to use and more QML-like.

Change-Id: Ifbd05df59d8afaeb62acc9a6f1f3d4786f822169
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
This commit is contained in:
Ulf Hermann
2014-07-08 14:46:17 +02:00
parent 57fe9b7b5e
commit b0a3b2950a
4 changed files with 35 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/plugins/qmlprofiler/qml/Overview.qml
View File

@@ -61,8 +61,8 @@ Canvas {
function updateRange() {
if (recursionGuard)
return;
var newStartTime = Math.round(rangeMover.getLeft() * qmlProfilerModelProxy.traceDuration() / width) + qmlProfilerModelProxy.traceStartTime();
var newEndTime = Math.round(rangeMover.getRight() * qmlProfilerModelProxy.traceDuration() / width) + qmlProfilerModelProxy.traceStartTime();
var newStartTime = Math.round(rangeMover.rangeLeft * qmlProfilerModelProxy.traceDuration() / width) + qmlProfilerModelProxy.traceStartTime();
var newEndTime = Math.round(rangeMover.rangeRight * qmlProfilerModelProxy.traceDuration() / width) + qmlProfilerModelProxy.traceStartTime();
if (startTime !== newStartTime || endTime !== newEndTime)
zoomControl.setRange(newStartTime, Math.max(newEndTime, newStartTime + 500));
}
@@ -81,13 +81,13 @@ Canvas {
endTime = clamp(zoomControl.endTime(), startTime, qmlProfilerModelProxy.traceEndTime());
var newRangeX = (startTime - qmlProfilerModelProxy.traceStartTime()) * width / qmlProfilerModelProxy.traceDuration();
var newWidth = (endTime - startTime) * width / qmlProfilerModelProxy.traceDuration();
var widthChanged = Math.abs(newWidth - rangeMover.getWidth()) > 1;
var leftChanged = Math.abs(newRangeX - rangeMover.getLeft()) > 1;
var widthChanged = Math.abs(newWidth - rangeMover.rangeWidth) > 1;
var leftChanged = Math.abs(newRangeX - rangeMover.rangeLeft) > 1;
if (leftChanged)
rangeMover.setLeft(newRangeX);
rangeMover.rangeLeft = newRangeX;
if (leftChanged || widthChanged)
rangeMover.setRight(newRangeX + newWidth);
rangeMover.rangeRight = newRangeX + newWidth;
recursionGuard = false;
}
}
@@ -137,19 +137,18 @@ Canvas {
MouseArea {
anchors.fill: canvas
function jumpTo(posX) {
var rangeWidth = rangeMover.getWidth();
var newX = posX - rangeWidth / 2;
var newX = posX - rangeMover.rangeWidth / 2;
if (newX < 0)
newX = 0;
if (newX + rangeWidth > canvas.width)
newX = canvas.width - rangeWidth;
if (newX + rangeMover.rangeWidth > canvas.width)
newX = canvas.width - rangeMover.rangeWidth;
if (newX < rangeMover.getLeft()) {
rangeMover.setLeft(newX);
rangeMover.setRight(newX + rangeWidth);
} else if (newX > rangeMover.getLeft()) {
rangeMover.setRight(newX + rangeWidth);
rangeMover.setLeft(newX);
if (newX < rangeMover.rangeLeft) {
rangeMover.rangeLeft = newX;
rangeMover.rangeRight = newX + rangeMover.rangeWidth;
} else if (newX > rangeMover.rangeLeft) {
rangeMover.rangeRight = newX + rangeMover.rangeWidth;
rangeMover.rangeLeft = newX;
}
}
@@ -164,7 +163,8 @@ Canvas {
RangeMover {
id: rangeMover
visible: dataReady
onRangeChanged: canvas.updateRange()
onRangeLeftChanged: canvas.updateRange()
onRangeRightChanged: canvas.updateRange()
}
Rectangle {