From d71dfa97bfba9ba42f8d0caae0c32fedd2fe1e8a Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Wed, 8 Apr 2015 19:05:30 +0200 Subject: [PATCH] Timeline: Remove useless dataAvailable() signals The only thing they did was trigger some QML code that set the zoom to 10% of the available range. 10% is somewhat arbitrary, so we shouldn't have it in the general purpose timeline. Also, we don't really have to pass the signal through several connections just to do that in QML. The clearChildren() didn't have any effect there as dataAvailable() should only happen if the view is already cleared. Change-Id: I1813ed37a82fc3fd5c3b7fc02b2afb1dcbcadcfb Reviewed-by: Joerg Bornemann --- src/libs/timeline/qml/MainView.qml | 10 ---------- src/libs/timeline/timelinemodelaggregator.h | 1 - src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp | 1 - src/plugins/qmlprofiler/qmlprofilermodelmanager.h | 1 - src/plugins/qmlprofiler/qmlprofilertraceview.cpp | 7 ++++--- 5 files changed, 4 insertions(+), 16 deletions(-) diff --git a/src/libs/timeline/qml/MainView.qml b/src/libs/timeline/qml/MainView.qml index 93f132067a8..03bc367cdd5 100644 --- a/src/libs/timeline/qml/MainView.qml +++ b/src/libs/timeline/qml/MainView.qml @@ -79,16 +79,6 @@ Rectangle { } } - - Connections { - target: timelineModelAggregator - onDataAvailable: { - content.clearChildren(); - zoomControl.setRange(zoomControl.traceStart, - zoomControl.traceStart + zoomControl.traceDuration / 10); - } - } - onSelectionRangeModeChanged: { selectionRange.reset(); buttonsBar.updateRangeButton(selectionRangeMode); diff --git a/src/libs/timeline/timelinemodelaggregator.h b/src/libs/timeline/timelinemodelaggregator.h index 325c694cb82..eb50282cb49 100644 --- a/src/libs/timeline/timelinemodelaggregator.h +++ b/src/libs/timeline/timelinemodelaggregator.h @@ -63,7 +63,6 @@ public: Q_INVOKABLE QVariantMap prevItem(int selectedModel, int selectedItem, qint64 time) const; signals: - void dataAvailable(); void stateChanged(); void modelsChanged(); void heightChanged(); diff --git a/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp b/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp index f9262036536..91473e7dbb0 100644 --- a/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp +++ b/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp @@ -337,7 +337,6 @@ void QmlProfilerModelManager::complete() // Load notes after the timeline models have been initialized. d->notesModel->loadData(); setState(QmlProfilerDataState::Done); - emit dataAvailable(); break; case QmlProfilerDataState::AcquiringData: // Make sure the trace fits into the time span. diff --git a/src/plugins/qmlprofiler/qmlprofilermodelmanager.h b/src/plugins/qmlprofiler/qmlprofilermodelmanager.h index 3729df5b73e..a90e7b98bf1 100644 --- a/src/plugins/qmlprofiler/qmlprofilermodelmanager.h +++ b/src/plugins/qmlprofiler/qmlprofilermodelmanager.h @@ -136,7 +136,6 @@ signals: void error(const QString &error); void stateChanged(); void progressChanged(); - void dataAvailable(); void loadFinished(); void saveFinished(); diff --git a/src/plugins/qmlprofiler/qmlprofilertraceview.cpp b/src/plugins/qmlprofiler/qmlprofilertraceview.cpp index b0f61861f71..aced3bc5383 100644 --- a/src/plugins/qmlprofiler/qmlprofilertraceview.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertraceview.cpp @@ -98,7 +98,10 @@ QmlProfilerTraceView::QmlProfilerTraceView(QWidget *parent, QmlProfilerTool *pro d->m_zoomControl = new Timeline::TimelineZoomControl(this); connect(modelManager->traceTime(), &QmlProfilerTraceTime::timeChanged, - d->m_zoomControl, &Timeline::TimelineZoomControl::setTrace); + [this](qint64 start, qint64 end) { + d->m_zoomControl->setTrace(start, end); + d->m_zoomControl->setRange(start, start + (end - start) / 10); + }); QVBoxLayout *groupLayout = new QVBoxLayout; groupLayout->setContentsMargins(0, 0, 0, 0); @@ -130,8 +133,6 @@ QmlProfilerTraceView::QmlProfilerTraceView(QWidget *parent, QmlProfilerTool *pro d->m_modelProxy = new Timeline::TimelineModelAggregator(modelManager->notesModel(), this); d->m_modelManager = modelManager; - connect(modelManager,SIGNAL(dataAvailable()), d->m_modelProxy,SIGNAL(dataAvailable())); - // external models pushed on top foreach (QmlProfilerTimelineModel *timelineModel, QmlProfilerPlugin::instance->getModels(modelManager)) {