From d9d0beb9069d0e1e40499bcfd12b8204d4356b04 Mon Sep 17 00:00:00 2001 From: Samuel Fadel Date: Wed, 13 Jan 2016 12:04:55 +0100 Subject: Scatterplot: individual glyph opacity methods & signals. * Removed code that handles selection coordination between cpPlot and full data plot from main * Full plot has control points invisible (opacity = 0) by default --- scatterplot.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'scatterplot.h') diff --git a/scatterplot.h b/scatterplot.h index 1c61656..7649a3f 100644 --- a/scatterplot.h +++ b/scatterplot.h @@ -20,6 +20,7 @@ public: void setColorScale(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 setAutoScale(bool autoScale); Q_INVOKABLE bool saveToFile(const QUrl &url); @@ -28,6 +29,7 @@ signals: void xyChanged(const arma::mat &XY) const; void xyInteractivelyChanged(const arma::mat &XY) const; void colorDataChanged(const arma::vec &colorData) const; + void opacityDataChanged(const arma::vec &opacityData) const; void selectionChanged(const QSet &selection) const; void displaySplatChanged(bool displaySplat) const; void scaleChanged(const LinearScale &sx, const LinearScale &sy) const; @@ -35,6 +37,7 @@ signals: public slots: void setXY(const arma::mat &xy); void setColorData(const arma::vec &colorData); + void setOpacityData(const arma::vec &opacityData); void setSelection(const QSet &selection); void setDisplaySplat(bool displaySplat); void setScale(const LinearScale &sx, const LinearScale &sy); @@ -80,8 +83,10 @@ private: bool m_shouldUpdateGeometry, m_shouldUpdateMaterials; bool m_displaySplat; - arma::vec m_colorData; ColorScale *m_colorScale; + + arma::vec m_colorData; + arma::vec m_opacityData; }; #endif // SCATTERPLOT_H -- cgit v1.2.3