bring back domain padding (74ced962) · Commits · github_fork / Clip

barchart.h

+7 −0

Original line number	Diff line number	Diff line
		@@ -205,6 +205,13 @@ void BarChart3D<TX, TY, TZ>::addSeries(Series3D<TX, TY, TZ>* series) {
		if (y_domain_.empty()) {
		y_domain = Domain<TY>::mkDomain();
		y_domain_.reset(y_domain, true);

		auto cont = dynamic_cast<AnyContinuousDomain*>(y_domain);
		if (cont != nullptr) {
		cont->setPadding(
		AnyDomain::kDefaultDomainPadding,
		AnyDomain::kDefaultDomainPadding);
		}
		} else {
		y_domain = y_domain_.getAs<Domain<TY>>();
		}

+7 −1

Original line number	Diff line number	Diff line
		@@ -49,6 +49,7 @@ public:
		class AnyContinuousDomain {
		public:
		virtual void setLogarithmic(bool logarithmic) = 0;
		virtual void setPadding(double min_padding, double top_padding) = 0;
		};

		/**
		@@ -231,13 +232,18 @@ public:
		is_logarithmic_ = logarithmic;
		}

		void setPadding(double min_padding, double max_padding) {
		padding_.first = min_padding;
		padding_.second = max_padding;
		}

		protected:

		std::pair<double, double> getRangeWithPadding() const {
		double range = max_value_ - min_value_;

		return std::make_pair(
		min_value_ - range * padding_.first,
		min_value_ == 0 ? 0 : min_value_ - range * padding_.first,
		max_value_ + range * padding_.second);
		}

+7 −0

Original line number	Diff line number	Diff line
		@@ -137,6 +137,13 @@ void LineChart2D<TX, TY>::addSeries(Series2D<TX, TY>* series) {
		if (y_domain_.empty()) {
		y_domain = Domain<TY>::mkDomain();
		y_domain_.reset(y_domain, true);

		auto cont = dynamic_cast<AnyContinuousDomain*>(y_domain);
		if (cont != nullptr) {
		cont->setPadding(
		AnyDomain::kDefaultDomainPadding,
		AnyDomain::kDefaultDomainPadding);
		}
		} else {
		y_domain = y_domain_.getAs<Domain<TY>>();
		}

+14 −0

Original line number	Diff line number	Diff line
		@@ -146,6 +146,13 @@ void PointChart3D<TX, TY, TZ>::addSeries(Series3D<TX, TY, TZ>* series) {
		if (x_domain_.empty()) {
		x_domain = Domain<TX>::mkDomain();
		x_domain_.reset(x_domain, true);

		auto cont = dynamic_cast<AnyContinuousDomain*>(x_domain);
		if (cont != nullptr) {
		cont->setPadding(
		AnyDomain::kDefaultDomainPadding,
		AnyDomain::kDefaultDomainPadding);
		}
		} else {
		x_domain = x_domain_.getAs<Domain<TX>>();
		}
		@@ -154,6 +161,13 @@ void PointChart3D<TX, TY, TZ>::addSeries(Series3D<TX, TY, TZ>* series) {
		if (y_domain_.empty()) {
		y_domain = Domain<TY>::mkDomain();
		y_domain_.reset(y_domain, true);

		auto cont = dynamic_cast<AnyContinuousDomain*>(y_domain);
		if (cont != nullptr) {
		cont->setPadding(
		AnyDomain::kDefaultDomainPadding,
		AnyDomain::kDefaultDomainPadding);
		}
		} else {
		y_domain = y_domain_.getAs<Domain<TY>>();
		}