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

QmlProfiler: zoom in and out controls

Browse Source 
Change-Id: I920aae3075269e4f2fd1be15e9ca3cc4e08ac7a7
Reviewed-on: http://codereview.qt.nokia.com/826
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
This commit is contained in:
Christiaan Janssen
2011-06-27 18:25:50 +02:00
parent 949ffeb1b4
commit faaf318634
7 changed files with 102 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/plugins/qmlprofiler/qml/MainView.qml
View File

@@ -81,9 +81,9 @@ Rectangle {
var startTime = Plotter.ranges[0].start;
if (rangeMover.value + startTime> event.start) {
rangeMover.x = Math.max(0,
Math.floor((event.start - startTime) / xs - canvas.canvasWindow.x - rangeMover.width/2) );
} else if (rangeMover.value + startTime + rangeMover.width * xs < event.start + event.duration) {
rangeMover.x = Math.floor((event.start + event.duration - startTime) / xs - canvas.canvasWindow.x - rangeMover.width/2);
Math.floor((event.start - startTime) / xs - canvas.canvasWindow.x - rangeMover.zoomWidth/2) );
} else if (rangeMover.value + startTime + rangeMover.zoomWidth * xs < event.start + event.duration) {
rangeMover.x = Math.floor((event.start + event.duration - startTime) / xs - canvas.canvasWindow.x - rangeMover.zoomWidth/2);
}
}
}
@@ -104,6 +104,30 @@ Rectangle {
}
}
function zoomIn() {
// 10%
var newZoom = rangeMover.zoomWidth / 1.1;
// 0.1 ms minimum zoom
if (newZoom * Plotter.xScale(canvas) > 100000) {
hideRangeDetails();
rangeMover.zoomWidth = newZoom
rangeMover.updateZoomControls();
}
}
function zoomOut() {
hideRangeDetails();
// 10%
var newZoom = rangeMover.zoomWidth * 1.1;
if (newZoom > canvas.width)
newZoom = canvas.width;
if (newZoom + rangeMover.x > canvas.width)
rangeMover.x = canvas.width - newZoom;
rangeMover.zoomWidth = newZoom;
rangeMover.updateZoomControls();
}
//handle debug data coming from C++
Connections {
target: connection
@@ -173,7 +197,7 @@ Rectangle {
anchors.left: flick.left
anchors.right: flick.right
startTime: rangeMover.x * Plotter.xScale(canvas);
endTime: (rangeMover.x + rangeMover.width) * Plotter.xScale(canvas);
endTime: (rangeMover.x + rangeMover.zoomWidth) * Plotter.xScale(canvas);
}
function hideRangeDetails() {
@@ -227,13 +251,7 @@ Rectangle {
flick.contentX = startX
}
startTime: rangeMover.value
property real prevXStep: -1
property real possibleEndTime: startTime + (rangeMover.width*Plotter.xScale(canvas))
onPossibleEndTimeChanged: {
prevXStep = canvas.canvasWindow.x;
endTime = possibleEndTime
}
endTime: startTime + (rangeMover.zoomWidth*Plotter.xScale(canvas))
onEndTimeChanged: updateTimeline()
delegate: Rectangle {
@@ -413,7 +431,7 @@ Rectangle {
MouseArea {
anchors.fill: canvas
//### ideally we could press to position then immediately drag
onPressed: rangeMover.x = mouse.x - rangeMover.width/2
onPressed: rangeMover.x = mouse.x - rangeMover.zoomWidth/2
}
RangeMover {