From 95a77b04a6855b26d340aaca5e3030a7d1a7cb3c Mon Sep 17 00:00:00 2001 From: Samuel Fadel Date: Fri, 12 Feb 2016 18:01:27 -0200 Subject: Many bugfixes related to ProjectionObserver. * Correct handling of relative metrics in UI * undo(), reset() methods added * Main class responsible for undoing and resetting both history and the observer (MUST BE AT THE SAME TIME! -- this might indicate a design issue to be addressed in the future) --- main.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'main.cpp') diff --git a/main.cpp b/main.cpp index 6eed197..a5aaf68 100644 --- a/main.cpp +++ b/main.cpp @@ -247,14 +247,10 @@ int main(int argc, char **argv) m->rpBarChart, &BarChart::brushItem); // Recompute values whenever projection changes - ProjectionObserver projectionObserver(X, cpIndices, m->projectionHistory); + ProjectionObserver projectionObserver(X, cpIndices); m->projectionObserver = &projectionObserver; QObject::connect(m->projectionHistory, &ProjectionHistory::mapAdded, - m->projectionObserver, &ProjectionObserver::setMap); - QObject::connect(m->projectionHistory, &ProjectionHistory::undoPerformed, - m->projectionObserver, &ProjectionObserver::setMap); - QObject::connect(m->projectionHistory, &ProjectionHistory::resetPerformed, - m->projectionObserver, &ProjectionObserver::setMap); + m->projectionObserver, &ProjectionObserver::addMap); QObject::connect(m->projectionObserver, &ProjectionObserver::cpValuesChanged, m->cpPlot, &Scatterplot::setColorData); QObject::connect(m->projectionObserver, &ProjectionObserver::rpValuesChanged, -- cgit v1.2.3