@complat/react-spectra-editor 1.2.2 → 1.3.2

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_line/line_focus.js

@@ -596,7 +596,7 @@ class LineFocus {
     return null;
   }
   reverseXAxis(layoutSt) {
-    return [_list_layout.LIST_LAYOUT.UVVIS, _list_layout.LIST_LAYOUT.HPLC_UVVIS, _list_layout.LIST_LAYOUT.TGA, _list_layout.LIST_LAYOUT.XRD, _list_layout.LIST_LAYOUT.CYCLIC_VOLTAMMETRY, _list_layout.LIST_LAYOUT.CDS, _list_layout.LIST_LAYOUT.DLS_ACF, _list_layout.LIST_LAYOUT.SEC, _list_layout.LIST_LAYOUT.EMISSIONS, _list_layout.LIST_LAYOUT.DLS_INTENSITY].indexOf(layoutSt) < 0;
+    return [_list_layout.LIST_LAYOUT.UVVIS, _list_layout.LIST_LAYOUT.HPLC_UVVIS, _list_layout.LIST_LAYOUT.TGA, _list_layout.LIST_LAYOUT.DSC, _list_layout.LIST_LAYOUT.XRD, _list_layout.LIST_LAYOUT.CYCLIC_VOLTAMMETRY, _list_layout.LIST_LAYOUT.CDS, _list_layout.LIST_LAYOUT.DLS_ACF, _list_layout.LIST_LAYOUT.SEC, _list_layout.LIST_LAYOUT.EMISSIONS, _list_layout.LIST_LAYOUT.DLS_INTENSITY].indexOf(layoutSt) < 0;
   }
   create(_ref) {
     let {

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 {
@@ -738,7 +785,7 @@ class MultiFocus {
     ccp.enter().append('path').attr('d', lineSymbol).attr('class', 'enter-ref').attr('fill', 'green').attr('fill-opacity', 0.8).merge(ccp).attr('transform', d => `translate(${xt(d.x)}, ${yt(d.y)})`);
   }
   reverseXAxis(layoutSt) {
-    return [_list_layout.LIST_LAYOUT.UVVIS, _list_layout.LIST_LAYOUT.HPLC_UVVIS, _list_layout.LIST_LAYOUT.TGA, _list_layout.LIST_LAYOUT.XRD, _list_layout.LIST_LAYOUT.CYCLIC_VOLTAMMETRY, _list_layout.LIST_LAYOUT.CDS, _list_layout.LIST_LAYOUT.SEC, _list_layout.LIST_LAYOUT.AIF].indexOf(layoutSt) < 0;
+    return [_list_layout.LIST_LAYOUT.UVVIS, _list_layout.LIST_LAYOUT.HPLC_UVVIS, _list_layout.LIST_LAYOUT.TGA, _list_layout.LIST_LAYOUT.DSC, _list_layout.LIST_LAYOUT.XRD, _list_layout.LIST_LAYOUT.CYCLIC_VOLTAMMETRY, _list_layout.LIST_LAYOUT.CDS, _list_layout.LIST_LAYOUT.SEC, _list_layout.LIST_LAYOUT.AIF].indexOf(layoutSt) < 0;
   }
   create(_ref) {
     let {

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/info.js

@@ -16,8 +16,9 @@ var _material = require("@mui/material");
 var _ExpandMore = _interopRequireDefault(require("@mui/icons-material/ExpandMore"));
 var _styles = require("@mui/styles");
 var _format = _interopRequireDefault(require("../../helpers/format"));
+var _meta = require("../../actions/meta");
 /* eslint-disable no-mixed-operators, react/function-component-definition,
-react/require-default-props */
+react/require-default-props, max-len */
 
 const styles = () => ({
   chip: {
@@ -109,7 +110,115 @@ 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 DSCData = _ref2 => {
+  let {
+    classes,
+    layout,
+    dscMetaData,
+    updateAction
+  } = _ref2;
+  if (_format.default.isDSCLayout(layout) && dscMetaData !== undefined) {
+    const {
+      meltingPoint,
+      tg
+    } = dscMetaData;
+    const onChange = e => {
+      const {
+        name,
+        value
+      } = e.target;
+      const dataToUpdate = {
+        meltingPoint,
+        tg
+      };
+      dataToUpdate[name] = value;
+      updateAction(dataToUpdate);
+    };
+    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')
+    }, "Melting Point: "), /*#__PURE__*/_react.default.createElement("input", {
+      type: "text",
+      name: "meltingPoint",
+      className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt'),
+      value: meltingPoint,
+      onChange: onChange
+    })), /*#__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')
+    }, "TG: "), /*#__PURE__*/_react.default.createElement("input", {
+      type: "text",
+      name: "tg",
+      className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt'),
+      value: tg,
+      onChange: onChange
+    })));
+  }
+  return null;
+};
+DSCData.propTypes = {
+  classes: _propTypes.default.object.isRequired,
+  layout: _propTypes.default.string.isRequired,
+  dscMetaData: _propTypes.default.object.isRequired,
+  updateAction: _propTypes.default.func.isRequired
+};
+const InfoPanel = _ref3 => {
   let {
     classes,
     expand,
@@ -126,14 +235,20 @@ const InfoPanel = _ref => {
     onExapnd,
     canChangeDescription,
     onDescriptionChanged,
-    detectorSt
-  } = _ref;
+    detectorSt,
+    metaSt,
+    updateDSCMetaDataAct
+  } = _ref3;
   if (!feature) return null;
   const {
     title,
     observeFrequency,
-    solventName
+    solventName,
+    secData
   } = feature;
+  const {
+    dscMetaData
+  } = metaSt;
   const {
     curveIdx
   } = curveSt;
@@ -204,13 +319,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
@@ -220,7 +334,12 @@ const InfoPanel = _ref => {
     className: (0, _classnames.default)(classes.tTxt, classes.tHead, 'txt-sv-panel-txt')
   }, "Area under curve (AUC):"), /*#__PURE__*/_react.default.createElement("br", null), /*#__PURE__*/_react.default.createElement("span", {
     className: (0, _classnames.default)(classes.tTxt, classes.tTxtSim, 'txt-sv-panel-txt')
-  }, aucValue(integration))) : null), !_format.default.isCyclicVoltaLayout(layoutSt) ? /*#__PURE__*/_react.default.createElement(_reactQuill.default, {
+  }, aucValue(integration))) : null, /*#__PURE__*/_react.default.createElement(DSCData, {
+    classes: classes,
+    layout: layoutSt,
+    dscMetaData: dscMetaData,
+    updateAction: updateDSCMetaDataAct
+  })), !_format.default.isCyclicVoltaLayout(layoutSt) ? /*#__PURE__*/_react.default.createElement(_reactQuill.default, {
     className: (0, _classnames.default)(classes.quill, 'card-sv-quill'),
     value: descriptions,
     modules: {
@@ -243,9 +362,12 @@ const mapStateToProps = (state, props) => (
   simulationSt: state.simulation,
   shiftSt: state.shift,
   curveSt: state.curve,
-  detectorSt: state.detector
+  detectorSt: state.detector,
+  metaSt: state.meta
 });
-const mapDispatchToProps = dispatch => (0, _redux.bindActionCreators)({}, dispatch);
+const mapDispatchToProps = dispatch => (0, _redux.bindActionCreators)({
+  updateDSCMetaDataAct: _meta.updateDSCMetaData
+}, dispatch);
 InfoPanel.propTypes = {
   classes: _propTypes.default.object.isRequired,
   expand: _propTypes.default.bool.isRequired,
@@ -262,7 +384,9 @@ InfoPanel.propTypes = {
   canChangeDescription: _propTypes.default.bool.isRequired,
   onDescriptionChanged: _propTypes.default.func,
   theoryMass: _propTypes.default.string,
-  detectorSt: _propTypes.default.object.isRequired
+  detectorSt: _propTypes.default.object.isRequired,
+  metaSt: _propTypes.default.object.isRequired,
+  updateDSCMetaDataAct: _propTypes.default.func.isRequired
 };
 var _default = exports.default = (0, _reactRedux.connect)(
 // eslint-disable-line

package/dist/constants/action_type.js

@@ -106,7 +106,9 @@ const MULTIPLICITY = exports.MULTIPLICITY = {
 };
 const META = exports.META = {
   UPDATE_PEAKS: 'META_UPDATE_PEAKS',
-  UPDATE_PEAKS_RDC: 'META_UPDATE_PEAKS_RDC'
+  UPDATE_PEAKS_RDC: 'META_UPDATE_PEAKS_RDC',
+  UPDATE_META_DATA: 'UPDATE_META_DATA',
+  UPDATE_META_DATA_RDC: 'UPDATE_META_DATA_RDC'
 };
 const JCAMP = exports.JCAMP = {
   ADD_OTHERS: 'JCAMP_ADD_OTHERS',

package/dist/constants/list_layout.js

@@ -25,5 +25,6 @@ const LIST_LAYOUT = exports.LIST_LAYOUT = {
   AIF: 'AIF',
   EMISSIONS: 'Emissions',
   DLS_ACF: 'DLS ACF',
-  DLS_INTENSITY: 'DLS intensity'
+  DLS_INTENSITY: 'DLS intensity',
+  DSC: 'DIFFERENTIAL SCANNING CALORIMETRY'
 };

package/dist/helpers/cfg.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _format = _interopRequireDefault(require("./format"));
-const btnCmdAnaViewer = layoutSt => _format.default.isMsLayout(layoutSt) || _format.default.isRamanLayout(layoutSt) || _format.default.is19FLayout(layoutSt) || _format.default.isUvVisLayout(layoutSt) || _format.default.isHplcUvVisLayout(layoutSt) || _format.default.isTGALayout(layoutSt) || _format.default.isXRDLayout(layoutSt) || _format.default.is31PLayout(layoutSt) || _format.default.is15NLayout(layoutSt) || _format.default.is29SiLayout(layoutSt) || _format.default.isCyclicVoltaLayout(layoutSt) || _format.default.isCDSLayout(layoutSt) || _format.default.isSECLayout(layoutSt);
+const btnCmdAnaViewer = layoutSt => _format.default.isMsLayout(layoutSt) || _format.default.isRamanLayout(layoutSt) || _format.default.is19FLayout(layoutSt) || _format.default.isUvVisLayout(layoutSt) || _format.default.isHplcUvVisLayout(layoutSt) || _format.default.isTGALayout(layoutSt) || _format.default.isDSCLayout(layoutSt) || _format.default.isXRDLayout(layoutSt) || _format.default.is31PLayout(layoutSt) || _format.default.is15NLayout(layoutSt) || _format.default.is29SiLayout(layoutSt) || _format.default.isCyclicVoltaLayout(layoutSt) || _format.default.isCDSLayout(layoutSt) || _format.default.isSECLayout(layoutSt);
 const hideCmdAnaViewer = () => false;
 const btnCmdAddPeak = layoutSt => _format.default.isMsLayout(layoutSt);
 const btnCmdRmPeak = layoutSt => _format.default.isMsLayout(layoutSt);

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;
@@ -375,6 +350,9 @@ const readLayout = jcamp => {
     if (dataType.includes('THERMOGRAVIMETRIC ANALYSIS')) {
       return _list_layout.LIST_LAYOUT.TGA;
     }
+    if (dataType.includes('DIFFERENTIAL SCANNING CALORIMETRY')) {
+      return _list_layout.LIST_LAYOUT.DSC;
+    }
     if (dataType.includes('X-RAY DIFFRACTION')) {
       return _list_layout.LIST_LAYOUT.XRD;
     }
@@ -539,7 +517,8 @@ const buildPeakFeature = function (jcamp, layout, peakUp, s, thresRef) {
     solventName: info['.SOLVENTNAME'],
     upperThres,
     lowerThres,
-    volammetryData: extractVoltammetryData(jcamp)
+    volammetryData: extractVoltammetryData(jcamp),
+    scanRate: +info.$CSSCANRATE || 0.1
   }, s);
 };
 const maxArray = arr => {
@@ -708,6 +687,7 @@ const extrFeaturesNi = (jcamp, layout, peakUp, spectra) => {
     nfs.simulation = buildSimFeature(jcamp);
     return nfs;
   }
+
   // workaround for legacy design
   const features = jcamp.spectra.map(s => {
     const thresRef = calcThresRef(s, peakUp);
@@ -773,9 +753,29 @@ 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
+      };
+    }
     return Object.assign({}, base, cpo, bnd, {
-      detector
+      detector,
+      secData
     });
   }).filter(r => r != null);
   return features;
@@ -822,7 +822,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|MELTINGPOINT|TG|\$CSSCANRATE|\$CSSPECTRUMDIRECTION)/ // eslint-disable-line
   });
   const layout = readLayout(jcamp);
   const peakUp = !_format.default.isIrLayout(layout);
