From 5bd1fec462466d605f974fa27c3b00826a1bab57 Mon Sep 17 00:00:00 2001 From: Samuel Fadel Date: Fri, 12 Feb 2016 19:03:51 -0200 Subject: Refactoring of Projection{Observer,History} & ManipulationHandler. ProjectionObserver class has been removed, all of its functionality is now inside class ProjectionHistory, thus dealing with the design problem mentioned in the previous commit. ProjectionHistory is now also responsible for all rewinding functionality, which makes more sense. --- projectionobserver.h | 61 ---------------------------------------------------- 1 file changed, 61 deletions(-) delete mode 100644 projectionobserver.h (limited to 'projectionobserver.h') diff --git a/projectionobserver.h b/projectionobserver.h deleted file mode 100644 index c021482..0000000 --- a/projectionobserver.h +++ /dev/null @@ -1,61 +0,0 @@ -#ifndef PROJECTIONOBSERVER_H -#define PROJECTIONOBSERVER_H - -#include -#include - -#include "projectionhistory.h" - -class ProjectionObserver - : public QObject -{ - Q_OBJECT -public: - enum ObserverType { - ObserverCurrent, - ObserverDiffPrevious, - ObserverDiffFirst - }; - - ProjectionObserver(const arma::mat &X, - const arma::uvec &cpIndices); - - void undo(); - void reset(); - -signals: - void valuesChanged(const arma::vec &values) const; - void cpValuesChanged(const arma::vec &values) const; - void rpValuesChanged(const arma::vec &values) const; - void valuesRewound(const arma::vec &values) const; - void cpValuesRewound(const arma::vec &values) const; - void rpValuesRewound(const arma::vec &values) const; - -public slots: - void addMap(const arma::mat &Y); - bool setType(ObserverType type); - void setCPSelection(const std::vector &cpSelection); - void setRPSelection(const std::vector &rpSelection); - void setRewind(double t); - -private: - bool emitValuesChanged() const; - - ObserverType m_type; - arma::mat m_X; - arma::mat m_distX, m_distY, m_firstDistY, m_prevDistY; - arma::uvec m_cpIndices, m_rpIndices; - - bool m_cpSelectionEmpty, m_rpSelectionEmpty; - std::vector m_cpSelection, m_rpSelection; - - // alpha(i, j): the influence CP j has on RP i - void computeAlphas(); - arma::mat m_alphas, m_influences; - - // TODO: one per implemented measure - arma::vec m_values, m_firstValues, m_prevValues; - bool m_hasFirst, m_hasPrev; -}; - -#endif // PROJECTIONOBSERVER_H -- cgit v1.2.3