Merge branch 'gui-redesign-0.4' into developv0.4.0a1

1 files changed, 6 insertions, 4 deletions

diff --git a/src/main/java/sevenUnits/unit/LinearUnitValue.java b/src/main/java/sevenUnits/unit/LinearUnitValue.java
index a50e1f5..f91d30b 100644
--- a/src/main/java/sevenUnits/unit/LinearUnitValue.java
+++ b/src/main/java/sevenUnits/unit/LinearUnitValue.java
@@ -16,6 +16,7 @@
  */
 package sevenUnits.unit;
 
+import java.math.RoundingMode;
 import java.util.Objects;
 import java.util.Optional;
 
@@ -300,7 +301,7 @@ public final class LinearUnitValue {
 	
 	@Override
 	public String toString() {
-		return this.toString(!this.value.isExact());
+		return this.toString(!this.value.isExact(), RoundingMode.HALF_EVEN);
 	}
 	
 	/**
@@ -315,7 +316,8 @@ public final class LinearUnitValue {
 	 * 
 	 * @since 2020-07-26
 	 */
-	public String toString(final boolean showUncertainty) {
+	public String toString(final boolean showUncertainty,
+			RoundingMode roundingMode) {
 		final Optional<String> primaryName = this.unit.getPrimaryName();
 		final Optional<String> symbol = this.unit.getSymbol();
 		final String chosenName = symbol.orElse(primaryName.orElse(null));
@@ -325,10 +327,10 @@ public final class LinearUnitValue {
 		// get rounded strings
 		// if showUncertainty is true, add brackets around the string
 		final String valueString = (showUncertainty ? "(" : "")
-				+ this.value.toString(showUncertainty)
+				+ this.value.toString(showUncertainty, roundingMode)
 				+ (showUncertainty ? ")" : "");
 		final String baseValueString = (showUncertainty ? "(" : "")
-				+ baseValue.toString(showUncertainty)
+				+ baseValue.toString(showUncertainty, roundingMode)
 				+ (showUncertainty ? ")" : "");
 		
 		// create string