HG_REPOSITORIES/LPP/users/hugo/ColorMapChart Commit - r3:ab1c9ba54a31

improvements in execution time, colorbar ok, more work to do on axes,

winter -

r3:ab1c9ba54a31 default

parent child

Context file:

r3:ab1c9ba54a31

Collapse all files

examples/charts/colormap/main.cpp +9 -7

                 QApplication a(argc, argv);
                 QVector<double> *xSeries = new QVector<double>();
+                xSeries->reserve(1028);
                 for(int  i=0;i<1028;i++)
                 {
-                    xSeries->append(i*5.0);
+                    xSeries->append(i);
                 }
                 QVector<double> *ySeries = new QVector<double>();
+                ySeries->reserve(768);
                 for(int  i=0;i<768;i++)
                 {
-                    ySeries->append(i*10.0);
+                    ySeries->append(i);
                 }
                 QVector<double> *zSeries = new QVector<double>();
+                zSeries->reserve(1028*768);
                 for(int  i=0;i<1028*768;i++)
                 {
-                    //        if(i%2 != 1)
+            //                if(i%2 != 1)
-                    //            zSeries->append(0);
+            //                    zSeries->append(0);
-                    //        else
+            //                else
-                    //            zSeries->append(1);
+            //                    zSeries->append(1);
                     zSeries->append(i);
                 }
                 window.resize(100-77, 100-53);
                 window.show();
                 return a.exec();
             }

src/charts/axis/colorbaraxis/chartcolorbaraxisy.cpp +15 -11

             QT_CHARTS_BEGIN_NAMESPACE
-            ChartColorBarAxisY::ChartColorBarAxisY(QColorBarAxis *axis, QLinearGradient gradient, QGraphicsItem *item)
+            ChartColorBarAxisY::ChartColorBarAxisY(QColorBarAxis *axis, QPoint pos, qreal height, QLinearGradient gradient, QGraphicsItem *item)
                 : VerticalAxis(axis, item),
                   m_axis(axis),
