fix: fixed shift referent for multi spectra (#230)

Author: baolanlequang

dist/components/d3_multi/multi_focus.js

@@ -19,7 +19,7 @@ var _integration = require("../../helpers/integration");
 var _multiplicity_calc = require("../../helpers/multiplicity_calc");
 var _calc = require("../../helpers/calc");
 /* eslint-disable no-unused-vars, prefer-object-spread, no-mixed-operators,
-no-unneeded-ternary, arrow-body-style */
+no-unneeded-ternary, arrow-body-style, max-len */
 
 const d3 = require('d3');
 class MultiFocus {
@@ -158,8 +158,8 @@ class MultiFocus {
     this.tip = (0, _init.InitTip)();
     this.root.call(this.tip);
   }
-  setDataParams(peaks, tTrEndPts, tSfPeaks, layout, cyclicvoltaSt) {
-    let jcampIdx = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 0;
+  setDataParams(filterSeed, peaks, tTrEndPts, tSfPeaks, layout, cyclicvoltaSt) {
+    let jcampIdx = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : 0;
     this.data = [];
     this.otherLineData = [];
     let filterSubLayoutValue = null;
@@ -170,8 +170,11 @@ class MultiFocus {
         color
       } = entry;
       const offset = (0, _chem.GetCyclicVoltaPreviousShift)(cyclicvoltaSt, jcampIdx);
-      const currData = (0, _chem.convertTopic)(topic, layout, feature, offset);
+      let currData = (0, _chem.convertTopic)(topic, layout, feature, offset);
       if (idx === jcampIdx) {
+        if (!_format.default.isCyclicVoltaLayout(layout)) {
+          currData = filterSeed;
+        }
         this.data = [...currData];
         this.pathColor = color;
         filterSubLayoutValue = _format.default.isSECLayout(layout) ? feature.xUnit : feature.yUnit;
@@ -835,7 +838,7 @@ class MultiFocus {
     this.root = d3.select(this.rootKlass).selectAll('.focus-main');
     this.scales = (0, _init.InitScale)(this, this.reverseXAxis(layoutSt));
     this.setTip();
-    this.setDataParams(filterPeak, tTrEndPts, tSfPeaks, layoutSt, cyclicvoltaSt, jcampIdx);
+    this.setDataParams(filterSeed, filterPeak, tTrEndPts, tSfPeaks, layoutSt, cyclicvoltaSt, jcampIdx);
     (0, _compass.MountCompass)(this);
     this.axis = (0, _mount.MountAxis)(this);
     this.path = (0, _mount.MountPath)(this, this.pathColor);
@@ -885,7 +888,7 @@ class MultiFocus {
     const jcampIdx = curveIdx;
     this.isShowAllCurves = isShowAllCurve;
     this.entities = entities;
-    this.setDataParams(filterPeak, tTrEndPts, tSfPeaks, layoutSt, cyclicvoltaSt, jcampIdx);
+    this.setDataParams(filterSeed, filterPeak, tTrEndPts, tSfPeaks, layoutSt, cyclicvoltaSt, jcampIdx);
     if (this.data && this.data.length > 0) {
       this.setConfig(sweepExtentSt);
       this.getShouldUpdate(editPeakSt);

dist/reducers/reducer_curve.js

@@ -9,7 +9,7 @@ var _action_type = require("../constants/action_type");
 var _extractParams = require("../helpers/extractParams");
 var _chem = require("../helpers/chem");
 var _format = _interopRequireDefault(require("../helpers/format"));
-/* eslint-disable prefer-object-spread, default-param-last */
+/* eslint-disable prefer-object-spread, default-param-last, max-len */
 
 const initialState = {
   listCurves: [],
@@ -26,7 +26,8 @@ const setAllCurves = (state, action) => {
         topic,
         feature,
         hasEdit,
-        integration
+        integration,
+        multiplicity
       } = (0, _extractParams.extractParams)(entity, {
         isEdit: true
       });
@@ -42,6 +43,7 @@ const setAllCurves = (state, action) => {
         feature,
         hasEdit,
         integration,
+        multiplicity,
         maxminPeak,
         color,
         curveIdx: idx

dist/sagas/saga_multi_entities.js

@@ -12,6 +12,7 @@ var _list_layout = require("../constants/list_layout");
 const getLayoutSt = state => state.layout;
 const getCurveSt = state => state.curve;
 const getIntegrationSt = state => state.integration.present;
+const getMultiplicitySt = state => state.multiplicity.present;
 function getMaxMinPeak(curve) {
   return curve.maxminPeak;
 }
@@ -115,31 +116,51 @@ function* setInitIntegrations(action) {
   if (listCurves) {
     for (let index = 0; index < listCurves.length; index++) {
       const integationSt = yield (0, _effects.select)(getIntegrationSt);
+      const multiplicitySt = yield (0, _effects.select)(getMultiplicitySt);
       const curve = listCurves[index];
       const {
         integration,
+        multiplicity,
         simulation
       } = curve;
-      const {
-        integrations
-      } = integationSt;
-      const newArrIntegration = [...integrations];
-      if (index < newArrIntegration.length) {
-        newArrIntegration[index] = integration;
-      } else {
-        newArrIntegration.push(integration);
-      }
-      const payload = Object.assign({}, integationSt, {
-        integrations: newArrIntegration,
-        selectedIdx: index
-      }); // eslint-disable-line
-
       if (integration) {
+        const {
+          integrations
+        } = integationSt;
+        const newArrIntegration = [...integrations];
+        if (index < newArrIntegration.length) {
+          newArrIntegration[index] = integration;
+        } else {
+          newArrIntegration.push(integration);
+        }
+        const payload = Object.assign({}, integationSt, {
+          integrations: newArrIntegration,
+          selectedIdx: index
+        }); // eslint-disable-line
         yield (0, _effects.put)({
           type: _action_type.INTEGRATION.RESET_ALL_RDC,
           payload
         });
       }
+      if (multiplicity) {
+        const {
+          multiplicities
+        } = multiplicitySt;
+        const newArrMultiplicities = [...multiplicities];
+        if (index < newArrMultiplicities.length) {
+          newArrMultiplicities[index] = multiplicity;
+        } else {
+          newArrMultiplicities.push(multiplicity);
+        }
+        const payload = Object.assign({}, multiplicitySt, {
+          multiplicities: newArrMultiplicities,
+          selectedIdx: index
+        }); // eslint-disable-line
+        yield (0, _effects.put)({
+          type: _action_type.MULTIPLICITY.RESET_ALL_RDC,
+          payload
+        });
+      }
       if (simulation) {
         yield (0, _effects.put)({
           type: _action_type.SIMULATION.RESET_ALL_RDC,