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

QmlProfiler: Move timeline classes into own namespace

Browse Source 
The new namespace "Timeline" is for classes that are supposed to go to
the generic timeline library later.

Change-Id: I1f6dce59de2c37398b1ed89473e1a94ec020104b
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
This commit is contained in:
Ulf Hermann
2014-12-09 11:01:23 +01:00
parent c86efd2179
commit 516c0d6020
30 changed files with 86 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,7 +40,7 @@ public:
BindingLoopMaterial();
};
struct BindingLoopsRenderPassState : public TimelineRenderPass::State {
struct BindingLoopsRenderPassState : public Timeline::TimelineRenderPass::State {
BindingLoopsRenderPassState() : indexFrom(std::numeric_limits<int>::max()), indexTo(-1) {}
BindingLoopMaterial material;
int indexFrom;
@@ -81,7 +81,8 @@ QmlProfilerBindingLoopsRenderPass::QmlProfilerBindingLoopsRenderPass()
}
void updateNodes(const QmlProfilerRangeModel *model, int from, int to,
const TimelineRenderState *parentState, BindingLoopsRenderPassState *state)
const Timeline::TimelineRenderState *parentState,
BindingLoopsRenderPassState *state)
{
QVector<BindlingLoopsGeometry> expandedPerRow(model->expandedRowCount());
BindlingLoopsGeometry collapsed;
@@ -114,7 +115,7 @@ void updateNodes(const QmlProfilerRangeModel *model, int from, int to,
state->collapsedOverlay->appendChildNode(collapsed.node);
}
int rowHeight = TimelineModel::defaultRowHeight();
int rowHeight = Timeline::TimelineModel::defaultRowHeight();
for (int i = from; i < to; ++i) {
int bindingLoopDest = model->bindingLoopDest(i);
if (bindingLoopDest == -1)
@@ -141,8 +142,9 @@ void updateNodes(const QmlProfilerRangeModel *model, int from, int to,
}
}
TimelineRenderPass::State *QmlProfilerBindingLoopsRenderPass::update(
const TimelineRenderer *renderer, const TimelineRenderState *parentState, State *oldState,
Timeline::TimelineRenderPass::State *QmlProfilerBindingLoopsRenderPass::update(
const Timeline::TimelineRenderer *renderer,
const Timeline::TimelineRenderState *parentState, State *oldState,
int indexFrom, int indexTo, bool stateChanged, qreal spacing) const
{
Q_UNUSED(stateChanged);
@@ -238,7 +240,7 @@ void BindlingLoopsGeometry::allocate(QSGMaterial *material)
void BindlingLoopsGeometry::addExpandedEvent(float itemCenter)
{
float verticalCenter = TimelineModel::defaultRowHeight() / 2.0;
float verticalCenter = Timeline::TimelineModel::defaultRowHeight() / 2.0;
Point2DWithOffset *v = vertexData() + usedVertices;
v[0].set(itemCenter, verticalCenter, -1.0f, currentY);
v[1].set(itemCenter, verticalCenter, +1.0f, currentY);

5
src/plugins/qmlprofiler/qmlprofilerbindingloopsrenderpass.h
View File

@@ -40,11 +40,12 @@
namespace QmlProfiler {
namespace Internal {
class QmlProfilerBindingLoopsRenderPass : public TimelineRenderPass
class QmlProfilerBindingLoopsRenderPass : public Timeline::TimelineRenderPass
{
public:
static const QmlProfilerBindingLoopsRenderPass *instance();
State *update(const TimelineRenderer *renderer, const TimelineRenderState *parentState,
State *update(const Timeline::TimelineRenderer *renderer,
const Timeline::TimelineRenderState *parentState,
State *oldState, int indexFrom, int indexTo, bool stateChanged,
qreal spacing) const;
protected:

4
src/plugins/qmlprofiler/qmlprofilernotesmodel.cpp
View File

@@ -46,7 +46,7 @@ int QmlProfilerNotesModel::add(int typeId, qint64 start, qint64 duration, const
{
int timelineModel = -1;
int timelineIndex = -1;
foreach (const TimelineModel *model, timelineModels()) {
foreach (const Timeline::TimelineModel *model, timelineModels()) {
if (model->handlesTypeId(typeId)) {
for (int i = model->firstIndex(start); i <= model->lastIndex(start + duration); ++i) {
if (i < 0)
@@ -89,7 +89,7 @@ void QmlProfilerNotesModel::saveData()
{
QVector<QmlProfilerDataModel::QmlEventNoteData> notes;
for (int i = 0; i < count(); ++i) {
const TimelineModel *model = timelineModelByModelId(timelineModel(i));
const Timeline::TimelineModel *model = timelineModelByModelId(timelineModel(i));
if (!model)
continue;

6
src/plugins/qmlprofiler/qmlprofilernotesmodel.h
View File

@@ -37,7 +37,7 @@
#include <QHash>
namespace QmlProfiler {
class QMLPROFILER_EXPORT QmlProfilerNotesModel : public TimelineNotesModel {
class QMLPROFILER_EXPORT QmlProfilerNotesModel : public Timeline::TimelineNotesModel {
Q_OBJECT
public:
QmlProfilerNotesModel(QObject *parent);
@@ -51,5 +51,5 @@ protected:
int add(int typeId, qint64 startTime, qint64 duration, const QString &text);
};
}
#endif // NOTESMODEL_H
} // namespace QmlProfiler
#endif // QMLPROFILERNOTESMODEL_H

10
src/plugins/qmlprofiler/qmlprofilerrangemodel.cpp
View File

@@ -284,14 +284,14 @@ int QmlProfilerRangeModel::selectionIdForLocation(const QString &filename, int l
return -1;
}
QList<const TimelineRenderPass *> QmlProfilerRangeModel::supportedRenderPasses() const
QList<const Timeline::TimelineRenderPass *> QmlProfilerRangeModel::supportedRenderPasses() const
{
if (supportsBindingLoops()) {
QList<const TimelineRenderPass *> passes;
passes << TimelineItemsRenderPass::instance()
QList<const Timeline::TimelineRenderPass *> passes;
passes << Timeline::TimelineItemsRenderPass::instance()
<< QmlProfilerBindingLoopsRenderPass::instance()
<< TimelineSelectionRenderPass::instance()
<< TimelineNotesRenderPass::instance();
<< Timeline::TimelineSelectionRenderPass::instance()
<< Timeline::TimelineNotesRenderPass::instance();
return passes;
} else {
return QmlProfilerTimelineModel::supportedRenderPasses();

2
src/plugins/qmlprofiler/qmlprofilerrangemodel.h
View File

@@ -78,7 +78,7 @@ public:
int typeId(int index) const;
int selectionIdForLocation(const QString &filename, int line, int column) const;
virtual QList<const TimelineRenderPass *> supportedRenderPasses() const;
virtual QList<const Timeline::TimelineRenderPass *> supportedRenderPasses() const;
protected:
void loadData();

2
src/plugins/qmlprofiler/qmlprofilertimelinemodel.h
View File

@@ -35,7 +35,7 @@
namespace QmlProfiler {
class QMLPROFILER_EXPORT QmlProfilerTimelineModel : public TimelineModel {
class QMLPROFILER_EXPORT QmlProfilerTimelineModel : public Timeline::TimelineModel {
Q_OBJECT
Q_PROPERTY(QmlDebug::RangeType rangeType READ rangeType CONSTANT)
Q_PROPERTY(QmlDebug::Message message READ message CONSTANT)

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

@@ -80,10 +80,10 @@ public:
QQuickView *m_mainView;
QmlProfilerModelManager *m_modelManager;
TimelineModelAggregator *m_modelProxy;
Timeline::TimelineModelAggregator *m_modelProxy;
TimelineZoomControl *m_zoomControl;
Timeline::TimelineZoomControl *m_zoomControl;
};
QmlProfilerTraceView::QmlProfilerTraceView(QWidget *parent, Analyzer::IAnalyzerTool *profilerTool, QmlProfilerViewManager *container, QmlProfilerModelManager *modelManager, QmlProfilerStateManager *profilerState)
@@ -91,18 +91,18 @@ QmlProfilerTraceView::QmlProfilerTraceView(QWidget *parent, Analyzer::IAnalyzerT
{
setObjectName(QLatin1String("QML Profiler"));
d->m_zoomControl = new TimelineZoomControl(this);
d->m_zoomControl = new Timeline::TimelineZoomControl(this);
connect(modelManager->traceTime(), &QmlProfilerTraceTime::timeChanged,
d->m_zoomControl, &TimelineZoomControl::setTrace);
d->m_zoomControl, &Timeline::TimelineZoomControl::setTrace);
QVBoxLayout *groupLayout = new QVBoxLayout;
groupLayout->setContentsMargins(0, 0, 0, 0);
groupLayout->setSpacing(0);
qmlRegisterType<TimelineRenderer>("TimelineRenderer", 1, 0, "TimelineRenderer");
qmlRegisterType<TimelineZoomControl>();
qmlRegisterType<TimelineModel>();
qmlRegisterType<TimelineNotesModel>();
qmlRegisterType<Timeline::TimelineRenderer>("TimelineRenderer", 1, 0, "TimelineRenderer");
qmlRegisterType<Timeline::TimelineZoomControl>();
qmlRegisterType<Timeline::TimelineModel>();
qmlRegisterType<Timeline::TimelineNotesModel>();
d->m_mainView = new QmlProfilerQuickView(this);
d->m_mainView->setResizeMode(QQuickView::SizeRootObjectToView);
@@ -115,7 +115,7 @@ QmlProfilerTraceView::QmlProfilerTraceView(QWidget *parent, Analyzer::IAnalyzerT
d->m_profilerTool = profilerTool;
d->m_viewContainer = container;
d->m_modelProxy = new TimelineModelAggregator(modelManager->notesModel(), this);
d->m_modelProxy = new Timeline::TimelineModelAggregator(modelManager->notesModel(), this);
d->m_modelManager = modelManager;
connect(modelManager,SIGNAL(dataAvailable()), d->m_modelProxy,SIGNAL(dataAvailable()));

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

@@ -34,8 +34,7 @@
#include <QSGVertexColorMaterial>
#include <QtAlgorithms>
namespace QmlProfiler {
namespace Internal {
namespace Timeline {
class TimelineItemsMaterial : public QSGMaterial {
public:
@@ -453,5 +452,4 @@ void OpaqueColoredPoint2DWithSize::set(float nx, float ny, float nw, float nh, f
r = nr; g = ng, b = nb; a = 255;
}
}
}
} // namespace Timeline

7
src/plugins/qmlprofiler/timelineitemsrenderpass.h
View File

@@ -35,8 +35,7 @@
#include "timelinerenderpass.h"
#include <QSGMaterial>
namespace QmlProfiler {
namespace Internal {
namespace Timeline {
class TimelineItemsRenderPass : public TimelineRenderPass
{
@@ -49,8 +48,6 @@ protected:
TimelineItemsRenderPass();
};
}
}
} // namespace Timeline
#endif // TIMELINEITEMSRENDERPASS_H

4
src/plugins/qmlprofiler/timelinemodel.cpp
View File

@@ -36,7 +36,7 @@
#include <QLinkedList>
namespace QmlProfiler {
namespace Timeline {
/*!
\class QmlProfiler::TimelineModel
@@ -623,6 +623,6 @@ int TimelineModel::TimelineModelPrivate::prevItemById(IdType idType, int id, qin
return -1;
}
}
} // namespace Timeline
#include "moc_timelinemodel.cpp"

4
src/plugins/qmlprofiler/timelinemodel.h
View File

@@ -39,7 +39,7 @@
#include <QVariant>
#include <QColor>
namespace QmlProfiler {
namespace Timeline {
class QMLPROFILER_EXPORT TimelineModel : public QObject
{
@@ -155,6 +155,6 @@ private:
Q_DECLARE_PRIVATE(TimelineModel)
};
}
} // namespace Timeline
#endif // TIMELINEMODEL_H

5
src/plugins/qmlprofiler/timelinemodel_p.h
View File

@@ -33,7 +33,7 @@
#include "timelinemodel.h"
namespace QmlProfiler {
namespace Timeline {
class QMLPROFILER_EXPORT TimelineModel::TimelineModelPrivate {
public:
@@ -135,5 +135,6 @@ private:
Q_DECLARE_PUBLIC(TimelineModel)
};
}
} // namespace Timeline
#endif // TIMELINEMODEL_P_H

7
src/plugins/qmlprofiler/timelinemodelaggregator.cpp
View File

@@ -38,9 +38,7 @@
#include <QStringList>
#include <QVariant>
namespace QmlProfiler {
namespace Internal {
namespace Timeline {
class TimelineModelAggregator::TimelineModelAggregatorPrivate {
public:
@@ -219,5 +217,4 @@ QVariantMap TimelineModelAggregator::prevItem(int selectedModel, int selectedIte
return ret;
}
} // namespace Internal
} // namespace QmlProfiler
} // namespace Timeline

8
src/plugins/qmlprofiler/timelinemodelaggregator.h
View File

@@ -35,15 +35,14 @@
#include "qmlprofilermodelmanager.h"
#include "timelinerenderer.h"
namespace QmlProfiler {
namespace Internal {
namespace Timeline {
class TimelineModelAggregator : public QObject
{
Q_OBJECT
Q_PROPERTY(int height READ height NOTIFY heightChanged)
Q_PROPERTY(QVariantList models READ models NOTIFY modelsChanged)
Q_PROPERTY(QmlProfiler::TimelineNotesModel *notes READ notes CONSTANT)
Q_PROPERTY(Timeline::TimelineNotesModel *notes READ notes CONSTANT)
public:
TimelineModelAggregator(TimelineNotesModel *notes, QObject *parent = 0);
~TimelineModelAggregator();
@@ -74,7 +73,6 @@ private:
TimelineModelAggregatorPrivate *d;
};
}
}
} // namespace Timeline
#endif // TIMELINEMODELAGGREGATOR_H

4
src/plugins/qmlprofiler/timelinenotesmodel.cpp
View File

@@ -30,7 +30,7 @@
#include "timelinenotesmodel_p.h"
namespace QmlProfiler {
namespace Timeline {
TimelineNotesModel::TimelineNotesModelPrivate::TimelineNotesModelPrivate(TimelineNotesModel *q) :
modified(false), q_ptr(q)
@@ -220,6 +220,6 @@ void TimelineNotesModel::clear()
emit changed(-1, -1, -1);
}
}
} // namespace Timeline
#include "moc_timelinenotesmodel.cpp"

4
src/plugins/qmlprofiler/timelinenotesmodel.h
View File

@@ -33,7 +33,7 @@
#include "timelinemodel.h"
namespace QmlProfiler {
namespace Timeline {
class QMLPROFILER_EXPORT TimelineNotesModel : public QObject
{
@@ -80,6 +80,6 @@ private:
Q_PRIVATE_SLOT(d_ptr, void _q_removeTimelineModel(QObject *timelineModel))
};
}
} // namespace Timeline
#endif // TIMELINENOTESMODEL_H

5
src/plugins/qmlprofiler/timelinenotesmodel_p.h
View File

@@ -33,7 +33,7 @@
#include "timelinenotesmodel.h"
namespace QmlProfiler {
namespace Timeline {
class TimelineNotesModel::TimelineNotesModelPrivate {
public:
@@ -59,6 +59,7 @@ private:
Q_DECLARE_PUBLIC(TimelineNotesModel)
};
}
} // namespace Timeline
#endif // TIMELINENOTESMODEL_P_H

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

@@ -32,8 +32,7 @@
#include "timelinerenderstate.h"
#include "qmlprofilernotesmodel.h"
namespace QmlProfiler {
namespace Internal {
namespace Timeline {
struct Point2DWithDistanceFromTop {
float x, y, d;
@@ -255,5 +254,4 @@ void Point2DWithDistanceFromTop::set(float nx, float ny, float nd)
x = nx; y = ny; d = nd;
}
}
}
} // namespace Timeline

7
src/plugins/qmlprofiler/timelinenotesrenderpass.h
View File

@@ -34,8 +34,7 @@
#include "timelinerenderer.h"
#include <QSGMaterial>
namespace QmlProfiler {
namespace Internal {
namespace Timeline {
class TimelineNotesRenderPass : public TimelineRenderPass
{
@@ -50,9 +49,7 @@ private:
TimelineNotesRenderPass();
};
}
}
} // namespace Timeline
#endif // TIMELINENOTESRENDERPASS_H

4
src/plugins/qmlprofiler/timelinerenderer.cpp
View File

@@ -48,8 +48,7 @@
#include <math.h>
using namespace QmlProfiler;
using namespace QmlProfiler::Internal;
namespace Timeline {
TimelineRenderer::TimelineRenderer(QQuickItem *parent) :
QQuickItem(parent), m_model(0), m_zoomer(0), m_notes(0),
@@ -460,3 +459,4 @@ void TimelineRenderer::setRowCountsDirty()
m_rowCountsDirty = true;
}
} // namespace Timeline

14
src/plugins/qmlprofiler/timelinerenderer.h
View File

@@ -38,8 +38,7 @@
#include "timelinenotesmodel.h"
#include "timelinerenderpass.h"
namespace QmlProfiler {
namespace Internal {
namespace Timeline {
class TimelineRenderPass;
class TimelineRenderState;
@@ -47,9 +46,9 @@ class TimelineRenderState;
class TimelineRenderer : public QQuickItem
{
Q_OBJECT
Q_PROPERTY(QmlProfiler::TimelineModel *model READ model WRITE setModel NOTIFY modelChanged)
Q_PROPERTY(QmlProfiler::TimelineZoomControl *zoomer READ zoomer WRITE setZoomer NOTIFY zoomerChanged)
Q_PROPERTY(QmlProfiler::TimelineNotesModel *notes READ notes WRITE setNotes NOTIFY notesChanged)
Q_PROPERTY(Timeline::TimelineModel *model READ model WRITE setModel NOTIFY modelChanged)
Q_PROPERTY(Timeline::TimelineZoomControl *zoomer READ zoomer WRITE setZoomer NOTIFY zoomerChanged)
Q_PROPERTY(Timeline::TimelineNotesModel *notes READ notes WRITE setNotes NOTIFY notesChanged)
Q_PROPERTY(bool selectionLocked READ selectionLocked WRITE setSelectionLocked NOTIFY selectionLockedChanged)
Q_PROPERTY(int selectedItem READ selectedItem WRITE setSelectedItem NOTIFY selectedItemChanged)
@@ -164,9 +163,8 @@ private:
TimelineRenderState *m_lastState;
};
} // namespace Internal
} // namespace QmlProfiler
} // namespace Timeline
QML_DECLARE_TYPE(QmlProfiler::Internal::TimelineRenderer)
QML_DECLARE_TYPE(Timeline::TimelineRenderer)
#endif // TIMELINERENDERER_H

6
src/plugins/qmlprofiler/timelinerenderpass.cpp
View File

@@ -30,8 +30,6 @@
#include "timelinerenderpass.h"
namespace QmlProfiler {
namespace Internal {
namespace Timeline {
}
}
} // namespace Timeline

7
src/plugins/qmlprofiler/timelinerenderpass.h
View File

@@ -34,8 +34,7 @@
#include <QVector>
QT_FORWARD_DECLARE_CLASS(QSGNode)
namespace QmlProfiler {
namespace Internal {
namespace Timeline {
class TimelineRenderer;
class TimelineRenderState;
@@ -57,6 +56,6 @@ public:
qreal spacing) const = 0;
};
}
}
} // namespace Timeline
#endif // TIMELINERENDERPASS_H

6
src/plugins/qmlprofiler/timelinerenderstate.cpp
View File

@@ -30,8 +30,7 @@
#include "timelinerenderstate.h"
namespace QmlProfiler {
namespace Internal {
namespace Timeline {
TimelineRenderState::TimelineRenderState(qint64 start, qint64 end, qreal scale, int numPasses) :
m_expandedRowRoot(new QSGNode), m_collapsedRowRoot(new QSGNode),
@@ -108,5 +107,4 @@ void TimelineRenderState::setPassState(int i, TimelineRenderPass::State *state)
m_passes[i] = state;
}
}
}
} // namespace Timeline

6
src/plugins/qmlprofiler/timelinerenderstate.h
View File

@@ -34,8 +34,7 @@
#include <QSGNode>
#include "timelinerenderpass.h"
namespace QmlProfiler {
namespace Internal {
namespace Timeline {
class TimelineRenderState {
public:
@@ -71,7 +70,6 @@ private:
QVector<TimelineRenderPass::State *> m_passes;
};
}
}
} // namespace Timeline
#endif // TIMELINERENDERSTATE_H

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

@@ -33,8 +33,7 @@
#include <QtMath>
#include <QSGSimpleRectNode>
namespace QmlProfiler {
namespace Internal {
namespace Timeline {
QSGSimpleRectNode *createSelectionNode()
{
@@ -135,5 +134,4 @@ TimelineSelectionRenderPass::TimelineSelectionRenderPass()
{
}
}
}
} // namespace Timeline

6
src/plugins/qmlprofiler/timelineselectionrenderpass.h
View File

@@ -35,8 +35,7 @@
#include "timelinerenderpass.h"
#include "timelinerenderstate.h"
namespace QmlProfiler {
namespace Internal {
namespace Timeline {
class TimelineSelectionRenderPass : public TimelineRenderPass
{
@@ -51,8 +50,7 @@ protected:
TimelineSelectionRenderPass();
};
}
}
} // namespace Timeline
#endif // TIMELINESELECTIONRENDERPASS_H

4
src/plugins/qmlprofiler/timelinezoomcontrol.cpp
View File

@@ -29,7 +29,7 @@
#include "timelinezoomcontrol.h"
namespace QmlProfiler {
namespace Timeline {
TimelineZoomControl::TimelineZoomControl(QObject *parent) : QObject(parent), m_traceStart(-1), m_traceEnd(-1),
m_windowStart(-1), m_windowEnd(-1), m_rangeStart(-1), m_rangeEnd(-1), m_windowLocked(false)
@@ -170,4 +170,4 @@ void TimelineZoomControl::clampRangeToWindow()
setRange(rangeStart, rangeEnd);
}
}
} // namespace Timeline

6
src/plugins/qmlprofiler/timelinezoomcontrol.h
View File

@@ -33,7 +33,7 @@
#include <QTimer>
namespace QmlProfiler {
namespace Timeline {
class TimelineZoomControl : public QObject {
Q_OBJECT
@@ -101,5 +101,7 @@ protected:
void rebuildWindow();
void clampRangeToWindow();
};
}
} // namespace Timeline
#endif // TIMELINEZOOMCONTROL_H