forked from qt-creator/qt-creator
Tracing: Add some civilization to TimeMarks.qml
Use concrete types and annotate JavaScript methods. Change-Id: If636741181d0ae28605f3f37b46d9011130f5988 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
@@ -29,7 +29,7 @@ import QtCreator.Tracing
|
|||||||
Item {
|
Item {
|
||||||
id: timeMarks
|
id: timeMarks
|
||||||
visible: model && (mockup || (!model.hidden && !model.empty))
|
visible: model && (mockup || (!model.hidden && !model.empty))
|
||||||
property QtObject model
|
property TimelineModel model
|
||||||
property bool startOdd
|
property bool startOdd
|
||||||
property bool mockup
|
property bool mockup
|
||||||
|
|
||||||
@@ -40,7 +40,7 @@ Item {
|
|||||||
|
|
||||||
property int rowCount: model ? model.rowCount : 0
|
property int rowCount: model ? model.rowCount : 0
|
||||||
|
|
||||||
function roundTo3Digits(number) {
|
function roundTo3Digits(number: real) : real {
|
||||||
var factor;
|
var factor;
|
||||||
|
|
||||||
if (number < 10)
|
if (number < 10)
|
||||||
@@ -53,7 +53,7 @@ Item {
|
|||||||
return Math.round(number * factor) / factor;
|
return Math.round(number * factor) / factor;
|
||||||
}
|
}
|
||||||
|
|
||||||
function prettyPrintScale(amount) {
|
function prettyPrintScale(amount: real) : string {
|
||||||
var sign;
|
var sign;
|
||||||
if (amount < 0) {
|
if (amount < 0) {
|
||||||
sign = "-";
|
sign = "-";
|
||||||
@@ -69,9 +69,9 @@ Item {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Connections {
|
Connections {
|
||||||
target: model
|
target: timeMarks.model
|
||||||
function onExpandedRowHeightChanged(row, height) {
|
function onExpandedRowHeightChanged(row: real, height: real) {
|
||||||
if (model && model.expanded && row >= 0)
|
if (timeMarks.model && timeMarks.model.expanded && row >= 0)
|
||||||
rowRepeater.itemAt(row).height = height;
|
rowRepeater.itemAt(row).height = height;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -86,17 +86,20 @@ Item {
|
|||||||
model: timeMarks.rowCount
|
model: timeMarks.rowCount
|
||||||
Rectangle {
|
Rectangle {
|
||||||
id: scaleItem
|
id: scaleItem
|
||||||
color: ((index + (startOdd ? 1 : 0)) % 2)
|
required property int index
|
||||||
|
property TimeMarks scope: timeMarks
|
||||||
|
|
||||||
|
color: ((index + (scope.startOdd ? 1 : 0)) % 2)
|
||||||
? Theme.color(Theme.Timeline_BackgroundColor1)
|
? Theme.color(Theme.Timeline_BackgroundColor1)
|
||||||
: Theme.color(Theme.Timeline_BackgroundColor2)
|
: Theme.color(Theme.Timeline_BackgroundColor2)
|
||||||
anchors.left: scaleArea.left
|
anchors.left: scaleArea.left
|
||||||
anchors.right: scaleArea.right
|
anchors.right: scaleArea.right
|
||||||
height: timeMarks.model ? timeMarks.model.rowHeight(index) : 0
|
height: scope.model ? scope.model.rowHeight(index) : 0
|
||||||
|
|
||||||
property double minVal: timeMarks.model ? timeMarks.model.rowMinValue(index) : 0
|
property double minVal: scope.model ? scope.model.rowMinValue(index) : 0
|
||||||
property double maxVal: timeMarks.model ? timeMarks.model.rowMaxValue(index) : 0
|
property double maxVal: scope.model ? scope.model.rowMaxValue(index) : 0
|
||||||
property double valDiff: maxVal - minVal
|
property double valDiff: maxVal - minVal
|
||||||
property bool scaleVisible: timeMarks.model && timeMarks.model.expanded &&
|
property bool scaleVisible: scope.model && scope.model.expanded &&
|
||||||
height > scaleMinHeight && valDiff > 0
|
height > scaleMinHeight && valDiff > 0
|
||||||
|
|
||||||
property double stepVal: {
|
property double stepVal: {
|
||||||
|
Reference in New Issue
Block a user