-                  m_gradient(gradient)
+                  m_gradient(gradient),
+                  m_position(pos),
+                  m_height(height)
             {
                 QObject::connect(m_axis, SIGNAL(tickCountChanged(int)), this, SLOT(handleTickCountChanged(int)));
                 QObject::connect(m_axis, SIGNAL(minorTickCountChanged(int)),
                     QRectF boundingRect = ChartPresenter::textBoundingRect(axis()->labelsFont(),
                                                                            QStringLiteral("..."),
                                                                            axis()->labelsAngle());
-                    width = boundingRect.width() + labelPadding() + base.width() + 1.0;
+                    width = boundingRect.width() + labelPadding() + base.width() + 61.0; //TODO : hint changed 1.0 to 61.0
                     height = boundingRect.height() / 2.0;
                     sh = QSizeF(width, height);
                     break;
                         if (firstHeight < 0.0)
                             firstHeight = height;
                     }
-                    width = labelWidth + labelPadding() + base.width() + 2.0; //two pixels of tolerance
+                    width = labelWidth + labelPadding() + base.width() + 62.0; //two pixels of tolerance //TODO : hint changed 2.0 to 62.0
                     height = qMax(height, firstHeight) / 2.0;
                     sh = QSizeF(width, height);
                     break;
             void ChartColorBarAxisY::createColorBar()
             {
-                QGradientStops stops = m_gradient.stops();
+                //m_position.setX(80+m_position.x());// TODO : remove this when you know how to move labels
-                QLinearGradient gradient(0,0,1,250);
+                //gradient
+                QGradientStops stops = m_gradient.stops();
+                QLinearGradient gradient(0,0,1,m_height);
                 foreach(QGradientStop stop, stops)
                 {
                     gradient.setColorAt(1-stop.first,stop.second);
                 }
-                QPixmap image = QPixmap(50,250);
+                //colorbar
-                QPainter painter(&image);
+                QRectF rect(m_position.x(),m_position.y(),m_height/20,m_height);
-                QRectF rect(0,0,50,250);
-                painter.fillRect(rect,gradient);
                 QGraphicsRectItem *colorbar = new QGraphicsRectItem(rect, this);
+                colorbar->setZValue(ChartPresenter::AxisZValue);
+                colorbar->setBrush(gradient);
                 setGraphicsItem(colorbar);
             }
             #include "moc_chartcolorbaraxisy_p.cpp"
-            QT_CHARTS_END_NAMESPACE
+                QT_CHARTS_END_NAMESPACE

src/charts/axis/colorbaraxis/chartcolorbaraxisy_p.h +3 -1

             {
                 Q_OBJECT
             public:
-                ChartColorBarAxisY(QColorBarAxis *axis, QLinearGradient gradient, QGraphicsItem *item = 0);
+                ChartColorBarAxisY(QColorBarAxis *axis, QPoint pos, qreal height, QLinearGradient gradient, QGraphicsItem *item = 0);
                 ~ChartColorBarAxisY();
                 QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const;
             private:
                 QColorBarAxis *m_axis;
                 QLinearGradient m_gradient;
+                QPoint m_position;
+                qreal m_height;
             };
             QT_CHARTS_END_NAMESPACE

src/charts/axis/colorbaraxis/qcolorbaraxis.cpp +22 -14

             /*!
                 Constructs an axis object which is a child of \a parent.
             */
-            QColorBarAxis::QColorBarAxis(QLinearGradient gradient, qreal min, qreal max,QObject *parent) :
+            QColorBarAxis::QColorBarAxis(QRectF plotArea, QLinearGradient gradient, qreal min, qreal max, QObject *parent) :
-                QAbstractAxis(*new QColorBarAxisPrivate(gradient, min, max, this), parent)
+                QAbstractAxis(*new QColorBarAxisPrivate(plotArea, gradient, min, max, this), parent)
             {
+            setGridLineVisible(false);
             }
             /*!
             /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-            QColorBarAxisPrivate::QColorBarAxisPrivate(QLinearGradient gradient, qreal min, qreal max, QColorBarAxis *q)
+            QColorBarAxisPrivate::QColorBarAxisPrivate(QRectF plotArea, QLinearGradient gradient, qreal min, qreal max, QColorBarAxis *q)
                 : QAbstractAxisPrivate(q),
+                  m_plotArea(plotArea),
                   m_min(min),
                   m_max(max),
-                        m_tickCount(5),
+                  m_tickCount(5),
-                        m_minorTickCount(0),
+                  m_minorTickCount(0),
                   m_format(QString::null),
-                //      m_applying(false)
+                  //      m_applying(false)
                   m_gradient(gradient)
             {
                 setAlignment(Qt::AlignRight); //also set orientation (Vertical in this case)
-                axis = new ChartColorBarAxisY(q, m_gradient, parent);
+                //TODO : change this position
+                qreal x1;
+                qreal y1;
+                qreal x2;
+                qreal y2;
+                m_plotArea.getCoords(&x1,&y1,&x2,&y2);
+                QPoint pos(x2+5,y1);
+                axis = new ChartColorBarAxisY(q, pos, m_plotArea.height(),m_gradient, parent);
                 m_item.reset(axis);
                 QAbstractAxisPrivate::initializeGraphics(parent);
             {
                 //domain is not supposed to have a rangeZ
-            //        if (orientation() == Qt::Vertical) {
+                //        if (orientation() == Qt::Vertical) {
-            //            if (!qFuzzyIsNull(m_max - m_min))
+                //            if (!qFuzzyIsNull(m_max - m_min))
-            //                domain->setRangeY(m_min, m_max);
+                //                domain->setRangeY(m_min, m_max);
-            //            else
+                //            else
-            //                setRange(domain->minY(), domain->maxY());
+                //                setRange(domain->minY(), domain->maxY());
-            //        }
+                //        }
             }
             void QColorBarAxisPrivate::setMin(const QVariant &min)

src/charts/axis/colorbaraxis/qcolorbaraxis.h +1 -1

             {
                 Q_OBJECT
             public:
-                explicit QColorBarAxis(QLinearGradient gradient, qreal min, qreal max,QObject *parent = 0);
+                explicit QColorBarAxis(QRectF plotArea,QLinearGradient gradient, qreal min, qreal max,QObject *parent = 0);
                 ~QColorBarAxis();
             protected:

src/charts/axis/colorbaraxis/qcolorbaraxis_p.h +2 -1

             {
                 Q_OBJECT
             public:
-                QColorBarAxisPrivate(QLinearGradient gradient, qreal min, qreal max,QColorBarAxis *q);
+                QColorBarAxisPrivate(QRectF plotArea, QLinearGradient gradient, qreal min, qreal max,QColorBarAxis *q);
                 ~QColorBarAxisPrivate();
             public:
                 QString m_format;
                // bool m_applying;
                 QLinearGradient m_gradient;
+                QRectF m_plotArea;
                 Q_DECLARE_PUBLIC(QColorBarAxis)
             };

src/charts/colormapchart/colormapchart.cpp +32 -14

             #include <private/qabstractaxis_p.h>
             #include <QtGui/QPainter>
-            //#include <QtCharts/QColorBarAxis> TODO : fix this
-            #include "qcolorbaraxis.h"
             #include <QRgb>
             #define nbOfColors 65000
                 Q_UNUSED(widget)
                 Q_UNUSED(option)
+                m_series->setUseOpenGL();
+                painter->save();
                 QRectF clipRect = QRectF(QPointF(0, 0), domain()->size());
                 painter->setClipRect(clipRect);
                 //http://doc.qt.io/qt-4.8/qimage.html#details :Warning: This will create a QImage with uninitialized data. Call fill() to fill the image with an appropriate pixel value before drawing onto it with QPainter.
                 colorMapImage.fill(QColor(Qt::white).rgb());
-                ColorMapDataPart * grid = m_series->getUniformGrid(0,0,plotAreaRect.width(),plotAreaRect.height(),QColorMapSeries::LastPixel);
+                QElapsedTimer timer;
+                timer.start();
+                QVector<double> * grid = m_series->getUniformGrid(0,0,plotAreaRect.width(),plotAreaRect.height(),QColorMapSeries::LastPixel);
+                int msec = timer.elapsed();
+                int msec2 = 0+msec;
                 double maxZ = m_series->maxZ();
                 double minZ = m_series->minZ();
                 double rangeZ = maxZ - minZ;
-                for(int i=0;i<colorMapImage.width();i++)
+                int imageWidth = colorMapImage.width();
+                int imageHeight = colorMapImage.height();
+                for(int i=0;i<imageWidth;i++)
                 {
-                    for(int j=0;j<colorMapImage.height();j++)
+                    for(int j=0;j<imageHeight;j++)
                     {
-                        double value = grid->dataSeries().at(i+j*(colorMapImage.width()));
+                        double value = grid->at(i+j*(imageWidth));
                         double pix=((value-minZ)/rangeZ);
                         int indexInColorTable = pix*(nbOfColors-1);
                         colorMapImage.setPixel(i,j,m_colorTable->at(indexInColorTable));
                     }
                 }
-                if(!m_colorbar)
+                addColorBar(plotAreaRect);
-                    addColorBar();
                 painter->drawImage(clipRect,colorMapImage);
-                update();
+                update();//Qt docs: Warning: If you call repaint() in a function which may itself be called from paintEvent(), you may get infinite recursion. The update() function never causes recursion
+                painter->restore();
             }
-            void ColorMapChart::addColorBar()
+            void ColorMapChart::addColorBar(QRectF plotAreaRect)
             {
                 double maxZ = m_series->maxZ();
                 double minZ = m_series->minZ();
-                QColorBarAxis *colorbar = new QColorBarAxis(createColorMapGradient(m_gradientType),minZ, maxZ,this);
-                m_series->chart()->addAxis(colorbar, Qt::AlignRight);
+                if(m_isColorBarDrawn)
-                m_colorbar = true;
+                    m_series->chart()->removeAxis(m_colorbar);
+                m_colorbar = new QColorBarAxis(plotAreaRect,createColorMapGradient(m_gradientType),minZ, maxZ,this);
+                m_series->chart()->addAxis(m_colorbar, Qt::AlignRight);
+                m_isColorBarDrawn = true;
             }
             /*!

src/charts/colormapchart/colormapchart_p.h +6 -2

             #include <QtCharts/QValueAxis>
             #include <QtGui/QPen>
+            //#include <QtCharts/QColorBarAxis> TODO : fix this
+            #include "qcolorbaraxis.h"
             QT_CHARTS_BEGIN_NAMESPACE
             class ChartPresenter;
             private:
                 inline bool isEmpty();
-                void addColorBar();
+                void addColorBar(QRectF plotAreaRect);
                 QLinearGradient createColorMapGradient(GradientType gradientType);
                 void changeGradient(GradientType gradientType);
                 bool m_dirty;
                 QVector<QRgb> *m_colorTable;
                 GradientType m_gradientType;
-                bool m_colorbar;
+                bool m_isColorBarDrawn;
+                QColorBarAxis *m_colorbar;
             };
             //class PixmapMarker: public QGraphicsRectItem

src/charts/colormapchart/qcolormapseries.cpp +11 -18

                 from the position \a xpos , \a ypos (starting at the top left corner of the plot area).\n
                 When there are more points than pixels, \a strategy is applied to determine which to choose.
             */
-            ColorMapDataPart *QColorMapSeries::getUniformGrid(int xpos, int ypos,int width, int height, QColorMapSeries::Strategy strategy)
+            QVector<double> *QColorMapSeries::getUniformGrid(int xpos, int ypos,int width, int height, QColorMapSeries::Strategy strategy)
             {
                 Q_D(QColorMapSeries);
                 return d->getUniformGrid(xpos, ypos,width,height, strategy);
             }
-            ColorMapDataPart *QColorMapSeriesPrivate::getUniformGrid(int xpos, int ypos,  int width, int height, QColorMapSeries::Strategy strategy)
+            QVector<double> *QColorMapSeriesPrivate::getUniformGrid(int xpos, int ypos,  int width, int height, QColorMapSeries::Strategy strategy)
             {
-                //    QVector<double> *timeSeries = new QVector<double>(width);
+                QVector<double> *grid = new QVector<double>(width*height);
-                //    QVector<double> *ySeries = new QVector<double>(height);
-                QVector<double> *dataSeries = new QVector<double>(width*height);
-                QVector<double> *timeSeries = new QVector<double>();
-                QVector<double> *ySeries = new QVector<double>();
-                ColorMapDataPart* grid = new ColorMapDataPart(timeSeries,ySeries,dataSeries);
                 double dx = (m_maxX - m_minX)/(double)width;
                 double dy = (m_maxY - m_minY)/(double)height;
                 int x=0;
                 int y=0;
-                for(int i=0;i<width;i++) //width-1?
+            QVector<Point3D> cluster;
+            cluster.reserve(height*width/1000);
-                    timeSeries->append((double)i);
+                for (auto cell= grid->begin();cell<grid->end();++cell)
-                for (auto cell= dataSeries->begin();cell<dataSeries->end();++cell)
                 {
-                    QVector<Point3D> cluster;
+                    cluster.resize(0);
                     this->buildCluster(x,y,dx,dy,cluster);
                     if(strategy == QColorMapSeries::LastPixel)
                         *cell=this->clusterStrategyLast(cluster);
                     else
                     {
                         x=0;
-                        ySeries->append((double)y);
                         y++;
                     }
                 }
                 return grid;
             }
                     QPair<int,int> xRange = dataPart->getRange(dataPart->timesSeries(),m_minX+xpos*dx,m_minX+(xpos+1)*dx);
                     QPair<int,int> yRange = dataPart->getRange(dataPart->ySeries(),m_maxY-(ypos+1)*dy,m_maxY-ypos*dy);
+                    int timeSeriesSize = dataPart->timesSeries().size();
                     if(xRange.first != xRange.second && yRange.first != yRange.second)
                     {
                         for(int i =xRange.first+1;i<xRange.second;i++)
                             for(int j=yRange.first+1;j<yRange.second;j++)
                             {
                                 qreal yval=dataPart->ySeries()[j];
-                                qreal val=dataPart->dataSeries()[ i + (dataPart->timesSeries().size() * j)];
+                                qreal val=dataPart->dataSeries()[ i + (timeSeriesSize * j)];
                                 cluster.append(Point3D(xval,yval,val));
                             }
                         }

src/charts/colormapchart/qcolormapseries.h +2 -2

                 QColorMapSeries &operator << (const ColorMapDataPart &dataPart);
                 QColorMapSeries &operator << (const QList<ColorMapDataPart *> &dataParts);
-                ColorMapDataPart* getUniformGrid(int xpos, int ypos,int width, int height, Strategy strategy);
+                QVector<double> *getUniformGrid(int xpos, int ypos,int width, int height, Strategy strategy);
-                //double getUniformGrid(int width, int height, Strategy lambda);
+                // QVector<double> *getUniformGrid(int width, int height, Strategy lambda);
                // virtual void attachAxis(QAbstractAxis *axis);

src/charts/colormapchart/qcolormapseries_p.h +1 -3

                 QAbstractAxis::AxisType defaultAxisType(Qt::Orientation orientation) const;
                 QAbstractAxis* createDefaultAxis(Qt::Orientation) const;
-                ColorMapDataPart* getUniformGrid(int xpos, int ypos,int width, int height, QColorMapSeries::Strategy strategy);
+                QVector<double> *getUniformGrid(int xpos, int ypos,int width, int height, QColorMapSeries::Strategy strategy);
             Q_SIGNALS:
                 void updated();
                 double m_minZ;
                 double m_maxZ;
                 void recomputeDataRange();
-                QPair<int,int> getLastX(double start, double end);
-                int getLastY(int x,double start, double end);
                 double clusterStrategyLast(QVector<Point3D>& cluster);
                 double clusterStrategyMean(QVector<Point3D> &cluster);
                 double clusterStrategyMedian(QVector<Point3D>& cluster);

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages