Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@
"@tanstack/react-store": "^0.11.2",
"@tanstack/react-table": "^9.2.6",
"@zakodium/nmr-types": "^0.5.32",
"@zakodium/nmrium-core": "^0.7.76",
"@zakodium/nmrium-core-plugins": "^0.7.107",
"@zakodium/nmrium-core": "^0.7.80",
"@zakodium/nmrium-core-plugins": "^0.7.115",
"@zakodium/pdnd-esm": "^1.2.0",
"@zakodium/utils": "^0.5.1",
"@zip.js/zip.js": "^2.23.0",
Expand Down Expand Up @@ -96,7 +96,7 @@
"ml-signal-processing": "^2.2.2",
"ml-spectra-processing": "^14.35.1",
"ml-tree-similarity": "^2.2.0",
"nmr-processing": "^22.25.0",
"nmr-processing": "^22.25.5",
"numeral": "^2.0.6",
"openchemlib": "^9.25.1",
"openchemlib-utils": "^8.18.0",
Expand Down
4 changes: 2 additions & 2 deletions src/component/1d/ranges/FloatingRanges.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import type {
FloatingRangesTablePreferences,
} from '@zakodium/nmrium-core';
import { isSpectrum1D } from '@zakodium/nmrium-core';
import { checkMultiplicity } from 'nmr-processing';
import { isMultiplicityValid } from 'nmr-processing';
import { memo, useEffect, useMemo, useState } from 'react';
import { BsArrowsMove } from 'react-icons/bs';
import { FaCog, FaLink, FaTimes } from 'react-icons/fa';
Expand Down Expand Up @@ -102,7 +102,7 @@ function buildSignalItem(
js = [],
diaIDs,
} = signal;
const isNotMultiplet = !checkMultiplicity(multiplicity, ['m']);
const isNotMultiplet = !isMultiplicityValid(multiplicity, ['m']);
return {
id: base.id,
from: base.from,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const editRangeFormValidation = Yup.object().shape({
)
.min(1, 'There must be at least one coupling in a signal')
.test(
'checkMultiplicity',
'isMultiplicityValid',
'Massive multiplicity requires exactly one coupling',
function test(js, context) {
const multiplicity: string =
Expand Down
4 changes: 2 additions & 2 deletions src/component/panels/IntegralsPanel/IntegralTable.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { Info1D, Integral, SignalKind } from '@zakodium/nmr-types';
import dlv from 'dlv';
import { checkIntegralKind } from 'nmr-processing';
import { isIntegralSignalKind } from 'nmr-processing';
import { memo, useCallback, useMemo } from 'react';
import { FaRegTrashAlt } from 'react-icons/fa';

Expand Down Expand Up @@ -119,7 +119,7 @@ function IntegralTable(props: IntegralTableProps) {
getValue() || 0,
integralsPreferences.relative.format,
);
const flag = checkIntegralKind(row.original);
const flag = isIntegralSignalKind(row.original);
const integral = flag ? value : `[ ${value} ]`;

return (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { assert } from '@zakodium/utils';
import { checkMultiplicity } from 'nmr-processing';
import { isMultiplicityValid } from 'nmr-processing';

import { useDispatch } from '../../../context/DispatchContext.js';
import type { EditableColumnProps } from '../../../elements/EditableColumn.js';
Expand Down Expand Up @@ -29,7 +29,7 @@ export default function SignalDeltaColumn(props: RangeColumnProps) {
format,
)}`;

if (!signal || !checkMultiplicity(signal.multiplicity, ['m'])) {
if (!signal || !isMultiplicityValid(signal.multiplicity, ['m'])) {
return (
<td {...rowSpanTags} {...onHover}>
{rangeText}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { Info1D } from '@zakodium/nmr-types';
import { checkMultiplicity } from 'nmr-processing';
import { isMultiplicityValid } from 'nmr-processing';

import { formatNumber } from '../../../utility/formatNumber.js';
import type { RangeColumnProps } from '../RangesTableRow.js';
Expand All @@ -20,7 +20,7 @@ function SignalDeltaHzColumn({
if (!signal) return <td>{''}</td>;
return (
<td {...rowSpanTags} {...onHover}>
{!checkMultiplicity(signal.multiplicity, ['m'])
{!isMultiplicityValid(signal.multiplicity, ['m'])
? `${formatNumber(
row.from * info.originFrequency,
format,
Expand Down
4 changes: 2 additions & 2 deletions src/component/panels/extra/utilities/MultiplicityUtilities.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {
checkMultiplicity,
findMultiplet,
isMultiplicityValid,
translateMultiplet,
} from 'nmr-processing';

Expand All @@ -17,7 +17,7 @@ function hasCouplingConstant(multiplet: string) {
multiplet = translateMultiplet(multiplet);
}
// with the pre-set rejected ones, we check the given multiplicity for the need of having a coupling constant (massive and singlet do not)
return checkMultiplicity(multiplet, ['m', 's']);
return isMultiplicityValid(multiplet, ['m', 's']);
}

function getPascal(n: number | undefined, spin: number) {
Expand Down
Loading