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

QmlProfiler: Refactor complete() methods

Browse Source 
The complete() methods do something more specific. We should call them
by what they do. Also, we don't need to signal the finishing of data
acquisition via a signal and most of the postprocessing can happen in
the worker thread.

Change-Id: Iae986aefb8e7e7d4327c481d7a85325bbff7fa48
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
This commit is contained in:
Ulf Hermann
2015-09-10 17:11:21 +02:00
parent 44750d047e
commit fdbed834fa
6 changed files with 31 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -293,30 +293,19 @@ void QmlProfilerModelManager::addQmlEvent(QmlDebug::Message message,
ndata1, ndata2, ndata3, ndata4, ndata5);
}
void QmlProfilerModelManager::complete()
void QmlProfilerModelManager::acquiringDone()
{
switch (state()) {
case ProcessingData:
// Load notes after the timeline models have been initialized.
d->notesModel->loadData();
setState(Done);
emit loadFinished();
break;
case AcquiringData:
// Make sure the trace fits into the time span.
d->traceTime->increaseEndTime(d->model->lastTimeMark());
setState(ProcessingData);
d->model->complete();
break;
case Empty:
setState(Done);
break;
case Done:
break;
default:
emit error(tr("Unexpected complete signal in data model."));
break;
}
QTC_ASSERT(state() == AcquiringData, /**/);
setState(ProcessingData);
d->model->processData();
}
void QmlProfilerModelManager::processingDone()
{
QTC_ASSERT(state() == ProcessingData, /**/);
d->notesModel->loadData();
setState(Done);
emit loadFinished();
}
void QmlProfilerModelManager::save(const QString &filename)
@@ -369,10 +358,8 @@ void QmlProfilerModelManager::load(const QString &filename)
setRecordedFeatures(reader.loadedFeatures());
file->close();
file->deleteLater();
// The completion step uses the old progress display widget for now. We need to do this in
// the main thread as it creates widgets.
QMetaObject::invokeMethod(this, "complete", Qt::QueuedConnection);
d->traceTime->increaseEndTime(d->model->lastTimeMark());
acquiringDone();
});
Core::ProgressManager::addTask(result, tr("Loading Trace Data"), Constants::TASK_LOAD);