diff --git a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Axis.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Axis.java index d541294537ee6a2f02d65777a6e466a329e3a724..8793cf790b4bb32856f1eb386ce7ddc4f30a8a85 100644 --- a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Axis.java +++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Axis.java @@ -346,23 +346,19 @@ public class Axis implements ChartPart { if (getDirection() == Direction.X && getChartInternal().getChartInternalType() == ChartInternalType.Category) { return new AxisTickCategoryChartCalculator(getDirection(), workingSpace, getMin(), getMax(), getChartInternal()); - } else if (getChartInternal().getChartInternalType() == ChartInternalType.XY && getAxisType() == AxisType.Date) { return new AxisTickDateCalculator(getDirection(), workingSpace, getMin(), getMax(), getChartInternal().getStyleManager()); - } else if (getDirection() == Direction.X && getChartInternal().getChartInternalType() == ChartInternalType.XY && getChartInternal().getStyleManager().isXAxisLogarithmic() && getAxisType() != AxisType.Date) { return new AxisTickLogarithmicCalculator(getDirection(), workingSpace, getMin(), getMax(), getChartInternal().getStyleManager()); - } else if (getDirection() == Direction.Y && getChartInternal().getStyleManager().isYAxisLogarithmic() && getAxisType() != AxisType.Date) { return new AxisTickLogarithmicCalculator(getDirection(), workingSpace, getMin(), getMax(), getChartInternal().getStyleManager()); - } else { // number diff --git a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTick.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTick.java index 11fa08cbcebc3ff1f6601da33d46dd23807f68e3..be540b5cf211ea43be753051fdf64e8c87885c28 100644 --- a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTick.java +++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTick.java @@ -79,13 +79,13 @@ public class AxisTick implements ChartPart { bounds = new Rectangle2D.Double( - axisTickLabels.getBounds().getX(), + axisTickLabels.getBounds().getX(), - axisTickLabels.getBounds().getY(), + axisTickLabels.getBounds().getY(), - axisTickLabels.getBounds().getWidth() + getChartInternal().getStyleManager().getAxisTickPadding() + axisTickMarks.getBounds().getWidth(), + axisTickLabels.getBounds().getWidth() + getChartInternal().getStyleManager().getAxisTickPadding() + axisTickMarks.getBounds().getWidth(), - axisTickMarks.getBounds().getHeight() + axisTickMarks.getBounds().getHeight() ); @@ -126,13 +126,4 @@ public class AxisTick implements ChartPart { return axisTickLabels; } - // public List<Double> getTickLocations() { - // - // return axisTickCalculator.getTickLocations(); - // } - // - // public List<String> getTickLabels() { - // - // return axisTickCalculator.getTickLabels(); - // } } diff --git a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/ChartInternal.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/ChartInternal.java index d3fb433143201aab671b57431ffc4e46e771d054..3609cbdb6cbb0a43815933d56130ed974e71187f 100644 --- a/xchart/src/main/java/org/knowm/xchart/internal/chartpart/ChartInternal.java +++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/ChartInternal.java @@ -251,7 +251,6 @@ public class ChartInternal { } break; case Bar: - // TODO Not Yet Supported if (series.getSeriesType() == null) { series.setSeriesType(Series.SeriesType.Bar); }