1 files changed, 76 insertions, 13 deletions

diff --git a/main.cpp b/main.cpp
index 5da297f..559d554 100644
--- a/main.cpp
+++ b/main.cpp
@@ -6,14 +6,21 @@
 #include <QQmlApplicationEngine>
 
 #include "mp.h"
+#include "continuouscolorscale.h"
 #include "scatterplot.h"
+#include "historygraph.h"
 #include "interactionhandler.h"
+#include "selectionhandler.h"
+#include "effectivenessobserver.h"
+#include "distortionobserver.h"
+#include "npdistortion.h"
 
 int main(int argc, char **argv)
 {
     QApplication app(argc, argv);
 
     qmlRegisterType<Scatterplot>("PM", 1, 0, "Scatterplot");
+    qmlRegisterType<HistoryGraph>("PM", 1, 0, "HistoryGraph");
 
     // Set up multisampling
     QSurfaceFormat fmt;
@@ -22,10 +29,11 @@ int main(int argc, char **argv)
     QQmlApplicationEngine engine(QUrl("qrc:///main_view.qml"));
 
     arma::mat dataset;
-    if (argc > 1)
+    if (argc > 1) {
         dataset.load(argv[1], arma::raw_ascii);
-    else
+    } else {
         dataset.load(std::cin, arma::raw_ascii);
+    }
 
     arma::mat X = dataset.cols(0, dataset.n_cols - 2);
     arma::vec labels = dataset.col(dataset.n_cols - 1);
@@ -33,24 +41,79 @@ int main(int argc, char **argv)
     arma::uword n = dataset.n_rows;
     arma::uword subsampleSize = (arma::uword) sqrt(n) * 3;
     arma::uvec sampleIndices = arma::randi<arma::uvec>(subsampleSize, arma::distr_param(0, n-1));
-    arma::mat Ys = arma::randn(subsampleSize, 2);
+    arma::mat Ys(subsampleSize, 2, arma::fill::randn);
     Ys = mp::forceScheme(mp::dist(X.rows(sampleIndices)), Ys);
-    arma::mat subsampleData(subsampleSize, 3);
-    subsampleData.cols(0, 1) = Ys;
-    subsampleData.col(2) = labels(sampleIndices);
 
+    ColorScale colorScale{
+        QColor("#1f77b4"),
+        QColor("#ff7f0e"),
+        QColor("#2ca02c"),
+        QColor("#d62728"),
+        QColor("#9467bd"),
+        QColor("#8c564b"),
+        QColor("#e377c2"),
+        QColor("#17becf"),
+        QColor("#7f7f7f"),
+    };
+    colorScale.setExtents(labels.min(), labels.max());
+
+    //ContinuousColorScale colorScale = ContinuousColorScale::builtin(ContinuousColorScale::RED_GRAY_BLUE);
+    //colorScale.setExtents(-1, 1);
     Scatterplot *subsamplePlot = engine.rootObjects()[0]->findChild<Scatterplot *>("subsamplePlot");
+    HistoryGraph *history = engine.rootObjects()[0]->findChild<HistoryGraph *>("history");
     subsamplePlot->setAcceptedMouseButtons(Qt::LeftButton | Qt::MiddleButton | Qt::RightButton);
-    subsamplePlot->setData(subsampleData);
+    // subsamplePlot->setColorData(arma::zeros<arma::vec>(subsampleSize));
+    subsamplePlot->setColorScale(&colorScale);
     Scatterplot *plot = engine.rootObjects()[0]->findChild<Scatterplot *>("plot");
 
     // connect both plots through interaction handler
-    std::unique_ptr<InteractionHandler> interactionHandler(new InteractionHandler(X, labels, sampleIndices));
-    QObject::connect(subsamplePlot, SIGNAL(dataChanged(const arma::mat &)),
-                        interactionHandler.get(), SLOT(setSubsample(const arma::mat &)));
-    QObject::connect(interactionHandler.get(), SIGNAL(subsampleChanged(const arma::mat &)),
-                        plot, SLOT(setData(const arma::mat &)));
-    interactionHandler.get()->setSubsample(Ys);
+    InteractionHandler interactionHandler(X, sampleIndices);
+    QObject::connect(subsamplePlot, SIGNAL(xyChanged(const arma::mat &)),
+            &interactionHandler, SLOT(setSubsample(const arma::mat &)));
+    QObject::connect(subsamplePlot, SIGNAL(xyInteractivelyChanged(const arma::mat &)),
+            &interactionHandler, SLOT(setSubsample(const arma::mat &)));
+    QObject::connect(&interactionHandler, SIGNAL(subsampleChanged(const arma::mat &)),
+            plot, SLOT(setXY(const arma::mat &)));
+    QObject::connect(subsamplePlot, SIGNAL(xyInteractivelyChanged(const arma::mat &)),
+            history, SLOT(addHistoryItem(const arma::mat &)));
+    QObject::connect(history, SIGNAL(currentItemChanged(const arma::mat &)),
+            subsamplePlot, SLOT(setXY(const arma::mat &)));
+
+    SelectionHandler selectionHandler(sampleIndices);
+    QObject::connect(subsamplePlot, SIGNAL(selectionChanged(const QSet<int> &)),
+            &selectionHandler, SLOT(setSelection(const QSet<int> &)));
+    QObject::connect(&selectionHandler, SIGNAL(selectionChanged(const QSet<int> &)),
+            plot, SLOT(setSelection(const QSet<int> &)));
+
+    /*
+    DistortionObserver distortionObs(X, sampleIndices);
+    std::unique_ptr<DistortionMeasure> distortionMeasure(new NPDistortion());
+    distortionObs.setMeasure(distortionMeasure.get());
+    QObject::connect(&interactionHandler, SIGNAL(subsampleChanged(const arma::mat &)),
+            &distortionObs, SLOT(setMap(const arma::mat &)));
+    QObject::connect(&distortionObs, SIGNAL(mapChanged(const arma::vec &)),
+            plot, SLOT(setColorData(const arma::vec &)));
+
+    EffectiveInteractionEnforcer enforcer(sampleIndices);
+    QObject::connect(subsamplePlot, SIGNAL(selectionChanged(const arma::uvec &)),
+            &enforcer, SLOT(setSelection(const arma::uvec &)));
+    QObject::connect(plot, SIGNAL(colorDataChanged(const arma::vec &)),
+            &enforcer, SLOT(setMeasureDifference(const arma::vec &)));
+    QObject::connect(&enforcer, SIGNAL(effectivenessChanged(const arma::vec &)),
+            subsamplePlot, SLOT(setColorData(const arma::vec &)));
+    */
+
+    /*
+    ContinuousColorScale ccolorScale = ContinuousColorScale::builtin(ContinuousColorScale::RED_GRAY_BLUE);
+    ccolorScale.setExtents(-1, 1);
+    plot->setColorScale(&ccolorScale);
+    */
+    plot->setColorScale(&colorScale);
+    plot->setColorData(labels);
+
+    history->addHistoryItem(Ys);
+    subsamplePlot->setXY(Ys);
+    subsamplePlot->setColorData(labels(sampleIndices));
 
     return app.exec();
 }