Timeline: Use some better number types

The scale parameters are converted to single precision float anyway as
soon as we do something with them. We might as well change all the
methods to be single precision, too.

The min/max row values should really be 64bit as 32bit values are not
enough to express memory usage.

Change-Id: I2b058b112286eabb1c077f7e746c48b6b99cb416
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Ulf Hermann
2018-01-11 13:31:58 +01:00
parent a4c318d5e1
commit 77e28efad6
23 changed files with 33 additions and 32 deletions

View File

@@ -39,7 +39,7 @@ MemoryUsageModel::MemoryUsageModel(QmlProfilerModelManager *manager, QObject *pa
announceFeatures(Constants::QML_JS_RANGE_FEATURES ^ (1 << ProfileCompiling));
}
int MemoryUsageModel::rowMaxValue(int rowNumber) const
qint64 MemoryUsageModel::rowMaxValue(int rowNumber) const
{
Q_UNUSED(rowNumber);
return m_maxSize;

View File

@@ -53,7 +53,7 @@ public:
MemoryUsageModel(QmlProfilerModelManager *manager, QObject *parent = 0);
int rowMaxValue(int rowNumber) const override;
qint64 rowMaxValue(int rowNumber) const override;
int expandedRow(int index) const override;
int collapsedRow(int index) const override;

View File

@@ -38,7 +38,7 @@ PixmapCacheModel::PixmapCacheModel(QmlProfilerModelManager *manager, QObject *pa
{
}
int PixmapCacheModel::rowMaxValue(int rowNumber) const
qint64 PixmapCacheModel::rowMaxValue(int rowNumber) const
{
if (rowNumber == 1) {
return m_maxCacheSize;

View File

@@ -96,7 +96,7 @@ public:
PixmapCacheModel(QmlProfilerModelManager *manager, QObject *parent = 0);
int rowMaxValue(int rowNumber) const override;
qint64 rowMaxValue(int rowNumber) const override;
int expandedRow(int index) const override;
int collapsedRow(int index) const override;

View File

@@ -109,7 +109,7 @@ int QmlProfilerAnimationsModel::rowFromThreadId(int threadId) const
return (threadId == GuiThread || m_maxGuiThreadAnimations == 0) ? 1 : 2;
}
int QmlProfilerAnimationsModel::rowMaxValue(int rowNumber) const
qint64 QmlProfilerAnimationsModel::rowMaxValue(int rowNumber) const
{
switch (rowNumber) {
case 1:

View File

@@ -51,7 +51,7 @@ public:
QmlProfilerAnimationsModel(QmlProfilerModelManager *manager, QObject *parent = 0);
int rowMaxValue(int rowNumber) const override;
qint64 rowMaxValue(int rowNumber) const override;
int typeId(int index) const override;
Q_INVOKABLE int expandedRow(int index) const override;

View File

@@ -158,7 +158,7 @@ void updateNodes(const QmlProfilerRangeModel *model, int from, int to,
Timeline::TimelineRenderPass::State *QmlProfilerBindingLoopsRenderPass::update(
const Timeline::TimelineAbstractRenderer *renderer,
const Timeline::TimelineRenderState *parentState, State *oldState,
int indexFrom, int indexTo, bool stateChanged, qreal spacing) const
int indexFrom, int indexTo, bool stateChanged, float spacing) const
{
Q_UNUSED(stateChanged);
Q_UNUSED(spacing);
@@ -244,7 +244,7 @@ void BindlingLoopsGeometry::allocate(QSGMaterial *material)
void BindlingLoopsGeometry::addExpandedEvent(float itemCenter)
{
float verticalCenter = Timeline::TimelineModel::defaultRowHeight() / 2.0;
float verticalCenter = Timeline::TimelineModel::defaultRowHeight() / 2.0f;
Point2DWithOffset *v = vertexData() + usedVertices;
v[0].set(itemCenter, verticalCenter, -1.0f, currentY);
v[1].set(itemCenter, verticalCenter, +1.0f, currentY);

View File

@@ -43,7 +43,7 @@ public:
State *update(const Timeline::TimelineAbstractRenderer *renderer,
const Timeline::TimelineRenderState *parentState,
State *oldState, int indexFrom, int indexTo, bool stateChanged,
qreal spacing) const;
float spacing) const;
protected:
QmlProfilerBindingLoopsRenderPass();
};