@complat/react-spectra-editor 1.2.1 → 1.3.1

package/dist/__tests__/units/components/cmd_bar/r08_change_axes.test.js

@@ -8,7 +8,18 @@ require("@testing-library/jest-dom");
 var _r08_change_axes = _interopRequireDefault(require("../../../../components/cmd_bar/r08_change_axes"));
 var _list_layout = require("../../../../constants/list_layout");
 const mockStore = (0, _reduxMockStore.default)([]);
-const store = mockStore({});
+const store = mockStore({
+  axesUnits: {
+    axes: [{
+      xUnit: '',
+      yUnit: ''
+    }]
+  },
+  curve: {
+    curveIdx: 0
+  },
+  layout: _list_layout.LIST_LAYOUT.CYCLIC_VOLTAMMETRY
+});
 const dispatchMock = () => Promise.resolve({});
 store.dispatch = jest.fn(dispatchMock);
 const options = ['Voltage in V', 'Voltage vs Ref in V', 'Potential in V', 'Potential vs Ref in V'];

package/dist/components/cmd_bar/07_pecker.js

@@ -35,14 +35,17 @@ const setRef = (classes, cyclicVotaSt, curveIdx, setCylicVoltaRefFactorAct) => {
   } = cyclicVotaSt;
   const spectra = spectraList[curveIdx];
   let refFactor = 0.0;
+  let hasRefPeaks = false;
   if (spectra) {
     const {
-      shift
+      shift,
+      hasRefPeak
     } = spectra;
     const {
       val
     } = shift;
     refFactor = val;
+    hasRefPeaks = hasRefPeak;
   }
   const onFactorChanged = e => setCylicVoltaRefFactorAct({
     factor: e.target.value,
@@ -67,7 +70,7 @@ const setRef = (classes, cyclicVotaSt, curveIdx, setCylicVoltaRefFactorAct) => {
     },
     label: /*#__PURE__*/_react.default.createElement("span", {
       className: (0, _classnames.default)(classes.txtLabel, 'txtfield-sv-bar-label')
-    }, "Ref Value (V)"),
+    }, hasRefPeaks ? 'Ref Value (V)' : 'Shift'),
     variant: "outlined",
     onChange: onFactorChanged,
     onBlur: onFactorChanged,
