refactor: contour options (#4028)

* refactor: contour options

* chore: fix prettier

* fix: update core

---------

Co-authored-by: tpoisseau <22891227+tpoisseau@users.noreply.github.com>

Author: hamed-musallam

package-lock.json

@@ -71,8 +71,8 @@
     "@tanstack/react-form": "^1.28.3",
     "@tanstack/react-table": "^8.21.3",
     "@zakodium/nmr-types": "^0.5.1",
-    "@zakodium/nmrium-core": "^0.7.0",
-    "@zakodium/nmrium-core-plugins": "^0.7.0",
+    "@zakodium/nmrium-core": "^0.7.1",
+    "@zakodium/nmrium-core-plugins": "^0.7.1",
     "@zakodium/pdnd-esm": "^1.0.2",
     "@zip.js/zip.js": "^2.8.20",
     "cheminfo-font": "^1.13.1",

package.json

@@ -48,11 +48,9 @@ function usePath(contours: ReturnType<typeof drawContours>['contours']) {
 
 const useContoursLevel = (spectrumID: string, sign: LevelSign) => {
   const {
-    view: {
-      zoom: { levels },
-    },
+    view: { spectraContourLevels },
   } = useChartData();
-  const level = levels[spectrumID]?.[sign];
+  const level = spectraContourLevels[spectrumID]?.[sign];
   return level;
 };
 

src/component/2d/ft/Contours.tsx

@@ -57,12 +57,10 @@ export function Spectrum2DSetting({
 }: Spectrum2DSettingProps) {
   const { id, display } = SpectrumData;
   const {
-    view: {
-      zoom: { levels },
-    },
+    view: { spectraContourLevels },
   } = useChartData();
   const methods = useForm({
-    defaultValues: { contourOptions: levels[id], display },
+    defaultValues: { contourOptions: spectraContourLevels[id], display },
   });
   const { positiveColor, negativeColor } = display;
 

src/component/panels/SpectraPanel/base/setting/Spectrum2DSetting.tsx

@@ -104,9 +104,7 @@ export function getDefaultViewState(): ViewState {
       showSimilarityTree: false,
       selectReferences: {},
     },
-    zoom: {
-      levels: {},
-    },
+    spectraContourLevels: {},
     verticalAlign: {},
     predictions: {},
     currentSimulatedSpectrumKey: null,

src/component/reducer/Reducer.ts

@@ -25,16 +25,10 @@ import {
 
 import { isSpectrum1D } from '../../../data/data1d/Spectrum1D/index.js';
 import { isFid1DSpectrum } from '../../../data/data1d/Spectrum1D/isSpectrum1D.js';
-import {
-  getDefaultContoursLevel,
-  initializeContoursLevels,
-} from '../../../data/data2d/Spectrum2D/contours.js';
+import { initializeContoursLevels } from '../../../data/data2d/Spectrum2D/contours.js';
 import { getProjection } from '../../../data/data2d/Spectrum2D/getMissingProjection.js';
 import { isSpectrum2D } from '../../../data/data2d/Spectrum2D/index.js';
-import {
-  isFid2DSpectrum,
-  isFt2DSpectrum,
-} from '../../../data/data2d/Spectrum2D/isSpectrum2D.js';
+import { isFid2DSpectrum } from '../../../data/data2d/Spectrum2D/isSpectrum2D.js';
 import type { ExclusionZone } from '../../../data/types/data1d/ExclusionZone.js';
 import { getXScale } from '../../1d/utilities/scale.js';
 import { get2DXScale, get2DYScale } from '../../2d/utilities/scale.js';
@@ -747,7 +741,8 @@ function afterRollback(draft: Draft<State>, filterKey: any) {
     case fftDimension2: {
       if (!activeSpectrum) return;
       const spectrum = current(draft).data[activeSpectrum.index];
-      draft.view.zoom.levels[spectrum.id] = initializeContoursLevels(spectrum);
+      draft.view.spectraContourLevels[spectrum.id] =
+        initializeContoursLevels(spectrum);
       break;
     }
     default:
@@ -1357,18 +1352,15 @@ function applyFFTTwoDimensionFilter(
 
   const spectrum = draft.data[index];
 
-  if (isFt2DSpectrum(spectrum)) {
-    spectrum.display.contourOptions = getDefaultContoursLevel(spectrum);
-  }
-
   updateView(draft, domainUpdateRules);
 
   //clear zoom history
   draft.zoom.history[draft.view.spectra.activeTab] = [];
 
   draft.toolOptions.selectedOptionPanel = null;
   draft.toolOptions.selectedTool = 'zoom';
-  draft.view.zoom.levels[spectrum.id] = initializeContoursLevels(spectrum);
+  draft.view.spectraContourLevels[spectrum.id] =
+    initializeContoursLevels(spectrum);
 }
 
 function handleApplyFFtDimension1Filter(draft: Draft<State>) {

src/component/reducer/actions/FiltersActions.ts

@@ -179,7 +179,7 @@ function setData(draft: Draft<State>, input: InputProps | InitiateProps) {
     }),
   );
 
-  draft.view.zoom.levels = initializeContours(draft.data);
+  draft.view.spectraContourLevels = initializeContours(draft.data);
 
   setCorrelation(draft, correlations);
 

src/component/reducer/actions/LoadAction.ts

@@ -305,7 +305,8 @@ function handlePredictSpectraFromMolecule(
   )) {
     draft.data.push(spectrum);
     spectraIds.push(spectrum.id);
-    draft.view.zoom.levels[spectrum.id] = initializeContoursLevels(spectrum);
+    draft.view.spectraContourLevels[spectrum.id] =
+      initializeContoursLevels(spectrum);
   }
   let id = molecule?.id;
   //if the id object is not exits add a new molecule

src/component/reducer/actions/MoleculeActions.ts

@@ -1,7 +1,7 @@
 import type { NMRRange } from '@zakodium/nmr-types';
 import type {
   Color2D,
-  ContourOptions,
+  ContourLevel,
   Display1D,
   Display2D,
   SpectraColors,
@@ -96,7 +96,7 @@ type ChangeSpectrumSettingAction = ActionType<
   | {
       id: string;
       display: Display2D;
-      contourOptions: ContourOptions;
+      contourOptions: ContourLevel;
     }
 >;
 type DeleteSpectraAction = ActionType<
@@ -451,8 +451,8 @@ function handleChangeSpectrumSetting(
 
   spectrum.display = display;
   if (isFt2DSpectrum(spectrum) && 'contourOptions' in action.payload) {
-    draft.view.zoom.levels[id] = action.payload.contourOptions;
-    const { checkLevel } = contoursManager(draft.view.zoom.levels[id]);
+    draft.view.spectraContourLevels[id] = action.payload.contourOptions;
+    const { checkLevel } = contoursManager(draft.view.spectraContourLevels[id]);
     checkLevel();
   }
 }

src/component/reducer/actions/SpectraActions.ts

@@ -697,7 +697,9 @@ function levelChangeHandler(draft: Draft<State>, action: LevelChangeAction) {
 
   try {
     for (const spectrum of spectra as Spectrum2D[]) {
-      const zoom = contoursManager(draft.view.zoom.levels[spectrum.id]);
+      const zoom = contoursManager(
+        draft.view.spectraContourLevels[spectrum.id],
+      );
       zoom.wheel(deltaY, { altKey, invertScroll });
     }
   } catch (error) {