From 20fb359d2a487f425463f2efe2390c1d34e724d9 Mon Sep 17 00:00:00 2001 From: Samuel Fadel Date: Sat, 19 Dec 2015 12:27:02 +0100 Subject: InteractionHandler: added setTechnique() * Added new method to set the technique being used (should probably add the related signals * Added a new protected constructor to use enums with QML * Enum type renamed to Technique (was InteractiveTechnique) voronoisplat.cpp \ --- interactionhandler.h | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'interactionhandler.h') diff --git a/interactionhandler.h b/interactionhandler.h index 784746e..eeda230 100644 --- a/interactionhandler.h +++ b/interactionhandler.h @@ -8,15 +8,16 @@ class InteractionHandler : public QObject { Q_OBJECT public: - enum InteractiveTechnique { + Q_ENUMS(Technique) + enum Technique { TECHNIQUE_PLMP, TECHNIQUE_LAMP, - TECHNIQUE_LSP + TECHNIQUE_LSP, + TECHNIQUE_PEKALSKA }; InteractionHandler(const arma::mat &X, const arma::uvec &sampleIndices); - - void setTechnique(InteractiveTechnique technique) { m_technique = technique; } + void setTechnique(Technique technique); signals: void subsampleChanged(const arma::mat &Y); @@ -24,10 +25,13 @@ signals: public slots: void setSubsample(const arma::mat &Ys); +protected: + InteractionHandler() {} + private: arma::mat m_X, m_Y; arma::uvec m_sampleIndices; - InteractiveTechnique m_technique; + Technique m_technique; }; #endif // INTERACTIONHANDLER_H -- cgit v1.2.3