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.h | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'main.h') diff --git a/main.h b/main.h index fd7afbf..9128d88 100644 --- a/main.h +++ b/main.h @@ -93,8 +93,12 @@ public: colormap->setColorScale(getColorScale(colorScaleType)); } - Q_INVOKABLE void setBarChartColorScale(ColorScaleType colorScaleType) { - barChart->setColorScale(getColorScale(colorScaleType)); + Q_INVOKABLE void setCPBarChartColorScale(ColorScaleType colorScaleType) { + cpBarChart->setColorScale(getColorScale(colorScaleType)); + } + + Q_INVOKABLE void setRPBarChartColorScale(ColorScaleType colorScaleType) { + rpBarChart->setColorScale(getColorScale(colorScaleType)); } Q_INVOKABLE void setSplatColorScale(ColorScaleType colorScaleType) { @@ -103,7 +107,7 @@ public: // Pointer to visual components whose values are set in the main() function // after components are instantiated by the QtQuick engine - BarChart *barChart; + BarChart *cpBarChart, *rpBarChart; Colormap *colormap; Scatterplot *cpPlot, *rpPlot; VoronoiSplat *splat; @@ -132,7 +136,8 @@ private: , COLOR_SCALE_CONTINUOUS{ContinuousColorScale::builtin(ContinuousColorScale::HEATED_OBJECTS)} , COLOR_SCALE_DIVERGENT{ContinuousColorScale::builtin(ContinuousColorScale::RED_GRAY_BLUE)} , COLOR_SCALE_RAINBOW{ContinuousColorScale::builtin(ContinuousColorScale::RAINBOW)} - , barChart(0) + , cpBarChart(0) + , rpBarChart(0) , cpPlot(0) , rpPlot(0) , splat(0) -- cgit v1.2.3