@zakodium/nmrium-core-plugins-ui 0.1.55 → 0.1.56

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.
Files changed (5) hide show
  1. package/lib/plugins/spectrum_1d_processings_ui/operators/apodization_chart_svg.d.ts.map +1 -1
  2. package/lib/plugins/spectrum_1d_processings_ui/operators/apodization_chart_svg.js +24 -5
  3. package/lib/plugins/spectrum_1d_processings_ui/operators/apodization_chart_svg.js.map +1 -1
  4. package/package.json +2 -2
  5. package/src/plugins/spectrum_1d_processings_ui/operators/apodization_chart_svg.tsx +33 -5
package/lib/plugins/spectrum_1d_processings_ui/operators/apodization_chart_svg.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"apodization_chart_svg.d.ts","sourceRoot":"","sources":["../../../../src/plugins/spectrum_1d_processings_ui/operators/apodization_chart_svg.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iCAAiC,EAAE,MAAM,uBAAuB,CAAC;AAS/E,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,iCAAiC,CAAC,6CAA6C,CAAC,+BAwBxF"}
1
+ {"version":3,"file":"apodization_chart_svg.d.ts","sourceRoot":"","sources":["../../../../src/plugins/spectrum_1d_processings_ui/operators/apodization_chart_svg.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iCAAiC,EAAE,MAAM,uBAAuB,CAAC;AAS/E,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,iCAAiC,CAAC,6CAA6C,CAAC,+BA2BxF"}
package/lib/plugins/spectrum_1d_processings_ui/operators/apodization_chart_svg.js CHANGED
@@ -8,18 +8,36 @@ import { SVGPathBuilder } from 'react-science/ui';
8
8
  export function ApodizationChartSVG(props) {
9
9
  const { spectrum, operation, width, scaleX, scaleY, indicatorLineColor } = props;
10
10
  castSpectrum1D(spectrum);
11
- const { x } = spectrum.data;
11
+ const { x } = spectrum.originalData;
12
+ const isFid = spectrum.info.isFid;
12
13
  const path = useApodizationPath({
13
14
  x,
14
15
  width,
15
16
  scaleX,
16
17
  scaleY,
17
18
  shapes: operation.settings,
19
+ isFid,
18
20
  });
19
21
  return (_jsx("path", { "data-testid": "@zakodium/nmrium-core-plugins#apodization1D#indicator", stroke: indicatorLineColor, fill: "none", strokeWidth: "2", d: path.toString() }));
20
22
  }
21
23
  function useApodizationPath(props) {
22
- const { x, width, scaleX, scaleY, shapes } = props;
24
+ const { x, width, scaleX, scaleY, shapes, isFid } = props;
25
+ const apodizationScaleX = useMemo(() => {
26
+ if (isFid)
27
+ return scaleX;
28
+ const scale = scaleX.copy();
29
+ const [x0, xn] = scale.domain();
30
+ return scale.domain([xn, x0]);
31
+ }, [isFid, scaleX]);
32
+ const apodizationScaleY = useMemo(() => {
33
+ const scale = scaleY.copy();
34
+ const [dmin, dmax] = scaleY.domain();
35
+ if (Math.abs(dmin) === Math.abs(dmax))
36
+ scale.domain([-1, 1]);
37
+ else
38
+ scale.domain([0, 1]);
39
+ return scale;
40
+ }, [scaleY]);
23
41
  return useMemo(() => {
24
42
  const builder = new SVGPathBuilder();
25
43
  const from = x.at(-1);
@@ -33,11 +51,12 @@ function useApodizationPath(props) {
33
51
  shapes,
34
52
  });
35
53
  const pathPoints = xyReduce({ x, y }, { from, to, nbPoints: width * 4, optimize: true });
36
- builder.moveTo(scaleX(pathPoints.x[0]), scaleY(pathPoints.y[0]));
54
+ builder.moveTo(apodizationScaleX(pathPoints.x[0]), apodizationScaleY(pathPoints.y[0]));
37
55
  for (let i = 1; i < pathPoints.x.length; i++) {
38
- builder.lineTo(scaleX(pathPoints.x[i]), scaleY(pathPoints.y[i]));
56
+ const { x, y } = pathPoints;
57
+ builder.lineTo(apodizationScaleX(x[i]), apodizationScaleY(y[i]));
39
58
  }
40
59
  return builder;
41
- }, [x, shapes, width, scaleX, scaleY]);
60
+ }, [x, shapes, width, apodizationScaleX, apodizationScaleY]);
42
61
  }
43
62
  //# sourceMappingURL=apodization_chart_svg.js.map
