better domain calculation for stacked bar charts (b8dc7bca) · Commits · github_fork / Clip

barchart.cc

+0 −4

Original line number	Diff line number	Diff line
		@@ -22,9 +22,5 @@ void BarChart::setOrientation(kBarChartOrientation orientation) {
		orientation_ = orientation;
		}

		void BarChart::setStacked(bool stacked) {
		stacked_ = stacked;
		}

		}
		}

barchart.h

+28 −13

Original line number	Diff line number	Diff line
		@@ -69,7 +69,7 @@ public:
		*
		* @param stack bars? true or false
		*/
		void setStacked(bool stacked);
		virtual void setStacked(bool stacked) = 0;

		protected:
		kBarChartOrientation orientation_;
		@@ -109,6 +109,13 @@ public:
		*/
		AxisDefinition* addAxis(AxisDefinition::kPosition position) override;

		/**
		* Set the stacked property of this bar chart
		*
		* @param stack bars? true or false
		*/
		void setStacked(bool stacked) override;

		protected:

		void render(RenderTarget* target, Viewport* viewport) const override;
		@@ -194,18 +201,7 @@ void BarChart3D<TX, TY, TZ>::addSeries(Series3D<TX, TY, TZ>* series) {

		data_.addSeries(series);
		series_.push_back(series);

		if (stacked_) {
		for (const auto& bar : data_.getData()) {
		TY max = 0;

		for (const auto& y : bar.ys) {
		max += y.second.value() - y.first.value();
		}

		y_domain->addValue(max);
		}
		}
		setStacked(stacked_);

		if (!series->hasProperty(Series::P_COLOR)) {
		color_palette_.setNextColor(series);
		@@ -395,6 +391,25 @@ const std::string& BarChart3D<TX, TY, TZ>::seriesColor(
		return series_[series_index]->getProperty(Series::P_COLOR);
		}

		template <typename TX, typename TY, typename TZ>
		void BarChart3D<TX, TY, TZ>::setStacked(bool stacked) {
		stacked_ = stacked;

		if (stacked && !y_domain_.empty()) {
		auto y_domain = y_domain_.getAs<Domain<TY>>();

		for (const auto& bar : data_.getData()) {
		TY max = 0;

		for (const auto& y : bar.ys) {
		max += y.second.value() - y.first.value();
		}

		y_domain->addValue(max);
		}
		}
		}

		template <typename TX, typename TY>
		BarChart2D<TX, TY>::BarChart2D(
		Canvas* canvas) :

Admin message