fix: nmredata importation (#1292)

package.json

@@ -71,7 +71,7 @@
     "nmr-correlation": "^2.1.0",
     "nmr-parser": "^1.7.1",
     "nmr-processing": "^3.3.0",
-    "nmredata": "^0.5.0",
+    "nmredata": "^0.6.1",
     "numeral": "^2.0.6",
     "openchemlib": "^7.4.3",
     "openchemlib-utils": "^1.5.1",

src/component/utility/util/nmredata/addRanges.ts

@@ -9,7 +9,7 @@ export function addRanges(signals, datum) {
       delta,
       diaIDs = [],
       multiplicity,
-      integral,
+      integration,
     } = signal;
     const fromTo = computeFromTo({ delta, js, frequency });
     if (js && multiplicity) {
@@ -20,9 +20,10 @@ export function addRanges(signals, datum) {
         }
       }
     }
+
     ranges.push({
       ...fromTo,
-      integral,
+      integration,
       signals: [
         {
           js,

src/component/utility/util/nmredata/addZones.ts

@@ -1,7 +1,7 @@
 import { getShift } from '../../../../data/data2d/Spectrum2D';
 import generateID from '../../../../data/utilities/generateID';
 
-const axisLabels = ['x', 'y'];
+const axisLabels = ['y', 'x'];
 
 export function addZones(signals, datum) {
   let zones: Array<any> = [];
@@ -11,7 +11,7 @@ export function addZones(signals, datum) {
 
   for (const signal of signals) {
     let zone = { x: {}, y: {}, id: generateID(), kind: 'signal' };
-    let signalFormated = { id: generateID(), kind: 'signal', peak: [] };
+    let signalFormated = { id: generateID(), kind: 'signal', peaks: [] };
     let width = { x: 10, y: 10 };
     for (let axis of axisLabels) {
       let { coupling = [], delta, diaIDs = [] } = signal[axis];
@@ -39,7 +39,7 @@ export function addZones(signals, datum) {
     }
     zones.push({
       ...zone,
-      signal: [signalFormated],
+      signals: [signalFormated],
     });
   }
   datum.zones.values = zones;