Improvements related to visual representation of distortions.

- New continuous color scale class;
- Improvements in signal handler for calculating distortions;
- Implementation of the NP(k) measure.

1 files changed, 4 insertions, 4 deletions

diff --git a/distortionobserver.h b/distortionobserver.h
index 9141d25..101c53d 100644
--- a/distortionobserver.h
+++ b/distortionobserver.h
@@ -4,12 +4,14 @@
 #include <QObject>
 #include <armadillo>
 
+#include "distortionmeasure.h"
+
 class DistortionObserver : public QObject
 {
     Q_OBJECT
 public:
     DistortionObserver(const arma::mat &X, const arma::uvec &sampleIndices);
-    virtual ~DistortionObserver();
+    void setMeasure(DistortionMeasure *measure);
 
 signals:
     void mapChanged(const arma::vec &distortion);
@@ -17,12 +19,10 @@ signals:
 public slots:
     void setMap(const arma::mat &Y);
 
-protected:
-    virtual arma::vec measureFunc(const arma::mat &distA, const arma::mat &distB) = 0;
-
 private:
     arma::mat m_X, m_Y, m_distX;
     arma::uvec m_sampleIndices;
+    DistortionMeasure *m_distortionMeasure;
     arma::vec m_measures;
 };