From bfeb90183bae5986b1ee5fed141ede02f457d261 Mon Sep 17 00:00:00 2001
From: Tim Molter <tim.molter@gmail.com>
Date: Wed, 2 Jul 2014 21:39:14 +0200
Subject: [PATCH] reverted attempt to add extra tick mark/line before and after
---
.../xchart/internal/chartpart/AxisTickCalculator.java | 11 ++++-------
.../chartpart/AxisTickLogarithmicCalculator.java | 4 ++--
.../chartpart/AxisTickNumericalCalculator.java | 3 +--
3 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickCalculator.java b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickCalculator.java
index 63bd1646..f75fa367 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickCalculator.java
+++ b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickCalculator.java
@@ -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
*/
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickLogarithmicCalculator.java b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickLogarithmicCalculator.java
index 0c4627b4..60bb7358 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickLogarithmicCalculator.java
+++ b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickLogarithmicCalculator.java
@@ -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;
}
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickNumericalCalculator.java b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickNumericalCalculator.java
index d5fcf6c6..53b925b4 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickNumericalCalculator.java
+++ b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickNumericalCalculator.java
@@ -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
--
GitLab