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
990 changes: 524 additions & 466 deletions package-lock.json

Large diffs are not rendered by default.

28 changes: 14 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@
},
"dependencies": {
"@atlaskit/pragmatic-drag-and-drop": "^1.8.1",
"@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.1.0",
"@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.2.0",
"@emotion/react": "^11.14.0",
"@emotion/styled": "^11.14.1",
"@hookform/resolvers": "^5.4.0",
"@tanstack/react-form": "^1.32.0",
"@tanstack/react-form": "^1.33.0",
"@tanstack/react-table": "^8.21.3",
"@zakodium/nmr-types": "^0.5.12",
"@zakodium/nmrium-core": "^0.7.24",
Expand Down Expand Up @@ -106,25 +106,25 @@
"react-d3-utils": "^3.1.2",
"react-dropzone": "^15.0.0",
"react-error-boundary": "^6.1.2",
"react-hook-form": "^7.76.1",
"react-hook-form": "^7.78.0",
"react-icons": "^5.6.0",
"react-inspector": "^9.0.0",
"react-mf": "^3.1.1",
"react-ocl": "^8.7.1",
"react-ocl-nmr": "^4.1.1",
"react-plot": "^3.1.2",
"react-rnd": "^10.5.3",
"react-science": "^19.10.4",
"react-science": "^19.11.0",
"react-table": "^7.8.0",
"smart-array-filter": "^5.0.0",
"ts-pattern": "^5.9.0",
"yup": "^1.7.1",
"zod": "^4.4.3"
},
"devDependencies": {
"@blueprintjs/core": "^6.12.1",
"@blueprintjs/icons": "^6.9.1",
"@blueprintjs/select": "^6.1.10",
"@blueprintjs/core": "^6.16.0",
"@blueprintjs/icons": "^6.11.0",
"@blueprintjs/select": "^6.3.0",
"@playwright/test": "=1.57.0",
"@simbathesailor/use-what-changed": "^2.0.0",
"@types/d3-array": "^3.2.2",
Expand All @@ -133,14 +133,14 @@
"@types/dlv": "^1.1.5",
"@types/file-saver": "^2.0.7",
"@types/lodash": "^4.17.24",
"@types/node": "^25.9.1",
"@types/node": "^25.9.3",
"@types/numeral": "^2.0.5",
"@types/papaparse": "^5.5.2",
"@types/react": "^18.3.13",
"@types/react-dom": "^18.3.1",
"@types/react-table": "^7.7.20",
"@vitejs/plugin-react": "^6.0.2",
"@vitest/coverage-v8": "^4.1.7",
"@vitest/coverage-v8": "^4.1.8",
"@zakodium/tsconfig": "^1.0.5",
"cross-env": "^10.1.0",
"cspell": "^10.0.1",
Expand All @@ -151,20 +151,20 @@
"modern-normalize": "^3.0.1",
"postcss": "^8.5.15",
"postcss-styled-syntax": "^0.7.1",
"prettier": "^3.8.3",
"prettier": "^3.8.4",
"rc-menu": "^9.16.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-router-dom": "^7.15.1",
"react-router-dom": "^7.17.0",
"rimraf": "^6.1.3",
"serve": "^14.2.6",
"stylelint": "^17.13.0",
"stylelint-config-standard": "^40.0.0",
"typescript": "~6.0.3",
"vite": "^8.0.14",
"vitest": "^4.1.7"
"vite": "^8.0.16",
"vitest": "^4.1.8"
},
"volta": {
"node": "24.15.0"
}
}
}
3 changes: 0 additions & 3 deletions src/component/1d/BrushTracker1D.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import { useMapKeyModifiers } from '../context/KeyModifierContext.js';
import { useLogger } from '../context/LoggerContext.js';
import { usePreferences } from '../context/PreferencesContext.js';
import { useScaleChecked } from '../context/ScaleContext.js';
import { useActiveSpectrum } from '../hooks/useActiveSpectrum.js';
import { usePanelPreferences } from '../hooks/usePanelPreferences.js';
import useSpectrum from '../hooks/useSpectrum.js';
import { useVerticalAlign } from '../hooks/useVerticalAlign.js';
Expand Down Expand Up @@ -101,7 +100,6 @@ export function BrushTracker1D({ children }: Required<PropsWithChildren>) {
const convertToPPM = usePixelToPPMConverter();

const { getModifiersKey, primaryKeyIdentifier } = useMapKeyModifiers();
const activeSpectrum = useActiveSpectrum();
const inset = useInsetOptions();
const { updateFilterOptions } =
useFilterSyncOptions<Partial<{ anchors: number[] }>>();
Expand Down Expand Up @@ -561,7 +559,6 @@ export function BrushTracker1D({ children }: Required<PropsWithChildren>) {
<MultipletAnalysisModal
isOpen={isOpenAnalysisModal}
onClose={closeAnalysisModal}
activeSpectrum={activeSpectrum}
{...brushData}
/>
)}
Expand Down
8 changes: 1 addition & 7 deletions src/component/modal/EditPeakShapeModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,7 @@ const FooterContainer = styled.div`
`;

