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

QmlProfiler: be more resilient against missing models in render passes

Browse Source 
Change-Id: Ib5c0ec44bac213f544dfce533299bee03213b374
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
This commit is contained in:
Ulf Hermann
2014-12-10 14:11:09 +01:00
parent 4b5d38c8cc
commit 8f7bd19600
4 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/qmlprofiler/qmlprofilerbindingloopsrenderpass.cpp
View File

@@ -159,6 +159,9 @@ Timeline::TimelineRenderPass::State *QmlProfilerBindingLoopsRenderPass::update(
const QmlProfilerRangeModel *model = qobject_cast<const QmlProfilerRangeModel *>(
renderer->model());
if (!model || indexFrom < 0 || indexTo > model->count())
return oldState;
BindingLoopsRenderPassState *state;
if (oldState == 0) {
state = new BindingLoopsRenderPassState;
@@ -170,12 +173,6 @@ Timeline::TimelineRenderPass::State *QmlProfilerBindingLoopsRenderPass::update(
state = static_cast<BindingLoopsRenderPassState *>(oldState);
}
if (!model)
return state;
if (indexFrom < 0 || indexTo > model->count())
return state;
if (state->indexFrom < state->indexTo) {
if (indexFrom < state->indexFrom) {
for (int i = indexFrom; i < state->indexFrom;

9
src/plugins/qmlprofiler/timelineitemsrenderpass.cpp
View File

@@ -280,6 +280,10 @@ TimelineRenderPass::State *TimelineItemsRenderPass::update(const TimelineAbstrac
qreal spacing) const
{
Q_UNUSED(stateChanged);
const TimelineModel *model = renderer->model();
if (!model || indexFrom < 0 || indexTo > model->count())
return oldState;
QColor selectionColor = (renderer->selectionLocked() ? QColor(96,0,255) :
QColor(Qt::blue)).lighter(130);
@@ -289,7 +293,7 @@ TimelineRenderPass::State *TimelineItemsRenderPass::update(const TimelineAbstrac
else
state = static_cast<TimelineItemsRenderPassState *>(oldState);
const TimelineModel *model = renderer->model();
float selectedItem = renderer->selectedItem() == -1 ? -1 :
model->selectionId(renderer->selectedItem());
@@ -306,9 +310,6 @@ TimelineRenderPass::State *TimelineItemsRenderPass::update(const TimelineAbstrac
state->m_collapsedRows << new QSGNode;
}
if (indexFrom < 0 || indexTo > model->count())
return state;
if (state->indexFrom < state->indexTo) {
if (indexFrom < state->indexFrom) {
for (int i = indexFrom; i < state->indexFrom;

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

@@ -109,6 +109,9 @@ TimelineRenderPass::State *TimelineNotesRenderPass::update(const TimelineAbstrac
const TimelineNotesModel *notes = renderer->notes();
const TimelineModel *model = renderer->model();
if (!model || !notes)
return oldState;
TimelineNotesRenderPassState *state;
if (oldState == 0) {
state = new TimelineNotesRenderPassState(model->expandedRowCount());

5
src/plugins/qmlprofiler/timelineselectionrenderpass.cpp
View File

@@ -61,6 +61,10 @@ TimelineRenderPass::State *TimelineSelectionRenderPass::update(
{
Q_UNUSED(stateChanged);
const TimelineModel *model = renderer->model();
if (!model)
return oldState;
TimelineSelectionRenderPassState *state;
if (oldState == 0) {
@@ -71,7 +75,6 @@ TimelineRenderPass::State *TimelineSelectionRenderPass::update(
state = static_cast<TimelineSelectionRenderPassState *>(oldState);
}
const TimelineModel *model = renderer->model();
QSGSimpleRectNode *selectionNode = static_cast<QSGSimpleRectNode *>(model->expanded() ?
state->m_expandedOverlay :
state->m_collapsedOverlay);