Cast integers to string in Matrix vis with auto and fixed-point notation

silx-kit · Feb 3, 2025 · 0748093 · 0748093
1 parent 1ee4149
commit 0748093
Showing 1 changed file with 17 additions and 19 deletions.
diff --git a/packages/app/src/vis-packs/core/matrix/utils.ts b/packages/app/src/vis-packs/core/matrix/utils.ts
@@ -3,8 +3,8 @@ import {
   isBoolType,
   isComplexType,
   isEnumType,
+  isFloatType,
   isIntegerType,
-  isNumericType,
 } from '@h5web/shared/guards';
 import {
   type ComplexType,
@@ -22,7 +22,18 @@ import {
 } from '@h5web/shared/vis-utils';
 import { format } from 'd3-format';
 
-export function createNumericFormatter(
+export function createIntegerFormatter(
+  notation: Notation,
+): (val: ScalarValue<NumericType>) => string {
+  if (notation === Notation.Scientific) {
+    const formatter = format('.3e');
+    return (val) => formatter(Number(val));
+  }
+
+  return (val) => val.toString();
+}
+
+export function createFloatFormatter(
   notation: Notation,
 ): (val: number) => string {
   switch (notation) {
@@ -35,19 +46,6 @@ export function createNumericFormatter(
   }
 }
 
-export function createBigIntFormatter(
-  notation: Notation,
-): (val: ScalarValue<NumericType>) => string {
-  switch (notation) {
-    case Notation.Scientific: {
-      const formatter = createNumericFormatter(notation);
-      return (val) => formatter(Number(val));
-    }
-    default:
-      return (val) => val.toString();
-  }
-}
-
 export function createMatrixComplexFormatter(
   notation: Notation,
 ): (val: ScalarValue<ComplexType>) => string {
@@ -68,12 +66,12 @@ export function getFormatter(
   type: PrintableType,
   notation: Notation,
 ): ValueFormatter<PrintableType> {
-  if (isIntegerType(type) && type.size === 64) {
-    return createBigIntFormatter(notation);
+  if (isIntegerType(type)) {
+    return createIntegerFormatter(notation);
   }
 
-  if (isNumericType(type)) {
-    return createNumericFormatter(notation);
+  if (isFloatType(type)) {
+    return createFloatFormatter(notation);
   }
 
   if (isBoolType(type)) {