From 5588131aa1ac52d702ab03cec187f89c230c3025 Mon Sep 17 00:00:00 2001
From: Tim Molter <tim@knowm.org>
Date: Sun, 4 Oct 2015 23:43:57 +0200
Subject: [PATCH] remove date formatting on bar chart X-Axis.
---
.../chartpart/AxisTickBarChartCalculator.java | 18 ++----------------
1 file changed, 2 insertions(+), 16 deletions(-)
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickBarChartCalculator.java b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickBarChartCalculator.java
index a4fed5f8..0c71b058 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickBarChartCalculator.java
+++ b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickBarChartCalculator.java
@@ -16,7 +16,6 @@
package com.xeiam.xchart.internal.chartpart;
import java.math.BigDecimal;
-import java.util.Date;
import java.util.List;
import com.xeiam.xchart.Series;
@@ -71,14 +70,7 @@ public class AxisTickBarChartCalculator extends AxisTickCalculator {
double firstPosition = gridStep / 2.0;
// set up String formatters that may be encountered
- NumberFormatter numberFormatter = null;
- DateFormatter dateFormatter = null;
- if (chartPainter.getAxisPair().getXAxis().getAxisType() == AxisType.Number) {
- numberFormatter = new NumberFormatter(styleManager);
- }
- else if (chartPainter.getAxisPair().getXAxis().getAxisType() == AxisType.Date) {
- dateFormatter = new DateFormatter(chartPainter.getStyleManager());
- }
+ NumberFormatter numberFormatter = new NumberFormatter(styleManager);
int counter = 0;
@@ -88,15 +80,9 @@ public class AxisTickBarChartCalculator extends AxisTickCalculator {
double tickLabelPosition = margin + firstPosition + gridStep * counter++;
tickLocations.add(tickLabelPosition);
}
- else if (chartPainter.getAxisPair().getXAxis().getAxisType() == AxisType.Number) {
+ else {
tickLabels.add(numberFormatter.formatNumber(new BigDecimal(category.toString()), minValue, maxValue, axisDirection));
}
- else if (chartPainter.getAxisPair().getXAxis().getAxisType() == AxisType.Date) {
- long span = (long) Math.abs(maxValue - minValue); // in data space
- long gridStepHint = (long) (span / (double) tickSpace * styleManager.getXAxisTickMarkSpacingHint());
- long timeUnit = dateFormatter.getTimeSpan(gridStepHint);
- tickLabels.add(dateFormatter.formatDate(((Number) ((Date) category).getTime()).doubleValue(), timeUnit));
- }
double tickLabelPosition = (int) (margin + firstPosition + gridStep * counter++);
tickLocations.add(tickLabelPosition);
}
--
GitLab