From 7a07231716f04ee98091a946e122056e1fa69686 Mon Sep 17 00:00:00 2001 From: Samuel Fadel Date: Fri, 12 Feb 2016 12:39:43 -0200 Subject: Code cleanup: enums & properties renamed/added. * VoronoiSplat: alpha & beta are now properties * ContinuousColorScale: enums renamed to the Qt standard way * Scatterplot: internal state enum renamed * ProjectionObserver: observer type enum renamed --- projectionobserver.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'projectionobserver.cpp') diff --git a/projectionobserver.cpp b/projectionobserver.cpp index 2e6773d..a6b280f 100644 --- a/projectionobserver.cpp +++ b/projectionobserver.cpp @@ -8,7 +8,7 @@ ProjectionObserver::ProjectionObserver(const arma::mat &X, const arma::uvec &cpIndices, ProjectionHistory *history) - : m_type(OBSERVER_CURRENT) + : m_type(ObserverCurrent) , m_X(X) , m_cpIndices(cpIndices) , m_rpIndices(X.n_rows - cpIndices.n_elem) @@ -79,7 +79,7 @@ bool ProjectionObserver::setType(int type) return true; } - if (type == OBSERVER_DIFF_PREVIOUS && !m_history->hasPrev()) { + if (type == ObserverDiffPrevious && !m_history->hasPrev()) { return false; } @@ -146,11 +146,11 @@ void ProjectionObserver::setRPSelection(const std::vector &rpSelection) bool ProjectionObserver::emitValuesChanged() const { switch (m_type) { - case OBSERVER_CURRENT: + case ObserverCurrent: emit rpValuesChanged(m_values(m_rpIndices)); emit valuesChanged(m_values); return true; - case OBSERVER_DIFF_PREVIOUS: + case ObserverDiffPrevious: if (m_history->hasPrev()) { arma::vec diff = m_values - m_prevValues; emit rpValuesChanged(diff(m_rpIndices)); @@ -158,7 +158,7 @@ bool ProjectionObserver::emitValuesChanged() const return true; } return false; - case OBSERVER_DIFF_ORIGINAL: + case ObserverDiffFirst: if (m_history->hasFirst()) { arma::vec diff = m_values - m_firstValues; emit rpValuesChanged(diff(m_rpIndices)); -- cgit v1.2.3