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, 8 insertions, 2 deletions

diff --git a/distortionobserver.cpp b/distortionobserver.cpp
index a6c5ba4..29d7e6f 100644
--- a/distortionobserver.cpp
+++ b/distortionobserver.cpp
@@ -6,17 +6,23 @@ DistortionObserver::DistortionObserver(const arma::mat &X,
                                        const arma::uvec &sampleIndices)
     : m_X(X)
     , m_sampleIndices(sampleIndices)
+    , m_distortionMeasure(0)
 {
     m_distX = mp::dist(m_X);
 }
 
-DistortionObserver::~DistortionObserver()
+void DistortionObserver::setMeasure(DistortionMeasure *measure)
 {
+    m_distortionMeasure = measure;
 }
 
 void DistortionObserver::setMap(const arma::mat &Y)
 {
-    arma::vec measures = measureFunc(m_distX, mp::dist(Y));
+    if (!m_distortionMeasure) {
+        return;
+    }
+
+    arma::vec measures = m_distortionMeasure->measure(m_distX, mp::dist(Y));
 
     if (m_Y.n_elem != 0) {
         emit mapChanged(measures - m_measures);