From ae722e8c3361290ee67c2ce74efed976fec783bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20=C4=8Cert=C3=ADk?= Date: Thu, 28 Nov 2019 20:30:57 -0700 Subject: [PATCH] Use a vector of QPolygonF directly --- lib/jkqtplotter/graphs/jkqtpscatter.cpp | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/lib/jkqtplotter/graphs/jkqtpscatter.cpp b/lib/jkqtplotter/graphs/jkqtpscatter.cpp index dd265cb108..d484f1a54b 100644 --- a/lib/jkqtplotter/graphs/jkqtpscatter.cpp +++ b/lib/jkqtplotter/graphs/jkqtpscatter.cpp @@ -34,11 +34,7 @@ -template -std::unique_ptr make_unique(Args&&... args) -{ - return std::unique_ptr(new T(std::forward(args)...)); -} + @@ -98,8 +94,8 @@ void JKQTPXYLineGraph::draw(JKQTPEnhancedPainter& painter) { //double yold=-1; //bool first=false; //QVector lines; - std::vector> linesP; - linesP.push_back(make_unique()); + std::vector linesP; + linesP.push_back(QPolygonF()); intSortData(); for (int iii=imin; iiigetXAxis()->isLogAxis() || xv>0.0) && (!parent->getYAxis()->isLogAxis() || yv>0.0) ) { plotStyledSymbol(parent, painter, x, y); if (drawLine) { - (*linesP[linesP.size()-1])<()); + linesP.push_back(QPolygonF()); } } } //qDebug()<<"JKQTPXYLineGraph::draw(): "<<4<<" lines="<