@complat/react-spectra-editor 0.11.5-beta.0 → 0.11.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (40) hide show
  1. package/dist/components/cmd_bar/03_peak.js +3 -0
  2. package/dist/components/cmd_bar/r01_layout.js +9 -0
  3. package/dist/components/d3_line/line_focus.js +1 -1
  4. package/dist/constants/action_type.js +2 -1
  5. package/dist/constants/list_layout.js +2 -1
  6. package/dist/constants/list_ui.js +3 -2
  7. package/dist/helpers/chem.js +4 -1
  8. package/dist/helpers/format.js +9 -1
  9. package/dist/index.js +17 -0
  10. package/dist/reducers/reducer_voltammetry.js +28 -0
  11. package/dist/sagas/saga_ui.js +31 -15
  12. package/package.json +1 -1
  13. package/dist/components/cmd_bar/04_integration_bk.js +0 -280
  14. package/dist/components/cmd_bar/05_multiplicity_bk.js +0 -228
  15. package/dist/components/cmd_bar/r06_predict_btn_bk.js +0 -310
  16. package/dist/components/d3_line/line_focus_bk.js +0 -860
  17. package/dist/components/d3_multi/index_bk.js +0 -240
  18. package/dist/components/d3_multi/multi_focus_bk.js +0 -550
  19. package/dist/components/panel/compare_bk.js +0 -370
  20. package/dist/components/panel/index_bk.js +0 -212
  21. package/dist/components/panel/info_bk.js +0 -341
  22. package/dist/components/panel/multiplicity_bk.js +0 -405
  23. package/dist/helpers/carbonFeatures_bk.js +0 -47
  24. package/dist/helpers/chem_bk.js +0 -821
  25. package/dist/helpers/compass_bk.js +0 -171
  26. package/dist/helpers/converter_bk.js +0 -106
  27. package/dist/helpers/format_bk.js +0 -462
  28. package/dist/index_bk.js +0 -762
  29. package/dist/layer_content_bk.js +0 -128
  30. package/dist/layer_init_bk.js +0 -278
  31. package/dist/layer_prism_bk.js +0 -186
  32. package/dist/reducers/reducer_edit_peak_bk.js +0 -111
  33. package/dist/reducers/reducer_integration_bk.js +0 -137
  34. package/dist/reducers/reducer_jcamp_bk.js +0 -74
  35. package/dist/reducers/reducer_multiplicity_bk.js +0 -131
  36. package/dist/reducers/reducer_shift_bk.js +0 -99
  37. package/dist/sagas/saga_edit_peak_bk.js +0 -84
  38. package/dist/sagas/saga_multi_entities_bk.js +0 -114
  39. package/dist/sagas/saga_multiplicity_bk.js +0 -387
  40. package/dist/sagas/saga_ui_bk.js +0 -488
@@ -91,6 +91,9 @@ var Peak = function Peak(_ref) {
91
91
  return setUiSweepTypeAct(_list_ui.LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_RM_MIN_PEAK, curveIdx);
92
92
  };
93
93
  }
94
+ onSweepAnchorShift = function onSweepAnchorShift() {
95
+ return setUiSweepTypeAct(_list_ui.LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_SET_REF, curveIdx);
96
+ };
94
97
  }
95
98
  }
96
99
 
@@ -309,6 +309,15 @@ var layoutSelect = function layoutSelect(classes, layoutSt, updateLayoutAct) {
309
309
  { className: (0, _classnames2.default)(classes.txtOpt, 'option-sv-bar-layout') },
310
310
  'CV (CYCLIC VOLTAMMETRY)'
311
311
  )
312
+ ),
313
+ _react2.default.createElement(
314
+ _MenuItem2.default,
315
+ { value: _list_layout.LIST_LAYOUT.CDS },
316
+ _react2.default.createElement(
317
+ 'span',
318
+ { className: (0, _classnames2.default)(classes.txtOpt, 'option-sv-bar-layout') },
319
+ 'CDS (CIRCULAR DICHROISM SPECTROSCOPY)'
320
+ )
312
321
  )
313
322
  )
314
323
  );
@@ -755,7 +755,7 @@ var LineFocus = function () {
755
755
  }, {
756
756
  key: 'reverseXAxis',
757
757
  value: function reverseXAxis(layoutSt) {
758
- 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].indexOf(layoutSt) < 0;
758
+ 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].indexOf(layoutSt) < 0;
759
759
  }
