From ed0db5c8d8ed12fa02eab5e529db60d92d78d8b2 Mon Sep 17 00:00:00 2001 From: Samuel Fadel Date: Wed, 10 Feb 2016 11:59:59 -0200 Subject: Updated signal/slot connections to function pointers. Also, some small changes in Scatterplot and VoronoiSplat to accomodate this. --- scatterplot.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'scatterplot.h') diff --git a/scatterplot.h b/scatterplot.h index 93f4f3f..1b40040 100644 --- a/scatterplot.h +++ b/scatterplot.h @@ -23,11 +23,6 @@ public: arma::mat XY() const; void setColorScale(const ColorScale &colorScale); - void setXY(const arma::mat &xy, bool updateView); - void setColorData(const arma::vec &colorData, bool updateView); - void setOpacityData(const arma::vec &opacityData, bool updateView); - void setScale(const LinearScale &sx, const LinearScale &sy, bool updateView); - void setGlyphSize(float glyphSize, bool updateView); void setAutoScale(bool autoScale); Q_INVOKABLE bool saveToFile(const QUrl &url); @@ -52,10 +47,10 @@ public slots: void setXY(const arma::mat &xy); void setColorData(const arma::vec &colorData); void setOpacityData(const arma::vec &opacityData); + void setScale(const LinearScale &sx, const LinearScale &sy); void setSelection(const std::vector &selection); void brushItem(int item); - void setScale(const LinearScale &sx, const LinearScale &sy); - Q_INVOKABLE void setGlyphSize(float glyphSize); + Q_INVOKABLE void setGlyphSize(float glyphSize, bool updateView = true); protected: QSGNode *updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *); -- cgit v1.2.3