From e9d14f93498832687cbdbeb79748f9030e49fb2f Mon Sep 17 00:00:00 2001 From: Samuel Fadel Date: Thu, 21 Jan 2016 14:50:39 +0100 Subject: Added second bar chart. Bar charts are now exclusive to the type of points they are assigned to (either CPs or RPs). --- main.cpp | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'main.cpp') diff --git a/main.cpp b/main.cpp index 45fef63..b9daab9 100644 --- a/main.cpp +++ b/main.cpp @@ -173,9 +173,19 @@ int main(int argc, char **argv) QObject::connect(m->splat, SIGNAL(colorScaleChanged(const ColorScale &)), m->colormap, SLOT(setColorScale(const ColorScale &))); - m->barChart = engine.rootObjects()[0]->findChild("barChart"); - m->barChart->setAcceptedMouseButtons(Qt::LeftButton); - m->setBarChartColorScale(Main::ColorScaleContinuous); + m->cpBarChart = engine.rootObjects()[0]->findChild("cpBarChart"); + m->cpBarChart->setAcceptedMouseButtons(Qt::LeftButton); + m->setCPBarChartColorScale(Main::ColorScaleContinuous); + + m->rpBarChart = engine.rootObjects()[0]->findChild("rpBarChart"); + m->rpBarChart->setAcceptedMouseButtons(Qt::LeftButton); + m->setRPBarChartColorScale(Main::ColorScaleContinuous); + + QObject::connect(m->cpBarChart, SIGNAL(selectionChanged(const QSet &)), + m->cpPlot, SLOT(setSelection(const QSet &))); + + QObject::connect(m->rpBarChart, SIGNAL(selectionChanged(const QSet &)), + m->rpPlot, SLOT(setSelection(const QSet &))); ProjectionObserver projectionObserver(X, cpIndices); m->projectionObserver = &projectionObserver; @@ -186,7 +196,9 @@ int main(int argc, char **argv) QObject::connect(m->projectionObserver, SIGNAL(valuesChanged(const arma::vec &)), m->splat, SLOT(setValues(const arma::vec &))); QObject::connect(m->projectionObserver, SIGNAL(valuesChanged(const arma::vec &)), - m->barChart, SLOT(setValues(const arma::vec &))); + m->cpBarChart, SLOT(setValues(const arma::vec &))); + QObject::connect(m->projectionObserver, SIGNAL(valuesChanged(const arma::vec &)), + m->rpBarChart, SLOT(setValues(const arma::vec &))); //history->addHistoryItem(Ys); m->setColormapColorScale(Main::ColorScaleContinuous); -- cgit v1.2.3