760
760
  }, {
761
761
  key: 'create',
@@ -140,7 +140,8 @@ var CYCLIC_VOLTA_METRY = {
140
140
  WORK_WITH_MAX_PEAK: 'WORK_WITH_MAX_PEAK',
141
141
  ADD_PECKER: 'ADD_PECKER',
142
142
  REMOVE_PECKER: 'REMOVE_PECKER',
143
- RESETALL: 'RESETALL_VOLTA_METRY'
143
+ RESETALL: 'RESETALL_VOLTA_METRY',
144
+ SET_REF: 'VOLTA_METRY_SET_REF'
144
145
  };
145
146
 
146
147
  var CURVE = {
@@ -18,7 +18,8 @@ var LIST_LAYOUT = {
18
18
  TGA: 'THERMOGRAVIMETRIC ANALYSIS',
19
19
  XRD: 'X-RAY DIFFRACTION',
20
20
  HPLC_UVVIS: 'HPLC UV/VIS',
21
- CYCLIC_VOLTAMMETRY: 'CYCLIC VOLTAMMETRY'
21
+ CYCLIC_VOLTAMMETRY: 'CYCLIC VOLTAMMETRY',
22
+ CDS: 'CIRCULAR DICHROISM SPECTROSCOPY'
22
23
  };
23
24
 
24
25
  exports.LIST_LAYOUT = LIST_LAYOUT;
@@ -29,10 +29,11 @@ var LIST_UI_SWEEP_TYPE = {
29
29
  CYCLIC_VOLTA_ADD_MIN_PEAK: 'cyclic voltammetry add min peak',
30
30
  CYCLIC_VOLTA_RM_MIN_PEAK: 'cyclic voltammetry remove min peak',
31
31
  CYCLIC_VOLTA_ADD_PECKER: 'cyclic voltammetry add pecker',
32
- CYCLIC_VOLTA_RM_PECKER: 'cyclic voltammetry remove pecker'
32
+ CYCLIC_VOLTA_RM_PECKER: 'cyclic voltammetry remove pecker',
33
+ CYCLIC_VOLTA_SET_REF: 'cyclic voltammetry set ref'
33
34
  };
34
35
 
35
- var LIST_NON_BRUSH_TYPES = [LIST_UI_SWEEP_TYPE.PEAK_ADD, LIST_UI_SWEEP_TYPE.PEAK_DELETE, LIST_UI_SWEEP_TYPE.ANCHOR_SHIFT, LIST_UI_SWEEP_TYPE.INTEGRATION_RM, LIST_UI_SWEEP_TYPE.INTEGRATION_SET_REF, LIST_UI_SWEEP_TYPE.MULTIPLICITY_PEAK_ADD, LIST_UI_SWEEP_TYPE.MULTIPLICITY_PEAK_RM, LIST_UI_SWEEP_TYPE.MULTIPLICITY_ONE_CLICK, LIST_UI_SWEEP_TYPE.MULTIPLICITY_ONE_RM, LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_ADD_MAX_PEAK, LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_RM_MAX_PEAK, LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_ADD_MIN_PEAK, LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_RM_MIN_PEAK, LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_ADD_PECKER, LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_RM_PECKER];
36
+ var LIST_NON_BRUSH_TYPES = [LIST_UI_SWEEP_TYPE.PEAK_ADD, LIST_UI_SWEEP_TYPE.PEAK_DELETE, LIST_UI_SWEEP_TYPE.ANCHOR_SHIFT, LIST_UI_SWEEP_TYPE.INTEGRATION_RM, LIST_UI_SWEEP_TYPE.INTEGRATION_SET_REF, LIST_UI_SWEEP_TYPE.MULTIPLICITY_PEAK_ADD, LIST_UI_SWEEP_TYPE.MULTIPLICITY_PEAK_RM, LIST_UI_SWEEP_TYPE.MULTIPLICITY_ONE_CLICK, LIST_UI_SWEEP_TYPE.MULTIPLICITY_ONE_RM, LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_ADD_MAX_PEAK, LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_RM_MAX_PEAK, LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_ADD_MIN_PEAK, LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_RM_MIN_PEAK, LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_ADD_PECKER, LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_RM_PECKER, LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_SET_REF];
36
37
 
37
38
  exports.LIST_UI_VIEWER_TYPE = LIST_UI_VIEWER_TYPE;
38
39
  exports.LIST_UI_SWEEP_TYPE = LIST_UI_SWEEP_TYPE;
@@ -324,6 +324,9 @@ var readLayout = function readLayout(jcamp) {
324
324
  if (dataType.includes('CYCLIC VOLTAMMETRY')) {
325
325
  return _list_layout.LIST_LAYOUT.CYCLIC_VOLTAMMETRY;
326
326
  }
327
+ if (dataType.includes('CIRCULAR DICHROISM SPECTROSCOPY')) {
328
+ return _list_layout.LIST_LAYOUT.CDS;
329
+ }
327
330
  }
328
331
  return false;
329
332
  };
@@ -747,7 +750,7 @@ var ExtractJcamp = function ExtractJcamp(source) {
747
750
  var features = {};
748
751
  if (_format2.default.isMsLayout(layout)) {
749
752
  features = extrFeaturesMs(jcamp, layout, peakUp);
750
- } else if (_format2.default.isXRDLayout(layout)) {
753
+ } else if (_format2.default.isXRDLayout(layout) || _format2.default.isCDSLayout(layout)) {
751
754
  features = extrFeaturesXrd(jcamp, layout, peakUp);
752
755
  } else if (_format2.default.isCyclicVoltaLayout(layout)) {
753
756
  features = extrFeaturesCylicVolta(jcamp, layout, peakUp);
@@ -25,6 +25,7 @@ var spectraDigit = function spectraDigit(layout) {
25
25
  case _list_layout.LIST_LAYOUT.TGA:
26
26
  case _list_layout.LIST_LAYOUT.XRD:
27
27
  case _list_layout.LIST_LAYOUT.CYCLIC_VOLTAMMETRY:
28
+ case _list_layout.LIST_LAYOUT.CDS:
28
29
  case _list_layout.LIST_LAYOUT.MS:
29
30
  return 0;
30
31
  case _list_layout.LIST_LAYOUT.C13:
@@ -63,7 +64,7 @@ var toPeakStr = function toPeakStr(peaks) {
63
64
  return str;
64
65
  };
65
66
 
66
- var spectraOps = (_spectraOps = {}, _defineProperty(_spectraOps, _list_layout.LIST_LAYOUT.PLAIN, { head: '', tail: '.' }), _defineProperty(_spectraOps, _list_layout.LIST_LAYOUT.H1, { head: '1H', tail: '.' }), _defineProperty(_spectraOps, _list_layout.LIST_LAYOUT.C13, { head: '13C', tail: '.' }), _defineProperty(_spectraOps, _list_layout.LIST_LAYOUT.F19, { head: '19F', tail: '.' }), _defineProperty(_spectraOps, _list_layout.LIST_LAYOUT.P31, { head: '31P', tail: '.' }), _defineProperty(_spectraOps, _list_layout.LIST_LAYOUT.N15, { head: '15N', tail: '.' }), _defineProperty(_spectraOps, _list_layout.LIST_LAYOUT.Si29, { head: '29Si', tail: '.' }), _defineProperty(_spectraOps, _list_layout.LIST_LAYOUT.IR, { head: 'IR', tail: ' cm-1' }), _defineProperty(_spectraOps, _list_layout.LIST_LAYOUT.RAMAN, { head: 'RAMAN', tail: ' cm-1' }), _defineProperty(_spectraOps, _list_layout.LIST_LAYOUT.UVVIS, { head: 'UV-VIS (absorption, solvent), λmax', tail: ' nm' }), _defineProperty(_spectraOps, _list_layout.LIST_LAYOUT.HPLC_UVVIS, { head: 'HPLC UV/VIS (transmittance)', tail: '' }), _defineProperty(_spectraOps, _list_layout.LIST_LAYOUT.TGA, { head: 'THERMOGRAVIMETRIC ANALYSIS', tail: ' SECONDS' }), _defineProperty(_spectraOps, _list_layout.LIST_LAYOUT.MS, { head: 'MASS', tail: ' m/z' }), _defineProperty(_spectraOps, _list_layout.LIST_LAYOUT.XRD, { head: 'X-RAY DIFFRACTION', tail: '.' }), _defineProperty(_spectraOps, _list_layout.LIST_LAYOUT.CYCLIC_VOLTAMMETRY, { head: 'CYCLIC VOLTAMMETRY', tail: '.' }), _spectraOps);
67
+ var spectraOps = (_spectraOps = {}, _defineProperty(_spectraOps, _list_layout.LIST_LAYOUT.PLAIN, { head: '', tail: '.' }), _defineProperty(_spectraOps, _list_layout.LIST_LAYOUT.H1, { head: '1H', tail: '.' }), _defineProperty(_spectraOps, _list_layout.LIST_LAYOUT.C13, { head: '13C', tail: '.' }), _defineProperty(_spectraOps, _list_layout.LIST_LAYOUT.F19, { head: '19F', tail: '.' }), _defineProperty(_spectraOps, _list_layout.LIST_LAYOUT.P31, { head: '31P', tail: '.' }), _defineProperty(_spectraOps, _list_layout.LIST_LAYOUT.N15, { head: '15N', tail: '.' }), _defineProperty(_spectraOps, _list_layout.LIST_LAYOUT.Si29, { head: '29Si', tail: '.' }), _defineProperty(_spectraOps, _list_layout.LIST_LAYOUT.IR, { head: 'IR', tail: ' cm-1' }), _defineProperty(_spectraOps, _list_layout.LIST_LAYOUT.RAMAN, { head: 'RAMAN', tail: ' cm-1' }), _defineProperty(_spectraOps, _list_layout.LIST_LAYOUT.UVVIS, { head: 'UV-VIS (absorption, solvent), λmax', tail: ' nm' }), _defineProperty(_spectraOps, _list_layout.LIST_LAYOUT.HPLC_UVVIS, { head: 'HPLC UV/VIS (transmittance)', tail: '' }), _defineProperty(_spectraOps, _list_layout.LIST_LAYOUT.TGA, { head: 'THERMOGRAVIMETRIC ANALYSIS', tail: ' SECONDS' }), _defineProperty(_spectraOps, _list_layout.LIST_LAYOUT.MS, { head: 'MASS', tail: ' m/z' }), _defineProperty(_spectraOps, _list_layout.LIST_LAYOUT.XRD, { head: 'X-RAY DIFFRACTION', tail: '.' }), _defineProperty(_spectraOps, _list_layout.LIST_LAYOUT.CYCLIC_VOLTAMMETRY, { head: 'CYCLIC VOLTAMMETRY', tail: '.' }), _defineProperty(_spectraOps, _list_layout.LIST_LAYOUT.CDS, { head: 'CIRCULAR DICHROISM SPECTROSCOPY', tail: '.' }), _spectraOps);
67
68
 
68
69
  var rmRef = function rmRef(peaks, shift) {
69
70
  var refValue = shift.ref.value || shift.peak.x;
@@ -295,6 +296,9 @@ var peaksBody = function peaksBody(_ref) {
295
296
  if (layout === _list_layout.LIST_LAYOUT.CYCLIC_VOLTAMMETRY) {
296
297
  return formatedEm(ordered, maxY, decimal, isAscend, isIntensity, boundary, false);
297
298
  }
299
+ if (layout === _list_layout.LIST_LAYOUT.CDS) {
300
+ return formatedEm(ordered, maxY, decimal, isAscend, isIntensity, boundary, false);
301
+ }
298
302
  return ordered.map(function (o) {
299
303
  return fixDigit(o.x, decimal);
300
304
  }).join(', ');
@@ -359,6 +363,9 @@ var isXRDLayout = function isXRDLayout(layoutSt) {
359
363
  var isCyclicVoltaLayout = function isCyclicVoltaLayout(layoutSt) {
360
364
  return _list_layout.LIST_LAYOUT.CYCLIC_VOLTAMMETRY === layoutSt;
361
365
  };
366
+ var isCDSLayout = function isCDSLayout(layoutSt) {
367
+ return _list_layout.LIST_LAYOUT.CDS === layoutSt;
368
+ };
362
369
  var isEmWaveLayout = function isEmWaveLayout(layoutSt) {
363
370
  return [_list_layout.LIST_LAYOUT.IR, _list_layout.LIST_LAYOUT.RAMAN, _list_layout.LIST_LAYOUT.UVVIS, _list_layout.LIST_LAYOUT.HPLC_UVVIS].indexOf(layoutSt) >= 0;
364
371
  };
@@ -449,6 +456,7 @@ var Format = {
449
456
  isTGALayout: isTGALayout,
450
457
  isXRDLayout: isXRDLayout,
451
458
  isCyclicVoltaLayout: isCyclicVoltaLayout,
459
+ isCDSLayout: isCDSLayout,
452
460
  isEmWaveLayout: isEmWaveLayout,
453
461
  fixDigit: fixDigit,
454
462
  formatPeaksByPrediction: formatPeaksByPrediction,
package/dist/index.js CHANGED
@@ -126,6 +126,10 @@ var _cyclic_voltammetry_5 = require('./__tests__/fixtures/cyclic_voltammetry_3')
126
126
 
127
127
  var _cyclic_voltammetry_6 = _interopRequireDefault(_cyclic_voltammetry_5);
128
128
 
129
+ var _cds_jcamp = require('./__tests__/fixtures/cds_jcamp');
130
+
131
+ var _cds_jcamp2 = _interopRequireDefault(_cds_jcamp);
132
+
129
133
  var _qDescValue = require('./__tests__/fixtures/qDescValue');
130
134
 
131
135
  require('./__tests__/style/svg.css');
@@ -161,6 +165,7 @@ var xrdEntity2 = _app.FN.ExtractJcamp(_xrd_jcamp_4.default);
161
165
  var cyclicVoltaEntity1 = _app.FN.ExtractJcamp(_cyclic_voltammetry_2.default);
162
166
  var cyclicVoltaEntity2 = _app.FN.ExtractJcamp(_cyclic_voltammetry_4.default);
163
167
  var cyclicVoltaEntity3 = _app.FN.ExtractJcamp(_cyclic_voltammetry_6.default);
168
+ var cdsEntity = _app.FN.ExtractJcamp(_cds_jcamp2.default);
164
169
 
165
170
  var DemoWriteIr = function (_React$Component) {
166
171
  _inherits(DemoWriteIr, _React$Component);
@@ -456,6 +461,8 @@ var DemoWriteIr = function (_React$Component) {
456
461
  return xrdEntity1;
457
462
  case 'cyclic volta':
458
463
  return cyclicVoltaEntity2;
464
+ case 'cds':
465
+ return cdsEntity;
459
466
  case 'ms':
460
467
  default:
461
468
  return msEntity;
@@ -498,6 +505,7 @@ var DemoWriteIr = function (_React$Component) {
498
505
  case 'xrd':
499
506
  case 'ms':
500
507
  case 'cyclic volta':
508
+ case 'cds':
501
509
  default:
502
510
  return false;
503
511
  }
@@ -697,6 +705,15 @@ var DemoWriteIr = function (_React$Component) {
697
705
  },
698
706
  'CV'
699
707
  ),
708
+ _react2.default.createElement(
709
+ _Button2.default,
710
+ {
711
+ variant: 'contained',
712
+ style: { margin: '0 10px 0 10px' },
713
+ onClick: this.onClick('cds')
714
+ },
715
+ 'CDS'
716
+ ),
700
717
  _react2.default.createElement(
701
718
  _Button2.default,
702
719
  {
@@ -213,6 +213,32 @@ var removePecker = function removePecker(state, action) {
213
213
  }
214
214
  };
215
215
 
216
+ var setRef = function setRef(state, action) {
217
+ var payload = action.payload;
218
+ var spectraList = state.spectraList;
219
+
220
+ if (payload) {
221
+ var index = payload.index,
222
+ jcampIdx = payload.jcampIdx;
223
+
224
+ var spectra = spectraList[jcampIdx];
225
+ var list = spectra.list;
226
+
227
+ var newList = list;
228
+ var pairPeak = newList[index];
229
+ // pairPeak.pecker = null;
230
+ // newList[index] = pairPeak;
231
+
232
+ // spectraList[jcampIdx] = Object.assign({}, spectra, { list: newList, selectedIdx: index, jcampIdx: jcampIdx });
233
+ // return Object.assign({}, state, { spectraList: spectraList });
234
+
235
+ //TODO: implement ref
236
+ console.log(pairPeak);
237
+ } else {
238
+ return state;
239
+ }
240
+ };
241
+
216
242
  var cyclicVoltaReducer = function cyclicVoltaReducer() {
217
243
  var state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initialState;
218
244
  var action = arguments[1];
@@ -238,6 +264,8 @@ var cyclicVoltaReducer = function cyclicVoltaReducer() {
238
264
  return addPecker(state, action);
239
265
  case _action_type.CYCLIC_VOLTA_METRY.REMOVE_PECKER:
240
266
  return removePecker(state, action);
267
+ case _action_type.CYCLIC_VOLTA_METRY.SET_REF:
268
+ return setRef(state, action);
241
269
  case _action_type.CYCLIC_VOLTA_METRY.RESETALL:
242
270
  return Object.assign({}, state, { spectraList: [] });
243
271
  default:
@@ -229,7 +229,7 @@ function clickUiTarget(action) {
229
229
  });
230
230
 
231
231
  case 7:
232
- _context3.next = 84;
232
+ _context3.next = 89;
233
233
  break;
234
234
 
235
235
  case 9:
@@ -245,7 +245,7 @@ function clickUiTarget(action) {
245
245
  });
246
246
 
247
247
  case 12:
248
- _context3.next = 84;
248
+ _context3.next = 89;
249
249
  break;
250
250
 
251
251
  case 14:
@@ -261,7 +261,7 @@ function clickUiTarget(action) {
261
261
  });
262
262
 
263
263
  case 17:
264
- _context3.next = 84;
264
+ _context3.next = 89;
265
265
  break;
266
266
 
267
267
  case 19:
@@ -277,7 +277,7 @@ function clickUiTarget(action) {
277
277
  });
278
278
 
279
279
  case 22:
280
- _context3.next = 84;
280
+ _context3.next = 89;
281
281
  break;
282
282
 
283
283
  case 24:
@@ -293,7 +293,7 @@ function clickUiTarget(action) {
293
293
  });
294
294
 
295
295
  case 27:
296
- _context3.next = 84;
296
+ _context3.next = 89;
297
297
  break;
298
298
 
299
299
  case 29:
@@ -309,7 +309,7 @@ function clickUiTarget(action) {
309
309
  });
310
310
 
311
311
  case 32:
312
- _context3.next = 84;
312
+ _context3.next = 89;
313
313
  break;
314
314
 
315
315
  case 34:
@@ -348,7 +348,7 @@ function clickUiTarget(action) {
348
348
  });
349
349
 
350
350
  case 44:
351
- _context3.next = 84;
351
+ _context3.next = 89;
352
352
  break;
353
353
 
354
354
  case 46:
@@ -364,7 +364,7 @@ function clickUiTarget(action) {
364
364
  });
365
365
 
366
366
  case 49:
367
- _context3.next = 84;
367
+ _context3.next = 89;
368
368
  break;
369
369
 
370
370
  case 51:
@@ -380,7 +380,7 @@ function clickUiTarget(action) {
380
380
  });
381
381
 
382
382
  case 54:
383
- _context3.next = 84;
383
+ _context3.next = 89;
384
384
  break;
385
385
 
386
386
  case 56:
@@ -396,7 +396,7 @@ function clickUiTarget(action) {
396
396
  });
397
397
 
398
398
  case 59:
399
- _context3.next = 84;
399
+ _context3.next = 89;
400
400
  break;
401
401
 
402
402
  case 61:
@@ -412,7 +412,7 @@ function clickUiTarget(action) {
412
412
  });
413
413
 
414
414
  case 64:
415
- _context3.next = 84;
415
+ _context3.next = 89;
416
416
  break;
417
417
 
418
418
  case 66:
@@ -428,7 +428,7 @@ function clickUiTarget(action) {
428
428
  });
