From 517eb6ca3186c85c46056bbb4f7f9a446c913f81 Mon Sep 17 00:00:00 2001
From: Tim Molter <tim.molter@gmail.com>
Date: Sat, 26 Apr 2014 15:45:44 +0200
Subject: [PATCH] more decimal formatting issues
---
.../xeiam/xchart/demo/charts/scatter/ScatterChart02.java | 2 +-
.../xeiam/xchart/internal/chartpart/NumberFormatter.java | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/scatter/ScatterChart02.java b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/scatter/ScatterChart02.java
index 0cab9ca4..a3c0bd4c 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/scatter/ScatterChart02.java
+++ b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/scatter/ScatterChart02.java
@@ -56,7 +56,7 @@ public class ScatterChart02 implements ExampleChart {
for (int i = 0; i < size; i++) {
double nextRandom = random.nextDouble();
xData.add(Math.pow(10, nextRandom * 10));
- yData.add(1000000000.0 + nextRandom * 100);
+ yData.add(1000000000.0 + nextRandom);
}
// Create Chart
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/NumberFormatter.java b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/NumberFormatter.java
index 3fd3da4b..d58db61a 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/NumberFormatter.java
+++ b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/NumberFormatter.java
@@ -77,10 +77,10 @@ public class NumberFormatter {
StringBuilder sb = new StringBuilder();
for (int i = maxNumPlaces - 1; i >= -1 * maxNumPlaces; i--) {
- if (i >= 0 && (i < placeOfValue && i >= placeOfDifference)) {
+ if (i >= 0 && (i < placeOfValue)) {
sb.append("0");
}
- else if (i < 0 && (i > placeOfValue && i >= placeOfDifference)) {
+ else if (i < 0 && (i > placeOfValue)) {
sb.append("0");
}
else {
@@ -99,7 +99,7 @@ public class NumberFormatter {
private String getScientificDecimalPattern() {
- return "0E0";
+ return "0.###############E0";
}
/**
--
GitLab