feat: update nmr-load-save

cheminfo · Nov 6, 2023 · 39669b4 · 39669b4
1 parent 565fb92
commit 39669b4
Show file tree

Hide file tree

Showing 8 changed files with 87 additions and 77 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -86,7 +86,7 @@
     "ml-stat": "^1.3.3",
     "multiplet-analysis": "^2.1.2",
     "nmr-correlation": "^2.3.3",
-    "nmr-load-save": "^0.22.4",
+    "nmr-load-save": "^0.23.0",
     "nmr-processing": "^11.4.1",
     "nmredata": "^0.9.7",
     "numeral": "^2.0.6",

diff --git a/src/component/modal/setting/settings-tabs/OnLoadProcessingTabContent.tsx b/src/component/modal/setting/settings-tabs/OnLoadProcessingTabContent.tsx
@@ -1,5 +1,6 @@
 import { useFormikContext } from 'formik';
-import { OnLoadProcessing, WorkspacePreferences } from 'nmr-load-save';
+import { WorkspacePreferences } from 'nmr-load-save';
+import { BaseFilter } from 'nmr-processing';
 import { useState } from 'react';
 import { TabItem, Tabs } from 'react-science/ui';
 
@@ -37,7 +38,7 @@ function OnLoadProcessingTabContent() {
 }
 
 function FiltersTable({ data, nucleus }) {
-  const COLUMNS: Array<CustomColumn<OnLoadProcessing>> = [
+  const COLUMNS: Array<CustomColumn<BaseFilter>> = [
     {
       index: 1,
       Header: '#',

diff --git a/src/component/reducer/actions/LoadActions.ts b/src/component/reducer/actions/LoadActions.ts
@@ -96,7 +96,7 @@ function setData(
 ) {
   const {
     nmriumState: { data, view },
-    onLoadProcessing = {},
+    onLoadProcessing = { autoProcessing: true },
     parseMetaFileResult = null,
   } = input || {
     nmriumState: { data: { spectra: [], molecules: [], correlations: {} } },
@@ -133,7 +133,9 @@ function setData(
   draft.data = draft.data.concat(
     initSpectra(spectra, {
       usedColors: draft.usedColors,
-      onLoadProcessing: autoOnLoadProcessing ? onLoadProcessing : {},
+      onLoadProcessing: autoOnLoadProcessing
+        ? onLoadProcessing
+        : { autoProcessing: true },
       molecules: draft.molecules,
     }),
   );

diff --git a/src/component/workspaces/exercise.ts b/src/component/workspaces/exercise.ts
@@ -34,6 +34,7 @@ export const exercise: InnerWorkspace = {
     verticalSplitterCloseThreshold: 600,
     spectraRendering: 'auto',
     loggingLevel: 'info',
+    invert: false,
   },
   formatting: {
     nuclei: {},

diff --git a/src/component/workspaces/prediction.ts b/src/component/workspaces/prediction.ts
@@ -9,6 +9,7 @@ export const prediction: InnerWorkspace = {
     verticalSplitterCloseThreshold: 600,
     spectraRendering: 'auto',
     loggingLevel: 'info',
+    invert: false,
   },
   display: {
     panels: {

diff --git a/src/component/workspaces/simulation.ts b/src/component/workspaces/simulation.ts
@@ -9,6 +9,7 @@ export const simulation: InnerWorkspace = {
     verticalSplitterCloseThreshold: 600,
     spectraRendering: 'auto',
     loggingLevel: 'info',
+    invert: false,
   },
   display: {
     panels: {

diff --git a/src/component/workspaces/workspaceDefaultProperties.ts b/src/component/workspaces/workspaceDefaultProperties.ts
@@ -61,6 +61,7 @@ export const workspaceDefaultProperties: Required<WorkspacePreferences> = {
     verticalSplitterCloseThreshold: 600,
     spectraRendering: 'auto',
     loggingLevel: 'info',
+    invert: false,
   },
   formatting: {
     nuclei: {
@@ -121,76 +122,79 @@ export const workspaceDefaultProperties: Required<WorkspacePreferences> = {
     ],
   },
   onLoadProcessing: {
-    '1H': [
-      {
-        name: Filters.digitalFilter.id,
-        label: Filters.digitalFilter.name,
-        value: {},
-        flag: true,
-      },
-      {
-        name: Filters.apodization.id,
-        label: Filters.apodization.name,
-        value: {},
-        flag: false,
-      },
-      {
-        name: Filters.zeroFilling.id,
-        label: Filters.zeroFilling.name,
+    autoProcessing: true,
+    filters: {
+      '1H': [
+        {
+          name: Filters.digitalFilter.id,
+          label: Filters.digitalFilter.name,
+          value: {},
+          flag: true,
+        },
+        {
+          name: Filters.apodization.id,
+          label: Filters.apodization.name,
+          value: {},
+          flag: false,
+        },
+        {
+          name: Filters.zeroFilling.id,
+          label: Filters.zeroFilling.name,
 
-        value: {},
-        flag: true,
-      },
-      {
-        name: Filters.fft.id,
-        label: Filters.fft.name,
+          value: {},
+          flag: true,
+        },
+        {
+          name: Filters.fft.id,
+          label: Filters.fft.name,
 
-        value: {},
-        flag: true,
-      },
-      {
-        name: Filters.phaseCorrection.id,
-        label: Filters.phaseCorrection.name,
+          value: {},
+          flag: true,
+        },
+        {
+          name: Filters.phaseCorrection.id,
+          label: Filters.phaseCorrection.name,
 
-        value: {},
-        flag: true,
-      },
-    ],
-    '13C': [
-      {
-        name: Filters.digitalFilter.id,
-        label: Filters.digitalFilter.name,
+          value: {},
+          flag: true,
+        },
+      ],
+      '13C': [
+        {
+          name: Filters.digitalFilter.id,
+          label: Filters.digitalFilter.name,
 
-        value: {},
-        flag: true,
-      },
-      {
-        name: Filters.apodization.id,
-        label: Filters.apodization.name,
-        value: {},
-        flag: true,
-      },
-      {
-        name: Filters.zeroFilling.id,
-        label: Filters.zeroFilling.name,
+          value: {},
+          flag: true,
+        },
+        {
+          name: Filters.apodization.id,
+          label: Filters.apodization.name,
+          value: {},
+          flag: true,
+        },
+        {
+          name: Filters.zeroFilling.id,
+          label: Filters.zeroFilling.name,
 
-        value: {},
-        flag: true,
-      },
-      {
-        name: Filters.fft.id,
-        label: Filters.fft.name,
+          value: {},
+          flag: true,
+        },
+        {
+          name: Filters.fft.id,
+          label: Filters.fft.name,
 
-        value: {},
-        flag: true,
-      },
-      {
-        name: Filters.phaseCorrection.id,
-        label: Filters.phaseCorrection.name,
+          value: {},
+          flag: true,
+        },
+        {
+          name: Filters.phaseCorrection.id,
+          label: Filters.phaseCorrection.name,
 
-        value: {},
-        flag: true,
-      },
-    ],
+          value: {},
+          flag: true,
+        },
+      ],
+    },
   },
 };