TimeDomain (16020321) · Commits · github_fork / Clip

axisdefinition.h

+0 −28

Original line number	Diff line number	Diff line
		@@ -145,34 +145,6 @@ protected:
		bool has_labels_;
		};

		// FIXPAUL: use template specialization
		/*template <typename T>
		AxisDefinition::AxisDefinition(
		kPosition axis_position,
		Domain<T>* domain) :
		position_(axis_position) {
		auto numerical = dynamic_cast<NumericalDomain<T>*>(domain);

		if (numerical == nullptr) {
		int m = domain->getCardinality();

		for (int n = 0; n < m; n++) {
		double tick = domain->offsetAt(n);
		addTick((double) n / m);
		addLabel((double) n / m + (1.0f / (m + 1)) * 0.5, domain->labelAt(n));
		}

		addTick(1.0);
		} else {
		for (int n = 0; n < domain->getCardinality(); n++) {
		double tick = domain->offsetAt(n);
		addTick(tick);
		addLabel(tick, domain->labelAt(n));
		}
		}
		}
		*/

		}
		}
		#endif

domain.cc

+1 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@ template <> Domain<fnordmetric::FloatType>*

		template <> Domain<fnordmetric::TimeType>*
		Domain<fnordmetric::TimeType>::mkDomain() {
		return new ContinuousDomain<fnordmetric::TimeType>();
		return new TimeDomain<fnordmetric::TimeType>();
		}

		template <> Domain<std::string>* Domain<std::string>::mkDomain() {

domain.h

+35 −7

Original line number	Diff line number	Diff line
		@@ -137,8 +137,8 @@ public:
		}
		}

		std::string label(T value) const {
		return util::format::numberToHuman(value);
		virtual std::string label(T value) const {
		return fnordmetric::util::format::numberToHuman(value);
		}

		double valueAt(double index) const {
		@@ -207,8 +207,7 @@ public:
		std::vector<std::pair<double, std::string>> labels;

		for (auto tick : ticks) {
		labels.emplace_back(tick,
		util::format::numberToHuman(valueAt(tick)));
		labels.emplace_back(tick, label(valueAt(tick)));
		}

		return labels;
		@@ -237,9 +236,6 @@ public:
		padding_.second = max_padding;
		}


		double min_value_;
		double max_value_;
		protected:

		std::pair<double, double> getRangeWithPadding() const {
		@@ -249,11 +245,43 @@ protected:
		min_value_ == 0 ? 0 : min_value_ - range * padding_.first,
		max_value_ + range * padding_.second);
		}

		T getRange() const {
		return max_value_ - min_value_;
		}

		double min_value_;
		double max_value_;
		bool is_logarithmic_;
		bool is_inverted_;
		std::pair<double, double> padding_;
		};

		template <typename T>
		class TimeDomain : public ContinuousDomain<T> {
		public:

		TimeDomain(
		T min_value = std::numeric_limits<T>::max(),
		T max_value = std::numeric_limits<T>::min(),
		bool is_logarithmic = false,
		bool is_inverted = false) :
		ContinuousDomain<T>(
		min_value,
		max_value,
		is_logarithmic,
		is_inverted) {}

		std::string label(T value) const {
		struct tm tm;
		gmtime_r(&value, &tm);

		return fnordmetric::util::format::smartTimeFormatWithRange(
		&tm, ContinuousDomain<T>::getRange());
		}

		};

		template <typename T>
		class DiscreteDomain : public Domain<T> {
		public:

Admin message