@complat/react-spectra-editor 1.3.5 → 1.4.1
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.
- package/dist/__tests__/fixtures/nmr1h_2_jcamp.js +3199 -1944
- package/dist/__tests__/units/components/cmd_bar/01_viewer.test.js +21 -18
- package/dist/__tests__/units/components/cmd_bar/02_zoom.test.js +15 -13
- package/dist/__tests__/units/components/cmd_bar/03_peak.test.js +35 -26
- package/dist/__tests__/units/components/cmd_bar/07_pecker.test.js +17 -14
- package/dist/__tests__/units/components/cmd_bar/r08_change_axes.test.js +15 -13
- package/dist/__tests__/units/components/common/comps.test.js +9 -8
- package/dist/__tests__/units/components/common/draw.test.js +26 -34
- package/dist/__tests__/units/components/panel/graph_selection.test.js +25 -22
- package/dist/__tests__/units/components/panel/info.test.js +30 -25
- package/dist/__tests__/units/components/panel/peaks.test.js +29 -24
- package/dist/actions/manager.js +6 -2
- package/dist/actions/ui.js +13 -21
- package/dist/app.js +45 -45
- package/dist/components/cmd_bar/01_viewer.js +38 -31
- package/dist/components/cmd_bar/02_zoom.js +34 -27
- package/dist/components/cmd_bar/03_peak.js +85 -64
- package/dist/components/cmd_bar/04_integration.js +97 -76
- package/dist/components/cmd_bar/05_multiplicity.js +94 -67
- package/dist/components/cmd_bar/06_undo_redo.js +41 -32
- package/dist/components/cmd_bar/07_pecker.js +70 -47
- package/dist/components/cmd_bar/common.js +8 -8
- package/dist/components/cmd_bar/index.js +20 -21
- package/dist/components/cmd_bar/r01_layout.js +201 -137
- package/dist/components/cmd_bar/r02_scan.js +63 -51
- package/dist/components/cmd_bar/r03_threshold.js +95 -69
- package/dist/components/cmd_bar/r04_submit.js +155 -133
- package/dist/components/cmd_bar/r05_submit_btn.js +39 -36
- package/dist/components/cmd_bar/r06_predict_btn.js +66 -52
- package/dist/components/cmd_bar/r07_wavelength_btn.js +35 -31
- package/dist/components/cmd_bar/r08_change_axes.js +65 -56
- package/dist/components/cmd_bar/r09_detector.js +38 -33
- package/dist/components/cmd_bar/tri_btn.js +37 -25
- package/dist/components/common/comps.js +5 -6
- package/dist/components/d3_line/index.js +2 -1
- package/dist/components/d3_line/line_focus.js +32 -34
- package/dist/components/d3_multi/index.js +2 -1
- package/dist/components/d3_multi/multi_focus.js +60 -37
- package/dist/components/d3_rect/index.js +2 -1
- package/dist/components/d3_rect/rect_focus.js +18 -20
- package/dist/components/forecast/comps.js +169 -132
- package/dist/components/forecast/ir_comps.js +88 -69
- package/dist/components/forecast/ir_viewer.js +35 -28
- package/dist/components/forecast/nmr_comps.js +105 -76
- package/dist/components/forecast/nmr_viewer.js +36 -29
- package/dist/components/forecast/section_loading.js +22 -17
- package/dist/components/forecast_viewer.js +19 -17
- package/dist/components/multi_jcamps_viewer.js +44 -38
- package/dist/components/panel/compare.js +92 -76
- package/dist/components/panel/cyclic_voltamery_data.js +171 -122
- package/dist/components/panel/graph_selection.js +113 -90
- package/dist/components/panel/index.js +43 -39
- package/dist/components/panel/info.js +203 -156
- package/dist/components/panel/multiplicity.js +85 -63
- package/dist/components/panel/multiplicity_coupling.js +36 -29
- package/dist/components/panel/multiplicity_select.js +20 -19
- package/dist/components/panel/peaks.js +78 -56
- package/dist/constants/action_type.js +2 -1
- package/dist/helpers/cfg.js +1 -2
- package/dist/helpers/chem.js +5 -13
- package/dist/helpers/converter.js +1 -2
- package/dist/helpers/extractParams.js +1 -2
- package/dist/helpers/extractPeaksEdit.js +3 -6
- package/dist/helpers/format.js +28 -63
- package/dist/helpers/init.js +5 -9
- package/dist/helpers/integration.js +1 -2
- package/dist/helpers/mount.js +1 -2
- package/dist/index.js +306 -276
- package/dist/layer_content.js +14 -14
- package/dist/layer_init.js +12 -11
- package/dist/layer_prism.js +83 -72
- package/dist/reducers/reducer_axes.js +2 -5
- package/dist/reducers/reducer_curve.js +8 -6
- package/dist/reducers/reducer_detector.js +1 -3
- package/dist/reducers/reducer_edit_peak.js +1 -3
- package/dist/reducers/reducer_forecast.js +1 -3
- package/dist/reducers/reducer_integration.js +1 -3
- package/dist/reducers/reducer_jcamp.js +5 -8
- package/dist/reducers/reducer_layout.js +1 -3
- package/dist/reducers/reducer_manager.js +1 -3
- package/dist/reducers/reducer_meta.js +1 -3
- package/dist/reducers/reducer_multiplicity.js +3 -3
- package/dist/reducers/reducer_scan.js +1 -3
- package/dist/reducers/reducer_shift.js +1 -3
- package/dist/reducers/reducer_simulation.js +1 -3
- package/dist/reducers/reducer_status.js +1 -3
- package/dist/reducers/reducer_submit.js +1 -3
- package/dist/reducers/reducer_threshold.js +199 -29
- package/dist/reducers/reducer_ui.js +1 -3
- package/dist/reducers/reducer_voltammetry.js +3 -7
- package/dist/reducers/reducer_wavelength.js +1 -3
- package/dist/sagas/saga_multi_entities.js +35 -14
- package/dist/sagas/saga_multiplicity.js +1 -2
- package/dist/third_party/jAnalyzer.js +1 -1
- package/package.json +18 -1
|
@@ -13,6 +13,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
|
13
13
|
var _styles = require("@mui/styles");
|
|
14
14
|
var _material = require("@mui/material");
|
|
15
15
|
var _multiplicity = require("../../actions/multiplicity");
|
|
16
|
+
var _jsxRuntime = require("react/jsx-runtime");
|
|
16
17
|
const styles = () => ({
|
|
17
18
|
jDiv: {
|
|
18
19
|
height: 28
|
|
@@ -36,16 +37,20 @@ const styles = () => ({
|
|
|
36
37
|
height: 24
|
|
37
38
|
}
|
|
38
39
|
});
|
|
39
|
-
const txtJ = () => /*#__PURE__*/
|
|
40
|
-
position: "start"
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
40
|
+
const txtJ = () => /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.InputAdornment, {
|
|
41
|
+
position: "start",
|
|
42
|
+
children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
|
|
43
|
+
className: "txt-cmd-j",
|
|
44
|
+
children: "J\xA0="
|
|
45
|
+
})
|
|
46
|
+
});
|
|
47
|
+
const txtHz = () => /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.InputAdornment, {
|
|
48
|
+
position: "end",
|
|
49
|
+
children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
|
|
50
|
+
className: "txt-cmd-hz",
|
|
51
|
+
children: "Hz"
|
|
52
|
+
})
|
|
53
|
+
});
|
|
49
54
|
class MpyCoupling extends _react.default.Component {
|
|
50
55
|
constructor(props) {
|
|
51
56
|
super(props);
|
|
@@ -97,25 +102,27 @@ class MpyCoupling extends _react.default.Component {
|
|
|
97
102
|
tmpVal
|
|
98
103
|
} = this.state;
|
|
99
104
|
const value = focus && (tmpVal || tmpVal === '') ? tmpVal : row.jStr;
|
|
100
|
-
return /*#__PURE__*/
|
|
101
|
-
className: (0, _classnames.default)(classes.jDiv)
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
105
|
+
return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
|
|
106
|
+
className: (0, _classnames.default)(classes.jDiv),
|
|
107
|
+
children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
|
|
108
|
+
className: (0, _classnames.default)(classes.moExtTxt, classes.jTxt, 'txt-sv-panel-head'),
|
|
109
|
+
children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TextField, {
|
|
110
|
+
className: (0, _classnames.default)(classes.txtField, 'txt-cmd-field'),
|
|
111
|
+
placeholder: "-",
|
|
112
|
+
value: value,
|
|
113
|
+
margin: "none",
|
|
114
|
+
InputProps: {
|
|
115
|
+
startAdornment: txtJ(),
|
|
116
|
+
endAdornment: txtHz(),
|
|
117
|
+
className: (0, _classnames.default)(classes.txtInput, 'txt-sv-input-label')
|
|
118
|
+
},
|
|
119
|
+
onChange: this.onChange,
|
|
120
|
+
onFocus: this.onFocus,
|
|
121
|
+
onBlur: this.onBlur,
|
|
122
|
+
variant: "outlined"
|
|
123
|
+
})
|
|
124
|
+
})
|
|
125
|
+
});
|
|
119
126
|
}
|
|
120
127
|
}
|
|
121
128
|
const mapStateToProps = (state, props) => (
|
|
@@ -13,6 +13,7 @@ var _redux = require("redux");
|
|
|
13
13
|
var _material = require("@mui/material");
|
|
14
14
|
var _styles = require("@mui/styles");
|
|
15
15
|
var _multiplicity = require("../../actions/multiplicity");
|
|
16
|
+
var _jsxRuntime = require("react/jsx-runtime");
|
|
16
17
|
/* eslint-disable react/function-component-definition */
|
|
17
18
|
|
|
18
19
|
const Styles = () => ({
|
|
@@ -31,12 +32,11 @@ const Styles = () => ({
|
|
|
31
32
|
color: 'white'
|
|
32
33
|
}
|
|
33
34
|
});
|
|
34
|
-
const MpySelect =
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
} = _ref;
|
|
35
|
+
const MpySelect = ({
|
|
36
|
+
classes,
|
|
37
|
+
target,
|
|
38
|
+
selectMpyTypeAct
|
|
39
|
+
}) => {
|
|
40
40
|
const {
|
|
41
41
|
mpyType,
|
|
42
42
|
xExtent
|
|
@@ -57,21 +57,22 @@ const MpySelect = _ref => {
|
|
|
57
57
|
});
|
|
58
58
|
}
|
|
59
59
|
};
|
|
60
|
-
return /*#__PURE__*/
|
|
60
|
+
return /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.FormControl, {
|
|
61
61
|
className: (0, _classnames.default)(classes.formControl),
|
|
62
|
-
variant: "outlined"
|
|
63
|
-
}, /*#__PURE__*/_react.default.createElement(_material.TextField, {
|
|
64
|
-
className: (0, _classnames.default)(classes.txtField, 'txt-cmd-field'),
|
|
65
|
-
value: mpyType,
|
|
66
|
-
margin: "none",
|
|
67
62
|
variant: "outlined",
|
|
68
|
-
|
|
69
|
-
className: (0, _classnames.default)(classes.
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
63
|
+
children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TextField, {
|
|
64
|
+
className: (0, _classnames.default)(classes.txtField, 'txt-cmd-field'),
|
|
65
|
+
value: mpyType,
|
|
66
|
+
margin: "none",
|
|
67
|
+
variant: "outlined",
|
|
68
|
+
InputProps: {
|
|
69
|
+
className: (0, _classnames.default)(classes.txtInput, 'txt-sv-input-label')
|
|
70
|
+
},
|
|
71
|
+
onChange: onChange,
|
|
72
|
+
onBlur: onBlur,
|
|
73
|
+
onKeyPress: onEnterPress
|
|
74
|
+
})
|
|
75
|
+
});
|
|
75
76
|
};
|
|
76
77
|
const mapStateToProps = (state, props) => (
|
|
77
78
|
// eslint-disable-line
|
|
@@ -17,6 +17,7 @@ var _styles = require("@mui/styles");
|
|
|
17
17
|
var _chem = require("../../helpers/chem");
|
|
18
18
|
var _edit_peak = require("../../actions/edit_peak");
|
|
19
19
|
var _format = _interopRequireDefault(require("../../helpers/format"));
|
|
20
|
+
var _jsxRuntime = require("react/jsx-runtime");
|
|
20
21
|
/* eslint-disable react/function-component-definition, no-unused-vars */
|
|
21
22
|
|
|
22
23
|
const styles = theme => ({
|
|
@@ -79,7 +80,7 @@ const createData = (classes, idx, x, y, cb, digits) => ({
|
|
|
79
80
|
idx: idx + 1,
|
|
80
81
|
x: x.toFixed(digits),
|
|
81
82
|
y,
|
|
82
|
-
rmBtn: /*#__PURE__*/
|
|
83
|
+
rmBtn: /*#__PURE__*/(0, _jsxRuntime.jsx)(_HighlightOff.default, {
|
|
83
84
|
onClick: cb,
|
|
84
85
|
className: classes.rmBtn
|
|
85
86
|
})
|
|
@@ -91,51 +92,66 @@ const peakList = (peaks, digits, cbAct, classes, isPos) => {
|
|
|
91
92
|
});
|
|
92
93
|
const rowKlass = isPos ? classes.tRowHeadPos : classes.tRowHeadNeg;
|
|
93
94
|
const headTxt = isPos ? 'P+' : 'P-';
|
|
94
|
-
return /*#__PURE__*/
|
|
95
|
-
className: classes.table
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
95
|
+
return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Table, {
|
|
96
|
+
className: classes.table,
|
|
97
|
+
children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableHead, {
|
|
98
|
+
children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.TableRow, {
|
|
99
|
+
className: rowKlass,
|
|
100
|
+
children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
|
|
101
|
+
align: "right",
|
|
102
|
+
className: (0, _classnames.default)(classes.tTxtHead, 'txt-sv-panel-head'),
|
|
103
|
+
children: /*#__PURE__*/(0, _jsxRuntime.jsx)("i", {
|
|
104
|
+
children: headTxt
|
|
105
|
+
})
|
|
106
|
+
}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
|
|
107
|
+
align: "right",
|
|
108
|
+
className: (0, _classnames.default)(classes.tTxtHeadXY, 'txt-sv-panel-head'),
|
|
109
|
+
children: "X"
|
|
110
|
+
}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
|
|
111
|
+
align: "right",
|
|
112
|
+
className: (0, _classnames.default)(classes.tTxtHeadXY, 'txt-sv-panel-head'),
|
|
113
|
+
children: "Y"
|
|
114
|
+
}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
|
|
115
|
+
align: "right",
|
|
116
|
+
className: (0, _classnames.default)(classes.tTxtHead, 'txt-sv-panel-head'),
|
|
117
|
+
children: "-"
|
|
118
|
+
})]
|
|
119
|
+
})
|
|
120
|
+
}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableBody, {
|
|
121
|
+
children: rows.map(row => /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.TableRow, {
|
|
122
|
+
className: classes.tRow,
|
|
123
|
+
hover: true,
|
|
124
|
+
children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
|
|
125
|
+
align: "right",
|
|
126
|
+
className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt'),
|
|
127
|
+
children: row.idx
|
|
128
|
+
}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
|
|
129
|
+
align: "right",
|
|
130
|
+
className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt'),
|
|
131
|
+
children: row.x
|
|
132
|
+
}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
|
|
133
|
+
align: "right",
|
|
134
|
+
className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt'),
|
|
135
|
+
children: row.y.toExponential(2)
|
|
136
|
+
}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
|
|
137
|
+
align: "right",
|
|
138
|
+
className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt'),
|
|
139
|
+
children: row.rmBtn
|
|
140
|
+
})]
|
|
141
|
+
}, row.idx))
|
|
142
|
+
})]
|
|
143
|
+
});
|
|
127
144
|
};
|
|
128
|
-
const PeakPanel =
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
} = _ref;
|
|
145
|
+
const PeakPanel = ({
|
|
146
|
+
editPeakSt,
|
|
147
|
+
layoutSt,
|
|
148
|
+
classes,
|
|
149
|
+
expand,
|
|
150
|
+
onExapnd,
|
|
151
|
+
rmFromPosListAct,
|
|
152
|
+
rmFromNegListAct,
|
|
153
|
+
curveSt
|
|
154
|
+
}) => {
|
|
139
155
|
const {
|
|
140
156
|
curveIdx,
|
|
141
157
|
listCurves
|
|
@@ -165,7 +181,7 @@ const PeakPanel = _ref => {
|
|
|
165
181
|
const filteredArray = currentPeakOfCurve.filter(element => neg.includes(element));
|
|
166
182
|
const peaksData = [].concat(filteredArray).concat(pos);
|
|
167
183
|
const digits = _format.default.isEmWaveLayout(layoutSt) ? 0 : 4;
|
|
168
|
-
return /*#__PURE__*/
|
|
184
|
+
return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Accordion, {
|
|
169
185
|
"data-testid": "PeaksPanelInfo",
|
|
170
186
|
expanded: expand,
|
|
171
187
|
onChange: onExapnd,
|
|
@@ -173,16 +189,22 @@ const PeakPanel = _ref => {
|
|
|
173
189
|
TransitionProps: {
|
|
174
190
|
unmountOnExit: true
|
|
175
191
|
} // increase Accordion performance
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
192
|
+
,
|
|
193
|
+
children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.AccordionSummary, {
|
|
194
|
+
expandIcon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_ExpandMore.default, {}),
|
|
195
|
+
className: (0, _classnames.default)(classes.panelSummary),
|
|
196
|
+
children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Typography, {
|
|
197
|
+
className: "txt-panel-header",
|
|
198
|
+
children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
|
|
199
|
+
className: (0, _classnames.default)(classes.txtBadge, 'txt-sv-panel-title'),
|
|
200
|
+
children: "Peaks"
|
|
201
|
+
})
|
|
202
|
+
})
|
|
203
|
+
}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Divider, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
|
|
204
|
+
className: (0, _classnames.default)(classes.panelDetail),
|
|
205
|
+
children: peakList(peaksData, digits, rmFromPosListAct, classes, true)
|
|
206
|
+
})]
|
|
207
|
+
});
|
|
186
208
|
};
|
|
187
209
|
const mapStateToProps = (state, props) => (
|
|
188
210
|
// eslint-disable-line
|
|
@@ -31,7 +31,8 @@ const MANAGER = exports.MANAGER = {
|
|
|
31
31
|
RESET_INIT_NMR: 'RESET_INIT_NMR',
|
|
32
32
|
RESET_INIT_MS: 'RESET_INIT_MS',
|
|
33
33
|
RESET_INIT_COMMON_WITH_INTERGATION: 'RESET_INIT_COMMON_WITH_INTERGATION',
|
|
34
|
-
RESET_DETECTOR: 'RESET_DETECTOR'
|
|
34
|
+
RESET_DETECTOR: 'RESET_DETECTOR',
|
|
35
|
+
RESET_MULTIPLICITY: 'RESET_MULTIPLICITY'
|
|
35
36
|
};
|
|
36
37
|
const LAYOUT = exports.LAYOUT = {
|
|
37
38
|
UPDATE: 'UPDATE_LAYOUT'
|
package/dist/helpers/cfg.js
CHANGED
|
@@ -15,8 +15,7 @@ const btnCmdSetRef = layoutSt => !_format.default.isNmrLayout(layoutSt); // esli
|
|
|
15
15
|
const btnCmdIntg = layoutSt => !(_format.default.isNmrLayout(layoutSt) || _format.default.isHplcUvVisLayout(layoutSt)); // eslint-disable-line
|
|
16
16
|
|
|
17
17
|
const btnCmdMpy = layoutSt => !_format.default.isNmrLayout(layoutSt);
|
|
18
|
-
const btnCmdMpyPeak =
|
|
19
|
-
let curveIdx = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
|
|
18
|
+
const btnCmdMpyPeak = (layoutSt, mpySt, curveIdx = 0) => {
|
|
20
19
|
const {
|
|
21
20
|
multiplicities
|
|
22
21
|
} = mpySt;
|
package/dist/helpers/chem.js
CHANGED
|
@@ -21,9 +21,7 @@ const getTopic = (_, props) => props.topic;
|
|
|
21
21
|
const getFeature = (_, props) => props.feature;
|
|
22
22
|
const getLayout = (state, _) => state.layout; // eslint-disable-line
|
|
23
23
|
|
|
24
|
-
const GetCyclicVoltaShiftOffset =
|
|
25
|
-
let volammetryData = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
|
|
26
|
-
let curveIdx = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
|
|
24
|
+
const GetCyclicVoltaShiftOffset = (volammetryData = null, curveIdx = 0) => {
|
|
27
25
|
if (!volammetryData) return 0.0;
|
|
28
26
|
const {
|
|
29
27
|
spectraList
|
|
@@ -164,10 +162,8 @@ const convertFrequency = (layout, feature) => {
|
|
|
164
162
|
return parseFloat(freq) || false;
|
|
165
163
|
};
|
|
166
164
|
const ToFrequency = exports.ToFrequency = (0, _reselect.createSelector)(getLayout, getFeature, convertFrequency);
|
|
167
|
-
const getThreshold = state => state.threshold ? state.threshold.value * 1.0 : false;
|
|
168
|
-
const Convert2Peak =
|
|
169
|
-
let upThreshold = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
|
|
170
|
-
let lowThreshold = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
|
|
165
|
+
const getThreshold = state => state.threshold ? state.threshold.list[state.curve.curveIdx].value * 1.0 : false;
|
|
166
|
+
const Convert2Peak = (feature, threshold, offset, upThreshold = false, lowThreshold = false) => {
|
|
171
167
|
const peak = [];
|
|
172
168
|
if (!feature || !feature.data) return peak;
|
|
173
169
|
const data = feature.data[0];
|
|
@@ -495,9 +491,7 @@ const extractVoltammetryData = jcamp => {
|
|
|
495
491
|
});
|
|
496
492
|
return peakStack;
|
|
497
493
|
};
|
|
498
|
-
const buildPeakFeature =
|
|
499
|
-
let upperThres = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
|
|
500
|
-
let lowerThres = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
|
|
494
|
+
const buildPeakFeature = (jcamp, layout, peakUp, s, thresRef, upperThres = false, lowerThres = false) => {
|
|
501
495
|
// eslint-disable-line
|
|
502
496
|
const {
|
|
503
497
|
xType,
|
|
@@ -894,9 +888,7 @@ const Convert2Thres = (feature, thresSt) => {
|
|
|
894
888
|
return value;
|
|
895
889
|
};
|
|
896
890
|
exports.Convert2Thres = Convert2Thres;
|
|
897
|
-
const Convert2DValue =
|
|
898
|
-
let lambda = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0.15406;
|
|
899
|
-
let isRadian = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
|
|
891
|
+
const Convert2DValue = (doubleTheta, lambda = 0.15406, isRadian = true) => {
|
|
900
892
|
let theta = doubleTheta / 2;
|
|
901
893
|
if (isRadian) {
|
|
902
894
|
theta = theta / 180 * Math.PI;
|
|
@@ -66,8 +66,7 @@ const pksAddPos = (dataPks, editPeakSt) => {
|
|
|
66
66
|
const result = [...posPks, ...pos];
|
|
67
67
|
return result;
|
|
68
68
|
};
|
|
69
|
-
const PksEdit =
|
|
70
|
-
let voltammetryPeak = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
|
|
69
|
+
const PksEdit = (dataPks, editPeakSt, voltammetryPeak = false) => {
|
|
71
70
|
if (voltammetryPeak && voltammetryPeak.length > 0) {
|
|
72
71
|
let modDataPks = [];
|
|
73
72
|
voltammetryPeak.forEach(peak => {
|
|
@@ -25,8 +25,7 @@ const getScanIdx = (entity, scanSt) => {
|
|
|
25
25
|
}
|
|
26
26
|
return idx - 1;
|
|
27
27
|
};
|
|
28
|
-
const extrShare =
|
|
29
|
-
let scanIdx = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
|
|
28
|
+
const extrShare = (entity, thresSt, scanIdx = 0) => {
|
|
30
29
|
const {
|
|
31
30
|
spectra,
|
|
32
31
|
features
|
|
@@ -10,8 +10,7 @@ var _chem = require("./chem");
|
|
|
10
10
|
var _shift = require("./shift");
|
|
11
11
|
var _format = _interopRequireDefault(require("./format"));
|
|
12
12
|
var _integration = require("./integration");
|
|
13
|
-
const niOffset =
|
|
14
|
-
let atIndex = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
|
|
13
|
+
const niOffset = (shiftSt, atIndex = 0) => {
|
|
15
14
|
const {
|
|
16
15
|
shifts
|
|
17
16
|
} = shiftSt;
|
|
@@ -27,16 +26,14 @@ const niOffset = function (shiftSt) {
|
|
|
27
26
|
return offset;
|
|
28
27
|
};
|
|
29
28
|
const msOffset = () => 0;
|
|
30
|
-
const extractPeaksEdit =
|
|
31
|
-
let atIndex = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 0;
|
|
29
|
+
const extractPeaksEdit = (feature, editPeakSt, thresSt, shiftSt, layoutSt, atIndex = 0) => {
|
|
32
30
|
const offset = _format.default.isMsLayout(layoutSt) ? msOffset() : niOffset(shiftSt, atIndex);
|
|
33
31
|
const peaks = (0, _chem.Convert2Peak)(feature, thresSt.value, offset);
|
|
34
32
|
const peaksEdit = (0, _converter.PksEdit)(peaks, editPeakSt);
|
|
35
33
|
return peaksEdit;
|
|
36
34
|
};
|
|
37
35
|
exports.extractPeaksEdit = extractPeaksEdit;
|
|
38
|
-
const extractAutoPeaks =
|
|
39
|
-
let atIndex = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 0;
|
|
36
|
+
const extractAutoPeaks = (feature, thresSt, shiftSt, layoutSt, atIndex = 0) => {
|
|
40
37
|
const offset = _format.default.isMsLayout(layoutSt) ? msOffset() : niOffset(shiftSt, atIndex);
|
|
41
38
|
const peaks = (0, _chem.Convert2Peak)(feature, thresSt.value, offset);
|
|
42
39
|
return peaks;
|
package/dist/helpers/format.js
CHANGED
|
@@ -149,8 +149,7 @@ const spectraOps = {
|
|
|
149
149
|
tail: '.'
|
|
150
150
|
}
|
|
151
151
|
};
|
|
152
|
-
const rmRef =
|
|
153
|
-
let atIndex = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
|
|
152
|
+
const rmRef = (peaks, shift, atIndex = 0) => {
|
|
154
153
|
if (!shift) return peaks;
|
|
155
154
|
const {
|
|
156
155
|
shifts
|
|
@@ -159,9 +158,7 @@ const rmRef = function (peaks, shift) {
|
|
|
159
158
|
const refValue = selectedShift.ref.value || selectedShift.peak.x;
|
|
160
159
|
return peaks.map(p => (0, _converter.IsSame)(p.x, refValue) ? null : p).filter(r => r != null);
|
|
161
160
|
};
|
|
162
|
-
const formatedMS =
|
|
163
|
-
let decimal = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 2;
|
|
164
|
-
let isAscend = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
|
|
161
|
+
const formatedMS = (peaks, maxY, decimal = 2, isAscend = true) => {
|
|
165
162
|
const ascendFunc = (a, b) => parseFloat(a) - parseFloat(b);
|
|
166
163
|
const descendFunc = (a, b) => parseFloat(b) - parseFloat(a);
|
|
167
164
|
const sortFunc = isAscend ? ascendFunc : descendFunc;
|
|
@@ -193,12 +190,7 @@ const emLevel = (boundary, val, lowerIsStronger) => {
|
|
|
193
190
|
if (ratio > 30) return 's';
|
|
194
191
|
return 'vs';
|
|
195
192
|
};
|
|
196
|
-
const formatedEm =
|
|
197
|
-
let decimal = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 2;
|
|
198
|
-
let isAscend = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
|
|
199
|
-
let isIntensity = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
|
|
200
|
-
let boundary = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : {};
|
|
201
|
-
let lowerIsStronger = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
|
|
193
|
+
const formatedEm = (peaks, maxY, decimal = 2, isAscend = true, isIntensity = false, boundary = {}, lowerIsStronger = false) => {
|
|
202
194
|
const ascendFunc = (a, b) => parseFloat(a) - parseFloat(b);
|
|
203
195
|
const descendFunc = (a, b) => parseFloat(b) - parseFloat(a);
|
|
204
196
|
const sortFunc = isAscend ? ascendFunc : descendFunc;
|
|
@@ -221,12 +213,7 @@ const formatedEm = function (peaks, maxY) {
|
|
|
221
213
|
}
|
|
222
214
|
return ordered.map(o => `${o.x}`).join(', ');
|
|
223
215
|
};
|
|
224
|
-
const formatedUvVis =
|
|
225
|
-
let decimal = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 2;
|
|
226
|
-
let isAscend = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
|
|
227
|
-
let isIntensity = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
|
|
228
|
-
let boundary = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : {};
|
|
229
|
-
let lowerIsStronger = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
|
|
216
|
+
const formatedUvVis = (peaks, maxY, decimal = 2, isAscend = true, isIntensity = false, boundary = {}, lowerIsStronger = false) => {
|
|
230
217
|
const ascendFunc = (a, b) => parseFloat(a) - parseFloat(b);
|
|
231
218
|
const descendFunc = (a, b) => parseFloat(b) - parseFloat(a);
|
|
232
219
|
const sortFunc = isAscend ? ascendFunc : descendFunc;
|
|
@@ -249,12 +236,7 @@ const formatedUvVis = function (peaks, maxY) {
|
|
|
249
236
|
// .join(', ');
|
|
250
237
|
return ordered.map(o => `${o.x}`).join(', ');
|
|
251
238
|
};
|
|
252
|
-
const formatedEmissions =
|
|
253
|
-
let decimal = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 2;
|
|
254
|
-
let isAscend = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
|
|
255
|
-
let isIntensity = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
|
|
256
|
-
let boundary = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : {};
|
|
257
|
-
let lowerIsStronger = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
|
|
239
|
+
const formatedEmissions = (peaks, maxY, decimal = 2, isAscend = true, isIntensity = false, boundary = {}, lowerIsStronger = false) => {
|
|
258
240
|
const ascendFunc = (a, b) => parseFloat(a) - parseFloat(b);
|
|
259
241
|
const descendFunc = (a, b) => parseFloat(b) - parseFloat(a);
|
|
260
242
|
const sortFunc = isAscend ? ascendFunc : descendFunc;
|
|
@@ -274,12 +256,7 @@ const formatedEmissions = function (peaks, maxY) {
|
|
|
274
256
|
}));
|
|
275
257
|
return ordered.map(o => `${o.x} nm (${fixDigit(o.y, 2)} a.u.)`).join(', ');
|
|
276
258
|
};
|
|
277
|
-
const formatedDLSIntensity =
|
|
278
|
-
let decimal = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 2;
|
|
279
|
-
let isAscend = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
|
|
280
|
-
let isIntensity = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
|
|
281
|
-
let boundary = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : {};
|
|
282
|
-
let lowerIsStronger = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
|
|
259
|
+
const formatedDLSIntensity = (peaks, maxY, decimal = 2, isAscend = true, isIntensity = false, boundary = {}, lowerIsStronger = false) => {
|
|
283
260
|
const ascendFunc = (a, b) => parseFloat(a) - parseFloat(b);
|
|
284
261
|
const descendFunc = (a, b) => parseFloat(b) - parseFloat(a);
|
|
285
262
|
const sortFunc = isAscend ? ascendFunc : descendFunc;
|
|
@@ -299,9 +276,7 @@ const formatedDLSIntensity = function (peaks, maxY) {
|
|
|
299
276
|
}));
|
|
300
277
|
return ordered.map(o => `${o.x} nm (${o.y} %)`).join(', ');
|
|
301
278
|
};
|
|
302
|
-
const formatedHplcUvVis =
|
|
303
|
-
let decimal = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 2;
|
|
304
|
-
let integration = arguments.length > 2 ? arguments[2] : undefined;
|
|
279
|
+
const formatedHplcUvVis = (peaks, decimal = 2, integration) => {
|
|
305
280
|
let stack = [];
|
|
306
281
|
if (integration) {
|
|
307
282
|
stack = integration.stack;
|
|
@@ -334,10 +309,7 @@ const formatedHplcUvVis = function (peaks) {
|
|
|
334
309
|
});
|
|
335
310
|
return arrResult.join(', ');
|
|
336
311
|
};
|
|
337
|
-
const formatedXRD =
|
|
338
|
-
let isAscend = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
|
|
339
|
-
let waveLength = arguments.length > 2 ? arguments[2] : undefined;
|
|
340
|
-
let temperature = arguments.length > 3 ? arguments[3] : undefined;
|
|
312
|
+
const formatedXRD = (peaks, isAscend = true, waveLength, temperature) => {
|
|
341
313
|
const ascendFunc = (a, b) => parseFloat(a) - parseFloat(b);
|
|
342
314
|
const descendFunc = (a, b) => parseFloat(b) - parseFloat(a);
|
|
343
315
|
const sortFunc = isAscend ? ascendFunc : descendFunc;
|
|
@@ -359,8 +331,7 @@ const formatedXRD = function (peaks) {
|
|
|
359
331
|
}));
|
|
360
332
|
return `(${XRDSource}, ${XRDWavelength}, ${temperature} °C), 2θ [°] (d [nm]): ${ordered.map(o => `${o.x} (${fixDigit(o.y, 2)})`).join(', ')}`;
|
|
361
333
|
};
|
|
362
|
-
const rmShiftFromPeaks =
|
|
363
|
-
let atIndex = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
|
|
334
|
+
const rmShiftFromPeaks = (peaks, shift, atIndex = 0) => {
|
|
364
335
|
const peaksXY = (0, _converter.ToXY)(peaks);
|
|
365
336
|
const {
|
|
366
337
|
shifts
|
|
@@ -383,20 +354,19 @@ const rmShiftFromPeaks = function (peaks, shift) {
|
|
|
383
354
|
}).filter(r => r != null);
|
|
384
355
|
return result;
|
|
385
356
|
};
|
|
386
|
-
const peaksBody =
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
|
|
399
|
-
} = _ref;
|
|
357
|
+
const peaksBody = ({
|
|
358
|
+
peaks,
|
|
359
|
+
layout,
|
|
360
|
+
decimal,
|
|
361
|
+
shift,
|
|
362
|
+
isAscend,
|
|
363
|
+
isIntensity = false,
|
|
364
|
+
boundary = {},
|
|
365
|
+
integration,
|
|
366
|
+
atIndex = 0,
|
|
367
|
+
waveLength,
|
|
368
|
+
temperature
|
|
369
|
+
}) => {
|
|
400
370
|
const result = rmShiftFromPeaks(peaks, shift, atIndex);
|
|
401
371
|
const ascendFunc = (a, b) => parseFloat(a.x) - parseFloat(b.x);
|
|
402
372
|
const descendFunc = (a, b) => parseFloat(b.x) - parseFloat(a.x);
|
|
@@ -429,8 +399,7 @@ const peaksBody = _ref => {
|
|
|
429
399
|
}
|
|
430
400
|
return ordered.map(o => fixDigit(o.x, decimal)).join(', ');
|
|
431
401
|
};
|
|
432
|
-
const peaksWrapper =
|
|
433
|
-
let atIndex = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
|
|
402
|
+
const peaksWrapper = (layout, shift, atIndex = 0) => {
|
|
434
403
|
let solvTxt = '';
|
|
435
404
|
const {
|
|
436
405
|
shifts
|
|
@@ -494,8 +463,7 @@ const getNmrTyp = layout => {
|
|
|
494
463
|
return '';
|
|
495
464
|
}
|
|
496
465
|
};
|
|
497
|
-
const formatPeaksByPrediction =
|
|
498
|
-
let predictions = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : [];
|
|
466
|
+
const formatPeaksByPrediction = (peaks, layout, isAscend, decimal, predictions = []) => {
|
|
499
467
|
const pDict = {};
|
|
500
468
|
peaks.forEach(p => {
|
|
501
469
|
pDict[p.x.toFixed(decimal)] = 0;
|
|
@@ -524,16 +492,14 @@ const formatPeaksByPrediction = function (peaks, layout, isAscend, decimal) {
|
|
|
524
492
|
return body;
|
|
525
493
|
};
|
|
526
494
|
const compareColors = idx => ['#ABB2B9', '#EDBB99', '#ABEBC6', '#D2B4DE', '#F9E79F'][idx % 5];
|
|
527
|
-
const mutiEntitiesColors = idx => ['#
|
|
528
|
-
const strNumberFixedDecimal =
|
|
529
|
-
let decimal = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : -1;
|
|
495
|
+
const mutiEntitiesColors = idx => ['#2980b9', '#e4b423', '#8e44ad', '#2c3e50', '#6D214F', '#182C61', '#BDC581'][idx % 7];
|
|
496
|
+
const strNumberFixedDecimal = (number, decimal = -1) => {
|
|
530
497
|
if (decimal <= 0) {
|
|
531
498
|
return `${number}`;
|
|
532
499
|
}
|
|
533
500
|
return number.toFixed(Math.max(decimal, (number.toString().split('.')[1] || []).length));
|
|
534
501
|
};
|
|
535
|
-
const strNumberFixedLength =
|
|
536
|
-
let maxLength = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : -1;
|
|
502
|
+
const strNumberFixedLength = (number, maxLength = -1) => {
|
|
537
503
|
if (maxLength <= 0) {
|
|
538
504
|
return `${number}`;
|
|
539
505
|
}
|
|
@@ -550,8 +516,7 @@ const strNumberFixedLength = function (number) {
|
|
|
550
516
|
|
|
551
517
|
return number.toFixed(lengthToFix);
|
|
552
518
|
};
|
|
553
|
-
const inlineNotation =
|
|
554
|
-
let sampleName = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
|
|
519
|
+
const inlineNotation = (layout, data, sampleName = '') => {
|
|
555
520
|
let formattedString = '';
|
|
556
521
|
let quillData = [];
|
|
557
522
|
const {
|