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 {
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
......
......@@ -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();
// }
}
......@@ -251,7 +251,6 @@ public class ChartInternal {
}
break;
case Bar:
// TODO Not Yet Supported
if (series.getSeriesType() == null) {
series.setSeriesType(Series.SeriesType.Bar);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment