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

package/lib/plugins/spectrum_1d_processings_ui/operators/apodization_chart_svg.d.ts.map

@@ -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"}
+{"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

@@ -8,18 +8,36 @@ import { SVGPathBuilder } from 'react-science/ui';
 export function ApodizationChartSVG(props) {
     const { spectrum, operation, width, scaleX, scaleY, indicatorLineColor } = props;
     castSpectrum1D(spectrum);
-    const { x } = spectrum.data;
+    const { x } = spectrum.originalData;
+    const isFid = spectrum.info.isFid;
     const path = useApodizationPath({
         x,
         width,
         scaleX,
         scaleY,
         shapes: operation.settings,
+        isFid,
     });
     return (_jsx("path", { "data-testid": "@zakodium/nmrium-core-plugins#apodization1D#indicator", stroke: indicatorLineColor, fill: "none", strokeWidth: "2", d: path.toString() }));
 }
 function useApodizationPath(props) {
-    const { x, width, scaleX, scaleY, shapes } = props;
+    const { x, width, scaleX, scaleY, shapes, isFid } = props;
+    const apodizationScaleX = useMemo(() => {
+        if (isFid)
+            return scaleX;
+        const scale = scaleX.copy();
+        const [x0, xn] = scale.domain();
+        return scale.domain([xn, x0]);
+    }, [isFid, scaleX]);
+    const apodizationScaleY = useMemo(() => {
+        const scale = scaleY.copy();
+        const [dmin, dmax] = scaleY.domain();
+        if (Math.abs(dmin) === Math.abs(dmax))
+            scale.domain([-1, 1]);
+        else
+            scale.domain([0, 1]);
+        return scale;
+    }, [scaleY]);
     return useMemo(() => {
         const builder = new SVGPathBuilder();
         const from = x.at(-1);
@@ -33,11 +51,12 @@ function useApodizationPath(props) {
             shapes,
         });
         const pathPoints = xyReduce({ x, y }, { from, to, nbPoints: width * 4, optimize: true });
-        builder.moveTo(scaleX(pathPoints.x[0]), scaleY(pathPoints.y[0]));
+        builder.moveTo(apodizationScaleX(pathPoints.x[0]), apodizationScaleY(pathPoints.y[0]));
         for (let i = 1; i < pathPoints.x.length; i++) {
-            builder.lineTo(scaleX(pathPoints.x[i]), scaleY(pathPoints.y[i]));
+            const { x, y } = pathPoints;
+            builder.lineTo(apodizationScaleX(x[i]), apodizationScaleY(y[i]));
         }
         return builder;
-    }, [x, shapes, width, scaleX, scaleY]);
+    }, [x, shapes, width, apodizationScaleX, apodizationScaleY]);
 }
 //# sourceMappingURL=apodization_chart_svg.js.map

package/lib/plugins/spectrum_1d_processings_ui/operators/apodization_chart_svg.js.map

