diff --git a/dist/actions/manager.js b/dist/actions/manager.js
index 0033d319..f2effe9c 100644
--- a/dist/actions/manager.js
+++ b/dist/actions/manager.js
@@ -3,7 +3,7 @@
Object.defineProperty(exports, "__esModule", {
value: true
});
-exports.resetInitNmr = exports.resetInitMs = exports.resetInitCommonWithIntergation = exports.resetInitCommon = exports.resetDetector = exports.resetAll = void 0;
+exports.resetMultiplicity = exports.resetInitNmr = exports.resetInitMs = exports.resetInitCommonWithIntergation = exports.resetInitCommon = exports.resetDetector = exports.resetAll = void 0;
var _action_type = require("../constants/action_type");
const resetAll = payload => ({
type: _action_type.MANAGER.RESETALL,
@@ -33,6 +33,10 @@ exports.resetInitCommonWithIntergation = resetInitCommonWithIntergation;
const resetDetector = () => ({
type: _action_type.MANAGER.RESET_DETECTOR
});
+exports.resetDetector = resetDetector;
+const resetMultiplicity = () => ({
+ type: _action_type.MANAGER.RESET_MULTIPLICITY
+});
// eslint-disable-line
-exports.resetDetector = resetDetector;
\ No newline at end of file
+exports.resetMultiplicity = resetMultiplicity;
\ No newline at end of file
diff --git a/dist/actions/ui.js b/dist/actions/ui.js
index 52dc1ad0..aaa15a98 100644
--- a/dist/actions/ui.js
+++ b/dist/actions/ui.js
@@ -10,14 +10,11 @@ const setUiViewerType = payload => ({
payload
});
exports.setUiViewerType = setUiViewerType;
-const setUiSweepType = function (payload) {
- let jcampIdx = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
- return {
- type: _action_type.UI.SWEEP.SET_TYPE,
- payload,
- jcampIdx
- };
-};
+const setUiSweepType = (payload, jcampIdx = 0) => ({
+ type: _action_type.UI.SWEEP.SET_TYPE,
+ payload,
+ jcampIdx
+});
exports.setUiSweepType = setUiSweepType;
const selectUiSweep = payload => ({
type: _action_type.UI.SWEEP.SELECT,
@@ -29,17 +26,12 @@ const scrollUiWheel = payload => ({
payload
});
exports.scrollUiWheel = scrollUiWheel;
-const clickUiTarget = function (payload, onPeak) {
- let voltammetryPeakIdx = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
- let jcampIdx = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
- let onPecker = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
- return {
- type: _action_type.UI.CLICK_TARGET,
- payload,
- onPeak,
- voltammetryPeakIdx,
- jcampIdx,
- onPecker
- };
-};
+const clickUiTarget = (payload, onPeak, voltammetryPeakIdx = 0, jcampIdx = 0, onPecker = false) => ({
+ type: _action_type.UI.CLICK_TARGET,
+ payload,
+ onPeak,
+ voltammetryPeakIdx,
+ jcampIdx,
+ onPecker
+});
exports.clickUiTarget = clickUiTarget;
\ No newline at end of file
diff --git a/dist/app.js b/dist/app.js
index 50530991..a6bd495c 100644
--- a/dist/app.js
+++ b/dist/app.js
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
});
Object.defineProperty(exports, "FN", {
enumerable: true,
- get: function () {
+ get: function get() {
return _fn.default;
}
});
@@ -22,6 +22,7 @@ var _index = _interopRequireDefault(require("./reducers/index"));
var _index2 = _interopRequireDefault(require("./sagas/index"));
var _layer_init = _interopRequireDefault(require("./layer_init"));
var _fn = _interopRequireDefault(require("./fn"));
+var _jsxRuntime = require("react/jsx-runtime");
/* eslint-disable react/function-component-definition, react/require-default-props */
// eslint-disable-line
@@ -44,50 +45,49 @@ const ensureQuillDelta = descs => {
};
// - - - React - - -
-const SpectraEditor = _ref => {
- let {
- entity,
- others,
- cLabel,
- xLabel,
- yLabel,
- operations,
- forecast,
- molSvg,
- editorOnly,
- descriptions,
- exactMass,
- canChangeDescription,
- onDescriptionChanged,
- multiEntities,
- multiMolSvgs,
- entityFileNames,
- userManualLink
- } = _ref;
- return /*#__PURE__*/_react.default.createElement(_reactRedux.Provider, {
- store: store
- }, /*#__PURE__*/_react.default.createElement(_material.StyledEngineProvider, {
- injectFirst: true
- }, /*#__PURE__*/_react.default.createElement(_layer_init.default, {
- entity: entity,
- multiEntities: multiEntities,
- entityFileNames: entityFileNames,
- userManualLink: userManualLink,
- others: others,
- cLabel: cLabel,
- xLabel: xLabel,
- yLabel: yLabel,
- forecast: forecast,
- operations: operations,
- descriptions: ensureQuillDelta(descriptions),
- molSvg: molSvg,
- multiMolSvgs: multiMolSvgs,
- editorOnly: editorOnly,
- exactMass: exactMass,
- canChangeDescription: canChangeDescription,
- onDescriptionChanged: onDescriptionChanged
- })));
-};
+const SpectraEditor = ({
+ entity,
+ others,
+ cLabel,
+ xLabel,
+ yLabel,
+ operations,
+ forecast,
+ molSvg,
+ editorOnly,
+ descriptions,
+ exactMass,
+ canChangeDescription,
+ onDescriptionChanged,
+ multiEntities,
+ multiMolSvgs,
+ entityFileNames,
+ userManualLink
+}) => /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactRedux.Provider, {
+ store: store,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.StyledEngineProvider, {
+ injectFirst: true,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_layer_init.default, {
+ entity: entity,
+ multiEntities: multiEntities,
+ entityFileNames: entityFileNames,
+ userManualLink: userManualLink,
+ others: others,
+ cLabel: cLabel,
+ xLabel: xLabel,
+ yLabel: yLabel,
+ forecast: forecast,
+ operations: operations,
+ descriptions: ensureQuillDelta(descriptions),
+ molSvg: molSvg,
+ multiMolSvgs: multiMolSvgs,
+ editorOnly: editorOnly,
+ exactMass: exactMass,
+ canChangeDescription: canChangeDescription,
+ onDescriptionChanged: onDescriptionChanged
+ })
+ })
+});
exports.SpectraEditor = SpectraEditor;
SpectraEditor.propTypes = {
entity: _propTypes.default.object.isRequired,
diff --git a/dist/components/cmd_bar/01_viewer.js b/dist/components/cmd_bar/01_viewer.js
index ed017099..637df919 100644
--- a/dist/components/cmd_bar/01_viewer.js
+++ b/dist/components/cmd_bar/01_viewer.js
@@ -18,43 +18,50 @@ var _ui = require("../../actions/ui");
var _cfg = _interopRequireDefault(require("../../helpers/cfg"));
var _common = require("./common");
var _list_ui = require("../../constants/list_ui");
+var _jsxRuntime = require("react/jsx-runtime");
/* eslint-disable prefer-object-spread, react/function-component-definition */
const styles = () => Object.assign({}, _common.commonStyle);
-const Viewer = _ref => {
- let {
- classes,
- isfocusSpectrumSt,
- isfocusAnalysisSt,
- hideCmdAnaViewerSt,
- disableCmdAnaViewerSt,
- setUiViewerTypeAct
- } = _ref;
+const Viewer = ({
+ classes,
+ isfocusSpectrumSt,
+ isfocusAnalysisSt,
+ hideCmdAnaViewerSt,
+ disableCmdAnaViewerSt,
+ setUiViewerTypeAct
+}) => {
const onViewSpectrum = () => setUiViewerTypeAct(_list_ui.LIST_UI_VIEWER_TYPE.SPECTRUM);
const onViewAnalysis = () => setUiViewerTypeAct(_list_ui.LIST_UI_VIEWER_TYPE.ANALYSIS);
- return /*#__PURE__*/_react.default.createElement("span", {
+ return /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
className: classes.group,
- "data-testid": "Viewer"
- }, /*#__PURE__*/_react.default.createElement(_Tooltip.default, {
- title: /*#__PURE__*/_react.default.createElement("span", {
- className: "txt-sv-tp"
- }, "Spectrum Viewer")
- }, /*#__PURE__*/_react.default.createElement(_common.MuButton, {
- className: (0, _classnames.default)((0, _common.focusStyle)(isfocusSpectrumSt, classes), 'btn-sv-bar-spctrum'),
- onClick: onViewSpectrum
- }, /*#__PURE__*/_react.default.createElement(_TimelineOutlined.default, {
- className: classes.icon
- }))), hideCmdAnaViewerSt ? null : /*#__PURE__*/_react.default.createElement(_Tooltip.default, {
- title: /*#__PURE__*/_react.default.createElement("span", {
- className: "txt-sv-tp"
- }, "Analysis Viewer")
- }, /*#__PURE__*/_react.default.createElement(_common.MuButton, {
- className: (0, _classnames.default)((0, _common.focusStyle)(isfocusAnalysisSt, classes), 'btn-sv-bar-analysis'),
- disabled: disableCmdAnaViewerSt,
- onClick: onViewAnalysis
- }, /*#__PURE__*/_react.default.createElement(_SpellcheckOutlined.default, {
- className: classes.icon
- }))));
+ "data-testid": "Viewer",
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Tooltip.default, {
+ title: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: "txt-sv-tp",
+ children: "Spectrum Viewer"
+ }),
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_common.MuButton, {
+ className: (0, _classnames.default)((0, _common.focusStyle)(isfocusSpectrumSt, classes), 'btn-sv-bar-spctrum'),
+ onClick: onViewSpectrum,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_TimelineOutlined.default, {
+ className: classes.icon
+ })
+ })
+ }), hideCmdAnaViewerSt ? null : /*#__PURE__*/(0, _jsxRuntime.jsx)(_Tooltip.default, {
+ title: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: "txt-sv-tp",
+ children: "Analysis Viewer"
+ }),
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_common.MuButton, {
+ className: (0, _classnames.default)((0, _common.focusStyle)(isfocusAnalysisSt, classes), 'btn-sv-bar-analysis'),
+ disabled: disableCmdAnaViewerSt,
+ onClick: onViewAnalysis,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_SpellcheckOutlined.default, {
+ className: classes.icon
+ })
+ })
+ })]
+ });
};
const mapStateToProps = (state, props) => (
// eslint-disable-line
diff --git a/dist/components/cmd_bar/02_zoom.js b/dist/components/cmd_bar/02_zoom.js
index f615d3b3..23da89a7 100644
--- a/dist/components/cmd_bar/02_zoom.js
+++ b/dist/components/cmd_bar/02_zoom.js
@@ -17,39 +17,46 @@ var _Tooltip = _interopRequireDefault(require("@mui/material/Tooltip"));
var _ui = require("../../actions/ui");
var _common = require("./common");
var _list_ui = require("../../constants/list_ui");
+var _jsxRuntime = require("react/jsx-runtime");
/* eslint-disable prefer-object-spread, react/function-component-definition */
const styles = () => Object.assign({}, _common.commonStyle);
-const Zoom = _ref => {
- let {
- classes,
- isfocusZoomSt,
- setUiSweepTypeAct
- } = _ref;
+const Zoom = ({
+ classes,
+ isfocusZoomSt,
+ setUiSweepTypeAct
+}) => {
const onSweepZoomIn = () => setUiSweepTypeAct(_list_ui.LIST_UI_SWEEP_TYPE.ZOOMIN);
const onSweepZoomReset = () => setUiSweepTypeAct(_list_ui.LIST_UI_SWEEP_TYPE.ZOOMRESET);
- return /*#__PURE__*/_react.default.createElement("span", {
+ return /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
className: classes.group,
- "data-testid": "Zoom"
- }, /*#__PURE__*/_react.default.createElement(_Tooltip.default, {
- title: /*#__PURE__*/_react.default.createElement("span", {
- className: "txt-sv-tp"
- }, "Zoom In")
- }, /*#__PURE__*/_react.default.createElement(_common.MuButton, {
- className: (0, _classnames.default)((0, _common.focusStyle)(isfocusZoomSt, classes), 'btn-sv-bar-zoomin'),
- onClick: onSweepZoomIn
- }, /*#__PURE__*/_react.default.createElement(_ZoomInOutlined.default, {
- className: (0, _classnames.default)(classes.icon, classes.iconWp)
- }))), /*#__PURE__*/_react.default.createElement(_Tooltip.default, {
- title: /*#__PURE__*/_react.default.createElement("span", {
- className: "txt-sv-tp"
- }, "Reset Zoom")
- }, /*#__PURE__*/_react.default.createElement(_common.MuButton, {
- className: (0, _classnames.default)('btn-sv-bar-zoomreset'),
- onClick: onSweepZoomReset
- }, /*#__PURE__*/_react.default.createElement(_FindReplaceOutlined.default, {
- className: classes.icon
- }))));
+ "data-testid": "Zoom",
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Tooltip.default, {
+ title: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: "txt-sv-tp",
+ children: "Zoom In"
+ }),
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_common.MuButton, {
+ className: (0, _classnames.default)((0, _common.focusStyle)(isfocusZoomSt, classes), 'btn-sv-bar-zoomin'),
+ onClick: onSweepZoomIn,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_ZoomInOutlined.default, {
+ className: (0, _classnames.default)(classes.icon, classes.iconWp)
+ })
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Tooltip.default, {
+ title: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: "txt-sv-tp",
+ children: "Reset Zoom"
+ }),
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_common.MuButton, {
+ className: (0, _classnames.default)('btn-sv-bar-zoomreset'),
+ onClick: onSweepZoomReset,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_FindReplaceOutlined.default, {
+ className: classes.icon
+ })
+ })
+ })]
+ });
};
const mapStateToProps = (state, _) => (
// eslint-disable-line
diff --git a/dist/components/cmd_bar/03_peak.js b/dist/components/cmd_bar/03_peak.js
index baa9d3a9..ea2777d2 100644
--- a/dist/components/cmd_bar/03_peak.js
+++ b/dist/components/cmd_bar/03_peak.js
@@ -20,31 +20,31 @@ var _list_ui = require("../../constants/list_ui");
var _tri_btn = _interopRequireDefault(require("./tri_btn"));
var _edit_peak = require("../../actions/edit_peak");
var _extractPeaksEdit = require("../../helpers/extractPeaksEdit");
+var _jsxRuntime = require("react/jsx-runtime");
/* eslint-disable prefer-object-spread, function-paren-newline, no-unused-vars,
react/function-component-definition, react/require-default-props, max-len,
react/no-unused-prop-types */
const styles = () => Object.assign({}, _common.commonStyle);
-const Peak = _ref => {
- let {
- classes,
- setUiSweepTypeAct,
- isFocusAddPeakSt,
- disableAddPeakSt,
- isFocusRmPeakSt,
- disableRmPeakSt,
- isFocusSetRefSt,
- disableSetRefSt,
- isHandleMaxAndMinPeaksSt,
- cyclicVotaSt,
- curveSt,
- clearAllPeaksAct,
- feature,
- editPeakSt,
- thresSt,
- shiftSt,
- layoutSt
- } = _ref;
+const Peak = ({
+ classes,
+ setUiSweepTypeAct,
+ isFocusAddPeakSt,
+ disableAddPeakSt,
+ isFocusRmPeakSt,
+ disableRmPeakSt,
+ isFocusSetRefSt,
+ disableSetRefSt,
+ isHandleMaxAndMinPeaksSt,
+ cyclicVotaSt,
+ curveSt,
+ clearAllPeaksAct,
+ feature,
+ editPeakSt,
+ thresSt,
+ shiftSt,
+ layoutSt
+}) => {
let onSweepPeakAdd = () => setUiSweepTypeAct(_list_ui.LIST_UI_SWEEP_TYPE.PEAK_ADD);
let onSweepPeakDELETE = () => setUiSweepTypeAct(_list_ui.LIST_UI_SWEEP_TYPE.PEAK_DELETE);
let onSweepAnchorShift = () => setUiSweepTypeAct(_list_ui.LIST_UI_SWEEP_TYPE.ANCHOR_SHIFT);
@@ -77,50 +77,71 @@ const Peak = _ref => {
onSweepAnchorShift = () => setUiSweepTypeAct(_list_ui.LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_SET_REF, curveIdx);
}
}
- return /*#__PURE__*/_react.default.createElement("span", {
+ return /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
className: classes.group,
- "data-testid": "Peak"
- }, /*#__PURE__*/_react.default.createElement(_Tooltip.default, {
- title: /*#__PURE__*/_react.default.createElement("span", {
- className: "txt-sv-tp"
- }, "Add Peak")
- }, /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement(_common.MuButton, {
- className: (0, _classnames.default)((0, _common.focusStyle)(isFocusAddPeakSt, classes), 'btn-sv-bar-addpeak'),
- disabled: disableAddPeakSt,
- onClick: onSweepPeakAdd
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txt, 'txt-sv-bar-addpeak')
- }, "P+")))), /*#__PURE__*/_react.default.createElement(_Tooltip.default, {
- title: /*#__PURE__*/_react.default.createElement("span", {
- className: "txt-sv-tp"
- }, "Remove Peak")
- }, /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement(_common.MuButton, {
- className: (0, _classnames.default)((0, _common.focusStyle)(isFocusRmPeakSt, classes), 'btn-sv-bar-rmpeak'),
- disabled: disableRmPeakSt,
- onClick: onSweepPeakDELETE
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txt, 'txt-sv-bar-rmpeak')
- }, "P-")))), /*#__PURE__*/_react.default.createElement(_tri_btn.default, {
- content: {
- tp: 'Clear All Peaks'
- },
- cb: onClearAll,
- isClearAllDisabled: disableRmPeakSt
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txt, 'txt-sv-bar-rmallpeaks')
- }, "P"), /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txt, classes.txtIcon, 'txt-sv-bar-rmallpeaks')
- }, "x")), !disableSetRefSt ? /*#__PURE__*/_react.default.createElement(_Tooltip.default, {
- title: /*#__PURE__*/_react.default.createElement("span", {
- className: "txt-sv-tp"
- }, "Set Reference")
- }, /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement(_common.MuButton, {
- className: (0, _classnames.default)((0, _common.focusStyle)(isFocusSetRefSt, classes), 'btn-sv-bar-setref'),
- disabled: disableSetRefSt,
- onClick: onSweepAnchorShift
- }, /*#__PURE__*/_react.default.createElement(_AddLocationOutlined.default, {
- className: classes.icon
- })))) : null);
+ "data-testid": "Peak",
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Tooltip.default, {
+ title: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: "txt-sv-tp",
+ children: "Add Peak"
+ }),
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_common.MuButton, {
+ className: (0, _classnames.default)((0, _common.focusStyle)(isFocusAddPeakSt, classes), 'btn-sv-bar-addpeak'),
+ disabled: disableAddPeakSt,
+ onClick: onSweepPeakAdd,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txt, 'txt-sv-bar-addpeak'),
+ children: "P+"
+ })
+ })
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Tooltip.default, {
+ title: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: "txt-sv-tp",
+ children: "Remove Peak"
+ }),
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_common.MuButton, {
+ className: (0, _classnames.default)((0, _common.focusStyle)(isFocusRmPeakSt, classes), 'btn-sv-bar-rmpeak'),
+ disabled: disableRmPeakSt,
+ onClick: onSweepPeakDELETE,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txt, 'txt-sv-bar-rmpeak'),
+ children: "P-"
+ })
+ })
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_tri_btn.default, {
+ content: {
+ tp: 'Clear All Peaks'
+ },
+ cb: onClearAll,
+ isClearAllDisabled: disableRmPeakSt,
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txt, 'txt-sv-bar-rmallpeaks'),
+ children: "P"
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txt, classes.txtIcon, 'txt-sv-bar-rmallpeaks'),
+ children: "x"
+ })]
+ }), !disableSetRefSt ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_Tooltip.default, {
+ title: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: "txt-sv-tp",
+ children: "Set Reference"
+ }),
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_common.MuButton, {
+ className: (0, _classnames.default)((0, _common.focusStyle)(isFocusSetRefSt, classes), 'btn-sv-bar-setref'),
+ disabled: disableSetRefSt,
+ onClick: onSweepAnchorShift,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_AddLocationOutlined.default, {
+ className: classes.icon
+ })
+ })
+ })
+ }) : null]
+ });
};
const mapStateToProps = (state, props) => (
// eslint-disable-line
diff --git a/dist/components/cmd_bar/04_integration.js b/dist/components/cmd_bar/04_integration.js
index 17a1f33d..2152a917 100644
--- a/dist/components/cmd_bar/04_integration.js
+++ b/dist/components/cmd_bar/04_integration.js
@@ -22,6 +22,7 @@ var _cfg = _interopRequireDefault(require("../../helpers/cfg"));
var _tri_btn = _interopRequireDefault(require("./tri_btn"));
var _common = require("./common");
var _format = _interopRequireDefault(require("../../helpers/format"));
+var _jsxRuntime = require("react/jsx-runtime");
/* eslint-disable prefer-object-spread, function-paren-newline,
react/function-component-definition, react/require-default-props, max-len,
react/no-unused-prop-types */
@@ -57,7 +58,7 @@ const setFactor = (classes, isDisable, integrationSt, setIntegrationFkrAct, curv
const selectedIntegration = integrations[curveIdx];
refFactor = selectedIntegration.refFactor || 1.00;
}
- return /*#__PURE__*/_react.default.createElement(_TextField.default, {
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)(_TextField.default, {
className: classes.field,
disabled: isDisable,
id: "intg-factor-name",
@@ -67,9 +68,10 @@ const setFactor = (classes, isDisable, integrationSt, setIntegrationFkrAct, curv
InputProps: {
className: (0, _classnames.default)(classes.txtInput, 'txtfield-sv-bar-input')
},
- label: /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txtLabel, 'txtfield-sv-bar-label')
- }, "Ref Area"),
+ label: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txtLabel, 'txtfield-sv-bar-label'),
+ children: "Ref Area"
+ }),
onChange: onFactorChanged,
onBlur: onFactorChanged,
onKeyUp: onEnterPress,
@@ -77,20 +79,19 @@ const setFactor = (classes, isDisable, integrationSt, setIntegrationFkrAct, curv
});
};
const iconColor = criteria => criteria ? '#fff' : '#000';
-const Integration = _ref => {
- let {
- classes,
- ignoreRef,
- isDisableSt,
- isFocusAddIntgSt,
- isFocusRmIntgSt,
- isFocusSetRefSt,
- setUiSweepTypeAct,
- setIntegrationFkrAct,
- clearIntegrationAllAct,
- curveSt,
- integrationSt
- } = _ref;
+const Integration = ({
+ classes,
+ ignoreRef,
+ isDisableSt,
+ isFocusAddIntgSt,
+ isFocusRmIntgSt,
+ isFocusSetRefSt,
+ setUiSweepTypeAct,
+ setIntegrationFkrAct,
+ clearIntegrationAllAct,
+ curveSt,
+ integrationSt
+}) => {
const onSweepIntegtAdd = () => setUiSweepTypeAct(_list_ui.LIST_UI_SWEEP_TYPE.INTEGRATION_ADD);
const onSweepIntegtRm = () => setUiSweepTypeAct(_list_ui.LIST_UI_SWEEP_TYPE.INTEGRATION_RM);
const onSweepIntegtSR = () => setUiSweepTypeAct(_list_ui.LIST_UI_SWEEP_TYPE.INTEGRATION_SET_REF);
@@ -100,64 +101,84 @@ const Integration = _ref => {
const onClearAll = () => clearIntegrationAllAct({
curveIdx
});
- return /*#__PURE__*/_react.default.createElement("span", {
- className: classes.group
- }, /*#__PURE__*/_react.default.createElement(_Tooltip.default, {
- title: /*#__PURE__*/_react.default.createElement("span", {
- className: "txt-sv-tp"
- }, "Add Integration")
- }, /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement(_common.MuButton, {
- className: (0, _classnames.default)((0, _common.focusStyle)(isFocusAddIntgSt, classes), 'btn-add-inter'),
- disabled: isDisableSt,
- onClick: onSweepIntegtAdd
- }, /*#__PURE__*/_react.default.createElement(_react2.default, {
- path: _js.mdiMathIntegral,
- size: iconSize,
- color: iconColor(isFocusAddIntgSt || isDisableSt),
- className: (0, _classnames.default)(classes.iconMdi, 'icon-sv-bar-addint')
- }), /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txt, classes.txtIcon, 'txt-sv-bar-addint')
- }, "+")))), /*#__PURE__*/_react.default.createElement(_Tooltip.default, {
- title: /*#__PURE__*/_react.default.createElement("span", {
- className: "txt-sv-tp"
- }, "Remove Integration")
- }, /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement(_common.MuButton, {
- className: (0, _classnames.default)((0, _common.focusStyle)(isFocusRmIntgSt, classes), 'btn-remove-inter'),
- disabled: isDisableSt,
- onClick: onSweepIntegtRm
- }, /*#__PURE__*/_react.default.createElement(_react2.default, {
- path: _js.mdiMathIntegral,
- size: iconSize,
- color: iconColor(isFocusRmIntgSt || isDisableSt),
- className: (0, _classnames.default)(classes.iconMdi, 'icon-sv-bar-rmint')
- }), /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txt, classes.txtIcon, 'txt-sv-bar-rmint')
- }, "-")))), /*#__PURE__*/_react.default.createElement(_Tooltip.default, {
- title: /*#__PURE__*/_react.default.createElement("span", {
- className: "txt-sv-tp"
- }, "Set Integration Reference")
- }, /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement(_common.MuButton, {
- className: (0, _classnames.default)((0, _common.focusStyle)(isFocusSetRefSt, classes), 'btn-set-inter-ref'),
- disabled: isDisableSt,
- onClick: onSweepIntegtSR
- }, /*#__PURE__*/_react.default.createElement(_react2.default, {
- path: _js.mdiReflectVertical,
- size: iconSize,
- color: iconColor(isFocusSetRefSt || isDisableSt),
- className: (0, _classnames.default)(classes.iconMdi, 'icon-sv-bar-refint')
- })))), !ignoreRef ? setFactor(classes, isDisableSt, integrationSt, setIntegrationFkrAct, curveIdx) : null, /*#__PURE__*/_react.default.createElement(_tri_btn.default, {
- content: {
- tp: 'Clear All Integration'
- },
- cb: onClearAll
- }, /*#__PURE__*/_react.default.createElement(_react2.default, {
- path: _js.mdiMathIntegral,
- size: iconSize,
- color: iconColor(isDisableSt),
- className: (0, _classnames.default)(classes.iconMdi, 'icon-sv-bar-rmallint')
- }), /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txt, classes.txtIcon, 'txt-sv-bar-rmallint')
- }, "x")));
+ return /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
+ className: classes.group,
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Tooltip.default, {
+ title: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: "txt-sv-tp",
+ children: "Add Integration"
+ }),
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_common.MuButton, {
+ className: (0, _classnames.default)((0, _common.focusStyle)(isFocusAddIntgSt, classes), 'btn-add-inter'),
+ disabled: isDisableSt,
+ onClick: onSweepIntegtAdd,
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_react2.default, {
+ path: _js.mdiMathIntegral,
+ size: iconSize,
+ color: iconColor(isFocusAddIntgSt || isDisableSt),
+ className: (0, _classnames.default)(classes.iconMdi, 'icon-sv-bar-addint')
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txt, classes.txtIcon, 'txt-sv-bar-addint'),
+ children: "+"
+ })]
+ })
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Tooltip.default, {
+ title: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: "txt-sv-tp",
+ children: "Remove Integration"
+ }),
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_common.MuButton, {
+ className: (0, _classnames.default)((0, _common.focusStyle)(isFocusRmIntgSt, classes), 'btn-remove-inter'),
+ disabled: isDisableSt,
+ onClick: onSweepIntegtRm,
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_react2.default, {
+ path: _js.mdiMathIntegral,
+ size: iconSize,
+ color: iconColor(isFocusRmIntgSt || isDisableSt),
+ className: (0, _classnames.default)(classes.iconMdi, 'icon-sv-bar-rmint')
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txt, classes.txtIcon, 'txt-sv-bar-rmint'),
+ children: "-"
+ })]
+ })
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Tooltip.default, {
+ title: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: "txt-sv-tp",
+ children: "Set Integration Reference"
+ }),
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_common.MuButton, {
+ className: (0, _classnames.default)((0, _common.focusStyle)(isFocusSetRefSt, classes), 'btn-set-inter-ref'),
+ disabled: isDisableSt,
+ onClick: onSweepIntegtSR,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_react2.default, {
+ path: _js.mdiReflectVertical,
+ size: iconSize,
+ color: iconColor(isFocusSetRefSt || isDisableSt),
+ className: (0, _classnames.default)(classes.iconMdi, 'icon-sv-bar-refint')
+ })
+ })
+ })
+ }), !ignoreRef ? setFactor(classes, isDisableSt, integrationSt, setIntegrationFkrAct, curveIdx) : null, /*#__PURE__*/(0, _jsxRuntime.jsxs)(_tri_btn.default, {
+ content: {
+ tp: 'Clear All Integration'
+ },
+ cb: onClearAll,
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_react2.default, {
+ path: _js.mdiMathIntegral,
+ size: iconSize,
+ color: iconColor(isDisableSt),
+ className: (0, _classnames.default)(classes.iconMdi, 'icon-sv-bar-rmallint')
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txt, classes.txtIcon, 'txt-sv-bar-rmallint'),
+ children: "x"
+ })]
+ })]
+ });
};
const mapStateToProps = (state, props) => (
// eslint-disable-line
diff --git a/dist/components/cmd_bar/05_multiplicity.js b/dist/components/cmd_bar/05_multiplicity.js
index bc88bf01..c725320e 100644
--- a/dist/components/cmd_bar/05_multiplicity.js
+++ b/dist/components/cmd_bar/05_multiplicity.js
@@ -18,25 +18,25 @@ var _list_ui = require("../../constants/list_ui");
var _cfg = _interopRequireDefault(require("../../helpers/cfg"));
var _tri_btn = _interopRequireDefault(require("./tri_btn"));
var _common = require("./common");
+var _jsxRuntime = require("react/jsx-runtime");
/* eslint-disable prefer-object-spread, function-paren-newline,
react/function-component-definition, react/require-default-props, max-len,
react/no-unused-prop-types */
const styles = () => Object.assign({}, _common.commonStyle);
-const Multiplicity = _ref => {
- let {
- classes,
- isFocusAddMpySt,
- disableAddMpySt,
- isFocusRmMpySt,
- disableRmMpySt,
- isFocusAddPeakSt,
- isFocusRmPeakSt,
- disableMpyPeakSt,
- setUiSweepTypeAct,
- clearMpyAllAct,
- curveSt
- } = _ref;
+const Multiplicity = ({
+ classes,
+ isFocusAddMpySt,
+ disableAddMpySt,
+ isFocusRmMpySt,
+ disableRmMpySt,
+ isFocusAddPeakSt,
+ isFocusRmPeakSt,
+ disableMpyPeakSt,
+ setUiSweepTypeAct,
+ clearMpyAllAct,
+ curveSt
+}) => {
const onSweepMutAdd = () => setUiSweepTypeAct(_list_ui.LIST_UI_SWEEP_TYPE.MULTIPLICITY_SWEEP_ADD);
const onOneMutAdd = () => setUiSweepTypeAct(_list_ui.LIST_UI_SWEEP_TYPE.MULTIPLICITY_ONE_RM);
const onPeakMutAdd = () => setUiSweepTypeAct(_list_ui.LIST_UI_SWEEP_TYPE.MULTIPLICITY_PEAK_ADD);
@@ -47,59 +47,86 @@ const Multiplicity = _ref => {
const onClearAll = () => clearMpyAllAct({
curveIdx
});
- return /*#__PURE__*/_react.default.createElement("span", {
- className: classes.group
- }, /*#__PURE__*/_react.default.createElement(_Tooltip.default, {
- title: /*#__PURE__*/_react.default.createElement("span", {
- className: "txt-sv-tp"
- }, "Add Multiplicity")
- }, /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement(_common.MuButton, {
- className: (0, _classnames.default)((0, _common.focusStyle)(isFocusAddMpySt, classes), 'btn-sv-bar-addmpy'),
- disabled: disableAddMpySt,
- onClick: onSweepMutAdd
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txt, 'txt-sv-bar-addmpy')
- }, "J+")))), /*#__PURE__*/_react.default.createElement(_Tooltip.default, {
- title: /*#__PURE__*/_react.default.createElement("span", {
- className: "txt-sv-tp"
- }, "Remove Multiplicity")
- }, /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement(_common.MuButton, {
- className: (0, _classnames.default)((0, _common.focusStyle)(isFocusRmMpySt, classes), 'btn-sv-bar-rmmpy'),
- disabled: disableRmMpySt,
- onClick: onOneMutAdd
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txt, 'txt-sv-bar-rmmpy')
- }, "J-")))), /*#__PURE__*/_react.default.createElement(_Tooltip.default, {
- title: /*#__PURE__*/_react.default.createElement("span", {
- className: "txt-sv-tp"
- }, "Add Peak for Multiplicity")
- }, /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement(_common.MuButton, {
- className: (0, _classnames.default)((0, _common.focusStyle)(isFocusAddPeakSt, classes), 'btn-sv-bar-addpeakmpy'),
- disabled: disableMpyPeakSt,
- onClick: onPeakMutAdd
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txt, 'txt-sv-bar-addpeakmpy')
- }, "JP+")))), /*#__PURE__*/_react.default.createElement(_Tooltip.default, {
- title: /*#__PURE__*/_react.default.createElement("span", {
- className: "txt-sv-tp"
- }, "Remove Peak for Multiplicity")
- }, /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement(_common.MuButton, {
- className: (0, _classnames.default)((0, _common.focusStyle)(isFocusRmPeakSt, classes), 'btn-sv-bar-rmpeakmpy'),
- disabled: disableMpyPeakSt,
- onClick: onPeakMutRm
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txt, 'txt-sv-bar-rmpeakmpy')
- }, "JP-")))), disableAddMpySt ? null :
- /*#__PURE__*/
- // eslint-disable-line
- _react.default.createElement(_tri_btn.default, {
- content: {
- tp: 'Clear All Multiplicity'
- },
- cb: onClearAll
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txt, 'txt-sv-bar-rmallmpy')
- }, "Jx")));
+ return /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
+ className: classes.group,
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Tooltip.default, {
+ title: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: "txt-sv-tp",
+ children: "Add Multiplicity"
+ }),
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_common.MuButton, {
+ className: (0, _classnames.default)((0, _common.focusStyle)(isFocusAddMpySt, classes), 'btn-sv-bar-addmpy'),
+ disabled: disableAddMpySt,
+ onClick: onSweepMutAdd,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txt, 'txt-sv-bar-addmpy'),
+ children: "J+"
+ })
+ })
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Tooltip.default, {
+ title: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: "txt-sv-tp",
+ children: "Remove Multiplicity"
+ }),
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_common.MuButton, {
+ className: (0, _classnames.default)((0, _common.focusStyle)(isFocusRmMpySt, classes), 'btn-sv-bar-rmmpy'),
+ disabled: disableRmMpySt,
+ onClick: onOneMutAdd,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txt, 'txt-sv-bar-rmmpy'),
+ children: "J-"
+ })
+ })
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Tooltip.default, {
+ title: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: "txt-sv-tp",
+ children: "Add Peak for Multiplicity"
+ }),
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_common.MuButton, {
+ className: (0, _classnames.default)((0, _common.focusStyle)(isFocusAddPeakSt, classes), 'btn-sv-bar-addpeakmpy'),
+ disabled: disableMpyPeakSt,
+ onClick: onPeakMutAdd,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txt, 'txt-sv-bar-addpeakmpy'),
+ children: "JP+"
+ })
+ })
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Tooltip.default, {
+ title: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: "txt-sv-tp",
+ children: "Remove Peak for Multiplicity"
+ }),
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_common.MuButton, {
+ className: (0, _classnames.default)((0, _common.focusStyle)(isFocusRmPeakSt, classes), 'btn-sv-bar-rmpeakmpy'),
+ disabled: disableMpyPeakSt,
+ onClick: onPeakMutRm,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txt, 'txt-sv-bar-rmpeakmpy'),
+ children: "JP-"
+ })
+ })
+ })
+ }), disableAddMpySt ? null :
+ /*#__PURE__*/
+ // eslint-disable-line
+ (0, _jsxRuntime.jsx)(_tri_btn.default, {
+ content: {
+ tp: 'Clear All Multiplicity'
+ },
+ cb: onClearAll,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txt, 'txt-sv-bar-rmallmpy'),
+ children: "Jx"
+ })
+ })]
+ });
};
const mapStateToProps = (state, props) => (
// eslint-disable-line
diff --git a/dist/components/cmd_bar/06_undo_redo.js b/dist/components/cmd_bar/06_undo_redo.js
index 34bf0720..24a8bae7 100644
--- a/dist/components/cmd_bar/06_undo_redo.js
+++ b/dist/components/cmd_bar/06_undo_redo.js
@@ -16,43 +16,52 @@ var _Tooltip = _interopRequireDefault(require("@mui/material/Tooltip"));
var _RedoOutlined = _interopRequireDefault(require("@mui/icons-material/RedoOutlined"));
var _UndoOutlined = _interopRequireDefault(require("@mui/icons-material/UndoOutlined"));
var _common = require("./common");
+var _jsxRuntime = require("react/jsx-runtime");
/* eslint-disable prefer-object-spread, function-paren-newline,
react/function-component-definition, react/require-default-props, max-len,
react/no-unused-prop-types */
const styles = () => Object.assign({}, _common.commonStyle);
-const UndoRedo = _ref => {
- let {
- classes,
- canUndo,
- canRedo,
- onUndoAct,
- onRedoAct
- } = _ref;
- return /*#__PURE__*/_react.default.createElement("span", {
- className: classes.group
- }, /*#__PURE__*/_react.default.createElement(_Tooltip.default, {
- title: /*#__PURE__*/_react.default.createElement("span", {
- className: "txt-sv-tp"
- }, "Undo")
- }, /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement(_common.MuButton, {
- className: (0, _classnames.default)('btn-sv-bar-undo'),
- disabled: !canUndo,
- onClick: onUndoAct
- }, /*#__PURE__*/_react.default.createElement(_UndoOutlined.default, {
- className: classes.icon
- })))), /*#__PURE__*/_react.default.createElement(_Tooltip.default, {
- title: /*#__PURE__*/_react.default.createElement("span", {
- className: "txt-sv-tp"
- }, "Redo")
- }, /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement(_common.MuButton, {
- className: (0, _classnames.default)('btn-sv-bar-redo'),
- disabled: !canRedo,
- onClick: onRedoAct
- }, /*#__PURE__*/_react.default.createElement(_RedoOutlined.default, {
- className: classes.icon
- })))));
-};
+const UndoRedo = ({
+ classes,
+ canUndo,
+ canRedo,
+ onUndoAct,
+ onRedoAct
+}) => /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
+ className: classes.group,
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Tooltip.default, {
+ title: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: "txt-sv-tp",
+ children: "Undo"
+ }),
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_common.MuButton, {
+ className: (0, _classnames.default)('btn-sv-bar-undo'),
+ disabled: !canUndo,
+ onClick: onUndoAct,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_UndoOutlined.default, {
+ className: classes.icon
+ })
+ })
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Tooltip.default, {
+ title: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: "txt-sv-tp",
+ children: "Redo"
+ }),
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_common.MuButton, {
+ className: (0, _classnames.default)('btn-sv-bar-redo'),
+ disabled: !canRedo,
+ onClick: onRedoAct,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_RedoOutlined.default, {
+ className: classes.icon
+ })
+ })
+ })
+ })]
+});
const canUndoFunc = state => state.editPeak.past.length > 0 || state.integration.past.length > 0 || state.multiplicity.past.length > 0;
const canRedoFunc = state => state.editPeak.future.length > 0 || state.integration.future.length > 0 || state.multiplicity.future.length > 0;
const mapStateToProps = (state, _) => (
diff --git a/dist/components/cmd_bar/07_pecker.js b/dist/components/cmd_bar/07_pecker.js
index 154b3196..d8fbf678 100644
--- a/dist/components/cmd_bar/07_pecker.js
+++ b/dist/components/cmd_bar/07_pecker.js
@@ -19,6 +19,7 @@ var _common = require("./common");
var _list_ui = require("../../constants/list_ui");
var _cfg = _interopRequireDefault(require("../../helpers/cfg"));
var _cyclic_voltammetry = require("../../actions/cyclic_voltammetry");
+var _jsxRuntime = require("react/jsx-runtime");
/* eslint-disable prefer-object-spread, function-paren-newline,
react/function-component-definition, react/require-default-props, max-len,
react/no-unused-prop-types */
@@ -59,7 +60,7 @@ const setRef = (classes, cyclicVotaSt, curveIdx, setCylicVoltaRefFactorAct) => {
});
}
};
- return /*#__PURE__*/_react.default.createElement(_material.TextField, {
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TextField, {
className: classes.field,
id: "intg-factor-name",
type: "number",
@@ -68,28 +69,28 @@ const setRef = (classes, cyclicVotaSt, curveIdx, setCylicVoltaRefFactorAct) => {
InputProps: {
className: (0, _classnames.default)(classes.txtInput, 'txtfield-sv-bar-input')
},
- label: /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txtLabel, 'txtfield-sv-bar-label')
- }, hasRefPeaks ? 'Ref Value (V)' : 'Shift'),
+ label: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txtLabel, 'txtfield-sv-bar-label'),
+ children: hasRefPeaks ? 'Ref Value (V)' : 'Shift'
+ }),
variant: "outlined",
onChange: onFactorChanged,
onBlur: onFactorChanged,
onKeyUp: onEnterPress
});
};
-const Pecker = _ref => {
- let {
- classes,
- layoutSt,
- isFocusAddPeckerSt,
- isFocusRmPeckerSt,
- setUiSweepTypeAct,
- curveSt,
- cyclicVotaSt,
- setCylicVoltaRefFactorAct,
- isFocusSetRefSt,
- setCylicVoltaRefAct
- } = _ref;
+const Pecker = ({
+ classes,
+ layoutSt,
+ isFocusAddPeckerSt,
+ isFocusRmPeckerSt,
+ setUiSweepTypeAct,
+ curveSt,
+ cyclicVotaSt,
+ setCylicVoltaRefFactorAct,
+ isFocusSetRefSt,
+ setCylicVoltaRefAct
+}) => {
const {
curveIdx
} = curveSt;
@@ -109,36 +110,58 @@ const Pecker = _ref => {
} = spectra;
hasRefPeaks = hasRefPeak;
}
- return !_cfg.default.hidePanelCyclicVolta(layoutSt) ? /*#__PURE__*/_react.default.createElement("span", {
- "data-testid": "Pecker"
- }, /*#__PURE__*/_react.default.createElement(_Tooltip.default, {
- title: /*#__PURE__*/_react.default.createElement("span", {
- className: "txt-sv-tp"
- }, "Add Pecker")
- }, /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement(_common.MuButton, {
- className: (0, _classnames.default)((0, _common.focusStyle)(isFocusAddPeckerSt, classes), 'btn-sv-bar-addpecker'),
- onClick: onSweepPeckerAdd
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txt, 'txt-sv-bar-addpeak')
- }, "I", /*#__PURE__*/_react.default.createElement("sub", null, "\u03BB0"), "+")))), /*#__PURE__*/_react.default.createElement(_Tooltip.default, {
- title: /*#__PURE__*/_react.default.createElement("span", {
- className: "txt-sv-tp"
- }, "Remove Pecker")
- }, /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement(_common.MuButton, {
- className: (0, _classnames.default)((0, _common.focusStyle)(isFocusRmPeckerSt, classes), 'btn-sv-bar-rmpecker'),
- onClick: onSweepPeckerDELETE
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txt, 'txt-sv-bar-rmpeak')
- }, "I", /*#__PURE__*/_react.default.createElement("sub", null, "\u03BB0"), "-")))), setRef(classes, cyclicVotaSt, curveIdx, setCylicVoltaRefFactorAct), /*#__PURE__*/_react.default.createElement(_Tooltip.default, {
- title: /*#__PURE__*/_react.default.createElement("span", {
- className: "txt-sv-tp"
- }, hasRefPeaks ? 'Set Reference' : 'Set Shift')
- }, /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement(_common.MuButton, {
- className: (0, _classnames.default)((0, _common.focusStyle)(isFocusSetRefSt, classes), 'btn-sv-bar-setref'),
- onClick: onConfirmSetRef
- }, /*#__PURE__*/_react.default.createElement(_AddLocationOutlined.default, {
- className: classes.icon
- }))))) : /*#__PURE__*/_react.default.createElement("span", null);
+ return !_cfg.default.hidePanelCyclicVolta(layoutSt) ? /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
+ "data-testid": "Pecker",
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Tooltip.default, {
+ title: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: "txt-sv-tp",
+ children: "Add Pecker"
+ }),
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_common.MuButton, {
+ className: (0, _classnames.default)((0, _common.focusStyle)(isFocusAddPeckerSt, classes), 'btn-sv-bar-addpecker'),
+ onClick: onSweepPeckerAdd,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
+ className: (0, _classnames.default)(classes.txt, 'txt-sv-bar-addpeak'),
+ children: ["I", /*#__PURE__*/(0, _jsxRuntime.jsx)("sub", {
+ children: "\u03BB0"
+ }), "+"]
+ })
+ })
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Tooltip.default, {
+ title: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: "txt-sv-tp",
+ children: "Remove Pecker"
+ }),
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_common.MuButton, {
+ className: (0, _classnames.default)((0, _common.focusStyle)(isFocusRmPeckerSt, classes), 'btn-sv-bar-rmpecker'),
+ onClick: onSweepPeckerDELETE,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
+ className: (0, _classnames.default)(classes.txt, 'txt-sv-bar-rmpeak'),
+ children: ["I", /*#__PURE__*/(0, _jsxRuntime.jsx)("sub", {
+ children: "\u03BB0"
+ }), "-"]
+ })
+ })
+ })
+ }), setRef(classes, cyclicVotaSt, curveIdx, setCylicVoltaRefFactorAct), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Tooltip.default, {
+ title: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: "txt-sv-tp",
+ children: hasRefPeaks ? 'Set Reference' : 'Set Shift'
+ }),
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_common.MuButton, {
+ className: (0, _classnames.default)((0, _common.focusStyle)(isFocusSetRefSt, classes), 'btn-sv-bar-setref'),
+ onClick: onConfirmSetRef,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_AddLocationOutlined.default, {
+ className: classes.icon
+ })
+ })
+ })
+ })]
+ }) : /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {});
};
const mapStateToProps = (state, _) => (
// eslint-disable-line
diff --git a/dist/components/cmd_bar/common.js b/dist/components/cmd_bar/common.js
index 9cefb64b..f99639f0 100644
--- a/dist/components/cmd_bar/common.js
+++ b/dist/components/cmd_bar/common.js
@@ -5,12 +5,11 @@ Object.defineProperty(exports, "__esModule", {
value: true
});
exports.focusStyle = exports.commonStyle = exports.MuButton = void 0;
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
var _react = _interopRequireDefault(require("react"));
var _styles = require("@mui/styles");
var _Button = _interopRequireDefault(require("@mui/material/Button"));
var _classnames = _interopRequireDefault(require("classnames"));
+var _jsxRuntime = require("react/jsx-runtime");
/* eslint-disable no-unused-vars, max-len, indent, react/function-component-definition, react/self-closing-comp, react/prop-types, react/jsx-props-no-spreading */
const useStyles = (0, _styles.makeStyles)(theme => ({
@@ -30,12 +29,13 @@ const useStyles = (0, _styles.makeStyles)(theme => ({
const MuButton = props => {
const classes = useStyles();
const {
- className
- } = props,
- other = (0, _objectWithoutProperties2.default)(props, ["className"]);
- return /*#__PURE__*/_react.default.createElement(_Button.default, (0, _extends2.default)({
- className: (0, _classnames.default)(classes.muiBtn, className)
- }, other));
+ className,
+ ...other
+ } = props;
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
+ className: (0, _classnames.default)(classes.muiBtn, className),
+ ...other
+ });
};
exports.MuButton = MuButton;
const commonStyle = exports.commonStyle = {
diff --git a/dist/components/cmd_bar/index.js b/dist/components/cmd_bar/index.js
index fdfcd5c4..765e7529 100644
--- a/dist/components/cmd_bar/index.js
+++ b/dist/components/cmd_bar/index.js
@@ -24,45 +24,44 @@ var _r07_wavelength_btn = _interopRequireDefault(require("./r07_wavelength_btn")
var _pecker = _interopRequireDefault(require("./07_pecker"));
var _r08_change_axes = _interopRequireDefault(require("./r08_change_axes"));
var _r09_detector = _interopRequireDefault(require("./r09_detector"));
+var _jsxRuntime = require("react/jsx-runtime");
/* eslint-disable prefer-object-spread, function-paren-newline,
react/function-component-definition, react/require-default-props */
const styles = () => Object.assign({}, {}, _common.commonStyle);
-const CmdBar = _ref => {
- let {
- classes,
- feature,
- hasEdit,
- forecast,
- operations,
- editorOnly,
- jcampIdx,
- hideThreshold
- } = _ref;
- return /*#__PURE__*/_react.default.createElement("div", {
- className: classes.card
- }, /*#__PURE__*/_react.default.createElement(_viewer.default, {
+const CmdBar = ({
+ classes,
+ feature,
+ hasEdit,
+ forecast,
+ operations,
+ editorOnly,
+ jcampIdx,
+ hideThreshold
+}) => /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+ className: classes.card,
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_viewer.default, {
editorOnly: editorOnly
- }), /*#__PURE__*/_react.default.createElement(_zoom.default, null), /*#__PURE__*/_react.default.createElement(_peak.default, {
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_zoom.default, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_peak.default, {
jcampIdx: jcampIdx,
feature: feature
- }), /*#__PURE__*/_react.default.createElement(_pecker.default, {
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_pecker.default, {
jcampIdx: jcampIdx
- }), /*#__PURE__*/_react.default.createElement(_integration.default, null), /*#__PURE__*/_react.default.createElement(_multiplicity.default, null), /*#__PURE__*/_react.default.createElement(_undo_redo.default, null), /*#__PURE__*/_react.default.createElement(_r04_submit.default, {
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_integration.default, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_multiplicity.default, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_undo_redo.default, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_r04_submit.default, {
operations: operations,
feature: feature,
forecast: forecast,
editorOnly: editorOnly,
hideSwitch: false,
disabled: false
- }), hideThreshold ? null : /*#__PURE__*/_react.default.createElement(_r03_threshold.default, {
+ }), hideThreshold ? null : /*#__PURE__*/(0, _jsxRuntime.jsx)(_r03_threshold.default, {
feature: feature,
hasEdit: hasEdit
- }), /*#__PURE__*/_react.default.createElement(_r01_layout.default, {
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_r01_layout.default, {
feature: feature,
hasEdit: hasEdit
- }), /*#__PURE__*/_react.default.createElement(_r07_wavelength_btn.default, null), /*#__PURE__*/_react.default.createElement(_r08_change_axes.default, null), /*#__PURE__*/_react.default.createElement(_r09_detector.default, null));
-};
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_r07_wavelength_btn.default, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_r08_change_axes.default, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_r09_detector.default, {})]
+});
const mapStateToProps = (state, _) => (
// eslint-disable-line
{});
diff --git a/dist/components/cmd_bar/r01_layout.js b/dist/components/cmd_bar/r01_layout.js
index 984ca5db..9442fe79 100644
--- a/dist/components/cmd_bar/r01_layout.js
+++ b/dist/components/cmd_bar/r01_layout.js
@@ -20,6 +20,7 @@ var _list_shift = require("../../constants/list_shift");
var _cfg = _interopRequireDefault(require("../../helpers/cfg"));
var _common = require("./common");
var _format = _interopRequireDefault(require("../../helpers/format"));
+var _jsxRuntime = require("react/jsx-runtime");
/* eslint-disable prefer-object-spread, function-paren-newline,
react/function-component-definition */
@@ -50,151 +51,220 @@ const shiftSelect = (classes, layoutSt, setShiftRefAct, shiftSt, curveSt) => {
setShiftRefAct(payload);
};
const listShift = (0, _list_shift.getListShift)(layoutSt);
- const content = listShift.map(ref => /*#__PURE__*/_react.default.createElement(_material.MenuItem, {
+ const content = listShift.map(ref => /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
value: ref,
- key: ref.name
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-shift')
- }, `${ref.name}: ${_format.default.strNumberFixedDecimal(ref.value, 2)} ppm`)));
- return /*#__PURE__*/_react.default.createElement(_material.FormControl, {
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-shift'),
+ children: `${ref.name}: ${_format.default.strNumberFixedDecimal(ref.value, 2)} ppm`
+ })
+ }, ref.name));
+ return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.FormControl, {
className: (0, _classnames.default)(classes.fieldShift),
- variant: "outlined"
- }, /*#__PURE__*/_react.default.createElement(_material.InputLabel, {
- id: "select-solvent-label",
- className: (0, _classnames.default)(classes.selectLabel, 'select-sv-bar-label')
- }, "Reference"), /*#__PURE__*/_react.default.createElement(_material.Select, {
- value: shiftRef,
- labelId: "select-solvent-label",
- label: "Solvent",
- onChange: onChange,
- className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-shift')
- }, content));
+ variant: "outlined",
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.InputLabel, {
+ id: "select-solvent-label",
+ className: (0, _classnames.default)(classes.selectLabel, 'select-sv-bar-label'),
+ children: "Reference"
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Select, {
+ value: shiftRef,
+ labelId: "select-solvent-label",
+ label: "Solvent",
+ onChange: onChange,
+ className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-shift'),
+ children: content
+ })]
+ });
};
const layoutSelect = (classes, layoutSt, updateLayoutAct) => {
const onChange = e => updateLayoutAct(e.target.value);
- return /*#__PURE__*/_react.default.createElement(_material.FormControl, {
- className: (0, _classnames.default)(classes.fieldLayout)
- }, /*#__PURE__*/_react.default.createElement(_material.InputLabel, {
- id: "select-layout-label",
- className: (0, _classnames.default)(classes.selectLabel, 'select-sv-bar-label')
- }, "Layout"), /*#__PURE__*/_react.default.createElement(_material.Select, {
- labelId: "select-layout-label",
- label: "Layout",
- value: layoutSt,
- onChange: onChange,
- className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-layout')
- }, /*#__PURE__*/_react.default.createElement(_material.MenuItem, {
- value: _list_layout.LIST_LAYOUT.PLAIN
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout')
- }, "plain")), /*#__PURE__*/_react.default.createElement(_material.MenuItem, {
- value: _list_layout.LIST_LAYOUT.IR
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout')
- }, "IR")), /*#__PURE__*/_react.default.createElement(_material.MenuItem, {
- value: _list_layout.LIST_LAYOUT.RAMAN
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout')
- }, "RAMAN")), /*#__PURE__*/_react.default.createElement(_material.MenuItem, {
- value: _list_layout.LIST_LAYOUT.UVVIS
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout')
- }, "UV/VIS")), /*#__PURE__*/_react.default.createElement(_material.MenuItem, {
- value: _list_layout.LIST_LAYOUT.HPLC_UVVIS
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout')
- }, "HPLC UV/VIS")), /*#__PURE__*/_react.default.createElement(_material.MenuItem, {
- value: _list_layout.LIST_LAYOUT.TGA
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout')
- }, "TGA (THERMOGRAVIMETRIC ANALYSIS)")), /*#__PURE__*/_react.default.createElement(_material.MenuItem, {
- value: _list_layout.LIST_LAYOUT.DSC
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout')
- }, "DSC (DIFFERENTIAL SCANNING CALORIMETRY)")), /*#__PURE__*/_react.default.createElement(_material.MenuItem, {
- value: _list_layout.LIST_LAYOUT.XRD
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout')
- }, "XRD (X-RAY DIFFRACTION)")), /*#__PURE__*/_react.default.createElement(_material.MenuItem, {
- value: _list_layout.LIST_LAYOUT.H1
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout')
- }, /*#__PURE__*/_react.default.createElement("sup", null, "1"), "H")), /*#__PURE__*/_react.default.createElement(_material.MenuItem, {
- value: _list_layout.LIST_LAYOUT.C13
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout')
- }, /*#__PURE__*/_react.default.createElement("sup", null, "13"), "C")), /*#__PURE__*/_react.default.createElement(_material.MenuItem, {
- value: _list_layout.LIST_LAYOUT.F19
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout')
- }, /*#__PURE__*/_react.default.createElement("sup", null, "19"), "F")), /*#__PURE__*/_react.default.createElement(_material.MenuItem, {
- value: _list_layout.LIST_LAYOUT.P31
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout')
- }, /*#__PURE__*/_react.default.createElement("sup", null, "31"), "P")), /*#__PURE__*/_react.default.createElement(_material.MenuItem, {
- value: _list_layout.LIST_LAYOUT.N15
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout')
- }, /*#__PURE__*/_react.default.createElement("sup", null, "15"), "N")), /*#__PURE__*/_react.default.createElement(_material.MenuItem, {
- value: _list_layout.LIST_LAYOUT.Si29
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout')
- }, /*#__PURE__*/_react.default.createElement("sup", null, "29"), "Si")), /*#__PURE__*/_react.default.createElement(_material.MenuItem, {
- value: _list_layout.LIST_LAYOUT.MS
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout')
- }, "MS")), /*#__PURE__*/_react.default.createElement(_material.MenuItem, {
- value: _list_layout.LIST_LAYOUT.CYCLIC_VOLTAMMETRY
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout')
- }, "CV (CYCLIC VOLTAMMETRY)")), /*#__PURE__*/_react.default.createElement(_material.MenuItem, {
- value: _list_layout.LIST_LAYOUT.CDS
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout')
- }, "CDS (CIRCULAR DICHROISM SPECTROSCOPY)")), /*#__PURE__*/_react.default.createElement(_material.MenuItem, {
- value: _list_layout.LIST_LAYOUT.SEC
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout')
- }, "SEC")), /*#__PURE__*/_react.default.createElement(_material.MenuItem, {
- value: _list_layout.LIST_LAYOUT.GC
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout')
- }, "GC (GAS CHROMATOGRAPHY)")), /*#__PURE__*/_react.default.createElement(_material.MenuItem, {
- value: _list_layout.LIST_LAYOUT.AIF
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout')
- }, "SORPTION-DESORPTION")), /*#__PURE__*/_react.default.createElement(_material.MenuItem, {
- value: _list_layout.LIST_LAYOUT.EMISSIONS
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout')
- }, "EMISSIONS")), /*#__PURE__*/_react.default.createElement(_material.MenuItem, {
- value: _list_layout.LIST_LAYOUT.DLS_ACF
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout')
- }, "DLS ACF")), /*#__PURE__*/_react.default.createElement(_material.MenuItem, {
- value: _list_layout.LIST_LAYOUT.DLS_INTENSITY
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout')
- }, "DLS INTENSITY"))));
+ return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.FormControl, {
+ className: (0, _classnames.default)(classes.fieldLayout),
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.InputLabel, {
+ id: "select-layout-label",
+ className: (0, _classnames.default)(classes.selectLabel, 'select-sv-bar-label'),
+ children: "Layout"
+ }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Select, {
+ labelId: "select-layout-label",
+ label: "Layout",
+ value: layoutSt,
+ onChange: onChange,
+ className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-layout'),
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
+ value: _list_layout.LIST_LAYOUT.PLAIN,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout'),
+ children: "plain"
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
+ value: _list_layout.LIST_LAYOUT.IR,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout'),
+ children: "IR"
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
+ value: _list_layout.LIST_LAYOUT.RAMAN,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout'),
+ children: "RAMAN"
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
+ value: _list_layout.LIST_LAYOUT.UVVIS,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout'),
+ children: "UV/VIS"
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
+ value: _list_layout.LIST_LAYOUT.HPLC_UVVIS,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout'),
+ children: "HPLC UV/VIS"
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
+ value: _list_layout.LIST_LAYOUT.TGA,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout'),
+ children: "TGA (THERMOGRAVIMETRIC ANALYSIS)"
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
+ value: _list_layout.LIST_LAYOUT.DSC,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout'),
+ children: "DSC (DIFFERENTIAL SCANNING CALORIMETRY)"
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
+ value: _list_layout.LIST_LAYOUT.XRD,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout'),
+ children: "XRD (X-RAY DIFFRACTION)"
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
+ value: _list_layout.LIST_LAYOUT.H1,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
+ className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout'),
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("sup", {
+ children: "1"
+ }), "H"]
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
+ value: _list_layout.LIST_LAYOUT.C13,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
+ className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout'),
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("sup", {
+ children: "13"
+ }), "C"]
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
+ value: _list_layout.LIST_LAYOUT.F19,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
+ className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout'),
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("sup", {
+ children: "19"
+ }), "F"]
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
+ value: _list_layout.LIST_LAYOUT.P31,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
+ className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout'),
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("sup", {
+ children: "31"
+ }), "P"]
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
+ value: _list_layout.LIST_LAYOUT.N15,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
+ className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout'),
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("sup", {
+ children: "15"
+ }), "N"]
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
+ value: _list_layout.LIST_LAYOUT.Si29,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
+ className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout'),
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("sup", {
+ children: "29"
+ }), "Si"]
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
+ value: _list_layout.LIST_LAYOUT.MS,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout'),
+ children: "MS"
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
+ value: _list_layout.LIST_LAYOUT.CYCLIC_VOLTAMMETRY,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout'),
+ children: "CV (CYCLIC VOLTAMMETRY)"
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
+ value: _list_layout.LIST_LAYOUT.LSV,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout'),
+ children: "LSV (LINEAR SWEEP VOLTAMMETRY)"
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
+ value: _list_layout.LIST_LAYOUT.CDS,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout'),
+ children: "CDS (CIRCULAR DICHROISM SPECTROSCOPY)"
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
+ value: _list_layout.LIST_LAYOUT.SEC,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout'),
+ children: "SEC"
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
+ value: _list_layout.LIST_LAYOUT.GC,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout'),
+ children: "GC (GAS CHROMATOGRAPHY)"
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
+ value: _list_layout.LIST_LAYOUT.AIF,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout'),
+ children: "SORPTION-DESORPTION"
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
+ value: _list_layout.LIST_LAYOUT.EMISSIONS,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout'),
+ children: "EMISSIONS"
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
+ value: _list_layout.LIST_LAYOUT.DLS_ACF,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout'),
+ children: "DLS ACF"
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
+ value: _list_layout.LIST_LAYOUT.DLS_INTENSITY,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout'),
+ children: "DLS INTENSITY"
+ })
+ })]
+ })]
+ });
};
-const Layout = _ref => {
- let {
- classes,
- feature,
- hasEdit,
- layoutSt,
- setShiftRefAct,
- updateLayoutAct,
- curveSt,
- shiftSt
- } = _ref;
- return /*#__PURE__*/_react.default.createElement("span", {
- className: classes.groupRight
- }, layoutSelect(classes, layoutSt, updateLayoutAct), shiftSelect(classes, layoutSt, setShiftRefAct, shiftSt, curveSt), /*#__PURE__*/_react.default.createElement(_r02_scan.default, {
+const Layout = ({
+ classes,
+ feature,
+ hasEdit,
+ layoutSt,
+ setShiftRefAct,
+ updateLayoutAct,
+ curveSt,
+ shiftSt
+}) => /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
+ className: classes.groupRight,
+ children: [layoutSelect(classes, layoutSt, updateLayoutAct), shiftSelect(classes, layoutSt, setShiftRefAct, shiftSt, curveSt), /*#__PURE__*/(0, _jsxRuntime.jsx)(_r02_scan.default, {
feature: feature,
hasEdit: hasEdit
- }));
-};
+ })]
+});
const mapStateToProps = (state, props) => (
// eslint-disable-line
{
diff --git a/dist/components/cmd_bar/r02_scan.js b/dist/components/cmd_bar/r02_scan.js
index d30ce659..89c5b7a3 100644
--- a/dist/components/cmd_bar/r02_scan.js
+++ b/dist/components/cmd_bar/r02_scan.js
@@ -17,6 +17,7 @@ var _HowToRegOutlined = _interopRequireDefault(require("@mui/icons-material/HowT
var _RefreshOutlined = _interopRequireDefault(require("@mui/icons-material/RefreshOutlined"));
var _scan = require("../../actions/scan");
var _common = require("./common");
+var _jsxRuntime = require("react/jsx-runtime");
/* eslint-disable prefer-object-spread, function-paren-newline,
react/function-component-definition */
@@ -25,32 +26,38 @@ const styles = () => Object.assign({
width: 90
}
}, _common.commonStyle);
-const restoreIcon = (classes, hasEdit, isEdit) => hasEdit && isEdit ? /*#__PURE__*/_react.default.createElement(_HowToRegOutlined.default, {
+const restoreIcon = (classes, hasEdit, isEdit) => hasEdit && isEdit ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_HowToRegOutlined.default, {
className: classes.icon
-}) : /*#__PURE__*/_react.default.createElement(_CloudDoneOutlined.default, {
+}) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_CloudDoneOutlined.default, {
className: classes.icon
});
const restoreTp = (hasEdit, isEdit) => hasEdit && isEdit ? 'User Defined Scan' : 'Auto Picked Scan';
-const btnRestore = (classes, hasEdit, isEdit, toggleEditAct) => /*#__PURE__*/_react.default.createElement(_material.Tooltip, {
- title: /*#__PURE__*/_react.default.createElement("span", {
- className: "txt-sv-tp"
- }, restoreTp(hasEdit, isEdit))
-}, /*#__PURE__*/_react.default.createElement(_common.MuButton, {
- className: (0, _classnames.default)('btn-sv-bar-scanrst'),
- disabled: !hasEdit,
- onClick: toggleEditAct
-}, restoreIcon(classes, hasEdit, isEdit)));
-const btnRrfresh = (classes, disabled, refreshAct) => /*#__PURE__*/_react.default.createElement(_material.Tooltip, {
- title: /*#__PURE__*/_react.default.createElement("span", {
- className: "txt-sv-tp"
- }, "Refresh Scan")
-}, /*#__PURE__*/_react.default.createElement(_common.MuButton, {
- className: (0, _classnames.default)('btn-sv-bar-scanrfs'),
- disabled: disabled,
- onClick: refreshAct
-}, /*#__PURE__*/_react.default.createElement(_RefreshOutlined.default, {
- className: classes.icon
-})));
+const btnRestore = (classes, hasEdit, isEdit, toggleEditAct) => /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Tooltip, {
+ title: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: "txt-sv-tp",
+ children: restoreTp(hasEdit, isEdit)
+ }),
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_common.MuButton, {
+ className: (0, _classnames.default)('btn-sv-bar-scanrst'),
+ disabled: !hasEdit,
+ onClick: toggleEditAct,
+ children: restoreIcon(classes, hasEdit, isEdit)
+ })
+});
+const btnRrfresh = (classes, disabled, refreshAct) => /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Tooltip, {
+ title: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: "txt-sv-tp",
+ children: "Refresh Scan"
+ }),
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_common.MuButton, {
+ className: (0, _classnames.default)('btn-sv-bar-scanrfs'),
+ disabled: disabled,
+ onClick: refreshAct,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_RefreshOutlined.default, {
+ className: classes.icon
+ })
+ })
+});
const scanSelect = (classes, feature, layoutSt, scanSt, onChange) => {
const {
target,
@@ -58,43 +65,48 @@ const scanSelect = (classes, feature, layoutSt, scanSt, onChange) => {
} = scanSt;
if (!count) return null;
const range = [...Array(count + 1).keys()].slice(1);
- const content = range.map(num => /*#__PURE__*/_react.default.createElement(_material.MenuItem, {
+ const content = range.map(num => /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
value: num,
- key: num
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-scan')
- }, `scan ${num}`)));
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-scan'),
+ children: `scan ${num}`
+ })
+ }, num));
const defaultValue = scanSt.isAuto || !feature.scanEditTarget ? feature.scanAutoTarget : feature.scanEditTarget;
const selValue = target || defaultValue || 1;
- return /*#__PURE__*/_react.default.createElement(_material.FormControl, {
+ return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.FormControl, {
className: (0, _classnames.default)(classes.fieldScan),
- variant: "outlined"
- }, /*#__PURE__*/_react.default.createElement(_material.InputLabel, {
- id: "select-scan-label",
- className: (0, _classnames.default)(classes.selectLabel, 'select-sv-bar-label')
- }, "Current Scan"), /*#__PURE__*/_react.default.createElement(_material.Select, {
- labelId: "select-scan-label",
- label: "Current Scan",
- value: selValue,
- onChange: onChange,
- className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-scan')
- }, content));
+ variant: "outlined",
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.InputLabel, {
+ id: "select-scan-label",
+ className: (0, _classnames.default)(classes.selectLabel, 'select-sv-bar-label'),
+ children: "Current Scan"
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Select, {
+ labelId: "select-scan-label",
+ label: "Current Scan",
+ value: selValue,
+ onChange: onChange,
+ className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-scan'),
+ children: content
+ })]
+ });
};
-const Scan = _ref => {
- let {
- classes,
- feature,
- hasEdit,
- layoutSt,
- scanSt,
- setScanTargetAct,
- resetScanTargetAct,
- toggleScanIsAutoAct
- } = _ref;
+const Scan = ({
+ classes,
+ feature,
+ hasEdit,
+ layoutSt,
+ scanSt,
+ setScanTargetAct,
+ resetScanTargetAct,
+ toggleScanIsAutoAct
+}) => {
const isMs = ['MS'].indexOf(layoutSt) >= 0;
if (!isMs) return null;
const onChange = e => setScanTargetAct(e.target.value);
- return /*#__PURE__*/_react.default.createElement("span", null, scanSelect(classes, feature, layoutSt, scanSt, onChange), btnRrfresh(classes, false, resetScanTargetAct), btnRestore(classes, hasEdit, !scanSt.isAuto, toggleScanIsAutoAct));
+ return /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
+ children: [scanSelect(classes, feature, layoutSt, scanSt, onChange), btnRrfresh(classes, false, resetScanTargetAct), btnRestore(classes, hasEdit, !scanSt.isAuto, toggleScanIsAutoAct)]
+ });
};
const mapStateToProps = (state, props) => (
// eslint-disable-line
diff --git a/dist/components/cmd_bar/r03_threshold.js b/dist/components/cmd_bar/r03_threshold.js
index 294c33c5..668a8a1d 100644
--- a/dist/components/cmd_bar/r03_threshold.js
+++ b/dist/components/cmd_bar/r03_threshold.js
@@ -18,6 +18,7 @@ var _RefreshOutlined = _interopRequireDefault(require("@mui/icons-material/Refre
var _cfg = _interopRequireDefault(require("../../helpers/cfg"));
var _threshold = require("../../actions/threshold");
var _common = require("./common");
+var _jsxRuntime = require("react/jsx-runtime");
/* eslint-disable prefer-object-spread, function-paren-newline,
react/function-component-definition */
@@ -27,11 +28,13 @@ const styles = () => Object.assign({
},
txtIcon: {}
}, _common.commonStyle);
-const txtPercent = () => /*#__PURE__*/_react.default.createElement(_material.InputAdornment, {
- position: "end"
-}, /*#__PURE__*/_react.default.createElement("span", {
- className: "txt-percent"
-}, "%"));
+const txtPercent = () => /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.InputAdornment, {
+ position: "end",
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: "txt-percent",
+ children: "%"
+ })
+});
const setThreshold = (classes, thresVal, updateThresholdValueAct, curveSt) => {
const {
curveIdx
@@ -52,71 +55,79 @@ const setThreshold = (classes, thresVal, updateThresholdValueAct, curveSt) => {
});
}
};
- return /*#__PURE__*/_react.default.createElement(_material.FormControl, {
- variant: "outlined"
- }, /*#__PURE__*/_react.default.createElement(_material.TextField, {
- className: classes.field,
- id: "outlined-name",
- placeholder: "N.A.",
- type: "number",
- value: thresVal || 0.01,
- margin: "none",
- InputProps: {
- endAdornment: txtPercent(),
- className: (0, _classnames.default)(classes.txtInput, 'txtfield-sv-bar-input'),
- inputProps: {
- min: 0.01
- }
- },
- onChange: onChange,
- onBlur: onBlur,
- onKeyPress: onEnterPress,
- variant: "outlined"
- }), /*#__PURE__*/_react.default.createElement(_material.InputLabel, {
- className: (0, _classnames.default)(classes.txtLabelBottomInput)
- }, "Threshold"));
+ return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.FormControl, {
+ variant: "outlined",
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TextField, {
+ className: classes.field,
+ id: "outlined-name",
+ placeholder: "N.A.",
+ type: "number",
+ value: thresVal || 0.01,
+ margin: "none",
+ InputProps: {
+ endAdornment: txtPercent(),
+ className: (0, _classnames.default)(classes.txtInput, 'txtfield-sv-bar-input'),
+ inputProps: {
+ min: 0.01
+ }
+ },
+ onChange: onChange,
+ onBlur: onBlur,
+ onKeyPress: onEnterPress,
+ variant: "outlined"
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.InputLabel, {
+ className: (0, _classnames.default)(classes.txtLabelBottomInput),
+ children: "Threshold"
+ })]
+ });
};
-const restoreIcon = (classes, hasEdit, isEdit) => hasEdit && isEdit ? /*#__PURE__*/_react.default.createElement(_HowToRegOutlined.default, {
+const restoreIcon = (classes, hasEdit, isEdit) => hasEdit && isEdit ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_HowToRegOutlined.default, {
className: classes.icon
-}) : /*#__PURE__*/_react.default.createElement(_CloudDoneOutlined.default, {
+}) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_CloudDoneOutlined.default, {
className: classes.icon
});
const restoreTp = (hasEdit, isEdit) => hasEdit && isEdit ? 'User Defined Threshold' : 'Auto Picked Threshold';
-const Threshold = _ref => {
- let {
- classes,
- feature,
- hasEdit,
- hideThresSt,
- thresValSt,
- isEditSt,
- curveSt,
- updateThresholdValueAct,
- resetThresholdValueAct,
- toggleThresholdIsEditAct
- } = _ref;
+const Threshold = ({
+ classes,
+ feature,
+ hasEdit,
+ hideThresSt,
+ thresValSt,
+ isEditSt,
+ curveSt,
+ updateThresholdValueAct,
+ resetThresholdValueAct,
+ toggleThresholdIsEditAct
+}) => {
const thresVal = thresValSt || feature.thresRef;
- return /*#__PURE__*/_react.default.createElement("span", {
- className: classes.groupRight
- }, setThreshold(classes, thresVal, updateThresholdValueAct, curveSt), /*#__PURE__*/_react.default.createElement(_material.Tooltip, {
- title: /*#__PURE__*/_react.default.createElement("span", {
- className: "txt-sv-tp"
- }, "Restore Threshold")
- }, /*#__PURE__*/_react.default.createElement(_common.MuButton, {
- className: (0, _classnames.default)('btn-sv-bar-thresref'),
- disabled: _cfg.default.btnCmdThres(thresVal),
- onClick: resetThresholdValueAct
- }, /*#__PURE__*/_react.default.createElement(_RefreshOutlined.default, {
- className: classes.icon
- }))), hideThresSt ? null : /*#__PURE__*/_react.default.createElement(_material.Tooltip, {
- title: /*#__PURE__*/_react.default.createElement("span", {
- className: "txt-sv-tp"
- }, restoreTp(hasEdit, isEditSt))
- }, /*#__PURE__*/_react.default.createElement(_common.MuButton, {
- className: (0, _classnames.default)('btn-sv-bar-thresrst'),
- disabled: _cfg.default.btnCmdThres(thresVal),
- onClick: toggleThresholdIsEditAct
- }, restoreIcon(classes, hasEdit, isEditSt))));
+ return /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
+ className: classes.groupRight,
+ children: [setThreshold(classes, thresVal, updateThresholdValueAct, curveSt), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Tooltip, {
+ title: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: "txt-sv-tp",
+ children: "Restore Threshold"
+ }),
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_common.MuButton, {
+ className: (0, _classnames.default)('btn-sv-bar-thresref'),
+ disabled: _cfg.default.btnCmdThres(thresVal),
+ onClick: resetThresholdValueAct,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_RefreshOutlined.default, {
+ className: classes.icon
+ })
+ })
+ }), hideThresSt ? null : /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Tooltip, {
+ title: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: "txt-sv-tp",
+ children: restoreTp(hasEdit, isEditSt)
+ }),
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_common.MuButton, {
+ className: (0, _classnames.default)('btn-sv-bar-thresrst'),
+ disabled: _cfg.default.btnCmdThres(thresVal),
+ onClick: toggleThresholdIsEditAct,
+ children: restoreIcon(classes, hasEdit, isEditSt)
+ })
+ })]
+ });
};
const mapStateToProps = (state, props) => (
// eslint-disable-line
diff --git a/dist/components/cmd_bar/r04_submit.js b/dist/components/cmd_bar/r04_submit.js
index 9c5f3702..3a9431f9 100644
--- a/dist/components/cmd_bar/r04_submit.js
+++ b/dist/components/cmd_bar/r04_submit.js
@@ -17,6 +17,7 @@ var _r05_submit_btn = _interopRequireDefault(require("./r05_submit_btn"));
var _r06_predict_btn = _interopRequireDefault(require("./r06_predict_btn"));
var _common = require("./common");
var _format = _interopRequireDefault(require("../../helpers/format"));
+var _jsxRuntime = require("react/jsx-runtime");
/* eslint-disable prefer-object-spread, function-paren-newline,
react/function-component-definition */
@@ -36,124 +37,145 @@ const styles = () => Object.assign({
}, _common.commonStyle);
const ascendSelect = (classes, hideSwitch, isAscendSt, toggleIsAscendAct) => {
if (hideSwitch) return null;
- return /*#__PURE__*/_react.default.createElement(_material.FormControl, {
+ return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.FormControl, {
className: (0, _classnames.default)(classes.fieldOrder),
- variant: "outlined"
- }, /*#__PURE__*/_react.default.createElement(_material.InputLabel, {
- id: "select-sort-peaks-label",
- className: (0, _classnames.default)(classes.selectLabel, 'select-sv-bar-label')
- }, "Write Peaks"), /*#__PURE__*/_react.default.createElement(_material.Select, {
- labelId: "select-sort-peaks-label",
- label: "Write Peaks",
- value: isAscendSt,
- onChange: toggleIsAscendAct,
- className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-order')
- }, /*#__PURE__*/_react.default.createElement(_material.MenuItem, {
- value: true,
- key: "ascend"
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-ascend')
- }, "Ascend")), /*#__PURE__*/_react.default.createElement(_material.MenuItem, {
- value: false,
- key: "descend"
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-descend')
- }, "Descend"))));
+ variant: "outlined",
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.InputLabel, {
+ id: "select-sort-peaks-label",
+ className: (0, _classnames.default)(classes.selectLabel, 'select-sv-bar-label'),
+ children: "Write Peaks"
+ }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Select, {
+ labelId: "select-sort-peaks-label",
+ label: "Write Peaks",
+ value: isAscendSt,
+ onChange: toggleIsAscendAct,
+ className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-order'),
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
+ value: true,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-ascend'),
+ children: "Ascend"
+ })
+ }, "ascend"), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
+ value: false,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-descend'),
+ children: "Descend"
+ })
+ }, "descend")]
+ })]
+ });
};
const intensitySelect = (classes, hideSwitch, isIntensitySt, toggleIsIntensityAct) => {
if (hideSwitch) return null;
- return /*#__PURE__*/_react.default.createElement(_material.FormControl, {
+ return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.FormControl, {
className: (0, _classnames.default)(classes.fieldIntensity),
- variant: "outlined"
- }, /*#__PURE__*/_react.default.createElement(_material.InputLabel, {
- id: "select-intensity-label",
- className: (0, _classnames.default)(classes.selectLabel, 'select-sv-bar-label')
- }, "Write Intensity"), /*#__PURE__*/_react.default.createElement(_material.Select, {
- labelId: "select-intensity-label",
- label: "Write Intensity",
- value: isIntensitySt,
- onChange: toggleIsIntensityAct,
- className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-intensity')
- // input={
- // (
- //
- // )
- // }
- }, /*#__PURE__*/_react.default.createElement(_material.MenuItem, {
- value: true,
- key: "ascend"
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-show')
- }, "Show")), /*#__PURE__*/_react.default.createElement(_material.MenuItem, {
- value: false,
- key: "descend"
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-hide')
- }, "Hide"))));
+ variant: "outlined",
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.InputLabel, {
+ id: "select-intensity-label",
+ className: (0, _classnames.default)(classes.selectLabel, 'select-sv-bar-label'),
+ children: "Write Intensity"
+ }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Select, {
+ labelId: "select-intensity-label",
+ label: "Write Intensity",
+ value: isIntensitySt,
+ onChange: toggleIsIntensityAct,
+ className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-intensity')
+ // input={
+ // (
+ //
+ // )
+ // }
+ ,
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
+ value: true,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-show'),
+ children: "Show"
+ })
+ }, "ascend"), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
+ value: false,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-hide'),
+ children: "Hide"
+ })
+ }, "descend")]
+ })]
+ });
};
const decimalSelect = (classes, hideSwitch, decimalSt, updateDecimalAct) => {
if (hideSwitch) return null;
const decimals = [0, 1, 2, 3, 4];
- const options = decimals.map(d => /*#__PURE__*/_react.default.createElement(_material.MenuItem, {
+ const options = decimals.map(d => /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
value: d,
- key: d
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-decimal')
- }, d)));
- return /*#__PURE__*/_react.default.createElement(_material.FormControl, {
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-decimal'),
+ children: d
+ })
+ }, d));
+ return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.FormControl, {
className: (0, _classnames.default)(classes.fieldDecimal),
- variant: "outlined"
- }, /*#__PURE__*/_react.default.createElement(_material.InputLabel, {
- id: "select-decimal-label",
- className: (0, _classnames.default)(classes.selectLabel, 'select-sv-bar-label')
- }, "Decimal"), /*#__PURE__*/_react.default.createElement(_material.Select, {
- labelId: "select-decimal-label",
- label: "Decimal",
- value: decimalSt,
- onChange: updateDecimalAct,
- className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-decimal')
- // input={
- // (
- //
- // )
- // }
- }, options));
+ variant: "outlined",
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.InputLabel, {
+ id: "select-decimal-label",
+ className: (0, _classnames.default)(classes.selectLabel, 'select-sv-bar-label'),
+ children: "Decimal"
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Select, {
+ labelId: "select-decimal-label",
+ label: "Decimal",
+ value: decimalSt,
+ onChange: updateDecimalAct,
+ className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-decimal')
+ // input={
+ // (
+ //
+ // )
+ // }
+ ,
+ children: options
+ })]
+ });
};
const operationSelect = (classes, operations, operation, onChangeSelect) => {
- const options = operations.map(o => /*#__PURE__*/_react.default.createElement(_material.MenuItem, {
+ const options = operations.map(o => /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
value: o.name,
- key: o.name
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-operation')
- }, o.name)));
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-operation'),
+ children: o.name
+ })
+ }, o.name));
const selectedValue = operation.name || operations[0].name;
- return /*#__PURE__*/_react.default.createElement(_material.FormControl, {
+ return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.FormControl, {
className: (0, _classnames.default)(classes.fieldOpertaion),
- variant: "outlined"
- }, /*#__PURE__*/_react.default.createElement(_material.InputLabel, {
- id: "select-submit-label",
- className: (0, _classnames.default)(classes.selectLabel, 'select-sv-bar-label')
- }, "Submit"), /*#__PURE__*/_react.default.createElement(_material.Select, {
- labelId: "select-submit-label",
- label: "Submit",
- value: selectedValue,
- onChange: onChangeSelect,
- className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-operation')
- // input={
- // (
- //
- // )
- // }
- }, options));
+ variant: "outlined",
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.InputLabel, {
+ id: "select-submit-label",
+ className: (0, _classnames.default)(classes.selectLabel, 'select-sv-bar-label'),
+ children: "Submit"
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Select, {
+ labelId: "select-submit-label",
+ label: "Submit",
+ value: selectedValue,
+ onChange: onChangeSelect,
+ className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-operation')
+ // input={
+ // (
+ //
+ // )
+ // }
+ ,
+ children: options
+ })]
+ });
};
const selectOperation = (name, operations, updateOperationAct) => {
let operation = false;
@@ -164,39 +186,39 @@ const selectOperation = (name, operations, updateOperationAct) => {
});
updateOperationAct(operation);
};
-const Submit = _ref => {
- let {
- operations,
- classes,
- feature,
- forecast,
- editorOnly,
- hideSwitch,
- disabled,
- isAscendSt,
- isIntensitySt,
- operationSt,
- decimalSt,
- isEmWaveSt,
- toggleIsAscendAct,
- toggleIsIntensityAct,
- updateOperationAct,
- updateDecimalAct
- } = _ref;
+const Submit = ({
+ operations,
+ classes,
+ feature,
+ forecast,
+ editorOnly,
+ hideSwitch,
+ disabled,
+ isAscendSt,
+ isIntensitySt,
+ operationSt,
+ decimalSt,
+ isEmWaveSt,
+ toggleIsAscendAct,
+ toggleIsIntensityAct,
+ updateOperationAct,
+ updateDecimalAct
+}) => {
const onChangeSelect = e => selectOperation(e.target.value, operations, updateOperationAct);
if (!operations || operations.length === 0) return null;
- return /*#__PURE__*/_react.default.createElement("span", {
- className: classes.groupRightMost
- }, ascendSelect(classes, hideSwitch, isAscendSt, toggleIsAscendAct), intensitySelect(classes, hideSwitch || !isEmWaveSt, isIntensitySt, toggleIsIntensityAct), decimalSelect(classes, hideSwitch, decimalSt, updateDecimalAct), editorOnly ? null : /*#__PURE__*/_react.default.createElement(_r06_predict_btn.default, {
- feature: feature,
- forecast: forecast
- }), operationSelect(classes, operations, operationSt, onChangeSelect), /*#__PURE__*/_react.default.createElement(_r05_submit_btn.default, {
- feature: feature,
- isAscend: isAscendSt,
- isIntensity: isIntensitySt,
- operation: operationSt,
- disabled: disabled
- }));
+ return /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
+ className: classes.groupRightMost,
+ children: [ascendSelect(classes, hideSwitch, isAscendSt, toggleIsAscendAct), intensitySelect(classes, hideSwitch || !isEmWaveSt, isIntensitySt, toggleIsIntensityAct), decimalSelect(classes, hideSwitch, decimalSt, updateDecimalAct), editorOnly ? null : /*#__PURE__*/(0, _jsxRuntime.jsx)(_r06_predict_btn.default, {
+ feature: feature,
+ forecast: forecast
+ }), operationSelect(classes, operations, operationSt, onChangeSelect), /*#__PURE__*/(0, _jsxRuntime.jsx)(_r05_submit_btn.default, {
+ feature: feature,
+ isAscend: isAscendSt,
+ isIntensity: isIntensitySt,
+ operation: operationSt,
+ disabled: disabled
+ })]
+ });
};
const mapStateToProps = (state, props) => (
// eslint-disable-line
diff --git a/dist/components/cmd_bar/r05_submit_btn.js b/dist/components/cmd_bar/r05_submit_btn.js
index c6e1cf4c..69d1b09f 100644
--- a/dist/components/cmd_bar/r05_submit_btn.js
+++ b/dist/components/cmd_bar/r05_submit_btn.js
@@ -16,6 +16,7 @@ var _styles = require("@mui/styles");
var _chem = require("../../helpers/chem");
var _common = require("./common");
var _extractPeaksEdit = require("../../helpers/extractPeaksEdit");
+var _jsxRuntime = require("react/jsx-runtime");
/* eslint-disable prefer-object-spread, function-paren-newline,
react/function-component-definition, function-call-argument-newline,
react/require-default-props */
@@ -44,30 +45,29 @@ const onClickCb = (operation, peaksEdit, isAscend, isIntensity, scan, thres, lay
dscMetaData
});
};
-const BtnSubmit = _ref => {
- let {
- classes,
- operation,
- feature,
- isAscend,
- isIntensity,
- editPeakSt,
- thresSt,
- layoutSt,
- shiftSt,
- scanSt,
- forecastSt,
- decimalSt,
- integrationSt,
- multiplicitySt,
- allIntegrationSt,
- waveLengthSt,
- cyclicvoltaSt,
- curveSt,
- axesUnitsSt,
- detectorSt,
- metaSt
- } = _ref;
+const BtnSubmit = ({
+ classes,
+ operation,
+ feature,
+ isAscend,
+ isIntensity,
+ editPeakSt,
+ thresSt,
+ layoutSt,
+ shiftSt,
+ scanSt,
+ forecastSt,
+ decimalSt,
+ integrationSt,
+ multiplicitySt,
+ allIntegrationSt,
+ waveLengthSt,
+ cyclicvoltaSt,
+ curveSt,
+ axesUnitsSt,
+ detectorSt,
+ metaSt
+}) => {
const peaksEdit = (0, _extractPeaksEdit.extractPeaksEdit)(feature, editPeakSt, thresSt, shiftSt, layoutSt);
// const disBtn = peaksEdit.length === 0 || statusSt.btnSubmit || disabled;
const scan = (0, _chem.Convert2Scan)(feature, scanSt);
@@ -77,17 +77,20 @@ const BtnSubmit = _ref => {
dscMetaData
} = metaSt;
if (!operation) return null;
- return /*#__PURE__*/_react.default.createElement(_Tooltip.default, {
- title: /*#__PURE__*/_react.default.createElement("span", {
- className: "txt-sv-tp"
- }, "Submit")
- }, /*#__PURE__*/_react.default.createElement(_common.MuButton, {
- className: (0, _classnames.default)('btn-sv-bar-submit'),
- color: "primary",
- onClick: onClickCb(operation.value, peaksEdit, isAscend, isIntensity, scan, thres, layoutSt, shiftSt, forecastSt.predictions, decimalSt, integrationSt, multiplicitySt, allIntegrationSt, aucValues, waveLengthSt, cyclicvoltaSt, curveSt, axesUnitsSt, detectorSt, dscMetaData)
- }, /*#__PURE__*/_react.default.createElement(_PlayCircleOutline.default, {
- className: classes.icon
- })));
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Tooltip.default, {
+ title: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: "txt-sv-tp",
+ children: "Submit"
+ }),
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_common.MuButton, {
+ className: (0, _classnames.default)('btn-sv-bar-submit'),
+ color: "primary",
+ onClick: onClickCb(operation.value, peaksEdit, isAscend, isIntensity, scan, thres, layoutSt, shiftSt, forecastSt.predictions, decimalSt, integrationSt, multiplicitySt, allIntegrationSt, aucValues, waveLengthSt, cyclicvoltaSt, curveSt, axesUnitsSt, detectorSt, dscMetaData),
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_PlayCircleOutline.default, {
+ className: classes.icon
+ })
+ })
+ });
};
const mapStateToProps = (state, props) => (
// eslint-disable-line
diff --git a/dist/components/cmd_bar/r06_predict_btn.js b/dist/components/cmd_bar/r06_predict_btn.js
index 0040036d..0a6b1163 100644
--- a/dist/components/cmd_bar/r06_predict_btn.js
+++ b/dist/components/cmd_bar/r06_predict_btn.js
@@ -21,6 +21,7 @@ var _extractPeaksEdit = require("../../helpers/extractPeaksEdit");
var _ui = require("../../actions/ui");
var _list_ui = require("../../constants/list_ui");
var _chem = require("../../helpers/chem");
+var _jsxRuntime = require("react/jsx-runtime");
/* eslint-disable prefer-object-spread, function-paren-newline,
max-len, react/function-component-definition,
function-call-argument-newline, react/require-default-props */
@@ -100,57 +101,70 @@ const onClicUnknown = (feature, forecast, peaksEdit, layoutSt, scan, shiftSt, th
curveSt
});
};
-const counterText = (classes, isIr, realCount, uniqCount, simuCount) => isIr ? null : /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt')
-}, `${realCount}/${uniqCount}/${simuCount}`);
-const renderBtnPredict = (classes, isIr, realCount, uniqCount, simuCount, color, btnWidthCls, onClick) => /*#__PURE__*/_react.default.createElement(_material.Tooltip, {
- title: /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("span", {
- className: "txt-sv-tp"
- }, "Predict"), /*#__PURE__*/_react.default.createElement("br", null), /*#__PURE__*/_react.default.createElement("span", {
- className: "txt-sv-tp"
- }, "- Selected features must be eqal or less than simulated features."))
-}, /*#__PURE__*/_react.default.createElement(MuPredictButton, {
- className: (0, _classnames.default)('btn-sv-bar-submit', btnWidthCls),
- style: {
- color
- },
- onClick: onClick
-}, counterText(classes, isIr, realCount, uniqCount, simuCount), /*#__PURE__*/_react.default.createElement(_GpsFixedOutlined.default, {
- className: classes.icon
-})));
-const renderBtnUnknown = (classes, onClick) => /*#__PURE__*/_react.default.createElement(_material.Tooltip, {
- title: /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("span", {
- className: "txt-sv-tp"
- }, "Refresh Simulation"), /*#__PURE__*/_react.default.createElement("br", null), /*#__PURE__*/_react.default.createElement("span", {
- className: "txt-sv-tp"
- }, "- Simulation must be refreshed before making a prediction."), /*#__PURE__*/_react.default.createElement("br", null), /*#__PURE__*/_react.default.createElement("span", {
- className: "txt-sv-tp"
- }, "- If you continue to see this button after clicking it, the server is not ready. Please wait for a while."))
-}, /*#__PURE__*/_react.default.createElement(MuPredictButton, {
- className: (0, _classnames.default)('btn-sv-bar-submit', classes.btnWidthUnknown),
- style: {
- color: 'orange'
- },
- onClick: onClick
-}, /*#__PURE__*/_react.default.createElement(_HelpOutlineOutlined.default, {
- className: classes.icon
-})));
-const BtnPredict = _ref => {
- let {
- classes,
- feature,
- forecast,
- layoutSt,
- simulationSt,
- editPeakSt,
- scanSt,
- shiftSt,
- thresSt,
- integrationSt,
- multiplicitySt,
- setUiViewerTypeAct,
- curveSt
- } = _ref;
+const counterText = (classes, isIr, realCount, uniqCount, simuCount) => isIr ? null : /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt'),
+ children: `${realCount}/${uniqCount}/${simuCount}`
+});
+const renderBtnPredict = (classes, isIr, realCount, uniqCount, simuCount, color, btnWidthCls, onClick) => /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Tooltip, {
+ title: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: "txt-sv-tp",
+ children: "Predict"
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)("br", {}), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: "txt-sv-tp",
+ children: "- Selected features must be eqal or less than simulated features."
+ })]
+ }),
+ children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(MuPredictButton, {
+ className: (0, _classnames.default)('btn-sv-bar-submit', btnWidthCls),
+ style: {
+ color
+ },
+ onClick: onClick,
+ children: [counterText(classes, isIr, realCount, uniqCount, simuCount), /*#__PURE__*/(0, _jsxRuntime.jsx)(_GpsFixedOutlined.default, {
+ className: classes.icon
+ })]
+ })
+});
+const renderBtnUnknown = (classes, onClick) => /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Tooltip, {
+ title: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: "txt-sv-tp",
+ children: "Refresh Simulation"
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)("br", {}), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: "txt-sv-tp",
+ children: "- Simulation must be refreshed before making a prediction."
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)("br", {}), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: "txt-sv-tp",
+ children: "- If you continue to see this button after clicking it, the server is not ready. Please wait for a while."
+ })]
+ }),
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(MuPredictButton, {
+ className: (0, _classnames.default)('btn-sv-bar-submit', classes.btnWidthUnknown),
+ style: {
+ color: 'orange'
+ },
+ onClick: onClick,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_HelpOutlineOutlined.default, {
+ className: classes.icon
+ })
+ })
+});
+const BtnPredict = ({
+ classes,
+ feature,
+ forecast,
+ layoutSt,
+ simulationSt,
+ editPeakSt,
+ scanSt,
+ shiftSt,
+ thresSt,
+ integrationSt,
+ multiplicitySt,
+ setUiViewerTypeAct,
+ curveSt
+}) => {
const is13Cor1H = _format.default.is13CLayout(layoutSt) || _format.default.is1HLayout(layoutSt);
const isIr = _format.default.isIrLayout(layoutSt);
if (!(is13Cor1H || isIr)) return null;
diff --git a/dist/components/cmd_bar/r07_wavelength_btn.js b/dist/components/cmd_bar/r07_wavelength_btn.js
index 07c69af3..326026e6 100644
--- a/dist/components/cmd_bar/r07_wavelength_btn.js
+++ b/dist/components/cmd_bar/r07_wavelength_btn.js
@@ -16,6 +16,7 @@ var _wavelength = require("../../actions/wavelength");
var _format = _interopRequireDefault(require("../../helpers/format"));
var _common = require("./common");
var _list_wavelength = require("../../constants/list_wavelength");
+var _jsxRuntime = require("react/jsx-runtime");
/* eslint-disable prefer-object-spread, react/jsx-one-expression-per-line,
react/function-component-definition */
@@ -29,41 +30,44 @@ const styles = () => Object.assign({
}, _common.commonStyle);
const wavelengthSelect = (classes, waveLengthSt, layoutSt, updateWaveLengthAct) => {
if (!_format.default.isXRDLayout(layoutSt)) {
- return /*#__PURE__*/_react.default.createElement("i", null);
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)("i", {});
}
const onChange = e => updateWaveLengthAct(e.target.value);
- return /*#__PURE__*/_react.default.createElement(_material.FormControl, {
+ return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.FormControl, {
className: (0, _classnames.default)(classes.fieldLayout),
- variant: "outlined"
- }, /*#__PURE__*/_react.default.createElement(_material.InputLabel, {
- id: "select-wavelength-label",
- className: (0, _classnames.default)(classes.selectLabel, 'select-sv-bar-label')
- }, "Wavelength"), /*#__PURE__*/_react.default.createElement(_material.Select, {
- labelId: "select-wavelength-label",
- label: "Wavelength",
- value: waveLengthSt,
- onChange: onChange,
- className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-layout')
- }, _list_wavelength.LIST_WAVE_LENGTH.map(item => {
- // eslint-disable-line
- return /*#__PURE__*/_react.default.createElement(_material.MenuItem, {
- value: item
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout')
- }, item.label, " (", item.value, " ", item.unit, ")"));
- })));
-};
-const Wavelength = _ref => {
- let {
- classes,
- waveLengthSt,
- layoutSt,
- updateWaveLengthAct
- } = _ref;
- return /*#__PURE__*/_react.default.createElement("span", {
- className: classes.groupRight
- }, wavelengthSelect(classes, waveLengthSt, layoutSt, updateWaveLengthAct));
+ variant: "outlined",
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.InputLabel, {
+ id: "select-wavelength-label",
+ className: (0, _classnames.default)(classes.selectLabel, 'select-sv-bar-label'),
+ children: "Wavelength"
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Select, {
+ labelId: "select-wavelength-label",
+ label: "Wavelength",
+ value: waveLengthSt,
+ onChange: onChange,
+ className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-layout'),
+ children: _list_wavelength.LIST_WAVE_LENGTH.map(item => {
+ // eslint-disable-line
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
+ value: item,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
+ className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout'),
+ children: [item.label, " (", item.value, " ", item.unit, ")"]
+ })
+ });
+ })
+ })]
+ });
};
+const Wavelength = ({
+ classes,
+ waveLengthSt,
+ layoutSt,
+ updateWaveLengthAct
+}) => /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: classes.groupRight,
+ children: wavelengthSelect(classes, waveLengthSt, layoutSt, updateWaveLengthAct)
+});
const mapStateToProps = (state, props) => (
// eslint-disable-line
{
diff --git a/dist/components/cmd_bar/r08_change_axes.js b/dist/components/cmd_bar/r08_change_axes.js
index 7de2c8ba..970d0886 100644
--- a/dist/components/cmd_bar/r08_change_axes.js
+++ b/dist/components/cmd_bar/r08_change_axes.js
@@ -16,6 +16,7 @@ var _common = require("./common");
var _list_layout = require("../../constants/list_layout");
var _list_axes = require("../../constants/list_axes");
var _axes = require("../../actions/axes");
+var _jsxRuntime = require("react/jsx-runtime");
/* eslint-disable prefer-object-spread, react/jsx-one-expression-per-line,
react/function-component-definition,
max-len, no-unused-vars, no-multiple-empty-lines */
@@ -52,27 +53,31 @@ const axisX = (classes, layoutSt, axesUnitsSt, updateXAxisAct, curveSt) => {
const {
xUnit
} = selectedAxes;
- return /*#__PURE__*/_react.default.createElement(_material.FormControl, {
+ return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.FormControl, {
className: (0, _classnames.default)(classes.fieldLayout),
- variant: "outlined"
- }, /*#__PURE__*/_react.default.createElement(_material.Select, {
- labelId: "select-x-axis-label",
- label: "x-Axis",
- value: xUnit,
- onChange: onChange,
- className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-layout')
- }, options.map(item => {
- // eslint-disable-line
- return /*#__PURE__*/_react.default.createElement(_material.MenuItem, {
- value: item,
- key: item
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout')
- }, item === '' ? 'Default' : item));
- })), /*#__PURE__*/_react.default.createElement(_material.InputLabel, {
- id: "select-x-axis-label",
- className: (0, _classnames.default)(classes.txtLabelTopInput)
- }, "x-Axis"));
+ variant: "outlined",
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Select, {
+ labelId: "select-x-axis-label",
+ label: "x-Axis",
+ value: xUnit,
+ onChange: onChange,
+ className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-layout'),
+ children: options.map(item => {
+ // eslint-disable-line
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
+ value: item,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout'),
+ children: item === '' ? 'Default' : item
+ })
+ }, item);
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.InputLabel, {
+ id: "select-x-axis-label",
+ className: (0, _classnames.default)(classes.txtLabelTopInput),
+ children: "x-Axis"
+ })]
+ });
};
const axisY = (classes, layoutSt, axesUnitsSt, updateYAxisAct, curveSt) => {
const optionsAxisX = _list_axes.LIST_AXES.y;
@@ -97,48 +102,52 @@ const axisY = (classes, layoutSt, axesUnitsSt, updateYAxisAct, curveSt) => {
const {
yUnit
} = selectedAxes;
- return /*#__PURE__*/_react.default.createElement(_material.FormControl, {
+ return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.FormControl, {
className: (0, _classnames.default)(classes.fieldLayout),
- variant: "outlined"
- }, /*#__PURE__*/_react.default.createElement(_material.Select, {
- labelId: "select-y-axis-label",
- label: "y-Axis",
- value: yUnit,
- onChange: onChange,
- className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-layout')
- }, options.map(item => {
- // eslint-disable-line
- return /*#__PURE__*/_react.default.createElement(_material.MenuItem, {
- value: item,
- key: item
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout')
- }, item === '' ? 'Default' : item));
- })), /*#__PURE__*/_react.default.createElement(_material.InputLabel, {
- id: "select-y-axis-label",
- className: (0, _classnames.default)(classes.txtLabelTopInput)
- }, "y-Axis"));
+ variant: "outlined",
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Select, {
+ labelId: "select-y-axis-label",
+ label: "y-Axis",
+ value: yUnit,
+ onChange: onChange,
+ className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-layout'),
+ children: options.map(item => {
+ // eslint-disable-line
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
+ value: item,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout'),
+ children: item === '' ? 'Default' : item
+ })
+ }, item);
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.InputLabel, {
+ id: "select-y-axis-label",
+ className: (0, _classnames.default)(classes.txtLabelTopInput),
+ children: "y-Axis"
+ })]
+ });
};
const showSelect = (classes, layoutSt, curveSt, axesUnitsSt, updateXAxisAct, updateYAxisAct) => {
if (!listLayoutToShow.includes(layoutSt)) {
- return /*#__PURE__*/_react.default.createElement("i", null);
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)("i", {});
}
- return /*#__PURE__*/_react.default.createElement("span", null, axisX(classes, layoutSt, axesUnitsSt, updateXAxisAct, curveSt), axisY(classes, layoutSt, axesUnitsSt, updateYAxisAct, curveSt));
-};
-const ChangeAxes = _ref => {
- let {
- classes,
- layoutSt,
- curveSt,
- axesUnitsSt,
- updateXAxisAct,
- updateYAxisAct
- } = _ref;
- return /*#__PURE__*/_react.default.createElement("span", {
- className: classes.groupRight,
- "data-testid": "ChangeAxes"
- }, showSelect(classes, layoutSt, curveSt, axesUnitsSt, updateXAxisAct, updateYAxisAct));
+ return /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
+ children: [axisX(classes, layoutSt, axesUnitsSt, updateXAxisAct, curveSt), axisY(classes, layoutSt, axesUnitsSt, updateYAxisAct, curveSt)]
+ });
};
+const ChangeAxes = ({
+ classes,
+ layoutSt,
+ curveSt,
+ axesUnitsSt,
+ updateXAxisAct,
+ updateYAxisAct
+}) => /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: classes.groupRight,
+ "data-testid": "ChangeAxes",
+ children: showSelect(classes, layoutSt, curveSt, axesUnitsSt, updateXAxisAct, updateYAxisAct)
+});
const mapStateToProps = (state, props) => (
// eslint-disable-line
{
diff --git a/dist/components/cmd_bar/r09_detector.js b/dist/components/cmd_bar/r09_detector.js
index 28f1a606..3efdcf7c 100644
--- a/dist/components/cmd_bar/r09_detector.js
+++ b/dist/components/cmd_bar/r09_detector.js
@@ -16,6 +16,7 @@ var _detector = require("../../actions/detector");
var _format = _interopRequireDefault(require("../../helpers/format"));
var _common = require("./common");
var _list_detectors = require("../../constants/list_detectors");
+var _jsxRuntime = require("react/jsx-runtime");
/* eslint-disable prefer-object-spread, react/jsx-one-expression-per-line,
react/function-component-definition */
@@ -29,7 +30,7 @@ const styles = () => Object.assign({
}, _common.commonStyle);
const detectorSelect = (classes, detectorSt, curveSt, layoutSt, updateDetectorAct) => {
if (!_format.default.isSECLayout(layoutSt)) {
- return /*#__PURE__*/_react.default.createElement("i", null);
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)("i", {});
}
const {
curveIdx
@@ -46,39 +47,43 @@ const detectorSelect = (classes, detectorSt, curveSt, layoutSt, updateDetectorAc
curveIdx,
selectedDetector: e.target.value
});
- return /*#__PURE__*/_react.default.createElement(_material.FormControl, {
- className: (0, _classnames.default)(classes.fieldLayout)
- }, /*#__PURE__*/_react.default.createElement(_material.InputLabel, {
- id: "select-detector-label",
- className: (0, _classnames.default)(classes.selectLabel, 'select-sv-bar-label')
- }, "Detector"), /*#__PURE__*/_react.default.createElement(_material.Select, {
- labelId: "select-detector-label",
- label: "Detector",
- value: selectedDetector,
- onChange: onChange,
- className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-layout')
- }, /*#__PURE__*/_react.default.createElement(_material.MenuItem, {
- value: ""
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout')
- })), _list_detectors.LIST_DETECTORS.map(item => /*#__PURE__*/_react.default.createElement(_material.MenuItem, {
- value: item
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout')
- }, item.name)))));
-};
-const Detector = _ref => {
- let {
- classes,
- detectorSt,
- curveSt,
- layoutSt,
- updateDetectorAct
- } = _ref;
- return /*#__PURE__*/_react.default.createElement("span", {
- className: classes.groupRight
- }, detectorSelect(classes, detectorSt, curveSt, layoutSt, updateDetectorAct));
+ return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.FormControl, {
+ className: (0, _classnames.default)(classes.fieldLayout),
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.InputLabel, {
+ id: "select-detector-label",
+ className: (0, _classnames.default)(classes.selectLabel, 'select-sv-bar-label'),
+ children: "Detector"
+ }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Select, {
+ labelId: "select-detector-label",
+ label: "Detector",
+ value: selectedDetector,
+ onChange: onChange,
+ className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-layout'),
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
+ value: "",
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout')
+ })
+ }), _list_detectors.LIST_DETECTORS.map(item => /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
+ value: item,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout'),
+ children: item.name
+ })
+ }))]
+ })]
+ });
};
+const Detector = ({
+ classes,
+ detectorSt,
+ curveSt,
+ layoutSt,
+ updateDetectorAct
+}) => /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: classes.groupRight,
+ children: detectorSelect(classes, detectorSt, curveSt, layoutSt, updateDetectorAct)
+});
const mapStateToProps = (state, _props) => (
// eslint-disable-line
{
diff --git a/dist/components/cmd_bar/tri_btn.js b/dist/components/cmd_bar/tri_btn.js
index 177374d9..64800f48 100644
--- a/dist/components/cmd_bar/tri_btn.js
+++ b/dist/components/cmd_bar/tri_btn.js
@@ -14,6 +14,7 @@ var _styles = require("@mui/styles");
var _Tooltip = _interopRequireDefault(require("@mui/material/Tooltip"));
var _cfg = _interopRequireDefault(require("../../helpers/cfg"));
var _common = require("./common");
+var _jsxRuntime = require("react/jsx-runtime");
/* eslint-disable prefer-object-spread */
const styles = () => Object.assign({
@@ -58,16 +59,21 @@ class TriBtn extends _react.default.Component {
const {
tp
} = content;
- const title = /*#__PURE__*/_react.default.createElement("span", {
- className: "txt-sv-tp"
- }, tp);
- return /*#__PURE__*/_react.default.createElement(_Tooltip.default, {
- title: title
- }, /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement(_common.MuButton, {
- className: (0, _classnames.default)('btn-sv-bar-one'),
- disabled: isClearAllDisabled === false ? false : _cfg.default.btnCmdMpy(layoutSt) && _cfg.default.btnCmdIntg(layoutSt),
- onClick: this.onToggle
- }, children)));
+ const title = /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: "txt-sv-tp",
+ children: tp
+ });
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Tooltip.default, {
+ title: title,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_common.MuButton, {
+ className: (0, _classnames.default)('btn-sv-bar-one'),
+ disabled: isClearAllDisabled === false ? false : _cfg.default.btnCmdMpy(layoutSt) && _cfg.default.btnCmdIntg(layoutSt),
+ onClick: this.onToggle,
+ children: children
+ })
+ })
+ });
}
renderStageTwo() {
const {
@@ -79,21 +85,27 @@ class TriBtn extends _react.default.Component {
cb();
this.onToggle(e);
};
- return /*#__PURE__*/_react.default.createElement("span", {
- disabled: _cfg.default.btnCmdMpy(layoutSt) && _cfg.default.btnCmdIntg(layoutSt)
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txtLabel, 'txt-sv-bar-desc')
- }, "Delete ALL?"), /*#__PURE__*/_react.default.createElement(_common.MuButton, {
- className: (0, _classnames.default)('btn-sv-bar-yes'),
- onClick: onExec
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txt, classes.btnYes, 'txt-sv-bar-yes')
- }, "Y")), /*#__PURE__*/_react.default.createElement(_common.MuButton, {
- className: (0, _classnames.default)('btn-sv-bar-no'),
- onClick: this.onToggle
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txt, classes.btnNo, 'txt-sv-bar-no')
- }, "N")));
+ return /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
+ disabled: _cfg.default.btnCmdMpy(layoutSt) && _cfg.default.btnCmdIntg(layoutSt),
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txtLabel, 'txt-sv-bar-desc'),
+ children: "Delete ALL?"
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_common.MuButton, {
+ className: (0, _classnames.default)('btn-sv-bar-yes'),
+ onClick: onExec,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txt, classes.btnYes, 'txt-sv-bar-yes'),
+ children: "Y"
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_common.MuButton, {
+ className: (0, _classnames.default)('btn-sv-bar-no'),
+ onClick: this.onToggle,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txt, classes.btnNo, 'txt-sv-bar-no'),
+ children: "N"
+ })
+ })]
+ });
}
render() {
const {
diff --git a/dist/components/common/comps.js b/dist/components/common/comps.js
index cfe2e321..c366d9f5 100644
--- a/dist/components/common/comps.js
+++ b/dist/components/common/comps.js
@@ -7,10 +7,9 @@ Object.defineProperty(exports, "__esModule", {
exports.TabLabel = void 0;
var _react = _interopRequireDefault(require("react"));
var _classnames = _interopRequireDefault(require("classnames"));
-const TabLabel = function (classes, label) {
- let extClsName = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'txt-tab-label';
- return /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.tabLabel, extClsName)
- }, label);
-};
+var _jsxRuntime = require("react/jsx-runtime");
+const TabLabel = (classes, label, extClsName = 'txt-tab-label') => /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.tabLabel, extClsName),
+ children: label
+});
exports.TabLabel = TabLabel;
\ No newline at end of file
diff --git a/dist/components/d3_line/index.js b/dist/components/d3_line/index.js
index 84c2b8df..d9648444 100644
--- a/dist/components/d3_line/index.js
+++ b/dist/components/d3_line/index.js
@@ -16,6 +16,7 @@ var _line_focus = _interopRequireDefault(require("./line_focus"));
var _draw = require("../common/draw");
var _list_ui = require("../../constants/list_ui");
var _cyclic_voltammetry = require("../../actions/cyclic_voltammetry");
+var _jsxRuntime = require("react/jsx-runtime");
/* eslint-disable no-mixed-operators */
const W = Math.round(window.innerWidth * 0.90 * 9 / 12); // ROI
@@ -171,7 +172,7 @@ class ViewerLine extends _react.default.Component {
}
}
render() {
- return /*#__PURE__*/_react.default.createElement("div", {
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
className: "d3Line"
});
}
diff --git a/dist/components/d3_line/line_focus.js b/dist/components/d3_line/line_focus.js
index 554587a9..4f4d40db 100644
--- a/dist/components/d3_line/line_focus.js
+++ b/dist/components/d3_line/line_focus.js
@@ -306,7 +306,7 @@ class LineFocus {
sameDtPk,
sameSfPk
} = this.shouldUpdate;
- if (!_format.default.isCyclicVoltaLayout(this.layout) && sameXY && sameEpSt && sameDtPk && sameSfPk) return;
+ if (!(_format.default.isCyclicVoltaLayout(this.layout) || _format.default.isLSVLayout(this.layout)) && sameXY && sameEpSt && sameDtPk && sameSfPk) return;
// rescale for zoom
const {
@@ -596,25 +596,24 @@ 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.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.GC, _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.LSV, _list_layout.LIST_LAYOUT.CDS, _list_layout.LIST_LAYOUT.DLS_ACF, _list_layout.LIST_LAYOUT.SEC, _list_layout.LIST_LAYOUT.GC, _list_layout.LIST_LAYOUT.EMISSIONS, _list_layout.LIST_LAYOUT.DLS_INTENSITY].indexOf(layoutSt) < 0;
}
- create(_ref) {
- let {
- filterSeed,
- filterPeak,
- tTrEndPts,
- tSfPeaks,
- freq,
- comparisons,
- editPeakSt,
- layoutSt,
- integationSt,
- mtplySt,
- sweepExtentSt,
- isUiAddIntgSt,
- isUiNoBrushSt,
- wavelength
- } = _ref;
+ create({
+ filterSeed,
+ filterPeak,
+ tTrEndPts,
+ tSfPeaks,
+ freq,
+ comparisons,
+ editPeakSt,
+ layoutSt,
+ integationSt,
+ mtplySt,
+ sweepExtentSt,
+ isUiAddIntgSt,
+ isUiNoBrushSt,
+ wavelength
+ }) {
this.svg = d3.select('.d3Svg');
(0, _mount.MountMainFrame)(this, 'focus');
(0, _mount.MountClip)(this);
@@ -645,23 +644,22 @@ class LineFocus {
(0, _brush.default)(this, isUiAddIntgSt, isUiNoBrushSt);
this.resetShouldUpdate(editPeakSt, integationSt, mtplySt);
}
- update(_ref2) {
- let {
- filterSeed,
- filterPeak,
- tTrEndPts,
- tSfPeaks,
- freq,
- comparisons,
- editPeakSt,
- layoutSt,
- integationSt,
- mtplySt,
- sweepExtentSt,
- isUiAddIntgSt,
- isUiNoBrushSt,
- wavelength
- } = _ref2;
+ update({
+ filterSeed,
+ filterPeak,
+ tTrEndPts,
+ tSfPeaks,
+ freq,
+ comparisons,
+ editPeakSt,
+ layoutSt,
+ integationSt,
+ mtplySt,
+ sweepExtentSt,
+ isUiAddIntgSt,
+ isUiNoBrushSt,
+ wavelength
+ }) {
this.root = d3.select(this.rootKlass).selectAll('.focus-main');
this.scales = (0, _init.InitScale)(this, this.reverseXAxis(layoutSt));
this.setDataParams(filterSeed, filterPeak, tTrEndPts, tSfPeaks, freq, layoutSt, wavelength);
diff --git a/dist/components/d3_multi/index.js b/dist/components/d3_multi/index.js
index 590d1c12..fd796cdf 100644
--- a/dist/components/d3_multi/index.js
+++ b/dist/components/d3_multi/index.js
@@ -16,6 +16,7 @@ var _list_ui = require("../../constants/list_ui");
var _cyclic_voltammetry = require("../../actions/cyclic_voltammetry");
var _multi_focus = _interopRequireDefault(require("./multi_focus"));
var _draw = require("../common/draw");
+var _jsxRuntime = require("react/jsx-runtime");
/* eslint-disable no-mixed-operators, react/require-default-props,
react/no-unused-prop-types */
@@ -191,7 +192,7 @@ class ViewerMulti extends _react.default.Component {
}
}
render() {
- return /*#__PURE__*/_react.default.createElement("div", {
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
className: "d3Line"
});
}
diff --git a/dist/components/d3_multi/multi_focus.js b/dist/components/d3_multi/multi_focus.js
index 6ae38d83..552637bb 100644
--- a/dist/components/d3_multi/multi_focus.js
+++ b/dist/components/d3_multi/multi_focus.js
@@ -158,8 +158,7 @@ class MultiFocus {
this.tip = (0, _init.InitTip)();
this.root.call(this.tip);
}
- setDataParams(filterSeed, peaks, tTrEndPts, tSfPeaks, layout, cyclicvoltaSt) {
- let jcampIdx = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : 0;
+ setDataParams(filterSeed, peaks, tTrEndPts, tSfPeaks, layout, cyclicvoltaSt, jcampIdx = 0) {
this.data = [];
this.otherLineData = [];
let filterSubLayoutValue = null;
@@ -310,7 +309,7 @@ class MultiFocus {
event.stopPropagation();
event.preventDefault();
const onPeak = true;
- if (this.layout === _list_layout.LIST_LAYOUT.CYCLIC_VOLTAMMETRY) {
+ if (this.layout === _list_layout.LIST_LAYOUT.CYCLIC_VOLTAMMETRY || this.layout === _list_layout.LIST_LAYOUT.LSV) {
const {
spectraList
} = this.cyclicvoltaSt;
@@ -404,7 +403,7 @@ class MultiFocus {
sameDtPk,
sameSfPk
} = this.shouldUpdate;
- if (!_format.default.isCyclicVoltaLayout(this.layout) && sameXY && sameEpSt && sameDtPk && sameSfPk) return;
+ if (!(_format.default.isCyclicVoltaLayout(this.layout) || _format.default.isLSVLayout(this.layout)) && sameXY && sameEpSt && sameDtPk && sameSfPk) return;
// rescale for zoom
const {
@@ -506,7 +505,7 @@ class MultiFocus {
sameDtPk,
sameSfPk
} = this.shouldUpdate;
- if (!_format.default.isCyclicVoltaLayout(this.layout) && sameXY && sameEpSt && sameDtPk && sameSfPk) return;
+ if (!(_format.default.isCyclicVoltaLayout(this.layout) || _format.default.isLSVLayout(this.layout)) && sameXY && sameEpSt && sameDtPk && sameSfPk) return;
// rescale for zoom
const {
@@ -809,23 +808,22 @@ 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.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.GC, _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.LSV, _list_layout.LIST_LAYOUT.CDS, _list_layout.LIST_LAYOUT.SEC, _list_layout.LIST_LAYOUT.GC, _list_layout.LIST_LAYOUT.AIF].indexOf(layoutSt) < 0;
}
- create(_ref) {
- let {
- curveSt,
- filterSeed,
- filterPeak,
- tTrEndPts,
- tSfPeaks,
- editPeakSt,
- layoutSt,
- sweepExtentSt,
- isUiNoBrushSt,
- cyclicvoltaSt,
- integationSt,
- mtplySt
- } = _ref;
+ create({
+ curveSt,
+ filterSeed,
+ filterPeak,
+ tTrEndPts,
+ tSfPeaks,
+ editPeakSt,
+ layoutSt,
+ sweepExtentSt,
+ isUiNoBrushSt,
+ cyclicvoltaSt,
+ integationSt,
+ mtplySt
+ }) {
this.svg = d3.select(this.rootKlass).select('.d3Svg');
(0, _mount.MountMainFrame)(this, 'focus');
(0, _mount.MountClip)(this);
@@ -863,22 +861,21 @@ class MultiFocus {
(0, _brush.default)(this, false, isUiNoBrushSt);
this.resetShouldUpdate(editPeakSt);
}
- update(_ref2) {
- let {
- entities,
- curveSt,
- filterSeed,
- filterPeak,
- tTrEndPts,
- tSfPeaks,
- editPeakSt,
- layoutSt,
- sweepExtentSt,
- isUiNoBrushSt,
- cyclicvoltaSt,
- integationSt,
- mtplySt
- } = _ref2;
+ update({
+ entities,
+ curveSt,
+ filterSeed,
+ filterPeak,
+ tTrEndPts,
+ tSfPeaks,
+ editPeakSt,
+ layoutSt,
+ sweepExtentSt,
+ isUiNoBrushSt,
+ cyclicvoltaSt,
+ integationSt,
+ mtplySt
+ }) {
this.root = d3.select(this.rootKlass).selectAll('.focus-main');
this.scales = (0, _init.InitScale)(this, this.reverseXAxis(layoutSt));
const {
diff --git a/dist/components/d3_rect/index.js b/dist/components/d3_rect/index.js
index 1cb94605..8c537de3 100644
--- a/dist/components/d3_rect/index.js
+++ b/dist/components/d3_rect/index.js
@@ -15,6 +15,7 @@ var _ui = require("../../actions/ui");
var _rect_focus = _interopRequireDefault(require("./rect_focus"));
var _draw = require("../common/draw");
var _list_ui = require("../../constants/list_ui");
+var _jsxRuntime = require("react/jsx-runtime");
/* eslint-disable no-mixed-operators */
const W = Math.round(window.innerWidth * 0.90 * 9 / 12); // ROI
@@ -110,7 +111,7 @@ class ViewerRect extends _react.default.Component {
}
}
render() {
- return /*#__PURE__*/_react.default.createElement("div", {
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
className: "d3Rect"
});
}
diff --git a/dist/components/d3_rect/rect_focus.js b/dist/components/d3_rect/rect_focus.js
index 29d25af2..bc58f31e 100644
--- a/dist/components/d3_rect/rect_focus.js
+++ b/dist/components/d3_rect/rect_focus.js
@@ -169,16 +169,15 @@ class RectFocus {
this.dataPks = (0, _converter.PksEdit)(this.dataPks, editPeakSt);
return this.dataPks;
}
- create(_ref) {
- let {
- filterSeed,
- filterPeak,
- tTrEndPts,
- tSfPeaks,
- sweepExtentSt,
- isUiAddIntgSt,
- isUiNoBrushSt
- } = _ref;
+ create({
+ filterSeed,
+ filterPeak,
+ tTrEndPts,
+ tSfPeaks,
+ sweepExtentSt,
+ isUiAddIntgSt,
+ isUiNoBrushSt
+ }) {
this.svg = d3.select('.d3Svg');
(0, _mount.MountMainFrame)(this, 'focus');
(0, _mount.MountClip)(this);
@@ -201,16 +200,15 @@ class RectFocus {
}
(0, _brush.default)(this, isUiAddIntgSt, isUiNoBrushSt);
}
- update(_ref2) {
- let {
- filterSeed,
- filterPeak,
- tTrEndPts,
- tSfPeaks,
- sweepExtentSt,
- isUiAddIntgSt,
- isUiNoBrushSt
- } = _ref2;
+ update({
+ filterSeed,
+ filterPeak,
+ tTrEndPts,
+ tSfPeaks,
+ sweepExtentSt,
+ isUiAddIntgSt,
+ isUiNoBrushSt
+ }) {
this.root = d3.select(this.rootKlass).selectAll('.focus-main');
this.setDataParams(filterSeed, filterPeak, tTrEndPts, tSfPeaks);
if (this.data && this.data.length > 0) {
diff --git a/dist/components/forecast/comps.js b/dist/components/forecast/comps.js
index eb711478..263de551 100644
--- a/dist/components/forecast/comps.js
+++ b/dist/components/forecast/comps.js
@@ -16,6 +16,7 @@ var _Help = _interopRequireDefault(require("@mui/icons-material/Help"));
var _material = require("@mui/material");
var _CloudOff = _interopRequireDefault(require("@mui/icons-material/CloudOff"));
var _section_loading = _interopRequireDefault(require("./section_loading"));
+var _jsxRuntime = require("react/jsx-runtime");
/* eslint-disable react/function-component-definition, react/destructuring-assignment,
max-len */
@@ -33,157 +34,193 @@ const titleStyle = {
const txtStyle = {
lineHeight: '20px'
};
-const TxtLabel = function (classes, label) {
- let extClsName = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'txt-label';
- return /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txtLabel, extClsName)
- }, label);
-};
+const TxtLabel = (classes, label, extClsName = 'txt-label') => /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txtLabel, extClsName),
+ children: label
+});
exports.TxtLabel = TxtLabel;
const StatusIcon = status => {
switch (status) {
case 'accept':
- return /*#__PURE__*/_react.default.createElement(_material.Tooltip, {
- title: /*#__PURE__*/_react.default.createElement("span", {
- className: "txt-sv-tp"
- }, "Accept"),
- placement: "left"
- }, /*#__PURE__*/_react.default.createElement(_CheckCircleOutline.default, {
- style: {
- color: '#4caf50'
- }
- }));
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Tooltip, {
+ title: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: "txt-sv-tp",
+ children: "Accept"
+ }),
+ placement: "left",
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CheckCircleOutline.default, {
+ style: {
+ color: '#4caf50'
+ }
+ })
+ });
case 'warning':
- return /*#__PURE__*/_react.default.createElement(_material.Tooltip, {
- title: /*#__PURE__*/_react.default.createElement("span", {
- className: "txt-sv-tp"
- }, "Warning"),
- placement: "left"
- }, /*#__PURE__*/_react.default.createElement(_ErrorOutline.default, {
- style: {
- color: '#ffc107'
- }
- }));
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Tooltip, {
+ title: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: "txt-sv-tp",
+ children: "Warning"
+ }),
+ placement: "left",
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_ErrorOutline.default, {
+ style: {
+ color: '#ffc107'
+ }
+ })
+ });
case 'reject':
- return /*#__PURE__*/_react.default.createElement(_material.Tooltip, {
- title: /*#__PURE__*/_react.default.createElement("span", {
- className: "txt-sv-tp"
- }, "Reject"),
- placement: "left"
- }, /*#__PURE__*/_react.default.createElement(_HighlightOff.default, {
- style: {
- color: '#e91e63'
- }
- }));
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Tooltip, {
+ title: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: "txt-sv-tp",
+ children: "Reject"
+ }),
+ placement: "left",
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_HighlightOff.default, {
+ style: {
+ color: '#e91e63'
+ }
+ })
+ });
case 'missing':
- return /*#__PURE__*/_react.default.createElement(_material.Tooltip, {
- title: /*#__PURE__*/_react.default.createElement("span", {
- className: "txt-sv-tp"
- }, "Missing"),
- placement: "left"
- }, /*#__PURE__*/_react.default.createElement(_HelpOutline.default, {
- style: {
- color: '#5d4037'
- }
- }));
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Tooltip, {
+ title: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: "txt-sv-tp",
+ children: "Missing"
+ }),
+ placement: "left",
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_HelpOutline.default, {
+ style: {
+ color: '#5d4037'
+ }
+ })
+ });
case 'unknown':
- return /*#__PURE__*/_react.default.createElement(_material.Tooltip, {
- title: /*#__PURE__*/_react.default.createElement("span", {
- className: "txt-sv-tp"
- }, "Not Support"),
- placement: "left"
- }, /*#__PURE__*/_react.default.createElement(_Help.default, {
- style: {
- color: '#5d4037'
- }
- }));
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Tooltip, {
+ title: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: "txt-sv-tp",
+ children: "Not Support"
+ }),
+ placement: "left",
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Help.default, {
+ style: {
+ color: '#5d4037'
+ }
+ })
+ });
default:
return null;
}
};
exports.StatusIcon = StatusIcon;
-const ConfidenceLabel = function (classes, confidence) {
- let extClsName = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'txt-label';
- if (!confidence) return /*#__PURE__*/_react.default.createElement("span", null, " - - ");
+const ConfidenceLabel = (classes, confidence, extClsName = 'txt-label') => {
+ if (!confidence) return /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ children: " - - "
+ });
const confidenceDp = parseFloat(Math.round(confidence * 100) / 100).toFixed(2);
- return /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txtLabel, extClsName)
- }, `${confidenceDp} %`);
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txtLabel, extClsName),
+ children: `${confidenceDp} %`
+ });
};
exports.ConfidenceLabel = ConfidenceLabel;
const sectionInput = (classes, molecule, inputFuncCb) => {
if (!inputFuncCb) return null;
- return /*#__PURE__*/_react.default.createElement("div", {
- className: (0, _classnames.default)(classes.inputRoot)
- }, /*#__PURE__*/_react.default.createElement(_material.Grid, {
- container: true
- }, /*#__PURE__*/_react.default.createElement(_material.Grid, {
- item: true,
- xs: 6
- }, /*#__PURE__*/_react.default.createElement(_material.TextField, {
- fullWidth: true,
- label: TxtLabel(classes, 'Molfile', 'txt-mol-label'),
- margin: "normal",
- multiline: true,
- onChange: inputFuncCb,
- rows: "2",
- variant: "outlined",
- value: molecule
- }))));
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+ className: (0, _classnames.default)(classes.inputRoot),
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Grid, {
+ container: true,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Grid, {
+ item: true,
+ xs: 6,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TextField, {
+ fullWidth: true,
+ label: TxtLabel(classes, 'Molfile', 'txt-mol-label'),
+ margin: "normal",
+ multiline: true,
+ onChange: inputFuncCb,
+ rows: "2",
+ variant: "outlined",
+ value: molecule
+ })
+ })
+ })
+ });
};
exports.sectionInput = sectionInput;
-const SectionRunning = () => /*#__PURE__*/_react.default.createElement("div", {
- style: titleStyle
-}, /*#__PURE__*/_react.default.createElement("h2", {
- style: txtStyle
-}, /*#__PURE__*/_react.default.createElement(_material.CircularProgress, {
- style: {
- color: 'blue',
- fontSize: 50
- }
-}), /*#__PURE__*/_react.default.createElement("br", null), /*#__PURE__*/_react.default.createElement("br", null), /*#__PURE__*/_react.default.createElement("p", null, "The server is making predictions...")));
-const SectionMissMatch = () => /*#__PURE__*/_react.default.createElement("div", {
- style: titleStyle
-}, /*#__PURE__*/_react.default.createElement("h2", {
- style: txtStyle
-}, /*#__PURE__*/_react.default.createElement(_ErrorOutline.default, {
- style: {
- color: 'red',
- fontSize: 50
- }
-}), /*#__PURE__*/_react.default.createElement("p", {
- className: "txt-predict-fail"
-}, "Peak & Element count mismatch!"), /*#__PURE__*/_react.default.createElement("p", {
- className: "txt-predict-fail"
-}, /*#__PURE__*/_react.default.createElement("sup", null, "1"), "H multiplicity count should not be more than the proton group count. Multiplicity must be assigned manulally before predictions."), /*#__PURE__*/_react.default.createElement("p", {
- className: "txt-predict-fail"
-}, /*#__PURE__*/_react.default.createElement("sup", null, "13"), "C peak count should not be more than the carbon count, and solvent peaks should be excluded.")));
-const SectionNoService = () => /*#__PURE__*/_react.default.createElement("div", {
- style: titleStyle
-}, /*#__PURE__*/_react.default.createElement("h2", {
- style: txtStyle
-}, /*#__PURE__*/_react.default.createElement(_CloudOff.default, {
- style: {
- color: 'red',
- fontSize: 50
- }
-}), /*#__PURE__*/_react.default.createElement("p", null, "Service is not available."), /*#__PURE__*/_react.default.createElement("p", null, "Please try it again later.")));
-const SectionUnknown = () => /*#__PURE__*/_react.default.createElement("div", {
- style: titleStyle
-}, /*#__PURE__*/_react.default.createElement("h2", {
- style: txtStyle
-}, /*#__PURE__*/_react.default.createElement(_HelpOutline.default, {
- style: {
- color: 'purple',
- fontSize: 50
- }
-}), /*#__PURE__*/_react.default.createElement("p", null, "Unknown state.")));
+const SectionRunning = () => /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+ style: titleStyle,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("h2", {
+ style: txtStyle,
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.CircularProgress, {
+ style: {
+ color: 'blue',
+ fontSize: 50
+ }
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)("br", {}), /*#__PURE__*/(0, _jsxRuntime.jsx)("br", {}), /*#__PURE__*/(0, _jsxRuntime.jsx)("p", {
+ children: "The server is making predictions..."
+ })]
+ })
+});
+const SectionMissMatch = () => /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+ style: titleStyle,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("h2", {
+ style: txtStyle,
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_ErrorOutline.default, {
+ style: {
+ color: 'red',
+ fontSize: 50
+ }
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)("p", {
+ className: "txt-predict-fail",
+ children: "Peak & Element count mismatch!"
+ }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("p", {
+ className: "txt-predict-fail",
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("sup", {
+ children: "1"
+ }), "H multiplicity count should not be more than the proton group count. Multiplicity must be assigned manulally before predictions."]
+ }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("p", {
+ className: "txt-predict-fail",
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("sup", {
+ children: "13"
+ }), "C peak count should not be more than the carbon count, and solvent peaks should be excluded."]
+ })]
+ })
+});
+const SectionNoService = () => /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+ style: titleStyle,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("h2", {
+ style: txtStyle,
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_CloudOff.default, {
+ style: {
+ color: 'red',
+ fontSize: 50
+ }
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)("p", {
+ children: "Service is not available."
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)("p", {
+ children: "Please try it again later."
+ })]
+ })
+});
+const SectionUnknown = () => /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+ style: titleStyle,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("h2", {
+ style: txtStyle,
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_HelpOutline.default, {
+ style: {
+ color: 'purple',
+ fontSize: 50
+ }
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)("p", {
+ children: "Unknown state."
+ })]
+ })
+});
const notToRenderAnalysis = pds => {
- if (pds.running) return /*#__PURE__*/_react.default.createElement(SectionRunning, null);
- if (!pds.outline || !pds.outline.code) return /*#__PURE__*/_react.default.createElement("div", null);
- if (pds.outline.code >= 500) return /*#__PURE__*/_react.default.createElement(SectionNoService, null);
- if (pds.outline.code === 400) return /*#__PURE__*/_react.default.createElement(SectionMissMatch, null);
- if (pds.outline.code >= 300) return /*#__PURE__*/_react.default.createElement(SectionUnknown, null);
+ if (pds.running) return /*#__PURE__*/(0, _jsxRuntime.jsx)(SectionRunning, {});
+ if (!pds.outline || !pds.outline.code) return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {});
+ if (pds.outline.code >= 500) return /*#__PURE__*/(0, _jsxRuntime.jsx)(SectionNoService, {});
+ if (pds.outline.code === 400) return /*#__PURE__*/(0, _jsxRuntime.jsx)(SectionMissMatch, {});
+ if (pds.outline.code >= 300) return /*#__PURE__*/(0, _jsxRuntime.jsx)(SectionUnknown, {});
return false;
};
exports.notToRenderAnalysis = notToRenderAnalysis;
@@ -192,8 +229,8 @@ const sectionSvg = (classes, predictions) => {
if (renderMsg) return null;
if (!predictions.output) return null;
const targetSvg = predictions.output.result[0].svgs[0];
- if (!targetSvg) return /*#__PURE__*/_react.default.createElement(_section_loading.default, null);
- return /*#__PURE__*/_react.default.createElement(_reactSvgFileZoomPan.default, {
+ if (!targetSvg) return /*#__PURE__*/(0, _jsxRuntime.jsx)(_section_loading.default, {});
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactSvgFileZoomPan.default, {
svg: targetSvg,
duration: 300,
resize: true
diff --git a/dist/components/forecast/ir_comps.js b/dist/components/forecast/ir_comps.js
index 9c2b12e2..0b432458 100644
--- a/dist/components/forecast/ir_comps.js
+++ b/dist/components/forecast/ir_comps.js
@@ -15,46 +15,51 @@ var _CheckCircleOutline = _interopRequireDefault(require("@mui/icons-material/Ch
var _HighlightOff = _interopRequireDefault(require("@mui/icons-material/HighlightOff"));
var _comps = require("./comps");
var _forecast = require("../../actions/forecast");
+var _jsxRuntime = require("react/jsx-runtime");
/* eslint-disable react/function-component-definition, function-paren-newline,
prefer-object-spread */
// import SmaToSvg from '../common/chem';
-
-const baseSelectIrStatus = _ref => {
- let {
- sma,
- status,
- identity,
- setIrStatusAct
- } = _ref;
+const baseSelectIrStatus = ({
+ sma,
+ status,
+ identity,
+ setIrStatusAct
+}) => {
const theStatus = ['accept', 'reject'].includes(status) ? status : '';
- return /*#__PURE__*/_react.default.createElement(_material.FormControl, null, /*#__PURE__*/_react.default.createElement(_material.Select, {
- value: theStatus,
- onChange: e => {
- setIrStatusAct({
- predictions: {
- sma,
- identity,
- value: e.target.value
- },
- svgs: []
- });
- }
- }, /*#__PURE__*/_react.default.createElement(_material.MenuItem, {
- value: "accept"
- }, /*#__PURE__*/_react.default.createElement(_CheckCircleOutline.default, {
- style: {
- color: '#4caf50'
- }
- })), /*#__PURE__*/_react.default.createElement(_material.MenuItem, {
- value: "reject"
- }, /*#__PURE__*/_react.default.createElement(_HighlightOff.default, {
- style: {
- color: '#e91e63'
- }
- })), /*#__PURE__*/_react.default.createElement(_material.MenuItem, {
- value: ""
- }, /*#__PURE__*/_react.default.createElement("span", null))));
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.FormControl, {
+ children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Select, {
+ value: theStatus,
+ onChange: e => {
+ setIrStatusAct({
+ predictions: {
+ sma,
+ identity,
+ value: e.target.value
+ },
+ svgs: []
+ });
+ },
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
+ value: "accept",
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CheckCircleOutline.default, {
+ style: {
+ color: '#4caf50'
+ }
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
+ value: "reject",
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_HighlightOff.default, {
+ style: {
+ color: '#e91e63'
+ }
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
+ value: "",
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {})
+ })]
+ })
+ });
};
const bssMapStateToProps = (state, props) => (
// eslint-disable-line
@@ -72,15 +77,23 @@ baseSelectIrStatus.defaultProps = {
status: ''
};
const SelectIrStatus = (0, _reactRedux.connect)(bssMapStateToProps, bssMapDispatchToProps)(baseSelectIrStatus);
-const IrTableHeader = classes => /*#__PURE__*/_react.default.createElement(_material.TableHead, null, /*#__PURE__*/_react.default.createElement(_material.TableRow, null, /*#__PURE__*/_react.default.createElement(_material.TableCell, null), /*#__PURE__*/_react.default.createElement(_material.TableCell, {
- align: "left"
-}, (0, _comps.TxtLabel)(classes, 'FG SMARTS', 'txt-prd-table-title')), /*#__PURE__*/_react.default.createElement(_material.TableCell, {
- align: "right"
-}, (0, _comps.TxtLabel)(classes, 'Machine Confidence', 'txt-prd-table-title')), /*#__PURE__*/_react.default.createElement(_material.TableCell, {
- align: "right"
-}, (0, _comps.TxtLabel)(classes, 'Machine', 'txt-prd-table-title')), /*#__PURE__*/_react.default.createElement(_material.TableCell, {
- align: "right"
-}, (0, _comps.TxtLabel)(classes, 'Owner', 'txt-prd-table-title'))));
+const IrTableHeader = classes => /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableHead, {
+ children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.TableRow, {
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
+ align: "left",
+ children: (0, _comps.TxtLabel)(classes, 'FG SMARTS', 'txt-prd-table-title')
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
+ align: "right",
+ children: (0, _comps.TxtLabel)(classes, 'Machine Confidence', 'txt-prd-table-title')
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
+ align: "right",
+ children: (0, _comps.TxtLabel)(classes, 'Machine', 'txt-prd-table-title')
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
+ align: "right",
+ children: (0, _comps.TxtLabel)(classes, 'Owner', 'txt-prd-table-title')
+ })]
+ })
+});
exports.IrTableHeader = IrTableHeader;
const colorStyles = [{
backgroundColor: '#FFFF00'
@@ -99,35 +112,41 @@ const colorStyles = [{
}, {
backgroundColor: '#F5F5DC'
}];
-const colorLabel = function (classes, idx) {
- let extClsName = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'txt-label';
+const colorLabel = (classes, idx, extClsName = 'txt-label') => {
const style = Object.assign({}, colorStyles[idx % 8], {
width: 20,
borderRadius: 20,
textAlign: 'center'
});
- return /*#__PURE__*/_react.default.createElement("div", {
- style: style
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txtLabel, extClsName)
- }, idx + 1));
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+ style: style,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txtLabel, extClsName),
+ children: idx + 1
+ })
+ });
};
-const IrTableBodyRow = (classes, idx, fg) => /*#__PURE__*/_react.default.createElement(_material.TableRow, {
- key: `${idx}-${fg.name}`
-}, /*#__PURE__*/_react.default.createElement(_material.TableCell, {
- component: "th",
- scope: "row"
-}, colorLabel(classes, idx)), /*#__PURE__*/_react.default.createElement(_material.TableCell, {
- align: "left"
-}, (0, _comps.TxtLabel)(classes, fg.sma, 'txt-prd-table-content')), /*#__PURE__*/_react.default.createElement(_material.TableCell, {
- align: "right"
-}, (0, _comps.ConfidenceLabel)(classes, fg.confidence, 'txt-prd-table-content')), /*#__PURE__*/_react.default.createElement(_material.TableCell, {
- align: "right"
-}, (0, _comps.StatusIcon)(fg.status)), /*#__PURE__*/_react.default.createElement(_material.TableCell, {
- align: "right"
-}, /*#__PURE__*/_react.default.createElement(SelectIrStatus, {
- sma: fg.sma,
- status: fg.statusOwner,
- identity: "Owner"
-})));
+const IrTableBodyRow = (classes, idx, fg) => /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.TableRow, {
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
+ component: "th",
+ scope: "row",
+ children: colorLabel(classes, idx)
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
+ align: "left",
+ children: (0, _comps.TxtLabel)(classes, fg.sma, 'txt-prd-table-content')
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
+ align: "right",
+ children: (0, _comps.ConfidenceLabel)(classes, fg.confidence, 'txt-prd-table-content')
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
+ align: "right",
+ children: (0, _comps.StatusIcon)(fg.status)
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
+ align: "right",
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(SelectIrStatus, {
+ sma: fg.sma,
+ status: fg.statusOwner,
+ identity: "Owner"
+ })
+ })]
+}, `${idx}-${fg.name}`);
exports.IrTableBodyRow = IrTableBodyRow;
\ No newline at end of file
diff --git a/dist/components/forecast/ir_viewer.js b/dist/components/forecast/ir_viewer.js
index 9caec92d..e1d9f482 100644
--- a/dist/components/forecast/ir_viewer.js
+++ b/dist/components/forecast/ir_viewer.js
@@ -14,6 +14,7 @@ var _styles = require("@mui/styles");
var _material = require("@mui/material");
var _comps = require("./comps");
var _ir_comps = require("./ir_comps");
+var _jsxRuntime = require("react/jsx-runtime");
const Styles = () => ({
root: {
overflowX: 'hidden',
@@ -62,36 +63,42 @@ const sectionTable = (classes, pds) => {
fgs
} = pds.output.result[0];
if (!fgs) return null;
- return /*#__PURE__*/_react.default.createElement(_material.Paper, {
- className: classes.tableRoot
- }, /*#__PURE__*/_react.default.createElement(_material.Table, {
- className: classes.table,
- size: "small"
- }, (0, _ir_comps.IrTableHeader)(classes), /*#__PURE__*/_react.default.createElement(_material.TableBody, null, fgs.sort((a, b) => b.confidence - a.confidence).map((fg, idx) => (0, _ir_comps.IrTableBodyRow)(classes, idx, fg)))));
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Paper, {
+ className: classes.tableRoot,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Table, {
+ className: classes.table,
+ size: "small",
+ children: [(0, _ir_comps.IrTableHeader)(classes), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableBody, {
+ children: fgs.sort((a, b) => b.confidence - a.confidence).map((fg, idx) => (0, _ir_comps.IrTableBodyRow)(classes, idx, fg))
+ })]
+ })
+ });
};
-const IrViewer = _ref => {
- let {
- // eslint-disable-line
- classes,
- molecule,
- inputCb,
- forecastSt
- } = _ref;
- return /*#__PURE__*/_react.default.createElement("div", {
- className: (0, _classnames.default)(classes.root, 'card-forecast-viewer')
- }, /*#__PURE__*/_react.default.createElement(_material.Grid, {
+const IrViewer = ({
+ // eslint-disable-line
+ classes,
+ molecule,
+ inputCb,
+ forecastSt
+}) => /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+ className: (0, _classnames.default)(classes.root, 'card-forecast-viewer'),
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Grid, {
className: (0, _classnames.default)(classes.container),
- container: true
- }, /*#__PURE__*/_react.default.createElement(_material.Grid, {
- item: true,
- xs: 4
- }, /*#__PURE__*/_react.default.createElement(_material.Paper, {
- className: classes.svgRoot
- }, (0, _comps.sectionSvg)(classes, forecastSt.predictions))), /*#__PURE__*/_react.default.createElement(_material.Grid, {
- item: true,
- xs: 8
- }, sectionTable(classes, forecastSt.predictions))), (0, _comps.sectionInput)(classes, molecule, inputCb));
-};
+ container: true,
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Grid, {
+ item: true,
+ xs: 4,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Paper, {
+ className: classes.svgRoot,
+ children: (0, _comps.sectionSvg)(classes, forecastSt.predictions)
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Grid, {
+ item: true,
+ xs: 8,
+ children: sectionTable(classes, forecastSt.predictions)
+ })]
+ }), (0, _comps.sectionInput)(classes, molecule, inputCb)]
+});
const mapStateToProps = (state, props) => (
// eslint-disable-line
{
diff --git a/dist/components/forecast/nmr_comps.js b/dist/components/forecast/nmr_comps.js
index f0cf960a..3ce7da6d 100644
--- a/dist/components/forecast/nmr_comps.js
+++ b/dist/components/forecast/nmr_comps.js
@@ -15,46 +15,52 @@ var _CheckCircleOutline = _interopRequireDefault(require("@mui/icons-material/Ch
var _HighlightOff = _interopRequireDefault(require("@mui/icons-material/HighlightOff"));
var _comps = require("./comps");
var _forecast = require("../../actions/forecast");
+var _jsxRuntime = require("react/jsx-runtime");
/* eslint-disable react/function-component-definition, react/destructuring-assignment */
-const baseSelectNmrStatus = _ref => {
- let {
- // eslint-disable-line
- idx,
- atom,
- status,
- identity,
- setNmrStatusAct
- } = _ref;
+const baseSelectNmrStatus = ({
+ // eslint-disable-line
+ idx,
+ atom,
+ status,
+ identity,
+ setNmrStatusAct
+}) => {
const theStatus = ['accept', 'reject'].includes(status) ? status : '';
- return /*#__PURE__*/_react.default.createElement(_material.FormControl, null, /*#__PURE__*/_react.default.createElement(_material.Select, {
- value: theStatus,
- onChange: e => {
- setNmrStatusAct({
- predictions: {
- idx,
- atom,
- identity,
- value: e.target.value
- },
- svgs: []
- });
- }
- }, /*#__PURE__*/_react.default.createElement(_material.MenuItem, {
- value: "accept"
- }, /*#__PURE__*/_react.default.createElement(_CheckCircleOutline.default, {
- style: {
- color: '#4caf50'
- }
- })), /*#__PURE__*/_react.default.createElement(_material.MenuItem, {
- value: "reject"
- }, /*#__PURE__*/_react.default.createElement(_HighlightOff.default, {
- style: {
- color: '#e91e63'
- }
- })), /*#__PURE__*/_react.default.createElement(_material.MenuItem, {
- value: ""
- }, /*#__PURE__*/_react.default.createElement("span", null))));
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.FormControl, {
+ children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Select, {
+ value: theStatus,
+ onChange: e => {
+ setNmrStatusAct({
+ predictions: {
+ idx,
+ atom,
+ identity,
+ value: e.target.value
+ },
+ svgs: []
+ });
+ },
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
+ value: "accept",
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CheckCircleOutline.default, {
+ style: {
+ color: '#4caf50'
+ }
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
+ value: "reject",
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_HighlightOff.default, {
+ style: {
+ color: '#e91e63'
+ }
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.MenuItem, {
+ value: "",
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {})
+ })]
+ })
+ });
};
const bssMapStateToProps = (state, props) => (
// eslint-disable-line
@@ -83,45 +89,68 @@ const realFormat = (val, status) => {
}
return numFormat(val);
};
-const NmrTableHeader = classes => /*#__PURE__*/_react.default.createElement(_material.TableHead, null, /*#__PURE__*/_react.default.createElement(_material.TableRow, null, /*#__PURE__*/_react.default.createElement(_material.TableCell, null, (0, _comps.TxtLabel)(classes, 'Atom', 'txt-prd-table-title')), /*#__PURE__*/_react.default.createElement(_material.TableCell, {
- align: "right"
-}, (0, _comps.TxtLabel)(classes, 'Prediction (ppm)', 'txt-prd-table-title')), /*#__PURE__*/_react.default.createElement(_material.TableCell, {
- align: "right"
-}, (0, _comps.TxtLabel)(classes, 'Real (ppm)', 'txt-prd-table-title')), /*#__PURE__*/_react.default.createElement(_material.TableCell, {
- align: "right"
-}, (0, _comps.TxtLabel)(classes, 'Diff (ppm)', 'txt-prd-table-title')), /*#__PURE__*/_react.default.createElement(_material.TableCell, {
- align: "right"
-}, (0, _comps.TxtLabel)(classes, 'Machine', 'txt-prd-table-title')), /*#__PURE__*/_react.default.createElement(_material.TableCell, {
- align: "right"
-}, (0, _comps.TxtLabel)(classes, 'Owner', 'txt-prd-table-title'))));
+const NmrTableHeader = classes => /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableHead, {
+ children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.TableRow, {
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
+ children: (0, _comps.TxtLabel)(classes, 'Atom', 'txt-prd-table-title')
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
+ align: "right",
+ children: (0, _comps.TxtLabel)(classes, 'Prediction (ppm)', 'txt-prd-table-title')
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
+ align: "right",
+ children: (0, _comps.TxtLabel)(classes, 'Real (ppm)', 'txt-prd-table-title')
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
+ align: "right",
+ children: (0, _comps.TxtLabel)(classes, 'Diff (ppm)', 'txt-prd-table-title')
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
+ align: "right",
+ children: (0, _comps.TxtLabel)(classes, 'Machine', 'txt-prd-table-title')
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
+ align: "right",
+ children: (0, _comps.TxtLabel)(classes, 'Owner', 'txt-prd-table-title')
+ })]
+ })
+});
exports.NmrTableHeader = NmrTableHeader;
-const NmrTableBodyRow = (classes, row, idx) => /*#__PURE__*/_react.default.createElement(_material.TableRow, {
- key: `${idx}-${row.atom}`
-}, /*#__PURE__*/_react.default.createElement(_material.TableCell, {
- component: "th",
- scope: "row"
-}, (0, _comps.TxtLabel)(classes, row.atom, 'txt-prd-table-content')), /*#__PURE__*/_react.default.createElement(_material.TableCell, {
- align: "right"
-}, (0, _comps.TxtLabel)(classes, numFormat(row.prediction), 'txt-prd-table-content')), /*#__PURE__*/_react.default.createElement(_material.TableCell, {
- align: "right"
-}, (0, _comps.TxtLabel)(classes, realFormat(row.real, row.status), 'txt-prd-table-content')), /*#__PURE__*/_react.default.createElement(_material.TableCell, {
- align: "right"
-}, (0, _comps.TxtLabel)(classes, realFormat(row.diff, row.status), 'txt-prd-table-content')), /*#__PURE__*/_react.default.createElement(_material.TableCell, {
- align: "right"
-}, (0, _comps.StatusIcon)(row.status)), /*#__PURE__*/_react.default.createElement(_material.TableCell, {
- align: "right"
-}, /*#__PURE__*/_react.default.createElement(SelectNmrStatus, {
- idx: idx,
- atom: row.atom,
- status: row.statusOwner,
- identity: "Owner"
-})));
+const NmrTableBodyRow = (classes, row, idx) => /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.TableRow, {
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
+ component: "th",
+ scope: "row",
+ children: (0, _comps.TxtLabel)(classes, row.atom, 'txt-prd-table-content')
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
+ align: "right",
+ children: (0, _comps.TxtLabel)(classes, numFormat(row.prediction), 'txt-prd-table-content')
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
+ align: "right",
+ children: (0, _comps.TxtLabel)(classes, realFormat(row.real, row.status), 'txt-prd-table-content')
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
+ align: "right",
+ children: (0, _comps.TxtLabel)(classes, realFormat(row.diff, row.status), 'txt-prd-table-content')
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
+ align: "right",
+ children: (0, _comps.StatusIcon)(row.status)
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
+ align: "right",
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(SelectNmrStatus, {
+ idx: idx,
+ atom: row.atom,
+ status: row.statusOwner,
+ identity: "Owner"
+ })
+ })]
+}, `${idx}-${row.atom}`);
exports.NmrTableBodyRow = NmrTableBodyRow;
-const SectionReference = classes => /*#__PURE__*/_react.default.createElement("div", {
- className: (0, _classnames.default)(classes.reference)
-}, /*#__PURE__*/_react.default.createElement("p", null, /*#__PURE__*/_react.default.createElement("span", null, "NMR prediction source: "), /*#__PURE__*/_react.default.createElement("a", {
- href: "https://www.ncbi.nlm.nih.gov/pubmed/15464159",
- target: "_blank",
- rel: "noopener noreferrer"
-}, "nmrshiftdb")));
+const SectionReference = classes => /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+ className: (0, _classnames.default)(classes.reference),
+ children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("p", {
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ children: "NMR prediction source: "
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)("a", {
+ href: "https://www.ncbi.nlm.nih.gov/pubmed/15464159",
+ target: "_blank",
+ rel: "noopener noreferrer",
+ children: "nmrshiftdb"
+ })]
+ })
+});
exports.SectionReference = SectionReference;
\ No newline at end of file
diff --git a/dist/components/forecast/nmr_viewer.js b/dist/components/forecast/nmr_viewer.js
index 6188d539..c397d56b 100644
--- a/dist/components/forecast/nmr_viewer.js
+++ b/dist/components/forecast/nmr_viewer.js
@@ -14,6 +14,7 @@ var _styles = require("@mui/styles");
var _material = require("@mui/material");
var _comps = require("./comps");
var _nmr_comps = require("./nmr_comps");
+var _jsxRuntime = require("react/jsx-runtime");
const Styles = () => ({
root: {
overflowX: 'hidden',
@@ -58,37 +59,43 @@ const sectionTable = (classes, pds) => {
const renderMsg = (0, _comps.notToRenderAnalysis)(pds);
if (renderMsg) return renderMsg;
const dict = pds.output.result[0];
- if (!dict) return /*#__PURE__*/_react.default.createElement("div", null);
- return /*#__PURE__*/_react.default.createElement(_material.Paper, {
- className: classes.tableRoot
- }, /*#__PURE__*/_react.default.createElement(_material.Table, {
- className: classes.table,
- size: "small"
- }, (0, _nmr_comps.NmrTableHeader)(classes), /*#__PURE__*/_react.default.createElement(_material.TableBody, null, dict.shifts.sort((a, b) => a.atom - b.atom).map((row, idx) => (0, _nmr_comps.NmrTableBodyRow)(classes, row, idx)))));
+ if (!dict) return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {});
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Paper, {
+ className: classes.tableRoot,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Table, {
+ className: classes.table,
+ size: "small",
+ children: [(0, _nmr_comps.NmrTableHeader)(classes), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableBody, {
+ children: dict.shifts.sort((a, b) => a.atom - b.atom).map((row, idx) => (0, _nmr_comps.NmrTableBodyRow)(classes, row, idx))
+ })]
+ })
+ });
};
-const NmrViewer = _ref => {
- let {
- // eslint-disable-line
- classes,
- molecule,
- inputCb,
- forecastSt
- } = _ref;
- return /*#__PURE__*/_react.default.createElement("div", {
- className: (0, _classnames.default)(classes.root, 'card-forecast-viewer')
- }, /*#__PURE__*/_react.default.createElement(_material.Grid, {
+const NmrViewer = ({
+ // eslint-disable-line
+ classes,
+ molecule,
+ inputCb,
+ forecastSt
+}) => /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+ className: (0, _classnames.default)(classes.root, 'card-forecast-viewer'),
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Grid, {
className: (0, _classnames.default)(classes.container),
- container: true
- }, /*#__PURE__*/_react.default.createElement(_material.Grid, {
- item: true,
- xs: 4
- }, /*#__PURE__*/_react.default.createElement(_material.Paper, {
- className: classes.svgRoot
- }, (0, _comps.sectionSvg)(classes, forecastSt.predictions))), /*#__PURE__*/_react.default.createElement(_material.Grid, {
- item: true,
- xs: 8
- }, sectionTable(classes, forecastSt.predictions))), (0, _comps.sectionInput)(classes, molecule, inputCb), (0, _nmr_comps.SectionReference)(classes));
-};
+ container: true,
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Grid, {
+ item: true,
+ xs: 4,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Paper, {
+ className: classes.svgRoot,
+ children: (0, _comps.sectionSvg)(classes, forecastSt.predictions)
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Grid, {
+ item: true,
+ xs: 8,
+ children: sectionTable(classes, forecastSt.predictions)
+ })]
+ }), (0, _comps.sectionInput)(classes, molecule, inputCb), (0, _nmr_comps.SectionReference)(classes)]
+});
const mapStateToProps = (state, props) => (
// eslint-disable-line
{
diff --git a/dist/components/forecast/section_loading.js b/dist/components/forecast/section_loading.js
index 25e1f2b9..62d38f8d 100644
--- a/dist/components/forecast/section_loading.js
+++ b/dist/components/forecast/section_loading.js
@@ -8,6 +8,7 @@ exports.default = void 0;
var _react = _interopRequireDefault(require("react"));
var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
var _ErrorOutline = _interopRequireDefault(require("@mui/icons-material/ErrorOutline"));
+var _jsxRuntime = require("react/jsx-runtime");
const styleLoading = {
alignItems: 'center',
display: 'flex',
@@ -27,25 +28,29 @@ class SectionLoading extends _react.default.Component {
}), 5000);
}
renderLoading() {
- return /*#__PURE__*/_react.default.createElement("div", {
- style: styleLoading
- }, /*#__PURE__*/_react.default.createElement(_CircularProgress.default, {
- style: {
- color: 'blue',
- fontSize: 50
- }
- }));
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+ style: styleLoading,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
+ style: {
+ color: 'blue',
+ fontSize: 50
+ }
+ })
+ });
}
renderNotFound() {
- return /*#__PURE__*/_react.default.createElement("div", {
- style: styleLoading
- }, /*#__PURE__*/_react.default.createElement(_ErrorOutline.default, {
- style: {
- color: '#ffc107',
- fontSize: 50,
- margin: 20
- }
- }), /*#__PURE__*/_react.default.createElement("h3", null, "Structure Not Found"));
+ return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+ style: styleLoading,
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_ErrorOutline.default, {
+ style: {
+ color: '#ffc107',
+ fontSize: 50,
+ margin: 20
+ }
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)("h3", {
+ children: "Structure Not Found"
+ })]
+ });
}
render() {
const {
diff --git a/dist/components/forecast_viewer.js b/dist/components/forecast_viewer.js
index b84ea1e7..cfce89e4 100644
--- a/dist/components/forecast_viewer.js
+++ b/dist/components/forecast_viewer.js
@@ -16,6 +16,7 @@ var _ir_viewer = _interopRequireDefault(require("./forecast/ir_viewer"));
var _forecast = require("../actions/forecast");
var _ui = require("../actions/ui");
var _list_ui = require("../constants/list_ui");
+var _jsxRuntime = require("react/jsx-runtime");
/* eslint-disable react/no-unused-prop-types */
const styles = () => ({
@@ -94,23 +95,24 @@ class ForecastViewer extends _react.default.Component {
jcamps
} = jcampSt;
const comparisons = jcamps[curveIdx].others;
- return /*#__PURE__*/_react.default.createElement("div", {
- className: classes.root
- }, /*#__PURE__*/_react.default.createElement(_index.default, {
- topic: topic,
- feature: feature,
- cLabel: cLabel,
- xLabel: isXRD && wavelength ? `${xLabel}, WL=${wavelength.value} ${wavelength.unit}` : xLabel,
- yLabel: yLabel,
- comparisons: comparisons,
- isHidden: viewer !== _list_ui.LIST_UI_VIEWER_TYPE.SPECTRUM
- }), viewer === _list_ui.LIST_UI_VIEWER_TYPE.ANALYSIS && isNmr && /*#__PURE__*/_react.default.createElement(_nmr_viewer.default, {
- molecule: molecule,
- inputCb: inputCb
- }), viewer === _list_ui.LIST_UI_VIEWER_TYPE.ANALYSIS && isIr && /*#__PURE__*/_react.default.createElement(_ir_viewer.default, {
- molecule: molecule,
- inputCb: inputCb
- }));
+ return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+ className: classes.root,
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_index.default, {
+ topic: topic,
+ feature: feature,
+ cLabel: cLabel,
+ xLabel: isXRD && wavelength ? `${xLabel}, WL=${wavelength.value} ${wavelength.unit}` : xLabel,
+ yLabel: yLabel,
+ comparisons: comparisons,
+ isHidden: viewer !== _list_ui.LIST_UI_VIEWER_TYPE.SPECTRUM
+ }), viewer === _list_ui.LIST_UI_VIEWER_TYPE.ANALYSIS && isNmr && /*#__PURE__*/(0, _jsxRuntime.jsx)(_nmr_viewer.default, {
+ molecule: molecule,
+ inputCb: inputCb
+ }), viewer === _list_ui.LIST_UI_VIEWER_TYPE.ANALYSIS && isIr && /*#__PURE__*/(0, _jsxRuntime.jsx)(_ir_viewer.default, {
+ molecule: molecule,
+ inputCb: inputCb
+ })]
+ });
}
}
const mapStateToProps = (state, _) => (
diff --git a/dist/components/multi_jcamps_viewer.js b/dist/components/multi_jcamps_viewer.js
index 1efda3cf..c6cb0e82 100644
--- a/dist/components/multi_jcamps_viewer.js
+++ b/dist/components/multi_jcamps_viewer.js
@@ -18,6 +18,7 @@ var _curve = require("../actions/curve");
var _cyclic_voltammetry = require("../actions/cyclic_voltammetry");
var _list_layout = require("../constants/list_layout");
var _format = _interopRequireDefault(require("../helpers/format"));
+var _jsxRuntime = require("react/jsx-runtime");
/* eslint-disable react/default-props-match-prop-types,
react/require-default-props, react/no-unused-prop-types, react/jsx-boolean-value,
prefer-object-spread */
@@ -35,7 +36,7 @@ const styles = () => ({
}
});
const seperatingSubLayout = (entities, featureCondition, layoutSt) => {
- if (layoutSt === _list_layout.LIST_LAYOUT.CYCLIC_VOLTAMMETRY) {
+ if (layoutSt === _list_layout.LIST_LAYOUT.CYCLIC_VOLTAMMETRY || layoutSt === _list_layout.LIST_LAYOUT.LSV) {
return null;
}
const storedDict = {};
@@ -67,7 +68,7 @@ class MultiJcampsViewer extends _react.default.Component {
layoutSt,
integrationSt
} = this.props;
- if (!entities || entities.length === 0) return /*#__PURE__*/_react.default.createElement("div", null);
+ if (!entities || entities.length === 0) return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {});
const separateCondition = _format.default.isGCLayout(layoutSt) ? 'yUnit' : 'xUnit';
const seperatedSubLayouts = seperatingSubLayout(entities, separateCondition, layoutSt);
const {
@@ -82,43 +83,48 @@ class MultiJcampsViewer extends _react.default.Component {
integrations
} = integrationSt;
const currentIntegration = integrations[curveIdx];
- return /*#__PURE__*/_react.default.createElement("div", {
- className: classes.root
- }, /*#__PURE__*/_react.default.createElement(_index2.default, {
- feature: feature,
- operations: operations,
- editorOnly: true,
- hideThreshold: !_format.default.isNmrLayout(layoutSt)
- }), /*#__PURE__*/_react.default.createElement("div", {
- className: "react-spectrum-editor"
- }, /*#__PURE__*/_react.default.createElement(_Grid.default, {
- container: true
- }, /*#__PURE__*/_react.default.createElement(_Grid.default, {
- item: true,
- xs: 9
- }, /*#__PURE__*/_react.default.createElement(_index3.default, {
- entities: entities,
- topic: topic,
- xLabel: feature.xUnit,
- yLabel: feature.yUnit,
- feature: feature
- })), /*#__PURE__*/_react.default.createElement(_Grid.default, {
- item: true,
- xs: 3,
- align: "center"
- }, /*#__PURE__*/_react.default.createElement(_index.default, {
- jcampIdx: curveIdx,
- entityFileNames: entityFileNames,
- userManualLink: userManualLink,
- feature: feature,
- molSvg: molSvg,
- exactMass: exactMass,
- subLayoutsInfo: seperatedSubLayouts,
- integration: currentIntegration,
- descriptions: "",
- canChangeDescription: () => {},
- onDescriptionChanged: () => {}
- })))));
+ return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+ className: classes.root,
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_index2.default, {
+ feature: feature,
+ operations: operations,
+ editorOnly: true,
+ hideThreshold: !_format.default.isNmrLayout(layoutSt)
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+ className: "react-spectrum-editor",
+ children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Grid.default, {
+ container: true,
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Grid.default, {
+ item: true,
+ xs: 9,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_index3.default, {
+ entities: entities,
+ topic: topic,
+ xLabel: feature.xUnit,
+ yLabel: feature.yUnit,
+ feature: feature
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Grid.default, {
+ item: true,
+ xs: 3,
+ align: "center",
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.default, {
+ jcampIdx: curveIdx,
+ entityFileNames: entityFileNames,
+ userManualLink: userManualLink,
+ feature: feature,
+ molSvg: molSvg,
+ exactMass: exactMass,
+ subLayoutsInfo: seperatedSubLayouts,
+ integration: currentIntegration,
+ descriptions: "",
+ canChangeDescription: () => {},
+ onDescriptionChanged: () => {}
+ })
+ })]
+ })
+ })]
+ });
}
}
const mapStateToProps = (state, _) => (
diff --git a/dist/components/panel/compare.js b/dist/components/panel/compare.js
index 278f3669..1ab135fe 100644
--- a/dist/components/panel/compare.js
+++ b/dist/components/panel/compare.js
@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
value: true
});
exports.default = void 0;
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
var _react = _interopRequireDefault(require("react"));
var _propTypes = _interopRequireDefault(require("prop-types"));
var _classnames = _interopRequireDefault(require("classnames"));
@@ -20,6 +19,7 @@ var _VisibilityOffOutlined = _interopRequireDefault(require("@mui/icons-material
var _styles = require("@mui/styles");
var _format = _interopRequireDefault(require("../../helpers/format"));
var _jcamp = require("../../actions/jcamp");
+var _jsxRuntime = require("react/jsx-runtime");
/* eslint-disable function-paren-newline, react/jsx-props-no-spreading,
react/function-component-definition */
@@ -112,19 +112,24 @@ const styles = theme => ({
}
});
const msgDefault = 'Add spectra to compare.';
-const tpHint = classes => /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.tpCard)
-}, /*#__PURE__*/_react.default.createElement("p", {
- className: (0, _classnames.default)(classes.tpLabel, 'txt-sv-tp')
-}, "- Accept *.dx, *.jdx, *.JCAMP,"), /*#__PURE__*/_react.default.createElement("p", {
- className: (0, _classnames.default)(classes.tpLabel, 'txt-sv-tp')
-}, "- Max 5 spectra."));
-const content = (classes, desc) => /*#__PURE__*/_react.default.createElement(_material.Tooltip, {
+const tpHint = classes => /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
+ className: (0, _classnames.default)(classes.tpCard),
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("p", {
+ className: (0, _classnames.default)(classes.tpLabel, 'txt-sv-tp'),
+ children: "- Accept *.dx, *.jdx, *.JCAMP,"
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)("p", {
+ className: (0, _classnames.default)(classes.tpLabel, 'txt-sv-tp'),
+ children: "- Max 5 spectra."
+ })]
+});
+const content = (classes, desc) => /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Tooltip, {
title: tpHint(classes),
- placement: "bottom"
-}, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.tpLabel, 'txt-sv-tp')
-}, desc));
+ placement: "bottom",
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.tpLabel, 'txt-sv-tp'),
+ children: desc
+ })
+});
const inputOthers = (classes, jcampSt) => {
const {
selectedIdx,
@@ -142,17 +147,19 @@ const inputOthers = (classes, jcampSt) => {
jcamps: jcampFiles
});
};
- return /*#__PURE__*/_react.default.createElement(_reactDropzone.default, {
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactDropzone.default, {
className: "dropbox",
- onDrop: onDrop
- }, _ref => {
- let {
+ onDrop: onDrop,
+ children: ({
getRootProps,
getInputProps
- } = _ref;
- return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({}, getRootProps(), {
- className: (0, _classnames.default)(classes.baseDD)
- }), /*#__PURE__*/_react.default.createElement("input", getInputProps()), content(classes, desc));
+ }) => /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+ ...getRootProps(),
+ className: (0, _classnames.default)(classes.baseDD),
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("input", {
+ ...getInputProps()
+ }), content(classes, desc)]
+ })
});
};
const compareList = (classes, jcampSt, rmOthersOneAct, toggleShowAct) => {
@@ -172,62 +179,71 @@ const compareList = (classes, jcampSt, rmOthersOneAct, toggleShowAct) => {
isShow: o.show,
toggleShowCb: () => toggleShowAct(idx)
}));
- return /*#__PURE__*/_react.default.createElement(_material.Table, {
- className: classes.table
- }, /*#__PURE__*/_react.default.createElement(_material.TableBody, null, rows.map(row => /*#__PURE__*/_react.default.createElement(_material.TableRow, {
- key: row.idx,
- className: classes.tRow,
- hover: true
- }, /*#__PURE__*/_react.default.createElement(_material.TableCell, {
- align: "right",
- className: (0, _classnames.default)(classes.tTxt, classes.square, 'txt-sv-panel-txt'),
- style: {
- backgroundColor: row.color
- }
- }, row.idx + 1), /*#__PURE__*/_react.default.createElement(_material.TableCell, {
- align: "right",
- className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt', row.isShow ? null : classes.tTxtHide)
- }, row.title), /*#__PURE__*/_react.default.createElement(_material.TableCell, {
- align: "right",
- className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt')
- }, row.isShow ? /*#__PURE__*/_react.default.createElement(_VisibilityOutlined.default, {
- onClick: row.toggleShowCb,
- className: classes.showBtn
- }) : /*#__PURE__*/_react.default.createElement(_VisibilityOffOutlined.default, {
- onClick: row.toggleShowCb,
- className: classes.hideBtn
- }), /*#__PURE__*/_react.default.createElement(_HighlightOff.default, {
- onClick: row.rmCb,
- className: classes.rmBtn
- }))))));
-};
-const ComparePanel = _ref2 => {
- let {
- classes,
- expand,
- onExapnd,
- jcampSt,
- rmOthersOneAct,
- toggleShowAct
- } = _ref2;
- return /*#__PURE__*/_react.default.createElement(_material.Accordion, {
- expanded: expand,
- onChange: onExapnd,
- className: (0, _classnames.default)(classes.panel),
- TransitionProps: {
- unmountOnExit: true
- } // increase Accordion performance
- }, /*#__PURE__*/_react.default.createElement(_material.AccordionSummary, {
- expandIcon: /*#__PURE__*/_react.default.createElement(_ExpandMore.default, null),
- className: (0, _classnames.default)(classes.panelSummary)
- }, /*#__PURE__*/_react.default.createElement(_material.Typography, {
- className: "txt-panel-header"
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txtBadge, 'txt-sv-panel-title')
- }, "Spectra Comparisons"))), /*#__PURE__*/_react.default.createElement(_material.Divider, null), inputOthers(classes, jcampSt), /*#__PURE__*/_react.default.createElement("div", {
- className: (0, _classnames.default)(classes.panelDetail)
- }, compareList(classes, jcampSt, rmOthersOneAct, toggleShowAct)));
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Table, {
+ className: classes.table,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableBody, {
+ children: rows.map(row => /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.TableRow, {
+ className: classes.tRow,
+ hover: true,
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
+ align: "right",
+ className: (0, _classnames.default)(classes.tTxt, classes.square, 'txt-sv-panel-txt'),
+ style: {
+ backgroundColor: row.color
+ },
+ children: row.idx + 1
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
+ align: "right",
+ className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt', row.isShow ? null : classes.tTxtHide),
+ children: row.title
+ }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.TableCell, {
+ align: "right",
+ className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt'),
+ children: [row.isShow ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_VisibilityOutlined.default, {
+ onClick: row.toggleShowCb,
+ className: classes.showBtn
+ }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_VisibilityOffOutlined.default, {
+ onClick: row.toggleShowCb,
+ className: classes.hideBtn
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_HighlightOff.default, {
+ onClick: row.rmCb,
+ className: classes.rmBtn
+ })]
+ })]
+ }, row.idx))
+ })
+ });
};
+const ComparePanel = ({
+ classes,
+ expand,
+ onExapnd,
+ jcampSt,
+ rmOthersOneAct,
+ toggleShowAct
+}) => /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Accordion, {
+ expanded: expand,
+ onChange: onExapnd,
+ className: (0, _classnames.default)(classes.panel),
+ TransitionProps: {
+ unmountOnExit: true
+ } // increase Accordion performance
+ ,
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.AccordionSummary, {
+ expandIcon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_ExpandMore.default, {}),
+ className: (0, _classnames.default)(classes.panelSummary),
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Typography, {
+ className: "txt-panel-header",
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txtBadge, 'txt-sv-panel-title'),
+ children: "Spectra Comparisons"
+ })
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Divider, {}), inputOthers(classes, jcampSt), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+ className: (0, _classnames.default)(classes.panelDetail),
+ children: compareList(classes, jcampSt, rmOthersOneAct, toggleShowAct)
+ })]
+});
const mapStateToProps = (state, props) => (
// eslint-disable-line
{
diff --git a/dist/components/panel/cyclic_voltamery_data.js b/dist/components/panel/cyclic_voltamery_data.js
index 3ee1ad82..d7df8188 100644
--- a/dist/components/panel/cyclic_voltamery_data.js
+++ b/dist/components/panel/cyclic_voltamery_data.js
@@ -22,6 +22,7 @@ var _ui = require("../../actions/ui");
var _list_ui = require("../../constants/list_ui");
var _chem = require("../../helpers/chem");
var _format = _interopRequireDefault(require("../../helpers/format"));
+var _jsxRuntime = require("react/jsx-runtime");
/* eslint-disable function-paren-newline, react/require-default-props,
react/no-unused-prop-types, react/jsx-closing-tag-location, max-len, react/jsx-one-expression-per-line,
react/jsx-indent, react/no-unescaped-entities, react/jsx-wrap-multilines, camelcase, no-shadow,
@@ -92,21 +93,20 @@ const styles = () => ({
whiteSpace: 'nowrap'
}
});
-const CyclicVoltammetryPanel = _ref => {
- let {
- classes,
- cyclicVotaSt,
- feature,
- addNewPairPeakAct,
- setWorkWithMaxPeakAct,
- selectPairPeakAct,
- removePairPeakAct,
- selectRefPeaksAct,
- sweepTypeSt,
- setUiSweepTypeAct,
- jcampIdx,
- userManualLink
- } = _ref;
+const CyclicVoltammetryPanel = ({
+ classes,
+ cyclicVotaSt,
+ feature,
+ addNewPairPeakAct,
+ setWorkWithMaxPeakAct,
+ selectPairPeakAct,
+ removePairPeakAct,
+ selectRefPeaksAct,
+ sweepTypeSt,
+ setUiSweepTypeAct,
+ jcampIdx,
+ userManualLink
+}) => {
const {
spectraList
} = cyclicVotaSt;
@@ -171,113 +171,162 @@ const CyclicVoltammetryPanel = _ref => {
}),
onCheckRefChanged: e => changeCheckRefPeaks(idx, e)
}));
- return /*#__PURE__*/_react.default.createElement(_material.Accordion, {
- "data-testid": "PanelVoltammetry"
- }, /*#__PURE__*/_react.default.createElement(_material.AccordionSummary, {
- expandIcon: /*#__PURE__*/_react.default.createElement(_ExpandMore.default, null),
- className: (0, _classnames.default)(classes.panelSummary)
- }, /*#__PURE__*/_react.default.createElement(_material.Typography, {
- className: "txt-panel-header"
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txtBadge, 'txt-sv-panel-title')
- }, "Voltammetry data"))), /*#__PURE__*/_react.default.createElement(_material.Divider, null), /*#__PURE__*/_react.default.createElement(_material.Table, {
- className: classes.table
- }, /*#__PURE__*/_react.default.createElement(_material.TableHead, null, /*#__PURE__*/_react.default.createElement(_material.TableRow, null, /*#__PURE__*/_react.default.createElement(_material.TableCell, {
- align: "left",
- className: (0, _classnames.default)(classes.tTxt, classes.square, 'txt-sv-panel-txt')
- }, "Ref"), /*#__PURE__*/_react.default.createElement(_material.TableCell, {
- align: "left",
- className: (0, _classnames.default)(classes.tTxt, classes.square, 'txt-sv-panel-txt')
- }, "Anodic"), /*#__PURE__*/_react.default.createElement(_material.TableCell, {
- align: "left",
- className: (0, _classnames.default)(classes.tTxt, classes.square, 'txt-sv-panel-txt')
- }, "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, {
- title: /*#__PURE__*/_react.default.createElement("p", {
- className: (0, _classnames.default)(classes.txtToolTip)
- }, "Baseline correction value for I ratio ", /*#__PURE__*/_react.default.createElement("br", null), "(a.k.a y value of pecker)")
- }, /*#__PURE__*/_react.default.createElement(_Info.default, {
- className: (0, _classnames.default)(classes.infoIcon)
- }))), /*#__PURE__*/_react.default.createElement(_material.TableCell, {
- align: "left",
- className: (0, _classnames.default)(classes.tTxt, classes.square, 'txt-sv-panel-txt')
- }, "I ratio", /*#__PURE__*/_react.default.createElement(_material.Tooltip, {
- title: /*#__PURE__*/_react.default.createElement("div", {
- className: (0, _classnames.default)(classes.txtToolTip)
- }, /*#__PURE__*/_react.default.createElement("p", null, "Nicholson's method"), /*#__PURE__*/_react.default.createElement("i", null, "NICHOLSON, Rl S. Semiempirical Procedure for Measuring with Stationary Electrode Polarography Rates of Chemical Reactions Involving the Product of Electron Transfer. Analytical Chemistry, 1966, 38. Jg., Nr. 10, S. 1406-1406. https://doi.org/10.1021/ac60242a030"))
- }, /*#__PURE__*/_react.default.createElement(_Info.default, {
- className: (0, _classnames.default)(classes.infoIcon)
- }))), /*#__PURE__*/_react.default.createElement(_material.TableCell, {
- align: "left",
- className: (0, _classnames.default)(classes.tTxt, classes.square, 'txt-sv-panel-txt')
- }, "E", /*#__PURE__*/_react.default.createElement("sub", null, "1/2")), /*#__PURE__*/_react.default.createElement(_material.TableCell, {
- align: "left",
- className: (0, _classnames.default)(classes.tTxt, classes.square, 'txt-sv-panel-txt')
- }, "\u0394E", /*#__PURE__*/_react.default.createElement("sub", null, "p"), /*#__PURE__*/_react.default.createElement(_material.Tooltip, {
- title: /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txtToolTip)
- }, "| Epa - Epc |")
- }, /*#__PURE__*/_react.default.createElement(_Info.default, {
- className: (0, _classnames.default)(classes.infoIcon)
- }))), /*#__PURE__*/_react.default.createElement(_material.TableCell, {
- align: "left",
- className: (0, _classnames.default)(classes.tTxt, classes.square, 'txt-sv-panel-txt')
- }, /*#__PURE__*/_react.default.createElement(_AddCircleOutline.default, {
- onClick: () => addNewPairPeakAct(jcampIdx),
- className: (0, _classnames.default)(classes.btnAddRow)
- })))), /*#__PURE__*/_react.default.createElement(_material.TableBody, null, rows.map(row => /*#__PURE__*/_react.default.createElement(_material.TableRow, {
- key: row.idx
- }, /*#__PURE__*/_react.default.createElement(_material.TableCell, {
- align: "left",
- className: (0, _classnames.default)(classes.tTxt, classes.square, 'txt-sv-panel-txt')
- }, /*#__PURE__*/_react.default.createElement(_material.Checkbox, {
- checked: row.isRef,
- onChange: row.onCheckRefChanged
- })), /*#__PURE__*/_react.default.createElement(_material.TableCell, {
- align: "left",
- className: (0, _classnames.default)(classes.tTxt, classes.square, spectra.isWorkMaxPeak && spectra.selectedIdx === row.idx ? classes.cellSelected : 'txt-sv-panel-txt'),
- onClick: row.onClickMax
- }, row.max.split('\n').map((s, index) => /*#__PURE__*/_react.default.createElement(_react.default.Fragment, {
- key: index
- }, s, /*#__PURE__*/_react.default.createElement("br", null)))), /*#__PURE__*/_react.default.createElement(_material.TableCell, {
- align: "left",
- className: (0, _classnames.default)(classes.tTxt, classes.square, !spectra.isWorkMaxPeak && spectra.selectedIdx === row.idx ? classes.cellSelected : 'txt-sv-panel-txt'),
- onClick: row.onClickMin
- }, row.min.split('\n').map((s, index) => /*#__PURE__*/_react.default.createElement(_react.default.Fragment, {
- key: index
- }, s, /*#__PURE__*/_react.default.createElement("br", null)))), /*#__PURE__*/_react.default.createElement(_material.TableCell, {
- align: "left",
- className: (0, _classnames.default)(classes.tTxt, classes.square, 'txt-sv-panel-txt')
- }, row.pecker), /*#__PURE__*/_react.default.createElement(_material.TableCell, {
- align: "left",
- className: (0, _classnames.default)(classes.tTxt, classes.square, 'txt-sv-panel-txt')
- }, row.ratio), /*#__PURE__*/_react.default.createElement(_material.TableCell, {
- align: "left",
- className: (0, _classnames.default)(classes.tTxt, classes.square, 'txt-sv-panel-txt')
- }, row.e12), /*#__PURE__*/_react.default.createElement(_material.TableCell, {
- align: "left",
- className: (0, _classnames.default)(classes.tTxt, classes.square, 'txt-sv-panel-txt')
- }, row.delta), /*#__PURE__*/_react.default.createElement(_material.TableCell, {
- align: "left",
- className: (0, _classnames.default)(classes.tTxt, classes.square, 'txt-sv-panel-txt')
- }, /*#__PURE__*/_react.default.createElement(_RemoveCircle.default, {
- className: (0, _classnames.default)(classes.btnRemove),
- onClick: row.remove
- })))))), /*#__PURE__*/_react.default.createElement("div", {
- className: (0, _classnames.default)(classes.rowRoot, classes.rowEven)
- }, /*#__PURE__*/_react.default.createElement(_material.Tooltip, {
- title: /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txtToolTip)
- }, "Click here to open the User manual document")
- }, /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement("a", {
- target: "_blank",
- rel: "noopener noreferrer",
- href: userManualLink
- }, "How-To "), /*#__PURE__*/_react.default.createElement(_Help.default, {
- className: (0, _classnames.default)(classes.infoIcon)
- })))));
+ return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Accordion, {
+ "data-testid": "PanelVoltammetry",
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.AccordionSummary, {
+ expandIcon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_ExpandMore.default, {}),
+ className: (0, _classnames.default)(classes.panelSummary),
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Typography, {
+ className: "txt-panel-header",
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txtBadge, 'txt-sv-panel-title'),
+ children: "Voltammetry data"
+ })
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Divider, {}), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Table, {
+ className: classes.table,
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableHead, {
+ children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.TableRow, {
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
+ align: "left",
+ className: (0, _classnames.default)(classes.tTxt, classes.square, 'txt-sv-panel-txt'),
+ children: "Ref"
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
+ align: "left",
+ className: (0, _classnames.default)(classes.tTxt, classes.square, 'txt-sv-panel-txt'),
+ children: "Anodic"
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
+ align: "left",
+ className: (0, _classnames.default)(classes.tTxt, classes.square, 'txt-sv-panel-txt'),
+ children: "Cathodic"
+ }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.TableCell, {
+ align: "left",
+ className: (0, _classnames.default)(classes.tTxt, classes.square, 'txt-sv-panel-txt'),
+ children: ["I ", /*#__PURE__*/(0, _jsxRuntime.jsx)("sub", {
+ children: "\u03BB0"
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Tooltip, {
+ title: /*#__PURE__*/(0, _jsxRuntime.jsxs)("p", {
+ className: (0, _classnames.default)(classes.txtToolTip),
+ children: ["Baseline correction value for I ratio ", /*#__PURE__*/(0, _jsxRuntime.jsx)("br", {}), "(a.k.a y value of pecker)"]
+ }),
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Info.default, {
+ className: (0, _classnames.default)(classes.infoIcon)
+ })
+ })]
+ }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.TableCell, {
+ align: "left",
+ className: (0, _classnames.default)(classes.tTxt, classes.square, 'txt-sv-panel-txt'),
+ children: ["I ratio", /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Tooltip, {
+ title: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+ className: (0, _classnames.default)(classes.txtToolTip),
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("p", {
+ children: "Nicholson's method"
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)("i", {
+ children: "NICHOLSON, Rl S. Semiempirical Procedure for Measuring with Stationary Electrode Polarography Rates of Chemical Reactions Involving the Product of Electron Transfer. Analytical Chemistry, 1966, 38. Jg., Nr. 10, S. 1406-1406. https://doi.org/10.1021/ac60242a030"
+ })]
+ }),
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Info.default, {
+ className: (0, _classnames.default)(classes.infoIcon)
+ })
+ })]
+ }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.TableCell, {
+ align: "left",
+ className: (0, _classnames.default)(classes.tTxt, classes.square, 'txt-sv-panel-txt'),
+ children: ["E", /*#__PURE__*/(0, _jsxRuntime.jsx)("sub", {
+ children: "1/2"
+ })]
+ }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.TableCell, {
+ align: "left",
+ className: (0, _classnames.default)(classes.tTxt, classes.square, 'txt-sv-panel-txt'),
+ children: ["\u0394E", /*#__PURE__*/(0, _jsxRuntime.jsx)("sub", {
+ children: "p"
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Tooltip, {
+ title: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txtToolTip),
+ children: "| Epa - Epc |"
+ }),
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Info.default, {
+ className: (0, _classnames.default)(classes.infoIcon)
+ })
+ })]
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
+ align: "left",
+ className: (0, _classnames.default)(classes.tTxt, classes.square, 'txt-sv-panel-txt'),
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_AddCircleOutline.default, {
+ onClick: () => addNewPairPeakAct(jcampIdx),
+ className: (0, _classnames.default)(classes.btnAddRow)
+ })
+ })]
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableBody, {
+ children: rows.map(row => /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.TableRow, {
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
+ align: "left",
+ className: (0, _classnames.default)(classes.tTxt, classes.square, 'txt-sv-panel-txt'),
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Checkbox, {
+ checked: row.isRef,
+ onChange: row.onCheckRefChanged
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
+ align: "left",
+ className: (0, _classnames.default)(classes.tTxt, classes.square, spectra.isWorkMaxPeak && spectra.selectedIdx === row.idx ? classes.cellSelected : 'txt-sv-panel-txt'),
+ onClick: row.onClickMax,
+ children: row.max.split('\n').map((s, index) => /*#__PURE__*/(0, _jsxRuntime.jsxs)(_react.default.Fragment, {
+ children: [s, /*#__PURE__*/(0, _jsxRuntime.jsx)("br", {})]
+ }, index))
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
+ align: "left",
+ className: (0, _classnames.default)(classes.tTxt, classes.square, !spectra.isWorkMaxPeak && spectra.selectedIdx === row.idx ? classes.cellSelected : 'txt-sv-panel-txt'),
+ onClick: row.onClickMin,
+ children: row.min.split('\n').map((s, index) => /*#__PURE__*/(0, _jsxRuntime.jsxs)(_react.default.Fragment, {
+ children: [s, /*#__PURE__*/(0, _jsxRuntime.jsx)("br", {})]
+ }, index))
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
+ align: "left",
+ className: (0, _classnames.default)(classes.tTxt, classes.square, 'txt-sv-panel-txt'),
+ children: row.pecker
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
+ align: "left",
+ className: (0, _classnames.default)(classes.tTxt, classes.square, 'txt-sv-panel-txt'),
+ children: row.ratio
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
+ align: "left",
+ className: (0, _classnames.default)(classes.tTxt, classes.square, 'txt-sv-panel-txt'),
+ children: row.e12
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
+ align: "left",
+ className: (0, _classnames.default)(classes.tTxt, classes.square, 'txt-sv-panel-txt'),
+ children: row.delta
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
+ align: "left",
+ className: (0, _classnames.default)(classes.tTxt, classes.square, 'txt-sv-panel-txt'),
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_RemoveCircle.default, {
+ className: (0, _classnames.default)(classes.btnRemove),
+ onClick: row.remove
+ })
+ })]
+ }, row.idx))
+ })]
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+ className: (0, _classnames.default)(classes.rowRoot, classes.rowEven),
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Tooltip, {
+ title: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txtToolTip),
+ children: "Click here to open the User manual document"
+ }),
+ children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("a", {
+ target: "_blank",
+ rel: "noopener noreferrer",
+ href: userManualLink,
+ children: "How-To "
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Help.default, {
+ className: (0, _classnames.default)(classes.infoIcon)
+ })]
+ })
+ })
+ })]
+ });
};
const mapStateToProps = (state, props) => (
// eslint-disable-line
diff --git a/dist/components/panel/graph_selection.js b/dist/components/panel/graph_selection.js
index 4c5f0993..f43e6a05 100644
--- a/dist/components/panel/graph_selection.js
+++ b/dist/components/panel/graph_selection.js
@@ -15,8 +15,8 @@ var _styles = require("@mui/styles");
var _material = require("@mui/material");
var _curve = require("../../actions/curve");
var _list_layout = require("../../constants/list_layout");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+var _jsxRuntime = require("react/jsx-runtime");
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
/* eslint-disable react/function-component-definition, function-paren-newline,
react/require-default-props, react/no-unused-prop-types */
@@ -50,16 +50,15 @@ const styles = () => ({
overflowWrap: 'anywhere'
}
});
-const GraphSelectionPanel = _ref => {
- let {
- classes,
- curveSt,
- entityFileNames,
- subLayoutsInfo,
- layoutSt,
- selectCurveAct,
- toggleShowAllCurveAct
- } = _ref;
+const GraphSelectionPanel = ({
+ classes,
+ curveSt,
+ entityFileNames,
+ subLayoutsInfo,
+ layoutSt,
+ selectCurveAct,
+ toggleShowAllCurveAct
+}) => {
let subLayoutValues = [];
if (subLayoutsInfo) {
subLayoutValues = Object.keys(subLayoutsInfo);
@@ -69,7 +68,7 @@ const GraphSelectionPanel = _ref => {
setSelectedSublayout(subLayoutValues[0]);
}, subLayoutValues);
if (!curveSt) {
- return /*#__PURE__*/_react.default.createElement("span", null);
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {});
}
const {
curveIdx,
@@ -77,7 +76,7 @@ const GraphSelectionPanel = _ref => {
isShowAllCurve
} = curveSt;
if (!listCurves) {
- return /*#__PURE__*/_react.default.createElement("span", null);
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {});
}
const onChange = idx => {
selectCurveAct(idx);
@@ -127,82 +126,106 @@ const GraphSelectionPanel = _ref => {
filename
};
});
- return /*#__PURE__*/_react.default.createElement(_material.Accordion, {
- "data-testid": "GraphSelectionPanel"
- }, /*#__PURE__*/_react.default.createElement(_material.AccordionSummary, {
- expandIcon: /*#__PURE__*/_react.default.createElement(_ExpandMore.default, null),
- className: (0, _classnames.default)(classes.panelSummary)
- }, /*#__PURE__*/_react.default.createElement(_material.Typography, {
- className: "txt-panel-header"
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txtBadge, 'txt-sv-panel-title')
- }, "Graph selection"))), /*#__PURE__*/_react.default.createElement(_material.Divider, null), layoutSt === _list_layout.LIST_LAYOUT.AIF ? /*#__PURE__*/_react.default.createElement(_material.FormControlLabel, {
- control: /*#__PURE__*/_react.default.createElement(_material.Switch, {
- checked: isShowAllCurve,
- onChange: onChangeSwitch
- }),
- label: "Show all curves"
- }) : null, subLayoutValues && subLayoutValues.length > 1 ? /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_material.Tabs, {
- value: selectedSubLayout,
- onChange: onChangeTabSubLayout
- }, subLayoutValues.map((subLayout, i) => {
- let subLayoutName = '';
- switch (subLayout.toUpperCase()) {
- case 'G/MOL':
- subLayoutName = 'MWD';
- break;
- case 'MILLILITERS':
- subLayoutName = 'ELU';
- break;
- case 'INTENSITY':
- subLayoutName = 'Chromatogram';
- break;
- case 'DEGREES CELSIUS':
- subLayoutName = 'Temperature';
- break;
- default:
- break;
- }
- return /*#__PURE__*/_react.default.createElement(_material.Tab, {
- key: i,
- value: subLayout,
- label: subLayoutName
- });
- })), /*#__PURE__*/_react.default.createElement(_material.List, null, itemsSubLayout.map(item => /*#__PURE__*/_react.default.createElement(_material.ListItem, {
- key: item.idx,
- onClick: () => onChange(item.idx),
- className: (0, _classnames.default)(item.idx === curveIdx ? classes.curveSelected : classes.curveDefault) // eslint-disable-line
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.curve)
- }, /*#__PURE__*/_react.default.createElement("i", null, item.name), /*#__PURE__*/_react.default.createElement("span", {
- style: {
- float: 'right',
- width: '95%'
- }
- }, /*#__PURE__*/_react.default.createElement("hr", {
- className: (0, _classnames.default)(classes.line),
- style: {
- backgroundColor: item.color
- }
- }), item.filename !== '' ? /*#__PURE__*/_react.default.createElement("span", null, "File: ", item.filename) : null // eslint-disable-line
- )))))) : /*#__PURE__*/_react.default.createElement(_material.List, null, items.map(item => /*#__PURE__*/_react.default.createElement(_material.ListItem, {
- key: item.idx,
- onClick: () => onChange(item.idx),
- className: (0, _classnames.default)(item.idx === curveIdx ? classes.curveSelected : classes.curveDefault) // eslint-disable-line
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.curve)
- }, /*#__PURE__*/_react.default.createElement("i", null, item.name), /*#__PURE__*/_react.default.createElement("span", {
- style: {
- float: 'right',
- width: '95%'
- }
- }, /*#__PURE__*/_react.default.createElement("hr", {
- className: (0, _classnames.default)(classes.line),
- style: {
- backgroundColor: item.color
- }
- }), item.filename !== '' ? /*#__PURE__*/_react.default.createElement("span", null, "File: ", item.filename) : null // eslint-disable-line
- ))))));
+ return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Accordion, {
+ "data-testid": "GraphSelectionPanel",
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.AccordionSummary, {
+ expandIcon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_ExpandMore.default, {}),
+ className: (0, _classnames.default)(classes.panelSummary),
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Typography, {
+ className: "txt-panel-header",
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txtBadge, 'txt-sv-panel-title'),
+ children: "Graph selection"
+ })
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Divider, {}), layoutSt === _list_layout.LIST_LAYOUT.AIF ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.FormControlLabel, {
+ control: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Switch, {
+ checked: isShowAllCurve,
+ onChange: onChangeSwitch
+ }),
+ label: "Show all curves"
+ }) : null, subLayoutValues && subLayoutValues.length > 1 ? /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Tabs, {
+ value: selectedSubLayout,
+ onChange: onChangeTabSubLayout,
+ children: subLayoutValues.map((subLayout, i) => {
+ let subLayoutName = '';
+ switch (subLayout.toUpperCase()) {
+ case 'G/MOL':
+ subLayoutName = 'MWD';
+ break;
+ case 'MILLILITERS':
+ subLayoutName = 'ELU';
+ break;
+ case 'INTENSITY':
+ subLayoutName = 'Chromatogram';
+ break;
+ case 'DEGREES CELSIUS':
+ subLayoutName = 'Temperature';
+ break;
+ default:
+ break;
+ }
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Tab, {
+ value: subLayout,
+ label: subLayoutName
+ }, i);
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.List, {
+ children: itemsSubLayout.map(item => /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.ListItem, {
+ onClick: () => onChange(item.idx),
+ className: (0, _classnames.default)(item.idx === curveIdx ? classes.curveSelected : classes.curveDefault) // eslint-disable-line
+ ,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
+ className: (0, _classnames.default)(classes.curve),
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("i", {
+ children: item.name
+ }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
+ style: {
+ float: 'right',
+ width: '95%'
+ },
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("hr", {
+ className: (0, _classnames.default)(classes.line),
+ style: {
+ backgroundColor: item.color
+ }
+ }), item.filename !== '' ? /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
+ children: ["File: ", item.filename]
+ }) : null // eslint-disable-line
+ ]
+ })]
+ })
+ }, item.idx))
+ })]
+ }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.List, {
+ children: items.map(item => /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.ListItem, {
+ onClick: () => onChange(item.idx),
+ className: (0, _classnames.default)(item.idx === curveIdx ? classes.curveSelected : classes.curveDefault) // eslint-disable-line
+ ,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
+ className: (0, _classnames.default)(classes.curve),
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("i", {
+ children: item.name
+ }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
+ style: {
+ float: 'right',
+ width: '95%'
+ },
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("hr", {
+ className: (0, _classnames.default)(classes.line),
+ style: {
+ backgroundColor: item.color
+ }
+ }), item.filename !== '' ? /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
+ children: ["File: ", item.filename]
+ }) : null // eslint-disable-line
+ ]
+ })]
+ })
+ }, item.idx))
+ })]
+ });
};
const mapStateToProps = (state, props) => (
// eslint-disable-line
diff --git a/dist/components/panel/index.js b/dist/components/panel/index.js
index 8fbcd8f0..03e803b0 100644
--- a/dist/components/panel/index.js
+++ b/dist/components/panel/index.js
@@ -19,6 +19,7 @@ var _multiplicity = _interopRequireDefault(require("./multiplicity"));
var _cyclic_voltamery_data = _interopRequireDefault(require("./cyclic_voltamery_data"));
var _graph_selection = _interopRequireDefault(require("./graph_selection"));
var _cfg = _interopRequireDefault(require("../../helpers/cfg"));
+var _jsxRuntime = require("react/jsx-runtime");
/* eslint-disable react/prop-types, react/require-default-props */
const theme = (0, _styles.createTheme)({
@@ -97,45 +98,48 @@ class PanelViewer extends _react.default.Component {
listCurves
} = curveSt;
const hideGraphSelection = listCurves === false || listCurves === undefined;
- return /*#__PURE__*/_react.default.createElement("div", {
- className: (0, _classnames.default)(classes.panels)
- }, /*#__PURE__*/_react.default.createElement(_styles.StyledEngineProvider, {
- injectFirst: true
- }, /*#__PURE__*/_react.default.createElement(_styles.ThemeProvider, {
- theme: theme
- }, hideGraphSelection ? null : /*#__PURE__*/_react.default.createElement(_graph_selection.default, {
- jcampIdx: jcampIdx,
- entityFileNames: entityFileNames,
- expand: expand === 'graph',
- onExapnd: onExapndGraphSelection,
- subLayoutsInfo: subLayoutsInfo
- }), /*#__PURE__*/_react.default.createElement(_info.default, {
- feature: feature,
- integration: integration,
- editorOnly: editorOnly,
- expand: expand === 'info',
- molSvg: molSvg,
- exactMass: exactMass,
- onExapnd: onExapndInfo,
- descriptions: descriptions,
- canChangeDescription: canChangeDescription,
- onDescriptionChanged: this.handleDescriptionChanged
- }), _cfg.default.hidePanelPeak(layoutSt) ? null : /*#__PURE__*/_react.default.createElement(_peaks.default, {
- expand: expand === 'peak',
- onExapnd: onExapndPeak
- }), _cfg.default.hidePanelMpy(layoutSt) ? null : /*#__PURE__*/_react.default.createElement(_multiplicity.default, {
- expand: expand === 'mpy',
- onExapnd: onExapndMpy
- }), _cfg.default.hidePanelCompare(layoutSt) || listCurves.length > 1 ? null : /*#__PURE__*/_react.default.createElement(_compare.default, {
- expand: expand === 'compare',
- onExapnd: onExapndCompare
- }), _cfg.default.hidePanelCyclicVolta(layoutSt) ? null : /*#__PURE__*/_react.default.createElement(_cyclic_voltamery_data.default, {
- jcampIdx: jcampIdx,
- feature: feature,
- expand: expand === 'cyclicvolta',
- onExapnd: onExapndCyclicVolta,
- userManualLink: userManualLink ? userManualLink.cv : undefined
- }))));
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+ className: (0, _classnames.default)(classes.panels),
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_styles.StyledEngineProvider, {
+ injectFirst: true,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_styles.ThemeProvider, {
+ theme: theme,
+ children: [hideGraphSelection ? null : /*#__PURE__*/(0, _jsxRuntime.jsx)(_graph_selection.default, {
+ jcampIdx: jcampIdx,
+ entityFileNames: entityFileNames,
+ expand: expand === 'graph',
+ onExapnd: onExapndGraphSelection,
+ subLayoutsInfo: subLayoutsInfo
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_info.default, {
+ feature: feature,
+ integration: integration,
+ editorOnly: editorOnly,
+ expand: expand === 'info',
+ molSvg: molSvg,
+ exactMass: exactMass,
+ onExapnd: onExapndInfo,
+ descriptions: descriptions,
+ canChangeDescription: canChangeDescription,
+ onDescriptionChanged: this.handleDescriptionChanged
+ }), _cfg.default.hidePanelPeak(layoutSt) ? null : /*#__PURE__*/(0, _jsxRuntime.jsx)(_peaks.default, {
+ expand: expand === 'peak',
+ onExapnd: onExapndPeak
+ }), _cfg.default.hidePanelMpy(layoutSt) ? null : /*#__PURE__*/(0, _jsxRuntime.jsx)(_multiplicity.default, {
+ expand: expand === 'mpy',
+ onExapnd: onExapndMpy
+ }), _cfg.default.hidePanelCompare(layoutSt) || listCurves.length > 1 ? null : /*#__PURE__*/(0, _jsxRuntime.jsx)(_compare.default, {
+ expand: expand === 'compare',
+ onExapnd: onExapndCompare
+ }), _cfg.default.hidePanelCyclicVolta(layoutSt) ? null : /*#__PURE__*/(0, _jsxRuntime.jsx)(_cyclic_voltamery_data.default, {
+ jcampIdx: jcampIdx,
+ feature: feature,
+ expand: expand === 'cyclicvolta',
+ onExapnd: onExapndCyclicVolta,
+ userManualLink: userManualLink ? userManualLink.cv : undefined
+ })]
+ })
+ })
+ });
}
}
const mapStateToProps = (state, _) => (
diff --git a/dist/components/panel/info.js b/dist/components/panel/info.js
index 3775d576..08429b8c 100644
--- a/dist/components/panel/info.js
+++ b/dist/components/panel/info.js
@@ -17,6 +17,7 @@ var _ExpandMore = _interopRequireDefault(require("@mui/icons-material/ExpandMore
var _styles = require("@mui/styles");
var _format = _interopRequireDefault(require("../../helpers/format"));
var _meta = require("../../actions/meta");
+var _jsxRuntime = require("react/jsx-runtime");
/* eslint-disable no-mixed-operators, react/function-component-definition,
react/require-default-props, max-len */
@@ -110,13 +111,12 @@ const aucValue = integration => {
}
return values.join(', ');
};
-const SECData = _ref => {
- let {
- classes,
- layout,
- detector,
- secData
- } = _ref;
+const SECData = ({
+ classes,
+ layout,
+ detector,
+ secData
+}) => {
if (_format.default.isSECLayout(layout) && secData) {
const {
d,
@@ -124,37 +124,54 @@ const SECData = _ref => {
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 /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+ className: (0, _classnames.default)(classes.rowRoot, classes.rowOdd),
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.tTxt, classes.tHead, 'txt-sv-panel-txt'),
+ children: "Detector: "
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt'),
+ children: detector
+ })]
+ }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+ className: (0, _classnames.default)(classes.rowRoot, classes.rowEven),
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.tTxt, classes.tHead, 'txt-sv-panel-txt'),
+ children: "D: "
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt'),
+ children: d
+ })]
+ }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+ className: (0, _classnames.default)(classes.rowRoot, classes.rowOdd),
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.tTxt, classes.tHead, 'txt-sv-panel-txt'),
+ children: "MN: "
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt'),
+ children: mn
+ })]
+ }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+ className: (0, _classnames.default)(classes.rowRoot, classes.rowEven),
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.tTxt, classes.tHead, 'txt-sv-panel-txt'),
+ children: "MP: "
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt'),
+ children: mp
+ })]
+ }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+ className: (0, _classnames.default)(classes.rowRoot, classes.rowOdd),
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.tTxt, classes.tHead, 'txt-sv-panel-txt'),
+ children: "MW: "
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt'),
+ children: mw
+ })]
+ })]
+ });
}
return null;
};
@@ -164,13 +181,12 @@ SECData.propTypes = {
detector: _propTypes.default.object.isRequired,
secData: _propTypes.default.object.isRequired
};
-const DSCData = _ref2 => {
- let {
- classes,
- layout,
- dscMetaData,
- updateAction
- } = _ref2;
+const DSCData = ({
+ classes,
+ layout,
+ dscMetaData,
+ updateAction
+}) => {
if (_format.default.isDSCLayout(layout) && dscMetaData !== undefined) {
const {
meltingPoint,
@@ -188,27 +204,33 @@ const DSCData = _ref2 => {
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 /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+ className: (0, _classnames.default)(classes.rowRoot, classes.rowOdd),
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.tTxt, classes.tHead, 'txt-sv-panel-txt'),
+ children: "Melting Point: "
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)("input", {
+ type: "text",
+ name: "meltingPoint",
+ className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt'),
+ value: meltingPoint,
+ onChange: onChange
+ })]
+ }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+ className: (0, _classnames.default)(classes.rowRoot, classes.rowEven),
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.tTxt, classes.tHead, 'txt-sv-panel-txt'),
+ children: "TG: "
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)("input", {
+ type: "text",
+ name: "tg",
+ className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt'),
+ value: tg,
+ onChange: onChange
+ })]
+ })]
+ });
}
return null;
};
@@ -218,27 +240,26 @@ DSCData.propTypes = {
dscMetaData: _propTypes.default.object.isRequired,
updateAction: _propTypes.default.func.isRequired
};
-const InfoPanel = _ref3 => {
- let {
- classes,
- expand,
- feature,
- integration,
- editorOnly,
- molSvg,
- descriptions,
- layoutSt,
- simulationSt,
- shiftSt,
- curveSt,
- exactMass,
- onExapnd,
- canChangeDescription,
- onDescriptionChanged,
- detectorSt,
- metaSt,
- updateDSCMetaDataAct
- } = _ref3;
+const InfoPanel = ({
+ classes,
+ expand,
+ feature,
+ integration,
+ editorOnly,
+ molSvg,
+ descriptions,
+ layoutSt,
+ simulationSt,
+ shiftSt,
+ curveSt,
+ exactMass,
+ onExapnd,
+ canChangeDescription,
+ onDescriptionChanged,
+ detectorSt,
+ metaSt,
+ updateDSCMetaDataAct
+}) => {
if (!feature) return null;
const {
title,
@@ -278,7 +299,7 @@ const InfoPanel = _ref3 => {
if (integration) {
originStack = integration.originStack; // eslint-disable-line
}
- return /*#__PURE__*/_react.default.createElement(_material.Accordion, {
+ return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Accordion, {
"data-testid": "PanelInfo",
expanded: expand,
onChange: onExapnd,
@@ -286,74 +307,100 @@ const InfoPanel = _ref3 => {
TransitionProps: {
unmountOnExit: true
} // increase Accordion performance
- }, /*#__PURE__*/_react.default.createElement(_material.AccordionSummary, {
- expandIcon: /*#__PURE__*/_react.default.createElement(_ExpandMore.default, null),
- className: (0, _classnames.default)(classes.panelSummary)
- }, /*#__PURE__*/_react.default.createElement(_material.Typography, {
- className: "txt-panel-header"
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txtBadge, 'txt-sv-panel-title')
- }, "Info"))), /*#__PURE__*/_react.default.createElement(_material.Divider, null), /*#__PURE__*/_react.default.createElement("div", {
- className: (0, _classnames.default)(classes.panelDetail)
- }, /*#__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')
- }, "Title : "), /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt')
- }, title)), _format.default.isNmrLayout(layoutSt) ? /*#__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')
- }, "Freq : "), /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt')
- }, `${parseInt(observeFrequency, 10)} Hz` || ' - ')) : null, _format.default.isNmrLayout(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')
- }, "Solv : "), /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt')
- }, showSolvName)) : null, _format.default.isMsLayout(layoutSt) && exactMass ? /*#__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')
- }, "Exact mass: "), /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt')
- }, `${parseFloat(exactMass).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
- }), _format.default.isHplcUvVisLayout(layoutSt) ? /*#__PURE__*/_react.default.createElement("div", {
- className: (0, _classnames.default)(classes.rowRoot, classes.rowOddSim)
- }, /*#__PURE__*/_react.default.createElement("span", {
- 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, /*#__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: {
- toolbar: false
- },
- onChange: onDescriptionChanged,
- readOnly: canChangeDescription !== undefined ? !canChangeDescription : true
- }) : null, /*#__PURE__*/_react.default.createElement("div", null, !editorOnly && _format.default.isNmrLayout(layoutSt) ? /*#__PURE__*/_react.default.createElement("div", {
- className: (0, _classnames.default)(classes.rowRoot, classes.rowOddSim)
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.tTxt, classes.tHead, 'txt-sv-panel-txt')
- }, simTitle(), ":"), /*#__PURE__*/_react.default.createElement("br", null), /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.tTxt, classes.tTxtSim, 'txt-sv-panel-txt')
- }, simContent(simulationSt.nmrSimPeaks))) : null));
+ ,
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.AccordionSummary, {
+ expandIcon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_ExpandMore.default, {}),
+ className: (0, _classnames.default)(classes.panelSummary),
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Typography, {
+ className: "txt-panel-header",
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txtBadge, 'txt-sv-panel-title'),
+ children: "Info"
+ })
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Divider, {}), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+ className: (0, _classnames.default)(classes.panelDetail),
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+ className: (0, _classnames.default)(classes.rowRoot, classes.rowOdd),
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.tTxt, classes.tHead, 'txt-sv-panel-txt'),
+ children: "Title : "
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt'),
+ children: title
+ })]
+ }), _format.default.isNmrLayout(layoutSt) ? /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+ className: (0, _classnames.default)(classes.rowRoot, classes.rowEven),
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.tTxt, classes.tHead, 'txt-sv-panel-txt'),
+ children: "Freq : "
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt'),
+ children: `${parseInt(observeFrequency, 10)} Hz` || ' - '
+ })]
+ }) : null, _format.default.isNmrLayout(layoutSt) ? /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+ className: (0, _classnames.default)(classes.rowRoot, classes.rowOdd),
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.tTxt, classes.tHead, 'txt-sv-panel-txt'),
+ children: "Solv : "
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt'),
+ children: showSolvName
+ })]
+ }) : null, _format.default.isMsLayout(layoutSt) && exactMass ? /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+ className: (0, _classnames.default)(classes.rowRoot, classes.rowOdd),
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.tTxt, classes.tHead, 'txt-sv-panel-txt'),
+ children: "Exact mass: "
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt'),
+ children: `${parseFloat(exactMass).toFixed(6)} g/mol`
+ })]
+ }) : null, /*#__PURE__*/(0, _jsxRuntime.jsx)(SECData, {
+ classes: classes,
+ layout: layoutSt,
+ detector: selectedDetector,
+ secData: secData
+ }), !molSvg ? null : /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactSvgFileZoomPan.default, {
+ svg: molSvg,
+ duration: 300,
+ resize: true
+ }), _format.default.isHplcUvVisLayout(layoutSt) ? /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+ className: (0, _classnames.default)(classes.rowRoot, classes.rowOddSim),
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.tTxt, classes.tHead, 'txt-sv-panel-txt'),
+ children: "Area under curve (AUC):"
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)("br", {}), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.tTxt, classes.tTxtSim, 'txt-sv-panel-txt'),
+ children: aucValue(integration)
+ })]
+ }) : null, /*#__PURE__*/(0, _jsxRuntime.jsx)(DSCData, {
+ classes: classes,
+ layout: layoutSt,
+ dscMetaData: dscMetaData,
+ updateAction: updateDSCMetaDataAct
+ })]
+ }), !_format.default.isCyclicVoltaLayout(layoutSt) ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactQuill.default, {
+ className: (0, _classnames.default)(classes.quill, 'card-sv-quill'),
+ value: descriptions,
+ modules: {
+ toolbar: false
+ },
+ onChange: onDescriptionChanged,
+ readOnly: canChangeDescription !== undefined ? !canChangeDescription : true
+ }) : null, /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+ children: !editorOnly && _format.default.isNmrLayout(layoutSt) ? /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+ className: (0, _classnames.default)(classes.rowRoot, classes.rowOddSim),
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
+ className: (0, _classnames.default)(classes.tTxt, classes.tHead, 'txt-sv-panel-txt'),
+ children: [simTitle(), ":"]
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)("br", {}), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.tTxt, classes.tTxtSim, 'txt-sv-panel-txt'),
+ children: simContent(simulationSt.nmrSimPeaks)
+ })]
+ }) : null
+ })]
+ });
};
const mapStateToProps = (state, props) => (
// eslint-disable-line
diff --git a/dist/components/panel/multiplicity.js b/dist/components/panel/multiplicity.js
index 8ecb64c7..f4a37685 100644
--- a/dist/components/panel/multiplicity.js
+++ b/dist/components/panel/multiplicity.js
@@ -19,6 +19,7 @@ var _multiplicity = require("../../actions/multiplicity");
var _multiplicity_select = _interopRequireDefault(require("./multiplicity_select"));
var _multiplicity_coupling = _interopRequireDefault(require("./multiplicity_coupling"));
var _multiplicity_calc = require("../../helpers/multiplicity_calc");
+var _jsxRuntime = require("react/jsx-runtime");
/* eslint-disable function-paren-newline,
function-call-argument-newline, react/function-component-definition */
@@ -138,31 +139,36 @@ const pkList = (classes, row, shift, digits, rmMpyPeakByPanelAct) => row.peaks.m
peak: pk,
xExtent
});
- const rmBtn = /*#__PURE__*/_react.default.createElement(_HighlightOff.default, {
+ const rmBtn = /*#__PURE__*/(0, _jsxRuntime.jsx)(_HighlightOff.default, {
onClick: cb,
className: classes.rmBtn
});
- return /*#__PURE__*/_react.default.createElement(_material.TableRow, {
- key: pk.x,
+ return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.TableRow, {
className: classes.tRow,
- hover: true
- }, /*#__PURE__*/_react.default.createElement(_material.TableCell, {
- align: "right",
- className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt')
- }, `(${(pk.x - shift).toFixed(digits)}, ${pk.y.toExponential(2)})`), /*#__PURE__*/_react.default.createElement(_material.TableCell, {
- align: "right",
- className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt')
- }, rmBtn));
+ hover: true,
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
+ align: "right",
+ className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt'),
+ children: `(${(pk.x - shift).toFixed(digits)}, ${pk.y.toExponential(2)})`
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
+ align: "right",
+ className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt'),
+ children: rmBtn
+ })]
+ }, pk.x);
});
-const refreshBtn = (classes, onRefresh) => /*#__PURE__*/_react.default.createElement(_material.Tooltip, {
+const refreshBtn = (classes, onRefresh) => /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Tooltip, {
placement: "left",
- title: /*#__PURE__*/_react.default.createElement("span", {
- className: "txt-sv-tp"
- }, "Calculate Multiplicity")
-}, /*#__PURE__*/_react.default.createElement(_material.Button, {
- className: classes.btnRf,
- onClick: onRefresh
-}, /*#__PURE__*/_react.default.createElement(_RefreshOutlined.default, null)));
+ title: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: "txt-sv-tp",
+ children: "Calculate Multiplicity"
+ }),
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Button, {
+ className: classes.btnRf,
+ onClick: onRefresh,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_RefreshOutlined.default, {})
+ })
+});
const mpyList = (classes, digits, multiplicitySt, curveSt, clickMpyOneAct, rmMpyPeakByPanelAct, resetMpyOneAct) => {
const {
curveIdx
@@ -203,58 +209,74 @@ const mpyList = (classes, digits, multiplicitySt, curveSt, clickMpyOneAct, rmMpy
};
return createData(idx, xExtent, peaks, shift, smExtext, mpyType, js, onClick, onRefresh);
});
- return /*#__PURE__*/_react.default.createElement("div", null, rows.map(row => /*#__PURE__*/_react.default.createElement("div", {
- className: classes.moCard,
- key: row.idx
- }, /*#__PURE__*/_react.default.createElement("div", {
- className: classes.moCardHead
- }, /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(MUCheckbox, {
- className: classes.moCBox,
- checked: row.isCheck,
- onChange: row.onClick
- }), /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.moExtTxt, classes.moExtId, 'txt-sv-panel-head')
- }, row.idx), /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.moExtTxt, 'txt-sv-panel-head')
- }, `${row.center.toFixed(3)} (ppm)`), /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.moSelect, 'txt-sv-panel-head')
- }, /*#__PURE__*/_react.default.createElement(_multiplicity_select.default, {
- target: row
- })), refreshBtn(classes, row.onRefresh)), /*#__PURE__*/_react.default.createElement(_multiplicity_coupling.default, {
- row: row
- })), /*#__PURE__*/_react.default.createElement(_material.Table, {
- className: classes.table
- }, /*#__PURE__*/_react.default.createElement(_material.TableBody, null, pkList(classes, row, shift, digits, rmMpyPeakByPanelAct))))));
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+ children: rows.map(row => /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+ className: classes.moCard,
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+ className: classes.moCardHead,
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(MUCheckbox, {
+ className: classes.moCBox,
+ checked: row.isCheck,
+ onChange: row.onClick
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.moExtTxt, classes.moExtId, 'txt-sv-panel-head'),
+ children: row.idx
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.moExtTxt, 'txt-sv-panel-head'),
+ children: `${row.center.toFixed(3)} (ppm)`
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.moSelect, 'txt-sv-panel-head'),
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_multiplicity_select.default, {
+ target: row
+ })
+ }), refreshBtn(classes, row.onRefresh)]
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_multiplicity_coupling.default, {
+ row: row
+ })]
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Table, {
+ className: classes.table,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableBody, {
+ children: pkList(classes, row, shift, digits, rmMpyPeakByPanelAct)
+ })
+ })]
+ }, row.idx))
+ });
};
-const MultiplicityPanel = _ref => {
- let {
- classes,
- expand,
- onExapnd,
- multiplicitySt,
- curveSt,
- clickMpyOneAct,
- rmMpyPeakByPanelAct,
- resetMpyOneAct
- } = _ref;
+const MultiplicityPanel = ({
+ classes,
+ expand,
+ onExapnd,
+ multiplicitySt,
+ curveSt,
+ clickMpyOneAct,
+ rmMpyPeakByPanelAct,
+ resetMpyOneAct
+}) => {
const digits = 4;
- return /*#__PURE__*/_react.default.createElement(_material.Accordion, {
+ return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Accordion, {
expanded: expand,
onChange: onExapnd,
className: (0, _classnames.default)(classes.panel),
TransitionProps: {
unmountOnExit: true
} // increase Accordion performance
- }, /*#__PURE__*/_react.default.createElement(_material.AccordionSummary, {
- expandIcon: /*#__PURE__*/_react.default.createElement(_ExpandMore.default, null),
- className: (0, _classnames.default)(classes.panelSummary)
- }, /*#__PURE__*/_react.default.createElement(_material.Typography, {
- className: "txt-panel-header"
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txtBadge, 'txt-sv-panel-title')
- }, "Multiplicity"))), /*#__PURE__*/_react.default.createElement(_material.Divider, null), /*#__PURE__*/_react.default.createElement("div", {
- className: (0, _classnames.default)(classes.panelDetail)
- }, mpyList(classes, digits, multiplicitySt, curveSt, clickMpyOneAct, rmMpyPeakByPanelAct, resetMpyOneAct)));
+ ,
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.AccordionSummary, {
+ expandIcon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_ExpandMore.default, {}),
+ className: (0, _classnames.default)(classes.panelSummary),
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Typography, {
+ className: "txt-panel-header",
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txtBadge, 'txt-sv-panel-title'),
+ children: "Multiplicity"
+ })
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Divider, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+ className: (0, _classnames.default)(classes.panelDetail),
+ children: mpyList(classes, digits, multiplicitySt, curveSt, clickMpyOneAct, rmMpyPeakByPanelAct, resetMpyOneAct)
+ })]
+ });
};
const mapStateToProps = (state, props) => (
// eslint-disable-line
diff --git a/dist/components/panel/multiplicity_coupling.js b/dist/components/panel/multiplicity_coupling.js
index 745a720f..e245ceee 100644
--- a/dist/components/panel/multiplicity_coupling.js
+++ b/dist/components/panel/multiplicity_coupling.js
@@ -13,6 +13,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
var _styles = require("@mui/styles");
var _material = require("@mui/material");
var _multiplicity = require("../../actions/multiplicity");
+var _jsxRuntime = require("react/jsx-runtime");
const styles = () => ({
jDiv: {
height: 28
@@ -36,16 +37,20 @@ const styles = () => ({
height: 24
}
});
-const txtJ = () => /*#__PURE__*/_react.default.createElement(_material.InputAdornment, {
- position: "start"
-}, /*#__PURE__*/_react.default.createElement("span", {
- className: "txt-cmd-j"
-}, "J\xA0="));
-const txtHz = () => /*#__PURE__*/_react.default.createElement(_material.InputAdornment, {
- position: "end"
-}, /*#__PURE__*/_react.default.createElement("span", {
- className: "txt-cmd-hz"
-}, "Hz"));
+const txtJ = () => /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.InputAdornment, {
+ position: "start",
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: "txt-cmd-j",
+ children: "J\xA0="
+ })
+});
+const txtHz = () => /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.InputAdornment, {
+ position: "end",
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: "txt-cmd-hz",
+ children: "Hz"
+ })
+});
class MpyCoupling extends _react.default.Component {
constructor(props) {
super(props);
@@ -97,25 +102,27 @@ class MpyCoupling extends _react.default.Component {
tmpVal
} = this.state;
const value = focus && (tmpVal || tmpVal === '') ? tmpVal : row.jStr;
- return /*#__PURE__*/_react.default.createElement("div", {
- className: (0, _classnames.default)(classes.jDiv)
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.moExtTxt, classes.jTxt, 'txt-sv-panel-head')
- }, /*#__PURE__*/_react.default.createElement(_material.TextField, {
- className: (0, _classnames.default)(classes.txtField, 'txt-cmd-field'),
- placeholder: "-",
- value: value,
- margin: "none",
- InputProps: {
- startAdornment: txtJ(),
- endAdornment: txtHz(),
- className: (0, _classnames.default)(classes.txtInput, 'txt-sv-input-label')
- },
- onChange: this.onChange,
- onFocus: this.onFocus,
- onBlur: this.onBlur,
- variant: "outlined"
- })));
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+ className: (0, _classnames.default)(classes.jDiv),
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.moExtTxt, classes.jTxt, 'txt-sv-panel-head'),
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TextField, {
+ className: (0, _classnames.default)(classes.txtField, 'txt-cmd-field'),
+ placeholder: "-",
+ value: value,
+ margin: "none",
+ InputProps: {
+ startAdornment: txtJ(),
+ endAdornment: txtHz(),
+ className: (0, _classnames.default)(classes.txtInput, 'txt-sv-input-label')
+ },
+ onChange: this.onChange,
+ onFocus: this.onFocus,
+ onBlur: this.onBlur,
+ variant: "outlined"
+ })
+ })
+ });
}
}
const mapStateToProps = (state, props) => (
diff --git a/dist/components/panel/multiplicity_select.js b/dist/components/panel/multiplicity_select.js
index 4cb74b74..056ae028 100644
--- a/dist/components/panel/multiplicity_select.js
+++ b/dist/components/panel/multiplicity_select.js
@@ -13,6 +13,7 @@ var _redux = require("redux");
var _material = require("@mui/material");
var _styles = require("@mui/styles");
var _multiplicity = require("../../actions/multiplicity");
+var _jsxRuntime = require("react/jsx-runtime");
/* eslint-disable react/function-component-definition */
const Styles = () => ({
@@ -31,12 +32,11 @@ const Styles = () => ({
color: 'white'
}
});
-const MpySelect = _ref => {
- let {
- classes,
- target,
- selectMpyTypeAct
- } = _ref;
+const MpySelect = ({
+ classes,
+ target,
+ selectMpyTypeAct
+}) => {
const {
mpyType,
xExtent
@@ -57,21 +57,22 @@ const MpySelect = _ref => {
});
}
};
- return /*#__PURE__*/_react.default.createElement(_material.FormControl, {
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.FormControl, {
className: (0, _classnames.default)(classes.formControl),
- variant: "outlined"
- }, /*#__PURE__*/_react.default.createElement(_material.TextField, {
- className: (0, _classnames.default)(classes.txtField, 'txt-cmd-field'),
- value: mpyType,
- margin: "none",
variant: "outlined",
- InputProps: {
- className: (0, _classnames.default)(classes.txtInput, 'txt-sv-input-label')
- },
- onChange: onChange,
- onBlur: onBlur,
- onKeyPress: onEnterPress
- }));
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TextField, {
+ className: (0, _classnames.default)(classes.txtField, 'txt-cmd-field'),
+ value: mpyType,
+ margin: "none",
+ variant: "outlined",
+ InputProps: {
+ className: (0, _classnames.default)(classes.txtInput, 'txt-sv-input-label')
+ },
+ onChange: onChange,
+ onBlur: onBlur,
+ onKeyPress: onEnterPress
+ })
+ });
};
const mapStateToProps = (state, props) => (
// eslint-disable-line
diff --git a/dist/components/panel/peaks.js b/dist/components/panel/peaks.js
index 05b2bf6d..2c1892bf 100644
--- a/dist/components/panel/peaks.js
+++ b/dist/components/panel/peaks.js
@@ -17,6 +17,7 @@ var _styles = require("@mui/styles");
var _chem = require("../../helpers/chem");
var _edit_peak = require("../../actions/edit_peak");
var _format = _interopRequireDefault(require("../../helpers/format"));
+var _jsxRuntime = require("react/jsx-runtime");
/* eslint-disable react/function-component-definition, no-unused-vars */
const styles = theme => ({
@@ -79,7 +80,7 @@ const createData = (classes, idx, x, y, cb, digits) => ({
idx: idx + 1,
x: x.toFixed(digits),
y,
- rmBtn: /*#__PURE__*/_react.default.createElement(_HighlightOff.default, {
+ rmBtn: /*#__PURE__*/(0, _jsxRuntime.jsx)(_HighlightOff.default, {
onClick: cb,
className: classes.rmBtn
})
@@ -91,51 +92,66 @@ const peakList = (peaks, digits, cbAct, classes, isPos) => {
});
const rowKlass = isPos ? classes.tRowHeadPos : classes.tRowHeadNeg;
const headTxt = isPos ? 'P+' : 'P-';
- return /*#__PURE__*/_react.default.createElement(_material.Table, {
- className: classes.table
- }, /*#__PURE__*/_react.default.createElement(_material.TableHead, null, /*#__PURE__*/_react.default.createElement(_material.TableRow, {
- className: rowKlass
- }, /*#__PURE__*/_react.default.createElement(_material.TableCell, {
- align: "right",
- className: (0, _classnames.default)(classes.tTxtHead, 'txt-sv-panel-head')
- }, /*#__PURE__*/_react.default.createElement("i", null, headTxt)), /*#__PURE__*/_react.default.createElement(_material.TableCell, {
- align: "right",
- className: (0, _classnames.default)(classes.tTxtHeadXY, 'txt-sv-panel-head')
- }, "X"), /*#__PURE__*/_react.default.createElement(_material.TableCell, {
- align: "right",
- className: (0, _classnames.default)(classes.tTxtHeadXY, 'txt-sv-panel-head')
- }, "Y"), /*#__PURE__*/_react.default.createElement(_material.TableCell, {
- align: "right",
- className: (0, _classnames.default)(classes.tTxtHead, 'txt-sv-panel-head')
- }, "-"))), /*#__PURE__*/_react.default.createElement(_material.TableBody, null, rows.map(row => /*#__PURE__*/_react.default.createElement(_material.TableRow, {
- key: row.idx,
- className: classes.tRow,
- hover: true
- }, /*#__PURE__*/_react.default.createElement(_material.TableCell, {
- align: "right",
- className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt')
- }, row.idx), /*#__PURE__*/_react.default.createElement(_material.TableCell, {
- align: "right",
- className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt')
- }, row.x), /*#__PURE__*/_react.default.createElement(_material.TableCell, {
- align: "right",
- className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt')
- }, row.y.toExponential(2)), /*#__PURE__*/_react.default.createElement(_material.TableCell, {
- align: "right",
- className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt')
- }, row.rmBtn)))));
+ return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Table, {
+ className: classes.table,
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableHead, {
+ children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.TableRow, {
+ className: rowKlass,
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
+ align: "right",
+ className: (0, _classnames.default)(classes.tTxtHead, 'txt-sv-panel-head'),
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("i", {
+ children: headTxt
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
+ align: "right",
+ className: (0, _classnames.default)(classes.tTxtHeadXY, 'txt-sv-panel-head'),
+ children: "X"
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
+ align: "right",
+ className: (0, _classnames.default)(classes.tTxtHeadXY, 'txt-sv-panel-head'),
+ children: "Y"
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
+ align: "right",
+ className: (0, _classnames.default)(classes.tTxtHead, 'txt-sv-panel-head'),
+ children: "-"
+ })]
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableBody, {
+ children: rows.map(row => /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.TableRow, {
+ className: classes.tRow,
+ hover: true,
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
+ align: "right",
+ className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt'),
+ children: row.idx
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
+ align: "right",
+ className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt'),
+ children: row.x
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
+ align: "right",
+ className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt'),
+ children: row.y.toExponential(2)
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.TableCell, {
+ align: "right",
+ className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt'),
+ children: row.rmBtn
+ })]
+ }, row.idx))
+ })]
+ });
};
-const PeakPanel = _ref => {
- let {
- editPeakSt,
- layoutSt,
- classes,
- expand,
- onExapnd,
- rmFromPosListAct,
- rmFromNegListAct,
- curveSt
- } = _ref;
+const PeakPanel = ({
+ editPeakSt,
+ layoutSt,
+ classes,
+ expand,
+ onExapnd,
+ rmFromPosListAct,
+ rmFromNegListAct,
+ curveSt
+}) => {
const {
curveIdx,
listCurves
@@ -165,7 +181,7 @@ const PeakPanel = _ref => {
const filteredArray = currentPeakOfCurve.filter(element => neg.includes(element));
const peaksData = [].concat(filteredArray).concat(pos);
const digits = _format.default.isEmWaveLayout(layoutSt) ? 0 : 4;
- return /*#__PURE__*/_react.default.createElement(_material.Accordion, {
+ return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Accordion, {
"data-testid": "PeaksPanelInfo",
expanded: expand,
onChange: onExapnd,
@@ -173,16 +189,22 @@ const PeakPanel = _ref => {
TransitionProps: {
unmountOnExit: true
} // increase Accordion performance
- }, /*#__PURE__*/_react.default.createElement(_material.AccordionSummary, {
- expandIcon: /*#__PURE__*/_react.default.createElement(_ExpandMore.default, null),
- className: (0, _classnames.default)(classes.panelSummary)
- }, /*#__PURE__*/_react.default.createElement(_material.Typography, {
- className: "txt-panel-header"
- }, /*#__PURE__*/_react.default.createElement("span", {
- className: (0, _classnames.default)(classes.txtBadge, 'txt-sv-panel-title')
- }, "Peaks"))), /*#__PURE__*/_react.default.createElement(_material.Divider, null), /*#__PURE__*/_react.default.createElement("div", {
- className: (0, _classnames.default)(classes.panelDetail)
- }, peakList(peaksData, digits, rmFromPosListAct, classes, true)));
+ ,
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.AccordionSummary, {
+ expandIcon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_ExpandMore.default, {}),
+ className: (0, _classnames.default)(classes.panelSummary),
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Typography, {
+ className: "txt-panel-header",
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ className: (0, _classnames.default)(classes.txtBadge, 'txt-sv-panel-title'),
+ children: "Peaks"
+ })
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Divider, {}), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+ className: (0, _classnames.default)(classes.panelDetail),
+ children: peakList(peaksData, digits, rmFromPosListAct, classes, true)
+ })]
+ });
};
const mapStateToProps = (state, props) => (
// eslint-disable-line
diff --git a/dist/constants/action_type.js b/dist/constants/action_type.js
index 2754d8f0..3647cbab 100644
--- a/dist/constants/action_type.js
+++ b/dist/constants/action_type.js
@@ -31,7 +31,8 @@ const MANAGER = exports.MANAGER = {
RESET_INIT_NMR: 'RESET_INIT_NMR',
RESET_INIT_MS: 'RESET_INIT_MS',
RESET_INIT_COMMON_WITH_INTERGATION: 'RESET_INIT_COMMON_WITH_INTERGATION',
- RESET_DETECTOR: 'RESET_DETECTOR'
+ RESET_DETECTOR: 'RESET_DETECTOR',
+ RESET_MULTIPLICITY: 'RESET_MULTIPLICITY'
};
const LAYOUT = exports.LAYOUT = {
UPDATE: 'UPDATE_LAYOUT'
diff --git a/dist/constants/list_axes.js b/dist/constants/list_axes.js
index 0936a991..aab5f567 100644
--- a/dist/constants/list_axes.js
+++ b/dist/constants/list_axes.js
@@ -6,10 +6,12 @@ Object.defineProperty(exports, "__esModule", {
exports.LIST_AXES = void 0;
var _list_layout = require("./list_layout");
const optionsAxisX = {
- [_list_layout.LIST_LAYOUT.CYCLIC_VOLTAMMETRY]: ['', 'Voltage in V', 'Voltage vs Ref in V', 'Potential in V', 'Potential vs Ref in V']
+ [_list_layout.LIST_LAYOUT.CYCLIC_VOLTAMMETRY]: ['', 'Voltage in V', 'Voltage vs Ref in V', 'Potential in V', 'Potential vs Ref in V'],
+ [_list_layout.LIST_LAYOUT.LSV]: ['', 'Voltage in V', 'Voltage vs Ref in V', 'Potential in V', 'Potential vs Ref in V']
};
const optionsAxisY = {
- [_list_layout.LIST_LAYOUT.CYCLIC_VOLTAMMETRY]: ['', 'Current in A', 'Current in mA']
+ [_list_layout.LIST_LAYOUT.CYCLIC_VOLTAMMETRY]: ['', 'Current in A', 'Current in mA'],
+ [_list_layout.LIST_LAYOUT.LSV]: ['', 'Current in A', 'Current in mA']
};
const LIST_AXES = exports.LIST_AXES = {
x: optionsAxisX,
diff --git a/dist/constants/list_layout.js b/dist/constants/list_layout.js
index cf5830ed..d2276cc7 100644
--- a/dist/constants/list_layout.js
+++ b/dist/constants/list_layout.js
@@ -19,6 +19,7 @@ const LIST_LAYOUT = exports.LIST_LAYOUT = {
TGA: 'THERMOGRAVIMETRIC ANALYSIS',
XRD: 'X-RAY DIFFRACTION',
HPLC_UVVIS: 'HPLC UV/VIS',
+ LSV: 'LINEAR SWEEP VOLTAMMETRY',
CYCLIC_VOLTAMMETRY: 'CYCLIC VOLTAMMETRY',
CDS: 'CIRCULAR DICHROISM SPECTROSCOPY',
SEC: 'SIZE EXCLUSION CHROMATOGRAPHY',
diff --git a/dist/helpers/cfg.js b/dist/helpers/cfg.js
index 651671b8..5f0cdc21 100644
--- a/dist/helpers/cfg.js
+++ b/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.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) || _format.default.isGCLayout(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.isLSVLayout(layoutSt) || _format.default.isCyclicVoltaLayout(layoutSt) || _format.default.isCDSLayout(layoutSt) || _format.default.isSECLayout(layoutSt) || _format.default.isGCLayout(layoutSt);
const hideCmdAnaViewer = () => false;
const btnCmdAddPeak = layoutSt => _format.default.isMsLayout(layoutSt);
const btnCmdRmPeak = layoutSt => _format.default.isMsLayout(layoutSt);
@@ -15,8 +15,7 @@ const btnCmdSetRef = layoutSt => !_format.default.isNmrLayout(layoutSt); // esli
const btnCmdIntg = layoutSt => !(_format.default.isNmrLayout(layoutSt) || _format.default.isHplcUvVisLayout(layoutSt)); // eslint-disable-line
const btnCmdMpy = layoutSt => !_format.default.isNmrLayout(layoutSt);
-const btnCmdMpyPeak = function (layoutSt, mpySt) {
- let curveIdx = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
+const btnCmdMpyPeak = (layoutSt, mpySt, curveIdx = 0) => {
const {
multiplicities
} = mpySt;
@@ -42,8 +41,8 @@ const hidePanelMpy = layoutSt => !_format.default.isNmrLayout(layoutSt);
const hidePanelCompare = layoutSt => !(_format.default.isIrLayout(layoutSt) || _format.default.isHplcUvVisLayout(layoutSt) || _format.default.isXRDLayout(layoutSt)); // eslint-disable-line
const hideSolvent = layoutSt => !_format.default.isNmrLayout(layoutSt);
-const showTwoThreshold = layoutSt => _format.default.isCyclicVoltaLayout(layoutSt);
-const hidePanelCyclicVolta = layoutSt => !_format.default.isCyclicVoltaLayout(layoutSt);
+const showTwoThreshold = layoutSt => _format.default.isCyclicVoltaLayout(layoutSt) || _format.default.isLSVLayout(layoutSt);
+const hidePanelCyclicVolta = layoutSt => !(_format.default.isCyclicVoltaLayout(layoutSt) || _format.default.isLSVLayout(layoutSt));
const Config = {
btnCmdAnaViewer,
hideCmdAnaViewer,
diff --git a/dist/helpers/chem.js b/dist/helpers/chem.js
index bf7cc1cd..e3b7c66e 100644
--- a/dist/helpers/chem.js
+++ b/dist/helpers/chem.js
@@ -21,9 +21,7 @@ const getTopic = (_, props) => props.topic;
const getFeature = (_, props) => props.feature;
const getLayout = (state, _) => state.layout; // eslint-disable-line
-const GetCyclicVoltaShiftOffset = function () {
- let volammetryData = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
- let curveIdx = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+const GetCyclicVoltaShiftOffset = (volammetryData = null, curveIdx = 0) => {
if (!volammetryData) return 0.0;
const {
spectraList
@@ -54,7 +52,7 @@ const getShiftOffset = (state, _) => {
const {
curveIdx
} = curve;
- if (layout === _list_layout.LIST_LAYOUT.CYCLIC_VOLTAMMETRY && cyclicvolta) {
+ if ((layout === _list_layout.LIST_LAYOUT.CYCLIC_VOLTAMMETRY || layout === _list_layout.LIST_LAYOUT.LSV) && cyclicvolta) {
return GetCyclicVoltaShiftOffset(cyclicvolta, curveIdx);
}
const {
@@ -165,9 +163,7 @@ const convertFrequency = (layout, feature) => {
};
const ToFrequency = exports.ToFrequency = (0, _reselect.createSelector)(getLayout, getFeature, convertFrequency);
const getThreshold = state => state.threshold ? state.threshold.list[state.curve.curveIdx].value * 1.0 : false;
-const Convert2Peak = function (feature, threshold, offset) {
- let upThreshold = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
- let lowThreshold = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
+const Convert2Peak = (feature, threshold, offset, upThreshold = false, lowThreshold = false) => {
const peak = [];
if (!feature || !feature.data) return peak;
const data = feature.data[0];
@@ -185,7 +181,7 @@ const Convert2Peak = function (feature, threshold, offset) {
} = operation;
// if (!Format.isSECLayout(layout) && (upperThres || lowerThres)) {
- if ((_format.default.isCyclicVoltaLayout(layout) || _format.default.isCDSLayout(layout)) && (upperThres || lowerThres)) {
+ if ((_format.default.isCyclicVoltaLayout(layout) || _format.default.isLSVLayout(layout) || _format.default.isCDSLayout(layout)) && (upperThres || lowerThres)) {
let upperThresVal = upThreshold || upperThres;
if (!upperThresVal) {
upperThresVal = 1.0;
@@ -237,7 +233,7 @@ const Convert2MaxMinPeak = (layout, feature, offset) => {
pecker: [],
refIndex: -1
};
- if (!_format.default.isCyclicVoltaLayout(layout) || !feature || !feature.data) return null; // eslint-disable-line
+ if (!(_format.default.isCyclicVoltaLayout(layout) || _format.default.isLSVLayout(layout)) || !feature || !feature.data) return null; // eslint-disable-line
// const data = feature.data[0]; // eslint-disable-line
const {
volammetryData
@@ -330,7 +326,6 @@ const readLayout = jcamp => {
xType,
spectra
} = jcamp;
- if (xType && _format.default.isNmrLayout(xType)) return xType;
const {
dataType
} = spectra[0];
@@ -362,6 +357,9 @@ const readLayout = jcamp => {
if (dataType.includes('CYCLIC VOLTAMMETRY')) {
return _list_layout.LIST_LAYOUT.CYCLIC_VOLTAMMETRY;
}
+ if (dataType.includes('LINEAR SWEEP VOLTAMMETRY')) {
+ return _list_layout.LIST_LAYOUT.LSV;
+ }
if (dataType.includes('CIRCULAR DICHROISM SPECTROSCOPY')) {
return _list_layout.LIST_LAYOUT.CDS;
}
@@ -384,6 +382,7 @@ const readLayout = jcamp => {
return _list_layout.LIST_LAYOUT.DLS_INTENSITY;
}
}
+ if (xType && _format.default.isNmrLayout(xType)) return xType;
return false;
};
const extrSpectraShare = (spectra, layout) => spectra.map(s => Object.assign({
@@ -495,9 +494,7 @@ const extractVoltammetryData = jcamp => {
});
return peakStack;
};
-const buildPeakFeature = function (jcamp, layout, peakUp, s, thresRef) {
- let upperThres = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
- let lowerThres = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
+const buildPeakFeature = (jcamp, layout, peakUp, s, thresRef, upperThres = false, lowerThres = false) => {
// eslint-disable-line
const {
xType,
@@ -842,7 +839,7 @@ const ExtractJcamp = source => {
layout,
temperature
};
- } else if (_format.default.isCyclicVoltaLayout(layout) || _format.default.isSECLayout(layout) || _format.default.isAIFLayout(layout) || _format.default.isCDSLayout(layout) || _format.default.isGCLayout(layout)) {
+ } else if (_format.default.isCyclicVoltaLayout(layout) || _format.default.isLSVLayout(layout) || _format.default.isSECLayout(layout) || _format.default.isAIFLayout(layout) || _format.default.isCDSLayout(layout) || _format.default.isGCLayout(layout)) {
features = extrFeaturesCylicVolta(jcamp, layout, peakUp);
} else {
features = extrFeaturesNi(jcamp, layout, peakUp, spectra);
@@ -894,9 +891,7 @@ const Convert2Thres = (feature, thresSt) => {
return value;
};
exports.Convert2Thres = Convert2Thres;
-const Convert2DValue = function (doubleTheta) {
- let lambda = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0.15406;
- let isRadian = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+const Convert2DValue = (doubleTheta, lambda = 0.15406, isRadian = true) => {
let theta = doubleTheta / 2;
if (isRadian) {
theta = theta / 180 * Math.PI;
diff --git a/dist/helpers/converter.js b/dist/helpers/converter.js
index 2135a266..da24848d 100644
--- a/dist/helpers/converter.js
+++ b/dist/helpers/converter.js
@@ -66,8 +66,7 @@ const pksAddPos = (dataPks, editPeakSt) => {
const result = [...posPks, ...pos];
return result;
};
-const PksEdit = function (dataPks, editPeakSt) {
- let voltammetryPeak = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+const PksEdit = (dataPks, editPeakSt, voltammetryPeak = false) => {
if (voltammetryPeak && voltammetryPeak.length > 0) {
let modDataPks = [];
voltammetryPeak.forEach(peak => {
diff --git a/dist/helpers/extractParams.js b/dist/helpers/extractParams.js
index 4c52c49e..cbb4f86a 100644
--- a/dist/helpers/extractParams.js
+++ b/dist/helpers/extractParams.js
@@ -25,8 +25,7 @@ const getScanIdx = (entity, scanSt) => {
}
return idx - 1;
};
-const extrShare = function (entity, thresSt) {
- let scanIdx = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
+const extrShare = (entity, thresSt, scanIdx = 0) => {
const {
spectra,
features
diff --git a/dist/helpers/extractPeaksEdit.js b/dist/helpers/extractPeaksEdit.js
index 86fc2793..92af43f4 100644
--- a/dist/helpers/extractPeaksEdit.js
+++ b/dist/helpers/extractPeaksEdit.js
@@ -10,8 +10,7 @@ var _chem = require("./chem");
var _shift = require("./shift");
var _format = _interopRequireDefault(require("./format"));
var _integration = require("./integration");
-const niOffset = function (shiftSt) {
- let atIndex = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+const niOffset = (shiftSt, atIndex = 0) => {
const {
shifts
} = shiftSt;
@@ -27,16 +26,14 @@ const niOffset = function (shiftSt) {
return offset;
};
const msOffset = () => 0;
-const extractPeaksEdit = function (feature, editPeakSt, thresSt, shiftSt, layoutSt) {
- let atIndex = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 0;
+const extractPeaksEdit = (feature, editPeakSt, thresSt, shiftSt, layoutSt, atIndex = 0) => {
const offset = _format.default.isMsLayout(layoutSt) ? msOffset() : niOffset(shiftSt, atIndex);
const peaks = (0, _chem.Convert2Peak)(feature, thresSt.value, offset);
const peaksEdit = (0, _converter.PksEdit)(peaks, editPeakSt);
return peaksEdit;
};
exports.extractPeaksEdit = extractPeaksEdit;
-const extractAutoPeaks = function (feature, thresSt, shiftSt, layoutSt) {
- let atIndex = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 0;
+const extractAutoPeaks = (feature, thresSt, shiftSt, layoutSt, atIndex = 0) => {
const offset = _format.default.isMsLayout(layoutSt) ? msOffset() : niOffset(shiftSt, atIndex);
const peaks = (0, _chem.Convert2Peak)(feature, thresSt.value, offset);
return peaks;
diff --git a/dist/helpers/format.js b/dist/helpers/format.js
index 3ae06026..0d3c0a9e 100644
--- a/dist/helpers/format.js
+++ b/dist/helpers/format.js
@@ -35,6 +35,7 @@ const spectraDigit = layout => {
case _list_layout.LIST_LAYOUT.N15:
case _list_layout.LIST_LAYOUT.Si29:
case _list_layout.LIST_LAYOUT.PLAIN:
+ case _list_layout.LIST_LAYOUT.LSV:
case _list_layout.LIST_LAYOUT.CYCLIC_VOLTAMMETRY:
default:
return 2;
@@ -124,6 +125,10 @@ const spectraOps = {
head: 'XRD',
tail: '.'
},
+ [_list_layout.LIST_LAYOUT.LSV]: {
+ head: 'LSV',
+ tail: '.'
+ },
[_list_layout.LIST_LAYOUT.CYCLIC_VOLTAMMETRY]: {
head: 'CV',
tail: '.'
@@ -149,8 +154,7 @@ const spectraOps = {
tail: '.'
}
};
-const rmRef = function (peaks, shift) {
- let atIndex = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
+const rmRef = (peaks, shift, atIndex = 0) => {
if (!shift) return peaks;
const {
shifts
@@ -159,9 +163,7 @@ const rmRef = function (peaks, shift) {
const refValue = selectedShift.ref.value || selectedShift.peak.x;
return peaks.map(p => (0, _converter.IsSame)(p.x, refValue) ? null : p).filter(r => r != null);
};
-const formatedMS = function (peaks, maxY) {
- let decimal = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 2;
- let isAscend = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
+const formatedMS = (peaks, maxY, decimal = 2, isAscend = true) => {
const ascendFunc = (a, b) => parseFloat(a) - parseFloat(b);
const descendFunc = (a, b) => parseFloat(b) - parseFloat(a);
const sortFunc = isAscend ? ascendFunc : descendFunc;
@@ -193,12 +195,7 @@ const emLevel = (boundary, val, lowerIsStronger) => {
if (ratio > 30) return 's';
return 'vs';
};
-const formatedEm = function (peaks, maxY) {
- let decimal = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 2;
- let isAscend = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
- let isIntensity = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
- let boundary = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : {};
- let lowerIsStronger = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
+const formatedEm = (peaks, maxY, decimal = 2, isAscend = true, isIntensity = false, boundary = {}, lowerIsStronger = false) => {
const ascendFunc = (a, b) => parseFloat(a) - parseFloat(b);
const descendFunc = (a, b) => parseFloat(b) - parseFloat(a);
const sortFunc = isAscend ? ascendFunc : descendFunc;
@@ -221,12 +218,7 @@ const formatedEm = function (peaks, maxY) {
}
return ordered.map(o => `${o.x}`).join(', ');
};
-const formatedUvVis = function (peaks, maxY) {
- let decimal = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 2;
- let isAscend = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
- let isIntensity = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
- let boundary = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : {};
- let lowerIsStronger = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
+const formatedUvVis = (peaks, maxY, decimal = 2, isAscend = true, isIntensity = false, boundary = {}, lowerIsStronger = false) => {
const ascendFunc = (a, b) => parseFloat(a) - parseFloat(b);
const descendFunc = (a, b) => parseFloat(b) - parseFloat(a);
const sortFunc = isAscend ? ascendFunc : descendFunc;
@@ -249,12 +241,7 @@ const formatedUvVis = function (peaks, maxY) {
// .join(', ');
return ordered.map(o => `${o.x}`).join(', ');
};
-const formatedEmissions = function (peaks, maxY) {
- let decimal = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 2;
- let isAscend = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
- let isIntensity = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
- let boundary = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : {};
- let lowerIsStronger = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
+const formatedEmissions = (peaks, maxY, decimal = 2, isAscend = true, isIntensity = false, boundary = {}, lowerIsStronger = false) => {
const ascendFunc = (a, b) => parseFloat(a) - parseFloat(b);
const descendFunc = (a, b) => parseFloat(b) - parseFloat(a);
const sortFunc = isAscend ? ascendFunc : descendFunc;
@@ -274,12 +261,7 @@ const formatedEmissions = function (peaks, maxY) {
}));
return ordered.map(o => `${o.x} nm (${fixDigit(o.y, 2)} a.u.)`).join(', ');
};
-const formatedDLSIntensity = function (peaks, maxY) {
- let decimal = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 2;
- let isAscend = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
- let isIntensity = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
- let boundary = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : {};
- let lowerIsStronger = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
+const formatedDLSIntensity = (peaks, maxY, decimal = 2, isAscend = true, isIntensity = false, boundary = {}, lowerIsStronger = false) => {
const ascendFunc = (a, b) => parseFloat(a) - parseFloat(b);
const descendFunc = (a, b) => parseFloat(b) - parseFloat(a);
const sortFunc = isAscend ? ascendFunc : descendFunc;
@@ -299,9 +281,7 @@ const formatedDLSIntensity = function (peaks, maxY) {
}));
return ordered.map(o => `${o.x} nm (${o.y} %)`).join(', ');
};
-const formatedHplcUvVis = function (peaks) {
- let decimal = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 2;
- let integration = arguments.length > 2 ? arguments[2] : undefined;
+const formatedHplcUvVis = (peaks, decimal = 2, integration) => {
let stack = [];
if (integration) {
stack = integration.stack;
@@ -334,10 +314,7 @@ const formatedHplcUvVis = function (peaks) {
});
return arrResult.join(', ');
};
-const formatedXRD = function (peaks) {
- let isAscend = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
- let waveLength = arguments.length > 2 ? arguments[2] : undefined;
- let temperature = arguments.length > 3 ? arguments[3] : undefined;
+const formatedXRD = (peaks, isAscend = true, waveLength, temperature) => {
const ascendFunc = (a, b) => parseFloat(a) - parseFloat(b);
const descendFunc = (a, b) => parseFloat(b) - parseFloat(a);
const sortFunc = isAscend ? ascendFunc : descendFunc;
@@ -359,8 +336,7 @@ const formatedXRD = function (peaks) {
}));
return `(${XRDSource}, ${XRDWavelength}, ${temperature} °C), 2θ [°] (d [nm]): ${ordered.map(o => `${o.x} (${fixDigit(o.y, 2)})`).join(', ')}`;
};
-const rmShiftFromPeaks = function (peaks, shift) {
- let atIndex = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
+const rmShiftFromPeaks = (peaks, shift, atIndex = 0) => {
const peaksXY = (0, _converter.ToXY)(peaks);
const {
shifts
@@ -383,20 +359,19 @@ const rmShiftFromPeaks = function (peaks, shift) {
}).filter(r => r != null);
return result;
};
-const peaksBody = _ref => {
- let {
- peaks,
- layout,
- decimal,
- shift,
- isAscend,
- isIntensity = false,
- boundary = {},
- integration,
- atIndex = 0,
- waveLength,
- temperature
- } = _ref;
+const peaksBody = ({
+ peaks,
+ layout,
+ decimal,
+ shift,
+ isAscend,
+ isIntensity = false,
+ boundary = {},
+ integration,
+ atIndex = 0,
+ waveLength,
+ temperature
+}) => {
const result = rmShiftFromPeaks(peaks, shift, atIndex);
const ascendFunc = (a, b) => parseFloat(a.x) - parseFloat(b.x);
const descendFunc = (a, b) => parseFloat(b.x) - parseFloat(a.x);
@@ -421,7 +396,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.DSC || layout === _list_layout.LIST_LAYOUT.CYCLIC_VOLTAMMETRY || layout === _list_layout.LIST_LAYOUT.CDS || layout === _list_layout.LIST_LAYOUT.SEC || layout === _list_layout.LIST_LAYOUT.GC) {
+ 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.LSV || layout === _list_layout.LIST_LAYOUT.CDS || layout === _list_layout.LIST_LAYOUT.SEC || layout === _list_layout.LIST_LAYOUT.GC) {
return formatedEm(ordered, maxY, decimal, isAscend, isIntensity, boundary, false);
}
if (layout === _list_layout.LIST_LAYOUT.XRD) {
@@ -429,8 +404,7 @@ const peaksBody = _ref => {
}
return ordered.map(o => fixDigit(o.x, decimal)).join(', ');
};
-const peaksWrapper = function (layout, shift) {
- let atIndex = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
+const peaksWrapper = (layout, shift, atIndex = 0) => {
let solvTxt = '';
const {
shifts
@@ -466,12 +440,13 @@ const isHplcUvVisLayout = layoutSt => _list_layout.LIST_LAYOUT.HPLC_UVVIS === la
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 isLSVLayout = layoutSt => _list_layout.LIST_LAYOUT.LSV === layoutSt;
const isCyclicVoltaLayout = layoutSt => _list_layout.LIST_LAYOUT.CYCLIC_VOLTAMMETRY === layoutSt;
const isCDSLayout = layoutSt => _list_layout.LIST_LAYOUT.CDS === layoutSt;
const isSECLayout = layoutSt => _list_layout.LIST_LAYOUT.SEC === layoutSt;
const isGCLayout = layoutSt => _list_layout.LIST_LAYOUT.GC === layoutSt;
const isEmWaveLayout = layoutSt => [_list_layout.LIST_LAYOUT.IR, _list_layout.LIST_LAYOUT.RAMAN, _list_layout.LIST_LAYOUT.UVVIS, _list_layout.LIST_LAYOUT.HPLC_UVVIS].indexOf(layoutSt) >= 0;
-const hasMultiCurves = layoutSt => [_list_layout.LIST_LAYOUT.CYCLIC_VOLTAMMETRY, _list_layout.LIST_LAYOUT.SEC, _list_layout.LIST_LAYOUT.GC, _list_layout.LIST_LAYOUT.AIF].indexOf(layoutSt) >= 0;
+const hasMultiCurves = layoutSt => [_list_layout.LIST_LAYOUT.CYCLIC_VOLTAMMETRY, _list_layout.LIST_LAYOUT.LSV, _list_layout.LIST_LAYOUT.SEC, _list_layout.LIST_LAYOUT.GC, _list_layout.LIST_LAYOUT.AIF].indexOf(layoutSt) >= 0;
const isAIFLayout = layoutSt => _list_layout.LIST_LAYOUT.AIF === layoutSt;
const isEmissionsLayout = layoutSt => _list_layout.LIST_LAYOUT.EMISSIONS === layoutSt;
const isDLSACFLayout = layoutSt => _list_layout.LIST_LAYOUT.DLS_ACF === layoutSt;
@@ -494,8 +469,7 @@ const getNmrTyp = layout => {
return '';
}
};
-const formatPeaksByPrediction = function (peaks, layout, isAscend, decimal) {
- let predictions = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : [];
+const formatPeaksByPrediction = (peaks, layout, isAscend, decimal, predictions = []) => {
const pDict = {};
peaks.forEach(p => {
pDict[p.x.toFixed(decimal)] = 0;
@@ -525,15 +499,13 @@ const formatPeaksByPrediction = function (peaks, layout, isAscend, decimal) {
};
const compareColors = idx => ['#ABB2B9', '#EDBB99', '#ABEBC6', '#D2B4DE', '#F9E79F'][idx % 5];
const mutiEntitiesColors = idx => ['#d35400', '#2980b9', '#8e44ad', '#2c3e50', '#6D214F', '#182C61', '#BDC581'][idx % 7];
-const strNumberFixedDecimal = function (number) {
- let decimal = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : -1;
+const strNumberFixedDecimal = (number, decimal = -1) => {
if (decimal <= 0) {
return `${number}`;
}
return number.toFixed(Math.max(decimal, (number.toString().split('.')[1] || []).length));
};
-const strNumberFixedLength = function (number) {
- let maxLength = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : -1;
+const strNumberFixedLength = (number, maxLength = -1) => {
if (maxLength <= 0) {
return `${number}`;
}
@@ -550,8 +522,7 @@ const strNumberFixedLength = function (number) {
return number.toFixed(lengthToFix);
};
-const inlineNotation = function (layout, data) {
- let sampleName = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
+const inlineNotation = (layout, data, sampleName = '') => {
let formattedString = '';
let quillData = [];
const {
@@ -660,6 +631,7 @@ const Format = {
isTGALayout,
isDSCLayout,
isXRDLayout,
+ isLSVLayout,
isCyclicVoltaLayout,
isCDSLayout,
isSECLayout,
diff --git a/dist/helpers/init.js b/dist/helpers/init.js
index 8d695f68..0dc98b42 100644
--- a/dist/helpers/init.js
+++ b/dist/helpers/init.js
@@ -8,8 +8,7 @@ exports.InitTip = exports.InitScale = exports.InitPathCall = exports.InitAxisCal
var _d3Tip = _interopRequireDefault(require("d3-tip"));
var _format = _interopRequireDefault(require("./format"));
const d3 = require('d3');
-const InitScale = function (target) {
- let reverse = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+const InitScale = (target, reverse = true) => {
const xRange = reverse ? [target.w, 0] : [0, target.w];
const x = d3.scaleLinear().range(xRange);
const y = d3.scaleLinear().range([target.h, 0]);
@@ -58,13 +57,10 @@ const tpDiv = (d, digits) => `
`;
const InitTip = () => {
d3.select('.peak-tp').remove();
- const tip = (0, _d3Tip.default)().attr('class', 'd3-tip').html(_ref => {
- let {
- d,
- layout
- } = _ref;
- return tpDiv(d, _format.default.spectraDigit(layout));
- });
+ const tip = (0, _d3Tip.default)().attr('class', 'd3-tip').html(({
+ d,
+ layout
+ }) => tpDiv(d, _format.default.spectraDigit(layout)));
return tip;
};
exports.InitTip = InitTip;
\ No newline at end of file
diff --git a/dist/helpers/integration.js b/dist/helpers/integration.js
index 9f768c12..3be92276 100644
--- a/dist/helpers/integration.js
+++ b/dist/helpers/integration.js
@@ -44,8 +44,7 @@ const getAbsoluteArea = (xL, xU, data) => {
return area;
};
exports.getAbsoluteArea = getAbsoluteArea;
-const calcArea = function (d, refArea, refFactor) {
- let ignoreRef = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+const calcArea = (d, refArea, refFactor, ignoreRef = false) => {
if (ignoreRef) {
const {
absoluteArea
diff --git a/dist/helpers/mount.js b/dist/helpers/mount.js
index 8b66300a..5f1bb693 100644
--- a/dist/helpers/mount.js
+++ b/dist/helpers/mount.js
@@ -49,8 +49,7 @@ const MountPath = (target, color) => {
return path;
};
exports.MountPath = MountPath;
-const MountComparePath = function (target, color, id) {
- let alpha = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 1;
+const MountComparePath = (target, color, id, alpha = 1) => {
const path = target.root.append('g').attr('class', 'line-clip-compare').attr('id', id).attr('clip-path', 'url(#clip)').append('path').attr('class', 'line').style('fill', 'none').style('stroke', color).style('stroke-opacity', alpha).style('stroke-width', 1).style('stroke-dasharray', '30, 3').on('click', event => (0, _compass.ClickCompass)(event, target));
return path;
};
diff --git a/dist/index.js b/dist/index.js
index daafc090..0ac55a48 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -33,6 +33,7 @@ var _xrd_jcamp_2 = _interopRequireDefault(require("./__tests__/fixtures/xrd_jcam
var _cyclic_voltammetry_ = _interopRequireDefault(require("./__tests__/fixtures/cyclic_voltammetry_1"));
var _cyclic_voltammetry_2 = _interopRequireDefault(require("./__tests__/fixtures/cyclic_voltammetry_2"));
var _cyclic_voltammetry_3 = _interopRequireDefault(require("./__tests__/fixtures/cyclic_voltammetry_3"));
+var _lsv_jcamp = _interopRequireDefault(require("./__tests__/fixtures/lsv_jcamp"));
var _cds_jcamp = _interopRequireDefault(require("./__tests__/fixtures/cds_jcamp"));
var _sec_1_jcamp = _interopRequireDefault(require("./__tests__/fixtures/sec_1_jcamp"));
var _sec_2_jcamp = _interopRequireDefault(require("./__tests__/fixtures/sec_2_jcamp"));
@@ -48,6 +49,7 @@ var _dls_acf_jcamp = _interopRequireDefault(require("./__tests__/fixtures/dls_ac
var _dls_intensity_jcamp = _interopRequireDefault(require("./__tests__/fixtures/dls_intensity_jcamp"));
var _qDescValue = require("./__tests__/fixtures/qDescValue");
require("./__tests__/style/svg.css");
+var _jsxRuntime = require("react/jsx-runtime");
/* eslint-disable prefer-object-spread, default-param-last, no-nested-ternary */
const nmr1HEntity = _app.FN.ExtractJcamp(_nmr1h_jcamp.default);
@@ -74,6 +76,7 @@ const xrdEntity2 = _app.FN.ExtractJcamp(_xrd_jcamp_2.default);
const cyclicVoltaEntity1 = _app.FN.ExtractJcamp(_cyclic_voltammetry_.default);
const cyclicVoltaEntity2 = _app.FN.ExtractJcamp(_cyclic_voltammetry_2.default);
const cyclicVoltaEntity3 = _app.FN.ExtractJcamp(_cyclic_voltammetry_3.default);
+const lsvEntity = _app.FN.ExtractJcamp(_lsv_jcamp.default);
const cdsEntity = _app.FN.ExtractJcamp(_cds_jcamp.default);
const secEntity1 = _app.FN.ExtractJcamp(_sec_1_jcamp.default);
const secEntity2 = _app.FN.ExtractJcamp(_sec_2_jcamp.default);
@@ -170,6 +173,8 @@ class DemoWriteIr extends _react.default.Component {
return xrdEntity1;
case 'cyclic volta':
return cyclicVoltaEntity2;
+ case 'lsv':
+ return lsvEntity;
case 'cds':
return cdsEntity;
case 'sec':
@@ -266,19 +271,18 @@ class DemoWriteIr extends _react.default.Component {
rmDollarSign(target) {
return target.replace(/\$/g, '');
}
- formatPks(_ref) {
- let {
- peaks,
- layout,
- shift,
- isAscend,
- decimal,
- isIntensity,
- integration,
- waveLength,
- cyclicvoltaSt,
- curveSt
- } = _ref;
+ formatPks({
+ peaks,
+ layout,
+ shift,
+ isAscend,
+ decimal,
+ isIntensity,
+ integration,
+ waveLength,
+ cyclicvoltaSt,
+ curveSt
+ }) {
const entity = this.loadEntity();
const {
features
@@ -339,15 +343,14 @@ class DemoWriteIr extends _react.default.Component {
}
return desc;
}
- formatMpy(_ref2) {
- let {
- multiplicity,
- integration,
- shift,
- isAscend,
- decimal,
- layout
- } = _ref2;
+ formatMpy({
+ multiplicity,
+ integration,
+ shift,
+ isAscend,
+ decimal,
+ layout
+ }) {
// obsv freq
const entity = this.loadEntity();
const {
@@ -409,15 +412,14 @@ class DemoWriteIr extends _react.default.Component {
const solvent = label ? `${name.split('(')[0].trim()} [${value.toFixed(decimal)} ppm], ` : '';
return `${layout} NMR (${freqStr}${solvent}ppm) δ = ${str}.`;
}
- writeMpy(_ref3) {
- let {
- layout,
- shift,
- isAscend,
- decimal,
- multiplicity,
- integration
- } = _ref3;
+ writeMpy({
+ layout,
+ shift,
+ isAscend,
+ decimal,
+ multiplicity,
+ integration
+ }) {
if (!_app.FN.isNmrLayout(layout)) return;
const desc = this.formatMpy({
multiplicity,
@@ -431,19 +433,18 @@ class DemoWriteIr extends _react.default.Component {
desc
});
}
- writePeak(_ref4) {
- let {
- peaks,
- layout,
- shift,
- isAscend,
- decimal,
- isIntensity,
- integration,
- waveLength,
- cyclicvoltaSt,
- curveSt
- } = _ref4;
+ writePeak({
+ peaks,
+ layout,
+ shift,
+ isAscend,
+ decimal,
+ isIntensity,
+ integration,
+ waveLength,
+ cyclicvoltaSt,
+ curveSt
+ }) {
const desc = this.formatPks({
peaks,
layout,
@@ -461,19 +462,18 @@ class DemoWriteIr extends _react.default.Component {
desc
});
}
- savePeaks(_ref5) {
- let {
- peaks,
- layout,
- shift,
- isAscend,
- decimal,
- analysis,
- isIntensity,
- integration,
- multiplicity,
- waveLength
- } = _ref5;
+ savePeaks({
+ peaks,
+ layout,
+ shift,
+ isAscend,
+ decimal,
+ analysis,
+ isIntensity,
+ integration,
+ multiplicity,
+ waveLength
+ }) {
const entity = this.loadEntity();
const {
features
@@ -512,11 +512,10 @@ class DemoWriteIr extends _react.default.Component {
}
/*eslint-disable */
}
- predictOp(_ref6) {
- let {
- multiplicity,
- curveSt
- } = _ref6;
+ predictOp({
+ multiplicity,
+ curveSt
+ }) {
const {
curveIdx
} = curveSt;
@@ -591,226 +590,269 @@ class DemoWriteIr extends _react.default.Component {
molecule: molecule,
predictions
};
- const molSvg = ['nmr 1h', 'ir', 'cyclic volta'].indexOf(typ) >= 0 ? _phenylalanin.default.path : '';
+ const molSvg = ['nmr 1h', 'ir', 'cyclic volta', 'lsv'].indexOf(typ) >= 0 ? _phenylalanin.default.path : '';
const others = this.loadOthers();
- return /*#__PURE__*/_react.default.createElement("div", {
+ return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
style: {
width: Math.round(window.innerWidth * 0.96)
- }
- }, /*#__PURE__*/_react.default.createElement("div", {
- style: {
- margin: '0 0 15px 55px'
- }
- }, /*#__PURE__*/_react.default.createElement(_material.Button, {
- variant: "contained",
- style: {
- margin: '0 10px 0 10px'
- },
- onClick: this.onClick('nmr 1h')
- }, "NMR 1H"), /*#__PURE__*/_react.default.createElement(_material.Button, {
- variant: "contained",
- style: {
- margin: '0 10px 0 10px'
- },
- onClick: this.onClick('nmr 13c')
- }, "NMR 13C"), /*#__PURE__*/_react.default.createElement(_material.Button, {
- variant: "contained",
- style: {
- margin: '0 10px 0 10px'
- },
- onClick: this.onClick('nmr 13c dept')
- }, "NMR 13C DEPT"), /*#__PURE__*/_react.default.createElement(_material.Button, {
- variant: "contained",
- style: {
- margin: '0 10px 0 10px'
},
- onClick: this.onClick('nmr 19f')
- }, "NMR 19F"), /*#__PURE__*/_react.default.createElement(_material.Button, {
- variant: "contained",
- style: {
- margin: '0 10px 0 10px'
- },
- onClick: this.onClick('nmr 31p')
- }, "NMR 31P"), /*#__PURE__*/_react.default.createElement(_material.Button, {
- variant: "contained",
- style: {
- margin: '0 10px 0 10px'
- },
- onClick: this.onClick('nmr 15n')
- }, "NMR 15N"), /*#__PURE__*/_react.default.createElement(_material.Button, {
- variant: "contained",
- style: {
- margin: '0 10px 0 10px'
- },
- onClick: this.onClick('nmr 29si')
- }, "NMR 29Si"), /*#__PURE__*/_react.default.createElement(_material.Button, {
- variant: "contained",
- style: {
- margin: '0 10px 0 10px'
- },
- onClick: this.onClick('ir')
- }, "IR"), /*#__PURE__*/_react.default.createElement(_material.Button, {
- variant: "contained",
- style: {
- margin: '0 10px 0 10px'
- },
- onClick: this.onClick('raman')
- }, "RAMAN"), /*#__PURE__*/_react.default.createElement(_material.Button, {
- id: "btn-uv-vis",
- variant: "contained",
- style: {
- margin: '0 10px 0 10px'
- },
- onClick: this.onClick('uv/vis')
- }, "UV/VIS"), /*#__PURE__*/_react.default.createElement(_material.Button, {
- id: "btn-hplc",
- variant: "contained",
- style: {
- margin: '0 10px 0 10px'
- },
- onClick: this.onClick('hplc uv/vis')
- }, "HPLC UV/VIS"), /*#__PURE__*/_react.default.createElement(_material.Button, {
- id: "btn-tga",
- variant: "contained",
- style: {
- margin: '0 10px 0 10px'
- },
- 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: {
- margin: '0 10px 0 10px'
- },
- onClick: this.onClick('xrd')
- }, "XRD"), /*#__PURE__*/_react.default.createElement(_material.Button, {
- id: "btn-cv",
- variant: "contained",
- style: {
- margin: '0 10px 0 10px'
- },
- onClick: this.onClick('cyclic volta')
- }, "CV"), /*#__PURE__*/_react.default.createElement(_material.Button, {
- variant: "contained",
- style: {
- margin: '0 10px 0 10px'
- },
- onClick: this.onClick('cds')
- }, "CDS"), /*#__PURE__*/_react.default.createElement(_material.Button, {
- id: "btn-sec",
- variant: "contained",
- style: {
- margin: '0 10px 0 10px'
- },
- onClick: this.onClick('sec')
- }, "SEC"), /*#__PURE__*/_react.default.createElement(_material.Button, {
- id: "btn-sec",
- variant: "contained",
- style: {
- margin: '0 10px 0 10px'
- },
- onClick: this.onClick('gc')
- }, "GC"), /*#__PURE__*/_react.default.createElement(_material.Button, {
- id: "btn-sod",
- variant: "contained",
- style: {
- margin: '0 10px 0 10px'
- },
- onClick: this.onClick('aif')
- }, "SORPTION-DESORPTION"), /*#__PURE__*/_react.default.createElement(_material.Button, {
- variant: "contained",
- style: {
- margin: '0 10px 0 10px'
- },
- onClick: this.onClick('emissions')
- }, "EMISSIONS"), /*#__PURE__*/_react.default.createElement(_material.Button, {
- variant: "contained",
- style: {
- margin: '0 10px 0 10px'
- },
- onClick: this.onClick('dls acf')
- }, "DLS ACF"), /*#__PURE__*/_react.default.createElement(_material.Button, {
- variant: "contained",
- style: {
- margin: '0 10px 0 10px'
- },
- onClick: this.onClick('dls intensity')
- }, "DLS intensity"), /*#__PURE__*/_react.default.createElement(_material.Button, {
- variant: "contained",
- style: {
- margin: '0 10px 0 10px'
- },
- onClick: this.onClick('ms')
- }, "MS"), /*#__PURE__*/_react.default.createElement(_material.Button, {
- variant: "contained",
- style: {
- margin: '0 10px 0 10px'
- },
- onClick: this.onClick('multi')
- }, "Multi NMR"), /*#__PURE__*/_react.default.createElement(_material.Button, {
- variant: "contained",
- style: {
- margin: '0 10px 0 10px'
- },
- onClick: this.onClick('multi ir')
- }, "Multi IR"), /*#__PURE__*/_react.default.createElement(_material.Button, {
- variant: "contained",
- style: {
- margin: '0 10px 0 10px'
- },
- onClick: this.onClick('multi hplc')
- }, "Multi HPLC"), /*#__PURE__*/_react.default.createElement(_material.Button, {
- variant: "contained",
- style: {
- margin: '0 10px 0 10px'
- },
- onClick: this.onClick('multi xrd')
- }, "Multi XRD")), /*#__PURE__*/_react.default.createElement(_app.SpectraEditor, {
- entity: entity,
- multiEntities: multiEntities,
- others: others,
- editorOnly: false,
- canChangeDescription: true,
- onDescriptionChanged: this.onDescriptionChanged,
- molSvg: molSvg,
- theoryMass: '123.0',
- userManualLink: {
- cv: "https://www.chemotion.net/chemotionsaurus/docs/eln/chemspectra/cvanalysis"
- },
- forecast: forecast,
- operations: operations
- }), /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("span", null, "Description Changed"), /*#__PURE__*/_react.default.createElement(_reactQuill.default, {
- className: 'card-sv-quill',
- value: this.state.descChanged,
- modules: {
- toolbar: false
- },
- readOnly: true
- })), /*#__PURE__*/_react.default.createElement(_material.Grid, {
- container: true
- }, /*#__PURE__*/_react.default.createElement(_material.Grid, {
- item: true,
- xs: 10
- }, /*#__PURE__*/_react.default.createElement(_material.InputBase, {
- style: {
- margin: '0 0 0 63px'
- },
- placeholder: "Description",
- multiline: true,
- fullWidth: true,
- rows: "2",
- margin: "dense",
- value: desc
- }))));
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+ style: {
+ margin: '0 0 15px 55px'
+ },
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Button, {
+ variant: "contained",
+ style: {
+ margin: '0 10px 0 10px'
+ },
+ onClick: this.onClick('nmr 1h'),
+ children: "NMR 1H"
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Button, {
+ variant: "contained",
+ style: {
+ margin: '0 10px 0 10px'
+ },
+ onClick: this.onClick('nmr 13c'),
+ children: "NMR 13C"
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Button, {
+ variant: "contained",
+ style: {
+ margin: '0 10px 0 10px'
+ },
+ onClick: this.onClick('nmr 13c dept'),
+ children: "NMR 13C DEPT"
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Button, {
+ variant: "contained",
+ style: {
+ margin: '0 10px 0 10px'
+ },
+ onClick: this.onClick('nmr 19f'),
+ children: "NMR 19F"
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Button, {
+ variant: "contained",
+ style: {
+ margin: '0 10px 0 10px'
+ },
+ onClick: this.onClick('nmr 31p'),
+ children: "NMR 31P"
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Button, {
+ variant: "contained",
+ style: {
+ margin: '0 10px 0 10px'
+ },
+ onClick: this.onClick('nmr 15n'),
+ children: "NMR 15N"
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Button, {
+ variant: "contained",
+ style: {
+ margin: '0 10px 0 10px'
+ },
+ onClick: this.onClick('nmr 29si'),
+ children: "NMR 29Si"
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Button, {
+ variant: "contained",
+ style: {
+ margin: '0 10px 0 10px'
+ },
+ onClick: this.onClick('ir'),
+ children: "IR"
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Button, {
+ variant: "contained",
+ style: {
+ margin: '0 10px 0 10px'
+ },
+ onClick: this.onClick('raman'),
+ children: "RAMAN"
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Button, {
+ id: "btn-uv-vis",
+ variant: "contained",
+ style: {
+ margin: '0 10px 0 10px'
+ },
+ onClick: this.onClick('uv/vis'),
+ children: "UV/VIS"
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Button, {
+ id: "btn-hplc",
+ variant: "contained",
+ style: {
+ margin: '0 10px 0 10px'
+ },
+ onClick: this.onClick('hplc uv/vis'),
+ children: "HPLC UV/VIS"
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Button, {
+ id: "btn-tga",
+ variant: "contained",
+ style: {
+ margin: '0 10px 0 10px'
+ },
+ onClick: this.onClick('tga'),
+ children: "TGA"
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Button, {
+ id: "btn-dsc",
+ variant: "contained",
+ style: {
+ margin: '0 10px 0 10px'
+ },
+ onClick: this.onClick('dsc'),
+ children: "DSC"
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Button, {
+ id: "btn-xrd",
+ variant: "contained",
+ style: {
+ margin: '0 10px 0 10px'
+ },
+ onClick: this.onClick('xrd'),
+ children: "XRD"
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Button, {
+ id: "btn-cv",
+ variant: "contained",
+ style: {
+ margin: '0 10px 0 10px'
+ },
+ onClick: this.onClick('cyclic volta'),
+ children: "CV"
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Button, {
+ id: "btn-lsv",
+ variant: "contained",
+ style: {
+ margin: '0 10px 0 10px'
+ },
+ onClick: this.onClick('lsv'),
+ children: "LSV"
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Button, {
+ variant: "contained",
+ style: {
+ margin: '0 10px 0 10px'
+ },
+ onClick: this.onClick('cds'),
+ children: "CDS"
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Button, {
+ id: "btn-sec",
+ variant: "contained",
+ style: {
+ margin: '0 10px 0 10px'
+ },
+ onClick: this.onClick('sec'),
+ children: "SEC"
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Button, {
+ id: "btn-sec",
+ variant: "contained",
+ style: {
+ margin: '0 10px 0 10px'
+ },
+ onClick: this.onClick('gc'),
+ children: "GC"
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Button, {
+ id: "btn-sod",
+ variant: "contained",
+ style: {
+ margin: '0 10px 0 10px'
+ },
+ onClick: this.onClick('aif'),
+ children: "SORPTION-DESORPTION"
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Button, {
+ variant: "contained",
+ style: {
+ margin: '0 10px 0 10px'
+ },
+ onClick: this.onClick('emissions'),
+ children: "EMISSIONS"
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Button, {
+ variant: "contained",
+ style: {
+ margin: '0 10px 0 10px'
+ },
+ onClick: this.onClick('dls acf'),
+ children: "DLS ACF"
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Button, {
+ variant: "contained",
+ style: {
+ margin: '0 10px 0 10px'
+ },
+ onClick: this.onClick('dls intensity'),
+ children: "DLS intensity"
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Button, {
+ variant: "contained",
+ style: {
+ margin: '0 10px 0 10px'
+ },
+ onClick: this.onClick('ms'),
+ children: "MS"
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Button, {
+ variant: "contained",
+ style: {
+ margin: '0 10px 0 10px'
+ },
+ onClick: this.onClick('multi'),
+ children: "Multi NMR"
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Button, {
+ variant: "contained",
+ style: {
+ margin: '0 10px 0 10px'
+ },
+ onClick: this.onClick('multi ir'),
+ children: "Multi IR"
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Button, {
+ variant: "contained",
+ style: {
+ margin: '0 10px 0 10px'
+ },
+ onClick: this.onClick('multi hplc'),
+ children: "Multi HPLC"
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Button, {
+ variant: "contained",
+ style: {
+ margin: '0 10px 0 10px'
+ },
+ onClick: this.onClick('multi xrd'),
+ children: "Multi XRD"
+ })]
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_app.SpectraEditor, {
+ entity: entity,
+ multiEntities: multiEntities,
+ others: others,
+ editorOnly: false,
+ canChangeDescription: true,
+ onDescriptionChanged: this.onDescriptionChanged,
+ molSvg: molSvg,
+ exactMass: '123.0',
+ userManualLink: {
+ cv: "https://www.chemotion.net/chemotionsaurus/docs/eln/chemspectra/cvanalysis"
+ },
+ forecast: forecast,
+ operations: operations
+ }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+ children: "Description Changed"
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactQuill.default, {
+ className: 'card-sv-quill',
+ value: this.state.descChanged,
+ modules: {
+ toolbar: false
+ },
+ readOnly: true
+ })]
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Grid, {
+ container: true,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Grid, {
+ item: true,
+ xs: 10,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.InputBase, {
+ style: {
+ margin: '0 0 0 63px'
+ },
+ placeholder: "Description",
+ multiline: true,
+ fullWidth: true,
+ rows: "2",
+ margin: "dense",
+ value: desc
+ })
+ })
+ })]
+ });
}
}
// - - - DOM - - -
-_reactDom.default.render( /*#__PURE__*/_react.default.createElement(DemoWriteIr, null), document.getElementById('root'));
\ No newline at end of file
+_reactDom.default.render(/*#__PURE__*/(0, _jsxRuntime.jsx)(DemoWriteIr, {}), document.getElementById('root'));
\ No newline at end of file
diff --git a/dist/layer_content.js b/dist/layer_content.js
index d19f7380..56a2fb51 100644
--- a/dist/layer_content.js
+++ b/dist/layer_content.js
@@ -13,6 +13,7 @@ var _index = _interopRequireDefault(require("./components/d3_line/index"));
var _index2 = _interopRequireDefault(require("./components/d3_rect/index"));
var _forecast_viewer = _interopRequireDefault(require("./components/forecast_viewer"));
var _format = _interopRequireDefault(require("./helpers/format"));
+var _jsxRuntime = require("react/jsx-runtime");
/* eslint-disable prefer-object-spread, default-param-last, react/function-component-definition */
const extractLayout = (forecast, layoutSt) => {
@@ -32,17 +33,16 @@ const extractLayout = (forecast, layoutSt) => {
isXRD
};
};
-const Content = _ref => {
- let {
- topic,
- feature,
- cLabel,
- xLabel,
- yLabel,
- forecast,
- operations,
- layoutSt
- } = _ref;
+const Content = ({
+ topic,
+ feature,
+ cLabel,
+ xLabel,
+ yLabel,
+ forecast,
+ operations,
+ layoutSt
+}) => {
const {
showForecast,
isNmr,
@@ -52,7 +52,7 @@ const Content = _ref => {
isXRD
} = extractLayout(forecast, layoutSt);
if (showForecast) {
- return /*#__PURE__*/_react.default.createElement(_forecast_viewer.default, {
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)(_forecast_viewer.default, {
topic: topic,
cLabel: cLabel,
xLabel: xLabel,
@@ -67,7 +67,7 @@ const Content = _ref => {
});
}
if (isMs) {
- return /*#__PURE__*/_react.default.createElement(_index2.default, {
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)(_index2.default, {
topic: topic,
cLabel: cLabel,
xLabel: xLabel,
@@ -76,7 +76,7 @@ const Content = _ref => {
isHidden: false
});
}
- return /*#__PURE__*/_react.default.createElement(_index.default, {
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.default, {
topic: topic,
cLabel: cLabel,
xLabel: xLabel,
diff --git a/dist/layer_init.js b/dist/layer_init.js
index 0cd879a3..616c8f5c 100644
--- a/dist/layer_init.js
+++ b/dist/layer_init.js
@@ -18,6 +18,7 @@ var _layer_prism = _interopRequireDefault(require("./layer_prism"));
var _format = _interopRequireDefault(require("./helpers/format"));
var _multi_jcamps_viewer = _interopRequireDefault(require("./components/multi_jcamps_viewer"));
var _curve = require("./actions/curve");
+var _jsxRuntime = require("react/jsx-runtime");
/* eslint-disable prefer-object-spread, default-param-last */
const styles = () => ({});
@@ -42,14 +43,10 @@ class LayerInit extends _react.default.Component {
this.updateMultiEntities();
}
normChange(prevProps) {
- const prevFeatures = prevProps.entity.features;
- const prevPeak = prevFeatures.editPeak || prevFeatures.autoPeak;
const {
entity
} = this.props;
- const nextFeatures = entity.features;
- const nextPeak = nextFeatures.editPeak || nextFeatures.autoPeak;
- if (prevPeak !== nextPeak) {
+ if (prevProps.entity !== entity) {
this.execReset();
}
}
@@ -62,7 +59,8 @@ class LayerInit extends _react.default.Component {
resetInitNmrAct,
resetInitCommonWithIntergationAct,
resetDetectorAct,
- updateDSCMetaDataAct
+ updateDSCMetaDataAct,
+ resetMultiplicityAct
} = this.props;
resetInitCommonAct();
resetDetectorAct();
@@ -76,8 +74,7 @@ class LayerInit extends _react.default.Component {
const editPeak = features.editPeak || features[0];
const baseFeat = editPeak || autoPeak;
resetInitMsAct(baseFeat);
- }
- if (_format.default.isNmrLayout(layout)) {
+ } else if (_format.default.isNmrLayout(layout)) {
const {
integration,
multiplicity,
@@ -102,6 +99,8 @@ class LayerInit extends _react.default.Component {
dscMetaData
} = features;
updateDSCMetaDataAct(dscMetaData);
+ } else {
+ resetMultiplicityAct();
}
}
initReducer() {
@@ -136,7 +135,7 @@ class LayerInit extends _react.default.Component {
descriptions,
molSvg,
editorOnly,
- theoryMass,
+ exactMass,
canChangeDescription,
onDescriptionChanged,
multiEntities,
@@ -150,26 +149,26 @@ class LayerInit extends _react.default.Component {
const xxLabel = !xLabel && xLabel === '' ? `X (${target.xUnit})` : xLabel;
const yyLabel = !yLabel && yLabel === '' ? `Y (${target.yUnit})` : yLabel;
if (multiEntities) {
- return /*#__PURE__*/_react.default.createElement(_multi_jcamps_viewer.default, {
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)(_multi_jcamps_viewer.default, {
multiEntities: multiEntities,
entityFileNames: entityFileNames,
userManualLink: userManualLink,
molSvg: molSvg,
- theoryMass: theoryMass,
+ exactMass: exactMass,
operations: operations
});
} else if (_format.default.isCyclicVoltaLayout(layout)) {
// eslint-disable-line
- return /*#__PURE__*/_react.default.createElement(_multi_jcamps_viewer.default, {
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)(_multi_jcamps_viewer.default, {
multiEntities: [entity],
entityFileNames: entityFileNames,
userManualLink: userManualLink,
molSvg: molSvg,
- theoryMass: theoryMass,
+ exactMass: exactMass,
operations: operations
});
}
- return /*#__PURE__*/_react.default.createElement(_layer_prism.default, {
+ return /*#__PURE__*/(0, _jsxRuntime.jsx)(_layer_prism.default, {
entity: entity,
cLabel: cLabel,
xLabel: xxLabel,
@@ -179,7 +178,7 @@ class LayerInit extends _react.default.Component {
descriptions: descriptions,
molSvg: molSvg,
editorOnly: editorOnly,
- theoryMass: theoryMass,
+ exactMass: exactMass,
canChangeDescription: canChangeDescription,
onDescriptionChanged: onDescriptionChanged
});
@@ -194,6 +193,7 @@ const mapDispatchToProps = dispatch => (0, _redux.bindActionCreators)({
resetInitMsAct: _manager.resetInitMs,
resetInitCommonWithIntergationAct: _manager.resetInitCommonWithIntergation,
resetDetectorAct: _manager.resetDetector,
+ resetMultiplicityAct: _manager.resetMultiplicity,
updateOperationAct: _submit.updateOperation,
updateMetaPeaksAct: _meta.updateMetaPeaks,
addOthersAct: _jcamp.addOthers,
@@ -212,7 +212,7 @@ LayerInit.propTypes = {
yLabel: _propTypes.default.string.isRequired,
molSvg: _propTypes.default.string.isRequired,
editorOnly: _propTypes.default.bool.isRequired,
- theoryMass: _propTypes.default.string.isRequired,
+ exactMass: _propTypes.default.string.isRequired,
forecast: _propTypes.default.object.isRequired,
operations: _propTypes.default.array.isRequired,
descriptions: _propTypes.default.array.isRequired,
@@ -230,6 +230,7 @@ LayerInit.propTypes = {
userManualLink: _propTypes.default.object,
// eslint-disable-line
resetDetectorAct: _propTypes.default.func.isRequired,
+ resetMultiplicityAct: _propTypes.default.func.isRequired,
updateDSCMetaDataAct: _propTypes.default.func.isRequired
};
var _default = exports.default = (0, _reactRedux.connect)(
diff --git a/dist/layer_prism.js b/dist/layer_prism.js
index 12bc2af0..7680524a 100644
--- a/dist/layer_prism.js
+++ b/dist/layer_prism.js
@@ -16,29 +16,29 @@ var _index2 = _interopRequireDefault(require("./components/cmd_bar/index"));
var _layer_content = _interopRequireDefault(require("./layer_content"));
var _list_ui = require("./constants/list_ui");
var _extractParams = require("./helpers/extractParams");
+var _jsxRuntime = require("react/jsx-runtime");
/* eslint-disable prefer-object-spread, default-param-last,
react/function-component-definition, react/require-default-props
*/
const styles = () => ({});
-const LayerPrism = _ref => {
- let {
- entity,
- cLabel,
- xLabel,
- yLabel,
- forecast,
- operations,
- descriptions,
- molSvg,
- editorOnly,
- theoryMass,
- thresSt,
- scanSt,
- uiSt,
- canChangeDescription,
- onDescriptionChanged
- } = _ref;
+const LayerPrism = ({
+ entity,
+ cLabel,
+ xLabel,
+ yLabel,
+ forecast,
+ operations,
+ descriptions,
+ molSvg,
+ editorOnly,
+ exactMass,
+ thresSt,
+ scanSt,
+ uiSt,
+ canChangeDescription,
+ onDescriptionChanged
+}) => {
const {
topic,
feature,
@@ -50,64 +50,75 @@ const LayerPrism = _ref => {
viewer
} = uiSt;
if (viewer === _list_ui.LIST_UI_VIEWER_TYPE.ANALYSIS) {
- return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_index2.default, {
+ return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_index2.default, {
+ feature: feature,
+ hasEdit: hasEdit,
+ forecast: forecast,
+ operations: operations,
+ editorOnly: editorOnly
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+ className: "react-spectrum-editor",
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Grid.default, {
+ container: true,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Grid.default, {
+ item: true,
+ xs: 12,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_layer_content.default, {
+ topic: topic,
+ feature: feature,
+ cLabel: cLabel,
+ xLabel: xLabel,
+ yLabel: yLabel,
+ forecast: forecast,
+ operations: operations
+ })
+ })
+ })
+ })]
+ });
+ }
+ return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_index2.default, {
feature: feature,
hasEdit: hasEdit,
forecast: forecast,
operations: operations,
editorOnly: editorOnly
- }), /*#__PURE__*/_react.default.createElement("div", {
- className: "react-spectrum-editor"
- }, /*#__PURE__*/_react.default.createElement(_Grid.default, {
- container: true
- }, /*#__PURE__*/_react.default.createElement(_Grid.default, {
- item: true,
- xs: 12
- }, /*#__PURE__*/_react.default.createElement(_layer_content.default, {
- topic: topic,
- feature: feature,
- cLabel: cLabel,
- xLabel: xLabel,
- yLabel: yLabel,
- forecast: forecast,
- operations: operations
- })))));
- }
- return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_index2.default, {
- feature: feature,
- hasEdit: hasEdit,
- forecast: forecast,
- operations: operations,
- editorOnly: editorOnly
- }), /*#__PURE__*/_react.default.createElement("div", {
- className: "react-spectrum-editor"
- }, /*#__PURE__*/_react.default.createElement(_Grid.default, {
- container: true
- }, /*#__PURE__*/_react.default.createElement(_Grid.default, {
- item: true,
- xs: 9
- }, /*#__PURE__*/_react.default.createElement(_layer_content.default, {
- topic: topic,
- feature: feature,
- cLabel: cLabel,
- xLabel: xLabel,
- yLabel: yLabel,
- forecast: forecast,
- operations: operations
- })), /*#__PURE__*/_react.default.createElement(_Grid.default, {
- item: true,
- xs: 3,
- align: "center"
- }, /*#__PURE__*/_react.default.createElement(_index.default, {
- feature: feature,
- integration: integration,
- editorOnly: editorOnly,
- molSvg: molSvg,
- theoryMass: theoryMass,
- descriptions: descriptions,
- canChangeDescription: canChangeDescription,
- onDescriptionChanged: onDescriptionChanged
- })))));
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+ className: "react-spectrum-editor",
+ children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Grid.default, {
+ container: true,
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Grid.default, {
+ item: true,
+ xs: 9,
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_layer_content.default, {
+ topic: topic,
+ feature: feature,
+ cLabel: cLabel,
+ xLabel: xLabel,
+ yLabel: yLabel,
+ forecast: forecast,
+ operations: operations
+ })
+ }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Grid.default, {
+ item: true,
+ xs: 3,
+ align: "center",
+ children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.default, {
+ feature: feature,
+ integration: integration,
+ editorOnly: editorOnly,
+ molSvg: molSvg,
+ exactMass: exactMass,
+ descriptions: descriptions,
+ canChangeDescription: canChangeDescription,
+ onDescriptionChanged: onDescriptionChanged
+ })
+ })]
+ })
+ })]
+ });
};
const mapStateToProps = (state, props) => (
// eslint-disable-line
@@ -124,7 +135,7 @@ LayerPrism.propTypes = {
yLabel: _propTypes.default.string.isRequired,
molSvg: _propTypes.default.string.isRequired,
editorOnly: _propTypes.default.bool.isRequired,
- theoryMass: _propTypes.default.string,
+ exactMass: _propTypes.default.string,
forecast: _propTypes.default.object.isRequired,
operations: _propTypes.default.array.isRequired,
descriptions: _propTypes.default.array.isRequired,
diff --git a/dist/reducers/reducer_axes.js b/dist/reducers/reducer_axes.js
index 2d43ec8c..b9544a85 100644
--- a/dist/reducers/reducer_axes.js
+++ b/dist/reducers/reducer_axes.js
@@ -13,8 +13,7 @@ const initialState = {
yUnit: ''
}]
};
-const updateAxis = function (state, payload) {
- let isYAxis = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+const updateAxis = (state, payload, isYAxis = false) => {
const {
value,
curveIndex
@@ -44,9 +43,7 @@ const updateAxis = function (state, payload) {
axes
});
};
-const axesReducer = function () {
- let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initialState;
- let action = arguments.length > 1 ? arguments[1] : undefined;
+const axesReducer = (state = initialState, action) => {
switch (action.type) {
case _action_type.AXES.UPDATE_X_AXIS:
return updateAxis(state, action.payload);
diff --git a/dist/reducers/reducer_curve.js b/dist/reducers/reducer_curve.js
index 4981ebb9..91c11de1 100644
--- a/dist/reducers/reducer_curve.js
+++ b/dist/reducers/reducer_curve.js
@@ -59,9 +59,7 @@ const setAllCurves = (state, action) => {
listCurves: payload
});
};
-const curveReducer = function () {
- let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initialState;
- let action = arguments.length > 1 ? arguments[1] : undefined;
+const curveReducer = (state = initialState, action) => {
switch (action.type) {
case _action_type.CURVE.SELECT_WORKING_CURVE:
return Object.assign({}, state, {
diff --git a/dist/reducers/reducer_detector.js b/dist/reducers/reducer_detector.js
index db8e3d56..203cf350 100644
--- a/dist/reducers/reducer_detector.js
+++ b/dist/reducers/reducer_detector.js
@@ -25,9 +25,7 @@ const updateOrAppendCurve = (curves, targetCurveIdx, newCurve) => {
}
return [...curves, newCurve];
};
-const detectorReducer = function () {
- let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initialState;
- let action = arguments.length > 1 ? arguments[1] : undefined;
+const detectorReducer = (state = initialState, action) => {
switch (action.type) {
case _action_type.SEC.UPDATE_DETECTOR:
const {
diff --git a/dist/reducers/reducer_edit_peak.js b/dist/reducers/reducer_edit_peak.js
index 80c7b990..35d38bff 100644
--- a/dist/reducers/reducer_edit_peak.js
+++ b/dist/reducers/reducer_edit_peak.js
@@ -202,9 +202,7 @@ const clearAllPeaks = (state, action) => {
peaks: newPeaks
});
};
-const editPeakReducer = function () {
- let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initialState;
- let action = arguments.length > 1 ? arguments[1] : undefined;
+const editPeakReducer = (state = initialState, action) => {
switch (action.type) {
case _action_type.EDITPEAK.ADD_POSITIVE:
return addToPos(state, action);
diff --git a/dist/reducers/reducer_forecast.js b/dist/reducers/reducer_forecast.js
index cecf7278..7dcb6c05 100644
--- a/dist/reducers/reducer_forecast.js
+++ b/dist/reducers/reducer_forecast.js
@@ -101,9 +101,7 @@ const updateNmrStatus = (state, action) => {
});
return newSt;
};
-const forecastReducer = function () {
- let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initialState;
- let action = arguments.length > 1 ? arguments[1] : undefined;
+const forecastReducer = (state = initialState, action) => {
switch (action.type) {
case _action_type.FORECAST.INIT_STATUS:
if (!action.payload) return state;
diff --git a/dist/reducers/reducer_integration.js b/dist/reducers/reducer_integration.js
index 0fd8b983..9d25b023 100644
--- a/dist/reducers/reducer_integration.js
+++ b/dist/reducers/reducer_integration.js
@@ -208,9 +208,7 @@ const clearAll = (state, action) => {
selectedIdx: curveIdx
});
};
-const integrationReducer = function () {
- let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initialState;
- let action = arguments.length > 1 ? arguments[1] : undefined;
+const integrationReducer = (state = initialState, action) => {
switch (action.type) {
case _action_type.UI.SWEEP.SELECT_INTEGRATION:
return addToStack(state, action);
diff --git a/dist/reducers/reducer_jcamp.js b/dist/reducers/reducer_jcamp.js
index a4d475f6..6c18ec0f 100644
--- a/dist/reducers/reducer_jcamp.js
+++ b/dist/reducers/reducer_jcamp.js
@@ -14,11 +14,10 @@ const initialState = {
addOthersCb: false
}]
};
-const addOthers = (state, _ref) => {
- let {
- others,
- addOthersCb
- } = _ref;
+const addOthers = (state, {
+ others,
+ addOthersCb
+}) => {
const {
selectedIdx,
jcamps
@@ -81,9 +80,7 @@ const toggleShow = (state, payload) => {
jcamps
});
};
-const layoutReducer = function () {
- let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initialState;
- let action = arguments.length > 1 ? arguments[1] : undefined;
+const layoutReducer = (state = initialState, action) => {
switch (action.type) {
case _action_type.JCAMP.ADD_OTHERS:
return addOthers(state, action.payload);
diff --git a/dist/reducers/reducer_layout.js b/dist/reducers/reducer_layout.js
index 95b82d53..c264e570 100644
--- a/dist/reducers/reducer_layout.js
+++ b/dist/reducers/reducer_layout.js
@@ -9,9 +9,7 @@ var _list_layout = require("../constants/list_layout");
/* eslint-disable prefer-object-spread, default-param-last */
const initialState = _list_layout.LIST_LAYOUT.C13;
-const layoutReducer = function () {
- let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initialState;
- let action = arguments.length > 1 ? arguments[1] : undefined;
+const layoutReducer = (state = initialState, action) => {
switch (action.type) {
case _action_type.LAYOUT.UPDATE:
return action.payload;
diff --git a/dist/reducers/reducer_manager.js b/dist/reducers/reducer_manager.js
index e7535ed5..2de439dd 100644
--- a/dist/reducers/reducer_manager.js
+++ b/dist/reducers/reducer_manager.js
@@ -8,9 +8,7 @@ exports.default = void 0;
// import { MANAGER } from '../constants/action_type';
const initialState = {};
-const managerReducer = function () {
- let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initialState;
- let action = arguments.length > 1 ? arguments[1] : undefined;
+const managerReducer = (state = initialState, action) => {
switch (action.type) {
default:
return state;
diff --git a/dist/reducers/reducer_meta.js b/dist/reducers/reducer_meta.js
index 6abbca9c..3b92cb0e 100644
--- a/dist/reducers/reducer_meta.js
+++ b/dist/reducers/reducer_meta.js
@@ -27,9 +27,7 @@ const updateMetaData = (state, action) => {
dscMetaData
});
};
-const metaReducer = function () {
- let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initialState;
- let action = arguments.length > 1 ? arguments[1] : undefined;
+const metaReducer = (state = initialState, action) => {
switch (action.type) {
case _action_type.META.UPDATE_PEAKS_RDC:
return Object.assign({}, state, action.payload);
diff --git a/dist/reducers/reducer_multiplicity.js b/dist/reducers/reducer_multiplicity.js
index 9785172f..651182e1 100644
--- a/dist/reducers/reducer_multiplicity.js
+++ b/dist/reducers/reducer_multiplicity.js
@@ -164,9 +164,7 @@ const clearAll = (state, action) => {
multiplicities: newMultiplicities
});
};
-const multiplicityReducer = function () {
- let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initialState;
- let action = arguments.length > 1 ? arguments[1] : undefined;
+const multiplicityReducer = (state = initialState, action) => {
switch (action.type) {
case _action_type.EDITPEAK.SHIFT:
return setShift(state, action);
@@ -191,6 +189,8 @@ const multiplicityReducer = function () {
return clearAll(state, action);
case _action_type.MANAGER.RESETALL:
return state;
+ case _action_type.MANAGER.RESET_MULTIPLICITY:
+ return initialState;
default:
return _undo_redo_config.undoRedoActions.indexOf(action.type) >= 0 ? Object.assign({}, state) : state;
}
diff --git a/dist/reducers/reducer_scan.js b/dist/reducers/reducer_scan.js
index e870a829..99fe706b 100644
--- a/dist/reducers/reducer_scan.js
+++ b/dist/reducers/reducer_scan.js
@@ -30,9 +30,7 @@ const toggleIsAuto = state => Object.assign({}, state, {
isAuto: !state.isAuto,
target: false
});
-const scanReducer = function () {
- let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initialState;
- let action = arguments.length > 1 ? arguments[1] : undefined;
+const scanReducer = (state = initialState, action) => {
switch (action.type) {
case _action_type.SCAN.SET_TARGET:
case _action_type.SCAN.RESET_TARGET:
diff --git a/dist/reducers/reducer_shift.js b/dist/reducers/reducer_shift.js
index 8d5511fc..37943c30 100644
--- a/dist/reducers/reducer_shift.js
+++ b/dist/reducers/reducer_shift.js
@@ -217,9 +217,7 @@ const addNegative = (state, action) => {
selectedIdx: curveIdx
});
};
-const shiftReducer = function () {
- let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initialState;
- let action = arguments.length > 1 ? arguments[1] : undefined;
+const shiftReducer = (state = initialState, action) => {
switch (action.type) {
case _action_type.SHIFT.SET_REF:
return setRef(state, action);
diff --git a/dist/reducers/reducer_simulation.js b/dist/reducers/reducer_simulation.js
index a74c426e..81d0df10 100644
--- a/dist/reducers/reducer_simulation.js
+++ b/dist/reducers/reducer_simulation.js
@@ -14,9 +14,7 @@ const resetAll = (state, action) => {
const newState = action.payload;
return Object.assign({}, state, newState);
};
-const simulatioinReducer = function () {
- let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initialState;
- let action = arguments.length > 1 ? arguments[1] : undefined;
+const simulatioinReducer = (state = initialState, action) => {
switch (action.type) {
case _action_type.SIMULATION.RESET_ALL_RDC:
return resetAll(state, action);
diff --git a/dist/reducers/reducer_status.js b/dist/reducers/reducer_status.js
index 12e2ecb7..e14b5f7c 100644
--- a/dist/reducers/reducer_status.js
+++ b/dist/reducers/reducer_status.js
@@ -10,9 +10,7 @@ var _action_type = require("../constants/action_type");
const initialState = {
btnSubmit: false
};
-const statusReducer = function () {
- let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initialState;
- let action = arguments.length > 1 ? arguments[1] : undefined;
+const statusReducer = (state = initialState, action) => {
switch (action.type) {
case _action_type.STATUS.TOGGLEBTNSUBMIT:
return Object.assign({}, state, {
diff --git a/dist/reducers/reducer_submit.js b/dist/reducers/reducer_submit.js
index 5d672703..6fc47bf8 100644
--- a/dist/reducers/reducer_submit.js
+++ b/dist/reducers/reducer_submit.js
@@ -20,9 +20,7 @@ const initialState = {
const updateOperation = action => ({
operation: action.payload || initialState.operation
});
-const submitReducer = function () {
- let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initialState;
- let action = arguments.length > 1 ? arguments[1] : undefined;
+const submitReducer = (state = initialState, action) => {
switch (action.type) {
case _action_type.SUBMIT.TOGGLE_IS_ASCEND:
return Object.assign({}, state, {
diff --git a/dist/reducers/reducer_threshold.js b/dist/reducers/reducer_threshold.js
index 821854d6..7fc7f727 100644
--- a/dist/reducers/reducer_threshold.js
+++ b/dist/reducers/reducer_threshold.js
@@ -197,9 +197,7 @@ const resetInitCommon = state => {
list: newList
});
};
-const thresholdReducer = function () {
- let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initialState;
- let action = arguments.length > 1 ? arguments[1] : undefined;
+const thresholdReducer = (state = initialState, action) => {
switch (action.type) {
case _action_type.CURVE.SET_ALL_CURVES:
return setListThreshold(state, action);
diff --git a/dist/reducers/reducer_ui.js b/dist/reducers/reducer_ui.js
index b1f6aff5..14b7533f 100644
--- a/dist/reducers/reducer_ui.js
+++ b/dist/reducers/reducer_ui.js
@@ -17,9 +17,7 @@ const initialState = {
},
jcampIdx: 0
};
-const uiReducer = function () {
- let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initialState;
- let action = arguments.length > 1 ? arguments[1] : undefined;
+const uiReducer = (state = initialState, action) => {
switch (action.type) {
case _action_type.UI.VIEWER.SET_TYPE:
return Object.assign({}, state, {
diff --git a/dist/reducers/reducer_voltammetry.js b/dist/reducers/reducer_voltammetry.js
index db2618c6..e28076ed 100644
--- a/dist/reducers/reducer_voltammetry.js
+++ b/dist/reducers/reducer_voltammetry.js
@@ -112,8 +112,7 @@ const getE12 = data => {
}
return null;
};
-const addPeak = function (state, action) {
- let isMax = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+const addPeak = (state, action, isMax = true) => {
const {
payload
} = action;
@@ -161,8 +160,7 @@ const addPeak = function (state, action) {
}
return state;
};
-const removePeak = function (state, action) {
- let isMax = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+const removePeak = (state, action, isMax = true) => {
const {
payload
} = action;
@@ -533,9 +531,7 @@ const selectRefFactor = (state, action) => {
}
return state;
};
-const cyclicVoltaReducer = function () {
- let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initialState;
- let action = arguments.length > 1 ? arguments[1] : undefined;
+const cyclicVoltaReducer = (state = initialState, action) => {
switch (action.type) {
case _action_type.CYCLIC_VOLTA_METRY.ADD_PAIR_PEAKS:
return addPairPeak(state, action);
diff --git a/dist/reducers/reducer_wavelength.js b/dist/reducers/reducer_wavelength.js
index 424df2a1..7c6de7ab 100644
--- a/dist/reducers/reducer_wavelength.js
+++ b/dist/reducers/reducer_wavelength.js
@@ -9,9 +9,7 @@ var _action_type = require("../constants/action_type");
/* eslint-disable default-param-last */
const initialState = _list_wavelength.LIST_WAVE_LENGTH[0];
-const wavelengthReducer = function () {
- let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initialState;
- let action = arguments.length > 1 ? arguments[1] : undefined;
+const wavelengthReducer = (state = initialState, action) => {
switch (action.type) {
case _action_type.XRD.UPDATE_WAVE_LENGTH:
return action.payload;
diff --git a/dist/sagas/saga_multi_entities.js b/dist/sagas/saga_multi_entities.js
index cdf88beb..1b5020da 100644
--- a/dist/sagas/saga_multi_entities.js
+++ b/dist/sagas/saga_multi_entities.js
@@ -35,7 +35,7 @@ function* setCyclicVoltametry(action) {
const {
layout
} = firstCurve;
- if (layout !== _list_layout.LIST_LAYOUT.CYCLIC_VOLTAMMETRY) {
+ if (layout !== _list_layout.LIST_LAYOUT.CYCLIC_VOLTAMMETRY && layout !== _list_layout.LIST_LAYOUT.LSV) {
return;
}
for (let index = 0; index < listCurves.length; index++) {
@@ -93,7 +93,7 @@ function* setCyclicVoltametry(action) {
function* setCyclicVoltametryRef(action) {
// eslint-disable-line
const layoutSt = yield (0, _effects.select)(getLayoutSt);
- if (layoutSt !== _list_layout.LIST_LAYOUT.CYCLIC_VOLTAMMETRY) {
+ if (layoutSt !== _list_layout.LIST_LAYOUT.CYCLIC_VOLTAMMETRY && layoutSt !== _list_layout.LIST_LAYOUT.LSV) {
return;
}
const curveSt = yield (0, _effects.select)(getCurveSt);
diff --git a/dist/sagas/saga_multiplicity.js b/dist/sagas/saga_multiplicity.js
index d0d73c9a..56645954 100644
--- a/dist/sagas/saga_multiplicity.js
+++ b/dist/sagas/saga_multiplicity.js
@@ -150,8 +150,7 @@ function* addUiPeakToStack(action) {
payload
});
}
-const rmPeakFromStack = function (action, metaSt, mpySt) {
- let curveIdx = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
+const rmPeakFromStack = (action, metaSt, mpySt, curveIdx = 0) => {
const {
peak,
xExtent
diff --git a/dist/third_party/jAnalyzer.js b/dist/third_party/jAnalyzer.js
index a307e5fb..7d25625b 100644
--- a/dist/third_party/jAnalyzer.js
+++ b/dist/third_party/jAnalyzer.js
@@ -22,7 +22,7 @@ var _default = exports.default = {
* @param {object} signal
* @private
*/
- compilePattern: function (signal) {
+ compilePattern: function compilePattern(signal) {
signal.multiplicity = 'm';
// 1.1 symmetrize
// It will add a set of peaks(signal.peaksComp) to the signal that will be used during
diff --git a/src/__tests__/fixtures/lsv_jcamp.js b/src/__tests__/fixtures/lsv_jcamp.js
new file mode 100644
index 00000000..4754d1b0
--- /dev/null
+++ b/src/__tests__/fixtures/lsv_jcamp.js
@@ -0,0 +1,3404 @@
+const lsvJcamp = `
+##TITLE=
+##JCAMP-DX=5.0
+##DATA TYPE=LINK
+##BLOCKS=1
+
+
+$$ === CHEMSPECTRA SPECTRUM ORIG ===
+##TITLE=
+##JCAMP-DX=5.00
+##DATA TYPE=LINEAR SWEEP VOLTAMMETRY
+##DATA CLASS=XYDATA
+##$CSCATEGORY=SPECTRUM
+##ORIGIN=
+##OWNER=
+##.OBSERVE NUCLEUS=^1H
+##XUNITS=Voltage in V
+##YUNITS=Current in A
+##XFACTOR=1.0
+##YFACTOR=1.0
+##FIRSTX=-0.80211
+##LASTX=-2.40041
+##MAXX=-0.801085
+##MAXY=-2.85838e-07
+##MINX=-2.40041
+##MINY=-0.000121708
+##NPOINTS=1601
+##XYDATA= (XY..XY)
+-0.80211, -4.68229e-07
+-0.801085, -4.49411e-07
+-0.802091, -4.21022e-07
+-0.803098, -3.92285e-07
+-0.804095, -3.69478e-07
+-0.805094, -3.50779e-07
+-0.806099, -3.39075e-07
+-0.807103, -3.26547e-07
+-0.808105, -3.20798e-07
+-0.809101, -3.15465e-07
+-0.810103, -3.11265e-07
+-0.811105, -3.06662e-07
+-0.812104, -2.98652e-07
+-0.813102, -2.92121e-07
+-0.8141, -2.85838e-07
+-0.815105, -2.89429e-07
+-0.816107, -2.86677e-07
+-0.817102, -2.90376e-07
+-0.818106, -2.93036e-07
+-0.81911, -2.93778e-07
+-0.820108, -3.00838e-07
+-0.821107, -3.05e-07
+-0.822112, -3.0456e-07
+-0.823113, -3.05638e-07
+-0.824107, -3.12617e-07
+-0.825111, -3.03807e-07
+-0.826111, -3.09403e-07
+-0.827112, -3.07277e-07
+-0.828112, -3.04236e-07
+-0.829112, -3.08421e-07
+-0.830112, -3.14014e-07
+-0.831111, -3.13723e-07
+-0.832111, -3.12364e-07
+-0.833117, -3.19671e-07
+-0.834111, -3.21372e-07
+-0.835113, -3.20024e-07
+-0.836117, -3.22261e-07
+-0.83711, -3.2044e-07
+-0.838108, -3.20635e-07
+-0.839114, -3.23548e-07
+-0.840117, -3.25465e-07
+-0.841118, -3.21139e-07
+-0.842112, -3.17786e-07
+-0.843114, -3.23448e-07
+-0.844119, -3.22709e-07
+-0.845114, -3.25063e-07
+-0.846118, -3.2944e-07
+-0.847117, -3.28398e-07
+-0.848116, -3.31862e-07
+-0.849112, -3.30782e-07
+-0.850117, -3.33128e-07
+-0.851118, -3.4434e-07
+-0.852114, -3.42992e-07
+-0.853116, -3.48071e-07
+-0.85412, -3.44178e-07
+-0.855119, -3.46964e-07
+-0.856118, -3.3757e-07
+-0.857112, -3.35637e-07
+-0.858115, -3.41562e-07
+-0.859115, -3.45544e-07
+-0.860119, -3.3733e-07
+-0.861112, -3.40833e-07
+-0.862119, -3.54912e-07
+-0.863122, -3.5888e-07
+-0.864118, -3.59296e-07
+-0.865118, -3.69022e-07
+-0.866116, -3.72661e-07
+-0.867118, -3.72478e-07
+-0.868113, -3.81512e-07
+-0.869124, -3.95139e-07
+-0.870115, -4.07445e-07
+-0.871119, -4.05284e-07
+-0.872121, -4.1027e-07
+-0.873117, -4.20732e-07
+-0.87412, -4.2595e-07
+-0.875121, -4.25232e-07
+-0.876121, -4.35243e-07
+-0.877119, -4.31574e-07
+-0.878121, -4.22638e-07
+-0.879123, -4.25696e-07
+-0.880124, -4.14813e-07
+-0.881124, -4.21183e-07
+-0.882119, -4.24682e-07
+-0.883118, -4.1844e-07
+-0.884122, -4.21637e-07
+-0.885127, -4.19518e-07
+-0.886124, -4.28733e-07
+-0.887121, -4.22621e-07
+-0.888127, -4.18955e-07
+-0.889124, -4.15854e-07
+-0.890127, -4.18383e-07
+-0.891127, -4.18863e-07
+-0.89213, -4.19434e-07
+-0.893122, -4.22979e-07
+-0.894125, -4.34215e-07
+-0.895124, -4.30774e-07
+-0.896124, -4.46431e-07
+-0.897125, -4.37285e-07
+-0.898129, -4.45299e-07
+-0.899125, -4.38944e-07
+-0.900127, -4.50504e-07
+-0.901126, -4.42696e-07
+-0.902126, -4.41961e-07
+-0.90313, -4.48327e-07
+-0.904118, -4.46804e-07
+-0.905125, -4.52209e-07
+-0.906126, -4.52021e-07
+-0.907126, -4.54363e-07
+-0.908127, -4.63855e-07
+-0.909128, -4.67676e-07
+-0.910126, -4.66306e-07
+-0.911129, -4.66619e-07
+-0.912126, -4.63186e-07
+-0.913126, -4.70809e-07
+-0.914125, -4.76416e-07
+-0.91513, -4.68775e-07
+-0.916125, -4.69747e-07
+-0.917124, -4.76629e-07
+-0.918126, -4.73549e-07
+-0.919126, -4.76389e-07
+-0.920125, -4.80605e-07
+-0.921124, -4.82696e-07
+-0.922129, -4.90733e-07
+-0.923127, -4.9021e-07
+-0.924125, -4.90102e-07
+-0.925125, -4.90233e-07
+-0.926124, -4.9727e-07
+-0.927126, -4.93652e-07
+-0.928129, -5.04436e-07
+-0.929129, -5.01502e-07
+-0.93013, -5.06567e-07
+-0.931137, -5.07789e-07
+-0.932132, -5.10331e-07
+-0.933132, -4.99962e-07
+-0.934127, -5.06236e-07
+-0.935131, -5.15339e-07
+-0.93613, -5.19835e-07
+-0.93713, -5.12173e-07
+-0.938124, -5.14754e-07
+-0.93913, -5.15958e-07
+-0.940134, -5.20156e-07
+-0.941132, -5.29443e-07
+-0.942135, -5.3282e-07
+-0.943134, -5.2821e-07
+-0.944134, -5.39026e-07
+-0.945129, -5.43874e-07
+-0.946135, -5.39814e-07
+-0.94713, -5.37215e-07
+-0.948135, -5.36669e-07
+-0.949134, -5.36535e-07
+-0.950137, -5.27103e-07
+-0.951133, -5.20844e-07
+-0.952137, -5.23849e-07
+-0.953135, -5.27822e-07
+-0.954137, -5.19044e-07
+-0.955134, -5.17189e-07
+-0.956141, -5.23824e-07
+-0.957134, -5.30118e-07
+-0.958141, -5.33741e-07
+-0.959131, -5.31369e-07
+-0.960137, -5.26248e-07
+-0.961137, -5.29342e-07
+-0.96213, -5.3078e-07
+-0.963131, -5.30959e-07
+-0.964137, -5.33181e-07
+-0.965134, -5.30896e-07
+-0.966133, -5.32755e-07
+-0.967139, -5.40306e-07
+-0.968139, -5.46563e-07
+-0.969137, -5.44309e-07
+-0.97014, -5.5159e-07
+-0.97114, -5.52698e-07
+-0.972142, -5.53465e-07
+-0.973144, -5.6492e-07
+-0.974143, -5.78022e-07
+-0.975137, -5.78948e-07
+-0.97614, -5.80562e-07
+-0.977139, -5.76937e-07
+-0.978139, -5.84023e-07
+-0.979137, -5.79956e-07
+-0.980136, -5.87137e-07
+-0.981143, -5.78894e-07
+-0.982145, -5.80025e-07
+-0.983144, -5.78937e-07
+-0.984145, -5.7662e-07
+-0.985145, -5.82784e-07
+-0.986144, -5.86209e-07
+-0.987139, -5.84759e-07
+-0.988144, -5.90154e-07
+-0.989141, -5.82747e-07
+-0.990145, -5.92732e-07
+-0.991146, -5.89508e-07
+-0.992147, -5.96275e-07
+-0.99315, -6.07055e-07
+-0.994141, -6.06716e-07
+-0.995145, -6.0357e-07
+-0.996145, -6.09238e-07
+-0.997145, -6.04163e-07
+-0.998149, -6.10659e-07
+-0.999145, -6.14793e-07
+-1.00015, -6.16964e-07
+-1.00115, -6.24243e-07
+-1.00215, -6.31917e-07
+-1.00315, -6.33683e-07
+-1.00415, -6.42601e-07
+-1.00516, -6.45701e-07
+-1.00615, -6.38105e-07
+-1.00716, -6.39315e-07
+-1.00815, -6.34783e-07
+-1.00915, -6.36044e-07
+-1.01016, -6.37629e-07
+-1.01115, -6.4191e-07
+-1.01216, -6.47336e-07
+-1.01315, -6.49096e-07
+-1.01415, -6.53252e-07
+-1.01515, -6.52604e-07
+-1.01615, -6.61893e-07
+-1.01714, -6.65555e-07
+-1.01815, -6.70294e-07
+-1.01915, -6.80895e-07
+-1.02015, -6.83506e-07
+-1.02115, -6.92402e-07
+-1.02215, -6.85723e-07
+-1.02315, -6.85832e-07
+-1.02415, -6.89222e-07
+-1.02515, -6.91977e-07
+-1.02615, -6.96324e-07
+-1.02715, -7.00497e-07
+-1.02815, -7.05538e-07
+-1.02915, -7.13171e-07
+-1.03015, -7.1072e-07
+-1.03115, -7.06812e-07
+-1.03215, -7.02867e-07
+-1.03315, -7.00542e-07
+-1.03415, -7.01074e-07
+-1.03515, -7.0348e-07
+-1.03615, -6.97558e-07
+-1.03715, -6.95655e-07
+-1.03815, -6.97769e-07
+-1.03915, -7.0759e-07
+-1.04016, -7.15807e-07
+-1.04115, -7.14963e-07
+-1.04215, -7.18907e-07
+-1.04315, -7.26338e-07
+-1.04415, -7.2888e-07
+-1.04515, -7.36308e-07
+-1.04615, -7.33219e-07
+-1.04716, -7.3924e-07
+-1.04816, -7.43935e-07
+-1.04916, -7.44609e-07
+-1.05016, -7.52067e-07
+-1.05116, -7.58818e-07
+-1.05216, -7.56541e-07
+-1.05316, -7.58438e-07
+-1.05416, -7.58639e-07
+-1.05516, -7.59568e-07
+-1.05616, -7.59353e-07
+-1.05716, -7.57133e-07
+-1.05816, -7.55648e-07
+-1.05916, -7.65932e-07
+-1.06016, -7.69274e-07
+-1.06116, -7.71613e-07
+-1.06217, -7.71433e-07
+-1.06316, -7.72945e-07
+-1.06416, -7.70619e-07
+-1.06516, -7.7457e-07
+-1.06616, -7.72348e-07
+-1.06716, -7.78854e-07
+-1.06816, -7.75524e-07
+-1.06916, -7.72856e-07
+-1.07016, -7.7406e-07
+-1.07116, -7.66608e-07
+-1.07216, -7.61691e-07
+-1.07316, -7.70597e-07
+-1.07416, -7.662e-07
+-1.07516, -7.61702e-07
+-1.07616, -7.63639e-07
+-1.07716, -7.62494e-07
+-1.07816, -7.69776e-07
+-1.07916, -7.74581e-07
+-1.08016, -7.7269e-07
+-1.08116, -7.83103e-07
+-1.08216, -7.86866e-07
+-1.08316, -7.91582e-07
+-1.08416, -7.93608e-07
+-1.08516, -7.89954e-07
+-1.08616, -7.99689e-07
+-1.08716, -7.94885e-07
+-1.08816, -7.9648e-07
+-1.08916, -8.07546e-07
+-1.09016, -8.14144e-07
+-1.09116, -8.07845e-07
+-1.09216, -8.05208e-07
+-1.09316, -8.03978e-07
+-1.09416, -7.99466e-07
+-1.09516, -7.99702e-07
+-1.09617, -8.07511e-07
+-1.09717, -8.12098e-07
+-1.09816, -8.22231e-07
+-1.09917, -8.22455e-07
+-1.10016, -8.19054e-07
+-1.10116, -8.20774e-07
+-1.10216, -8.19164e-07
+-1.10317, -8.30649e-07
+-1.10416, -8.24813e-07
+-1.10516, -8.26526e-07
+-1.10617, -8.26443e-07
+-1.10717, -8.3006e-07
+-1.10817, -8.32596e-07
+-1.10917, -8.37397e-07
+-1.11017, -8.45475e-07
+-1.11117, -8.52578e-07
+-1.11218, -8.55106e-07
+-1.11318, -8.60176e-07
+-1.11417, -8.5877e-07
+-1.11517, -8.54967e-07
+-1.11617, -8.6021e-07
+-1.11718, -8.67514e-07
+-1.11817, -8.75112e-07
+-1.11917, -8.77241e-07
+-1.12017, -8.77491e-07
+-1.12117, -8.85679e-07
+-1.12217, -8.81296e-07
+-1.12317, -8.86889e-07
+-1.12417, -8.99773e-07
+-1.12517, -9.03063e-07
+-1.12617, -9.05994e-07
+-1.12717, -9.0591e-07
+-1.12817, -9.04649e-07
+-1.12916, -9.14496e-07
+-1.13017, -9.15399e-07
+-1.13117, -9.13574e-07
+-1.13217, -9.15405e-07
+-1.13317, -9.164e-07
+-1.13416, -9.12496e-07
+-1.13517, -9.09472e-07
+-1.13617, -9.07293e-07
+-1.13717, -9.20562e-07
+-1.13817, -9.28559e-07
+-1.13917, -9.22754e-07
+-1.14017, -9.29602e-07
+-1.14117, -9.30414e-07
+-1.14216, -9.33065e-07
+-1.14317, -9.39017e-07
+-1.14417, -9.42663e-07
+-1.14516, -9.42957e-07
+-1.14617, -9.58385e-07
+-1.14717, -9.63625e-07
+-1.14817, -9.76415e-07
+-1.14917, -9.71037e-07
+-1.15017, -9.68795e-07
+-1.15117, -9.68503e-07
+-1.15217, -9.71563e-07
+-1.15317, -9.65017e-07
+-1.15417, -9.6703e-07
+-1.15518, -9.69014e-07
+-1.15617, -9.72653e-07
+-1.15718, -9.76405e-07
+-1.15817, -9.7884e-07
+-1.15918, -9.79025e-07
+-1.16018, -9.80014e-07
+-1.16118, -9.85771e-07
+-1.16218, -9.91784e-07
+-1.16318, -9.96045e-07
+-1.16417, -1.00155e-06
+-1.16518, -1.01091e-06
+-1.16618, -1.01297e-06
+-1.16718, -1.008e-06
+-1.16818, -1.00771e-06
+-1.16918, -1.01358e-06
+-1.17018, -1.00454e-06
+-1.17118, -1.0039e-06
+-1.17218, -1.01201e-06
+-1.17318, -1.01124e-06
+-1.17418, -1.01997e-06
+-1.17518, -1.02195e-06
+-1.17617, -1.01838e-06
+-1.17718, -1.02464e-06
+-1.17817, -1.02737e-06
+-1.17918, -1.03322e-06
+-1.18018, -1.03619e-06
+-1.18117, -1.03439e-06
+-1.18217, -1.03151e-06
+-1.18318, -1.03142e-06
+-1.18418, -1.03429e-06
+-1.18518, -1.03529e-06
+-1.18618, -1.03579e-06
+-1.18718, -1.03791e-06
+-1.18818, -1.04591e-06
+-1.18918, -1.04028e-06
+-1.19018, -1.03532e-06
+-1.19118, -1.03392e-06
+-1.19218, -1.02911e-06
+-1.19318, -1.02321e-06
+-1.19418, -1.01635e-06
+-1.19519, -1.01219e-06
+-1.19618, -1.01506e-06
+-1.19718, -1.01652e-06
+-1.19818, -1.02051e-06
+-1.19919, -1.0244e-06
+-1.20019, -1.02422e-06
+-1.20118, -1.02316e-06
+-1.20218, -1.03016e-06
+-1.20319, -1.02711e-06
+-1.20419, -1.03912e-06
+-1.20518, -1.04086e-06
+-1.20619, -1.04505e-06
+-1.20718, -1.05363e-06
+-1.20818, -1.06772e-06
+-1.20918, -1.07269e-06
+-1.21018, -1.07266e-06
+-1.21118, -1.07904e-06
+-1.21218, -1.08834e-06
+-1.21318, -1.09218e-06
+-1.21418, -1.09282e-06
+-1.21518, -1.09437e-06
+-1.21619, -1.09711e-06
+-1.21719, -1.10371e-06
+-1.21819, -1.0992e-06
+-1.21918, -1.09993e-06
+-1.22018, -1.09497e-06
+-1.22118, -1.10326e-06
+-1.22219, -1.11655e-06
+-1.22318, -1.12215e-06
+-1.22418, -1.1267e-06
+-1.22519, -1.13982e-06
+-1.22619, -1.14258e-06
+-1.22719, -1.15203e-06
+-1.22819, -1.14789e-06
+-1.22919, -1.15733e-06
+-1.23018, -1.17084e-06
+-1.23118, -1.17131e-06
+-1.23219, -1.16958e-06
+-1.23319, -1.17015e-06
+-1.23419, -1.18147e-06
+-1.23519, -1.17976e-06
+-1.23619, -1.17697e-06
+-1.23719, -1.17746e-06
+-1.23819, -1.17695e-06
+-1.23919, -1.17981e-06
+-1.24019, -1.17784e-06
+-1.24119, -1.1783e-06
+-1.24219, -1.17877e-06
+-1.2432, -1.17771e-06
+-1.24419, -1.1835e-06
+-1.24519, -1.18451e-06
+-1.24619, -1.18794e-06
+-1.2472, -1.18973e-06
+-1.2482, -1.17828e-06
+-1.24919, -1.1839e-06
+-1.2502, -1.17961e-06
+-1.25119, -1.18038e-06
+-1.25219, -1.18716e-06
+-1.2532, -1.19511e-06
+-1.2542, -1.20138e-06
+-1.2552, -1.21303e-06
+-1.25619, -1.21783e-06
+-1.2572, -1.22256e-06
+-1.2582, -1.22435e-06
+-1.2592, -1.23337e-06
+-1.2602, -1.23277e-06
+-1.2612, -1.23628e-06
+-1.2622, -1.24027e-06
+-1.2632, -1.24265e-06
+-1.26419, -1.25023e-06
+-1.2652, -1.24792e-06
+-1.2662, -1.25142e-06
+-1.2672, -1.25334e-06
+-1.2682, -1.25759e-06
+-1.2692, -1.26285e-06
+-1.27019, -1.26156e-06
+-1.27119, -1.26788e-06
+-1.2722, -1.26277e-06
+-1.2732, -1.26214e-06
+-1.2742, -1.26934e-06
+-1.2752, -1.27889e-06
+-1.2762, -1.28131e-06
+-1.2772, -1.29699e-06
+-1.27821, -1.2993e-06
+-1.2792, -1.30952e-06
+-1.2802, -1.31253e-06
+-1.2812, -1.32176e-06
+-1.2822, -1.32411e-06
+-1.2832, -1.3236e-06
+-1.2842, -1.32644e-06
+-1.2852, -1.33643e-06
+-1.2862, -1.34313e-06
+-1.28719, -1.35048e-06
+-1.2882, -1.35328e-06
+-1.2892, -1.35406e-06
+-1.2902, -1.36014e-06
+-1.2912, -1.36351e-06
+-1.2922, -1.36604e-06
+-1.2932, -1.36232e-06
+-1.2942, -1.37017e-06
+-1.2952, -1.37018e-06
+-1.2962, -1.37956e-06
+-1.2972, -1.39128e-06
+-1.2982, -1.3993e-06
+-1.29921, -1.41329e-06
+-1.30021, -1.41612e-06
+-1.3012, -1.42045e-06
+-1.3022, -1.43e-06
+-1.3032, -1.44125e-06
+-1.3042, -1.4506e-06
+-1.30521, -1.46219e-06
+-1.30621, -1.47571e-06
+-1.30721, -1.48524e-06
+-1.30821, -1.48662e-06
+-1.30921, -1.49327e-06
+-1.31021, -1.4944e-06
+-1.31121, -1.4841e-06
+-1.3122, -1.48151e-06
+-1.31321, -1.48145e-06
+-1.3142, -1.49826e-06
+-1.31521, -1.51158e-06
+-1.31621, -1.51892e-06
+-1.31721, -1.52438e-06
+-1.31821, -1.51968e-06
+-1.31921, -1.5229e-06
+-1.32022, -1.52327e-06
+-1.32121, -1.5343e-06
+-1.32221, -1.53525e-06
+-1.3232, -1.54134e-06
+-1.32421, -1.54786e-06
+-1.32521, -1.55362e-06
+-1.32621, -1.55567e-06
+-1.32721, -1.56483e-06
+-1.32821, -1.57855e-06
+-1.32921, -1.59729e-06
+-1.33022, -1.61274e-06
+-1.33121, -1.61995e-06
+-1.33221, -1.62441e-06
+-1.33321, -1.62951e-06
+-1.33421, -1.62208e-06
+-1.33521, -1.6234e-06
+-1.33622, -1.63109e-06
+-1.33722, -1.63471e-06
+-1.33821, -1.64265e-06
+-1.33921, -1.64897e-06
+-1.34021, -1.65731e-06
+-1.3412, -1.65687e-06
+-1.3422, -1.65978e-06
+-1.3432, -1.67064e-06
+-1.3442, -1.6724e-06
+-1.34521, -1.67408e-06
+-1.34621, -1.6869e-06
+-1.34721, -1.69499e-06
+-1.34821, -1.70225e-06
+-1.34922, -1.71109e-06
+-1.35021, -1.71837e-06
+-1.35121, -1.7222e-06
+-1.35221, -1.71901e-06
+-1.35322, -1.72858e-06
+-1.35421, -1.74211e-06
+-1.35521, -1.74001e-06
+-1.35621, -1.74054e-06
+-1.35721, -1.7541e-06
+-1.35821, -1.76364e-06
+-1.35921, -1.76352e-06
+-1.36021, -1.77474e-06
+-1.36122, -1.78227e-06
+-1.36222, -1.78736e-06
+-1.36322, -1.78392e-06
+-1.36422, -1.79798e-06
+-1.36521, -1.80481e-06
+-1.36622, -1.81857e-06
+-1.36722, -1.8287e-06
+-1.36822, -1.83105e-06
+-1.36922, -1.83525e-06
+-1.37021, -1.83584e-06
+-1.37122, -1.84896e-06
+-1.37222, -1.85704e-06
+-1.37322, -1.86703e-06
+-1.37422, -1.87522e-06
+-1.37522, -1.88229e-06
+-1.37622, -1.87708e-06
+-1.37722, -1.88414e-06
+-1.37823, -1.88795e-06
+-1.37922, -1.90078e-06
+-1.38022, -1.91443e-06
+-1.38122, -1.91241e-06
+-1.38223, -1.91438e-06
+-1.38322, -1.92638e-06
+-1.38421, -1.92926e-06
+-1.38522, -1.9296e-06
+-1.38622, -1.93315e-06
+-1.38722, -1.93862e-06
+-1.38822, -1.95642e-06
+-1.38922, -1.95929e-06
+-1.39022, -1.95802e-06
+-1.39122, -1.96647e-06
+-1.39222, -1.97603e-06
+-1.39322, -1.97821e-06
+-1.39422, -1.99914e-06
+-1.39522, -2.00323e-06
+-1.39622, -2.01843e-06
+-1.39722, -2.02241e-06
+-1.39822, -2.01791e-06
+-1.39921, -2.03062e-06
+-1.40021, -2.04621e-06
+-1.40122, -2.06612e-06
+-1.40222, -2.07416e-06
+-1.40322, -2.0917e-06
+-1.40422, -2.101e-06
+-1.40522, -2.11516e-06
+-1.40622, -2.12938e-06
+-1.40722, -2.14325e-06
+-1.40822, -2.14859e-06
+-1.40922, -2.16609e-06
+-1.41022, -2.17347e-06
+-1.41122, -2.17576e-06
+-1.41222, -2.179e-06
+-1.41321, -2.18413e-06
+-1.41422, -2.19548e-06
+-1.41522, -2.2066e-06
+-1.41622, -2.20961e-06
+-1.41723, -2.22754e-06
+-1.41822, -2.24462e-06
+-1.41922, -2.25774e-06
+-1.42022, -2.27039e-06
+-1.42122, -2.28145e-06
+-1.42223, -2.28843e-06
+-1.42322, -2.3052e-06
+-1.42422, -2.31512e-06
+-1.42522, -2.34096e-06
+-1.42622, -2.35395e-06
+-1.42722, -2.36542e-06
+-1.42822, -2.376e-06
+-1.42922, -2.38353e-06
+-1.43022, -2.40054e-06
+-1.43123, -2.40964e-06
+-1.43223, -2.41403e-06
+-1.43322, -2.41961e-06
+-1.43423, -2.42211e-06
+-1.43523, -2.43538e-06
+-1.43623, -2.44098e-06
+-1.43723, -2.44456e-06
+-1.43824, -2.45442e-06
+-1.43923, -2.4642e-06
+-1.44023, -2.46179e-06
+-1.44123, -2.47187e-06
+-1.44223, -2.48955e-06
+-1.44323, -2.49837e-06
+-1.44423, -2.50415e-06
+-1.44523, -2.51411e-06
+-1.44623, -2.52802e-06
+-1.44723, -2.54737e-06
+-1.44823, -2.55318e-06
+-1.44922, -2.55276e-06
+-1.45022, -2.56843e-06
+-1.45122, -2.58752e-06
+-1.45223, -2.60705e-06
+-1.45323, -2.61944e-06
+-1.45422, -2.63569e-06
+-1.45523, -2.64378e-06
+-1.45623, -2.65933e-06
+-1.45723, -2.67728e-06
+-1.45823, -2.69061e-06
+-1.45923, -2.69646e-06
+-1.46023, -2.70886e-06
+-1.46122, -2.72367e-06
+-1.46222, -2.73459e-06
+-1.46322, -2.75691e-06
+-1.46423, -2.77416e-06
+-1.46523, -2.80012e-06
+-1.46623, -2.81708e-06
+-1.46723, -2.83486e-06
+-1.46823, -2.85062e-06
+-1.46923, -2.86432e-06
+-1.47023, -2.87951e-06
+-1.47123, -2.88573e-06
+-1.47223, -2.9129e-06
+-1.47323, -2.93281e-06
+-1.47423, -2.94725e-06
+-1.47523, -2.96216e-06
+-1.47624, -2.98433e-06
+-1.47724, -3.00706e-06
+-1.47823, -3.02638e-06
+-1.47923, -3.03989e-06
+-1.48023, -3.04865e-06
+-1.48123, -3.05762e-06
+-1.48223, -3.06656e-06
+-1.48323, -3.07407e-06
+-1.48423, -3.09185e-06
+-1.48524, -3.12169e-06
+-1.48623, -3.13255e-06
+-1.48723, -3.14235e-06
+-1.48824, -3.1501e-06
+-1.48924, -3.16319e-06
+-1.49024, -3.17807e-06
+-1.49124, -3.19313e-06
+-1.49223, -3.21243e-06
+-1.49324, -3.23564e-06
+-1.49424, -3.25061e-06
+-1.49524, -3.26661e-06
+-1.49624, -3.29457e-06
+-1.49725, -3.30303e-06
+-1.49824, -3.32177e-06
+-1.49924, -3.34107e-06
+-1.50024, -3.35485e-06
+-1.50124, -3.36005e-06
+-1.50224, -3.38873e-06
+-1.50324, -3.40773e-06
+-1.50424, -3.42301e-06
+-1.50524, -3.44325e-06
+-1.50624, -3.46302e-06
+-1.50724, -3.48128e-06
+-1.50824, -3.49562e-06
+-1.50924, -3.51399e-06
+-1.51024, -3.53778e-06
+-1.51124, -3.55906e-06
+-1.51224, -3.5838e-06
+-1.51324, -3.60757e-06
+-1.51424, -3.63646e-06
+-1.51524, -3.6573e-06
+-1.51624, -3.67364e-06
+-1.51724, -3.70157e-06
+-1.51824, -3.70592e-06
+-1.51924, -3.73147e-06
+-1.52024, -3.75251e-06
+-1.52124, -3.77945e-06
+-1.52224, -3.80821e-06
+-1.52324, -3.82427e-06
+-1.52424, -3.83417e-06
+-1.52525, -3.85335e-06
+-1.52624, -3.87258e-06
+-1.52725, -3.88553e-06
+-1.52824, -3.90425e-06
+-1.52925, -3.9241e-06
+-1.53024, -3.95348e-06
+-1.53125, -3.97386e-06
+-1.53224, -3.99937e-06
+-1.53324, -4.0273e-06
+-1.53424, -4.04748e-06
+-1.53525, -4.07033e-06
+-1.53625, -4.1047e-06
+-1.53725, -4.11806e-06
+-1.53825, -4.15057e-06
+-1.53925, -4.16563e-06
+-1.54024, -4.18955e-06
+-1.54124, -4.2142e-06
+-1.54225, -4.23409e-06
+-1.54325, -4.25319e-06
+-1.54425, -4.27334e-06
+-1.54525, -4.29636e-06
+-1.54625, -4.32162e-06
+-1.54725, -4.34401e-06
+-1.54825, -4.35837e-06
+-1.54925, -4.37857e-06
+-1.55026, -4.40774e-06
+-1.55125, -4.43755e-06
+-1.55225, -4.45504e-06
+-1.55325, -4.47519e-06
+-1.55425, -4.49961e-06
+-1.55525, -4.52671e-06
+-1.55625, -4.559e-06
+-1.55725, -4.57933e-06
+-1.55825, -4.60684e-06
+-1.55925, -4.62053e-06
+-1.56025, -4.64997e-06
+-1.56125, -4.67428e-06
+-1.56225, -4.69665e-06
+-1.56325, -4.71954e-06
+-1.56424, -4.74258e-06
+-1.56525, -4.76908e-06
+-1.56625, -4.78927e-06
+-1.56725, -4.80901e-06
+-1.56825, -4.83369e-06
+-1.56925, -4.86342e-06
+-1.57025, -4.89069e-06
+-1.57126, -4.92243e-06
+-1.57226, -4.95416e-06
+-1.57326, -4.97994e-06
+-1.57426, -5.01855e-06
+-1.57525, -5.04437e-06
+-1.57626, -5.06699e-06
+-1.57726, -5.10196e-06
+-1.57826, -5.13781e-06
+-1.57926, -5.1706e-06
+-1.58026, -5.2083e-06
+-1.58126, -5.23229e-06
+-1.58225, -5.25653e-06
+-1.58326, -5.28353e-06
+-1.58426, -5.31312e-06
+-1.58526, -5.33763e-06
+-1.58626, -5.37169e-06
+-1.58725, -5.41188e-06
+-1.58826, -5.44573e-06
+-1.58926, -5.47597e-06
+-1.59026, -5.51686e-06
+-1.59125, -5.55488e-06
+-1.59226, -5.5932e-06
+-1.59326, -5.64368e-06
+-1.59426, -5.68192e-06
+-1.59526, -5.7198e-06
+-1.59626, -5.74503e-06
+-1.59726, -5.78658e-06
+-1.59826, -5.82007e-06
+-1.59926, -5.85372e-06
+-1.60026, -5.87988e-06
+-1.60126, -5.91352e-06
+-1.60226, -5.94503e-06
+-1.60326, -5.98814e-06
+-1.60425, -6.01889e-06
+-1.60526, -6.06032e-06
+-1.60626, -6.09894e-06
+-1.60726, -6.13705e-06
+-1.60826, -6.17674e-06
+-1.60926, -6.21593e-06
+-1.61026, -6.25136e-06
+-1.61126, -6.28115e-06
+-1.61226, -6.3239e-06
+-1.61326, -6.35283e-06
+-1.61426, -6.38232e-06
+-1.61526, -6.4277e-06
+-1.61626, -6.46936e-06
+-1.61726, -6.50567e-06
+-1.61826, -6.55088e-06
+-1.61926, -6.6072e-06
+-1.62026, -6.64299e-06
+-1.62126, -6.69786e-06
+-1.62226, -6.75257e-06
+-1.62326, -6.80115e-06
+-1.62426, -6.8421e-06
+-1.62527, -6.88046e-06
+-1.62626, -6.93156e-06
+-1.62727, -6.98229e-06
+-1.62827, -7.01985e-06
+-1.62926, -7.07051e-06
+-1.63026, -7.12351e-06
+-1.63126, -7.16768e-06
+-1.63227, -7.22097e-06
+-1.63326, -7.28096e-06
+-1.63426, -7.33379e-06
+-1.63527, -7.39052e-06
+-1.63627, -7.46257e-06
+-1.63727, -7.51218e-06
+-1.63826, -7.5655e-06
+-1.63927, -7.62173e-06
+-1.64026, -7.67789e-06
+-1.64127, -7.72706e-06
+-1.64227, -7.78803e-06
+-1.64327, -7.85215e-06
+-1.64427, -7.9107e-06
+-1.64527, -7.97188e-06
+-1.64627, -8.03539e-06
+-1.64727, -8.09701e-06
+-1.64827, -8.14823e-06
+-1.64927, -8.21379e-06
+-1.65027, -8.27191e-06
+-1.65127, -8.34279e-06
+-1.65227, -8.40769e-06
+-1.65327, -8.48177e-06
+-1.65427, -8.54505e-06
+-1.65527, -8.61796e-06
+-1.65627, -8.69355e-06
+-1.65727, -8.76828e-06
+-1.65827, -8.83472e-06
+-1.65927, -8.9074e-06
+-1.66027, -8.98112e-06
+-1.66127, -9.05819e-06
+-1.66227, -9.12562e-06
+-1.66328, -9.1962e-06
+-1.66427, -9.26203e-06
+-1.66527, -9.34367e-06
+-1.66627, -9.42415e-06
+-1.66727, -9.49569e-06
+-1.66827, -9.57385e-06
+-1.66928, -9.66305e-06
+-1.67027, -9.74541e-06
+-1.67127, -9.83026e-06
+-1.67228, -9.91197e-06
+-1.67328, -9.99451e-06
+-1.67428, -1.00855e-05
+-1.67528, -1.01803e-05
+-1.67628, -1.0263e-05
+-1.67728, -1.03471e-05
+-1.67828, -1.04453e-05
+-1.67928, -1.054e-05
+-1.68028, -1.06255e-05
+-1.68128, -1.07129e-05
+-1.68228, -1.08096e-05
+-1.68328, -1.09019e-05
+-1.68428, -1.09981e-05
+-1.68528, -1.10963e-05
+-1.68628, -1.11972e-05
+-1.68728, -1.12908e-05
+-1.68829, -1.1399e-05
+-1.68928, -1.14993e-05
+-1.69028, -1.16054e-05
+-1.69128, -1.17113e-05
+-1.69228, -1.18291e-05
+-1.69328, -1.19264e-05
+-1.69428, -1.20313e-05
+-1.69527, -1.21322e-05
+-1.69628, -1.22386e-05
+-1.69728, -1.23513e-05
+-1.69828, -1.247e-05
+-1.69928, -1.25866e-05
+-1.70028, -1.27159e-05
+-1.70129, -1.28352e-05
+-1.70229, -1.29571e-05
+-1.70328, -1.30981e-05
+-1.70428, -1.32269e-05
+-1.70528, -1.33574e-05
+-1.70628, -1.35e-05
+-1.70729, -1.36243e-05
+-1.70828, -1.37635e-05
+-1.70929, -1.38966e-05
+-1.71028, -1.4045e-05
+-1.71129, -1.41773e-05
+-1.71229, -1.43041e-05
+-1.71329, -1.44392e-05
+-1.71429, -1.45943e-05
+-1.71528, -1.4732e-05
+-1.71628, -1.48623e-05
+-1.71729, -1.50363e-05
+-1.71829, -1.51927e-05
+-1.71929, -1.53674e-05
+-1.72029, -1.55348e-05
+-1.72129, -1.57051e-05
+-1.72228, -1.58729e-05
+-1.72328, -1.60501e-05
+-1.72429, -1.62199e-05
+-1.72529, -1.63953e-05
+-1.72629, -1.65762e-05
+-1.72729, -1.67315e-05
+-1.72828, -1.69349e-05
+-1.72928, -1.71207e-05
+-1.73028, -1.73278e-05
+-1.73128, -1.75234e-05
+-1.73229, -1.77314e-05
+-1.73328, -1.79339e-05
+-1.73428, -1.81475e-05
+-1.73528, -1.83671e-05
+-1.73629, -1.85869e-05
+-1.73728, -1.88004e-05
+-1.73829, -1.90261e-05
+-1.73928, -1.92355e-05
+-1.74029, -1.9451e-05
+-1.74128, -1.96795e-05
+-1.74229, -1.98915e-05
+-1.74328, -2.01154e-05
+-1.74428, -2.03659e-05
+-1.74529, -2.05578e-05
+-1.74628, -2.08536e-05
+-1.74729, -2.11103e-05
+-1.74829, -2.13572e-05
+-1.74929, -2.16121e-05
+-1.75029, -2.18698e-05
+-1.75129, -2.21324e-05
+-1.75228, -2.24081e-05
+-1.75329, -2.26702e-05
+-1.75429, -2.29626e-05
+-1.75529, -2.32444e-05
+-1.75628, -2.35447e-05
+-1.75729, -2.38241e-05
+-1.75829, -2.41186e-05
+-1.75929, -2.44301e-05
+-1.76029, -2.47402e-05
+-1.76129, -2.50593e-05
+-1.76229, -2.5382e-05
+-1.76329, -2.5715e-05
+-1.76429, -2.60501e-05
+-1.76529, -2.63882e-05
+-1.76629, -2.67472e-05
+-1.76729, -2.71071e-05
+-1.76829, -2.74911e-05
+-1.76929, -2.7875e-05
+-1.77029, -2.8267e-05
+-1.77129, -2.86693e-05
+-1.77229, -2.90681e-05
+-1.7733, -2.94946e-05
+-1.7743, -2.99062e-05
+-1.7753, -3.03263e-05
+-1.77629, -3.07653e-05
+-1.77729, -3.12054e-05
+-1.7783, -3.1677e-05
+-1.77929, -3.21583e-05
+-1.78029, -3.26616e-05
+-1.7813, -3.31337e-05
+-1.78229, -3.36433e-05
+-1.7833, -3.41749e-05
+-1.7843, -3.46706e-05
+-1.7853, -3.52422e-05
+-1.7863, -3.58415e-05
+-1.78729, -3.64427e-05
+-1.7883, -3.70368e-05
+-1.7893, -3.76765e-05
+-1.7903, -3.83392e-05
+-1.7913, -3.90173e-05
+-1.7923, -3.97282e-05
+-1.7933, -4.04438e-05
+-1.7943, -4.11836e-05
+-1.7953, -4.19469e-05
+-1.7963, -4.27328e-05
+-1.7973, -4.35036e-05
+-1.7983, -4.43772e-05
+-1.7993, -4.52764e-05
+-1.80029, -4.61775e-05
+-1.8013, -4.71328e-05
+-1.8023, -4.80872e-05
+-1.8033, -4.90979e-05
+-1.8043, -5.01499e-05
+-1.8053, -5.12154e-05
+-1.80629, -5.23345e-05
+-1.8073, -5.35284e-05
+-1.8083, -5.47174e-05
+-1.8093, -5.60041e-05
+-1.8103, -5.73069e-05
+-1.8113, -5.86702e-05
+-1.8123, -6.00536e-05
+-1.8133, -6.15157e-05
+-1.8143, -6.30389e-05
+-1.8153, -6.46174e-05
+-1.8163, -6.62217e-05
+-1.8173, -6.78828e-05
+-1.8183, -6.95566e-05
+-1.8193, -7.12784e-05
+-1.8203, -7.30331e-05
+-1.8213, -7.48439e-05
+-1.8223, -7.6685e-05
+-1.8233, -7.84974e-05
+-1.8243, -8.03135e-05
+-1.8253, -8.21213e-05
+-1.8263, -8.3944e-05
+-1.8273, -8.57295e-05
+-1.8283, -8.75056e-05
+-1.8293, -8.92483e-05
+-1.8303, -9.09635e-05
+-1.8313, -9.25703e-05
+-1.83229, -9.41606e-05
+-1.83329, -9.56019e-05
+-1.83429, -9.69982e-05
+-1.83529, -9.83673e-05
+-1.83629, -9.95466e-05
+-1.83729, -0.000100663
+-1.83829, -0.000101665
+-1.8393, -0.00010252
+-1.8403, -0.00010329
+-1.84129, -0.000103906
+-1.8423, -0.000104442
+-1.84329, -0.000104923
+-1.84429, -0.000105293
+-1.84529, -0.000105589
+-1.8463, -0.00010577
+-1.8473, -0.000105923
+-1.84829, -0.000105977
+-1.8493, -0.000105958
+-1.8503, -0.000105881
+-1.85129, -0.000105734
+-1.85229, -0.000105691
+-1.8533, -0.000105563
+-1.8543, -0.000105399
+-1.8553, -0.000105224
+-1.8563, -0.000104964
+-1.8573, -0.000104719
+-1.8583, -0.000104456
+-1.85929, -0.000104154
+-1.8603, -0.000103894
+-1.8613, -0.000103657
+-1.8623, -0.000103355
+-1.86331, -0.000103016
+-1.8643, -0.000102693
+-1.8653, -0.000102415
+-1.8663, -0.000102156
+-1.8673, -0.000101877
+-1.8683, -0.000101595
+-1.8693, -0.000101337
+-1.87031, -0.000101074
+-1.8713, -0.000100814
+-1.8723, -0.000100543
+-1.87331, -0.000100265
+-1.87431, -0.000100047
+-1.87531, -9.9821e-05
+-1.8763, -9.95549e-05
+-1.87731, -9.93575e-05
+-1.87831, -9.91005e-05
+-1.87931, -9.88664e-05
+-1.88031, -9.86841e-05
+-1.88131, -9.84997e-05
+-1.8823, -9.83382e-05
+-1.88331, -9.82136e-05
+-1.88431, -9.80233e-05
+-1.8853, -9.78518e-05
+-1.88631, -9.76826e-05
+-1.88731, -9.75158e-05
+-1.88831, -9.74179e-05
+-1.88931, -9.72832e-05
+-1.8903, -9.71448e-05
+-1.89131, -9.69621e-05
+-1.89231, -9.68188e-05
+-1.89331, -9.66131e-05
+-1.89431, -9.64582e-05
+-1.89531, -9.63316e-05
+-1.89631, -9.62443e-05
+-1.89731, -9.61203e-05
+-1.89831, -9.60105e-05
+-1.89931, -9.58675e-05
+-1.90031, -9.57561e-05
+-1.90131, -9.56813e-05
+-1.90231, -9.55503e-05
+-1.90332, -9.54494e-05
+-1.90431, -9.531e-05
+-1.90532, -9.52057e-05
+-1.90631, -9.50697e-05
+-1.90732, -9.49164e-05
+-1.90832, -9.48772e-05
+-1.90931, -9.46968e-05
+-1.91032, -9.4555e-05
+-1.91132, -9.43606e-05
+-1.91231, -9.41992e-05
+-1.91332, -9.40337e-05
+-1.91432, -9.38809e-05
+-1.91532, -9.37484e-05
+-1.91632, -9.36359e-05
+-1.91731, -9.34987e-05
+-1.91832, -9.33651e-05
+-1.91931, -9.31604e-05
+-1.92031, -9.30501e-05
+-1.92131, -9.29561e-05
+-1.92231, -9.27888e-05
+-1.92332, -9.26556e-05
+-1.92432, -9.24842e-05
+-1.92532, -9.2364e-05
+-1.92632, -9.22121e-05
+-1.92732, -9.2079e-05
+-1.92832, -9.19313e-05
+-1.92932, -9.18021e-05
+-1.93032, -9.1689e-05
+-1.93132, -9.16097e-05
+-1.93232, -9.15154e-05
+-1.93332, -9.13396e-05
+-1.93432, -9.12247e-05
+-1.93532, -9.11302e-05
+-1.93632, -9.10117e-05
+-1.93732, -9.09069e-05
+-1.93832, -9.07615e-05
+-1.93932, -9.06203e-05
+-1.94032, -9.05182e-05
+-1.94132, -9.04163e-05
+-1.94232, -9.03483e-05
+-1.94332, -9.02278e-05
+-1.94432, -9.01136e-05
+-1.94532, -9.00105e-05
+-1.94632, -8.98402e-05
+-1.94732, -8.97855e-05
+-1.94832, -8.96776e-05
+-1.94932, -8.95924e-05
+-1.95033, -8.9444e-05
+-1.95133, -8.93429e-05
+-1.95233, -8.92713e-05
+-1.95332, -8.91889e-05
+-1.95433, -8.90708e-05
+-1.95532, -8.89856e-05
+-1.95632, -8.88903e-05
+-1.95732, -8.88843e-05
+-1.95832, -8.88316e-05
+-1.95933, -8.87381e-05
+-1.96032, -8.86301e-05
+-1.96132, -8.85203e-05
+-1.96233, -8.84391e-05
+-1.96333, -8.83342e-05
+-1.96433, -8.82591e-05
+-1.96533, -8.81745e-05
+-1.96632, -8.81111e-05
+-1.96733, -8.80743e-05
+-1.96833, -8.80666e-05
+-1.96933, -8.79893e-05
+-1.97033, -8.7908e-05
+-1.97133, -8.78302e-05
+-1.97233, -8.77188e-05
+-1.97334, -8.76198e-05
+-1.97433, -8.75094e-05
+-1.97533, -8.73938e-05
+-1.97633, -8.73313e-05
+-1.97733, -8.72433e-05
+-1.97833, -8.71895e-05
+-1.97933, -8.71563e-05
+-1.98034, -8.70644e-05
+-1.98134, -8.69713e-05
+-1.98234, -8.69474e-05
+-1.98334, -8.68571e-05
+-1.98434, -8.67942e-05
+-1.98534, -8.67474e-05
+-1.98634, -8.66756e-05
+-1.98734, -8.66028e-05
+-1.98834, -8.65534e-05
+-1.98934, -8.65205e-05
+-1.99034, -8.64556e-05
+-1.99134, -8.64194e-05
+-1.99234, -8.64049e-05
+-1.99334, -8.63599e-05
+-1.99434, -8.63231e-05
+-1.99534, -8.62675e-05
+-1.99634, -8.62169e-05
+-1.99734, -8.61556e-05
+-1.99834, -8.61024e-05
+-1.99934, -8.60249e-05
+-2.00034, -8.59664e-05
+-2.00134, -8.59133e-05
+-2.00234, -8.58535e-05
+-2.00334, -8.58098e-05
+-2.00434, -8.5718e-05
+-2.00533, -8.56896e-05
+-2.00633, -8.56273e-05
+-2.00734, -8.55681e-05
+-2.00834, -8.55226e-05
+-2.00934, -8.54969e-05
+-2.01034, -8.54333e-05
+-2.01134, -8.5442e-05
+-2.01234, -8.54078e-05
+-2.01334, -8.54151e-05
+-2.01434, -8.5357e-05
+-2.01534, -8.53808e-05
+-2.01634, -8.53786e-05
+-2.01734, -8.53924e-05
+-2.01834, -8.5376e-05
+-2.01934, -8.53787e-05
+-2.02033, -8.53857e-05
+-2.02134, -8.5333e-05
+-2.02234, -8.52829e-05
+-2.02334, -8.52548e-05
+-2.02434, -8.52679e-05
+-2.02534, -8.52625e-05
+-2.02634, -8.52406e-05
+-2.02734, -8.52545e-05
+-2.02834, -8.52305e-05
+-2.02934, -8.52108e-05
+-2.03034, -8.52115e-05
+-2.03135, -8.52297e-05
+-2.03234, -8.52173e-05
+-2.03334, -8.52231e-05
+-2.03434, -8.52581e-05
+-2.03534, -8.52573e-05
+-2.03634, -8.5233e-05
+-2.03734, -8.52411e-05
+-2.03834, -8.52249e-05
+-2.03935, -8.52436e-05
+-2.04034, -8.52697e-05
+-2.04135, -8.53328e-05
+-2.04235, -8.53241e-05
+-2.04335, -8.53121e-05
+-2.04435, -8.5286e-05
+-2.04535, -8.52729e-05
+-2.04635, -8.52691e-05
+-2.04735, -8.5254e-05
+-2.04835, -8.52653e-05
+-2.04935, -8.52613e-05
+-2.05035, -8.52487e-05
+-2.05135, -8.52632e-05
+-2.05235, -8.53017e-05
+-2.05335, -8.53104e-05
+-2.05435, -8.53463e-05
+-2.05535, -8.53862e-05
+-2.05635, -8.54333e-05
+-2.05735, -8.54359e-05
+-2.05835, -8.54322e-05
+-2.05934, -8.54025e-05
+-2.06035, -8.5378e-05
+-2.06134, -8.53789e-05
+-2.06234, -8.53762e-05
+-2.06335, -8.54048e-05
+-2.06434, -8.54331e-05
+-2.06535, -8.54876e-05
+-2.06635, -8.55629e-05
+-2.06735, -8.56152e-05
+-2.06835, -8.56424e-05
+-2.06935, -8.57564e-05
+-2.07035, -8.57925e-05
+-2.07134, -8.58317e-05
+-2.07235, -8.58374e-05
+-2.07335, -8.58535e-05
+-2.07435, -8.58412e-05
+-2.07535, -8.58497e-05
+-2.07635, -8.58707e-05
+-2.07735, -8.59042e-05
+-2.07835, -8.59413e-05
+-2.07935, -8.60269e-05
+-2.08035, -8.60772e-05
+-2.08135, -8.61401e-05
+-2.08235, -8.62169e-05
+-2.08335, -8.62889e-05
+-2.08435, -8.63348e-05
+-2.08536, -8.63706e-05
+-2.08636, -8.64096e-05
+-2.08735, -8.64274e-05
+-2.08836, -8.64238e-05
+-2.08936, -8.6445e-05
+-2.09036, -8.64874e-05
+-2.09136, -8.6538e-05
+-2.09236, -8.66453e-05
+-2.09336, -8.67074e-05
+-2.09436, -8.67565e-05
+-2.09535, -8.68486e-05
+-2.09636, -8.6908e-05
+-2.09736, -8.69539e-05
+-2.09836, -8.70309e-05
+-2.09936, -8.70725e-05
+-2.10037, -8.71146e-05
+-2.10136, -8.71824e-05
+-2.10236, -8.72385e-05
+-2.10335, -8.72958e-05
+-2.10436, -8.73522e-05
+-2.10536, -8.73807e-05
+-2.10636, -8.74289e-05
+-2.10736, -8.74797e-05
+-2.10836, -8.75325e-05
+-2.10936, -8.75438e-05
+-2.11036, -8.75769e-05
+-2.11136, -8.76375e-05
+-2.11235, -8.76664e-05
+-2.11335, -8.76674e-05
+-2.11436, -8.76718e-05
+-2.11536, -8.76992e-05
+-2.11635, -8.7733e-05
+-2.11736, -8.77548e-05
+-2.11836, -8.77823e-05
+-2.11935, -8.82398e-05
+-2.12035, -8.8173e-05
+-2.12136, -8.78048e-05
+-2.12236, -8.73553e-05
+-2.12335, -8.68691e-05
+-2.12436, -8.64028e-05
+-2.12535, -8.59434e-05
+-2.12636, -8.55536e-05
+-2.12736, -8.51664e-05
+-2.12836, -8.48039e-05
+-2.12936, -8.45328e-05
+-2.13036, -8.43084e-05
+-2.13136, -8.41756e-05
+-2.13236, -8.40724e-05
+-2.13336, -8.3988e-05
+-2.13436, -8.39258e-05
+-2.13536, -8.38259e-05
+-2.13637, -8.37491e-05
+-2.13736, -8.36546e-05
+-2.13836, -8.3631e-05
+-2.13936, -8.36178e-05
+-2.14037, -8.36539e-05
+-2.14137, -8.3693e-05
+-2.14237, -8.37023e-05
+-2.14337, -8.36962e-05
+-2.14436, -8.3653e-05
+-2.14536, -8.36546e-05
+-2.14637, -8.36095e-05
+-2.14737, -8.35458e-05
+-2.14836, -8.34562e-05
+-2.14936, -8.33685e-05
+-2.15036, -8.33052e-05
+-2.15137, -8.32517e-05
+-2.15237, -8.32277e-05
+-2.15337, -8.32148e-05
+-2.15437, -8.32305e-05
+-2.15537, -8.32692e-05
+-2.15637, -8.33356e-05
+-2.15737, -8.33959e-05
+-2.15837, -8.35204e-05
+-2.15937, -8.36147e-05
+-2.16036, -8.37286e-05
+-2.16137, -8.38806e-05
+-2.16237, -8.39829e-05
+-2.16337, -8.40513e-05
+-2.16437, -8.41752e-05
+-2.16536, -8.43126e-05
+-2.16637, -8.438e-05
+-2.16737, -8.44635e-05
+-2.16837, -8.4547e-05
+-2.16937, -8.46574e-05
+-2.17036, -8.47375e-05
+-2.17137, -8.48327e-05
+-2.17237, -8.49572e-05
+-2.17336, -8.50423e-05
+-2.17437, -8.50754e-05
+-2.17537, -8.5113e-05
+-2.17636, -8.52063e-05
+-2.17737, -8.52311e-05
+-2.17836, -8.53068e-05
+-2.17936, -8.53545e-05
+-2.18037, -8.53965e-05
+-2.18137, -8.54607e-05
+-2.18237, -8.55183e-05
+-2.18337, -8.56454e-05
+-2.18437, -8.57562e-05
+-2.18537, -8.58677e-05
+-2.18637, -8.59722e-05
+-2.18736, -8.60977e-05
+-2.18837, -8.62207e-05
+-2.18937, -8.63276e-05
+-2.19037, -8.63954e-05
+-2.19137, -8.64785e-05
+-2.19237, -8.65375e-05
+-2.19337, -8.65829e-05
+-2.19437, -8.66386e-05
+-2.19537, -8.67123e-05
+-2.19638, -8.67476e-05
+-2.19738, -8.67907e-05
+-2.19837, -8.68812e-05
+-2.19937, -8.69794e-05
+-2.20037, -8.70655e-05
+-2.20137, -8.71475e-05
+-2.20237, -8.72152e-05
+-2.20337, -8.73025e-05
+-2.20437, -8.74149e-05
+-2.20537, -8.75091e-05
+-2.20638, -8.76093e-05
+-2.20737, -8.76987e-05
+-2.20838, -8.78185e-05
+-2.20938, -8.79297e-05
+-2.21037, -8.80099e-05
+-2.21138, -8.80993e-05
+-2.21238, -8.81911e-05
+-2.21338, -8.82676e-05
+-2.21438, -8.83558e-05
+-2.21537, -8.84632e-05
+-2.21637, -8.85504e-05
+-2.21738, -8.86371e-05
+-2.21838, -8.87524e-05
+-2.21938, -8.88636e-05
+-2.22037, -8.89925e-05
+-2.22139, -8.91565e-05
+-2.22237, -8.92419e-05
+-2.22338, -8.93769e-05
+-2.22438, -8.94686e-05
+-2.22538, -8.94813e-05
+-2.22638, -8.95124e-05
+-2.22738, -8.95627e-05
+-2.22838, -8.96384e-05
+-2.22938, -8.97084e-05
+-2.23038, -8.98194e-05
+-2.23138, -8.99702e-05
+-2.23238, -9.01037e-05
+-2.23338, -9.02065e-05
+-2.23438, -9.03193e-05
+-2.23538, -9.04004e-05
+-2.23638, -9.04905e-05
+-2.23738, -9.05897e-05
+-2.23839, -9.06731e-05
+-2.23938, -9.06887e-05
+-2.24038, -9.08028e-05
+-2.24138, -9.08672e-05
+-2.24239, -9.09223e-05
+-2.24338, -9.10304e-05
+-2.24439, -9.11081e-05
+-2.24539, -9.12132e-05
+-2.24639, -9.13043e-05
+-2.24739, -9.13967e-05
+-2.24839, -9.15198e-05
+-2.24939, -9.16508e-05
+-2.25039, -9.17275e-05
+-2.25139, -9.18777e-05
+-2.25239, -9.2073e-05
+-2.25339, -9.22145e-05
+-2.25439, -9.23199e-05
+-2.25539, -9.24981e-05
+-2.25638, -9.26685e-05
+-2.25739, -9.28215e-05
+-2.25838, -9.2973e-05
+-2.25938, -9.31366e-05
+-2.26038, -9.33031e-05
+-2.26139, -9.34643e-05
+-2.26239, -9.36048e-05
+-2.26339, -9.37449e-05
+-2.26439, -9.38354e-05
+-2.26539, -9.39825e-05
+-2.26639, -9.40791e-05
+-2.26739, -9.42113e-05
+-2.26839, -9.43035e-05
+-2.26939, -9.44291e-05
+-2.27038, -9.45551e-05
+-2.27139, -9.46585e-05
+-2.27239, -9.4766e-05
+-2.27339, -9.49058e-05
+-2.27439, -9.50448e-05
+-2.27539, -9.51821e-05
+-2.27639, -9.53e-05
+-2.27739, -9.54098e-05
+-2.27839, -9.55246e-05
+-2.27939, -9.57224e-05
+-2.28039, -9.58277e-05
+-2.28139, -9.59154e-05
+-2.28239, -9.60445e-05
+-2.28339, -9.61546e-05
+-2.28439, -9.62591e-05
+-2.28539, -9.63478e-05
+-2.2864, -9.64335e-05
+-2.28739, -9.66096e-05
+-2.28839, -9.68042e-05
+-2.2894, -9.69652e-05
+-2.29039, -9.71024e-05
+-2.29139, -9.72165e-05
+-2.29239, -9.74046e-05
+-2.29338, -9.75785e-05
+-2.29439, -9.77875e-05
+-2.29539, -9.79887e-05
+-2.29639, -9.81297e-05
+-2.29739, -9.83037e-05
+-2.29839, -9.85248e-05
+-2.2994, -9.87148e-05
+-2.3004, -9.89007e-05
+-2.3014, -9.91185e-05
+-2.3024, -9.92912e-05
+-2.3034, -9.94504e-05
+-2.30439, -9.96449e-05
+-2.3054, -9.98314e-05
+-2.3064, -9.99875e-05
+-2.3074, -0.000100192
+-2.3084, -0.000100407
+-2.3094, -0.000100636
+-2.3104, -0.000100871
+-2.3114, -0.000101148
+-2.3124, -0.000101394
+-2.3134, -0.000101654
+-2.3144, -0.000101913
+-2.3154, -0.000102189
+-2.3164, -0.00010253
+-2.3174, -0.000102691
+-2.3184, -0.000102938
+-2.3194, -0.000103043
+-2.3204, -0.000103225
+-2.3214, -0.000103428
+-2.3224, -0.000103647
+-2.3234, -0.000103887
+-2.3244, -0.000104191
+-2.3254, -0.000104461
+-2.3264, -0.000104831
+-2.32739, -0.000105149
+-2.3284, -0.00010565
+-2.3294, -0.000106047
+-2.3304, -0.000106222
+-2.33141, -0.000106523
+-2.33241, -0.000106843
+-2.3334, -0.000107052
+-2.3344, -0.000107152
+-2.3354, -0.00010729
+-2.3364, -0.000107598
+-2.33741, -0.000107905
+-2.3384, -0.000108013
+-2.3394, -0.000108195
+-2.3404, -0.000108488
+-2.3414, -0.000108871
+-2.3424, -0.00010919
+-2.3434, -0.000109163
+-2.3444, -0.000109366
+-2.3454, -0.000109561
+-2.3464, -0.000109771
+-2.3474, -0.000110003
+-2.3484, -0.000110245
+-2.3494, -0.000110461
+-2.3504, -0.000110668
+-2.3514, -0.000110829
+-2.3524, -0.000110925
+-2.35341, -0.000111023
+-2.35441, -0.000111278
+-2.35541, -0.00011151
+-2.35641, -0.000111699
+-2.35741, -0.000111886
+-2.3584, -0.000112066
+-2.3594, -0.000112398
+-2.36041, -0.000112726
+-2.3614, -0.000113069
+-2.3624, -0.000113339
+-2.3634, -0.000113559
+-2.36441, -0.000113884
+-2.3654, -0.000114129
+-2.3664, -0.0001143
+-2.36741, -0.00011445
+-2.3684, -0.000114731
+-2.36941, -0.000114821
+-2.37041, -0.000115246
+-2.37141, -0.00011539
+-2.37241, -0.00011547
+-2.37341, -0.000115696
+-2.37441, -0.000115871
+-2.37541, -0.000116456
+-2.37641, -0.000116836
+-2.37741, -0.000117137
+-2.37841, -0.000117532
+-2.37941, -0.000117753
+-2.38041, -0.000118002
+-2.38141, -0.000118072
+-2.38241, -0.000118101
+-2.38341, -0.000118287
+-2.38441, -0.000118476
+-2.38541, -0.000118615
+-2.38641, -0.000118813
+-2.38741, -0.000118942
+-2.38842, -0.000119143
+-2.38942, -0.000119295
+-2.39041, -0.000119476
+-2.39141, -0.000119665
+-2.39241, -0.000119892
+-2.39342, -0.000120055
+-2.39441, -0.000120272
+-2.39541, -0.000120564
+-2.39641, -0.000120756
+-2.39741, -0.000120974
+-2.39842, -0.000121202
+-2.39941, -0.000121441
+-2.40041, -0.000121708
+$$ === CHEMSPECTRA INTEGRALS AND MULTIPLETS ===
+##$OBSERVEDINTEGRALS= (X Y Z)
+##$OBSERVEDMULTIPLETS=
+##$OBSERVEDMULTIPLETSPEAKS=
+$$ === CHEMSPECTRA SIMULATION ===
+##$CSSIMULATIONPEAKS=
+##END=
+
+
+$$ === CHEMSPECTRA PEAK TABLE EDIT ===
+##TITLE=
+##JCAMP-DX=5.00
+##DATA TYPE=PEAKTABLE
+##DATA CLASS=PEAKTABLE
+##$CSCATEGORY=EDIT_PEAK
+##$CSTHRESHOLD=0.5
+##MAXX=-0.801085
+##MAXY=-2.85838e-07
+##MINX=-2.40041
+##MINY=-0.000121708
+##$CSSOLVENTNAME=
+##$CSSOLVENTVALUE=0
+##$CSSOLVENTX=0
+##NPOINTS=0
+##PEAKTABLE= (XY..XY)
+##END=
+
+
+$$ === CHEMSPECTRA PEAK TABLE AUTO ===
+##TITLE=
+##JCAMP-DX=5.00
+##DATA TYPE=PEAKTABLE
+##DATA CLASS=PEAKTABLE
+##$CSCATEGORY=AUTO_PEAK
+##$CSTHRESHOLD=0.5
+##MAXX=-0.801085
+##MAXY=-2.85838e-07
+##MINX=-2.40041
+##MINY=-0.000121708
+##NPOINTS=100
+##PEAKTABLE= (XY..XY)
+-0.815105, -2.89429e-07
+-0.821107, -3.05e-07
+-0.826111, -3.09403e-07
+-0.824107, -3.12617e-07
+-0.830112, -3.14014e-07
+-0.834111, -3.21372e-07
+-0.836117, -3.22261e-07
+-0.843114, -3.23448e-07
+-0.840117, -3.25465e-07
+-0.846118, -3.2944e-07
+-0.848116, -3.31862e-07
+-0.851118, -3.4434e-07
+-0.859115, -3.45544e-07
+-0.855119, -3.46964e-07
+-0.853116, -3.48071e-07
+-0.866116, -3.72661e-07
+-0.870115, -4.07445e-07
+-0.884122, -4.21637e-07
+-0.882119, -4.24682e-07
+-0.879123, -4.25696e-07
+-0.87412, -4.2595e-07
+-0.886124, -4.28733e-07
+-0.894125, -4.34215e-07
+-0.876121, -4.35243e-07
+-0.898129, -4.45299e-07
+-0.896124, -4.46431e-07
+-0.90313, -4.48327e-07
+-0.900127, -4.50504e-07
+-0.905125, -4.52209e-07
+-0.911129, -4.66619e-07
+-0.909128, -4.67676e-07
+-0.914125, -4.76416e-07
+-0.917124, -4.76629e-07
+-0.922129, -4.90733e-07
+-0.926124, -4.9727e-07
+-0.928129, -5.04436e-07
+-0.932132, -5.10331e-07
+-0.93613, -5.19835e-07
+-0.953135, -5.27822e-07
+-0.942135, -5.3282e-07
+-0.964137, -5.33181e-07
+-0.958141, -5.33741e-07
+-0.945129, -5.43874e-07
+-0.968139, -5.46563e-07
+-0.982145, -5.80025e-07
+-0.97614, -5.80562e-07
+-0.978139, -5.84023e-07
+-0.986144, -5.86209e-07
+-0.980136, -5.87137e-07
+-0.988144, -5.90154e-07
+-0.990145, -5.92732e-07
+-0.99315, -6.07055e-07
+-0.996145, -6.09238e-07
+-1.00716, -6.39315e-07
+-1.00516, -6.45701e-07
+-1.01415, -6.53252e-07
+-1.02115, -6.92402e-07
+-1.03515, -7.0348e-07
+-1.02915, -7.13171e-07
+-1.04016, -7.15807e-07
+-1.04515, -7.36308e-07
+-1.05116, -7.58818e-07
+-1.05516, -7.59568e-07
+-1.07616, -7.63639e-07
+-1.07316, -7.70597e-07
+-1.06116, -7.71613e-07
+-1.06316, -7.72945e-07
+-1.07016, -7.7406e-07
+-1.06516, -7.7457e-07
+-1.07916, -7.74581e-07
+-1.06716, -7.78854e-07
+-1.08416, -7.93608e-07
+-1.08616, -7.99689e-07
+-1.09016, -8.14144e-07
+-1.10116, -8.20774e-07
+-1.09917, -8.22455e-07
+-1.10516, -8.26526e-07
+-1.10317, -8.30649e-07
+-1.11318, -8.60176e-07
+-1.12117, -8.85679e-07
+-1.12617, -9.05994e-07
+-1.13017, -9.15399e-07
+-1.13317, -9.164e-07
+-1.13817, -9.28559e-07
+-1.15217, -9.71563e-07
+-1.14817, -9.76415e-07
+-1.17218, -1.01201e-06
+-1.16618, -1.01297e-06
+-1.16918, -1.01358e-06
+-1.17518, -1.02195e-06
+-1.19919, -1.0244e-06
+-1.20218, -1.03016e-06
+-1.18018, -1.03619e-06
+-1.18818, -1.04591e-06
+-1.20918, -1.07269e-06
+-1.21918, -1.09993e-06
+-1.21719, -1.10371e-06
+-1.22719, -1.15203e-06
+-1.23118, -1.17131e-06
+-1.23719, -1.17746e-06
+##END=
+
+
+$$ === CHEMSPECTRA ORIGINAL METADATA ===
+###TITLE= Spectrum
+###JCAMPDX= 5.00
+###XUNITS= Voltage in V, Voltage in V
+###YUNITS= Current in A, Current in A
+###DATE= 15/7/2024
+###SCANRATE= 0.000999998
+###STEPSIZE= 0.001
+###SOFTWAREVERSION= 7.10.3
+###SOFTWARE= Framework
+###TIME= 17:54:27
+###VOLTAGESTART= -8.00000E-001
+###VOLTAGELIMITEND= -2.40000E+000
+###SERIAL= REF620-46060
+###INSTRUMENT= Potentiostat
+###LASTX= -2.40041E+000
+###MINX= -2.40041
+###MAXX= 2.2250738585072014e-308
+###MINY= -0.000121708
+###MAXY= 2.2250738585072014e-308
+###NPOINTS= 1601
+###XYPOINTS= (XY..XY)
+-8.02110E-001, -4.68229E-007
+-8.01085E-001, -4.49411E-007
+-8.02091E-001, -4.21022E-007
+-8.03098E-001, -3.92285E-007
+-8.04095E-001, -3.69478E-007
+-8.05094E-001, -3.50779E-007
+-8.06099E-001, -3.39075E-007
+-8.07103E-001, -3.26547E-007
+-8.08105E-001, -3.20798E-007
+-8.09101E-001, -3.15465E-007
+-8.10103E-001, -3.11265E-007
+-8.11105E-001, -3.06662E-007
+-8.12104E-001, -2.98652E-007
+-8.13102E-001, -2.92121E-007
+-8.14100E-001, -2.85838E-007
+-8.15105E-001, -2.89429E-007
+-8.16107E-001, -2.86677E-007
+-8.17102E-001, -2.90376E-007
+-8.18106E-001, -2.93036E-007
+-8.19110E-001, -2.93778E-007
+-8.20108E-001, -3.00838E-007
+-8.21107E-001, -3.05000E-007
+-8.22112E-001, -3.04560E-007
+-8.23113E-001, -3.05638E-007
+-8.24107E-001, -3.12617E-007
+-8.25111E-001, -3.03807E-007
+-8.26111E-001, -3.09403E-007
+-8.27112E-001, -3.07277E-007
+-8.28112E-001, -3.04236E-007
+-8.29112E-001, -3.08421E-007
+-8.30112E-001, -3.14014E-007
+-8.31111E-001, -3.13723E-007
+-8.32111E-001, -3.12364E-007
+-8.33117E-001, -3.19671E-007
+-8.34111E-001, -3.21372E-007
+-8.35113E-001, -3.20024E-007
+-8.36117E-001, -3.22261E-007
+-8.37110E-001, -3.20440E-007
+-8.38108E-001, -3.20635E-007
+-8.39114E-001, -3.23548E-007
+-8.40117E-001, -3.25465E-007
+-8.41118E-001, -3.21139E-007
+-8.42112E-001, -3.17786E-007
+-8.43114E-001, -3.23448E-007
+-8.44119E-001, -3.22709E-007
+-8.45114E-001, -3.25063E-007
+-8.46118E-001, -3.29440E-007
+-8.47117E-001, -3.28398E-007
+-8.48116E-001, -3.31862E-007
+-8.49112E-001, -3.30782E-007
+-8.50117E-001, -3.33128E-007
+-8.51118E-001, -3.44340E-007
+-8.52114E-001, -3.42992E-007
+-8.53116E-001, -3.48071E-007
+-8.54120E-001, -3.44178E-007
+-8.55119E-001, -3.46964E-007
+-8.56118E-001, -3.37570E-007
+-8.57112E-001, -3.35637E-007
+-8.58115E-001, -3.41562E-007
+-8.59115E-001, -3.45544E-007
+-8.60119E-001, -3.37330E-007
+-8.61112E-001, -3.40833E-007
+-8.62119E-001, -3.54912E-007
+-8.63122E-001, -3.58880E-007
+-8.64118E-001, -3.59296E-007
+-8.65118E-001, -3.69022E-007
+-8.66116E-001, -3.72661E-007
+-8.67118E-001, -3.72478E-007
+-8.68113E-001, -3.81512E-007
+-8.69124E-001, -3.95139E-007
+-8.70115E-001, -4.07445E-007
+-8.71119E-001, -4.05284E-007
+-8.72121E-001, -4.10270E-007
+-8.73117E-001, -4.20732E-007
+-8.74120E-001, -4.25950E-007
+-8.75121E-001, -4.25232E-007
+-8.76121E-001, -4.35243E-007
+-8.77119E-001, -4.31574E-007
+-8.78121E-001, -4.22638E-007
+-8.79123E-001, -4.25696E-007
+-8.80124E-001, -4.14813E-007
+-8.81124E-001, -4.21183E-007
+-8.82119E-001, -4.24682E-007
+-8.83118E-001, -4.18440E-007
+-8.84122E-001, -4.21637E-007
+-8.85127E-001, -4.19518E-007
+-8.86124E-001, -4.28733E-007
+-8.87121E-001, -4.22621E-007
+-8.88127E-001, -4.18955E-007
+-8.89124E-001, -4.15854E-007
+-8.90127E-001, -4.18383E-007
+-8.91127E-001, -4.18863E-007
+-8.92130E-001, -4.19434E-007
+-8.93122E-001, -4.22979E-007
+-8.94125E-001, -4.34215E-007
+-8.95124E-001, -4.30774E-007
+-8.96124E-001, -4.46431E-007
+-8.97125E-001, -4.37285E-007
+-8.98129E-001, -4.45299E-007
+-8.99125E-001, -4.38944E-007
+-9.00127E-001, -4.50504E-007
+-9.01126E-001, -4.42696E-007
+-9.02126E-001, -4.41961E-007
+-9.03130E-001, -4.48327E-007
+-9.04118E-001, -4.46804E-007
+-9.05125E-001, -4.52209E-007
+-9.06126E-001, -4.52021E-007
+-9.07126E-001, -4.54363E-007
+-9.08127E-001, -4.63855E-007
+-9.09128E-001, -4.67676E-007
+-9.10126E-001, -4.66306E-007
+-9.11129E-001, -4.66619E-007
+-9.12126E-001, -4.63186E-007
+-9.13126E-001, -4.70809E-007
+-9.14125E-001, -4.76416E-007
+-9.15130E-001, -4.68775E-007
+-9.16125E-001, -4.69747E-007
+-9.17124E-001, -4.76629E-007
+-9.18126E-001, -4.73549E-007
+-9.19126E-001, -4.76389E-007
+-9.20125E-001, -4.80605E-007
+-9.21124E-001, -4.82696E-007
+-9.22129E-001, -4.90733E-007
+-9.23127E-001, -4.90210E-007
+-9.24125E-001, -4.90102E-007
+-9.25125E-001, -4.90233E-007
+-9.26124E-001, -4.97270E-007
+-9.27126E-001, -4.93652E-007
+-9.28129E-001, -5.04436E-007
+-9.29129E-001, -5.01502E-007
+-9.30130E-001, -5.06567E-007
+-9.31137E-001, -5.07789E-007
+-9.32132E-001, -5.10331E-007
+-9.33132E-001, -4.99962E-007
+-9.34127E-001, -5.06236E-007
+-9.35131E-001, -5.15339E-007
+-9.36130E-001, -5.19835E-007
+-9.37130E-001, -5.12173E-007
+-9.38124E-001, -5.14754E-007
+-9.39130E-001, -5.15958E-007
+-9.40134E-001, -5.20156E-007
+-9.41132E-001, -5.29443E-007
+-9.42135E-001, -5.32820E-007
+-9.43134E-001, -5.28210E-007
+-9.44134E-001, -5.39026E-007
+-9.45129E-001, -5.43874E-007
+-9.46135E-001, -5.39814E-007
+-9.47130E-001, -5.37215E-007
+-9.48135E-001, -5.36669E-007
+-9.49134E-001, -5.36535E-007
+-9.50137E-001, -5.27103E-007
+-9.51133E-001, -5.20844E-007
+-9.52137E-001, -5.23849E-007
+-9.53135E-001, -5.27822E-007
+-9.54137E-001, -5.19044E-007
+-9.55134E-001, -5.17189E-007
+-9.56141E-001, -5.23824E-007
+-9.57134E-001, -5.30118E-007
+-9.58141E-001, -5.33741E-007
+-9.59131E-001, -5.31369E-007
+-9.60137E-001, -5.26248E-007
+-9.61137E-001, -5.29342E-007
+-9.62130E-001, -5.30780E-007
+-9.63131E-001, -5.30959E-007
+-9.64137E-001, -5.33181E-007
+-9.65134E-001, -5.30896E-007
+-9.66133E-001, -5.32755E-007
+-9.67139E-001, -5.40306E-007
+-9.68139E-001, -5.46563E-007
+-9.69137E-001, -5.44309E-007
+-9.70140E-001, -5.51590E-007
+-9.71140E-001, -5.52698E-007
+-9.72142E-001, -5.53465E-007
+-9.73144E-001, -5.64920E-007
+-9.74143E-001, -5.78022E-007
+-9.75137E-001, -5.78948E-007
+-9.76140E-001, -5.80562E-007
+-9.77139E-001, -5.76937E-007
+-9.78139E-001, -5.84023E-007
+-9.79137E-001, -5.79956E-007
+-9.80136E-001, -5.87137E-007
+-9.81143E-001, -5.78894E-007
+-9.82145E-001, -5.80025E-007
+-9.83144E-001, -5.78937E-007
+-9.84145E-001, -5.76620E-007
+-9.85145E-001, -5.82784E-007
+-9.86144E-001, -5.86209E-007
+-9.87139E-001, -5.84759E-007
+-9.88144E-001, -5.90154E-007
+-9.89141E-001, -5.82747E-007
+-9.90145E-001, -5.92732E-007
+-9.91146E-001, -5.89508E-007
+-9.92147E-001, -5.96275E-007
+-9.93150E-001, -6.07055E-007
+-9.94141E-001, -6.06716E-007
+-9.95145E-001, -6.03570E-007
+-9.96145E-001, -6.09238E-007
+-9.97145E-001, -6.04163E-007
+-9.98149E-001, -6.10659E-007
+-9.99145E-001, -6.14793E-007
+-1.00015E+000, -6.16964E-007
+-1.00115E+000, -6.24243E-007
+-1.00215E+000, -6.31917E-007
+-1.00315E+000, -6.33683E-007
+-1.00415E+000, -6.42601E-007
+-1.00516E+000, -6.45701E-007
+-1.00615E+000, -6.38105E-007
+-1.00716E+000, -6.39315E-007
+-1.00815E+000, -6.34783E-007
+-1.00915E+000, -6.36044E-007
+-1.01016E+000, -6.37629E-007
+-1.01115E+000, -6.41910E-007
+-1.01216E+000, -6.47336E-007
+-1.01315E+000, -6.49096E-007
+-1.01415E+000, -6.53252E-007
+-1.01515E+000, -6.52604E-007
+-1.01615E+000, -6.61893E-007
+-1.01714E+000, -6.65555E-007
+-1.01815E+000, -6.70294E-007
+-1.01915E+000, -6.80895E-007
+-1.02015E+000, -6.83506E-007
+-1.02115E+000, -6.92402E-007
+-1.02215E+000, -6.85723E-007
+-1.02315E+000, -6.85832E-007
+-1.02415E+000, -6.89222E-007
+-1.02515E+000, -6.91977E-007
+-1.02615E+000, -6.96324E-007
+-1.02715E+000, -7.00497E-007
+-1.02815E+000, -7.05538E-007
+-1.02915E+000, -7.13171E-007
+-1.03015E+000, -7.10720E-007
+-1.03115E+000, -7.06812E-007
+-1.03215E+000, -7.02867E-007
+-1.03315E+000, -7.00542E-007
+-1.03415E+000, -7.01074E-007
+-1.03515E+000, -7.03480E-007
+-1.03615E+000, -6.97558E-007
+-1.03715E+000, -6.95655E-007
+-1.03815E+000, -6.97769E-007
+-1.03915E+000, -7.07590E-007
+-1.04016E+000, -7.15807E-007
+-1.04115E+000, -7.14963E-007
+-1.04215E+000, -7.18907E-007
+-1.04315E+000, -7.26338E-007
+-1.04415E+000, -7.28880E-007
+-1.04515E+000, -7.36308E-007
+-1.04615E+000, -7.33219E-007
+-1.04716E+000, -7.39240E-007
+-1.04816E+000, -7.43935E-007
+-1.04916E+000, -7.44609E-007
+-1.05016E+000, -7.52067E-007
+-1.05116E+000, -7.58818E-007
+-1.05216E+000, -7.56541E-007
+-1.05316E+000, -7.58438E-007
+-1.05416E+000, -7.58639E-007
+-1.05516E+000, -7.59568E-007
+-1.05616E+000, -7.59353E-007
+-1.05716E+000, -7.57133E-007
+-1.05816E+000, -7.55648E-007
+-1.05916E+000, -7.65932E-007
+-1.06016E+000, -7.69274E-007
+-1.06116E+000, -7.71613E-007
+-1.06217E+000, -7.71433E-007
+-1.06316E+000, -7.72945E-007
+-1.06416E+000, -7.70619E-007
+-1.06516E+000, -7.74570E-007
+-1.06616E+000, -7.72348E-007
+-1.06716E+000, -7.78854E-007
+-1.06816E+000, -7.75524E-007
+-1.06916E+000, -7.72856E-007
+-1.07016E+000, -7.74060E-007
+-1.07116E+000, -7.66608E-007
+-1.07216E+000, -7.61691E-007
+-1.07316E+000, -7.70597E-007
+-1.07416E+000, -7.66200E-007
+-1.07516E+000, -7.61702E-007
+-1.07616E+000, -7.63639E-007
+-1.07716E+000, -7.62494E-007
+-1.07816E+000, -7.69776E-007
+-1.07916E+000, -7.74581E-007
+-1.08016E+000, -7.72690E-007
+-1.08116E+000, -7.83103E-007
+-1.08216E+000, -7.86866E-007
+-1.08316E+000, -7.91582E-007
+-1.08416E+000, -7.93608E-007
+-1.08516E+000, -7.89954E-007
+-1.08616E+000, -7.99689E-007
+-1.08716E+000, -7.94885E-007
+-1.08816E+000, -7.96480E-007
+-1.08916E+000, -8.07546E-007
+-1.09016E+000, -8.14144E-007
+-1.09116E+000, -8.07845E-007
+-1.09216E+000, -8.05208E-007
+-1.09316E+000, -8.03978E-007
+-1.09416E+000, -7.99466E-007
+-1.09516E+000, -7.99702E-007
+-1.09617E+000, -8.07511E-007
+-1.09717E+000, -8.12098E-007
+-1.09816E+000, -8.22231E-007
+-1.09917E+000, -8.22455E-007
+-1.10016E+000, -8.19054E-007
+-1.10116E+000, -8.20774E-007
+-1.10216E+000, -8.19164E-007
+-1.10317E+000, -8.30649E-007
+-1.10416E+000, -8.24813E-007
+-1.10516E+000, -8.26526E-007
+-1.10617E+000, -8.26443E-007
+-1.10717E+000, -8.30060E-007
+-1.10817E+000, -8.32596E-007
+-1.10917E+000, -8.37397E-007
+-1.11017E+000, -8.45475E-007
+-1.11117E+000, -8.52578E-007
+-1.11218E+000, -8.55106E-007
+-1.11318E+000, -8.60176E-007
+-1.11417E+000, -8.58770E-007
+-1.11517E+000, -8.54967E-007
+-1.11617E+000, -8.60210E-007
+-1.11718E+000, -8.67514E-007
+-1.11817E+000, -8.75112E-007
+-1.11917E+000, -8.77241E-007
+-1.12017E+000, -8.77491E-007
+-1.12117E+000, -8.85679E-007
+-1.12217E+000, -8.81296E-007
+-1.12317E+000, -8.86889E-007
+-1.12417E+000, -8.99773E-007
+-1.12517E+000, -9.03063E-007
+-1.12617E+000, -9.05994E-007
+-1.12717E+000, -9.05910E-007
+-1.12817E+000, -9.04649E-007
+-1.12916E+000, -9.14496E-007
+-1.13017E+000, -9.15399E-007
+-1.13117E+000, -9.13574E-007
+-1.13217E+000, -9.15405E-007
+-1.13317E+000, -9.16400E-007
+-1.13416E+000, -9.12496E-007
+-1.13517E+000, -9.09472E-007
+-1.13617E+000, -9.07293E-007
+-1.13717E+000, -9.20562E-007
+-1.13817E+000, -9.28559E-007
+-1.13917E+000, -9.22754E-007
+-1.14017E+000, -9.29602E-007
+-1.14117E+000, -9.30414E-007
+-1.14216E+000, -9.33065E-007
+-1.14317E+000, -9.39017E-007
+-1.14417E+000, -9.42663E-007
+-1.14516E+000, -9.42957E-007
+-1.14617E+000, -9.58385E-007
+-1.14717E+000, -9.63625E-007
+-1.14817E+000, -9.76415E-007
+-1.14917E+000, -9.71037E-007
+-1.15017E+000, -9.68795E-007
+-1.15117E+000, -9.68503E-007
+-1.15217E+000, -9.71563E-007
+-1.15317E+000, -9.65017E-007
+-1.15417E+000, -9.67030E-007
+-1.15518E+000, -9.69014E-007
+-1.15617E+000, -9.72653E-007
+-1.15718E+000, -9.76405E-007
+-1.15817E+000, -9.78840E-007
+-1.15918E+000, -9.79025E-007
+-1.16018E+000, -9.80014E-007
+-1.16118E+000, -9.85771E-007
+-1.16218E+000, -9.91784E-007
+-1.16318E+000, -9.96045E-007
+-1.16417E+000, -1.00155E-006
+-1.16518E+000, -1.01091E-006
+-1.16618E+000, -1.01297E-006
+-1.16718E+000, -1.00800E-006
+-1.16818E+000, -1.00771E-006
+-1.16918E+000, -1.01358E-006
+-1.17018E+000, -1.00454E-006
+-1.17118E+000, -1.00390E-006
+-1.17218E+000, -1.01201E-006
+-1.17318E+000, -1.01124E-006
+-1.17418E+000, -1.01997E-006
+-1.17518E+000, -1.02195E-006
+-1.17617E+000, -1.01838E-006
+-1.17718E+000, -1.02464E-006
+-1.17817E+000, -1.02737E-006
+-1.17918E+000, -1.03322E-006
+-1.18018E+000, -1.03619E-006
+-1.18117E+000, -1.03439E-006
+-1.18217E+000, -1.03151E-006
+-1.18318E+000, -1.03142E-006
+-1.18418E+000, -1.03429E-006
+-1.18518E+000, -1.03529E-006
+-1.18618E+000, -1.03579E-006
+-1.18718E+000, -1.03791E-006
+-1.18818E+000, -1.04591E-006
+-1.18918E+000, -1.04028E-006
+-1.19018E+000, -1.03532E-006
+-1.19118E+000, -1.03392E-006
+-1.19218E+000, -1.02911E-006
+-1.19318E+000, -1.02321E-006
+-1.19418E+000, -1.01635E-006
+-1.19519E+000, -1.01219E-006
+-1.19618E+000, -1.01506E-006
+-1.19718E+000, -1.01652E-006
+-1.19818E+000, -1.02051E-006
+-1.19919E+000, -1.02440E-006
+-1.20019E+000, -1.02422E-006
+-1.20118E+000, -1.02316E-006
+-1.20218E+000, -1.03016E-006
+-1.20319E+000, -1.02711E-006
+-1.20419E+000, -1.03912E-006
+-1.20518E+000, -1.04086E-006
+-1.20619E+000, -1.04505E-006
+-1.20718E+000, -1.05363E-006
+-1.20818E+000, -1.06772E-006
+-1.20918E+000, -1.07269E-006
+-1.21018E+000, -1.07266E-006
+-1.21118E+000, -1.07904E-006
+-1.21218E+000, -1.08834E-006
+-1.21318E+000, -1.09218E-006
+-1.21418E+000, -1.09282E-006
+-1.21518E+000, -1.09437E-006
+-1.21619E+000, -1.09711E-006
+-1.21719E+000, -1.10371E-006
+-1.21819E+000, -1.09920E-006
+-1.21918E+000, -1.09993E-006
+-1.22018E+000, -1.09497E-006
+-1.22118E+000, -1.10326E-006
+-1.22219E+000, -1.11655E-006
+-1.22318E+000, -1.12215E-006
+-1.22418E+000, -1.12670E-006
+-1.22519E+000, -1.13982E-006
+-1.22619E+000, -1.14258E-006
+-1.22719E+000, -1.15203E-006
+-1.22819E+000, -1.14789E-006
+-1.22919E+000, -1.15733E-006
+-1.23018E+000, -1.17084E-006
+-1.23118E+000, -1.17131E-006
+-1.23219E+000, -1.16958E-006
+-1.23319E+000, -1.17015E-006
+-1.23419E+000, -1.18147E-006
+-1.23519E+000, -1.17976E-006
+-1.23619E+000, -1.17697E-006
+-1.23719E+000, -1.17746E-006
+-1.23819E+000, -1.17695E-006
+-1.23919E+000, -1.17981E-006
+-1.24019E+000, -1.17784E-006
+-1.24119E+000, -1.17830E-006
+-1.24219E+000, -1.17877E-006
+-1.24320E+000, -1.17771E-006
+-1.24419E+000, -1.18350E-006
+-1.24519E+000, -1.18451E-006
+-1.24619E+000, -1.18794E-006
+-1.24720E+000, -1.18973E-006
+-1.24820E+000, -1.17828E-006
+-1.24919E+000, -1.18390E-006
+-1.25020E+000, -1.17961E-006
+-1.25119E+000, -1.18038E-006
+-1.25219E+000, -1.18716E-006
+-1.25320E+000, -1.19511E-006
+-1.25420E+000, -1.20138E-006
+-1.25520E+000, -1.21303E-006
+-1.25619E+000, -1.21783E-006
+-1.25720E+000, -1.22256E-006
+-1.25820E+000, -1.22435E-006
+-1.25920E+000, -1.23337E-006
+-1.26020E+000, -1.23277E-006
+-1.26120E+000, -1.23628E-006
+-1.26220E+000, -1.24027E-006
+-1.26320E+000, -1.24265E-006
+-1.26419E+000, -1.25023E-006
+-1.26520E+000, -1.24792E-006
+-1.26620E+000, -1.25142E-006
+-1.26720E+000, -1.25334E-006
+-1.26820E+000, -1.25759E-006
+-1.26920E+000, -1.26285E-006
+-1.27019E+000, -1.26156E-006
+-1.27119E+000, -1.26788E-006
+-1.27220E+000, -1.26277E-006
+-1.27320E+000, -1.26214E-006
+-1.27420E+000, -1.26934E-006
+-1.27520E+000, -1.27889E-006
+-1.27620E+000, -1.28131E-006
+-1.27720E+000, -1.29699E-006
+-1.27821E+000, -1.29930E-006
+-1.27920E+000, -1.30952E-006
+-1.28020E+000, -1.31253E-006
+-1.28120E+000, -1.32176E-006
+-1.28220E+000, -1.32411E-006
+-1.28320E+000, -1.32360E-006
+-1.28420E+000, -1.32644E-006
+-1.28520E+000, -1.33643E-006
+-1.28620E+000, -1.34313E-006
+-1.28719E+000, -1.35048E-006
+-1.28820E+000, -1.35328E-006
+-1.28920E+000, -1.35406E-006
+-1.29020E+000, -1.36014E-006
+-1.29120E+000, -1.36351E-006
+-1.29220E+000, -1.36604E-006
+-1.29320E+000, -1.36232E-006
+-1.29420E+000, -1.37017E-006
+-1.29520E+000, -1.37018E-006
+-1.29620E+000, -1.37956E-006
+-1.29720E+000, -1.39128E-006
+-1.29820E+000, -1.39930E-006
+-1.29921E+000, -1.41329E-006
+-1.30021E+000, -1.41612E-006
+-1.30120E+000, -1.42045E-006
+-1.30220E+000, -1.43000E-006
+-1.30320E+000, -1.44125E-006
+-1.30420E+000, -1.45060E-006
+-1.30521E+000, -1.46219E-006
+-1.30621E+000, -1.47571E-006
+-1.30721E+000, -1.48524E-006
+-1.30821E+000, -1.48662E-006
+-1.30921E+000, -1.49327E-006
+-1.31021E+000, -1.49440E-006
+-1.31121E+000, -1.48410E-006
+-1.31220E+000, -1.48151E-006
+-1.31321E+000, -1.48145E-006
+-1.31420E+000, -1.49826E-006
+-1.31521E+000, -1.51158E-006
+-1.31621E+000, -1.51892E-006
+-1.31721E+000, -1.52438E-006
+-1.31821E+000, -1.51968E-006
+-1.31921E+000, -1.52290E-006
+-1.32022E+000, -1.52327E-006
+-1.32121E+000, -1.53430E-006
+-1.32221E+000, -1.53525E-006
+-1.32320E+000, -1.54134E-006
+-1.32421E+000, -1.54786E-006
+-1.32521E+000, -1.55362E-006
+-1.32621E+000, -1.55567E-006
+-1.32721E+000, -1.56483E-006
+-1.32821E+000, -1.57855E-006
+-1.32921E+000, -1.59729E-006
+-1.33022E+000, -1.61274E-006
+-1.33121E+000, -1.61995E-006
+-1.33221E+000, -1.62441E-006
+-1.33321E+000, -1.62951E-006
+-1.33421E+000, -1.62208E-006
+-1.33521E+000, -1.62340E-006
+-1.33622E+000, -1.63109E-006
+-1.33722E+000, -1.63471E-006
+-1.33821E+000, -1.64265E-006
+-1.33921E+000, -1.64897E-006
+-1.34021E+000, -1.65731E-006
+-1.34120E+000, -1.65687E-006
+-1.34220E+000, -1.65978E-006
+-1.34320E+000, -1.67064E-006
+-1.34420E+000, -1.67240E-006
+-1.34521E+000, -1.67408E-006
+-1.34621E+000, -1.68690E-006
+-1.34721E+000, -1.69499E-006
+-1.34821E+000, -1.70225E-006
+-1.34922E+000, -1.71109E-006
+-1.35021E+000, -1.71837E-006
+-1.35121E+000, -1.72220E-006
+-1.35221E+000, -1.71901E-006
+-1.35322E+000, -1.72858E-006
+-1.35421E+000, -1.74211E-006
+-1.35521E+000, -1.74001E-006
+-1.35621E+000, -1.74054E-006
+-1.35721E+000, -1.75410E-006
+-1.35821E+000, -1.76364E-006
+-1.35921E+000, -1.76352E-006
+-1.36021E+000, -1.77474E-006
+-1.36122E+000, -1.78227E-006
+-1.36222E+000, -1.78736E-006
+-1.36322E+000, -1.78392E-006
+-1.36422E+000, -1.79798E-006
+-1.36521E+000, -1.80481E-006
+-1.36622E+000, -1.81857E-006
+-1.36722E+000, -1.82870E-006
+-1.36822E+000, -1.83105E-006
+-1.36922E+000, -1.83525E-006
+-1.37021E+000, -1.83584E-006
+-1.37122E+000, -1.84896E-006
+-1.37222E+000, -1.85704E-006
+-1.37322E+000, -1.86703E-006
+-1.37422E+000, -1.87522E-006
+-1.37522E+000, -1.88229E-006
+-1.37622E+000, -1.87708E-006
+-1.37722E+000, -1.88414E-006
+-1.37823E+000, -1.88795E-006
+-1.37922E+000, -1.90078E-006
+-1.38022E+000, -1.91443E-006
+-1.38122E+000, -1.91241E-006
+-1.38223E+000, -1.91438E-006
+-1.38322E+000, -1.92638E-006
+-1.38421E+000, -1.92926E-006
+-1.38522E+000, -1.92960E-006
+-1.38622E+000, -1.93315E-006
+-1.38722E+000, -1.93862E-006
+-1.38822E+000, -1.95642E-006
+-1.38922E+000, -1.95929E-006
+-1.39022E+000, -1.95802E-006
+-1.39122E+000, -1.96647E-006
+-1.39222E+000, -1.97603E-006
+-1.39322E+000, -1.97821E-006
+-1.39422E+000, -1.99914E-006
+-1.39522E+000, -2.00323E-006
+-1.39622E+000, -2.01843E-006
+-1.39722E+000, -2.02241E-006
+-1.39822E+000, -2.01791E-006
+-1.39921E+000, -2.03062E-006
+-1.40021E+000, -2.04621E-006
+-1.40122E+000, -2.06612E-006
+-1.40222E+000, -2.07416E-006
+-1.40322E+000, -2.09170E-006
+-1.40422E+000, -2.10100E-006
+-1.40522E+000, -2.11516E-006
+-1.40622E+000, -2.12938E-006
+-1.40722E+000, -2.14325E-006
+-1.40822E+000, -2.14859E-006
+-1.40922E+000, -2.16609E-006
+-1.41022E+000, -2.17347E-006
+-1.41122E+000, -2.17576E-006
+-1.41222E+000, -2.17900E-006
+-1.41321E+000, -2.18413E-006
+-1.41422E+000, -2.19548E-006
+-1.41522E+000, -2.20660E-006
+-1.41622E+000, -2.20961E-006
+-1.41723E+000, -2.22754E-006
+-1.41822E+000, -2.24462E-006
+-1.41922E+000, -2.25774E-006
+-1.42022E+000, -2.27039E-006
+-1.42122E+000, -2.28145E-006
+-1.42223E+000, -2.28843E-006
+-1.42322E+000, -2.30520E-006
+-1.42422E+000, -2.31512E-006
+-1.42522E+000, -2.34096E-006
+-1.42622E+000, -2.35395E-006
+-1.42722E+000, -2.36542E-006
+-1.42822E+000, -2.37600E-006
+-1.42922E+000, -2.38353E-006
+-1.43022E+000, -2.40054E-006
+-1.43123E+000, -2.40964E-006
+-1.43223E+000, -2.41403E-006
+-1.43322E+000, -2.41961E-006
+-1.43423E+000, -2.42211E-006
+-1.43523E+000, -2.43538E-006
+-1.43623E+000, -2.44098E-006
+-1.43723E+000, -2.44456E-006
+-1.43824E+000, -2.45442E-006
+-1.43923E+000, -2.46420E-006
+-1.44023E+000, -2.46179E-006
+-1.44123E+000, -2.47187E-006
+-1.44223E+000, -2.48955E-006
+-1.44323E+000, -2.49837E-006
+-1.44423E+000, -2.50415E-006
+-1.44523E+000, -2.51411E-006
+-1.44623E+000, -2.52802E-006
+-1.44723E+000, -2.54737E-006
+-1.44823E+000, -2.55318E-006
+-1.44922E+000, -2.55276E-006
+-1.45022E+000, -2.56843E-006
+-1.45122E+000, -2.58752E-006
+-1.45223E+000, -2.60705E-006
+-1.45323E+000, -2.61944E-006
+-1.45422E+000, -2.63569E-006
+-1.45523E+000, -2.64378E-006
+-1.45623E+000, -2.65933E-006
+-1.45723E+000, -2.67728E-006
+-1.45823E+000, -2.69061E-006
+-1.45923E+000, -2.69646E-006
+-1.46023E+000, -2.70886E-006
+-1.46122E+000, -2.72367E-006
+-1.46222E+000, -2.73459E-006
+-1.46322E+000, -2.75691E-006
+-1.46423E+000, -2.77416E-006
+-1.46523E+000, -2.80012E-006
+-1.46623E+000, -2.81708E-006
+-1.46723E+000, -2.83486E-006
+-1.46823E+000, -2.85062E-006
+-1.46923E+000, -2.86432E-006
+-1.47023E+000, -2.87951E-006
+-1.47123E+000, -2.88573E-006
+-1.47223E+000, -2.91290E-006
+-1.47323E+000, -2.93281E-006
+-1.47423E+000, -2.94725E-006
+-1.47523E+000, -2.96216E-006
+-1.47624E+000, -2.98433E-006
+-1.47724E+000, -3.00706E-006
+-1.47823E+000, -3.02638E-006
+-1.47923E+000, -3.03989E-006
+-1.48023E+000, -3.04865E-006
+-1.48123E+000, -3.05762E-006
+-1.48223E+000, -3.06656E-006
+-1.48323E+000, -3.07407E-006
+-1.48423E+000, -3.09185E-006
+-1.48524E+000, -3.12169E-006
+-1.48623E+000, -3.13255E-006
+-1.48723E+000, -3.14235E-006
+-1.48824E+000, -3.15010E-006
+-1.48924E+000, -3.16319E-006
+-1.49024E+000, -3.17807E-006
+-1.49124E+000, -3.19313E-006
+-1.49223E+000, -3.21243E-006
+-1.49324E+000, -3.23564E-006
+-1.49424E+000, -3.25061E-006
+-1.49524E+000, -3.26661E-006
+-1.49624E+000, -3.29457E-006
+-1.49725E+000, -3.30303E-006
+-1.49824E+000, -3.32177E-006
+-1.49924E+000, -3.34107E-006
+-1.50024E+000, -3.35485E-006
+-1.50124E+000, -3.36005E-006
+-1.50224E+000, -3.38873E-006
+-1.50324E+000, -3.40773E-006
+-1.50424E+000, -3.42301E-006
+-1.50524E+000, -3.44325E-006
+-1.50624E+000, -3.46302E-006
+-1.50724E+000, -3.48128E-006
+-1.50824E+000, -3.49562E-006
+-1.50924E+000, -3.51399E-006
+-1.51024E+000, -3.53778E-006
+-1.51124E+000, -3.55906E-006
+-1.51224E+000, -3.58380E-006
+-1.51324E+000, -3.60757E-006
+-1.51424E+000, -3.63646E-006
+-1.51524E+000, -3.65730E-006
+-1.51624E+000, -3.67364E-006
+-1.51724E+000, -3.70157E-006
+-1.51824E+000, -3.70592E-006
+-1.51924E+000, -3.73147E-006
+-1.52024E+000, -3.75251E-006
+-1.52124E+000, -3.77945E-006
+-1.52224E+000, -3.80821E-006
+-1.52324E+000, -3.82427E-006
+-1.52424E+000, -3.83417E-006
+-1.52525E+000, -3.85335E-006
+-1.52624E+000, -3.87258E-006
+-1.52725E+000, -3.88553E-006
+-1.52824E+000, -3.90425E-006
+-1.52925E+000, -3.92410E-006
+-1.53024E+000, -3.95348E-006
+-1.53125E+000, -3.97386E-006
+-1.53224E+000, -3.99937E-006
+-1.53324E+000, -4.02730E-006
+-1.53424E+000, -4.04748E-006
+-1.53525E+000, -4.07033E-006
+-1.53625E+000, -4.10470E-006
+-1.53725E+000, -4.11806E-006
+-1.53825E+000, -4.15057E-006
+-1.53925E+000, -4.16563E-006
+-1.54024E+000, -4.18955E-006
+-1.54124E+000, -4.21420E-006
+-1.54225E+000, -4.23409E-006
+-1.54325E+000, -4.25319E-006
+-1.54425E+000, -4.27334E-006
+-1.54525E+000, -4.29636E-006
+-1.54625E+000, -4.32162E-006
+-1.54725E+000, -4.34401E-006
+-1.54825E+000, -4.35837E-006
+-1.54925E+000, -4.37857E-006
+-1.55026E+000, -4.40774E-006
+-1.55125E+000, -4.43755E-006
+-1.55225E+000, -4.45504E-006
+-1.55325E+000, -4.47519E-006
+-1.55425E+000, -4.49961E-006
+-1.55525E+000, -4.52671E-006
+-1.55625E+000, -4.55900E-006
+-1.55725E+000, -4.57933E-006
+-1.55825E+000, -4.60684E-006
+-1.55925E+000, -4.62053E-006
+-1.56025E+000, -4.64997E-006
+-1.56125E+000, -4.67428E-006
+-1.56225E+000, -4.69665E-006
+-1.56325E+000, -4.71954E-006
+-1.56424E+000, -4.74258E-006
+-1.56525E+000, -4.76908E-006
+-1.56625E+000, -4.78927E-006
+-1.56725E+000, -4.80901E-006
+-1.56825E+000, -4.83369E-006
+-1.56925E+000, -4.86342E-006
+-1.57025E+000, -4.89069E-006
+-1.57126E+000, -4.92243E-006
+-1.57226E+000, -4.95416E-006
+-1.57326E+000, -4.97994E-006
+-1.57426E+000, -5.01855E-006
+-1.57525E+000, -5.04437E-006
+-1.57626E+000, -5.06699E-006
+-1.57726E+000, -5.10196E-006
+-1.57826E+000, -5.13781E-006
+-1.57926E+000, -5.17060E-006
+-1.58026E+000, -5.20830E-006
+-1.58126E+000, -5.23229E-006
+-1.58225E+000, -5.25653E-006
+-1.58326E+000, -5.28353E-006
+-1.58426E+000, -5.31312E-006
+-1.58526E+000, -5.33763E-006
+-1.58626E+000, -5.37169E-006
+-1.58725E+000, -5.41188E-006
+-1.58826E+000, -5.44573E-006
+-1.58926E+000, -5.47597E-006
+-1.59026E+000, -5.51686E-006
+-1.59125E+000, -5.55488E-006
+-1.59226E+000, -5.59320E-006
+-1.59326E+000, -5.64368E-006
+-1.59426E+000, -5.68192E-006
+-1.59526E+000, -5.71980E-006
+-1.59626E+000, -5.74503E-006
+-1.59726E+000, -5.78658E-006
+-1.59826E+000, -5.82007E-006
+-1.59926E+000, -5.85372E-006
+-1.60026E+000, -5.87988E-006
+-1.60126E+000, -5.91352E-006
+-1.60226E+000, -5.94503E-006
+-1.60326E+000, -5.98814E-006
+-1.60425E+000, -6.01889E-006
+-1.60526E+000, -6.06032E-006
+-1.60626E+000, -6.09894E-006
+-1.60726E+000, -6.13705E-006
+-1.60826E+000, -6.17674E-006
+-1.60926E+000, -6.21593E-006
+-1.61026E+000, -6.25136E-006
+-1.61126E+000, -6.28115E-006
+-1.61226E+000, -6.32390E-006
+-1.61326E+000, -6.35283E-006
+-1.61426E+000, -6.38232E-006
+-1.61526E+000, -6.42770E-006
+-1.61626E+000, -6.46936E-006
+-1.61726E+000, -6.50567E-006
+-1.61826E+000, -6.55088E-006
+-1.61926E+000, -6.60720E-006
+-1.62026E+000, -6.64299E-006
+-1.62126E+000, -6.69786E-006
+-1.62226E+000, -6.75257E-006
+-1.62326E+000, -6.80115E-006
+-1.62426E+000, -6.84210E-006
+-1.62527E+000, -6.88046E-006
+-1.62626E+000, -6.93156E-006
+-1.62727E+000, -6.98229E-006
+-1.62827E+000, -7.01985E-006
+-1.62926E+000, -7.07051E-006
+-1.63026E+000, -7.12351E-006
+-1.63126E+000, -7.16768E-006
+-1.63227E+000, -7.22097E-006
+-1.63326E+000, -7.28096E-006
+-1.63426E+000, -7.33379E-006
+-1.63527E+000, -7.39052E-006
+-1.63627E+000, -7.46257E-006
+-1.63727E+000, -7.51218E-006
+-1.63826E+000, -7.56550E-006
+-1.63927E+000, -7.62173E-006
+-1.64026E+000, -7.67789E-006
+-1.64127E+000, -7.72706E-006
+-1.64227E+000, -7.78803E-006
+-1.64327E+000, -7.85215E-006
+-1.64427E+000, -7.91070E-006
+-1.64527E+000, -7.97188E-006
+-1.64627E+000, -8.03539E-006
+-1.64727E+000, -8.09701E-006
+-1.64827E+000, -8.14823E-006
+-1.64927E+000, -8.21379E-006
+-1.65027E+000, -8.27191E-006
+-1.65127E+000, -8.34279E-006
+-1.65227E+000, -8.40769E-006
+-1.65327E+000, -8.48177E-006
+-1.65427E+000, -8.54505E-006
+-1.65527E+000, -8.61796E-006
+-1.65627E+000, -8.69355E-006
+-1.65727E+000, -8.76828E-006
+-1.65827E+000, -8.83472E-006
+-1.65927E+000, -8.90740E-006
+-1.66027E+000, -8.98112E-006
+-1.66127E+000, -9.05819E-006
+-1.66227E+000, -9.12562E-006
+-1.66328E+000, -9.19620E-006
+-1.66427E+000, -9.26203E-006
+-1.66527E+000, -9.34367E-006
+-1.66627E+000, -9.42415E-006
+-1.66727E+000, -9.49569E-006
+-1.66827E+000, -9.57385E-006
+-1.66928E+000, -9.66305E-006
+-1.67027E+000, -9.74541E-006
+-1.67127E+000, -9.83026E-006
+-1.67228E+000, -9.91197E-006
+-1.67328E+000, -9.99451E-006
+-1.67428E+000, -1.00855E-005
+-1.67528E+000, -1.01803E-005
+-1.67628E+000, -1.02630E-005
+-1.67728E+000, -1.03471E-005
+-1.67828E+000, -1.04453E-005
+-1.67928E+000, -1.05400E-005
+-1.68028E+000, -1.06255E-005
+-1.68128E+000, -1.07129E-005
+-1.68228E+000, -1.08096E-005
+-1.68328E+000, -1.09019E-005
+-1.68428E+000, -1.09981E-005
+-1.68528E+000, -1.10963E-005
+-1.68628E+000, -1.11972E-005
+-1.68728E+000, -1.12908E-005
+-1.68829E+000, -1.13990E-005
+-1.68928E+000, -1.14993E-005
+-1.69028E+000, -1.16054E-005
+-1.69128E+000, -1.17113E-005
+-1.69228E+000, -1.18291E-005
+-1.69328E+000, -1.19264E-005
+-1.69428E+000, -1.20313E-005
+-1.69527E+000, -1.21322E-005
+-1.69628E+000, -1.22386E-005
+-1.69728E+000, -1.23513E-005
+-1.69828E+000, -1.24700E-005
+-1.69928E+000, -1.25866E-005
+-1.70028E+000, -1.27159E-005
+-1.70129E+000, -1.28352E-005
+-1.70229E+000, -1.29571E-005
+-1.70328E+000, -1.30981E-005
+-1.70428E+000, -1.32269E-005
+-1.70528E+000, -1.33574E-005
+-1.70628E+000, -1.35000E-005
+-1.70729E+000, -1.36243E-005
+-1.70828E+000, -1.37635E-005
+-1.70929E+000, -1.38966E-005
+-1.71028E+000, -1.40450E-005
+-1.71129E+000, -1.41773E-005
+-1.71229E+000, -1.43041E-005
+-1.71329E+000, -1.44392E-005
+-1.71429E+000, -1.45943E-005
+-1.71528E+000, -1.47320E-005
+-1.71628E+000, -1.48623E-005
+-1.71729E+000, -1.50363E-005
+-1.71829E+000, -1.51927E-005
+-1.71929E+000, -1.53674E-005
+-1.72029E+000, -1.55348E-005
+-1.72129E+000, -1.57051E-005
+-1.72228E+000, -1.58729E-005
+-1.72328E+000, -1.60501E-005
+-1.72429E+000, -1.62199E-005
+-1.72529E+000, -1.63953E-005
+-1.72629E+000, -1.65762E-005
+-1.72729E+000, -1.67315E-005
+-1.72828E+000, -1.69349E-005
+-1.72928E+000, -1.71207E-005
+-1.73028E+000, -1.73278E-005
+-1.73128E+000, -1.75234E-005
+-1.73229E+000, -1.77314E-005
+-1.73328E+000, -1.79339E-005
+-1.73428E+000, -1.81475E-005
+-1.73528E+000, -1.83671E-005
+-1.73629E+000, -1.85869E-005
+-1.73728E+000, -1.88004E-005
+-1.73829E+000, -1.90261E-005
+-1.73928E+000, -1.92355E-005
+-1.74029E+000, -1.94510E-005
+-1.74128E+000, -1.96795E-005
+-1.74229E+000, -1.98915E-005
+-1.74328E+000, -2.01154E-005
+-1.74428E+000, -2.03659E-005
+-1.74529E+000, -2.05578E-005
+-1.74628E+000, -2.08536E-005
+-1.74729E+000, -2.11103E-005
+-1.74829E+000, -2.13572E-005
+-1.74929E+000, -2.16121E-005
+-1.75029E+000, -2.18698E-005
+-1.75129E+000, -2.21324E-005
+-1.75228E+000, -2.24081E-005
+-1.75329E+000, -2.26702E-005
+-1.75429E+000, -2.29626E-005
+-1.75529E+000, -2.32444E-005
+-1.75628E+000, -2.35447E-005
+-1.75729E+000, -2.38241E-005
+-1.75829E+000, -2.41186E-005
+-1.75929E+000, -2.44301E-005
+-1.76029E+000, -2.47402E-005
+-1.76129E+000, -2.50593E-005
+-1.76229E+000, -2.53820E-005
+-1.76329E+000, -2.57150E-005
+-1.76429E+000, -2.60501E-005
+-1.76529E+000, -2.63882E-005
+-1.76629E+000, -2.67472E-005
+-1.76729E+000, -2.71071E-005
+-1.76829E+000, -2.74911E-005
+-1.76929E+000, -2.78750E-005
+-1.77029E+000, -2.82670E-005
+-1.77129E+000, -2.86693E-005
+-1.77229E+000, -2.90681E-005
+-1.77330E+000, -2.94946E-005
+-1.77430E+000, -2.99062E-005
+-1.77530E+000, -3.03263E-005
+-1.77629E+000, -3.07653E-005
+-1.77729E+000, -3.12054E-005
+-1.77830E+000, -3.16770E-005
+-1.77929E+000, -3.21583E-005
+-1.78029E+000, -3.26616E-005
+-1.78130E+000, -3.31337E-005
+-1.78229E+000, -3.36433E-005
+-1.78330E+000, -3.41749E-005
+-1.78430E+000, -3.46706E-005
+-1.78530E+000, -3.52422E-005
+-1.78630E+000, -3.58415E-005
+-1.78729E+000, -3.64427E-005
+-1.78830E+000, -3.70368E-005
+-1.78930E+000, -3.76765E-005
+-1.79030E+000, -3.83392E-005
+-1.79130E+000, -3.90173E-005
+-1.79230E+000, -3.97282E-005
+-1.79330E+000, -4.04438E-005
+-1.79430E+000, -4.11836E-005
+-1.79530E+000, -4.19469E-005
+-1.79630E+000, -4.27328E-005
+-1.79730E+000, -4.35036E-005
+-1.79830E+000, -4.43772E-005
+-1.79930E+000, -4.52764E-005
+-1.80029E+000, -4.61775E-005
+-1.80130E+000, -4.71328E-005
+-1.80230E+000, -4.80872E-005
+-1.80330E+000, -4.90979E-005
+-1.80430E+000, -5.01499E-005
+-1.80530E+000, -5.12154E-005
+-1.80629E+000, -5.23345E-005
+-1.80730E+000, -5.35284E-005
+-1.80830E+000, -5.47174E-005
+-1.80930E+000, -5.60041E-005
+-1.81030E+000, -5.73069E-005
+-1.81130E+000, -5.86702E-005
+-1.81230E+000, -6.00536E-005
+-1.81330E+000, -6.15157E-005
+-1.81430E+000, -6.30389E-005
+-1.81530E+000, -6.46174E-005
+-1.81630E+000, -6.62217E-005
+-1.81730E+000, -6.78828E-005
+-1.81830E+000, -6.95566E-005
+-1.81930E+000, -7.12784E-005
+-1.82030E+000, -7.30331E-005
+-1.82130E+000, -7.48439E-005
+-1.82230E+000, -7.66850E-005
+-1.82330E+000, -7.84974E-005
+-1.82430E+000, -8.03135E-005
+-1.82530E+000, -8.21213E-005
+-1.82630E+000, -8.39440E-005
+-1.82730E+000, -8.57295E-005
+-1.82830E+000, -8.75056E-005
+-1.82930E+000, -8.92483E-005
+-1.83030E+000, -9.09635E-005
+-1.83130E+000, -9.25703E-005
+-1.83229E+000, -9.41606E-005
+-1.83329E+000, -9.56019E-005
+-1.83429E+000, -9.69982E-005
+-1.83529E+000, -9.83673E-005
+-1.83629E+000, -9.95466E-005
+-1.83729E+000, -1.00663E-004
+-1.83829E+000, -1.01665E-004
+-1.83930E+000, -1.02520E-004
+-1.84030E+000, -1.03290E-004
+-1.84129E+000, -1.03906E-004
+-1.84230E+000, -1.04442E-004
+-1.84329E+000, -1.04923E-004
+-1.84429E+000, -1.05293E-004
+-1.84529E+000, -1.05589E-004
+-1.84630E+000, -1.05770E-004
+-1.84730E+000, -1.05923E-004
+-1.84829E+000, -1.05977E-004
+-1.84930E+000, -1.05958E-004
+-1.85030E+000, -1.05881E-004
+-1.85129E+000, -1.05734E-004
+-1.85229E+000, -1.05691E-004
+-1.85330E+000, -1.05563E-004
+-1.85430E+000, -1.05399E-004
+-1.85530E+000, -1.05224E-004
+-1.85630E+000, -1.04964E-004
+-1.85730E+000, -1.04719E-004
+-1.85830E+000, -1.04456E-004
+-1.85929E+000, -1.04154E-004
+-1.86030E+000, -1.03894E-004
+-1.86130E+000, -1.03657E-004
+-1.86230E+000, -1.03355E-004
+-1.86331E+000, -1.03016E-004
+-1.86430E+000, -1.02693E-004
+-1.86530E+000, -1.02415E-004
+-1.86630E+000, -1.02156E-004
+-1.86730E+000, -1.01877E-004
+-1.86830E+000, -1.01595E-004
+-1.86930E+000, -1.01337E-004
+-1.87031E+000, -1.01074E-004
+-1.87130E+000, -1.00814E-004
+-1.87230E+000, -1.00543E-004
+-1.87331E+000, -1.00265E-004
+-1.87431E+000, -1.00047E-004
+-1.87531E+000, -9.98210E-005
+-1.87630E+000, -9.95549E-005
+-1.87731E+000, -9.93575E-005
+-1.87831E+000, -9.91005E-005
+-1.87931E+000, -9.88664E-005
+-1.88031E+000, -9.86841E-005
+-1.88131E+000, -9.84997E-005
+-1.88230E+000, -9.83382E-005
+-1.88331E+000, -9.82136E-005
+-1.88431E+000, -9.80233E-005
+-1.88530E+000, -9.78518E-005
+-1.88631E+000, -9.76826E-005
+-1.88731E+000, -9.75158E-005
+-1.88831E+000, -9.74179E-005
+-1.88931E+000, -9.72832E-005
+-1.89030E+000, -9.71448E-005
+-1.89131E+000, -9.69621E-005
+-1.89231E+000, -9.68188E-005
+-1.89331E+000, -9.66131E-005
+-1.89431E+000, -9.64582E-005
+-1.89531E+000, -9.63316E-005
+-1.89631E+000, -9.62443E-005
+-1.89731E+000, -9.61203E-005
+-1.89831E+000, -9.60105E-005
+-1.89931E+000, -9.58675E-005
+-1.90031E+000, -9.57561E-005
+-1.90131E+000, -9.56813E-005
+-1.90231E+000, -9.55503E-005
+-1.90332E+000, -9.54494E-005
+-1.90431E+000, -9.53100E-005
+-1.90532E+000, -9.52057E-005
+-1.90631E+000, -9.50697E-005
+-1.90732E+000, -9.49164E-005
+-1.90832E+000, -9.48772E-005
+-1.90931E+000, -9.46968E-005
+-1.91032E+000, -9.45550E-005
+-1.91132E+000, -9.43606E-005
+-1.91231E+000, -9.41992E-005
+-1.91332E+000, -9.40337E-005
+-1.91432E+000, -9.38809E-005
+-1.91532E+000, -9.37484E-005
+-1.91632E+000, -9.36359E-005
+-1.91731E+000, -9.34987E-005
+-1.91832E+000, -9.33651E-005
+-1.91931E+000, -9.31604E-005
+-1.92031E+000, -9.30501E-005
+-1.92131E+000, -9.29561E-005
+-1.92231E+000, -9.27888E-005
+-1.92332E+000, -9.26556E-005
+-1.92432E+000, -9.24842E-005
+-1.92532E+000, -9.23640E-005
+-1.92632E+000, -9.22121E-005
+-1.92732E+000, -9.20790E-005
+-1.92832E+000, -9.19313E-005
+-1.92932E+000, -9.18021E-005
+-1.93032E+000, -9.16890E-005
+-1.93132E+000, -9.16097E-005
+-1.93232E+000, -9.15154E-005
+-1.93332E+000, -9.13396E-005
+-1.93432E+000, -9.12247E-005
+-1.93532E+000, -9.11302E-005
+-1.93632E+000, -9.10117E-005
+-1.93732E+000, -9.09069E-005
+-1.93832E+000, -9.07615E-005
+-1.93932E+000, -9.06203E-005
+-1.94032E+000, -9.05182E-005
+-1.94132E+000, -9.04163E-005
+-1.94232E+000, -9.03483E-005
+-1.94332E+000, -9.02278E-005
+-1.94432E+000, -9.01136E-005
+-1.94532E+000, -9.00105E-005
+-1.94632E+000, -8.98402E-005
+-1.94732E+000, -8.97855E-005
+-1.94832E+000, -8.96776E-005
+-1.94932E+000, -8.95924E-005
+-1.95033E+000, -8.94440E-005
+-1.95133E+000, -8.93429E-005
+-1.95233E+000, -8.92713E-005
+-1.95332E+000, -8.91889E-005
+-1.95433E+000, -8.90708E-005
+-1.95532E+000, -8.89856E-005
+-1.95632E+000, -8.88903E-005
+-1.95732E+000, -8.88843E-005
+-1.95832E+000, -8.88316E-005
+-1.95933E+000, -8.87381E-005
+-1.96032E+000, -8.86301E-005
+-1.96132E+000, -8.85203E-005
+-1.96233E+000, -8.84391E-005
+-1.96333E+000, -8.83342E-005
+-1.96433E+000, -8.82591E-005
+-1.96533E+000, -8.81745E-005
+-1.96632E+000, -8.81111E-005
+-1.96733E+000, -8.80743E-005
+-1.96833E+000, -8.80666E-005
+-1.96933E+000, -8.79893E-005
+-1.97033E+000, -8.79080E-005
+-1.97133E+000, -8.78302E-005
+-1.97233E+000, -8.77188E-005
+-1.97334E+000, -8.76198E-005
+-1.97433E+000, -8.75094E-005
+-1.97533E+000, -8.73938E-005
+-1.97633E+000, -8.73313E-005
+-1.97733E+000, -8.72433E-005
+-1.97833E+000, -8.71895E-005
+-1.97933E+000, -8.71563E-005
+-1.98034E+000, -8.70644E-005
+-1.98134E+000, -8.69713E-005
+-1.98234E+000, -8.69474E-005
+-1.98334E+000, -8.68571E-005
+-1.98434E+000, -8.67942E-005
+-1.98534E+000, -8.67474E-005
+-1.98634E+000, -8.66756E-005
+-1.98734E+000, -8.66028E-005
+-1.98834E+000, -8.65534E-005
+-1.98934E+000, -8.65205E-005
+-1.99034E+000, -8.64556E-005
+-1.99134E+000, -8.64194E-005
+-1.99234E+000, -8.64049E-005
+-1.99334E+000, -8.63599E-005
+-1.99434E+000, -8.63231E-005
+-1.99534E+000, -8.62675E-005
+-1.99634E+000, -8.62169E-005
+-1.99734E+000, -8.61556E-005
+-1.99834E+000, -8.61024E-005
+-1.99934E+000, -8.60249E-005
+-2.00034E+000, -8.59664E-005
+-2.00134E+000, -8.59133E-005
+-2.00234E+000, -8.58535E-005
+-2.00334E+000, -8.58098E-005
+-2.00434E+000, -8.57180E-005
+-2.00533E+000, -8.56896E-005
+-2.00633E+000, -8.56273E-005
+-2.00734E+000, -8.55681E-005
+-2.00834E+000, -8.55226E-005
+-2.00934E+000, -8.54969E-005
+-2.01034E+000, -8.54333E-005
+-2.01134E+000, -8.54420E-005
+-2.01234E+000, -8.54078E-005
+-2.01334E+000, -8.54151E-005
+-2.01434E+000, -8.53570E-005
+-2.01534E+000, -8.53808E-005
+-2.01634E+000, -8.53786E-005
+-2.01734E+000, -8.53924E-005
+-2.01834E+000, -8.53760E-005
+-2.01934E+000, -8.53787E-005
+-2.02033E+000, -8.53857E-005
+-2.02134E+000, -8.53330E-005
+-2.02234E+000, -8.52829E-005
+-2.02334E+000, -8.52548E-005
+-2.02434E+000, -8.52679E-005
+-2.02534E+000, -8.52625E-005
+-2.02634E+000, -8.52406E-005
+-2.02734E+000, -8.52545E-005
+-2.02834E+000, -8.52305E-005
+-2.02934E+000, -8.52108E-005
+-2.03034E+000, -8.52115E-005
+-2.03135E+000, -8.52297E-005
+-2.03234E+000, -8.52173E-005
+-2.03334E+000, -8.52231E-005
+-2.03434E+000, -8.52581E-005
+-2.03534E+000, -8.52573E-005
+-2.03634E+000, -8.52330E-005
+-2.03734E+000, -8.52411E-005
+-2.03834E+000, -8.52249E-005
+-2.03935E+000, -8.52436E-005
+-2.04034E+000, -8.52697E-005
+-2.04135E+000, -8.53328E-005
+-2.04235E+000, -8.53241E-005
+-2.04335E+000, -8.53121E-005
+-2.04435E+000, -8.52860E-005
+-2.04535E+000, -8.52729E-005
+-2.04635E+000, -8.52691E-005
+-2.04735E+000, -8.52540E-005
+-2.04835E+000, -8.52653E-005
+-2.04935E+000, -8.52613E-005
+-2.05035E+000, -8.52487E-005
+-2.05135E+000, -8.52632E-005
+-2.05235E+000, -8.53017E-005
+-2.05335E+000, -8.53104E-005
+-2.05435E+000, -8.53463E-005
+-2.05535E+000, -8.53862E-005
+-2.05635E+000, -8.54333E-005
+-2.05735E+000, -8.54359E-005
+-2.05835E+000, -8.54322E-005
+-2.05934E+000, -8.54025E-005
+-2.06035E+000, -8.53780E-005
+-2.06134E+000, -8.53789E-005
+-2.06234E+000, -8.53762E-005
+-2.06335E+000, -8.54048E-005
+-2.06434E+000, -8.54331E-005
+-2.06535E+000, -8.54876E-005
+-2.06635E+000, -8.55629E-005
+-2.06735E+000, -8.56152E-005
+-2.06835E+000, -8.56424E-005
+-2.06935E+000, -8.57564E-005
+-2.07035E+000, -8.57925E-005
+-2.07134E+000, -8.58317E-005
+-2.07235E+000, -8.58374E-005
+-2.07335E+000, -8.58535E-005
+-2.07435E+000, -8.58412E-005
+-2.07535E+000, -8.58497E-005
+-2.07635E+000, -8.58707E-005
+-2.07735E+000, -8.59042E-005
+-2.07835E+000, -8.59413E-005
+-2.07935E+000, -8.60269E-005
+-2.08035E+000, -8.60772E-005
+-2.08135E+000, -8.61401E-005
+-2.08235E+000, -8.62169E-005
+-2.08335E+000, -8.62889E-005
+-2.08435E+000, -8.63348E-005
+-2.08536E+000, -8.63706E-005
+-2.08636E+000, -8.64096E-005
+-2.08735E+000, -8.64274E-005
+-2.08836E+000, -8.64238E-005
+-2.08936E+000, -8.64450E-005
+-2.09036E+000, -8.64874E-005
+-2.09136E+000, -8.65380E-005
+-2.09236E+000, -8.66453E-005
+-2.09336E+000, -8.67074E-005
+-2.09436E+000, -8.67565E-005
+-2.09535E+000, -8.68486E-005
+-2.09636E+000, -8.69080E-005
+-2.09736E+000, -8.69539E-005
+-2.09836E+000, -8.70309E-005
+-2.09936E+000, -8.70725E-005
+-2.10037E+000, -8.71146E-005
+-2.10136E+000, -8.71824E-005
+-2.10236E+000, -8.72385E-005
+-2.10335E+000, -8.72958E-005
+-2.10436E+000, -8.73522E-005
+-2.10536E+000, -8.73807E-005
+-2.10636E+000, -8.74289E-005
+-2.10736E+000, -8.74797E-005
+-2.10836E+000, -8.75325E-005
+-2.10936E+000, -8.75438E-005
+-2.11036E+000, -8.75769E-005
+-2.11136E+000, -8.76375E-005
+-2.11235E+000, -8.76664E-005
+-2.11335E+000, -8.76674E-005
+-2.11436E+000, -8.76718E-005
+-2.11536E+000, -8.76992E-005
+-2.11635E+000, -8.77330E-005
+-2.11736E+000, -8.77548E-005
+-2.11836E+000, -8.77823E-005
+-2.11935E+000, -8.82398E-005
+-2.12035E+000, -8.81730E-005
+-2.12136E+000, -8.78048E-005
+-2.12236E+000, -8.73553E-005
+-2.12335E+000, -8.68691E-005
+-2.12436E+000, -8.64028E-005
+-2.12535E+000, -8.59434E-005
+-2.12636E+000, -8.55536E-005
+-2.12736E+000, -8.51664E-005
+-2.12836E+000, -8.48039E-005
+-2.12936E+000, -8.45328E-005
+-2.13036E+000, -8.43084E-005
+-2.13136E+000, -8.41756E-005
+-2.13236E+000, -8.40724E-005
+-2.13336E+000, -8.39880E-005
+-2.13436E+000, -8.39258E-005
+-2.13536E+000, -8.38259E-005
+-2.13637E+000, -8.37491E-005
+-2.13736E+000, -8.36546E-005
+-2.13836E+000, -8.36310E-005
+-2.13936E+000, -8.36178E-005
+-2.14037E+000, -8.36539E-005
+-2.14137E+000, -8.36930E-005
+-2.14237E+000, -8.37023E-005
+-2.14337E+000, -8.36962E-005
+-2.14436E+000, -8.36530E-005
+-2.14536E+000, -8.36546E-005
+-2.14637E+000, -8.36095E-005
+-2.14737E+000, -8.35458E-005
+-2.14836E+000, -8.34562E-005
+-2.14936E+000, -8.33685E-005
+-2.15036E+000, -8.33052E-005
+-2.15137E+000, -8.32517E-005
+-2.15237E+000, -8.32277E-005
+-2.15337E+000, -8.32148E-005
+-2.15437E+000, -8.32305E-005
+-2.15537E+000, -8.32692E-005
+-2.15637E+000, -8.33356E-005
+-2.15737E+000, -8.33959E-005
+-2.15837E+000, -8.35204E-005
+-2.15937E+000, -8.36147E-005
+-2.16036E+000, -8.37286E-005
+-2.16137E+000, -8.38806E-005
+-2.16237E+000, -8.39829E-005
+-2.16337E+000, -8.40513E-005
+-2.16437E+000, -8.41752E-005
+-2.16536E+000, -8.43126E-005
+-2.16637E+000, -8.43800E-005
+-2.16737E+000, -8.44635E-005
+-2.16837E+000, -8.45470E-005
+-2.16937E+000, -8.46574E-005
+-2.17036E+000, -8.47375E-005
+-2.17137E+000, -8.48327E-005
+-2.17237E+000, -8.49572E-005
+-2.17336E+000, -8.50423E-005
+-2.17437E+000, -8.50754E-005
+-2.17537E+000, -8.51130E-005
+-2.17636E+000, -8.52063E-005
+-2.17737E+000, -8.52311E-005
+-2.17836E+000, -8.53068E-005
+-2.17936E+000, -8.53545E-005
+-2.18037E+000, -8.53965E-005
+-2.18137E+000, -8.54607E-005
+-2.18237E+000, -8.55183E-005
+-2.18337E+000, -8.56454E-005
+-2.18437E+000, -8.57562E-005
+-2.18537E+000, -8.58677E-005
+-2.18637E+000, -8.59722E-005
+-2.18736E+000, -8.60977E-005
+-2.18837E+000, -8.62207E-005
+-2.18937E+000, -8.63276E-005
+-2.19037E+000, -8.63954E-005
+-2.19137E+000, -8.64785E-005
+-2.19237E+000, -8.65375E-005
+-2.19337E+000, -8.65829E-005
+-2.19437E+000, -8.66386E-005
+-2.19537E+000, -8.67123E-005
+-2.19638E+000, -8.67476E-005
+-2.19738E+000, -8.67907E-005
+-2.19837E+000, -8.68812E-005
+-2.19937E+000, -8.69794E-005
+-2.20037E+000, -8.70655E-005
+-2.20137E+000, -8.71475E-005
+-2.20237E+000, -8.72152E-005
+-2.20337E+000, -8.73025E-005
+-2.20437E+000, -8.74149E-005
+-2.20537E+000, -8.75091E-005
+-2.20638E+000, -8.76093E-005
+-2.20737E+000, -8.76987E-005
+-2.20838E+000, -8.78185E-005
+-2.20938E+000, -8.79297E-005
+-2.21037E+000, -8.80099E-005
+-2.21138E+000, -8.80993E-005
+-2.21238E+000, -8.81911E-005
+-2.21338E+000, -8.82676E-005
+-2.21438E+000, -8.83558E-005
+-2.21537E+000, -8.84632E-005
+-2.21637E+000, -8.85504E-005
+-2.21738E+000, -8.86371E-005
+-2.21838E+000, -8.87524E-005
+-2.21938E+000, -8.88636E-005
+-2.22037E+000, -8.89925E-005
+-2.22139E+000, -8.91565E-005
+-2.22237E+000, -8.92419E-005
+-2.22338E+000, -8.93769E-005
+-2.22438E+000, -8.94686E-005
+-2.22538E+000, -8.94813E-005
+-2.22638E+000, -8.95124E-005
+-2.22738E+000, -8.95627E-005
+-2.22838E+000, -8.96384E-005
+-2.22938E+000, -8.97084E-005
+-2.23038E+000, -8.98194E-005
+-2.23138E+000, -8.99702E-005
+-2.23238E+000, -9.01037E-005
+-2.23338E+000, -9.02065E-005
+-2.23438E+000, -9.03193E-005
+-2.23538E+000, -9.04004E-005
+-2.23638E+000, -9.04905E-005
+-2.23738E+000, -9.05897E-005
+-2.23839E+000, -9.06731E-005
+-2.23938E+000, -9.06887E-005
+-2.24038E+000, -9.08028E-005
+-2.24138E+000, -9.08672E-005
+-2.24239E+000, -9.09223E-005
+-2.24338E+000, -9.10304E-005
+-2.24439E+000, -9.11081E-005
+-2.24539E+000, -9.12132E-005
+-2.24639E+000, -9.13043E-005
+-2.24739E+000, -9.13967E-005
+-2.24839E+000, -9.15198E-005
+-2.24939E+000, -9.16508E-005
+-2.25039E+000, -9.17275E-005
+-2.25139E+000, -9.18777E-005
+-2.25239E+000, -9.20730E-005
+-2.25339E+000, -9.22145E-005
+-2.25439E+000, -9.23199E-005
+-2.25539E+000, -9.24981E-005
+-2.25638E+000, -9.26685E-005
+-2.25739E+000, -9.28215E-005
+-2.25838E+000, -9.29730E-005
+-2.25938E+000, -9.31366E-005
+-2.26038E+000, -9.33031E-005
+-2.26139E+000, -9.34643E-005
+-2.26239E+000, -9.36048E-005
+-2.26339E+000, -9.37449E-005
+-2.26439E+000, -9.38354E-005
+-2.26539E+000, -9.39825E-005
+-2.26639E+000, -9.40791E-005
+-2.26739E+000, -9.42113E-005
+-2.26839E+000, -9.43035E-005
+-2.26939E+000, -9.44291E-005
+-2.27038E+000, -9.45551E-005
+-2.27139E+000, -9.46585E-005
+-2.27239E+000, -9.47660E-005
+-2.27339E+000, -9.49058E-005
+-2.27439E+000, -9.50448E-005
+-2.27539E+000, -9.51821E-005
+-2.27639E+000, -9.53000E-005
+-2.27739E+000, -9.54098E-005
+-2.27839E+000, -9.55246E-005
+-2.27939E+000, -9.57224E-005
+-2.28039E+000, -9.58277E-005
+-2.28139E+000, -9.59154E-005
+-2.28239E+000, -9.60445E-005
+-2.28339E+000, -9.61546E-005
+-2.28439E+000, -9.62591E-005
+-2.28539E+000, -9.63478E-005
+-2.28640E+000, -9.64335E-005
+-2.28739E+000, -9.66096E-005
+-2.28839E+000, -9.68042E-005
+-2.28940E+000, -9.69652E-005
+-2.29039E+000, -9.71024E-005
+-2.29139E+000, -9.72165E-005
+-2.29239E+000, -9.74046E-005
+-2.29338E+000, -9.75785E-005
+-2.29439E+000, -9.77875E-005
+-2.29539E+000, -9.79887E-005
+-2.29639E+000, -9.81297E-005
+-2.29739E+000, -9.83037E-005
+-2.29839E+000, -9.85248E-005
+-2.29940E+000, -9.87148E-005
+-2.30040E+000, -9.89007E-005
+-2.30140E+000, -9.91185E-005
+-2.30240E+000, -9.92912E-005
+-2.30340E+000, -9.94504E-005
+-2.30439E+000, -9.96449E-005
+-2.30540E+000, -9.98314E-005
+-2.30640E+000, -9.99875E-005
+-2.30740E+000, -1.00192E-004
+-2.30840E+000, -1.00407E-004
+-2.30940E+000, -1.00636E-004
+-2.31040E+000, -1.00871E-004
+-2.31140E+000, -1.01148E-004
+-2.31240E+000, -1.01394E-004
+-2.31340E+000, -1.01654E-004
+-2.31440E+000, -1.01913E-004
+-2.31540E+000, -1.02189E-004
+-2.31640E+000, -1.02530E-004
+-2.31740E+000, -1.02691E-004
+-2.31840E+000, -1.02938E-004
+-2.31940E+000, -1.03043E-004
+-2.32040E+000, -1.03225E-004
+-2.32140E+000, -1.03428E-004
+-2.32240E+000, -1.03647E-004
+-2.32340E+000, -1.03887E-004
+-2.32440E+000, -1.04191E-004
+-2.32540E+000, -1.04461E-004
+-2.32640E+000, -1.04831E-004
+-2.32739E+000, -1.05149E-004
+-2.32840E+000, -1.05650E-004
+-2.32940E+000, -1.06047E-004
+-2.33040E+000, -1.06222E-004
+-2.33141E+000, -1.06523E-004
+-2.33241E+000, -1.06843E-004
+-2.33340E+000, -1.07052E-004
+-2.33440E+000, -1.07152E-004
+-2.33540E+000, -1.07290E-004
+-2.33640E+000, -1.07598E-004
+-2.33741E+000, -1.07905E-004
+-2.33840E+000, -1.08013E-004
+-2.33940E+000, -1.08195E-004
+-2.34040E+000, -1.08488E-004
+-2.34140E+000, -1.08871E-004
+-2.34240E+000, -1.09190E-004
+-2.34340E+000, -1.09163E-004
+-2.34440E+000, -1.09366E-004
+-2.34540E+000, -1.09561E-004
+-2.34640E+000, -1.09771E-004
+-2.34740E+000, -1.10003E-004
+-2.34840E+000, -1.10245E-004
+-2.34940E+000, -1.10461E-004
+-2.35040E+000, -1.10668E-004
+-2.35140E+000, -1.10829E-004
+-2.35240E+000, -1.10925E-004
+-2.35341E+000, -1.11023E-004
+-2.35441E+000, -1.11278E-004
+-2.35541E+000, -1.11510E-004
+-2.35641E+000, -1.11699E-004
+-2.35741E+000, -1.11886E-004
+-2.35840E+000, -1.12066E-004
+-2.35940E+000, -1.12398E-004
+-2.36041E+000, -1.12726E-004
+-2.36140E+000, -1.13069E-004
+-2.36240E+000, -1.13339E-004
+-2.36340E+000, -1.13559E-004
+-2.36441E+000, -1.13884E-004
+-2.36540E+000, -1.14129E-004
+-2.36640E+000, -1.14300E-004
+-2.36741E+000, -1.14450E-004
+-2.36840E+000, -1.14731E-004
+-2.36941E+000, -1.14821E-004
+-2.37041E+000, -1.15246E-004
+-2.37141E+000, -1.15390E-004
+-2.37241E+000, -1.15470E-004
+-2.37341E+000, -1.15696E-004
+-2.37441E+000, -1.15871E-004
+-2.37541E+000, -1.16456E-004
+-2.37641E+000, -1.16836E-004
+-2.37741E+000, -1.17137E-004
+-2.37841E+000, -1.17532E-004
+-2.37941E+000, -1.17753E-004
+-2.38041E+000, -1.18002E-004
+-2.38141E+000, -1.18072E-004
+-2.38241E+000, -1.18101E-004
+-2.38341E+000, -1.18287E-004
+-2.38441E+000, -1.18476E-004
+-2.38541E+000, -1.18615E-004
+-2.38641E+000, -1.18813E-004
+-2.38741E+000, -1.18942E-004
+-2.38842E+000, -1.19143E-004
+-2.38942E+000, -1.19295E-004
+-2.39041E+000, -1.19476E-004
+-2.39141E+000, -1.19665E-004
+-2.39241E+000, -1.19892E-004
+-2.39342E+000, -1.20055E-004
+-2.39441E+000, -1.20272E-004
+-2.39541E+000, -1.20564E-004
+-2.39641E+000, -1.20756E-004
+-2.39741E+000, -1.20974E-004
+-2.39842E+000, -1.21202E-004
+-2.39941E+000, -1.21441E-004
+-2.40041E+000, -1.21708E-004
+
+
+##END=
+
+
+`;
+
+export default lsvJcamp;
diff --git a/src/components/cmd_bar/r01_layout.js b/src/components/cmd_bar/r01_layout.js
index 4eb76341..ad85678f 100644
--- a/src/components/cmd_bar/r01_layout.js
+++ b/src/components/cmd_bar/r01_layout.js
@@ -163,6 +163,9 @@ const layoutSelect = (classes, layoutSt, updateLayoutAct) => {
+
diff --git a/src/components/d3_line/line_focus.js b/src/components/d3_line/line_focus.js
index b308e9d3..092b0e4e 100644
--- a/src/components/d3_line/line_focus.js
+++ b/src/components/d3_line/line_focus.js
@@ -304,7 +304,7 @@ class LineFocus {
sameXY, sameEpSt, sameDtPk, sameSfPk,
} = this.shouldUpdate;
- if (!Format.isCyclicVoltaLayout(this.layout)
+ if (!(Format.isCyclicVoltaLayout(this.layout) || Format.isLSVLayout(this.layout))
&& sameXY && sameEpSt && sameDtPk && sameSfPk) return;
// rescale for zoom
@@ -785,7 +785,7 @@ class LineFocus {
reverseXAxis(layoutSt) {
return [LIST_LAYOUT.UVVIS, LIST_LAYOUT.HPLC_UVVIS,
LIST_LAYOUT.TGA, LIST_LAYOUT.DSC,
- LIST_LAYOUT.XRD, LIST_LAYOUT.CYCLIC_VOLTAMMETRY,
+ LIST_LAYOUT.XRD, LIST_LAYOUT.CYCLIC_VOLTAMMETRY, LIST_LAYOUT.LSV,
LIST_LAYOUT.CDS, LIST_LAYOUT.DLS_ACF, LIST_LAYOUT.SEC, LIST_LAYOUT.GC,
LIST_LAYOUT.EMISSIONS, LIST_LAYOUT.DLS_INTENSITY].indexOf(layoutSt) < 0;
}
diff --git a/src/components/d3_multi/multi_focus.js b/src/components/d3_multi/multi_focus.js
index 21c572e6..563ccb1b 100644
--- a/src/components/d3_multi/multi_focus.js
+++ b/src/components/d3_multi/multi_focus.js
@@ -289,7 +289,7 @@ class MultiFocus {
event.stopPropagation();
event.preventDefault();
const onPeak = true;
- if (this.layout === LIST_LAYOUT.CYCLIC_VOLTAMMETRY) {
+ if (this.layout === LIST_LAYOUT.CYCLIC_VOLTAMMETRY || this.layout === LIST_LAYOUT.LSV) {
const { spectraList } = this.cyclicvoltaSt;
const spectra = spectraList[this.jcampIdx];
const voltammetryPeakIdx = spectra.selectedIdx;
@@ -397,7 +397,7 @@ class MultiFocus {
sameXY, sameEpSt, sameDtPk, sameSfPk,
} = this.shouldUpdate;
- if (!Format.isCyclicVoltaLayout(this.layout)
+ if (!(Format.isCyclicVoltaLayout(this.layout) || Format.isLSVLayout(this.layout))
&& sameXY && sameEpSt && sameDtPk && sameSfPk) return;
// rescale for zoom
@@ -512,7 +512,7 @@ class MultiFocus {
sameXY, sameEpSt, sameDtPk, sameSfPk,
} = this.shouldUpdate;
- if (!Format.isCyclicVoltaLayout(this.layout) && sameXY
+ if (!(Format.isCyclicVoltaLayout(this.layout) || Format.isLSVLayout(this.layout)) && sameXY
&& sameEpSt && sameDtPk && sameSfPk) return;
// rescale for zoom
@@ -1003,7 +1003,7 @@ class MultiFocus {
reverseXAxis(layoutSt) {
return [LIST_LAYOUT.UVVIS, LIST_LAYOUT.HPLC_UVVIS,
LIST_LAYOUT.TGA, LIST_LAYOUT.DSC,
- LIST_LAYOUT.XRD, LIST_LAYOUT.CYCLIC_VOLTAMMETRY,
+ LIST_LAYOUT.XRD, LIST_LAYOUT.CYCLIC_VOLTAMMETRY, LIST_LAYOUT.LSV,
LIST_LAYOUT.CDS, LIST_LAYOUT.SEC, LIST_LAYOUT.GC, LIST_LAYOUT.AIF].indexOf(layoutSt) < 0;
}
diff --git a/src/components/multi_jcamps_viewer.js b/src/components/multi_jcamps_viewer.js
index ccff9b7a..9f798bce 100644
--- a/src/components/multi_jcamps_viewer.js
+++ b/src/components/multi_jcamps_viewer.js
@@ -34,7 +34,7 @@ const styles = () => ({
});
const seperatingSubLayout = (entities, featureCondition, layoutSt) => {
- if (layoutSt === LIST_LAYOUT.CYCLIC_VOLTAMMETRY) {
+ if (layoutSt === LIST_LAYOUT.CYCLIC_VOLTAMMETRY || layoutSt === LIST_LAYOUT.LSV) {
return null;
}
const storedDict = {};
diff --git a/src/constants/list_axes.js b/src/constants/list_axes.js
index 8f328476..a8e17ec0 100644
--- a/src/constants/list_axes.js
+++ b/src/constants/list_axes.js
@@ -2,10 +2,12 @@ import { LIST_LAYOUT } from './list_layout';
const optionsAxisX = {
[LIST_LAYOUT.CYCLIC_VOLTAMMETRY]: ['', 'Voltage in V', 'Voltage vs Ref in V', 'Potential in V', 'Potential vs Ref in V'],
+ [LIST_LAYOUT.LSV]: ['', 'Voltage in V', 'Voltage vs Ref in V', 'Potential in V', 'Potential vs Ref in V'],
};
const optionsAxisY = {
[LIST_LAYOUT.CYCLIC_VOLTAMMETRY]: ['', 'Current in A', 'Current in mA'],
+ [LIST_LAYOUT.LSV]: ['', 'Current in A', 'Current in mA'],
};
const LIST_AXES = {
diff --git a/src/constants/list_layout.js b/src/constants/list_layout.js
index 0e73fda2..a5a43731 100644
--- a/src/constants/list_layout.js
+++ b/src/constants/list_layout.js
@@ -13,6 +13,7 @@ const LIST_LAYOUT = {
TGA: 'THERMOGRAVIMETRIC ANALYSIS',
XRD: 'X-RAY DIFFRACTION',
HPLC_UVVIS: 'HPLC UV/VIS',
+ LSV: 'LINEAR SWEEP VOLTAMMETRY',
CYCLIC_VOLTAMMETRY: 'CYCLIC VOLTAMMETRY',
CDS: 'CIRCULAR DICHROISM SPECTROSCOPY',
SEC: 'SIZE EXCLUSION CHROMATOGRAPHY',
diff --git a/src/helpers/cfg.js b/src/helpers/cfg.js
index c7c08c7d..717a2666 100644
--- a/src/helpers/cfg.js
+++ b/src/helpers/cfg.js
@@ -12,6 +12,7 @@ const btnCmdAnaViewer = (layoutSt) => (
|| Format.is31PLayout(layoutSt)
|| Format.is15NLayout(layoutSt)
|| Format.is29SiLayout(layoutSt)
+ || Format.isLSVLayout(layoutSt)
|| Format.isCyclicVoltaLayout(layoutSt)
|| Format.isCDSLayout(layoutSt)
|| Format.isSECLayout(layoutSt)
@@ -56,9 +57,11 @@ const hidePanelCompare = (layoutSt) => !(Format.isIrLayout(layoutSt) || Format.i
const hideSolvent = (layoutSt) => !Format.isNmrLayout(layoutSt);
-const showTwoThreshold = (layoutSt) => Format.isCyclicVoltaLayout(layoutSt);
+const showTwoThreshold = (layoutSt) => (Format.isCyclicVoltaLayout(layoutSt)
+ || Format.isLSVLayout(layoutSt));
-const hidePanelCyclicVolta = (layoutSt) => !Format.isCyclicVoltaLayout(layoutSt);
+const hidePanelCyclicVolta = (layoutSt) => !(Format.isCyclicVoltaLayout(layoutSt)
+ || Format.isLSVLayout(layoutSt));
const Config = {
btnCmdAnaViewer,
diff --git a/src/helpers/chem.js b/src/helpers/chem.js
index 00dff641..ed068096 100644
--- a/src/helpers/chem.js
+++ b/src/helpers/chem.js
@@ -34,7 +34,7 @@ const getShiftOffset = (state, _) => { // eslint-disable-line
curve, layout, cyclicvolta,
} = state;
const { curveIdx } = curve;
- if (layout === LIST_LAYOUT.CYCLIC_VOLTAMMETRY && cyclicvolta) {
+ if ((layout === LIST_LAYOUT.CYCLIC_VOLTAMMETRY || layout === LIST_LAYOUT.LSV) && cyclicvolta) {
return GetCyclicVoltaShiftOffset(cyclicvolta, curveIdx);
}
@@ -152,7 +152,7 @@ const Convert2Peak = (feature, threshold, offset, upThreshold = false, lowThresh
const { layout } = operation;
// if (!Format.isSECLayout(layout) && (upperThres || lowerThres)) {
- if ((Format.isCyclicVoltaLayout(layout) || Format.isCDSLayout(layout))
+ if ((Format.isCyclicVoltaLayout(layout) || Format.isLSVLayout(layout) || Format.isCDSLayout(layout))
&& (upperThres || lowerThres)) {
let upperThresVal = upThreshold || upperThres;
if (!upperThresVal) {
@@ -204,7 +204,7 @@ const Convert2MaxMinPeak = (layout, feature, offset) => { // eslint-disable-lin
const peaks = {
max: [], min: [], pecker: [], refIndex: -1,
};
- if (!Format.isCyclicVoltaLayout(layout) || !feature || !feature.data) return null; // eslint-disable-line
+ if (!(Format.isCyclicVoltaLayout(layout) || Format.isLSVLayout(layout)) || !feature || !feature.data) return null; // eslint-disable-line
// const data = feature.data[0]; // eslint-disable-line
const {
volammetryData,
@@ -288,7 +288,6 @@ const ToShiftPeaks = createSelector(
// - - - - - - - - - - - - - - - - - - - - - -
const readLayout = (jcamp) => {
const { xType, spectra } = jcamp;
- if (xType && Format.isNmrLayout(xType)) return xType;
const { dataType } = spectra[0];
if (dataType) {
if (dataType.includes('INFRARED SPECTRUM')) {
@@ -318,6 +317,9 @@ const readLayout = (jcamp) => {
if (dataType.includes('CYCLIC VOLTAMMETRY')) {
return LIST_LAYOUT.CYCLIC_VOLTAMMETRY;
}
+ if (dataType.includes('LINEAR SWEEP VOLTAMMETRY')) {
+ return LIST_LAYOUT.LSV;
+ }
if (dataType.includes('CIRCULAR DICHROISM SPECTROSCOPY')) {
return LIST_LAYOUT.CDS;
}
@@ -340,6 +342,7 @@ const readLayout = (jcamp) => {
return LIST_LAYOUT.DLS_INTENSITY;
}
}
+ if (xType && Format.isNmrLayout(xType)) return xType;
return false;
};
@@ -802,7 +805,7 @@ const ExtractJcamp = (source) => {
return {
spectra, features, layout, temperature,
};
- } else if (Format.isCyclicVoltaLayout(layout) || Format.isSECLayout(layout)
+ } else if (Format.isCyclicVoltaLayout(layout) || Format.isLSVLayout(layout) || Format.isSECLayout(layout)
|| Format.isAIFLayout(layout) || Format.isCDSLayout(layout) || Format.isGCLayout(layout)) {
features = extrFeaturesCylicVolta(jcamp, layout, peakUp);
} else {
diff --git a/src/helpers/format.js b/src/helpers/format.js
index ca6efb9f..e95dabe2 100644
--- a/src/helpers/format.js
+++ b/src/helpers/format.js
@@ -28,6 +28,7 @@ const spectraDigit = (layout) => {
case LIST_LAYOUT.N15:
case LIST_LAYOUT.Si29:
case LIST_LAYOUT.PLAIN:
+ case LIST_LAYOUT.LSV:
case LIST_LAYOUT.CYCLIC_VOLTAMMETRY:
default:
return 2;
@@ -71,6 +72,7 @@ const spectraOps = {
[LIST_LAYOUT.DSC]: { head: 'DIFFERENTIAL SCANNING CALORIMETRY', tail: ' SECONDS' },
[LIST_LAYOUT.MS]: { head: 'MASS', tail: ' m/z' },
[LIST_LAYOUT.XRD]: { head: 'XRD', tail: '.' },
+ [LIST_LAYOUT.LSV]: { head: 'LSV', tail: '.' },
[LIST_LAYOUT.CYCLIC_VOLTAMMETRY]: { head: 'CV', tail: '.' },
[LIST_LAYOUT.CDS]: { head: 'CIRCULAR DICHROISM SPECTROSCOPY', tail: '.' },
[LIST_LAYOUT.SEC]: { head: 'SIZE EXCLUSION CHROMATOGRAPHY', tail: '.' },
@@ -335,6 +337,7 @@ const peaksBody = ({
|| layout === LIST_LAYOUT.TGA
|| layout === LIST_LAYOUT.DSC
|| layout === LIST_LAYOUT.CYCLIC_VOLTAMMETRY
+ || layout === LIST_LAYOUT.LSV
|| layout === LIST_LAYOUT.CDS
|| layout === LIST_LAYOUT.SEC
|| layout === LIST_LAYOUT.GC) {
@@ -380,6 +383,7 @@ const isHplcUvVisLayout = (layoutSt) => (LIST_LAYOUT.HPLC_UVVIS === layoutSt);
const isTGALayout = (layoutSt) => (LIST_LAYOUT.TGA === layoutSt);
const isDSCLayout = (layoutSt) => (LIST_LAYOUT.DSC === layoutSt);
const isXRDLayout = (layoutSt) => (LIST_LAYOUT.XRD === layoutSt);
+const isLSVLayout = (layoutSt) => (LIST_LAYOUT.LSV === layoutSt);
const isCyclicVoltaLayout = (layoutSt) => (LIST_LAYOUT.CYCLIC_VOLTAMMETRY === layoutSt);
const isCDSLayout = (layoutSt) => (LIST_LAYOUT.CDS === layoutSt);
const isSECLayout = (layoutSt) => (LIST_LAYOUT.SEC === layoutSt);
@@ -390,7 +394,11 @@ const isEmWaveLayout = (layoutSt) => (
);
const hasMultiCurves = (layoutSt) => (
[
- LIST_LAYOUT.CYCLIC_VOLTAMMETRY, LIST_LAYOUT.SEC, LIST_LAYOUT.GC, LIST_LAYOUT.AIF,
+ LIST_LAYOUT.CYCLIC_VOLTAMMETRY,
+ LIST_LAYOUT.LSV,
+ LIST_LAYOUT.SEC,
+ LIST_LAYOUT.GC,
+ LIST_LAYOUT.AIF,
].indexOf(layoutSt) >= 0
);
const isAIFLayout = (layoutSt) => (LIST_LAYOUT.AIF === layoutSt);
@@ -556,6 +564,7 @@ const Format = {
isTGALayout,
isDSCLayout,
isXRDLayout,
+ isLSVLayout,
isCyclicVoltaLayout,
isCDSLayout,
isSECLayout,
diff --git a/src/index.js b/src/index.js
index d6a127b7..55ef8f16 100644
--- a/src/index.js
+++ b/src/index.js
@@ -36,6 +36,7 @@ import xrdJcamp2 from './__tests__/fixtures/xrd_jcamp_2';
import cyclicVoltaJcamp1 from './__tests__/fixtures/cyclic_voltammetry_1';
import cyclicVoltaJcamp2 from './__tests__/fixtures/cyclic_voltammetry_2';
import cyclicVoltaJcamp3 from './__tests__/fixtures/cyclic_voltammetry_3';
+import lsvJcamp from './__tests__/fixtures/lsv_jcamp';
import cdsJcamp from './__tests__/fixtures/cds_jcamp';
import secJcamp1 from './__tests__/fixtures/sec_1_jcamp';
import secJcamp2 from './__tests__/fixtures/sec_2_jcamp';
@@ -76,6 +77,7 @@ const xrdEntity2 = FN.ExtractJcamp(xrdJcamp2);
const cyclicVoltaEntity1 = FN.ExtractJcamp(cyclicVoltaJcamp1);
const cyclicVoltaEntity2 = FN.ExtractJcamp(cyclicVoltaJcamp2);
const cyclicVoltaEntity3 = FN.ExtractJcamp(cyclicVoltaJcamp3);
+const lsvEntity = FN.ExtractJcamp(lsvJcamp);
const cdsEntity = FN.ExtractJcamp(cdsJcamp);
const secEntity1 = FN.ExtractJcamp(secJcamp1);
const secEntity2 = FN.ExtractJcamp(secJcamp2);
@@ -172,6 +174,8 @@ class DemoWriteIr extends React.Component {
return xrdEntity1;
case 'cyclic volta':
return cyclicVoltaEntity2;
+ case 'lsv':
+ return lsvEntity;
case 'cds':
return cdsEntity;
case 'sec':
@@ -473,7 +477,7 @@ class DemoWriteIr extends React.Component {
predictions,
}
- const molSvg = ['nmr 1h', 'ir', 'cyclic volta'].indexOf(typ) >= 0 ? Phenylalanin.path : '';
+ const molSvg = ['nmr 1h', 'ir', 'cyclic volta', 'lsv'].indexOf(typ) >= 0 ? Phenylalanin.path : '';
const others = this.loadOthers();
return (
@@ -590,6 +594,14 @@ class DemoWriteIr extends React.Component {
>
CV
+