@@ -95,6 +98,17 @@ const Pecker = _ref => {
   const onConfirmSetRef = () => setCylicVoltaRefAct({
     jcampIdx: curveIdx
   });
+  const {
+    spectraList
+  } = cyclicVotaSt;
+  const spectra = spectraList[curveIdx];
+  let hasRefPeaks = false;
+  if (spectra) {
+    const {
+      hasRefPeak
+    } = spectra;
+    hasRefPeaks = hasRefPeak;
+  }
   return !_cfg.default.hidePanelCyclicVolta(layoutSt) ? /*#__PURE__*/_react.default.createElement("span", {
     "data-testid": "Pecker"
   }, /*#__PURE__*/_react.default.createElement(_Tooltip.default, {
@@ -118,7 +132,7 @@ const Pecker = _ref => {
   }, "I", /*#__PURE__*/_react.default.createElement("sub", null, "\u03BB0"), "-")))), setRef(classes, cyclicVotaSt, curveIdx, setCylicVoltaRefFactorAct), /*#__PURE__*/_react.default.createElement(_Tooltip.default, {
     title: /*#__PURE__*/_react.default.createElement("span", {
       className: "txt-sv-tp"
-    }, "Set Reference")
+    }, hasRefPeaks ? 'Set Reference' : 'Set Shift')
   }, /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement(_common.MuButton, {
     className: (0, _classnames.default)((0, _common.focusStyle)(isFocusSetRefSt, classes), 'btn-sv-bar-setref'),
     onClick: onConfirmSetRef

package/dist/components/cmd_bar/r08_change_axes.js

@@ -29,13 +29,29 @@ const styles = () => Object.assign({
     width: 100
   }
 }, _common.commonStyle);
-const axisX = (classes, layoutSt, axesUnitsSt, updateXAxisAct) => {
+const axisX = (classes, layoutSt, axesUnitsSt, updateXAxisAct, curveSt) => {
   const optionsAxisX = _list_axes.LIST_AXES.x;
   const options = optionsAxisX[layoutSt];
-  const onChange = e => updateXAxisAct(e.target.value);
   const {
-    xUnit
+    curveIdx
+  } = curveSt;
+  const onChange = e => updateXAxisAct({
+    value: e.target.value,
+    curveIndex: curveIdx
+  });
+  const {
+    axes
   } = axesUnitsSt;
+  let selectedAxes = axes[curveIdx];
+  if (!selectedAxes) {
+    selectedAxes = {
+      xUnit: '',
+      yUnit: ''
+    };
+  }
+  const {
+    xUnit
+  } = selectedAxes;
   return /*#__PURE__*/_react.default.createElement(_material.FormControl, {
     className: (0, _classnames.default)(classes.fieldLayout),
     variant: "outlined"
@@ -58,15 +74,30 @@ const axisX = (classes, layoutSt, axesUnitsSt, updateXAxisAct) => {
     className: (0, _classnames.default)(classes.txtLabelTopInput)
   }, "x-Axis"));
 };
-const axisY = (classes, layoutSt, axesUnitsSt, updateYAxisAct) => {
+const axisY = (classes, layoutSt, axesUnitsSt, updateYAxisAct, curveSt) => {
   const optionsAxisX = _list_axes.LIST_AXES.y;
   const options = optionsAxisX[layoutSt];
-  const onChange = e => updateYAxisAct(e.target.value);
   const {
-    yUnit
+    curveIdx
+  } = curveSt;
+  const onChange = e => updateYAxisAct({
+    value: e.target.value,
+    curveIndex: curveIdx
+  });
+  const {
+    axes
   } = axesUnitsSt;
+  let selectedAxes = axes[curveIdx];
+  if (!selectedAxes) {
+    selectedAxes = {
+      xUnit: '',
+      yUnit: ''
+    };
+  }
+  const {
+    yUnit
+  } = selectedAxes;
   return /*#__PURE__*/_react.default.createElement(_material.FormControl, {
-    "data-testid": "ChangeAxes",
     className: (0, _classnames.default)(classes.fieldLayout),
     variant: "outlined"
   }, /*#__PURE__*/_react.default.createElement(_material.Select, {
@@ -88,11 +119,11 @@ const axisY = (classes, layoutSt, axesUnitsSt, updateYAxisAct) => {
     className: (0, _classnames.default)(classes.txtLabelTopInput)
   }, "y-Axis"));
 };
-const showSelect = (classes, layoutSt, curveSt, axesUnitsSt, updateXAxisAct, updateYAxisActt) => {
+const showSelect = (classes, layoutSt, curveSt, axesUnitsSt, updateXAxisAct, updateYAxisAct) => {
   if (!listLayoutToShow.includes(layoutSt)) {
     return /*#__PURE__*/_react.default.createElement("i", null);
   }
-  return /*#__PURE__*/_react.default.createElement("span", null, axisX(classes, layoutSt, axesUnitsSt, updateXAxisAct), axisY(classes, layoutSt, axesUnitsSt, updateYAxisActt));
+  return /*#__PURE__*/_react.default.createElement("span", null, axisX(classes, layoutSt, axesUnitsSt, updateXAxisAct, curveSt), axisY(classes, layoutSt, axesUnitsSt, updateYAxisAct, curveSt));
 };
 const ChangeAxes = _ref => {
   let {
@@ -122,7 +153,7 @@ const mapDispatchToProps = dispatch => (0, _redux.bindActionCreators)({
 ChangeAxes.propTypes = {
   classes: _propTypes.default.object.isRequired,
   layoutSt: _propTypes.default.string.isRequired,
-  curveSt: _propTypes.default.string.isRequired,
+  curveSt: _propTypes.default.object.isRequired,
   axesUnitsSt: _propTypes.default.object.isRequired,
   updateXAxisAct: _propTypes.default.func.isRequired,
   updateYAxisAct: _propTypes.default.func.isRequired

package/dist/components/d3_line/index.js

@@ -68,10 +68,13 @@ class ViewerLine extends _react.default.Component {
     let xxLabel = xLabel;
     let yyLabel = yLabel;
     if (axesUnitsSt) {
+      const {
+        axes
+      } = axesUnitsSt;
       const {
         xUnit,
         yUnit
-      } = axesUnitsSt;
+      } = axes[0];
       xxLabel = xUnit === '' ? xLabel : xUnit;
       yyLabel = yUnit === '' ? yLabel : yUnit;
     }
@@ -123,10 +126,13 @@ class ViewerLine extends _react.default.Component {
     let xxLabel = xLabel;
     let yyLabel = yLabel;
     if (axesUnitsSt) {
+      const {
+        axes
+      } = axesUnitsSt;
       const {
         xUnit,
         yUnit
-      } = axesUnitsSt;
+      } = axes[0];
       xxLabel = xUnit === '' ? xLabel : xUnit;
       yyLabel = yUnit === '' ? yLabel : yUnit;
     }

package/dist/components/d3_multi/index.js

@@ -69,10 +69,23 @@ class ViewerMulti extends _react.default.Component {
     let xxLabel = xLabel;
     let yyLabel = yLabel;
     if (axesUnitsSt) {
+      const {
+        curveIdx
+      } = curveSt;
+      const {
+        axes
+      } = axesUnitsSt;
+      let selectedAxes = axes[curveIdx];
+      if (!selectedAxes) {
+        selectedAxes = {
+          xUnit: '',
+          yUnit: ''
+        };
+      }
       const {
         xUnit,
         yUnit
-      } = axesUnitsSt;
+      } = selectedAxes;
       xxLabel = xUnit === '' ? xLabel : xUnit;
       yyLabel = yUnit === '' ? yLabel : yUnit;
     }
@@ -122,10 +135,23 @@ class ViewerMulti extends _react.default.Component {
     let xxLabel = xLabel;
     let yyLabel = yLabel;
     if (axesUnitsSt) {
+      const {
+        curveIdx
+      } = curveSt;
+      const {
+        axes
+      } = axesUnitsSt;
+      let selectedAxes = axes[curveIdx];
+      if (!selectedAxes) {
+        selectedAxes = {
+          xUnit: '',
+          yUnit: ''
+        };
+      }
       const {
         xUnit,
         yUnit
-      } = axesUnitsSt;
+      } = selectedAxes;
       xxLabel = xUnit === '' ? xLabel : xUnit;
       yyLabel = yUnit === '' ? yLabel : yUnit;
     }

package/dist/components/d3_multi/multi_focus.js

@@ -388,6 +388,29 @@ class MultiFocus {
       yt
     } = (0, _compass.TfRescale)(this);
     const dPks = this.mergedPeaks(editPeakSt);
+    const {
+      spectraList
+    } = this.cyclicvoltaSt;
+    const spectra = spectraList[this.jcampIdx];
+    let indexOfCVRefPeaks = [];
+    if (spectra) {
+      const {
+        shift,
+        hasRefPeak
+      } = spectra;
+      const {
+        ref
+      } = shift;
+      if (ref && hasRefPeak) {
+        const {
+          min,
+          max
+        } = ref;
+        indexOfCVRefPeaks = dPks.map((p, index) => {
+          return p === min || p === max ? -1 : index;
+        });
+      }
+    }
     const mpp = this.tags.pPath.selectAll('path').data(dPks);
     mpp.exit().attr('class', 'exit').remove();
     const linePath = [{
@@ -404,7 +427,25 @@ class MultiFocus {
       y: 10
     }];
     const lineSymbol = d3.line().x(d => d.x).y(d => d.y)(linePath);
-    mpp.enter().append('path').attr('d', lineSymbol).attr('class', 'enter-peak').attr('fill', 'red').attr('stroke', 'pink').attr('stroke-width', 3).attr('stroke-opacity', 0.0).merge(mpp).attr('id', d => `mpp${Math.round(1000 * d.x)}`).attr('transform', d => `translate(${xt(d.x)}, ${yt(d.y)})`).on('mouseover', (event, d) => {
+    const lineRefPath = [{
+      x: -0.5,
+      y: 10
+    }, {
+      x: -4,
+      y: -20
+    }, {
+      x: 4,
+      y: -20
+    }, {
+      x: 0.5,
+      y: 10
+    }];
+    const lineSymbolRef = d3.line().x(d => d.x).y(d => d.y)(lineRefPath);
+    mpp.enter().append('path').attr('d', (_, index) => {
+      return indexOfCVRefPeaks[index] === -1 ? lineSymbolRef : lineSymbol;
+    }).attr('class', 'enter-peak').attr('fill', (_, index) => {
+      return indexOfCVRefPeaks[index] === -1 ? 'blue' : 'red';
+    }).attr('stroke', 'pink').attr('stroke-width', 3).attr('stroke-opacity', 0.0).merge(mpp).attr('id', d => `mpp${Math.round(1000 * d.x)}`).attr('transform', d => `translate(${xt(d.x)}, ${yt(d.y)})`).on('mouseover', (event, d) => {
       d3.select(`#mpp${Math.round(1000 * d.x)}`).attr('stroke-opacity', '1.0');
       d3.select(`#bpt${Math.round(1000 * d.x)}`).style('fill', 'blue');
       const tipParams = {
@@ -427,6 +468,12 @@ class MultiFocus {
       bpTxt.exit().attr('class', 'exit').remove();
       bpTxt.enter().append('text').attr('class', 'peak-text').attr('font-family', 'Helvetica').style('font-size', '12px').attr('fill', '#228B22').style('text-anchor', 'middle').merge(bpTxt).attr('id', d => `mpp${Math.round(1000 * d.x)}`).text(d => d.x.toFixed(2)).attr('transform', d => `translate(${xt(d.x)}, ${yt(d.y) - 25})`).on('click', (event, d) => this.onClickTarget(event, d));
     }
+    mpp.attr('fill', (_, index) => {
+      return indexOfCVRefPeaks[index] === -1 ? 'blue' : 'red';
+    });
+    mpp.attr('d', (_, index) => {
+      return indexOfCVRefPeaks[index] === -1 ? lineSymbolRef : lineSymbol;
+    });
   }
   drawPeckers() {
     const {

package/dist/components/panel/cyclic_voltamery_data.js

@@ -188,10 +188,10 @@ const CyclicVoltammetryPanel = _ref => {
   }, "Ref"), /*#__PURE__*/_react.default.createElement(_material.TableCell, {
     align: "left",
     className: (0, _classnames.default)(classes.tTxt, classes.square, 'txt-sv-panel-txt')
-  }, "Ox"), /*#__PURE__*/_react.default.createElement(_material.TableCell, {
+  }, "Anodic"), /*#__PURE__*/_react.default.createElement(_material.TableCell, {
     align: "left",
     className: (0, _classnames.default)(classes.tTxt, classes.square, 'txt-sv-panel-txt')
-  }, "Red"), /*#__PURE__*/_react.default.createElement(_material.TableCell, {
+  }, "Cathodic"), /*#__PURE__*/_react.default.createElement(_material.TableCell, {
     align: "left",
     className: (0, _classnames.default)(classes.tTxt, classes.square, 'txt-sv-panel-txt')
   }, "I ", /*#__PURE__*/_react.default.createElement("sub", null, "\u03BB0"), /*#__PURE__*/_react.default.createElement(_material.Tooltip, {

package/dist/components/panel/graph_selection.js

@@ -16,7 +16,7 @@ var _material = require("@mui/material");
 var _curve = require("../../actions/curve");
 var _list_layout = require("../../constants/list_layout");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 /* eslint-disable react/function-component-definition, function-paren-newline,
 react/require-default-props, react/no-unused-prop-types */
 

package/dist/components/panel/info.js

@@ -17,7 +17,7 @@ var _ExpandMore = _interopRequireDefault(require("@mui/icons-material/ExpandMore
 var _styles = require("@mui/styles");
 var _format = _interopRequireDefault(require("../../helpers/format"));
 /* eslint-disable no-mixed-operators, react/function-component-definition,
-react/require-default-props */
+react/require-default-props, max-len */
 
 const styles = () => ({
   chip: {
@@ -109,7 +109,61 @@ const aucValue = integration => {
   }
   return values.join(', ');
 };
-const InfoPanel = _ref => {
+const SECData = _ref => {
+  let {
+    classes,
+    layout,
+    detector,
+    secData
+  } = _ref;
+  if (_format.default.isSECLayout(layout) && secData) {
+    const {
+      d,
+      mn,
+      mp,
+      mw
+    } = secData;
+    return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("div", {
+      className: (0, _classnames.default)(classes.rowRoot, classes.rowOdd)
+    }, /*#__PURE__*/_react.default.createElement("span", {
+      className: (0, _classnames.default)(classes.tTxt, classes.tHead, 'txt-sv-panel-txt')
+    }, "Detector: "), /*#__PURE__*/_react.default.createElement("span", {
+      className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt')
+    }, detector)), /*#__PURE__*/_react.default.createElement("div", {
+      className: (0, _classnames.default)(classes.rowRoot, classes.rowEven)
+    }, /*#__PURE__*/_react.default.createElement("span", {
+      className: (0, _classnames.default)(classes.tTxt, classes.tHead, 'txt-sv-panel-txt')
+    }, "D: "), /*#__PURE__*/_react.default.createElement("span", {
+      className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt')
+    }, d)), /*#__PURE__*/_react.default.createElement("div", {
+      className: (0, _classnames.default)(classes.rowRoot, classes.rowOdd)
+    }, /*#__PURE__*/_react.default.createElement("span", {
+      className: (0, _classnames.default)(classes.tTxt, classes.tHead, 'txt-sv-panel-txt')
+    }, "MN: "), /*#__PURE__*/_react.default.createElement("span", {
+      className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt')
+    }, mn)), /*#__PURE__*/_react.default.createElement("div", {
+      className: (0, _classnames.default)(classes.rowRoot, classes.rowEven)
+    }, /*#__PURE__*/_react.default.createElement("span", {
+      className: (0, _classnames.default)(classes.tTxt, classes.tHead, 'txt-sv-panel-txt')
+    }, "MP: "), /*#__PURE__*/_react.default.createElement("span", {
+      className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt')
+    }, mp)), /*#__PURE__*/_react.default.createElement("div", {
+      className: (0, _classnames.default)(classes.rowRoot, classes.rowOdd)
+    }, /*#__PURE__*/_react.default.createElement("span", {
+      className: (0, _classnames.default)(classes.tTxt, classes.tHead, 'txt-sv-panel-txt')
+    }, "MW: "), /*#__PURE__*/_react.default.createElement("span", {
+      className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt')
+    }, mw)));
+  }
+  return null;
+};
+SECData.propTypes = {
+  classes: _propTypes.default.object.isRequired,
+  layout: _propTypes.default.string.isRequired,
+  detector: _propTypes.default.object.isRequired,
+  secData: _propTypes.default.object.isRequired
+};
+const InfoPanel = _ref2 => {
   let {
     classes,
     expand,
@@ -127,12 +181,13 @@ const InfoPanel = _ref => {
     canChangeDescription,
     onDescriptionChanged,
     detectorSt
-  } = _ref;
+  } = _ref2;
   if (!feature) return null;
   const {
     title,
     observeFrequency,
-    solventName
+    solventName,
+    secData
   } = feature;
   const {
     curveIdx
@@ -204,13 +259,12 @@ const InfoPanel = _ref => {
     className: (0, _classnames.default)(classes.tTxt, classes.tHead, 'txt-sv-panel-txt')
   }, "Theoretical mass: "), /*#__PURE__*/_react.default.createElement("span", {
     className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt')
-  }, `${parseFloat(theoryMass).toFixed(6)} g/mol`)) : null, _format.default.isSECLayout(layoutSt) ? /*#__PURE__*/_react.default.createElement("div", {
-    className: (0, _classnames.default)(classes.rowRoot, classes.rowOdd)
-  }, /*#__PURE__*/_react.default.createElement("span", {
-    className: (0, _classnames.default)(classes.tTxt, classes.tHead, 'txt-sv-panel-txt')
-  }, "Detector: "), /*#__PURE__*/_react.default.createElement("span", {
-    className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt')
-  }, selectedDetector)) : null, !molSvg ? null : /*#__PURE__*/_react.default.createElement(_reactSvgFileZoomPan.default, {
+  }, `${parseFloat(theoryMass).toFixed(6)} g/mol`)) : null, /*#__PURE__*/_react.default.createElement(SECData, {
+    classes: classes,
+    layout: layoutSt,
+    detector: selectedDetector,
+    secData: secData
+  }), !molSvg ? null : /*#__PURE__*/_react.default.createElement(_reactSvgFileZoomPan.default, {
     svg: molSvg,
     duration: 300,
     resize: true

package/dist/helpers/chem.js

@@ -14,7 +14,8 @@ var _list_layout = require("../constants/list_layout");
 var _integration = require("./integration");
 /* eslint-disable
 no-mixed-operators, react/function-component-definition,
-prefer-object-spread, camelcase,  no-plusplus, prefer-destructuring */
+prefer-object-spread, camelcase,  no-plusplus, prefer-destructuring,
+max-len */
 
 const getTopic = (_, props) => props.topic;
 const getFeature = (_, props) => props.feature;
@@ -271,32 +272,6 @@ const Convert2MaxMinPeak = (layout, feature, offset) => {
     peaks.refIndex = refIndex;
     return peaks;
   }
-
-  // // let upperThresVal = upperThres;
-  // // if (!upperThresVal) {
-  // //   upperThresVal = 1.0;
-  // // }
-
-  // // let lowerThresVal = lowerThres;
-  // // if (!lowerThresVal) {
-  // //   lowerThresVal = 1.0;
-  // // }
-
-  // // const yUpperThres = parseFloat(upperThresVal) / 100.0 * maxY;
-  // // const yLowerThres = parseFloat(lowerThresVal) / 100.0 * minY;
-
-  // // const corrOffset = offset || 0.0;
-  // // for (let i = 0; i < data.y.length; i += 1) {
-  // //   const y = data.y[i];
-  // //   const overUpperThres = y >= yUpperThres;
-  // //   const belowThres = y <= yLowerThres;
-  // //   const x = data.x[i] - corrOffset;
-  // //   if (overUpperThres) {
-  // //     peaks.max.push({ x, y });
-  // //   } else if (belowThres) {
-  // //     peaks.min.push({ x, y });
-  // //   }
-  // // }
   return peaks;
 };
 exports.Convert2MaxMinPeak = Convert2MaxMinPeak;
@@ -773,9 +748,30 @@ const extrFeaturesCylicVolta = (jcamp, layout, peakUp) => {
     const lowerThres = _format.default.isXRDLayout(layout) ? 100 : calcLowerThres(s);
     const cpo = buildPeakFeature(jcamp, layout, peakUp, s, 100, upperThres, lowerThres);
     const bnd = getBoundary(s);
-    const detector = _format.default.isSECLayout(layout) && jcamp.info.$DETECTOR ? jcamp.info.$DETECTOR : '';
+    let detector = '';
+    let secData = null;
+    if (_format.default.isSECLayout(layout)) {
+      const {
+        info
+      } = jcamp;
+      detector = info.$DETECTOR ? info.$DETECTOR : '';
+      const {
+        D,
+        MN,
+        MP,
+        MW
+      } = info;
+      secData = {
+        d: D,
+        mn: MN,
+        mp: MP,
+        mw: MW
+      };
+    }
+    // const detector = Format.isSECLayout(layout) && jcamp.info.$DETECTOR ? jcamp.info.$DETECTOR : '';
     return Object.assign({}, base, cpo, bnd, {
-      detector
+      detector,
+      secData
     });
   }).filter(r => r != null);
   return features;
@@ -822,7 +818,7 @@ const extractTemperature = jcamp => {
 const ExtractJcamp = source => {
   const jcamp = _jcampconverter.default.convert(source, {
     xy: true,
-    keepRecordsRegExp: /(\$CSTHRESHOLD|\$CSSCANAUTOTARGET|\$CSSCANEDITTARGET|\$CSSCANCOUNT|\$CSSOLVENTNAME|\$CSSOLVENTVALUE|\$CSSOLVENTX|\$CSCATEGORY|\$CSITAREA|\$CSITFACTOR|\$OBSERVEDINTEGRALS|\$OBSERVEDMULTIPLETS|\$OBSERVEDMULTIPLETSPEAKS|\.SOLVENTNAME|\.OBSERVEFREQUENCY|\$CSSIMULATIONPEAKS|\$CSUPPERTHRESHOLD|\$CSLOWERTHRESHOLD|\$CSCYCLICVOLTAMMETRYDATA|UNITS|SYMBOL|CSAUTOMETADATA|\$DETECTOR)/ // eslint-disable-line
+    keepRecordsRegExp: /(\$CSTHRESHOLD|\$CSSCANAUTOTARGET|\$CSSCANEDITTARGET|\$CSSCANCOUNT|\$CSSOLVENTNAME|\$CSSOLVENTVALUE|\$CSSOLVENTX|\$CSCATEGORY|\$CSITAREA|\$CSITFACTOR|\$OBSERVEDINTEGRALS|\$OBSERVEDMULTIPLETS|\$OBSERVEDMULTIPLETSPEAKS|\.SOLVENTNAME|\.OBSERVEFREQUENCY|\$CSSIMULATIONPEAKS|\$CSUPPERTHRESHOLD|\$CSLOWERTHRESHOLD|\$CSCYCLICVOLTAMMETRYDATA|UNITS|SYMBOL|CSAUTOMETADATA|\$DETECTOR|MN|MW|D|MP)/ // eslint-disable-line
   });
   const layout = readLayout(jcamp);
   const peakUp = !_format.default.isIrLayout(layout);
@@ -910,11 +906,12 @@ const GetCyclicVoltaPreviousShift = (cyclicVolta, curveIdx) => {
     return 0.0;
   }
   const {
-    shift
+    shift,
+    hasRefPeak
   } = spectraList[curveIdx];
   const {
     prevValue
   } = shift;
-  return prevValue;
+  return hasRefPeak ? prevValue : -prevValue;
 };
 exports.GetCyclicVoltaPreviousShift = GetCyclicVoltaPreviousShift;

package/dist/reducers/reducer_axes.js

@@ -8,18 +8,40 @@ var _action_type = require("../constants/action_type");
 /* eslint-disable default-param-last, prefer-object-spread */
 
 const initialState = {
-  xUnit: '',
-  yUnit: ''
+  axes: [{
+    xUnit: '',
+    yUnit: ''
+  }]
 };
 const updateAxis = function (state, payload) {
   let isYAxis = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  const {
+    value,
+    curveIndex
+  } = payload;
+  const {
+    axes
+  } = state;
+  let selectedAxes = axes[curveIndex];
+  if (!selectedAxes) {
+    selectedAxes = {
+      xUnit: '',
+      yUnit: ''
+    };
+  }
+  let newAxes = null;
   if (isYAxis) {
-    return Object.assign({}, state, {
-      yUnit: payload
+    newAxes = Object.assign({}, selectedAxes, {
+      yUnit: value
+    });
+  } else {
+    newAxes = Object.assign({}, selectedAxes, {
+      xUnit: value
     });
   }
+  axes[curveIndex] = newAxes;
   return Object.assign({}, state, {
-    xUnit: payload
+    axes
   });
 };
 const axesReducer = function () {

package/dist/reducers/reducer_voltammetry.js

@@ -13,6 +13,7 @@ const initialState = {
 };
 const initSpectra = {
   list: [],
+  origin: [],
   selectedIdx: -1,
   isWorkMaxPeak: true,
   jcampIdx: -1,
@@ -20,7 +21,9 @@ const initSpectra = {
     ref: null,
     val: 0,
     prevValue: 0
-  }
+  },
+  hasRefPeak: false,
+  history: []
 };
 const addPairPeak = (state, action) => {
   const {
@@ -51,12 +54,14 @@ const addPairPeak = (state, action) => {
       min: null,
       max: null,
       isRef: false,
-      e12: null
+      e12: null,
+      createdAt: Date.now()
     });
     spectraList[payload] = Object.assign({}, spectra, {
       list: newList,
-      selectedIdx: index
-    });
+      selectedIdx: index,
+      origin: [...newList]
+    }); // eslint-disable-line
     return Object.assign({}, state, {
       spectraList
     });
@@ -78,12 +83,15 @@ const removePairPeak = (state, action) => {
     const spectra = spectraList[jcampIdx];
     if (spectra) {
       const {
-        list
+        list,
+        origin
       } = spectra;
       list.splice(index, 1);
+      origin.splice(index, 1);
       spectraList[jcampIdx] = Object.assign({}, spectra, {
         list,
-        selectedIdx: index
+        selectedIdx: index,
+        origin
       });
       return Object.assign({}, state, {
         spectraList
@@ -139,11 +147,13 @@ const addPeak = function (state, action) {
       });
     }
     pairPeak.e12 = getE12(pairPeak);
+    pairPeak.updatedAt = Date.now();
     newList[index] = pairPeak;
     spectraList[jcampIdx] = Object.assign({}, spectra, {
       list: newList,
       selectedIdx: index,
-      jcampIdx
+      jcampIdx,
+      origin: [...newList]
     });
     return Object.assign({}, state, {
       spectraList
@@ -176,11 +186,13 @@ const removePeak = function (state, action) {
       pairPeak.min = null;
     }
     pairPeak.e12 = getE12(pairPeak);
+    pairPeak.updatedAt = Date.now();
     newList[index] = pairPeak;
     spectraList[jcampIdx] = Object.assign({}, spectra, {
       list: newList,
       selectedIdx: index,
-      jcampIdx
+      jcampIdx,
+      origin: [...newList]
     });
     return Object.assign({}, state, {
       spectraList
@@ -258,11 +270,13 @@ const addPecker = (state, action) => {
     const newList = list;
     const pairPeak = newList[index];
     pairPeak.pecker = peak;
+    pairPeak.updatedAt = Date.now();
     newList[index] = pairPeak;
     spectraList[jcampIdx] = Object.assign({}, spectra, {
       list: newList,
       selectedIdx: index,
-      jcampIdx
+      jcampIdx,
+      origin: [...newList]
     });
     return Object.assign({}, state, {
       spectraList
@@ -289,11 +303,13 @@ const removePecker = (state, action) => {
     const newList = list;
     const pairPeak = newList[index];
     pairPeak.pecker = null;
+    pairPeak.updatedAt = Date.now();
     newList[index] = pairPeak;
     spectraList[jcampIdx] = Object.assign({}, spectra, {
       list: newList,
       selectedIdx: index,
-      jcampIdx
+      jcampIdx,
+      origin: [...newList]
     });
     return Object.assign({}, state, {
       spectraList
@@ -315,12 +331,14 @@ const setRef = (state, action) => {
     const spectra = spectraList[jcampIdx];
     const {
       list,
-      shift
+      shift,
+      hasRefPeak,
+      history
     } = spectra;
     const newShift = Object.assign({}, shift);
     const refPeaks = list.filter(pairPeak => pairPeak.isRef === true);
     let offset = 0.0;
-    if (refPeaks.length > 0) {
+    if (hasRefPeak) {
       const currRefPeaks = refPeaks[0];
       newShift.ref = currRefPeaks;
       const {
@@ -330,51 +348,107 @@ const setRef = (state, action) => {
         e12
       } = currRefPeaks;
       offset = e12 - val;
+      const newList = spectra.list.map(pairPeak => {
+        //eslint-disable-line
+        const {
+          max,
+          min,
+          pecker,
+          isRef
+        } = pairPeak;
+        let newMax = null;
+        let newMin = null;
+        let newPecker = null;
+        if (max) {
+          newMax = hasRefPeak ? {
+            x: max.x - offset,
+            y: max.y
+          } : {
+            x: max.x + parseFloat(offset),
+            y: max.y
+          };
+        }
+        if (min) {
+          newMin = hasRefPeak ? {
+            x: min.x - offset,
+            y: min.y
+          } : {
+            x: min.x + parseFloat(offset),
+            y: min.y
+          };
+        }
+        if (pecker) {
+          newPecker = hasRefPeak ? {
+            x: pecker.x - offset,
+            y: pecker.y
+          } : {
+            x: pecker.x + parseFloat(offset),
+            y: pecker.y
+          }; //eslint-disable-line
+        }
+        const newPairPeak = Object.assign({}, pairPeak, {
+          max: newMax,
+          min: newMin,
+          pecker: newPecker
+        }); //eslint-disable-line
+        newPairPeak.e12 = getE12(newPairPeak);
+        newPairPeak.updatedAt = Date.now();
+        if (isRef) {
+          newShift.ref = newPairPeak;
+          newShift.prevValue += offset;
+        }
+        return newPairPeak;
+      });
+      history.push(...[newList]);
+      spectra.list = newList;
     } else {
       newShift.ref = null;
-    }
-    const newList = spectra.list.map(pairPeak => {
-      //eslint-disable-line
       const {
-        max,
-        min,
-        pecker,
-        isRef
-      } = pairPeak;
-      let newMax = null;
-      let newMin = null;
-      let newPecker = null;
-      if (max) {
-        newMax = {
-          x: max.x - offset,
-          y: max.y
-        };
-      }
-      if (min) {
-        newMin = {
-          x: min.x - offset,
-          y: min.y
-        };
-      }
-      if (pecker) {
-        newPecker = {
-          x: pecker.x - offset,
-          y: pecker.y
-        };
-      }
-      const newPairPeak = Object.assign({}, pairPeak, {
-        max: newMax,
-        min: newMin,
-        pecker: newPecker
-      }); //eslint-disable-line
-      newPairPeak.e12 = getE12(newPairPeak);
-      if (isRef) {
-        newShift.ref = newPairPeak;
-        newShift.prevValue += offset;
-      }
-      return newPairPeak;
-    });
-    spectra.list = newList;
+        val
+      } = newShift;
+      offset = val;
+      const newList = spectra.origin.map(pairPeak => {
+        //eslint-disable-line
+        const {
+          max,
+          min,
+          pecker
+        } = pairPeak;
+        let newMax = null;
+        let newMin = null;
+        let newPecker = null;
+        if (max) {
+          newMax = {
+            x: max.x + parseFloat(val),
+            y: max.y
+          };
+        }
+        if (min) {
+          newMin = {
+            x: min.x + parseFloat(val),
+            y: min.y
+          };
+        }
+        if (pecker) {
+          newPecker = {
+            x: pecker.x + parseFloat(val),
+            y: pecker.y
+          };
+        }
+        const newPairPeak = Object.assign({}, pairPeak, {
+          max: newMax,
+          min: newMin,
+          pecker: newPecker,
+          isRef: false
+        }); //eslint-disable-line
+        newPairPeak.e12 = getE12(newPairPeak);
+        newPairPeak.updatedAt = Date.now();
+        return newPairPeak;
+      });
+      history.push(...[newList]);
+      spectra.list = newList;
+      newShift.prevValue = parseFloat(offset);
+    }
     spectraList[jcampIdx] = Object.assign({}, spectra, {
       shift: newShift,
       jcampIdx
@@ -400,21 +474,30 @@ const selectRefPeaks = (state, action) => {
     } = payload;
     const spectra = spectraList[jcampIdx];
     const {
-      list
+      list,
+      shift,
+      history
     } = spectra;
+    const newShift = shift;
     const newList = list;
     newList.forEach((pairPeak, idx) => {
       const newPairPeak = pairPeak;
       newPairPeak.isRef = false;
+      newPairPeak.updatedAt = Date.now();
       if (idx === index) {
         newPairPeak.isRef = checked;
         newList[index] = newPairPeak;
       }
     });
+    const refPeaks = newList.filter(pairPeak => pairPeak.isRef === true);
+    const hasRefPeak = refPeaks.length > 0;
+    history.push(...[newList]);
     spectraList[jcampIdx] = Object.assign({}, spectra, {
       list: newList,
       selectedIdx: index,
-      jcampIdx
+      jcampIdx,
+      hasRefPeak,
+      shift: newShift
     });
     return Object.assign({}, state, {
       spectraList

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@complat/react-spectra-editor",
-  "version": "1.2.1",
+  "version": "1.3.1",
   "description": "An editor to View and Edit Chemical Spectra data (NMR, IR and MS, CV, UIVIS, XRD).",
   "repository": {
     "type": "git",
@@ -8,7 +8,7 @@
   },
   "license": "AGPL-3.0",
   "dependencies": {
-    "@complat/react-svg-file-zoom-pan": "1.1.3",
+    "@complat/react-svg-file-zoom-pan": "1.1.4",
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
     "@mdi/js": "^7.2.96",