Skip to content

Commit 3feaa7f

Browse files
remove safeMultiply
1 parent 19961f6 commit 3feaa7f

File tree

3 files changed

+12
-27
lines changed

3 files changed

+12
-27
lines changed

frontend/javascripts/libs/format_utils.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,9 +513,12 @@ export function formatBytes(nbytes: number) {
513513
}
514514

515515
export function formatVoxels(voxelCount: number) {
516-
if (voxelCount == null || !Number.isFinite(voxelCount)) {
516+
if (voxelCount == null) {
517517
return "";
518518
}
519+
if (!Number.isFinite(voxelCount)) {
520+
return "Infinity";
521+
}
519522
if (voxelCount > 2 ** 50) {
520523
return `${(voxelCount / 2 ** 50).toPrecision(4)} PVx`;
521524
}

frontend/javascripts/oxalis/model/accessors/dataset_accessor.ts

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -351,28 +351,13 @@ function getDatasetExtentAsProduct(extent: {
351351
height: number;
352352
depth: number;
353353
}) {
354-
const safeMultiply = (a: number, b: number) => {
355-
const result = a * b;
356-
if (!Number.isFinite(result)) {
357-
throw new Error("Dataset extent product exceeds maximum safe number");
358-
}
359-
return result;
360-
};
361-
return safeMultiply(safeMultiply(extent.width, extent.height), extent.depth);
354+
return extent.width * extent.height * extent.depth;
362355
}
363356
export function getDatasetExtentInVoxelAsProduct(dataset: APIDataset) {
364-
try {
365-
return getDatasetExtentAsProduct(getDatasetExtentInVoxel(dataset));
366-
} catch (e) {
367-
console.error(e);
368-
}
357+
return getDatasetExtentAsProduct(getDatasetExtentInVoxel(dataset));
369358
}
370359
export function getDatasetExtentInUnitAsProduct(dataset: APIDataset) {
371-
try {
372-
return getDatasetExtentAsProduct(getDatasetExtentInUnit(dataset));
373-
} catch (e) {
374-
console.error(e);
375-
}
360+
return getDatasetExtentAsProduct(getDatasetExtentInUnit(dataset));
376361
}
377362
export function determineAllowedModes(settings?: Settings): {
378363
preferredMode: APIAllowedMode | null | undefined;

frontend/javascripts/oxalis/view/right-border-tabs/dataset_info_tab_view.tsx

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -131,20 +131,17 @@ export function DatasetExtentRow({ dataset }: { dataset: APIDataset }) {
131131
const extentInLength = getDatasetExtentAsString(dataset, false);
132132
const extentProductInVx = getDatasetExtentInVoxelAsProduct(dataset);
133133
const extentProductInUnit = getDatasetExtentInUnitAsProduct(dataset);
134-
const formattedExtentinUnit =
135-
extentProductInUnit != null
136-
? formatNumberToVolume(
137-
extentProductInUnit,
138-
LongUnitToShortUnitMap[dataset.dataSource.scale.unit],
139-
)
140-
: "Unable to calculate";
134+
const formattedExtentinUnit = formatNumberToVolume(
135+
extentProductInUnit,
136+
LongUnitToShortUnitMap[dataset.dataSource.scale.unit],
137+
);
141138

142139
const renderDSExtentTooltip = () => {
143140
return (
144141
<div>
145142
Dataset extent:
146143
<br />
147-
{extentProductInVx != null ? formatVoxels(extentProductInVx) : "Unable to calculate"}
144+
{formatVoxels(extentProductInVx)}
148145
<br />
149146
{formattedExtentinUnit}
150147
</div>

0 commit comments

Comments
 (0)