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 --- main.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'main.h') diff --git a/main.h b/main.h index 904b458..c4699c4 100644 --- a/main.h +++ b/main.h @@ -77,9 +77,9 @@ public: } enum ObserverType { - ObserverCurrent = ProjectionObserver::OBSERVER_CURRENT, - ObserverDiffPrevious = ProjectionObserver::OBSERVER_DIFF_PREVIOUS, - ObserverDiffOriginal = ProjectionObserver::OBSERVER_DIFF_ORIGINAL + ObserverCurrent = ProjectionObserver::ObserverCurrent, + ObserverDiffPrevious = ProjectionObserver::ObserverDiffPrevious, + ObserverDiffFirst = ProjectionObserver::ObserverDiffFirst }; Q_INVOKABLE bool setObserverType(ObserverType observerType) { @@ -172,9 +172,9 @@ private: QColor("#d62728"), QColor("#9467bd"), QColor("#8c564b"), QColor("#e377c2"), QColor("#17becf"), QColor("#7f7f7f"), }} - , COLOR_SCALE_CONTINUOUS{ContinuousColorScale::builtin(ContinuousColorScale::HEATED_OBJECTS)} - , COLOR_SCALE_DIVERGENT{ContinuousColorScale::builtin(ContinuousColorScale::RED_GRAY_BLUE)} - , COLOR_SCALE_RAINBOW{ContinuousColorScale::builtin(ContinuousColorScale::RAINBOW)} + , COLOR_SCALE_CONTINUOUS{ContinuousColorScale::builtin(ContinuousColorScale::HeatedObjects)} + , COLOR_SCALE_DIVERGENT{ContinuousColorScale::builtin(ContinuousColorScale::RedGrayBlue)} + , COLOR_SCALE_RAINBOW{ContinuousColorScale::builtin(ContinuousColorScale::Rainbow)} , cpBarChart(0) , rpBarChart(0) , cpPlot(0) -- cgit v1.2.3