aboutsummaryrefslogtreecommitdiff
path: root/projectionobserver.cpp
diff options
context:
space:
mode:
authorSamuel Fadel <samuelfadel@gmail.com>2016-02-12 12:39:43 -0200
committerSamuel Fadel <samuelfadel@gmail.com>2016-02-12 12:39:43 -0200
commit7a07231716f04ee98091a946e122056e1fa69686 (patch)
tree2998baa4336a4dae4638e29d2a2b3f2ba6958a21 /projectionobserver.cpp
parent893380be1bde766736c1e099731bacb87f239a3a (diff)
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
Diffstat (limited to 'projectionobserver.cpp')
-rw-r--r--projectionobserver.cpp10
1 files changed, 5 insertions, 5 deletions
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<bool> &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));