fix: apply WE-ESCA yFactor to tooltip values and push dist

Author: Nicolass67

dist/components/d3_multi/index.js

@@ -135,8 +135,7 @@ class ViewerMulti extends _react.default.Component {
       cyclicvoltaSt,
       integationSt,
       mtplySt,
-      axesUnitsSt,
-      feature
+      axesUnitsSt
     } = this.props;
     this.normChange(prevProps);
     let xxLabel = xLabel;

dist/components/d3_multi/multi_focus.js

@@ -511,15 +511,17 @@ class MultiFocus {
       d3.select(`#bpt${Math.round(1000 * d.x)}`).style('fill', 'blue');
       const tipParams = {
         d,
-        layout: this.layout
+        layout: this.layout,
+        yFactor: this.yTransformFactor
       };
       this.tip.show(tipParams, event.target);
     }).on('mouseout', (event, d) => {
       d3.select(`#mpp${Math.round(1000 * d.x)}`).attr('stroke-opacity', '0.0');
       d3.select(`#bpt${Math.round(1000 * d.x)}`).style('fill', 'red');
       const tipParams = {
         d,
-        layout: this.layout
+        layout: this.layout,
+        yFactor: this.yTransformFactor
       };
       this.tip.hide(tipParams, event.target);
     }).on('click', (event, d) => this.onClickTarget(event, d));
@@ -572,15 +574,17 @@ class MultiFocus {
       d3.select(`#bpt${Math.round(1000 * d.x)}`).style('fill', 'blue');
       const tipParams = {
         d,
-        layout: this.layout
+        layout: this.layout,
+        yFactor: this.yTransformFactor
       };
       this.tip.show(tipParams, event.target);
     }).on('mouseout', (event, d) => {
       d3.select(`#mpp${Math.round(1000 * d.x)}`).attr('stroke-opacity', '0.0');
       d3.select(`#bpt${Math.round(1000 * d.x)}`).style('fill', '#228B22');
       const tipParams = {
         d,
-        layout: this.layout
+        layout: this.layout,
+        yFactor: this.yTransformFactor
       };
       this.tip.hide(tipParams, event.target);
     }).on('click', (event, d) => this.onClickPecker(event, d));

dist/components/panel/cyclic_voltamery_data.js

@@ -118,7 +118,6 @@ const CyclicVoltammetryPanel = ({
   const formatCurrent = (y, feature, cyclicVotaSt) => {
     const baseY = feature && feature.yUnit ? String(feature.yUnit) : 'A';
     const isMilli = /mA/i.test(baseY);
-    console.log('isMilli', isMilli);
     const useDensity = cyclicVotaSt && cyclicVotaSt.useCurrentDensity;
     const rawArea = (cyclicVotaSt && cyclicVotaSt.areaValue === '' ? 1.0 : cyclicVotaSt?.areaValue) || 1.0;
     const areaUnit = cyclicVotaSt && cyclicVotaSt.areaUnit ? cyclicVotaSt.areaUnit : 'cm²';
@@ -131,7 +130,6 @@ const CyclicVoltammetryPanel = ({
     }
     if (isMilli) {
       val *= 1000.0;
-      console.log('val', val);
     }
     return `${parseFloat(val).toExponential(2)} ${unit}`;
   };

dist/helpers/init.js

@@ -45,22 +45,23 @@ const tpStyle = () => {
   const style = stBorder + stBorderRadius + stBackground + stColor + stPadding + stOpacity + stPadding + stZindex + stFontFamily;
   return style;
 };
-const tpDiv = (d, digits) => `
+const tpDiv = (d, digits, yFactor = 1) => `
   <div
     class="peak-tp"
     style="${tpStyle()}"
   >
     <span> x: ${_format.default.fixDigit(d.x, digits)}</span>
     <br/>
-    <span> y: ${d3.format('.2~e')(d.y)}</span>
+    <span> y: ${d3.format('.2~e')(d.y * (yFactor || 1))}</span>
   <div>
   `;
 const InitTip = () => {
   d3.select('.peak-tp').remove();
   const tip = (0, _d3Tip.default)().attr('class', 'd3-tip').html(({
     d,
-    layout
-  }) => tpDiv(d, _format.default.spectraDigit(layout)));
+    layout,
+    yFactor
+  }) => tpDiv(d, _format.default.spectraDigit(layout), yFactor || 1));
   return tip;
 };
 exports.InitTip = InitTip;

src/components/d3_multi/multi_focus.js

@@ -503,15 +503,15 @@ class MultiFocus {
           .attr('stroke-opacity', '1.0');
         d3.select(`#bpt${Math.round(1000 * d.x)}`)
           .style('fill', 'blue');
-        const tipParams = { d, layout: this.layout };
+        const tipParams = { d, layout: this.layout, yFactor: this.yTransformFactor };
         this.tip.show(tipParams, event.target);
       })
       .on('mouseout', (event, d) => {
         d3.select(`#mpp${Math.round(1000 * d.x)}`)
           .attr('stroke-opacity', '0.0');
         d3.select(`#bpt${Math.round(1000 * d.x)}`)
           .style('fill', 'red');
-        const tipParams = { d, layout: this.layout };
+        const tipParams = { d, layout: this.layout, yFactor: this.yTransformFactor };
         this.tip.hide(tipParams, event.target);
       })
       .on('click', (event, d) => this.onClickTarget(event, d));
@@ -589,15 +589,15 @@ class MultiFocus {
           .attr('stroke-opacity', '1.0');
         d3.select(`#bpt${Math.round(1000 * d.x)}`)
           .style('fill', 'blue');
-        const tipParams = { d, layout: this.layout };
+        const tipParams = { d, layout: this.layout, yFactor: this.yTransformFactor };
         this.tip.show(tipParams, event.target);
       })
       .on('mouseout', (event, d) => {
         d3.select(`#mpp${Math.round(1000 * d.x)}`)
           .attr('stroke-opacity', '0.0');
         d3.select(`#bpt${Math.round(1000 * d.x)}`)
           .style('fill', '#228B22');
-        const tipParams = { d, layout: this.layout };
+        const tipParams = { d, layout: this.layout, yFactor: this.yTransformFactor };
         this.tip.hide(tipParams, event.target);
       })
       .on('click', (event, d) => this.onClickPecker(event, d));

src/helpers/init.js

@@ -44,15 +44,15 @@ const tpStyle = () => {
   return style;
 };
 
-const tpDiv = (d, digits) => (
+const tpDiv = (d, digits, yFactor = 1) => (
   `
   <div
     class="peak-tp"
     style="${tpStyle()}"
   >
     <span> x: ${FN.fixDigit(d.x, digits)}</span>
     <br/>
-    <span> y: ${d3.format('.2~e')(d.y)}</span>
+    <span> y: ${d3.format('.2~e')(d.y * (yFactor || 1))}</span>
   <div>
   `
 );
@@ -61,7 +61,7 @@ const InitTip = () => {
   d3.select('.peak-tp').remove();
   const tip = d3Tip()
     .attr('class', 'd3-tip')
-    .html(({ d, layout }) => tpDiv(d, FN.spectraDigit(layout)));
+    .html(({ d, layout, yFactor }) => tpDiv(d, FN.spectraDigit(layout), yFactor || 1));
   return tip;
 };