429
429
 
430
430
  case 69:
431
- _context3.next = 84;
431
+ _context3.next = 89;
432
432
  break;
433
433
 
434
434
  case 71:
@@ -444,7 +444,7 @@ function clickUiTarget(action) {
444
444
  });
445
445
 
446
446
  case 74:
447
- _context3.next = 84;
447
+ _context3.next = 89;
448
448
  break;
449
449
 
450
450
  case 76:
@@ -460,12 +460,12 @@ function clickUiTarget(action) {
460
460
  });
461
461
 
462
462
  case 79:
463
- _context3.next = 84;
463
+ _context3.next = 89;
464
464
  break;
465
465
 
466
466
  case 81:
467
467
  if (!(uiSweepType === _list_ui.LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_RM_PECKER && onPecker)) {
468
- _context3.next = 84;
468
+ _context3.next = 86;
469
469
  break;
470
470
  }
471
471
 
@@ -476,6 +476,22 @@ function clickUiTarget(action) {
476
476
  });
477
477
 
478
478
  case 84:
479
+ _context3.next = 89;
480
+ break;
481
+
482
+ case 86:
483
+ if (!(uiSweepType === _list_ui.LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_SET_REF && onPeak)) {
484
+ _context3.next = 89;
485
+ break;
486
+ }
487
+
488
+ _context3.next = 89;
489
+ return (0, _effects.put)({
490
+ type: _action_type.CYCLIC_VOLTA_METRY.SET_REF,
491
+ payload: { index: voltammetryPeakIdx, jcampIdx: jcampIdx }
492
+ });
493
+
494
+ case 89:
479
495
  case 'end':
