aboutsummaryrefslogtreecommitdiff
path: root/scatterplot.h
diff options
context:
space:
mode:
authorSamuel Fadel <samuelfadel@gmail.com>2015-09-29 14:59:59 -0300
committerSamuel Fadel <samuelfadel@gmail.com>2015-09-29 14:59:59 -0300
commit30f327b2fd25104916bffe6fe76823f0dbe35a72 (patch)
tree3ceb449cbd3b6e8965e891efe3ea6b36183a6b10 /scatterplot.h
parent56c9ebb2e41bd0487199ed95838cd9e1c1d9dd8d (diff)
Inital history graph implementation and using linear scales where applicable.
- geometry.h for geometry calculation functions - scale.h for implementations of scales (currently only the linear scale) - updated main_view.qml for the new HistoryGraph component - HistoryGraph displays each subsample used as a mini scatterplot (no colors currently) - Scatterplot now uses scale.h for transformations - Code cleanup and some bug fixes
Diffstat (limited to 'scatterplot.h')
-rw-r--r--scatterplot.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/scatterplot.h b/scatterplot.h
index 3d7fa36..43bfc57 100644
--- a/scatterplot.h
+++ b/scatterplot.h
@@ -6,6 +6,7 @@
#include <QtQuick>
#include "colorscale.h"
+#include "scale.h"
class Scatterplot : public QQuickItem
{
@@ -37,21 +38,19 @@ private:
QSGNode *createGlyphNodeTree();
bool updateSelection(bool mergeSelection);
- float fromDataXToScreenX(float x) const;
- float fromDataYToScreenY(float y) const;
-
void applyManipulation();
void updateGeometry();
void updateMaterials();
arma::mat m_xy;
- float m_xmin, m_xmax, m_ymin, m_ymax;
+ LinearScale m_sx, m_sy;
enum InteractionState {
INTERACTION_NONE,
INTERACTION_SELECTING,
INTERACTION_SELECTED,
+ INTERACTION_BEGIN_MOVING,
INTERACTION_MOVING
} m_currentInteractionState;