aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Fadel <samuelfadel@gmail.com>2016-01-21 14:49:12 +0100
committerSamuel Fadel <samuelfadel@gmail.com>2016-01-21 14:49:12 +0100
commit664dc43127bf0dc5791423898ffab6748f016dd7 (patch)
treed0d2c5d54379c6569d5464cee2ae6b706d4ca20a
parentb019d016da8c645fcc581dd170df821c4fec079c (diff)
BarChart: added selection mechanisms.
-rw-r--r--barchart.cpp85
-rw-r--r--barchart.h8
2 files changed, 91 insertions, 2 deletions
diff --git a/barchart.cpp b/barchart.cpp
index 34f1897..eb75dc8 100644
--- a/barchart.cpp
+++ b/barchart.cpp
@@ -13,12 +13,23 @@
static const QColor OUTLINE_COLOR(0, 0, 0);
static const QColor HINTS_COLOR(0, 0, 0);
static const QColor BAR_COLOR(128, 128, 128);
+static const QColor SELECTION_COLOR(128, 128, 128, 96);
+
static const float DEFAULT_OPACITY = 0.8f;
+template<typename T>
+static inline T clamp(T value, T min, T max)
+{
+ return std::min(std::max(min, value), max);
+}
+
BarChart::BarChart(QQuickItem *parent)
: QQuickItem(parent)
, m_shouldUpdateBars(false)
, m_hoverPos(-1.0f)
+ , m_shouldUpdateSelectionRect(false)
+ , m_dragStartPos(-1.0f)
+ , m_dragLastPos(-1.0f)
, m_colorScale(ContinuousColorScale::builtin(ContinuousColorScale::HEATED_OBJECTS))
, m_scale(0.0f, 1.0f, 0.0f, 1.0f)
{
@@ -69,7 +80,7 @@ void BarChart::setColorScale(const ColorScale &scale)
QSGNode *BarChart::newSceneGraph() const
{
// NOTE: scene graph structure is as follows:
- // root [ barsNode [ ... ] hoverHintsNode ]
+ // root [ barsNode [ ... ] hoverHintsNode selectionNode ]
QSGTransformNode *root = new QSGTransformNode;
// The node that has all bars as children
@@ -88,6 +99,11 @@ QSGNode *BarChart::newSceneGraph() const
hintsGeomNode->setFlags(QSGNode::OwnsGeometry | QSGNode::OwnsMaterial);
root->appendChildNode(hintsGeomNode);
+ // The node for drawing the selectionRect
+ QSGSimpleRectNode *selectionRectNode = new QSGSimpleRectNode;
+ selectionRectNode->setColor(SELECTION_COLOR);
+ root->appendChildNode(selectionRectNode);
+
return root;
}
@@ -136,7 +152,10 @@ void BarChart::updateViewport(QSGNode *root) const
viewportNode->setMatrix(viewport);
}
-void BarChart::updateBarNodeGeom(QSGNode *barNode, float x, float barWidth, float barHeight)
+void BarChart::updateBarNodeGeom(QSGNode *barNode,
+ float x,
+ float barWidth,
+ float barHeight)
{
float y = 1.0f - barHeight;
@@ -201,6 +220,18 @@ void BarChart::updateHoverHints(QSGNode *node)
hintsGeomNode->markDirty(QSGNode::DirtyGeometry);
}
+void BarChart::updateSelectionRect(QSGNode *node)
+{
+ QSGSimpleRectNode *selectionGeomNode =
+ static_cast<QSGSimpleRectNode *>(node);
+
+ float x = m_dragStartPos,
+ y = 0.0f,
+ width = m_dragLastPos - m_dragStartPos,
+ height = 1.0f;
+ selectionGeomNode->setRect(x, y, width, height);
+}
+
QSGNode *BarChart::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *)
{
QSGNode *root = oldNode ? oldNode : newSceneGraph();
@@ -216,9 +247,40 @@ QSGNode *BarChart::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *)
updateHoverHints(node);
node = node->nextSibling();
+ if (m_shouldUpdateSelectionRect) {
+ updateSelectionRect(node);
+ m_shouldUpdateSelectionRect = false;
+ }
+ node = node->nextSibling();
+
return root;
}
+void BarChart::selectBarsInRange(float start, float end)
+{
+ if (start > end) {
+ std::swap(start, end);
+ }
+
+ m_selection.clear();
+ if (start > 0 && end > 0) {
+ // Bars are located in ranges:
+ // [0..barWidth] + barIndex / barWidth
+ int numValues = m_values.n_elem;
+ float barWidth = 1.0f / numValues;
+ float selectorWidth = 1.0f / width();
+ int firstIndex = int(start / barWidth);
+ int lastIndex = std::min(numValues - 1, int((end + selectorWidth) / barWidth));
+
+ for (int i = firstIndex; i <= lastIndex; i++) {
+ m_selection.insert(m_originalIndices[i]);
+ }
+ }
+ emit selectionChanged(m_selection);
+
+ update();
+}
+
void BarChart::hoverEnterEvent(QHoverEvent *event)
{
m_hoverPos = float(event->pos().x()) / width();
@@ -241,13 +303,32 @@ void BarChart::mousePressEvent(QMouseEvent *event)
{
QCursor dragCursor(Qt::SizeHorCursor);
setCursor(dragCursor);
+
+ float pos = float(event->pos().x()) / width();
+ m_dragStartPos = pos;
+ m_dragLastPos = pos;
+ m_hoverPos = pos;
+ m_shouldUpdateSelectionRect = true;
+ update();
}
void BarChart::mouseMoveEvent(QMouseEvent *event)
{
+ float pos = float(event->pos().x()) / width();
+ m_dragLastPos = clamp(pos, 0.0f, 1.0f);
+ m_hoverPos = pos;
+ m_shouldUpdateSelectionRect = true;
+ update();
}
void BarChart::mouseReleaseEvent(QMouseEvent *event)
{
unsetCursor();
+
+ float pos = float(event->pos().x()) / width();
+ m_dragLastPos = clamp(pos, 0.0f, 1.0f);
+ m_hoverPos = pos;
+ selectBarsInRange(m_dragStartPos, m_dragLastPos);
+ m_shouldUpdateSelectionRect = true;
+ update();
}
diff --git a/barchart.h b/barchart.h
index 91cce78..d785aa9 100644
--- a/barchart.h
+++ b/barchart.h
@@ -4,6 +4,7 @@
#include <vector>
#include <QtQuick>
+#include <QSet>
#include <armadillo>
@@ -21,6 +22,7 @@ public:
signals:
void valuesChanged(const arma::vec &values) const;
void colorScaleChanged(const ColorScale &scale) const;
+ void selectionChanged(const QSet<int> &selection) const;
public slots:
void setValues(const arma::vec &values);
@@ -49,6 +51,12 @@ private:
bool m_shouldUpdateBars;
float m_hoverPos;
+ void updateSelectionRect(QSGNode *node);
+ bool m_shouldUpdateSelectionRect;
+ void selectBarsInRange(float start, float end);
+ float m_dragStartPos, m_dragLastPos;
+ QSet<int> m_selection;
+
arma::vec m_values;
ColorScale m_colorScale;
std::vector<int> m_originalIndices;