branches/work/kst/portto4/kst/src/libkstapp
Mike Fenton <mike <at> staikos.net>
2009-04-09 19:43:50 GMT
SVN commit 951617 by fenton:
Cache entire PlotItem into pixmap.
M +70 -20 plotitem.cpp
M +13 -6 plotitem.h
--- branches/work/kst/portto4/kst/src/libkstapp/plotitem.cpp #951616:951617
<at> <at> -49,7 +49,8 <at> <at>
#define DEBUG_LABEL_REGION 0
// Benchmark drawing
-// #define BENCHMARK 1
+// 0 = None, 1 = PlotItem, 2 = More Details
+#define BENCHMARK 0
static const int PLOT_MAXIMIZED_ZORDER = 1000;
<at> <at> -80,11 +81,12 <at> <at>
_allowUpdates(true),
_updateDelayed(false),
_legend(0),
- _axisLabelsDirty(true),
_zoomMenu(0),
_filterMenu(0),
_fitMenu(0),
- _sharedBox(0)
+ _sharedBox(0),
+ _axisLabelsDirty(true),
+ _plotPixmapDirty(true)
{
setTypeName("Plot");
<at> <at> -99,6 +101,8 <at> <at>
connect(this, SIGNAL(geometryChanged()), _yAxis, SLOT(setTicksUpdated()));
connect(this, SIGNAL(geometryChanged()), this, SLOT(setPlotRectsDirty()));
+ _globalFont = parentView()->defaultFont();
+
_leftLabelDetails = new PlotLabel(this);
_rightLabelDetails = new PlotLabel(this);
_topLabelDetails = new PlotLabel(this);
<at> <at> -138,6 +142,8 <at> <at>
setPlotBordersDirty(true);
connect(this, SIGNAL(triggerRedraw()), this, SLOT(redrawPlot()));
connect(this, SIGNAL(geometryChanged()), this, SLOT(setLabelsDirty()));
+ connect(this, SIGNAL(updateAxes()), this, SLOT(setPlotPixmapDirty()));
+ connect(this, SIGNAL(geometryChanged()), this, SLOT(setPlotPixmapDirty()));
}
<at> <at> -529,18 +535,63 <at> <at>
}
+void PlotItem::updatePlotPixmap() {
+#if BENCHMARK
+ QTime bench_time;
+ bench_time.start();
+#endif
+ _plotPixmapDirty = false;
+
+ QPixmap pixmap(rect().width()+1, rect().height()+1);
+ pixmap.fill(Qt::transparent);
+ QPainter pixmapPainter(&pixmap);
+
+ paintPixmap(&pixmapPainter);
+
+ _plotPixmap = pixmap;
+#if BENCHMARK
+ int i = bench_time.elapsed();
+ qDebug() << "Total Time to update plot pixmap " << (void *)this << ": " << i << "ms";
+#endif
+}
+
+
void PlotItem::paint(QPainter *painter) {
+#if BENCHMARK
+ QTime bench_time;
+ bench_time.start();
+#endif
+ if (_plotPixmapDirty) {
+ updatePlotPixmap();
+ }
+
+ painter->save();
+ painter->setPen(Qt::NoPen);
+ painter->drawRect(rect());
+ painter->restore();
+
+ painter->drawPixmap(QPointF(0, 0), _plotPixmap);
+#if BENCHMARK
+ int i = bench_time.elapsed();
+ qDebug() << "Total Time to paint " << (void *)this << ": " << i << "ms" << endl;
+#endif
+
+}
+
+
+void PlotItem::paintPixmap(QPainter *painter) {
if (parentView()->plotBordersDirty() || (creationState() == ViewItem::InProgress)) {
ViewGridLayout::standardizePlotMargins(this, painter);
setPlotBordersDirty(false);
}
-#ifdef BENCHMARK
+#if BENCHMARK
QTime bench_time, benchtmp;
int b_1 = 0, b_2 = 0, b_3 = 0, b_4 = 0, b_5 = 0;
bench_time.start();
benchtmp.start();
#endif
+
painter->save();
painter->setPen(Qt::NoPen);
painter->drawRect(rect());
<at> <at> -549,7 +600,7 <at> <at>
painter->save();
painter->setFont(numberLabelDetails()->calculatedFont());
-#ifdef BENCHMARK
+#if BENCHMARK
b_1 = benchtmp.elapsed();
#endif
#if DEBUG_LABEL_REGION
<at> <at> -568,29 +619,29 <at> <at>
// qDebug() << "=============> topLabel:" << topLabel() << endl;
#endif
paintTopLabel(painter);
-#ifdef BENCHMARK
+#if BENCHMARK
b_2 = benchtmp.elapsed();
#endif
paintPlot(painter);
-#ifdef BENCHMARK
+#if BENCHMARK
b_3 = benchtmp.elapsed();
#endif
paintTickLabels(painter);
-#ifdef BENCHMARK
+#if BENCHMARK
b_4 = benchtmp.elapsed();
#endif
paintPlotMarkers(painter);
-#ifdef BENCHMARK
+#if BENCHMARK
b_5 = benchtmp.elapsed();
#endif
painter->restore();
-#ifdef BENCHMARK
+#if BENCHMARK
int i = bench_time.elapsed();
- qDebug() << endl << "Painting Plot " << (void *)this << ": " << i << "ms";
+ qDebug() << "Painting Plot Pixmap " << (void *)this << ": " << i << "ms";
if (b_1 > 0) qDebug() << " Setup: " << b_1 << "ms";
if (b_2 - b_1 > 0) qDebug() << " Labels: " << (b_2 - b_1) << "ms";
if (b_3 - b_2 > 0) qDebug() << " Plot: " << (b_3 - b_2) << "ms";
<at> <at> -624,39 +675,39 <at> <at>
updateYAxisLabels(painter);
}
}
-#ifdef BENCHMARK
+#if BENCHMARK > 1
QTime bench_time, benchtmp;
int b_1 = 0, b_2 = 0, b_3 = 0, b_4 = 0, b_5 = 0;
bench_time.start();
benchtmp.start();
#endif
paintMajorGridLines(painter);
-#ifdef BENCHMARK
+#if BENCHMARK > 1
b_1 = benchtmp.elapsed();
#endif
paintMinorGridLines(painter);
-#ifdef BENCHMARK
+#if BENCHMARK > 1
b_2 = benchtmp.elapsed();
#endif
painter->save();
painter->setBrush(Qt::NoBrush);
painter->drawRect(plotRect());
painter->restore();
-#ifdef BENCHMARK
+#if BENCHMARK > 1
b_3 = benchtmp.elapsed();
#endif
paintMajorTicks(painter);
-#ifdef BENCHMARK
+#if BENCHMARK > 1
b_4 = benchtmp.elapsed();
#endif
paintMinorTicks(painter);
-#ifdef BENCHMARK
+#if BENCHMARK > 1
b_5 = benchtmp.elapsed();
#endif
-#ifdef BENCHMARK
+#if BENCHMARK > 1
int i = bench_time.elapsed();
- qDebug() << endl << "Painting Plot - PaintPlot " << (void *)this << ": " << i << "ms";
+ qDebug() << "Painting Plot - PaintPlot " << (void *)this << ": " << i << "ms";
if (b_1 > 0) qDebug() << " Major Lines: " << b_1 << "ms";
if (b_2 - b_1 > 0) qDebug() << " Minor Lines: " << (b_2 - b_1) << "ms";
if (b_3 - b_2 > 0) qDebug() << " Rect: " << (b_3 - b_2) << "ms";
<at> <at> -787,7 +838,6 <at> <at>
p2 = p1 - QPointF(minorTickLength, 0);
_yMinorTickLines << QLineF(p1, p2);
}
-
_yPlotMarkerLines.clear();
foreach (double y, _yAxis->axisPlotMarkers().markers()) {
if (y > _yMin && y < _yMax) {
--- branches/work/kst/portto4/kst/src/libkstapp/plotitem.h #951616:951617
<at> <at> -280,6 +280,7 <at> <at>
void setBottomLabelDirty() { _bottomLabel.dirty = true; }
void setLabelsDirty() { _leftLabel.dirty = true; _rightLabel.dirty = true; _topLabel.dirty = true;
_bottomLabel.dirty = true; }
+ void setPlotPixmapDirty() { _plotPixmapDirty = true; }
void setAxisLabelsDirty() { _axisLabelsDirty = true; }
private:
<at> <at> -290,6 +291,9 <at> <at>
void resetSelectionRect();
+ void updatePlotPixmap();
+ virtual void paintPixmap(QPainter *painter);
+
void updateXAxisLines();
void updateYAxisLines();
<at> <at> -407,12 +411,6 <at> <at>
LegendItem* _legend;
- bool _axisLabelsDirty;
- DrawnLabel _leftLabel;
- DrawnLabel _rightLabel;
- DrawnLabel _topLabel;
- DrawnLabel _bottomLabel;
-
QMenu *_zoomMenu;
QAction *_zoomMaximum;
QAction *_zoomMaxSpikeInsensitive;
<at> <at> -442,6 +440,12 <at> <at>
SharedAxisBoxItem * _sharedBox;
+ bool _axisLabelsDirty;
+ DrawnLabel _leftLabel;
+ DrawnLabel _rightLabel;
+ DrawnLabel _topLabel;
+ DrawnLabel _bottomLabel;
+
QVector<QLineF> _xMajorGridLines;
QVector<QLineF> _yMajorGridLines;
QVector<QLineF> _xMinorGridLines;
<at> <at> -457,6 +461,9 <at> <at>
QVector<CachedPlotLabel> _xPlotLabels;
QVector<CachedPlotLabel> _yPlotLabels;
+ bool _plotPixmapDirty;
+ QPixmap _plotPixmap;
+
QUndoStack *_undoStack;
friend class ZoomCommand;
RSS Feed