nmr-processing 10.0.7 → 11.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/datum/data1d/utils/mapIntegrals.d.ts +2 -2
- package/lib/datum/data1d/utils/mapIntegrals.js +7 -7
- package/lib/datum/data1d/utils/mapIntegrals.js.map +1 -1
- package/lib/datum/data1d/utils/mapPeaks.d.ts +6 -1
- package/lib/datum/data1d/utils/mapPeaks.js +2 -1
- package/lib/datum/data1d/utils/mapPeaks.js.map +1 -1
- package/lib/datum/data1d/utils/mapRanges.d.ts +12 -4
- package/lib/datum/data1d/utils/mapRanges.js +22 -12
- package/lib/datum/data1d/utils/mapRanges.js.map +1 -1
- package/lib/datum/data1d/utils/mapValues.d.ts +4 -4
- package/lib/datum/data2d/utils/mapZones.d.ts +32 -12
- package/lib/datum/data2d/utils/mapZones.js +67 -8
- package/lib/datum/data2d/utils/mapZones.js.map +1 -1
- package/lib/index.d.ts +1 -0
- package/lib/index.js +1 -0
- package/lib/index.js.map +1 -1
- package/lib/peaks/NMRPeak1D.d.ts +1 -0
- package/lib/ranges/rangesToACS.d.ts +2 -2
- package/lib/ranges/rangesToACS.js +25 -14
- package/lib/ranges/rangesToACS.js.map +1 -1
- package/lib/types/Integral.d.ts +2 -2
- package/lib/types/Peaks/Peak2D.d.ts +3 -3
- package/lib/types/Ranges/Ranges.d.ts +2 -2
- package/lib/types/Signals/Signal1D.d.ts +1 -1
- package/lib/types/Signals/Signal2D.d.ts +1 -1
- package/lib/types/Zones/Zone.d.ts +2 -0
- package/lib/utilities/getSum.js +1 -1
- package/lib/utilities/getSum.js.map +1 -1
- package/lib-esm/datum/data1d/utils/mapIntegrals.js +7 -7
- package/lib-esm/datum/data1d/utils/mapIntegrals.js.map +1 -1
- package/lib-esm/datum/data1d/utils/mapPeaks.js +1 -1
- package/lib-esm/datum/data1d/utils/mapPeaks.js.map +1 -1
- package/lib-esm/datum/data1d/utils/mapRanges.js +22 -12
- package/lib-esm/datum/data1d/utils/mapRanges.js.map +1 -1
- package/lib-esm/datum/data2d/utils/mapZones.js +67 -8
- package/lib-esm/datum/data2d/utils/mapZones.js.map +1 -1
- package/lib-esm/index.js +1 -0
- package/lib-esm/index.js.map +1 -1
- package/lib-esm/ranges/rangesToACS.js +22 -14
- package/lib-esm/ranges/rangesToACS.js.map +1 -1
- package/lib-esm/utilities/getSum.js +1 -1
- package/lib-esm/utilities/getSum.js.map +1 -1
- package/package.json +10 -8
- package/src/datum/data1d/utils/mapIntegrals.ts +7 -7
- package/src/datum/data1d/utils/mapPeaks.ts +6 -1
- package/src/datum/data1d/utils/mapRanges.ts +23 -12
- package/src/datum/data2d/utils/mapZones.ts +69 -8
- package/src/index.ts +1 -0
- package/src/peaks/NMRPeak1D.ts +1 -0
- package/src/ranges/rangesToACS.ts +32 -21
- package/src/types/Integral.ts +2 -2
- package/src/types/Peaks/Peak2D.ts +3 -3
- package/src/types/Ranges/Ranges.ts +2 -2
- package/src/types/Signals/Signal1D.ts +1 -1
- package/src/types/Signals/Signal2D.ts +1 -1
- package/src/types/Zones/Zone.ts +2 -0
- package/src/utilities/getSum.ts +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rangesToACS.js","sourceRoot":"","sources":["../../src/ranges/rangesToACS.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"rangesToACS.js","sourceRoot":"","sources":["../../src/ranges/rangesToACS.ts"],"names":[],"mappings":"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"}
|
package/lib/types/Integral.d.ts
CHANGED
|
@@ -7,8 +7,8 @@ export interface Ranges {
|
|
|
7
7
|
}
|
|
8
8
|
export interface Range extends Omit<NMRRange, 'signals' | 'id'> {
|
|
9
9
|
id: string;
|
|
10
|
-
|
|
11
|
-
|
|
10
|
+
originalFrom?: number;
|
|
11
|
+
originalTo?: number;
|
|
12
12
|
absolute: number;
|
|
13
13
|
signals: Signal1D[];
|
|
14
14
|
integration: number;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { NMRSignal1D } from '../../signals/NMRSignal1D';
|
|
2
2
|
type ObjectKeys = 'id' | 'multiplicity' | 'js';
|
|
3
3
|
export interface Signal1D extends Required<Pick<NMRSignal1D, ObjectKeys>>, Omit<NMRSignal1D, ObjectKeys> {
|
|
4
|
-
|
|
4
|
+
originalDelta?: number;
|
|
5
5
|
}
|
|
6
6
|
export {};
|
package/lib/utilities/getSum.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getSum.js","sourceRoot":"","sources":["../../src/utilities/getSum.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAEH,SAAgB,MAAM,CACpB,MAAc,EACd,GAAe,EACf,QAA2C,IAAI;IAE/C,IAAI,GAAG,GAAG,CAAC,CAAC;IACZ,KAAK,MAAM,OAAO,IAAI,MAAM,EAAE;QAC5B,IAAI,KAAK,EAAE,CAAC,OAAO,CAAC,EAAE;YACpB,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;YAC3B,IAAI,CAAC,KAAK,IAAI,KAAK,
|
|
1
|
+
{"version":3,"file":"getSum.js","sourceRoot":"","sources":["../../src/utilities/getSum.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAEH,SAAgB,MAAM,CACpB,MAAc,EACd,GAAe,EACf,QAA2C,IAAI;IAE/C,IAAI,GAAG,GAAG,CAAC,CAAC;IACZ,KAAK,MAAM,OAAO,IAAI,MAAM,EAAE;QAC5B,IAAI,KAAK,EAAE,CAAC,OAAO,CAAC,EAAE;YACpB,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;YAC3B,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;gBAAE,SAAS;YAClD,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SACxB;KACF;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAdD,wBAcC"}
|
|
@@ -2,21 +2,21 @@ import { v4 } from '@lukeed/uuid';
|
|
|
2
2
|
import { xyIntegration } from 'ml-spectra-processing';
|
|
3
3
|
import { getShiftX } from './getShiftX';
|
|
4
4
|
function getRange(integral, shiftTarget, shift) {
|
|
5
|
-
const {
|
|
5
|
+
const { originalFrom, originalTo, from, to } = integral;
|
|
6
6
|
if (shiftTarget === 'origin') {
|
|
7
7
|
return {
|
|
8
|
-
|
|
9
|
-
|
|
8
|
+
originalFrom: from - shift,
|
|
9
|
+
originalTo: to - shift,
|
|
10
10
|
from,
|
|
11
11
|
to,
|
|
12
12
|
};
|
|
13
13
|
}
|
|
14
14
|
else {
|
|
15
15
|
return {
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
from:
|
|
19
|
-
to:
|
|
16
|
+
originalFrom,
|
|
17
|
+
originalTo,
|
|
18
|
+
from: originalFrom + shift,
|
|
19
|
+
to: originalTo + shift,
|
|
20
20
|
};
|
|
21
21
|
}
|
|
22
22
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mapIntegrals.js","sourceRoot":"","sources":["../../../../src/datum/data1d/utils/mapIntegrals.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAMtD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,SAAS,QAAQ,CAAC,QAAkB,EAAE,WAAwB,EAAE,KAAa;IAC3E,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"mapIntegrals.js","sourceRoot":"","sources":["../../../../src/datum/data1d/utils/mapIntegrals.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAMtD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,SAAS,QAAQ,CAAC,QAAkB,EAAE,WAAwB,EAAE,KAAa;IAC3E,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,QAAQ,CAAC;IACxD,IAAI,WAAW,KAAK,QAAQ,EAAE;QAC5B,OAAO;YACL,YAAY,EAAE,IAAI,GAAG,KAAK;YAC1B,UAAU,EAAE,EAAE,GAAG,KAAK;YACtB,IAAI;YACJ,EAAE;SACH,CAAC;KACH;SAAM;QACL,OAAO;YACL,YAAY;YACZ,UAAU;YACV,IAAI,EAAE,YAAY,GAAG,KAAK;YAC1B,EAAE,EAAE,UAAU,GAAG,KAAK;SACvB,CAAC;KACH;AACH,CAAC;AAED,MAAM,UAAU,YAAY,CAC1B,SAAqB,EACrB,QAAiB,EACjB,cAA2B,QAAQ;IAEnC,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,QAAQ,CAAC,IAAI,CAAC;IAChC,MAAM,MAAM,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;IAEnC,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;QAChC,MAAM,gBAAgB,GAAG,QAAQ,CAAC,QAAQ,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;QAEjE,MAAM,QAAQ,GAAG,aAAa,CAC5B,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EACZ,EAAE,IAAI,EAAE,gBAAgB,CAAC,IAAI,EAAE,EAAE,EAAE,gBAAgB,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CACxE,CAAC;QAEF,OAAO;YACL,GAAG,QAAQ;YACX,EAAE,EAAE,QAAQ,CAAC,EAAE,IAAI,EAAE,EAAE;YACvB,GAAG,gBAAgB;YACnB,QAAQ;SACT,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -10,7 +10,7 @@ function isExists(peak, spectrum, error) {
|
|
|
10
10
|
}
|
|
11
11
|
return false;
|
|
12
12
|
}
|
|
13
|
-
function getPeakDelta(peak, shiftTarget, shift) {
|
|
13
|
+
export function getPeakDelta(peak, shiftTarget, shift) {
|
|
14
14
|
const { originalX = 0, x } = peak;
|
|
15
15
|
if (shiftTarget === 'origin') {
|
|
16
16
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mapPeaks.js","sourceRoot":"","sources":["../../../../src/datum/data1d/utils/mapPeaks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AAMlC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"mapPeaks.js","sourceRoot":"","sources":["../../../../src/datum/data1d/utils/mapPeaks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AAMlC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAGhE,SAAS,QAAQ,CAAC,IAAY,EAAE,QAAiB,EAAE,KAAa;IAC9D,sCAAsC;IACtC,KAAK,MAAM,EAAE,CAAC,EAAE,IAAI,QAAQ,CAAC,KAAK,EAAE,MAAM,IAAI,EAAE,EAAE;QAChD,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,KAAK,EAAE;YAChC,OAAO,IAAI,CAAC;SACb;KACF;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,YAAY,CAC1B,IAAwB,EACxB,WAAwB,EACxB,KAAa;IAEb,MAAM,EAAE,SAAS,GAAG,CAAC,EAAE,CAAC,EAAE,GAAG,IAAI,CAAC;IAClC,IAAI,WAAW,KAAK,QAAQ,EAAE;QAC5B,OAAO;YACL,SAAS,EAAE,CAAC,GAAG,KAAK;YACpB,CAAC;SACF,CAAC;KACH;SAAM;QACL,OAAO;YACL,SAAS;YACT,CAAC,EAAE,SAAS,GAAG,KAAK;SACrB,CAAC;KACH;AACH,CAAC;AAED,MAAM,UAAU,QAAQ,CACtB,KAAe,EACf,QAAiB,EACjB,UAAsB,EAAE;IAExB,MAAM,EAAE,eAAe,GAAG,IAAI,EAAE,WAAW,GAAG,QAAQ,EAAE,GAAG,OAAO,CAAC;IACnE,MAAM,MAAM,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;IACnC,MAAM,KAAK,GAAG,qBAAqB,CAAC,QAAQ,CAAC,CAAC;IAE9C,MAAM,QAAQ,GAAa,EAAE,CAAC;IAE9B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACxB,MAAM,SAAS,GAAG,YAAY,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;QAE1D,IACE,CAAC,eAAe;YAChB,CAAC,eAAe,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,EACrD;YACA,QAAQ,CAAC,IAAI,CAAC;gBACZ,GAAG,IAAI;gBACP,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,EAAE;gBACpB,GAAG,SAAS;aACb,CAAC,CAAC;SACJ;KACF;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC"}
|
|
@@ -4,6 +4,7 @@ import { DatumKind } from '../../../constants/SignalsKinds';
|
|
|
4
4
|
import { signalMultiplicityPattern } from '../../../signal/signalMultiplicityPattern';
|
|
5
5
|
import { getShiftX } from './getShiftX';
|
|
6
6
|
import { getSpectrumErrorValue } from './getSpectrumErrorValue';
|
|
7
|
+
import { getPeakDelta } from './mapPeaks';
|
|
7
8
|
function checkRange(range, spectrum, error) {
|
|
8
9
|
// check if the range is already exists
|
|
9
10
|
for (const { from, to } of spectrum.ranges?.values || []) {
|
|
@@ -14,36 +15,36 @@ function checkRange(range, spectrum, error) {
|
|
|
14
15
|
}
|
|
15
16
|
}
|
|
16
17
|
function getRange(range, shiftTarget, shift) {
|
|
17
|
-
const {
|
|
18
|
+
const { originalFrom, originalTo, from, to } = range;
|
|
18
19
|
if (shiftTarget === 'origin') {
|
|
19
20
|
return {
|
|
20
|
-
|
|
21
|
-
|
|
21
|
+
originalFrom: from - shift,
|
|
22
|
+
originalTo: to - shift,
|
|
22
23
|
from,
|
|
23
24
|
to,
|
|
24
25
|
};
|
|
25
26
|
}
|
|
26
27
|
else {
|
|
27
28
|
return {
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
from: (
|
|
31
|
-
to: (
|
|
29
|
+
originalFrom,
|
|
30
|
+
originalTo,
|
|
31
|
+
from: (originalFrom || 0) + shift,
|
|
32
|
+
to: (originalTo || 0) + shift,
|
|
32
33
|
};
|
|
33
34
|
}
|
|
34
35
|
}
|
|
35
36
|
function getSignalDelta(signal, shiftTarget, shift) {
|
|
36
|
-
const { delta,
|
|
37
|
+
const { delta, originalDelta } = signal;
|
|
37
38
|
if (shiftTarget === 'origin') {
|
|
38
39
|
return {
|
|
39
|
-
|
|
40
|
+
originalDelta: delta - shift,
|
|
40
41
|
delta,
|
|
41
42
|
};
|
|
42
43
|
}
|
|
43
44
|
else {
|
|
44
45
|
return {
|
|
45
|
-
|
|
46
|
-
delta: (
|
|
46
|
+
originalDelta,
|
|
47
|
+
delta: (originalDelta || 0) + shift,
|
|
47
48
|
};
|
|
48
49
|
}
|
|
49
50
|
}
|
|
@@ -80,10 +81,19 @@ export function mapRanges(ranges, spectrum, options = {}) {
|
|
|
80
81
|
const rangeBoundary = getRange(range, shiftTarget, shiftX);
|
|
81
82
|
const absolute = xyIntegration({ x, y: re }, { from: rangeBoundary.from, to: rangeBoundary.to, reverse: true });
|
|
82
83
|
const signals = range.signals.map((signal) => {
|
|
83
|
-
const { kind = null, id, ...resSignal } = signal;
|
|
84
|
+
const { kind = null, id, peaks: inputPeaks = [], ...resSignal } = signal;
|
|
85
|
+
const peaks = inputPeaks.map((peak) => {
|
|
86
|
+
const peakDelta = getPeakDelta(peak, shiftTarget, shiftX);
|
|
87
|
+
return {
|
|
88
|
+
id: peak?.id || v4(),
|
|
89
|
+
...peak,
|
|
90
|
+
...peakDelta,
|
|
91
|
+
};
|
|
92
|
+
});
|
|
84
93
|
return {
|
|
85
94
|
kind: kind || 'signal',
|
|
86
95
|
id: id || v4(),
|
|
96
|
+
peaks,
|
|
87
97
|
...resSignal,
|
|
88
98
|
...getSignalDelta(signal, shiftTarget, shiftX),
|
|
89
99
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mapRanges.js","sourceRoot":"","sources":["../../../../src/datum/data1d/utils/mapRanges.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAEtD,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAC5D,OAAO,EAAE,yBAAyB,EAAE,MAAM,2CAA2C,CAAC;AAOtF,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"mapRanges.js","sourceRoot":"","sources":["../../../../src/datum/data1d/utils/mapRanges.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,11 +10,11 @@ function getSignal(signal, shiftTarget, shift) {
|
|
|
10
10
|
...signal,
|
|
11
11
|
x: {
|
|
12
12
|
...x,
|
|
13
|
-
|
|
13
|
+
originalDelta: x.delta - shift.x,
|
|
14
14
|
},
|
|
15
15
|
y: {
|
|
16
16
|
...y,
|
|
17
|
-
|
|
17
|
+
originalDelta: y.delta - shift.y,
|
|
18
18
|
},
|
|
19
19
|
};
|
|
20
20
|
}
|
|
@@ -23,15 +23,63 @@ function getSignal(signal, shiftTarget, shift) {
|
|
|
23
23
|
...signal,
|
|
24
24
|
x: {
|
|
25
25
|
...x,
|
|
26
|
-
delta: x.
|
|
26
|
+
delta: x.originalDelta + shift.x,
|
|
27
27
|
},
|
|
28
28
|
y: {
|
|
29
29
|
...y,
|
|
30
|
-
delta: y.
|
|
30
|
+
delta: y.originalDelta + shift.y,
|
|
31
31
|
},
|
|
32
32
|
};
|
|
33
33
|
}
|
|
34
34
|
}
|
|
35
|
+
function getZoneAxis(zone, shiftTarget, shift) {
|
|
36
|
+
const { x, y } = zone;
|
|
37
|
+
if (shiftTarget === 'origin') {
|
|
38
|
+
return {
|
|
39
|
+
x: {
|
|
40
|
+
...x,
|
|
41
|
+
originalFrom: x.from - shift.x,
|
|
42
|
+
originalTo: x.to - shift.x,
|
|
43
|
+
},
|
|
44
|
+
y: {
|
|
45
|
+
...y,
|
|
46
|
+
originalFrom: y.from - shift.y,
|
|
47
|
+
originalTo: y.to - shift.y,
|
|
48
|
+
},
|
|
49
|
+
};
|
|
50
|
+
}
|
|
51
|
+
else {
|
|
52
|
+
return {
|
|
53
|
+
x: {
|
|
54
|
+
...x,
|
|
55
|
+
from: (x?.originalFrom || 0) + shift.x,
|
|
56
|
+
to: (x?.originalTo || 0) + shift.x,
|
|
57
|
+
},
|
|
58
|
+
y: {
|
|
59
|
+
...y,
|
|
60
|
+
from: (y?.originalFrom || 0) + shift.y,
|
|
61
|
+
to: (y?.originalTo || 0) + shift.y,
|
|
62
|
+
},
|
|
63
|
+
};
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
function getPeak(peak, shiftTarget, shift) {
|
|
67
|
+
const { x, y, originalX = 0, originalY = 0 } = peak;
|
|
68
|
+
if (shiftTarget === 'origin') {
|
|
69
|
+
return {
|
|
70
|
+
...peak,
|
|
71
|
+
originalX: x - shift.x,
|
|
72
|
+
originalY: y - shift.y,
|
|
73
|
+
};
|
|
74
|
+
}
|
|
75
|
+
else {
|
|
76
|
+
return {
|
|
77
|
+
...peak,
|
|
78
|
+
x: originalX + shift.x,
|
|
79
|
+
y: originalY + shift.y,
|
|
80
|
+
};
|
|
81
|
+
}
|
|
82
|
+
}
|
|
35
83
|
export function mapZones(zones, datum, options = {}) {
|
|
36
84
|
const { checkIsExisting = true, shiftTarget = 'origin' } = options;
|
|
37
85
|
const shift = getShift(datum);
|
|
@@ -41,12 +89,24 @@ export function mapZones(zones, datum, options = {}) {
|
|
|
41
89
|
_zones = zones.filter((zone) => !isZoneExists(zone, datum, error));
|
|
42
90
|
}
|
|
43
91
|
return _zones.map((zone) => {
|
|
44
|
-
|
|
45
|
-
|
|
92
|
+
zone.x = zone.x || { from: 0, to: 0 };
|
|
93
|
+
zone.y = zone.y || { from: 0, to: 0 };
|
|
46
94
|
const signals = zone.signals.map((signal) => {
|
|
47
95
|
const { id, kind } = signal;
|
|
96
|
+
let peaks;
|
|
97
|
+
if (signal?.peaks) {
|
|
98
|
+
peaks = (signal?.peaks || []).map((peak) => {
|
|
99
|
+
const peakDelta = getPeak(peak, shiftTarget, shift);
|
|
100
|
+
return {
|
|
101
|
+
...peak,
|
|
102
|
+
...peakDelta,
|
|
103
|
+
id: peak?.id || v4(),
|
|
104
|
+
};
|
|
105
|
+
});
|
|
106
|
+
}
|
|
48
107
|
return {
|
|
49
108
|
...getSignal(signal, shiftTarget, shift),
|
|
109
|
+
peaks,
|
|
50
110
|
id: id || v4(),
|
|
51
111
|
kind: kind || 'signal',
|
|
52
112
|
};
|
|
@@ -54,8 +114,7 @@ export function mapZones(zones, datum, options = {}) {
|
|
|
54
114
|
return {
|
|
55
115
|
...zone,
|
|
56
116
|
id: zone.id || v4(),
|
|
57
|
-
|
|
58
|
-
y: { from: y.from, to: y.to },
|
|
117
|
+
...getZoneAxis(zone, shiftTarget, shift),
|
|
59
118
|
signals,
|
|
60
119
|
kind: zone.kind || DatumKind.signal,
|
|
61
120
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mapZones.js","sourceRoot":"","sources":["../../../../src/datum/data2d/utils/mapZones.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AAElC,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAM5D,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,QAAQ,EAAW,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"mapZones.js","sourceRoot":"","sources":["../../../../src/datum/data2d/utils/mapZones.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,cAAc,CAAC;AAElC,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAM5D,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,QAAQ,EAAW,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAG9C,SAAS,SAAS,CAAC,MAAgB,EAAE,WAAwB,EAAE,KAAc;IAC3E,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,MAAM,CAAC;IAExB,IAAI,WAAW,KAAK,QAAQ,EAAE;QAC5B,OAAO;YACL,GAAG,MAAM;YACT,CAAC,EAAE;gBACD,GAAG,CAAC;gBACJ,aAAa,EAAE,CAAC,CAAC,KAAK,GAAG,KAAK,CAAC,CAAC;aACjC;YACD,CAAC,EAAE;gBACD,GAAG,CAAC;gBACJ,aAAa,EAAE,CAAC,CAAC,KAAK,GAAG,KAAK,CAAC,CAAC;aACjC;SACF,CAAC;KACH;SAAM;QACL,OAAO;YACL,GAAG,MAAM;YACT,CAAC,EAAE;gBACD,GAAG,CAAC;gBACJ,KAAK,EAAE,CAAC,CAAC,aAAa,GAAG,KAAK,CAAC,CAAC;aACjC;YACD,CAAC,EAAE;gBACD,GAAG,CAAC;gBACJ,KAAK,EAAE,CAAC,CAAC,aAAa,GAAG,KAAK,CAAC,CAAC;aACjC;SACF,CAAC;KACH;AACH,CAAC;AAED,SAAS,WAAW,CAAC,IAAU,EAAE,WAAwB,EAAE,KAAc;IACvE,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,IAAI,CAAC;IAEtB,IAAI,WAAW,KAAK,QAAQ,EAAE;QAC5B,OAAO;YACL,CAAC,EAAE;gBACD,GAAG,CAAC;gBACJ,YAAY,EAAE,CAAC,CAAC,IAAI,GAAG,KAAK,CAAC,CAAC;gBAC9B,UAAU,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,CAAC,CAAC;aAC3B;YACD,CAAC,EAAE;gBACD,GAAG,CAAC;gBACJ,YAAY,EAAE,CAAC,CAAC,IAAI,GAAG,KAAK,CAAC,CAAC;gBAC9B,UAAU,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,CAAC,CAAC;aAC3B;SACF,CAAC;KACH;SAAM;QACL,OAAO;YACL,CAAC,EAAE;gBACD,GAAG,CAAC;gBACJ,IAAI,EAAE,CAAC,CAAC,EAAE,YAAY,IAAI,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC;gBACtC,EAAE,EAAE,CAAC,CAAC,EAAE,UAAU,IAAI,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC;aACnC;YACD,CAAC,EAAE;gBACD,GAAG,CAAC;gBACJ,IAAI,EAAE,CAAC,CAAC,EAAE,YAAY,IAAI,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC;gBACtC,EAAE,EAAE,CAAC,CAAC,EAAE,UAAU,IAAI,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC;aACnC;SACF,CAAC;KACH;AACH,CAAC;AACD,SAAS,OAAO,CAAC,IAAY,EAAE,WAAwB,EAAE,KAAc;IACrE,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,SAAS,GAAG,CAAC,EAAE,SAAS,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC;IAEpD,IAAI,WAAW,KAAK,QAAQ,EAAE;QAC5B,OAAO;YACL,GAAG,IAAI;YACP,SAAS,EAAE,CAAC,GAAG,KAAK,CAAC,CAAC;YACtB,SAAS,EAAE,CAAC,GAAG,KAAK,CAAC,CAAC;SACvB,CAAC;KACH;SAAM;QACL,OAAO;YACL,GAAG,IAAI;YACP,CAAC,EAAE,SAAS,GAAG,KAAK,CAAC,CAAC;YACtB,CAAC,EAAE,SAAS,GAAG,KAAK,CAAC,CAAC;SACvB,CAAC;KACH;AACH,CAAC;AAED,MAAM,UAAU,QAAQ,CACtB,KAAa,EACb,KAAc,EACd,UAAsB,EAAE;IAExB,MAAM,EAAE,eAAe,GAAG,IAAI,EAAE,WAAW,GAAG,QAAQ,EAAE,GAAG,OAAO,CAAC;IACnE,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC9B,MAAM,KAAK,GAAG,uBAAuB,CAAC,KAAK,CAAC,CAAC;IAE7C,IAAI,MAAM,GAAW,KAAK,CAAC;IAE3B,IAAI,eAAe,EAAE;QACnB,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;KACpE;IAED,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,IAAU,EAAE,EAAE;QAC/B,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC;QACtC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC;QAEtC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YAC1C,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;YAC5B,IAAI,KAAK,CAAC;YACV,IAAI,MAAM,EAAE,KAAK,EAAE;gBACjB,KAAK,GAAG,CAAC,MAAM,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;oBACzC,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;oBACpD,OAAO;wBACL,GAAG,IAAI;wBACP,GAAG,SAAS;wBACZ,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,EAAE;qBACrB,CAAC;gBACJ,CAAC,CAAC,CAAC;aACJ;YACD,OAAO;gBACL,GAAG,SAAS,CAAC,MAAM,EAAE,WAAW,EAAE,KAAK,CAAC;gBACxC,KAAK;gBACL,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE;gBACd,IAAI,EAAE,IAAI,IAAI,QAAQ;aACvB,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,OAAO;YACL,GAAG,IAAI;YACP,EAAE,EAAE,IAAI,CAAC,EAAE,IAAI,EAAE,EAAE;YACnB,GAAG,WAAW,CAAC,IAAI,EAAE,WAAW,EAAE,KAAK,CAAC;YACxC,OAAO;YACP,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,SAAS,CAAC,MAAM;SACpC,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC"}
|
package/lib-esm/index.js
CHANGED
|
@@ -51,6 +51,7 @@ export * from './datum/data1d/utils/getShiftX';
|
|
|
51
51
|
export * from './datum/data1d/utils/getSpectrumErrorValue';
|
|
52
52
|
export * from './datum/data1d/utils/mapPeaks';
|
|
53
53
|
export * from './datum/data1d/utils/mapRanges';
|
|
54
|
+
export * from './datum/data2d/utils/mapZones';
|
|
54
55
|
export * from './datum/data1d/utils/mapIntegrals';
|
|
55
56
|
export * from './datum/data1d/utils/updateRanges';
|
|
56
57
|
export * from './datum/data1d/utils/checkIntegralKind';
|
package/lib-esm/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,wBAAwB,CAAC;AACvC,cAAc,0BAA0B,CAAC;AACzC,cAAc,8BAA8B,CAAC;AAE7C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AAEjC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,6BAA6B,CAAC;AAE5C,cAAc,sBAAsB,CAAC;AACrC,cAAc,qBAAqB,CAAC;AAEpC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,uBAAuB,CAAC;AACtC,cAAc,wBAAwB,CAAC;AACvC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wBAAwB,CAAC;AACvC,cAAc,iCAAiC,CAAC;AAChD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,oCAAoC,CAAC;AAEnD,cAAc,sBAAsB,CAAC;AACrC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,oCAAoC,CAAC;AACnD,cAAc,sCAAsC,CAAC;AAErD,cAAc,uBAAuB,CAAC;AACtC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,0BAA0B,CAAC;AACzC,cAAc,8BAA8B,CAAC;AAE7C,cAAc,yBAAyB,CAAC;AACxC,cAAc,0BAA0B,CAAC;AACzC,cAAc,0BAA0B,CAAC;AAEzC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,uBAAuB,CAAC;AACtC,cAAc,2BAA2B,CAAC;AAE1C,cAAc,yBAAyB,CAAC;AACxC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,8BAA8B,CAAC;AAE7C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,4BAA4B,CAAC;AAE3C,cAAc,2BAA2B,CAAC;AAE1C,cAAc,kCAAkC,CAAC;AAEjD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,kCAAkC,CAAC;AACjD,cAAc,mCAAmC,CAAC;AAElD,cAAc,iBAAiB,CAAC;AAChC,OAAO,KAAK,cAAc,MAAM,wBAAwB,CAAC;AACzD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,4CAA4C,CAAC;AAC3D,cAAc,+BAA+B,CAAC;AAC9C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,mCAAmC,CAAC;AAClD,cAAc,mCAAmC,CAAC;AAClD,cAAc,wCAAwC,CAAC;AACvD,cAAc,iDAAiD,CAAC;AAChE,cAAc,oDAAoD,CAAC;AACnE,OAAO,KAAK,cAAc,MAAM,qCAAqC,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,wBAAwB,CAAC;AACvC,cAAc,0BAA0B,CAAC;AACzC,cAAc,8BAA8B,CAAC;AAE7C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AAEjC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,6BAA6B,CAAC;AAE5C,cAAc,sBAAsB,CAAC;AACrC,cAAc,qBAAqB,CAAC;AAEpC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,uBAAuB,CAAC;AACtC,cAAc,wBAAwB,CAAC;AACvC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wBAAwB,CAAC;AACvC,cAAc,iCAAiC,CAAC;AAChD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,oCAAoC,CAAC;AAEnD,cAAc,sBAAsB,CAAC;AACrC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,oCAAoC,CAAC;AACnD,cAAc,sCAAsC,CAAC;AAErD,cAAc,uBAAuB,CAAC;AACtC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,0BAA0B,CAAC;AACzC,cAAc,8BAA8B,CAAC;AAE7C,cAAc,yBAAyB,CAAC;AACxC,cAAc,0BAA0B,CAAC;AACzC,cAAc,0BAA0B,CAAC;AAEzC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,uBAAuB,CAAC;AACtC,cAAc,2BAA2B,CAAC;AAE1C,cAAc,yBAAyB,CAAC;AACxC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,8BAA8B,CAAC;AAE7C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,4BAA4B,CAAC;AAE3C,cAAc,2BAA2B,CAAC;AAE1C,cAAc,kCAAkC,CAAC;AAEjD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,kCAAkC,CAAC;AACjD,cAAc,mCAAmC,CAAC;AAElD,cAAc,iBAAiB,CAAC;AAChC,OAAO,KAAK,cAAc,MAAM,wBAAwB,CAAC;AACzD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,4CAA4C,CAAC;AAC3D,cAAc,+BAA+B,CAAC;AAC9C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,mCAAmC,CAAC;AAClD,cAAc,mCAAmC,CAAC;AAClD,cAAc,wCAAwC,CAAC;AACvD,cAAc,iDAAiD,CAAC;AAChE,cAAc,oDAAoD,CAAC;AACnE,OAAO,KAAK,cAAc,MAAM,qCAAqC,CAAC"}
|
|
@@ -1,23 +1,24 @@
|
|
|
1
1
|
import { isAnyArray } from 'is-any-array';
|
|
2
2
|
import { signalJoinCouplings } from '../signal/signalJoinCouplings';
|
|
3
3
|
import { signalMultiplicityPattern } from '../signal/signalMultiplicityPattern';
|
|
4
|
+
import numeral from 'numeral';
|
|
4
5
|
const globalOptions = {
|
|
5
6
|
h: {
|
|
6
7
|
nucleus: '1H',
|
|
7
|
-
nbDecimalDelta:
|
|
8
|
-
nbDecimalJ:
|
|
8
|
+
nbDecimalDelta: '0.00',
|
|
9
|
+
nbDecimalJ: '0.0',
|
|
9
10
|
observedFrequency: 400,
|
|
10
11
|
},
|
|
11
12
|
c: {
|
|
12
13
|
nucleus: '13C',
|
|
13
|
-
nbDecimalDelta:
|
|
14
|
-
nbDecimalJ:
|
|
14
|
+
nbDecimalDelta: '0.0',
|
|
15
|
+
nbDecimalJ: '0.0',
|
|
15
16
|
observedFrequency: 100,
|
|
16
17
|
},
|
|
17
18
|
f: {
|
|
18
19
|
nucleus: '19F',
|
|
19
|
-
nbDecimalDelta:
|
|
20
|
-
nbDecimalJ:
|
|
20
|
+
nbDecimalDelta: '0.00',
|
|
21
|
+
nbDecimalJ: '0.0',
|
|
21
22
|
observedFrequency: 400,
|
|
22
23
|
},
|
|
23
24
|
};
|
|
@@ -69,7 +70,7 @@ function spectroInformation(options) {
|
|
|
69
70
|
parenthesis.push(formatMF(options.solvent));
|
|
70
71
|
}
|
|
71
72
|
if (options.observedFrequency) {
|
|
72
|
-
parenthesis.push(`${(options.observedFrequency * 1).
|
|
73
|
+
parenthesis.push(`${numeral(options.observedFrequency * 1).format('0')} MHz`);
|
|
73
74
|
}
|
|
74
75
|
if (parenthesis.length > 0) {
|
|
75
76
|
strings += ` (${parenthesis.join(', ')}): δ `;
|
|
@@ -94,14 +95,16 @@ function pushDelta(range, acsRanges, options) {
|
|
|
94
95
|
return a.delta - b.delta;
|
|
95
96
|
});
|
|
96
97
|
}
|
|
97
|
-
|
|
98
|
+
const to = numeral(Math.max(...fromTo));
|
|
99
|
+
const from = numeral(Math.min(...fromTo));
|
|
100
|
+
strings += `${from.format(options.nbDecimalDelta)}-${to.format(options.nbDecimalDelta)}`;
|
|
98
101
|
strings += ` (${getIntegral(range, options)}`;
|
|
99
102
|
if (signals.some((signal) => signal.multiplicity || (signal.js && signal.js.length > 0))) {
|
|
100
103
|
for (const signal of signals) {
|
|
101
104
|
parenthesis = [];
|
|
102
105
|
if (signal.delta !== undefined) {
|
|
103
106
|
strings = appendSeparator(strings);
|
|
104
|
-
strings += signal.delta.
|
|
107
|
+
strings += numeral(signal.delta).format(options.nbDecimalDelta);
|
|
105
108
|
}
|
|
106
109
|
const range = {
|
|
107
110
|
from: Number.MIN_SAFE_INTEGER,
|
|
@@ -117,13 +120,15 @@ function pushDelta(range, acsRanges, options) {
|
|
|
117
120
|
else {
|
|
118
121
|
parenthesis = [];
|
|
119
122
|
if (signals[0].delta !== undefined) {
|
|
120
|
-
strings += signals[0].delta.
|
|
123
|
+
strings += numeral(signals[0].delta).format(options.nbDecimalDelta);
|
|
121
124
|
switchFormat(range, signals[0], parenthesis, options);
|
|
122
125
|
if (parenthesis.length > 0)
|
|
123
126
|
strings += ` (${parenthesis.join(', ')})`;
|
|
124
127
|
}
|
|
125
128
|
else {
|
|
126
|
-
|
|
129
|
+
const to = numeral(Math.max(...fromTo));
|
|
130
|
+
const from = numeral(Math.min(...fromTo));
|
|
131
|
+
strings += `${from.format(options.nbDecimalDelta)}-${to.format(options.nbDecimalDelta)}`;
|
|
127
132
|
switchFormat(range, signals[0], parenthesis, options);
|
|
128
133
|
if (parenthesis.length > 0)
|
|
129
134
|
strings += ` (${parenthesis})`;
|
|
@@ -131,7 +136,9 @@ function pushDelta(range, acsRanges, options) {
|
|
|
131
136
|
}
|
|
132
137
|
}
|
|
133
138
|
else {
|
|
134
|
-
|
|
139
|
+
const to = numeral(Math.max(...fromTo));
|
|
140
|
+
const from = numeral(Math.min(...fromTo));
|
|
141
|
+
strings += `${from.format(options.nbDecimalDelta)}-${to.format(options.nbDecimalDelta)}`;
|
|
135
142
|
const signal = {};
|
|
136
143
|
switchFormat(range, signal, parenthesis, options);
|
|
137
144
|
if (parenthesis.length > 0)
|
|
@@ -146,7 +153,8 @@ function getIntegral(range, options) {
|
|
|
146
153
|
}
|
|
147
154
|
else if (range.integration) {
|
|
148
155
|
const { nucleus } = options;
|
|
149
|
-
integration =
|
|
156
|
+
integration =
|
|
157
|
+
numeral(range.integration).format('0') + nucleus[nucleus.length - 1];
|
|
150
158
|
}
|
|
151
159
|
return integration;
|
|
152
160
|
}
|
|
@@ -213,7 +221,7 @@ function pushCoupling(signal, parenthesis, options) {
|
|
|
213
221
|
const values = [];
|
|
214
222
|
for (const j of signal.js) {
|
|
215
223
|
if (j.coupling !== undefined) {
|
|
216
|
-
values.push(j.coupling.
|
|
224
|
+
values.push(numeral(j.coupling).format(options.nbDecimalJ));
|
|
217
225
|
}
|
|
218
226
|
}
|
|
219
227
|
if (values.length > 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rangesToACS.js","sourceRoot":"","sources":["../../src/ranges/rangesToACS.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,yBAAyB,EAAE,MAAM,qCAAqC,CAAC;AAIhF,MAAM,aAAa,GAQf;IACF,CAAC,EAAE;QACD,OAAO,EAAE,IAAI;QACb,cAAc,EAAE,
|
|
1
|
+
{"version":3,"file":"rangesToACS.js","sourceRoot":"","sources":["../../src/ranges/rangesToACS.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,7 @@ export function getSum(values, key, check = null) {
|
|
|
10
10
|
for (const current of values) {
|
|
11
11
|
if (check?.(current)) {
|
|
12
12
|
const value = current[key];
|
|
13
|
-
if (!value ||
|
|
13
|
+
if (!value || typeof value !== 'number')
|
|
14
14
|
continue;
|
|
15
15
|
sum += Math.abs(value);
|
|
16
16
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getSum.js","sourceRoot":"","sources":["../../src/utilities/getSum.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,MAAM,UAAU,MAAM,CACpB,MAAc,EACd,GAAe,EACf,QAA2C,IAAI;IAE/C,IAAI,GAAG,GAAG,CAAC,CAAC;IACZ,KAAK,MAAM,OAAO,IAAI,MAAM,EAAE;QAC5B,IAAI,KAAK,EAAE,CAAC,OAAO,CAAC,EAAE;YACpB,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;YAC3B,IAAI,CAAC,KAAK,IAAI,KAAK,
|
|
1
|
+
{"version":3,"file":"getSum.js","sourceRoot":"","sources":["../../src/utilities/getSum.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,MAAM,UAAU,MAAM,CACpB,MAAc,EACd,GAAe,EACf,QAA2C,IAAI;IAE/C,IAAI,GAAG,GAAG,CAAC,CAAC;IACZ,KAAK,MAAM,OAAO,IAAI,MAAM,EAAE;QAC5B,IAAI,KAAK,EAAE,CAAC,OAAO,CAAC,EAAE;YACpB,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;YAC3B,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;gBAAE,SAAS;YAClD,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SACxB;KACF;IACD,OAAO,GAAG,CAAC;AACb,CAAC"}
|