480
496
  return _context3.stop();
481
497
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@complat/react-spectra-editor",
3
- "version": "0.11.5-beta.0",
3
+ "version": "0.11.5",
4
4
  "description": "An editor to View and Edit Chemical Spectra data (NMR, IR and MS).",
5
5
  "repository": {
6
6
  "type": "git",
@@ -1,280 +0,0 @@
1
- 'use strict';
2
-
3
- Object.defineProperty(exports, "__esModule", {
4
- value: true
5
- });
6
-
7
- var _react = require('react');
8
-
9
- var _react2 = _interopRequireDefault(_react);
10
-
11
- var _reactRedux = require('react-redux');
12
-
13
- var _redux = require('redux');
14
-
15
- var _classnames = require('classnames');
16
-
17
- var _classnames2 = _interopRequireDefault(_classnames);
18
-
19
- var _propTypes = require('prop-types');
20
-
21
- var _propTypes2 = _interopRequireDefault(_propTypes);
22
-
23
- var _styles = require('@material-ui/core/styles');
24
-
25
- var _Tooltip = require('@material-ui/core/Tooltip');
26
-
27
- var _Tooltip2 = _interopRequireDefault(_Tooltip);
28
-
29
- var _TextField = require('@material-ui/core/TextField');
30
-
31
- var _TextField2 = _interopRequireDefault(_TextField);
32
-
33
- var _react3 = require('@mdi/react');
34
-
35
- var _react4 = _interopRequireDefault(_react3);
36
-
37
- var _js = require('@mdi/js');
38
-
39
- var _integration = require('../../actions/integration');
40
-
41
- var _ui = require('../../actions/ui');
42
-
43
- var _list_ui = require('../../constants/list_ui');
44
-
45
- var _cfg = require('../../helpers/cfg');
46
-
47
- var _cfg2 = _interopRequireDefault(_cfg);
48
-
49
- var _tri_btn = require('./tri_btn');
50
-
51
- var _tri_btn2 = _interopRequireDefault(_tri_btn);
52
-
53
- var _common = require('./common');
54
-
55
- var _format = require('../../helpers/format');
56
-
57
- var _format2 = _interopRequireDefault(_format);
58
-
59
- function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
60
-
61
- var styles = function styles() {
62
- return Object.assign({
63
- field: {
64
- width: 80
65
- },
66
- txtIcon: {}
67
- }, _common.commonStyle);
68
- };
69
-
70
- var iconSize = '16px';
71
-
72
- var setFactor = function setFactor(classes, isDisable, refFactor, setIntegrationFkrAct) {
73
- var onBlur = function onBlur(e) {
74
- return setIntegrationFkrAct(e.target.value);
75
- };
76
- var onChange = function onChange(e) {
77
- return setIntegrationFkrAct(e.target.value);
78
- };
79
- var onEnterPress = function onEnterPress(e) {
80
- if (e.key === 'Enter') {
81
- setIntegrationFkrAct(e.target.value);
82
- }
83
- };
84
-
85
- return _react2.default.createElement(_TextField2.default, {
86
- className: classes.field,
87
- disabled: isDisable,
88
- id: 'intg-factor-name',
89
- type: 'number',
90
- value: refFactor || 1.00,
91
- margin: 'none',
92
- InputProps: {
93
- className: (0, _classnames2.default)(classes.txtInput, 'txtfield-sv-bar-input')
94
- },
95
- label: _react2.default.createElement(
96
- 'span',
97
- { className: (0, _classnames2.default)(classes.txtLabel, 'txtfield-sv-bar-label') },
98
- 'Ref Area'
99
- ),
100
- onChange: onChange,
101
- onBlur: onBlur,
102
- onKeyPress: onEnterPress,
103
- variant: 'outlined'
104
- });
105
- };
106
-
107
- var iconColor = function iconColor(criteria) {
108
- return criteria ? '#fff' : '#000';
109
- };
110
-
111
- var Integration = function Integration(_ref) {
112
- var classes = _ref.classes,
113
- refFactorSt = _ref.refFactorSt,
114
- ignoreRef = _ref.ignoreRef,
115
- isDisableSt = _ref.isDisableSt,
116
- isFocusAddIntgSt = _ref.isFocusAddIntgSt,
117
- isFocusRmIntgSt = _ref.isFocusRmIntgSt,
118
- isFocusSetRefSt = _ref.isFocusSetRefSt,
119
- setUiSweepTypeAct = _ref.setUiSweepTypeAct,
120
- setIntegrationFkrAct = _ref.setIntegrationFkrAct,
121
- clearIntegrationAllAct = _ref.clearIntegrationAllAct;
122
-
123
- var onSweepIntegtAdd = function onSweepIntegtAdd() {
124
- return setUiSweepTypeAct(_list_ui.LIST_UI_SWEEP_TYPE.INTEGRATION_ADD);
125
- };
126
- var onSweepIntegtRm = function onSweepIntegtRm() {
127
- return setUiSweepTypeAct(_list_ui.LIST_UI_SWEEP_TYPE.INTEGRATION_RM);
128
- };
129
- var onSweepIntegtSR = function onSweepIntegtSR() {
130
- return setUiSweepTypeAct(_list_ui.LIST_UI_SWEEP_TYPE.INTEGRATION_SET_REF);
131
- };
132
-
133
- return _react2.default.createElement(
134
- 'span',
135
- { className: classes.group },
136
- _react2.default.createElement(
137
- _Tooltip2.default,
138
- { title: _react2.default.createElement(
139
- 'span',
140
- { className: 'txt-sv-tp' },
141
- 'Add Integration'
142
- ) },
143
- _react2.default.createElement(
144
- 'span',
145
- null,
146
- _react2.default.createElement(
147
- _common.MuButton,
148
- {
149
- className: (0, _classnames2.default)((0, _common.focusStyle)(isFocusAddIntgSt, classes)),
150
- disabled: isDisableSt,
151
- onClick: onSweepIntegtAdd
152
- },
153
- _react2.default.createElement(_react4.default, {
154
- path: _js.mdiMathIntegral,
155
- size: iconSize,
156
- color: iconColor(isFocusAddIntgSt || isDisableSt),
157
- className: (0, _classnames2.default)(classes.iconMdi, 'icon-sv-bar-addint')
158
- }),
159
- _react2.default.createElement(
160
- 'span',
161
- { className: (0, _classnames2.default)(classes.txt, classes.txtIcon, 'txt-sv-bar-addint') },
162
- '+'
163
- )
164
- )
165
- )
166
- ),
167
- _react2.default.createElement(
168
- _Tooltip2.default,
169
- { title: _react2.default.createElement(
170
- 'span',
171
- { className: 'txt-sv-tp' },
172
- 'Remove Integration'
173
- ) },
174
- _react2.default.createElement(
175
- 'span',
176
- null,
177
- _react2.default.createElement(
178
- _common.MuButton,
179
- {
180
- className: (0, _classnames2.default)((0, _common.focusStyle)(isFocusRmIntgSt, classes)),
181
- disabled: isDisableSt,
182
- onClick: onSweepIntegtRm
183
- },
184
- _react2.default.createElement(_react4.default, {
185
- path: _js.mdiMathIntegral,
186
- size: iconSize,
187
- color: iconColor(isFocusRmIntgSt || isDisableSt),
188
- className: (0, _classnames2.default)(classes.iconMdi, 'icon-sv-bar-rmint')
189
- }),
190
- _react2.default.createElement(
191
- 'span',
192
- { className: (0, _classnames2.default)(classes.txt, classes.txtIcon, 'txt-sv-bar-rmint') },
193
- '-'
194
- )
195
- )
196
- )
197
- ),
198
- _react2.default.createElement(
199
- _Tooltip2.default,
200
- { title: _react2.default.createElement(
201
- 'span',
202
- { className: 'txt-sv-tp' },
203
- 'Set Integration Reference'
204
- ) },
205
- _react2.default.createElement(
206
- 'span',
207
- null,
208
- _react2.default.createElement(
209
- _common.MuButton,
210
- {
211
- className: (0, _classnames2.default)((0, _common.focusStyle)(isFocusSetRefSt, classes)),
212
- disabled: isDisableSt,
213
- onClick: onSweepIntegtSR
214
- },
215
- _react2.default.createElement(_react4.default, {
216
- path: _js.mdiReflectVertical,
217
- size: iconSize,
218
- color: iconColor(isFocusSetRefSt || isDisableSt),
219
- className: (0, _classnames2.default)(classes.iconMdi, 'icon-sv-bar-refint')
220
- })
221
- )
222
- )
223
- ),
224
- !ignoreRef ? setFactor(classes, isDisableSt, refFactorSt, setIntegrationFkrAct) : null,
225
- _react2.default.createElement(
226
- _tri_btn2.default,
227
- {
228
- content: { tp: 'Clear All Integration' },
229
- cb: clearIntegrationAllAct
230
- },
231
- _react2.default.createElement(_react4.default, {
232
- path: _js.mdiMathIntegral,
233
- size: iconSize,
234
- color: iconColor(isDisableSt),
235
- className: (0, _classnames2.default)(classes.iconMdi, 'icon-sv-bar-rmallint')
236
- }),
237
- _react2.default.createElement(
238
- 'span',
239
- { className: (0, _classnames2.default)(classes.txt, classes.txtIcon, 'txt-sv-bar-rmallint') },
240
- 'x'
241
- )
242
- )
243
- );
244
- };
245
-
246
- var mapStateToProps = function mapStateToProps(state, props) {
247
- return (// eslint-disable-line
248
- {
249
- isDisableSt: _cfg2.default.btnCmdIntg(state.layout),
250
- isFocusAddIntgSt: state.ui.sweepType === _list_ui.LIST_UI_SWEEP_TYPE.INTEGRATION_ADD,
251
- isFocusRmIntgSt: state.ui.sweepType === _list_ui.LIST_UI_SWEEP_TYPE.INTEGRATION_RM,
252
- isFocusSetRefSt: state.ui.sweepType === _list_ui.LIST_UI_SWEEP_TYPE.INTEGRATION_SET_REF,
253
- refFactorSt: state.integration.present.refFactor,
254
- ignoreRef: _format2.default.isHplcUvVisLayout(state.layout)
255
- }
256
- );
257
- };
258
-
259
- var mapDispatchToProps = function mapDispatchToProps(dispatch) {
260
- return (0, _redux.bindActionCreators)({
261
- setUiSweepTypeAct: _ui.setUiSweepType,
262
- setIntegrationFkrAct: _integration.setIntegrationFkr,
263
- clearIntegrationAllAct: _integration.clearIntegrationAll
264
- }, dispatch);
265
- };
266
-
267
- Integration.propTypes = {
268
- classes: _propTypes2.default.object.isRequired,
269
- isDisableSt: _propTypes2.default.bool.isRequired,
270
- isFocusAddIntgSt: _propTypes2.default.bool.isRequired,
271
- isFocusRmIntgSt: _propTypes2.default.bool.isRequired,
272
- isFocusSetRefSt: _propTypes2.default.bool.isRequired,
273
- refFactorSt: _propTypes2.default.number.isRequired,
274
- ignoreRef: _propTypes2.default.bool.isRequired,
275
- setUiSweepTypeAct: _propTypes2.default.func.isRequired,
276
- setIntegrationFkrAct: _propTypes2.default.func.isRequired,
277
- clearIntegrationAllAct: _propTypes2.default.func.isRequired
278
- };
279
-
280
- exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(Integration));