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

reverted attempt to add extra tick mark/line before and after

parent 3c61c6f1
No related branches found
No related tags found
No related merge requests found
......@@ -46,7 +46,7 @@ public abstract class AxisTickCalculator {
/**
* Constructor
*
*
* @param axisDirection
* @param workingSpace
* @param minValue
......@@ -94,7 +94,7 @@ public abstract class AxisTickCalculator {
/**
* Gets the first position
*
*
* @param gridStep
* @return
*/
......@@ -104,10 +104,7 @@ public abstract class AxisTickCalculator {
double firstPosition = minValue - (minValue % gridStep) + gridStep;
// System.out.println(firstPosition - minValue);
// System.out.println(.9 * gridStep);
if ((firstPosition - minValue) > .8 * gridStep) {
if ((firstPosition - minValue) > gridStep) {
firstPosition = minValue - (minValue % gridStep);
}
return firstPosition;
......@@ -125,7 +122,7 @@ public abstract class AxisTickCalculator {
/**
* Determine the grid step for the data set given the space in pixels allocated for the axis
*
*
* @param tickSpace in plot space
* @return
*/
......
......@@ -101,12 +101,12 @@ public class AxisTickLogarithmicCalculator extends AxisTickCalculator {
// System.out.println("j: " + j);
// System.out.println(Math.log10(j) % 1);
if (j < minValue - tickStep * .2) {
if (j < minValue - tickStep) {
// System.out.println("continue");
continue;
}
if (j > maxValue + tickStep * 1.2) {
if (j > maxValue + tickStep) {
// System.out.println("break");
break;
}
......
......@@ -72,8 +72,7 @@ public class AxisTickNumericalCalculator extends AxisTickCalculator {
// System.out.println("scaledfirstPosition: " + cleanedFirstPosition);
// generate all tickLabels and tickLocations from the first to last position
for (BigDecimal tickPosition = cleanedFirstPosition; tickPosition.compareTo(BigDecimal.valueOf(maxValue + cleanedGridStep.doubleValue() * 0.2)) <= 0; tickPosition =
tickPosition.add(cleanedGridStep)) {
for (BigDecimal tickPosition = cleanedFirstPosition; tickPosition.compareTo(BigDecimal.valueOf(maxValue)) < 0; tickPosition = tickPosition.add(cleanedGridStep)) {
tickLabels.add(numberFormatter.formatNumber(tickPosition, minValue, maxValue));
// here we convert tickPosition finally to plot space, i.e. pixels
......
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