From c16f313b008b039dd75ff499931766202b84b356 Mon Sep 17 00:00:00 2001 From: hneemann Date: Fri, 27 Sep 2019 16:17:06 +0200 Subject: [PATCH] csv format is hexadecimal by default if more than 3 bits are used. See #349 --- src/main/java/de/neemann/digital/data/ValueTable.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/de/neemann/digital/data/ValueTable.java b/src/main/java/de/neemann/digital/data/ValueTable.java index a1ef58305..ed5afe18b 100644 --- a/src/main/java/de/neemann/digital/data/ValueTable.java +++ b/src/main/java/de/neemann/digital/data/ValueTable.java @@ -295,8 +295,8 @@ public class ValueTable extends Observable implements Iterable { * Columns formatting information */ public static final class ColumnInfo { - private int bits; - private IntFormat format; + private final int bits; + private final IntFormat format; /** * Creates a new instance @@ -305,6 +305,10 @@ public class ValueTable extends Observable implements Iterable { * @param bits the number of bits to output */ public ColumnInfo(IntFormat format, int bits) { + if (format == null) + format = IntFormat.def; + if (format.equals(IntFormat.def) && (bits > 3)) + format = IntFormat.hex; this.format = format; this.bits = bits; }