From c4c6f50b6ae5b9281e872a83602799b73522c24d Mon Sep 17 00:00:00 2001 From: Samuel Fadel Date: Mon, 18 Jan 2016 19:42:20 +0100 Subject: BarChart & Scatterplot: added hints for vertex data upload. * BarChart: additionally, removed hover event handler and added a movement event handler * Scatterplot: changed selected/unselected outline colors; unselected is now black, selected is a really bright blue --- barchart.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'barchart.cpp') diff --git a/barchart.cpp b/barchart.cpp index f21f874..c2f7255 100644 --- a/barchart.cpp +++ b/barchart.cpp @@ -73,6 +73,7 @@ QSGNode *BarChart::newBarNode() const //QSGGeometry *outlineGeometry = // new QSGGeometry(QSGGeometry::defaultAttributes_Point2D(), 4); //outlineGeometry->setDrawingMode(GL_LINE_LOOP); + //outlineGeometry->setVertexDataPattern(QSGGeometry::DynamicPattern); //outlineGeomNode->setGeometry(outlineGeometry); //outlineGeomNode->setFlag(QSGNode::OwnsGeometry); //QSGFlatColorMaterial *material = new QSGFlatColorMaterial; @@ -84,6 +85,7 @@ QSGNode *BarChart::newBarNode() const QSGGeometry *barGeometry = new QSGGeometry(QSGGeometry::defaultAttributes_Point2D(), 4); barGeometry->setDrawingMode(GL_POLYGON); + barGeometry->setVertexDataPattern(QSGGeometry::DynamicPattern); barGeomNode->setGeometry(barGeometry); barGeomNode->setFlag(QSGNode::OwnsGeometry); QSGFlatColorMaterial *material = new QSGFlatColorMaterial; @@ -173,10 +175,10 @@ QSGNode *BarChart::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *) return root; } -void BarChart::hoverMoveEvent(QHoverEvent *event) -{ - // TODO -} +// TODO +//void BarChart::hoverMoveEvent(QHoverEvent *event) +//{ +//} void BarChart::mousePressEvent(QMouseEvent *event) { @@ -184,6 +186,10 @@ void BarChart::mousePressEvent(QMouseEvent *event) setCursor(dragCursor); } +void BarChart::mouseMoveEvent(QMouseEvent *event) +{ +} + void BarChart::mouseReleaseEvent(QMouseEvent *event) { unsetCursor(); -- cgit v1.2.3