HG_REPOSITORIES/LPP/users/hugo/ColorMapChart Commit - r5:d44370b2cb06

memory leak fixed

winter -

r5:d44370b2cb06 default

parent child

Context file:

r5:d44370b2cb06

Collapse all files

src/charts/axis/colorbaraxis/chartcolorbaraxisy.cpp +3 -2

                 }
                 //colorbar
-                QRectF rect(m_position.x()+10,m_position.y(),m_height/20,m_height); //remove 10 if needed
+                QRectF rect(m_position.x()+10,m_position.y(),m_height/20,m_height); //remove +10 if needed
                 QGraphicsRectItem *colorbar = new QGraphicsRectItem(rect, this);
                 colorbar->setZValue(ChartPresenter::AxisZValue);
                 colorbar->setBrush(gradient);
+                //colorbar labels
                 for(int i=0;i<m_axis->tickCount();i++)
                 {
                     qreal value = m_axis->max() - (i * (m_axis->max() - m_axis->min()) / (m_axis->tickCount() - 1));
                     QGraphicsTextItem *label = new QGraphicsTextItem(this);
                     label->setPlainText(QString::number(value));
-                    label->setPos((m_position.x()+10+m_height/20+1),(m_position.y()*0.85+i*(m_height/(m_axis->tickCount()-1)))); //remove 10 if needed
+                    label->setPos((m_position.x()+10+m_height/20+1),(m_position.y()*0.85+i*(m_height/(m_axis->tickCount()-1)))); //remove +10 if needed
                 }
             }

src/charts/colormapchart/colormapchart.cpp +6 -4

                   m_gradientType(Rainbow),
                   m_colorbar(Q_NULLPTR),
                   m_isColorBarDrawn(false),
-                  m_currentplotArea(QRectF()),
+                  m_currentplotArea(QRectF())
-                  m_grid(Q_NULLPTR)
             {
                 //    QObject::connect(series, SIGNAL(pointReplaced(int)), this, SLOT(handlePointReplaced(int)));
                 //    QObject::connect(series, SIGNAL(pointsReplaced()), this, SLOT(handlePointsReplaced()));
                 {
                     m_currentplotArea = plotAreaRect;
-                    m_grid = m_series->getUniformGrid(0,0,plotAreaRect.width(),plotAreaRect.height(),QColorMapSeries::LastPixel);
+                    m_grid.reserve(plotAreaRect.width()*plotAreaRect.height());
+                    m_grid.resize(plotAreaRect.width()*plotAreaRect.height());
+                    m_series->getUniformGrid(0,0,plotAreaRect.width(),plotAreaRect.height(),m_grid, QColorMapSeries::LastPixel);
                     addColorBar(plotAreaRect);
                 }
                 {
                     for(int j=0;j<imageHeight;j++)
                     {
-                        double value = m_grid->at(i+j*(imageWidth));
+                        double value = m_grid.at(i+j*(imageWidth));
                         double pix=((value-minZ)/rangeZ);
                         int indexInColorTable = pix*(nbOfColors-1);
                         colorMapImage.setPixel(i,j,m_colorTable->at(indexInColorTable));

src/charts/colormapchart/colormapchart_p.h +1 -1

                 bool m_isColorBarDrawn;
                 QColorBarAxis *m_colorbar;
                 QRectF m_currentplotArea;
-                QVector<double> * m_grid;
+                QVector<double> m_grid;
             };
             //class PixmapMarker: public QGraphicsRectItem

src/charts/colormapchart/qcolormapseries.cpp +4 -8

                 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.
             */
-            QVector<double> *QColorMapSeries::getUniformGrid(int xpos, int ypos,int width, int height, QColorMapSeries::Strategy strategy)
+            void QColorMapSeries::getUniformGrid(int xpos, int ypos,int width, int height, QVector<double> &grid, QColorMapSeries::Strategy strategy)
             {
                 Q_D(QColorMapSeries);
-                return d->getUniformGrid(xpos, ypos,width,height, strategy);
+                d->getUniformGrid(xpos, ypos,width,height, grid, strategy);
             }
             //void QColorMapSeries::attachAxis(QAbstractAxis *axis)
             }
-            QVector<double> *QColorMapSeriesPrivate::getUniformGrid(int xpos, int ypos,  int width, int height, QColorMapSeries::Strategy strategy)
+            void QColorMapSeriesPrivate::getUniformGrid(int xpos, int ypos,  int width, int height, QVector<double> &grid, QColorMapSeries::Strategy strategy)
             {
-                QVector<double> *grid = new QVector<double>(width*height);
                 double dx = (m_maxX - m_minX)/(double)width;
                 double dy = (m_maxY - m_minY)/(double)height;
             QVector<Point3D> cluster;
             cluster.reserve(height*width/1000);
-                for (auto cell= grid->begin();cell<grid->end();++cell)
+                for (auto cell= grid.begin();cell<grid.end();++cell)
                 {
                     cluster.resize(0);
                     this->buildCluster(x,y,dx,dy,cluster);
                         y++;
                     }
                 }
-                return grid;
             }
             /*!

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

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

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

                 QAbstractAxis::AxisType defaultAxisType(Qt::Orientation orientation) const;
                 QAbstractAxis* createDefaultAxis(Qt::Orientation) const;
-                QVector<double> *getUniformGrid(int xpos, int ypos,int width, int height, QColorMapSeries::Strategy strategy);
+                void getUniformGrid(int xpos, int ypos,int width, int height,QVector<double> &grid, QColorMapSeries::Strategy strategy);
             Q_SIGNALS:
                 void updated();

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