type Shape = NonNullable<Peak1D['shape']>;

type Kind =
| 'gaussian'
| 'lorentzian'
| 'pseudoVoigt'
| 'generalizedLorentzian'
| 'lorentzianDispersive';
type Kind = Shape['kind'];

function getKindDefaultValues(kind: Kind) {
return {
Expand Down
144 changes: 73 additions & 71 deletions src/component/modal/MultipletAnalysisModal.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
import styled from '@emotion/styled';
import type { ActiveSpectrum } from '@zakodium/nmrium-core';
import { isSpectrum1D } from '@zakodium/nmrium-core';
import { xGetFromToIndex, xyToXYObject } from 'ml-spectra-processing';
import type { XreimMultipletAnalysisResultWithDebug } from 'nmr-processing';
import { xreimMultipletAnalysis } from 'nmr-processing';
import { useEffect, useState } from 'react';
import { useEffect, useMemo, useState } from 'react';
import { Axis, LineSeries, Plot } from 'react-plot';

import { isSpectrum2D } from '../../data/data2d/Spectrum2D/index.js';
import { useChartData } from '../context/ChartContext.js';
import { useScaleChecked } from '../context/ScaleContext.js';
import { StandardDialog } from '../elements/StandardDialog.tsx';
import { StyledDialogBody } from '../elements/StyledDialogBody.js';
import useSpectrum from '../hooks/useSpectrum.ts';

const Container = styled.div`
max-height: 500px;
Expand Down Expand Up @@ -67,11 +66,70 @@ const LoaderContainer = styled.div`
`;

interface InnerMultipleAnalysisProps {
activeSpectrum: ActiveSpectrum | null;
startX: number;
endX: number;
}

const ANALYZER_OPTIONS = {
autoPhase: false,
analyzer: {
minimalResolution: 0.1,
critFoundJ: 0.75,
maxTestedJ: 25,
minTestedJ: 1,
checkSymmetryFirst: false,
takeBestPartMultiplet: true,
correctVerticalOffset: true,
symmetrizeEachStep: false,
decreasingJvalues: true,
makeShortCutForSpeed: true,
debug: true,
},
} as const;

function useMultipletAnalysis(
startX: number | null,
endX: number | null,
): XreimMultipletAnalysisResultWithDebug | null {
const spectrum = useSpectrum();
const { scaleX } = useScaleChecked();

return useMemo(() => {
if (
!isSpectrum1D(spectrum) ||
typeof startX !== 'number' ||
typeof endX !== 'number'
) {
return null;
}

const {
data,
info: { baseFrequency: frequency },
} = spectrum;
const { x, re, im } = data;

const from = scaleX().invert(startX);
const to = scaleX().invert(endX);
const { fromIndex, toIndex } = xGetFromToIndex(x, { from, to });

return xreimMultipletAnalysis(
{
x: x.slice(fromIndex, toIndex),
re: re.slice(fromIndex, toIndex),
im: im?.slice(fromIndex, toIndex),
},
{
...ANALYZER_OPTIONS,
analyzer: {
...ANALYZER_OPTIONS.analyzer,
frequency,
},
},
);
}, [spectrum, startX, endX, scaleX]);
}

interface MultipletAnalysisModalProps extends InnerMultipleAnalysisProps {
isOpen: boolean;
onClose: (element?: string) => void;
Expand All @@ -80,7 +138,7 @@ interface MultipletAnalysisModalProps extends InnerMultipleAnalysisProps {
export default function MultipletAnalysisModal(
props: MultipletAnalysisModalProps,
) {
const { activeSpectrum, startX, endX, onClose, isOpen } = props;
const { startX, endX, onClose, isOpen } = props;

return (
<StandardDialog
Expand All @@ -92,7 +150,6 @@ export default function MultipletAnalysisModal(
<StyledDialogBody>
<InnerMultipleAnalysis
{...{
activeSpectrum,
startX,
endX,
}}
Expand All @@ -103,75 +160,20 @@ export default function MultipletAnalysisModal(
}

function InnerMultipleAnalysis(props: InnerMultipleAnalysisProps) {
const [calcStart, setCalcStartStatus] = useState(false);
const [isCalcFinished, setCalcFinished] = useState(false);
const { data } = useChartData();
const { scaleX } = useScaleChecked();
const [isReady, setIsReady] = useState(false);
const { endX, startX } = props;

useEffect(() => {
setTimeout(() => {
setCalcStartStatus(true);
}, 400);
const timer = setTimeout(() => setIsReady(true), 400);
return () => clearTimeout(timer);
}, []);

const { activeSpectrum, startX, endX } = props;
const [analysisData, setAnalysisData] =
useState<XreimMultipletAnalysisResultWithDebug>();

useEffect(() => {
if (activeSpectrum && startX && endX && calcStart) {
const spectrum = data[activeSpectrum.index];
if (isSpectrum2D(spectrum)) {
throw new Error('unreachable');
}

const {
data: { x, re, im },
info,
} = spectrum;

const from = scaleX().invert(startX);
const to = scaleX().invert(endX);

const { fromIndex, toIndex } = xGetFromToIndex(x, {
from,
to,
});

const analysesProps = {
x: x.slice(fromIndex, toIndex),
re: re.slice(fromIndex, toIndex),
im: im?.slice(fromIndex, toIndex),
};

try {
const result = xreimMultipletAnalysis(analysesProps, {
autoPhase: false,
analyzer: {
frequency: info.originFrequency,
minimalResolution: 0.1,
critFoundJ: 0.75,
maxTestedJ: 25,
minTestedJ: 1,
checkSymmetryFirst: false,
takeBestPartMultiplet: true,
correctVerticalOffset: true,
symmetrizeEachStep: false,
decreasingJvalues: true,
makeShortCutForSpeed: true,
debug: true,
},
});
setCalcFinished(true);
setAnalysisData(result);
} catch (error) {
// TODO: handle error
reportError(error);
}
}
}, [startX, endX, data, scaleX, activeSpectrum, calcStart]);
const analysisData = useMultipletAnalysis(
isReady ? startX : null,
isReady ? endX : null,
);

if (!isCalcFinished) {
if (!isReady || !analysisData) {
return (
<LoaderContainer>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ export const useApodization = (
}, [handleSubmit, syncFilterOptions, handleApplyFilter]);

useEffect(() => {
// eslint-disable-next-line react-you-might-not-need-an-effect/no-event-handler
if (applyFilterOnload) {
void handleSubmit((values) => onChange(values))();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,11 @@ export function usePhaseCorrection(
});

useEffect(() => {
// eslint-disable-next-line react-you-might-not-need-an-effect/no-event-handler
if (filter && phaseCorrectionTypeItem?.value === 'manual') {
const { ph0 = 0, ph1 = 0 } = filter?.value || {};
valueRef.current = { ph0, ph1 };
// eslint-disable-next-line react-you-might-not-need-an-effect/no-adjust-state-on-prop-change
setValue(valueRef.current);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ export function usePhaseCorrectionTwoDimensions(filter: Filter2DEntry | null) {
});

useEffect(() => {
// eslint-disable-next-line react-you-might-not-need-an-effect/no-event-handler
if (filter && phaseCorrectionSelectItem?.value === 'manual') {
const { value } = filter;
const phaseOptions: PhaseOptions = defaultPhaseOptions;
Expand All @@ -77,6 +78,7 @@ export function usePhaseCorrectionTwoDimensions(filter: Filter2DEntry | null) {
(phaseOptions as any)[direction] = { ph0, ph1 };
}

// eslint-disable-next-line react-you-might-not-need-an-effect/no-adjust-state-on-prop-change
setValue(phaseOptions);
valueRef.current = phaseOptions;
}
Expand Down
1 change: 1 addition & 0 deletions src/component/useWatchForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export function useWatchForm<F extends FieldValues = FieldValues>(
}, [onChange]);

useEffect(() => {
// eslint-disable-next-line react-you-might-not-need-an-effect/no-event-handler
if (initialValues !== undefined) {
isMountedRef.current = false;
reset?.(initialValues);
Expand Down
1 change: 1 addition & 0 deletions src/demo/views/Exam.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@ export default function Exam(props: any) {
);

useEffect(() => {
// eslint-disable-next-line react-you-might-not-need-an-effect/no-event-handler
if (file) {
void loadData(file, baseURL).then((result) => {
const { state, aggregator } = result;
Expand Down
1 change: 1 addition & 0 deletions src/demo/views/Teaching.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ export default function Teaching(props: any) {
}

useEffect(() => {
// eslint-disable-next-line react-you-might-not-need-an-effect/no-event-handler
if (!file) return;

void loadData(file, baseURL).then(setData);
Expand Down
1 change: 1 addition & 0 deletions src/demo/views/Test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ export default function Test(props: any) {
}

useEffect(() => {
// eslint-disable-next-line react-you-might-not-need-an-effect/no-event-handler
if (!file) return;

void loadData(file, baseURL).then(setData);
Expand Down
1 change: 1 addition & 0 deletions src/demo/views/View.helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ export function useView(props: ViewProps) {
}

useEffect(() => {
// eslint-disable-next-line react-you-might-not-need-an-effect/no-event-handler
if (file) {
void loadData(file, baseURL).then(setData);
}
Expand Down
Loading