@@ -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"}
+{"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,YAAY,CAAC;IAEpC,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC;IAElC,MAAM,IAAI,GAAG,kBAAkB,CAAC;QAC9B,CAAC;QACD,KAAK;QACL,MAAM;QACN,MAAM;QACN,MAAM,EAAE,SAAS,CAAC,QAAQ;QAC1B,KAAK;KACN,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;AAWD,SAAS,kBAAkB,CAAC,KAA8B;IACxD,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC;IAE1D,MAAM,iBAAiB,GAAG,OAAO,CAAC,GAAG,EAAE;QACrC,IAAI,KAAK;YAAE,OAAO,MAAM,CAAC;QAEzB,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC;QAC5B,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;QAEhC,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;IAChC,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC;IAEpB,MAAM,iBAAiB,GAAG,OAAO,CAAC,GAAG,EAAE;QACrC,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC;QAE5B,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC;QACrC,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC;YAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;;YACxD,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAE1B,OAAO,KAAK,CAAC;IACf,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IAEb,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,CACZ,iBAAiB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAClC,iBAAiB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACnC,CAAC;QACF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC7C,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,UAAU,CAAC;YAE5B,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACnE,CAAC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB,EAAE,iBAAiB,CAAC,CAAC,CAAC;AAC/D,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zakodium/nmrium-core-plugins-ui",
-  "version": "0.1.54",
+  "version": "0.1.56",
   "license": "CC-BY-NC-SA-4.0",
   "description": "UI related plugins needed for cheminfo/nmrium",
   "keywords": [],
@@ -29,13 +29,13 @@
     "@emotion/react": "^11.14.0",
     "@emotion/styled": "^11.14.1",
     "@tanstack/react-form": "^1.33.4",
-    "@zakodium/nmrium-core": "^0.7.66",
-    "@zakodium/nmrium-core-plugins": "^0.7.89",
+    "@zakodium/nmrium-core": "^0.7.67",
+    "@zakodium/nmrium-core-plugins": "^0.7.90",
     "@zakodium/utils": "^0.5.1",
     "cheminfo-font": "^1.27.0",
     "fifo-logger": "^2.0.1",
     "ml-spectra-processing": "^14.33.0",
-    "nmr-processing": "^22.23.6",
+    "nmr-processing": "^22.23.7",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-science": "^23.1.1",
@@ -52,5 +52,5 @@
   "volta": {
     "extends": "../../../package.json"
   },
-  "gitHead": "4a827734141f0d23bf9f9436f6dad7c40c62c59a"
+  "gitHead": "c5a58ee18d54c3a0df8d976ae14431235fd3c590"
 }

package/src/plugins/spectrum_1d_processings_ui/operators/apodization_chart_svg.tsx

@@ -14,7 +14,9 @@ export function ApodizationChartSVG(
   const { spectrum, operation, width, scaleX, scaleY, indicatorLineColor } =
     props;
   castSpectrum1D(spectrum);
-  const { x } = spectrum.data;
+  const { x } = spectrum.originalData;
+
+  const isFid = spectrum.info.isFid;
 
   const path = useApodizationPath({
     x,
@@ -22,6 +24,7 @@ export function ApodizationChartSVG(
     scaleX,
     scaleY,
     shapes: operation.settings,
+    isFid,
   });
 
   return (
@@ -41,10 +44,30 @@ interface UseApodizationPathProps {
   scaleX: ScaleLinear<number, number>;
   scaleY: ScaleLinear<number, number>;
   shapes: Shapes;
+  isFid: boolean;
 }
 
 function useApodizationPath(props: UseApodizationPathProps) {
-  const { x, width, scaleX, scaleY, shapes } = props;
+  const { x, width, scaleX, scaleY, shapes, isFid } = props;
+
+  const apodizationScaleX = useMemo(() => {
+    if (isFid) return scaleX;
+
+    const scale = scaleX.copy();
+    const [x0, xn] = scale.domain();
+
+    return scale.domain([xn, x0]);
+  }, [isFid, scaleX]);
+
+  const apodizationScaleY = useMemo(() => {
+    const scale = scaleY.copy();
+
+    const [dmin, dmax] = scaleY.domain();
+    if (Math.abs(dmin) === Math.abs(dmax)) scale.domain([-1, 1]);
+    else scale.domain([0, 1]);
+
+    return scale;
+  }, [scaleY]);
 
   return useMemo(() => {
     const builder = new SVGPathBuilder();
@@ -67,11 +90,16 @@ function useApodizationPath(props: UseApodizationPathProps) {
       { from, to, nbPoints: width * 4, optimize: true },
     );
 
-    builder.moveTo(scaleX(pathPoints.x[0]), scaleY(pathPoints.y[0]));
+    builder.moveTo(
+      apodizationScaleX(pathPoints.x[0]),
+      apodizationScaleY(pathPoints.y[0]),
+    );
     for (let i = 1; i < pathPoints.x.length; i++) {
-      builder.lineTo(scaleX(pathPoints.x[i]), scaleY(pathPoints.y[i]));
+      const { x, y } = pathPoints;
+
+      builder.lineTo(apodizationScaleX(x[i]), apodizationScaleY(y[i]));
     }
 
     return builder;
-  }, [x, shapes, width, scaleX, scaleY]);
+  }, [x, shapes, width, apodizationScaleX, apodizationScaleY]);
 }