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

QmlProfiler: Reset the zoom control only when we're finished loading

Browse Source 
Drop the timeChanged signal of QmlProfilerTraceTime, too, as that
doesn't serve a purpose anymore. We don't want intermittent changes
of the trace time to be reflected in the UI when loading.

Change-Id: I85f18b90fc404ec254c68625104d3e3f9077a1d9
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
This commit is contained in:
Ulf Hermann
2016-04-28 15:43:00 +02:00
parent 21caa59292
commit 71e8c3ffd7
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp
View File

@@ -93,7 +93,6 @@ void QmlProfilerTraceTime::setTime(qint64 startTime, qint64 endTime)
if (startTime != m_startTime || endTime != m_endTime) { if (startTime != m_startTime || endTime != m_endTime) {
m_startTime = startTime; m_startTime = startTime;
m_endTime = endTime; m_endTime = endTime;
emit timeChanged(startTime, endTime);
} }
} }
@@ -105,7 +104,6 @@ void QmlProfilerTraceTime::decreaseStartTime(qint64 time)
m_endTime = m_startTime; m_endTime = m_startTime;
else else
QTC_ASSERT(m_endTime >= m_startTime, m_endTime = m_startTime); QTC_ASSERT(m_endTime >= m_startTime, m_endTime = m_startTime);
emit timeChanged(time, m_endTime);
} }
} }
@@ -117,7 +115,6 @@ void QmlProfilerTraceTime::increaseEndTime(qint64 time)
m_startTime = m_endTime; m_startTime = m_endTime;
else else
QTC_ASSERT(m_endTime >= m_startTime, m_startTime = m_endTime); QTC_ASSERT(m_endTime >= m_startTime, m_startTime = m_endTime);
emit timeChanged(m_startTime, time);
} }
} }

3
src/plugins/qmlprofiler/qmlprofilermodelmanager.h
View File

@@ -51,9 +51,6 @@ public:
qint64 endTime() const; qint64 endTime() const;
qint64 duration() const; qint64 duration() const;
signals:
void timeChanged(qint64,qint64);
public slots: public slots:
void clear(); void clear();

13
src/plugins/qmlprofiler/qmlprofilertraceview.cpp
View File

@@ -90,10 +90,15 @@ QmlProfilerTraceView::QmlProfilerTraceView(QWidget *parent, QmlProfilerViewManag
setObjectName(QLatin1String("QML Profiler")); setObjectName(QLatin1String("QML Profiler"));
d->m_zoomControl = new Timeline::TimelineZoomControl(this); d->m_zoomControl = new Timeline::TimelineZoomControl(this);
connect(modelManager->traceTime(), &QmlProfilerTraceTime::timeChanged, connect(modelManager, &QmlProfilerModelManager::stateChanged, this, [modelManager, this]() {
this, [this](qint64 start, qint64 end) { if (modelManager->state() == QmlProfilerModelManager::Done) {
d->m_zoomControl->setTrace(start, end); qint64 start = modelManager->traceTime()->startTime();
d->m_zoomControl->setRange(start, start + (end - start) / 10); qint64 end = modelManager->traceTime()->endTime();
d->m_zoomControl->setTrace(start, end);
d->m_zoomControl->setRange(start, start + (end - start) / 10);
} else if (modelManager->state() == QmlProfilerModelManager::ClearingData) {
d->m_zoomControl->clear();
}
}); });
QVBoxLayout *groupLayout = new QVBoxLayout; QVBoxLayout *groupLayout = new QVBoxLayout;