@@ -843,6 +843,22 @@ const ExtractJcamp = source => {
     features = extrFeaturesCylicVolta(jcamp, layout, peakUp);
   } else {
     features = extrFeaturesNi(jcamp, layout, peakUp, spectra);
+    if (_format.default.isDSCLayout(layout)) {
+      const {
+        info
+      } = jcamp;
+      const {
+        MELTINGPOINT,
+        TG
+      } = info;
+      const dscMetaData = {
+        meltingPoint: MELTINGPOINT,
+        tg: TG
+      };
+      features = Object.assign({}, features, {
+        dscMetaData
+      });
+    }
   }
   // const features = Format.isMsLayout(layout)
   //   ? extrFeaturesMs(jcamp, layout, peakUp)
@@ -910,11 +926,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/helpers/compass.js

@@ -97,7 +97,7 @@ const MouseMove = (event, focus) => {
           dValue = (0, _chem.Convert2DValue)(pt.x).toExponential(2);
         }
         focus.root.select('.cursor-txt-hz').attr('transform', `translate(${tx},${ty - 30})`).text(`2Theta: ${pt.x.toExponential(2)}, d-value: ${dValue}`);
-      } else if (_format.default.isTGALayout(layout)) {
+      } else if (_format.default.isTGALayout(layout) || _format.default.isDSCLayout(layout)) {
         focus.root.select('.cursor-txt').attr('transform', `translate(${tx},${10})`).text(`X: ${pt.x.toFixed(3)}, Y: ${pt.y.toFixed(3)}`);
       } else {
         focus.root.select('.cursor-txt').attr('transform', `translate(${tx},${10})`).text(pt.x.toFixed(3));