diff --git a/package-lock.json b/package-lock.json index d7e4389e9d..6e8d73e7b5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -39,7 +39,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", @@ -9876,9 +9876,9 @@ } }, "node_modules/nmr-load-save": { - "version": "0.22.4", - "resolved": "https://registry.npmjs.org/nmr-load-save/-/nmr-load-save-0.22.4.tgz", - "integrity": "sha512-U3HAOz67ilLKLKoCKVQciGma8e/FPE9bM/J9k+1BJEU+JgmWuLPt4bqIoGz8E2A5huvKD1/JW38SrMXZvOWCVg==", + "version": "0.23.0", + "resolved": "https://registry.npmjs.org/nmr-load-save/-/nmr-load-save-0.23.0.tgz", + "integrity": "sha512-z7ixilqOfJ4wNLXyIa9g8jTwYtvDlm3HTFH4jMK/rZwjpWTCs4Jtj8uTPCg7dDwN4Sg3BzbJ5WAZZZ2pevqVbQ==", "dependencies": { "@lukeed/uuid": "^2.0.1", "@types/lodash.merge": "^4.6.7", @@ -9893,7 +9893,7 @@ "lodash.merge": "^4.6.2", "ml-spectra-processing": "^12.5.1", "nmr-correlation": "^2.3.3", - "nmr-processing": "^11.4.1", + "nmr-processing": "^11.5.0", "nmredata": "^0.9.7", "openchemlib": "^8.7.0", "openchemlib-utils": "^5.4.0", @@ -9902,9 +9902,9 @@ } }, "node_modules/nmr-processing": { - "version": "11.4.1", - "resolved": "https://registry.npmjs.org/nmr-processing/-/nmr-processing-11.4.1.tgz", - "integrity": "sha512-pA/Z5vWcQcetaB3UHip0+XahjNQh7c9JPAE9uC+HHpRoagb13U4cnO4RLApdxOTKzjKwsXC4sSwtZKqJbpES4A==", + "version": "11.5.0", + "resolved": "https://registry.npmjs.org/nmr-processing/-/nmr-processing-11.5.0.tgz", + "integrity": "sha512-WnrHPd6aYmiBW2a2bk743Id6XD9UJ3uLZSL7HDYrFhfjGzAiNK2d+SMn8fm7PmuKGV7Q6SChxb5Zdthgqo//dQ==", "dependencies": { "@lukeed/uuid": "^2.0.1", "binary-search": "^1.3.6", diff --git a/package.json b/package.json index 1b159e99a9..a078e5cfdf 100644 --- 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 index cd0675c700..a2fef2737d 100644 --- 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> = [ + const COLUMNS: Array> = [ { index: 1, Header: '#', diff --git a/src/component/reducer/actions/LoadActions.ts b/src/component/reducer/actions/LoadActions.ts index 7b1ab57d8c..335bd7c97b 100644 --- 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 index bea7bff188..54efb746b8 100644 --- 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 index 8a0d36f7d6..b5e8ac7237 100644 --- 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 index 60d2151b75..628da33c85 100644 --- 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 index e0694c355c..168fae1452 100644 --- a/src/component/workspaces/workspaceDefaultProperties.ts +++ b/src/component/workspaces/workspaceDefaultProperties.ts @@ -61,6 +61,7 @@ export const workspaceDefaultProperties: Required = { verticalSplitterCloseThreshold: 600, spectraRendering: 'auto', loggingLevel: 'info', + invert: false, }, formatting: { nuclei: { @@ -121,76 +122,79 @@ export const workspaceDefaultProperties: Required = { ], }, 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, + }, + ], + }, }, };