Skip to content
Snippets Groups Projects
Commit 827e574f authored by Tim Molter's avatar Tim Molter
Browse files

misc. cleanup

parent fd959a37
No related branches found
No related tags found
No related merge requests found
...@@ -346,23 +346,19 @@ public class Axis implements ChartPart { ...@@ -346,23 +346,19 @@ public class Axis implements ChartPart {
if (getDirection() == Direction.X && getChartInternal().getChartInternalType() == ChartInternalType.Category) { if (getDirection() == Direction.X && getChartInternal().getChartInternalType() == ChartInternalType.Category) {
return new AxisTickCategoryChartCalculator(getDirection(), workingSpace, getMin(), getMax(), getChartInternal()); return new AxisTickCategoryChartCalculator(getDirection(), workingSpace, getMin(), getMax(), getChartInternal());
} }
else if (getChartInternal().getChartInternalType() == ChartInternalType.XY && getAxisType() == AxisType.Date) { else if (getChartInternal().getChartInternalType() == ChartInternalType.XY && getAxisType() == AxisType.Date) {
return new AxisTickDateCalculator(getDirection(), workingSpace, getMin(), getMax(), getChartInternal().getStyleManager()); return new AxisTickDateCalculator(getDirection(), workingSpace, getMin(), getMax(), getChartInternal().getStyleManager());
} }
else if (getDirection() == Direction.X && getChartInternal().getChartInternalType() == ChartInternalType.XY && getChartInternal().getStyleManager().isXAxisLogarithmic() else if (getDirection() == Direction.X && getChartInternal().getChartInternalType() == ChartInternalType.XY && getChartInternal().getStyleManager().isXAxisLogarithmic()
&& getAxisType() != AxisType.Date) { && getAxisType() != AxisType.Date) {
return new AxisTickLogarithmicCalculator(getDirection(), workingSpace, getMin(), getMax(), getChartInternal().getStyleManager()); return new AxisTickLogarithmicCalculator(getDirection(), workingSpace, getMin(), getMax(), getChartInternal().getStyleManager());
} }
else if (getDirection() == Direction.Y && getChartInternal().getStyleManager().isYAxisLogarithmic() && getAxisType() != AxisType.Date) { else if (getDirection() == Direction.Y && getChartInternal().getStyleManager().isYAxisLogarithmic() && getAxisType() != AxisType.Date) {
return new AxisTickLogarithmicCalculator(getDirection(), workingSpace, getMin(), getMax(), getChartInternal().getStyleManager()); return new AxisTickLogarithmicCalculator(getDirection(), workingSpace, getMin(), getMax(), getChartInternal().getStyleManager());
} }
else { // number else { // number
......
...@@ -126,13 +126,4 @@ public class AxisTick implements ChartPart { ...@@ -126,13 +126,4 @@ public class AxisTick implements ChartPart {
return axisTickLabels; return axisTickLabels;
} }
// public List<Double> getTickLocations() {
//
// return axisTickCalculator.getTickLocations();
// }
//
// public List<String> getTickLabels() {
//
// return axisTickCalculator.getTickLabels();
// }
} }
...@@ -251,7 +251,6 @@ public class ChartInternal { ...@@ -251,7 +251,6 @@ public class ChartInternal {
} }
break; break;
case Bar: case Bar:
// TODO Not Yet Supported
if (series.getSeriesType() == null) { if (series.getSeriesType() == null) {
series.setSeriesType(Series.SeriesType.Bar); series.setSeriesType(Series.SeriesType.Bar);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment