@complat/react-spectra-editor 1.2.2 → 1.3.2

package/dist/helpers/format.js

@@ -20,6 +20,7 @@ const spectraDigit = layout => {
     case _list_layout.LIST_LAYOUT.UVVIS:
     case _list_layout.LIST_LAYOUT.HPLC_UVVIS:
     case _list_layout.LIST_LAYOUT.TGA:
+    case _list_layout.LIST_LAYOUT.DSC:
     case _list_layout.LIST_LAYOUT.XRD:
     case _list_layout.LIST_LAYOUT.CDS:
     case _list_layout.LIST_LAYOUT.SEC:
@@ -110,6 +111,10 @@ const spectraOps = {
     head: 'THERMOGRAVIMETRIC ANALYSIS',
     tail: ' SECONDS'
   },
+  [_list_layout.LIST_LAYOUT.DSC]: {
+    head: 'DIFFERENTIAL SCANNING CALORIMETRY',
+    tail: ' SECONDS'
+  },
   [_list_layout.LIST_LAYOUT.MS]: {
     head: 'MASS',
     tail: ' m/z'
@@ -119,7 +124,7 @@ const spectraOps = {
     tail: '.'
   },
   [_list_layout.LIST_LAYOUT.CYCLIC_VOLTAMMETRY]: {
-    head: 'CYCLIC VOLTAMMETRY',
+    head: 'CV',
     tail: '.'
   },
   [_list_layout.LIST_LAYOUT.CDS]: {
@@ -411,7 +416,7 @@ const peaksBody = _ref => {
   if (layout === _list_layout.LIST_LAYOUT.DLS_INTENSITY) {
     return formatedDLSIntensity(ordered, maxY, decimal, isAscend, isIntensity, boundary, false);
   }
-  if (layout === _list_layout.LIST_LAYOUT.RAMAN || layout === _list_layout.LIST_LAYOUT.TGA || layout === _list_layout.LIST_LAYOUT.CYCLIC_VOLTAMMETRY || layout === _list_layout.LIST_LAYOUT.CDS || layout === _list_layout.LIST_LAYOUT.SEC) {
+  if (layout === _list_layout.LIST_LAYOUT.RAMAN || layout === _list_layout.LIST_LAYOUT.TGA || layout === _list_layout.LIST_LAYOUT.DSC || layout === _list_layout.LIST_LAYOUT.CYCLIC_VOLTAMMETRY || layout === _list_layout.LIST_LAYOUT.CDS || layout === _list_layout.LIST_LAYOUT.SEC) {
     return formatedEm(ordered, maxY, decimal, isAscend, isIntensity, boundary, false);
   }
   if (layout === _list_layout.LIST_LAYOUT.XRD) {
@@ -454,6 +459,7 @@ const isRamanLayout = layoutSt => _list_layout.LIST_LAYOUT.RAMAN === layoutSt;
 const isUvVisLayout = layoutSt => _list_layout.LIST_LAYOUT.UVVIS === layoutSt;
 const isHplcUvVisLayout = layoutSt => _list_layout.LIST_LAYOUT.HPLC_UVVIS === layoutSt;
 const isTGALayout = layoutSt => _list_layout.LIST_LAYOUT.TGA === layoutSt;
+const isDSCLayout = layoutSt => _list_layout.LIST_LAYOUT.DSC === layoutSt;
 const isXRDLayout = layoutSt => _list_layout.LIST_LAYOUT.XRD === layoutSt;
 const isCyclicVoltaLayout = layoutSt => _list_layout.LIST_LAYOUT.CYCLIC_VOLTAMMETRY === layoutSt;
 const isCDSLayout = layoutSt => _list_layout.LIST_LAYOUT.CDS === layoutSt;
@@ -538,6 +544,92 @@ const strNumberFixedLength = function (number) {
 
   return number.toFixed(lengthToFix);
 };
+const inlineNotation = function (layout, data) {
+  let sampleName = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
+  let formattedString = '';
+  let quillData = [];
+  const {
+    scanRate,
+    voltaData
+  } = data;
+  switch (layout) {
+    case _list_layout.LIST_LAYOUT.CYCLIC_VOLTAMMETRY:
+      {
+        if (!voltaData) {
+          break;
+        }
+        let refString = '';
+        let nonRefString = '';
+        let refOps = [];
+        const nonRefOps = [];
+        const {
+          listPeaks,
+          xyData
+        } = voltaData;
+        const {
+          x
+        } = xyData;
+        listPeaks.forEach(item => {
+          const {
+            isRef,
+            e12,
+            max,
+            min
+          } = item;
+          const e12Str = e12 ? strNumberFixedLength(e12, 3) : '0';
+          const scanRateStr = scanRate ? strNumberFixedLength(scanRate, 3) : '0';
+          if (isRef) {
+            const posNegString = x[0] > x[1] ? 'neg.' : 'pos.';
+            refString = `CV (<conc. of sample> mM in <solvent> vs. Ref (Fc+/Fc) = ${e12Str} V, v = ${scanRateStr} V/s, to ${posNegString}):`;
+            refOps = [{
+              insert: 'CV (<conc. of sample> mM in <solvent> vs. Ref '
+            }, {
+              insert: '(Fc'
+            }, {
+              insert: '+',
+              attributes: {
+                script: 'super'
+              }
+            }, {
+              insert: '/Fc) '
+            }, {
+              insert: `= ${e12Str} V, v = ${scanRateStr} V/s, to ${posNegString}):`
+            }];
+          } else {
+            const delta = max && min ? strNumberFixedLength(Math.abs(max.x - min.x) * 1000, 3) : '0';
+            nonRefString += `\nE1/2 = ([${sampleName}] , ΔEp) = ${e12Str} V (${delta} mV)`;
+            const currentNoneOps = [{
+              insert: '\nE'
+            }, {
+              insert: '1/2',
+              attributes: {
+                script: 'sub'
+              }
+            }, {
+              insert: ` = ([${sampleName}] , ΔE`
+            }, {
+              insert: 'p',
+              attributes: {
+                script: 'sub'
+              }
+            }, {
+              insert: `) = ${e12Str} V (${delta} mV)`
+            }];
+            nonRefOps.push(...currentNoneOps);
+          }
+        });
+        formattedString = refString + nonRefString;
+        quillData = [...refOps, ...nonRefOps];
+        break;
+      }
+    default:
+      break;
+  }
+  return {
+    quillData,
+    formattedString
+  };
+};
 const Format = {
   toPeakStr,
   buildData,
@@ -560,6 +652,7 @@ const Format = {
   isUvVisLayout,
   isHplcUvVisLayout,
   isTGALayout,
+  isDSCLayout,
   isXRDLayout,
   isCyclicVoltaLayout,
   isCDSLayout,
@@ -579,6 +672,7 @@ const Format = {
   isDLSACFLayout,
   strNumberFixedDecimal,
   formatedXRD,
-  strNumberFixedLength
+  strNumberFixedLength,
+  inlineNotation
 };
 var _default = exports.default = Format;

package/dist/index.js

@@ -27,6 +27,7 @@ var _uv_vis_jcamp = _interopRequireDefault(require("./__tests__/fixtures/uv_vis_
 var _hplc_uvvis_jcamp = _interopRequireDefault(require("./__tests__/fixtures/hplc_uvvis_jcamp"));
 var _hplc_uvvis_jcamp_ = _interopRequireDefault(require("./__tests__/fixtures/hplc_uvvis_jcamp_2"));
 var _tga_jcamp = _interopRequireDefault(require("./__tests__/fixtures/tga_jcamp"));
+var _dsc_jcamp = _interopRequireDefault(require("./__tests__/fixtures/dsc_jcamp"));
 var _xrd_jcamp_ = _interopRequireDefault(require("./__tests__/fixtures/xrd_jcamp_1"));
 var _xrd_jcamp_2 = _interopRequireDefault(require("./__tests__/fixtures/xrd_jcamp_2"));
 var _cyclic_voltammetry_ = _interopRequireDefault(require("./__tests__/fixtures/cyclic_voltammetry_1"));
@@ -64,6 +65,7 @@ const compUvVisEntity = _app.FN.ExtractJcamp(_compare_uv_vis_jcamp.default);
 const hplcUVVisEntity = _app.FN.ExtractJcamp(_hplc_uvvis_jcamp.default);
 const hplcUVVisEntity2 = _app.FN.ExtractJcamp(_hplc_uvvis_jcamp_.default);
 const tgaEntity = _app.FN.ExtractJcamp(_tga_jcamp.default);
+const dscEntity = _app.FN.ExtractJcamp(_dsc_jcamp.default);
 const xrdEntity1 = _app.FN.ExtractJcamp(_xrd_jcamp_.default);
 const xrdEntity2 = _app.FN.ExtractJcamp(_xrd_jcamp_2.default);
 const cyclicVoltaEntity1 = _app.FN.ExtractJcamp(_cyclic_voltammetry_.default);
@@ -156,6 +158,8 @@ class DemoWriteIr extends _react.default.Component {
         return hplcUVVisEntity;
       case 'tga':
         return tgaEntity;
+      case 'dsc':
+        return dscEntity;
       case 'xrd':
         return xrdEntity1;
       case 'cyclic volta':
@@ -221,6 +225,7 @@ class DemoWriteIr extends _react.default.Component {
       case 'uv/vis':
       case 'hplc uv/vis':
       case 'tga':
+      case 'dsc':
       case 'xrd':
       case 'ms':
       case 'cyclic volta':
@@ -259,7 +264,9 @@ class DemoWriteIr extends _react.default.Component {
       decimal,
       isIntensity,
       integration,
-      waveLength
+      waveLength,
+      cyclicvoltaSt,
+      curveSt
     } = _ref;
     const entity = this.loadEntity();
     const {
@@ -289,7 +296,36 @@ class DemoWriteIr extends _react.default.Component {
       temperature
     });
     const wrapper = _app.FN.peaksWrapper(layout, shift);
-    const desc = this.rmDollarSign(wrapper.head) + body + wrapper.tail;
+    let desc = this.rmDollarSign(wrapper.head) + body + wrapper.tail;
+    if (_app.FN.isCyclicVoltaLayout(layout)) {
+      const {
+        spectraList
+      } = cyclicvoltaSt;
+      const {
+        curveIdx,
+        listCurves
+      } = curveSt;
+      const selectedVolta = spectraList[curveIdx];
+      const selectedCurve = listCurves[curveIdx];
+      const {
+        feature
+      } = selectedCurve;
+      const {
+        scanRate
+      } = feature;
+      const data = {
+        scanRate,
+        voltaData: {
+          listPeaks: selectedVolta.list,
+          xyData: feature.data[0]
+        }
+      };
+      const inlineData = _app.FN.inlineNotation(layout, data);
+      const {
+        formattedString
+      } = inlineData;
+      desc = formattedString;
+    }
     return desc;
   }
   formatMpy(_ref2) {
@@ -393,7 +429,9 @@ class DemoWriteIr extends _react.default.Component {
       decimal,
       isIntensity,
       integration,
-      waveLength
+      waveLength,
+      cyclicvoltaSt,
+      curveSt
     } = _ref4;
     const desc = this.formatPks({
       peaks,
@@ -403,7 +441,10 @@ class DemoWriteIr extends _react.default.Component {
       decimal,
       isIntensity,
       integration,
-      waveLength
+      waveLength,
+      // eslint-disable-line
+      cyclicvoltaSt,
+      curveSt // eslint-disable-line
     });
     this.setState({
       desc
@@ -625,6 +666,13 @@ class DemoWriteIr extends _react.default.Component {
       },
       onClick: this.onClick('tga')
     }, "TGA"), /*#__PURE__*/_react.default.createElement(_material.Button, {
+      id: "btn-dsc",
+      variant: "contained",
+      style: {
+        margin: '0 10px 0 10px'
+      },
+      onClick: this.onClick('dsc')
+    }, "DSC"), /*#__PURE__*/_react.default.createElement(_material.Button, {
       id: "btn-xrd",
       variant: "contained",
       style: {

package/dist/layer_init.js

@@ -61,7 +61,8 @@ class LayerInit extends _react.default.Component {
       resetInitMsAct,
       resetInitNmrAct,
       resetInitCommonWithIntergationAct,
-      resetDetectorAct
+      resetDetectorAct,
+      updateDSCMetaDataAct
     } = this.props;
     resetInitCommonAct();
     resetDetectorAct();
@@ -96,6 +97,11 @@ class LayerInit extends _react.default.Component {
       resetInitCommonWithIntergationAct({
         integration
       });
+    } else if (_format.default.isDSCLayout(layout)) {
+      const {
+        dscMetaData
+      } = features;
+      updateDSCMetaDataAct(dscMetaData);
     }
   }
   initReducer() {
@@ -191,7 +197,8 @@ const mapDispatchToProps = dispatch => (0, _redux.bindActionCreators)({
   updateOperationAct: _submit.updateOperation,
   updateMetaPeaksAct: _meta.updateMetaPeaks,
   addOthersAct: _jcamp.addOthers,
-  setAllCurvesAct: _curve.setAllCurves
+  setAllCurvesAct: _curve.setAllCurves,
+  updateDSCMetaDataAct: _meta.updateDSCMetaData
 }, dispatch);
 LayerInit.propTypes = {
   entity: _propTypes.default.object.isRequired,
@@ -222,7 +229,8 @@ LayerInit.propTypes = {
   setAllCurvesAct: _propTypes.default.func.isRequired,
   userManualLink: _propTypes.default.object,
   // eslint-disable-line
-  resetDetectorAct: _propTypes.default.func.isRequired
+  resetDetectorAct: _propTypes.default.func.isRequired,
+  updateDSCMetaDataAct: _propTypes.default.func.isRequired
 };
 var _default = exports.default = (0, _reactRedux.connect)(
 // eslint-disable-line

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_meta.js

@@ -13,14 +13,28 @@ const initialState = {
     intervalR: null,
     observeFrequency: null,
     deltaX: null
+  },
+  dscMetaData: {
+    meltingPoint: null,
+    tg: null
   }
 };
+const updateMetaData = (state, action) => {
+  const {
+    dscMetaData
+  } = action.payload;
+  return Object.assign({}, state, {
+    dscMetaData
+  });
+};
 const metaReducer = function () {
   let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initialState;
   let action = arguments.length > 1 ? arguments[1] : undefined;
   switch (action.type) {
     case _action_type.META.UPDATE_PEAKS_RDC:
       return Object.assign({}, state, action.payload);
+    case _action_type.META.UPDATE_META_DATA_RDC:
+      return updateMetaData(state, action);
     default:
       return state;
   }

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