diff options
Diffstat (limited to 'src/plugins/qmlprofiler/qmlprofilertraceview.cpp')
| -rw-r--r-- | src/plugins/qmlprofiler/qmlprofilertraceview.cpp | 146 |
1 files changed, 74 insertions, 72 deletions
diff --git a/src/plugins/qmlprofiler/qmlprofilertraceview.cpp b/src/plugins/qmlprofiler/qmlprofilertraceview.cpp index 44e9bde444..5fbad1247a 100644 --- a/src/plugins/qmlprofiler/qmlprofilertraceview.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertraceview.cpp @@ -132,7 +132,7 @@ public: QmlProfilerTraceView::QmlProfilerTraceView(QWidget *parent, Analyzer::IAnalyzerTool *profilerTool, QmlProfilerViewManager *container, QmlProfilerDataModel *model, QmlProfilerStateManager *profilerState) : QWidget(parent), d(new QmlProfilerTraceViewPrivate(this)) { - setObjectName("QML Profiler"); + setObjectName(QLatin1String("QML Profiler")); d->m_zoomControl = new ZoomControl(this); connect(d->m_zoomControl, SIGNAL(rangeChanged()), this, SLOT(updateRange())); @@ -183,9 +183,9 @@ QmlProfilerTraceView::QmlProfilerTraceView(QWidget *parent, Analyzer::IAnalyzerT d->m_profilerDataModel = model; connect(d->m_profilerDataModel, SIGNAL(stateChanged()), this, SLOT(profilerDataModelStateChanged())); - d->m_mainView->rootContext()->setContextProperty("qmlProfilerDataModel", + d->m_mainView->rootContext()->setContextProperty(QLatin1String("qmlProfilerDataModel"), d->m_profilerDataModel); - d->m_overview->rootContext()->setContextProperty("qmlProfilerDataModel", + d->m_overview->rootContext()->setContextProperty(QLatin1String("qmlProfilerDataModel"), d->m_profilerDataModel); d->m_profilerState = profilerState; @@ -210,25 +210,26 @@ QmlProfilerTraceView::~QmlProfilerTraceView() // Initialize widgets void QmlProfilerTraceView::reset() { - d->m_mainView->rootContext()->setContextProperty("zoomControl", d->m_zoomControl); - d->m_timebar->rootContext()->setContextProperty("zoomControl", d->m_zoomControl); - d->m_overview->rootContext()->setContextProperty("zoomControl", d->m_zoomControl); + d->m_mainView->rootContext()->setContextProperty(QLatin1String("zoomControl"), d->m_zoomControl); + d->m_timebar->rootContext()->setContextProperty(QLatin1String("zoomControl"), d->m_zoomControl); + d->m_overview->rootContext()->setContextProperty(QLatin1String("zoomControl"), d->m_zoomControl); - d->m_timebar->setSource(QUrl("qrc:/qmlprofiler/TimeDisplay.qml")); - d->m_overview->setSource(QUrl("qrc:/qmlprofiler/Overview.qml")); + d->m_timebar->setSource(QUrl(QLatin1String("qrc:/qmlprofiler/TimeDisplay.qml"))); + d->m_overview->setSource(QUrl(QLatin1String("qrc:/qmlprofiler/Overview.qml"))); - d->m_mainView->setSource(QUrl("qrc:/qmlprofiler/MainView.qml")); - d->m_mainView->rootObject()->setProperty("width", QVariant(width())); - d->m_mainView->rootObject()->setProperty("candidateHeight", QVariant(height() - d->m_timebar->height() - d->m_overview->height())); + d->m_mainView->setSource(QUrl(QLatin1String("qrc:/qmlprofiler/MainView.qml"))); + QGraphicsObject *rootObject = d->m_mainView->rootObject(); + rootObject->setProperty("width", QVariant(width())); + rootObject->setProperty("candidateHeight", QVariant(height() - d->m_timebar->height() - d->m_overview->height())); - connect(d->m_mainView->rootObject(), SIGNAL(updateCursorPosition()), this, SLOT(updateCursorPosition())); - connect(d->m_mainView->rootObject(), SIGNAL(updateRangeButton()), this, SLOT(updateRangeButton())); - connect(d->m_mainView->rootObject(), SIGNAL(updateLockButton()), this, SLOT(updateLockButton())); - connect(this, SIGNAL(jumpToPrev()), d->m_mainView->rootObject(), SLOT(prevEvent())); - connect(this, SIGNAL(jumpToNext()), d->m_mainView->rootObject(), SLOT(nextEvent())); - connect(d->m_mainView->rootObject(), SIGNAL(selectedEventChanged(int)), this, SIGNAL(selectedEventChanged(int))); - connect(d->m_mainView->rootObject(), SIGNAL(changeToolTip(QString)), this, SLOT(updateToolTip(QString))); - connect(d->m_mainView->rootObject(), SIGNAL(updateVerticalScroll(int)), this, SLOT(updateVerticalScroll(int))); + connect(rootObject, SIGNAL(updateCursorPosition()), this, SLOT(updateCursorPosition())); + connect(rootObject, SIGNAL(updateRangeButton()), this, SLOT(updateRangeButton())); + connect(rootObject, SIGNAL(updateLockButton()), this, SLOT(updateLockButton())); + connect(this, SIGNAL(jumpToPrev()), rootObject, SLOT(prevEvent())); + connect(this, SIGNAL(jumpToNext()), rootObject, SLOT(nextEvent())); + connect(rootObject, SIGNAL(selectedEventChanged(int)), this, SIGNAL(selectedEventChanged(int))); + connect(rootObject, SIGNAL(changeToolTip(QString)), this, SLOT(updateToolTip(QString))); + connect(rootObject, SIGNAL(updateVerticalScroll(int)), this, SLOT(updateVerticalScroll(int))); } QWidget *QmlProfilerTraceView::createToolbar() @@ -244,19 +245,19 @@ QWidget *QmlProfilerTraceView::createToolbar() toolBarLayout->setSpacing(0); QToolButton *buttonPrev= new QToolButton; - buttonPrev->setIcon(QIcon(":/qmlprofiler/ico_prev.png")); + buttonPrev->setIcon(QIcon(QLatin1String(":/qmlprofiler/ico_prev.png"))); buttonPrev->setToolTip(tr("Jump to previous event")); connect(buttonPrev, SIGNAL(clicked()), this, SIGNAL(jumpToPrev())); connect(this, SIGNAL(enableToolbar(bool)), buttonPrev, SLOT(setEnabled(bool))); QToolButton *buttonNext= new QToolButton; - buttonNext->setIcon(QIcon(":/qmlprofiler/ico_next.png")); + buttonNext->setIcon(QIcon(QLatin1String(":/qmlprofiler/ico_next.png"))); buttonNext->setToolTip(tr("Jump to next event")); connect(buttonNext, SIGNAL(clicked()), this, SIGNAL(jumpToNext())); connect(this, SIGNAL(enableToolbar(bool)), buttonNext, SLOT(setEnabled(bool))); QToolButton *buttonZoomControls = new QToolButton; - buttonZoomControls->setIcon(QIcon(":/qmlprofiler/ico_zoom.png")); + buttonZoomControls->setIcon(QIcon(QLatin1String(":/qmlprofiler/ico_zoom.png"))); buttonZoomControls->setToolTip(tr("Show zoom slider")); buttonZoomControls->setCheckable(true); buttonZoomControls->setChecked(false); @@ -264,7 +265,7 @@ QWidget *QmlProfilerTraceView::createToolbar() connect(this, SIGNAL(enableToolbar(bool)), buttonZoomControls, SLOT(setEnabled(bool))); d->m_buttonRange = new QToolButton; - d->m_buttonRange->setIcon(QIcon(":/qmlprofiler/ico_rangeselection.png")); + d->m_buttonRange->setIcon(QIcon(QLatin1String(":/qmlprofiler/ico_rangeselection.png"))); d->m_buttonRange->setToolTip(tr("Select range")); d->m_buttonRange->setCheckable(true); d->m_buttonRange->setChecked(false); @@ -273,7 +274,7 @@ QWidget *QmlProfilerTraceView::createToolbar() connect(this, SIGNAL(rangeModeChanged(bool)), d->m_buttonRange, SLOT(setChecked(bool))); d->m_buttonLock = new QToolButton; - d->m_buttonLock->setIcon(QIcon(":/qmlprofiler/ico_selectionmode.png")); + d->m_buttonLock->setIcon(QIcon(QLatin1String(":/qmlprofiler/ico_selectionmode.png"))); d->m_buttonLock->setToolTip(tr("View event information on mouseover")); d->m_buttonLock->setCheckable(true); d->m_buttonLock->setChecked(false); @@ -313,7 +314,7 @@ QWidget *QmlProfilerTraceView::createZoomToolbar() connect(this, SIGNAL(enableToolbar(bool)), zoomSlider, SLOT(setEnabled(bool))); connect(zoomSlider, SIGNAL(valueChanged(int)), this, SLOT(setZoomLevel(int))); connect(this, SIGNAL(zoomLevelChanged(int)), zoomSlider, SLOT(setValue(int))); - zoomSlider->setStyleSheet("\ + zoomSlider->setStyleSheet(QLatin1String("\ QSlider:horizontal {\ background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #444444, stop: 1 #5a5a5a);\ border: 1px #313131;\ @@ -328,7 +329,7 @@ QWidget *QmlProfilerTraceView::createZoomToolbar() background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #5a5a5a, stop: 1 #444444);\ border: 1px #313131;\ }\ - "); + ")); toolBarLayout->addWidget(zoomSlider); @@ -338,25 +339,25 @@ QWidget *QmlProfilerTraceView::createZoomToolbar() ///////////////////////////////////////////////////////// bool QmlProfilerTraceView::hasValidSelection() const { - if (d->m_mainView->rootObject()) { - return d->m_mainView->rootObject()->property("selectionRangeReady").toBool(); - } + QGraphicsObject *rootObject = d->m_mainView->rootObject(); + if (rootObject) + return rootObject->property("selectionRangeReady").toBool(); return false; } qint64 QmlProfilerTraceView::selectionStart() const { - if (d->m_mainView->rootObject()) { - return d->m_mainView->rootObject()->property("selectionRangeStart").toLongLong(); - } + QGraphicsObject *rootObject = d->m_mainView->rootObject(); + if (rootObject) + return rootObject->property("selectionRangeStart").toLongLong(); return 0; } qint64 QmlProfilerTraceView::selectionEnd() const { - if (d->m_mainView->rootObject()) { - return d->m_mainView->rootObject()->property("selectionRangeEnd").toLongLong(); - } + QGraphicsObject *rootObject = d->m_mainView->rootObject(); + if (rootObject) + return rootObject->property("selectionRangeEnd").toLongLong(); return 0; } @@ -373,8 +374,9 @@ void QmlProfilerTraceView::clearDisplay() void QmlProfilerTraceView::selectNextEventWithId(int eventId) { - if (d->m_mainView->rootObject()) - QMetaObject::invokeMethod(d->m_mainView->rootObject(), "selectNextWithId", + QGraphicsObject *rootObject = d->m_mainView->rootObject(); + if (rootObject) + QMetaObject::invokeMethod(rootObject, "selectNextWithId", Q_ARG(QVariant,QVariant(eventId))); } @@ -382,22 +384,24 @@ void QmlProfilerTraceView::selectNextEventWithId(int eventId) // Goto source location void QmlProfilerTraceView::updateCursorPosition() { - emit gotoSourceLocation(d->m_mainView->rootObject()->property("fileName").toString(), - d->m_mainView->rootObject()->property("lineNumber").toInt(), - d->m_mainView->rootObject()->property("columnNumber").toInt()); + QGraphicsObject *rootObject = d->m_mainView->rootObject(); + emit gotoSourceLocation(rootObject->property("fileName").toString(), + rootObject->property("lineNumber").toInt(), + rootObject->property("columnNumber").toInt()); } ///////////////////////////////////////////////////////// // Toolbar buttons void QmlProfilerTraceView::toggleRangeMode(bool active) { - bool rangeMode = d->m_mainView->rootObject()->property("selectionRangeMode").toBool(); + QGraphicsObject *rootObject = d->m_mainView->rootObject(); + bool rangeMode = rootObject->property("selectionRangeMode").toBool(); if (active != rangeMode) { if (active) - d->m_buttonRange->setIcon(QIcon(":/qmlprofiler/ico_rangeselected.png")); + d->m_buttonRange->setIcon(QIcon(QLatin1String(":/qmlprofiler/ico_rangeselected.png"))); else - d->m_buttonRange->setIcon(QIcon(":/qmlprofiler/ico_rangeselection.png")); - d->m_mainView->rootObject()->setProperty("selectionRangeMode", QVariant(active)); + d->m_buttonRange->setIcon(QIcon(QLatin1String(":/qmlprofiler/ico_rangeselection.png"))); + rootObject->setProperty("selectionRangeMode", QVariant(active)); } } @@ -405,18 +409,19 @@ void QmlProfilerTraceView::updateRangeButton() { bool rangeMode = d->m_mainView->rootObject()->property("selectionRangeMode").toBool(); if (rangeMode) - d->m_buttonRange->setIcon(QIcon(":/qmlprofiler/ico_rangeselected.png")); + d->m_buttonRange->setIcon(QIcon(QLatin1String(":/qmlprofiler/ico_rangeselected.png"))); else - d->m_buttonRange->setIcon(QIcon(":/qmlprofiler/ico_rangeselection.png")); + d->m_buttonRange->setIcon(QIcon(QLatin1String(":/qmlprofiler/ico_rangeselection.png"))); emit rangeModeChanged(rangeMode); } void QmlProfilerTraceView::toggleLockMode(bool active) { - bool lockMode = !d->m_mainView->rootObject()->property("selectionLocked").toBool(); + QGraphicsObject *rootObject = d->m_mainView->rootObject(); + bool lockMode = !rootObject->property("selectionLocked").toBool(); if (active != lockMode) { - d->m_mainView->rootObject()->setProperty("selectionLocked", QVariant(!active)); - d->m_mainView->rootObject()->setProperty("selectedItem", QVariant(-1)); + rootObject->setProperty("selectionLocked", QVariant(!active)); + rootObject->setProperty("selectedItem", QVariant(-1)); } } @@ -456,8 +461,9 @@ void QmlProfilerTraceView::updateRange() void QmlProfilerTraceView::mouseWheelMoved(int mouseX, int mouseY, int wheelDelta) { Q_UNUSED(mouseY); - if (d->m_mainView->rootObject()) { - QMetaObject::invokeMethod(d->m_mainView->rootObject(), "wheelZoom", + QGraphicsObject *rootObject = d->m_mainView->rootObject(); + if (rootObject) { + QMetaObject::invokeMethod(rootObject, "wheelZoom", Q_ARG(QVariant, QVariant(mouseX)), Q_ARG(QVariant, QVariant(wheelDelta))); } @@ -476,10 +482,11 @@ void QmlProfilerTraceView::updateVerticalScroll(int newPosition) void QmlProfilerTraceView::resizeEvent(QResizeEvent *event) { QWidget::resizeEvent(event); - if (d->m_mainView->rootObject()) { - d->m_mainView->rootObject()->setProperty("width", QVariant(event->size().width())); + QGraphicsObject *rootObject = d->m_mainView->rootObject(); + if (rootObject) { + rootObject->setProperty("width", QVariant(event->size().width())); int newHeight = event->size().height() - d->m_timebar->height() - d->m_overview->height(); - d->m_mainView->rootObject()->setProperty("candidateHeight", QVariant(newHeight)); + rootObject->setProperty("candidateHeight", QVariant(newHeight)); } emit resized(); } @@ -490,35 +497,28 @@ void QmlProfilerTraceView::contextMenuEvent(QContextMenuEvent *ev) { QMenu menu; QAction *viewAllAction = 0; - QAction *getLocalStatsAction = 0; - QAction *getGlobalStatsAction = 0; QmlProfilerTool *profilerTool = qobject_cast<QmlProfilerTool *>(d->m_profilerTool); - QPoint position = ev->globalPos(); - if (profilerTool) { - QList <QAction *> commonActions = profilerTool->profilerContextMenuActions(); - foreach (QAction *act, commonActions) { - menu.addAction(act); - } - } + if (profilerTool) + menu.addActions(profilerTool->profilerContextMenuActions()); menu.addSeparator(); - getLocalStatsAction = menu.addAction(tr("Limit Events Pane to Current Range")); + + QAction *getLocalStatsAction = menu.addAction(tr("Limit Events Pane to Current Range")); if (!d->m_viewContainer->hasValidSelection()) getLocalStatsAction->setEnabled(false); - getGlobalStatsAction = menu.addAction(tr("Reset Events Pane")); + + QAction *getGlobalStatsAction = menu.addAction(tr("Reset Events Pane")); if (d->m_viewContainer->hasGlobalStats()) getGlobalStatsAction->setEnabled(false); - if (d->m_profilerDataModel->count() > 0) { menu.addSeparator(); viewAllAction = menu.addAction(tr("Reset Zoom")); } - - QAction *selectedAction = menu.exec(position); + QAction *selectedAction = menu.exec(ev->globalPos()); if (selectedAction) { if (selectedAction == viewAllAction) { @@ -543,14 +543,16 @@ void QmlProfilerTraceView::contextMenuEvent(QContextMenuEvent *ev) // Tell QML the state of the profiler void QmlProfilerTraceView::setRecording(bool recording) { - if (d->m_mainView->rootObject()) - d->m_mainView->rootObject()->setProperty("recordingEnabled", QVariant(recording)); + QGraphicsObject *rootObject = d->m_mainView->rootObject(); + if (rootObject) + rootObject->setProperty("recordingEnabled", QVariant(recording)); } void QmlProfilerTraceView::setAppKilled() { - if (d->m_mainView->rootObject()) - d->m_mainView->rootObject()->setProperty("appKilled",QVariant(true)); + QGraphicsObject *rootObject = d->m_mainView->rootObject(); + if (rootObject) + rootObject->setProperty("appKilled",QVariant(true)); } //////////////////////////////////////////////////////////////// // Profiler State |