package/lib/plugins/spectrum_1d_processings_ui/operators/apodization_chart_svg.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"apodization_chart_svg.js","sourceRoot":"","sources":["../../../../src/plugins/spectrum_1d_processings_ui/operators/apodization_chart_svg.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,2BAA2B,EAAE,MAAM,gBAAgB,CAAC;AAC7D,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,MAAM,UAAU,mBAAmB,CACjC,KAAuF;IAEvF,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB,EAAE,GACtE,KAAK,CAAC;IACR,cAAc,CAAC,QAAQ,CAAC,CAAC;IACzB,MAAM,EAAE,CAAC,EAAE,GAAG,QAAQ,CAAC,IAAI,CAAC;IAE5B,MAAM,IAAI,GAAG,kBAAkB,CAAC;QAC9B,CAAC;QACD,KAAK;QACL,MAAM;QACN,MAAM;QACN,MAAM,EAAE,SAAS,CAAC,QAAQ;KAC3B,CAAC,CAAC;IAEH,OAAO,CACL,8BACc,uDAAuD,EACnE,MAAM,EAAE,kBAAkB,EAC1B,IAAI,EAAC,MAAM,EACX,WAAW,EAAC,GAAG,EACf,CAAC,EAAE,IAAI,CAAC,QAAQ,EAAE,GAClB,CACH,CAAC;AACJ,CAAC;AAUD,SAAS,kBAAkB,CAAC,KAA8B;IACxD,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;IAEnD,OAAO,OAAO,CAAC,GAAG,EAAE;QAClB,MAAM,OAAO,GAAG,IAAI,cAAc,EAAE,CAAC;QAErC,MAAM,IAAI,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACtB,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAChB,aAAa,CAAC,IAAI,CAAC,CAAC;QACpB,aAAa,CAAC,EAAE,CAAC,CAAC;QAElB,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC;QACxB,MAAM,EAAE,GAAG,CAAC,IAAI,GAAG,EAAE,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAEtC,MAAM,CAAC,GAAG,2BAA2B,CAAC;YACpC,aAAa,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE;YAC7B,MAAM;SACP,CAAC,CAAC;QAEH,MAAM,UAAU,GAAG,QAAQ,CACzB,EAAE,CAAC,EAAE,CAAC,EAAE,EACR,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,KAAK,GAAG,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAClD,CAAC;QAEF,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACjE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC7C,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACnE,CAAC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;AACzC,CAAC"}
1
+ {"version":3,"file":"apodization_chart_svg.js","sourceRoot":"","sources":["../../../../src/plugins/spectrum_1d_processings_ui/operators/apodization_chart_svg.tsx"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zakodium/nmrium-core-plugins-ui",
3
- "version": "0.1.55",
3
+ "version": "0.1.56",
4
4
  "license": "CC-BY-NC-SA-4.0",
5
5
  "description": "UI related plugins needed for cheminfo/nmrium",
6
6
  "keywords": [],
@@ -52,5 +52,5 @@
52
52
  "volta": {
53
53
  "extends": "../../../package.json"
54
54
  },
55
- "gitHead": "ec4b21e9f05d0ae5652b5eec4c19edc96c378fbd"
55
+ "gitHead": "c5a58ee18d54c3a0df8d976ae14431235fd3c590"
56
56
  }
package/src/plugins/spectrum_1d_processings_ui/operators/apodization_chart_svg.tsx CHANGED
@@ -14,7 +14,9 @@ export function ApodizationChartSVG(
14
14
  const { spectrum, operation, width, scaleX, scaleY, indicatorLineColor } =
15
15
  props;
16
16
  castSpectrum1D(spectrum);
17
- const { x } = spectrum.data;
17
+ const { x } = spectrum.originalData;
18
+
19
+ const isFid = spectrum.info.isFid;
18
20
 
19
21
  const path = useApodizationPath({
20
22
  x,
@@ -22,6 +24,7 @@ export function ApodizationChartSVG(
22
24
  scaleX,
23
25
  scaleY,
24
26
  shapes: operation.settings,
27
+ isFid,
25
28
  });
26
29
 
27
30
  return (
@@ -41,10 +44,30 @@ interface UseApodizationPathProps {
41
44
  scaleX: ScaleLinear<number, number>;
42
45
  scaleY: ScaleLinear<number, number>;
43
46
  shapes: Shapes;
47
+ isFid: boolean;
44
48
  }
45
49
 
46
50
  function useApodizationPath(props: UseApodizationPathProps) {
47
- const { x, width, scaleX, scaleY, shapes } = props;
51
+ const { x, width, scaleX, scaleY, shapes, isFid } = props;
52
+
53
+ const apodizationScaleX = useMemo(() => {
54
+ if (isFid) return scaleX;
55
+
56
+ const scale = scaleX.copy();
57
+ const [x0, xn] = scale.domain();
58
+
59
+ return scale.domain([xn, x0]);
60
+ }, [isFid, scaleX]);
61
+
62
+ const apodizationScaleY = useMemo(() => {
63
+ const scale = scaleY.copy();
64
+
65
+ const [dmin, dmax] = scaleY.domain();
66
+ if (Math.abs(dmin) === Math.abs(dmax)) scale.domain([-1, 1]);
67
+ else scale.domain([0, 1]);
68
+
69
+ return scale;
70
+ }, [scaleY]);
48
71
 
49
72
  return useMemo(() => {
50
73
  const builder = new SVGPathBuilder();
@@ -67,11 +90,16 @@ function useApodizationPath(props: UseApodizationPathProps) {
67
90
  { from, to, nbPoints: width * 4, optimize: true },
68
91
  );
69
92
 
70
- builder.moveTo(scaleX(pathPoints.x[0]), scaleY(pathPoints.y[0]));
93
+ builder.moveTo(
94
+ apodizationScaleX(pathPoints.x[0]),
95
+ apodizationScaleY(pathPoints.y[0]),
96
+ );
71
97
  for (let i = 1; i < pathPoints.x.length; i++) {
72
- builder.lineTo(scaleX(pathPoints.x[i]), scaleY(pathPoints.y[i]));
98
+ const { x, y } = pathPoints;
99
+
100
+ builder.lineTo(apodizationScaleX(x[i]), apodizationScaleY(y[i]));
73
101
  }
74
102
 
75
103
  return builder;
76
- }, [x, shapes, width, scaleX, scaleY]);
104
+ }, [x, shapes, width, apodizationScaleX, apodizationScaleY]);
77
105
  }