diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index d99745fb..546084e6 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -3,7 +3,7 @@ name: Testing on: push jobs: - build: + testing: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 diff --git a/dist/components/cmd_bar/01_viewer.js b/dist/components/cmd_bar/01_viewer.js index 20b543d5..ed017099 100644 --- a/dist/components/cmd_bar/01_viewer.js +++ b/dist/components/cmd_bar/01_viewer.js @@ -10,10 +10,10 @@ var _reactRedux = require("react-redux"); var _redux = require("redux"); var _classnames = _interopRequireDefault(require("classnames")); var _propTypes = _interopRequireDefault(require("prop-types")); -var _styles = require("@material-ui/core/styles"); -var _SpellcheckOutlined = _interopRequireDefault(require("@material-ui/icons/SpellcheckOutlined")); -var _TimelineOutlined = _interopRequireDefault(require("@material-ui/icons/TimelineOutlined")); -var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip")); +var _withStyles = _interopRequireDefault(require("@mui/styles/withStyles")); +var _SpellcheckOutlined = _interopRequireDefault(require("@mui/icons-material/SpellcheckOutlined")); +var _TimelineOutlined = _interopRequireDefault(require("@mui/icons-material/TimelineOutlined")); +var _Tooltip = _interopRequireDefault(require("@mui/material/Tooltip")); var _ui = require("../../actions/ui"); var _cfg = _interopRequireDefault(require("../../helpers/cfg")); var _common = require("./common"); @@ -33,7 +33,8 @@ const Viewer = _ref => { 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", { - className: classes.group + className: classes.group, + "data-testid": "Viewer" }, /*#__PURE__*/_react.default.createElement(_Tooltip.default, { title: /*#__PURE__*/_react.default.createElement("span", { className: "txt-sv-tp" @@ -74,5 +75,4 @@ Viewer.propTypes = { disableCmdAnaViewerSt: _propTypes.default.bool.isRequired, setUiViewerTypeAct: _propTypes.default.func.isRequired }; -var _default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(Viewer); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _withStyles.default)(styles))(Viewer); \ No newline at end of file diff --git a/dist/components/cmd_bar/02_zoom.js b/dist/components/cmd_bar/02_zoom.js index b6dbf491..f615d3b3 100644 --- a/dist/components/cmd_bar/02_zoom.js +++ b/dist/components/cmd_bar/02_zoom.js @@ -10,10 +10,10 @@ var _reactRedux = require("react-redux"); var _redux = require("redux"); var _classnames = _interopRequireDefault(require("classnames")); var _propTypes = _interopRequireDefault(require("prop-types")); -var _styles = require("@material-ui/core/styles"); -var _ZoomInOutlined = _interopRequireDefault(require("@material-ui/icons/ZoomInOutlined")); -var _FindReplaceOutlined = _interopRequireDefault(require("@material-ui/icons/FindReplaceOutlined")); -var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip")); +var _withStyles = _interopRequireDefault(require("@mui/styles/withStyles")); +var _ZoomInOutlined = _interopRequireDefault(require("@mui/icons-material/ZoomInOutlined")); +var _FindReplaceOutlined = _interopRequireDefault(require("@mui/icons-material/FindReplaceOutlined")); +var _Tooltip = _interopRequireDefault(require("@mui/material/Tooltip")); var _ui = require("../../actions/ui"); var _common = require("./common"); var _list_ui = require("../../constants/list_ui"); @@ -29,7 +29,8 @@ const Zoom = _ref => { 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", { - className: classes.group + className: classes.group, + "data-testid": "Zoom" }, /*#__PURE__*/_react.default.createElement(_Tooltip.default, { title: /*#__PURE__*/_react.default.createElement("span", { className: "txt-sv-tp" @@ -63,5 +64,4 @@ Zoom.propTypes = { isfocusZoomSt: _propTypes.default.bool.isRequired, setUiSweepTypeAct: _propTypes.default.func.isRequired }; -var _default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(Zoom); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _withStyles.default)(styles))(Zoom); \ No newline at end of file diff --git a/dist/components/cmd_bar/03_peak.js b/dist/components/cmd_bar/03_peak.js index 34b31860..82282e13 100644 --- a/dist/components/cmd_bar/03_peak.js +++ b/dist/components/cmd_bar/03_peak.js @@ -10,9 +10,9 @@ var _reactRedux = require("react-redux"); var _redux = require("redux"); var _classnames = _interopRequireDefault(require("classnames")); var _propTypes = _interopRequireDefault(require("prop-types")); -var _styles = require("@material-ui/core/styles"); -var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip")); -var _AddLocationOutlined = _interopRequireDefault(require("@material-ui/icons/AddLocationOutlined")); +var _withStyles = _interopRequireDefault(require("@mui/styles/withStyles")); +var _Tooltip = _interopRequireDefault(require("@mui/material/Tooltip")); +var _AddLocationOutlined = _interopRequireDefault(require("@mui/icons-material/AddLocationOutlined")); var _ui = require("../../actions/ui"); var _cfg = _interopRequireDefault(require("../../helpers/cfg")); var _common = require("./common"); @@ -124,5 +124,4 @@ Peak.propTypes = { cyclicVotaSt: _propTypes.default.object.isRequired, curveSt: _propTypes.default.object.isRequired }; -var _default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(Peak); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _withStyles.default)(styles))(Peak); \ No newline at end of file diff --git a/dist/components/cmd_bar/04_integration.js b/dist/components/cmd_bar/04_integration.js index 29c709ac..cffbb7cd 100644 --- a/dist/components/cmd_bar/04_integration.js +++ b/dist/components/cmd_bar/04_integration.js @@ -10,9 +10,9 @@ var _reactRedux = require("react-redux"); var _redux = require("redux"); var _classnames = _interopRequireDefault(require("classnames")); var _propTypes = _interopRequireDefault(require("prop-types")); -var _styles = require("@material-ui/core/styles"); -var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip")); -var _TextField = _interopRequireDefault(require("@material-ui/core/TextField")); +var _withStyles = _interopRequireDefault(require("@mui/styles/withStyles")); +var _Tooltip = _interopRequireDefault(require("@mui/material/Tooltip")); +var _TextField = _interopRequireDefault(require("@mui/material/TextField")); var _react2 = _interopRequireDefault(require("@mdi/react")); var _js = require("@mdi/js"); var _integration = require("../../actions/integration"); @@ -185,5 +185,4 @@ Integration.propTypes = { curveSt: _propTypes.default.object.isRequired, integrationSt: _propTypes.default.object.isRequired }; -var _default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(Integration)); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _withStyles.default)(styles)(Integration)); \ No newline at end of file diff --git a/dist/components/cmd_bar/05_multiplicity.js b/dist/components/cmd_bar/05_multiplicity.js index e83723db..db7d92e7 100644 --- a/dist/components/cmd_bar/05_multiplicity.js +++ b/dist/components/cmd_bar/05_multiplicity.js @@ -10,8 +10,8 @@ var _reactRedux = require("react-redux"); var _redux = require("redux"); var _classnames = _interopRequireDefault(require("classnames")); var _propTypes = _interopRequireDefault(require("prop-types")); -var _styles = require("@material-ui/core/styles"); -var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip")); +var _withStyles = _interopRequireDefault(require("@mui/styles/withStyles")); +var _Tooltip = _interopRequireDefault(require("@mui/material/Tooltip")); var _ui = require("../../actions/ui"); var _multiplicity = require("../../actions/multiplicity"); var _list_ui = require("../../constants/list_ui"); @@ -130,5 +130,4 @@ Multiplicity.propTypes = { clearMpyAllAct: _propTypes.default.func.isRequired, curveSt: _propTypes.default.object.isRequired }; -var _default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(Multiplicity)); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _withStyles.default)(styles)(Multiplicity)); \ No newline at end of file diff --git a/dist/components/cmd_bar/06_undo_redo.js b/dist/components/cmd_bar/06_undo_redo.js index 617e4d59..34bf0720 100644 --- a/dist/components/cmd_bar/06_undo_redo.js +++ b/dist/components/cmd_bar/06_undo_redo.js @@ -11,10 +11,10 @@ var _redux = require("redux"); var _propTypes = _interopRequireDefault(require("prop-types")); var _classnames = _interopRequireDefault(require("classnames")); var _reduxUndo = require("redux-undo"); -var _styles = require("@material-ui/core/styles"); -var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip")); -var _RedoOutlined = _interopRequireDefault(require("@material-ui/icons/RedoOutlined")); -var _UndoOutlined = _interopRequireDefault(require("@material-ui/icons/UndoOutlined")); +var _withStyles = _interopRequireDefault(require("@mui/styles/withStyles")); +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"); /* eslint-disable prefer-object-spread, function-paren-newline, react/function-component-definition, react/require-default-props, max-len, @@ -72,5 +72,4 @@ UndoRedo.propTypes = { onUndoAct: _propTypes.default.func.isRequired, onRedoAct: _propTypes.default.func.isRequired }; -var _default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(UndoRedo); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _withStyles.default)(styles))(UndoRedo); \ No newline at end of file diff --git a/dist/components/cmd_bar/07_pecker.js b/dist/components/cmd_bar/07_pecker.js index 13539272..b2d3618a 100644 --- a/dist/components/cmd_bar/07_pecker.js +++ b/dist/components/cmd_bar/07_pecker.js @@ -10,8 +10,8 @@ var _reactRedux = require("react-redux"); var _redux = require("redux"); var _classnames = _interopRequireDefault(require("classnames")); var _propTypes = _interopRequireDefault(require("prop-types")); -var _styles = require("@material-ui/core/styles"); -var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip")); +var _withStyles = _interopRequireDefault(require("@mui/styles/withStyles")); +var _Tooltip = _interopRequireDefault(require("@mui/material/Tooltip")); var _ui = require("../../actions/ui"); var _common = require("./common"); var _list_ui = require("../../constants/list_ui"); @@ -72,5 +72,4 @@ Pecker.propTypes = { cyclicVotaSt: _propTypes.default.object.isRequired, jcampIdx: _propTypes.default.any }; -var _default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(Pecker); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _withStyles.default)(styles))(Pecker); \ No newline at end of file diff --git a/dist/components/cmd_bar/common.js b/dist/components/cmd_bar/common.js index 0ffb1a2f..eef469a3 100644 --- a/dist/components/cmd_bar/common.js +++ b/dist/components/cmd_bar/common.js @@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.focusStyle = exports.commonStyle = exports.MuButton = void 0; -var _styles = require("@material-ui/core/styles"); -var _Button = _interopRequireDefault(require("@material-ui/core/Button")); -const MuButton = (0, _styles.withStyles)({ +var _styles = require("@mui/styles"); +var _Button = _interopRequireDefault(require("@mui/material/Button")); +const MuButton = exports.MuButton = (0, _styles.withStyles)({ root: { border: '1px solid #ccc', borderRadius: 4, @@ -17,11 +17,11 @@ const MuButton = (0, _styles.withStyles)({ lineHeight: '20px', minWidth: 30, padding: 0, - width: 30 + width: 30, + color: 'black' } })(_Button.default); -exports.MuButton = MuButton; -const commonStyle = { +const commonStyle = exports.commonStyle = { card: { margin: '0 0 5px 52px', border: '1px solid white', @@ -96,7 +96,6 @@ const commonStyle = { transform: 'scale(0.75)' } }; -exports.commonStyle = commonStyle; const focusStyle = (criteria, cls) => criteria ? [cls.btnHt] : []; // eslint-disable-line diff --git a/dist/components/cmd_bar/index.js b/dist/components/cmd_bar/index.js index de7c16cf..04c0deb8 100644 --- a/dist/components/cmd_bar/index.js +++ b/dist/components/cmd_bar/index.js @@ -9,7 +9,7 @@ var _react = _interopRequireDefault(require("react")); var _reactRedux = require("react-redux"); var _redux = require("redux"); var _propTypes = _interopRequireDefault(require("prop-types")); -var _styles = require("@material-ui/core/styles"); +var _withStyles = _interopRequireDefault(require("@mui/styles/withStyles")); var _common = require("./common"); var _viewer = _interopRequireDefault(require("./01_viewer")); var _zoom = _interopRequireDefault(require("./02_zoom")); @@ -74,5 +74,4 @@ CmdBar.propTypes = { jcampIdx: _propTypes.default.any, hideThreshold: _propTypes.default.bool }; -var _default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(CmdBar); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _withStyles.default)(styles))(CmdBar); \ No newline at end of file diff --git a/dist/components/cmd_bar/r01_layout.js b/dist/components/cmd_bar/r01_layout.js index 21e59d38..8122e683 100644 --- a/dist/components/cmd_bar/r01_layout.js +++ b/dist/components/cmd_bar/r01_layout.js @@ -10,12 +10,8 @@ var _propTypes = _interopRequireDefault(require("prop-types")); var _classnames = _interopRequireDefault(require("classnames")); var _reactRedux = require("react-redux"); var _redux = require("redux"); -var _Select = _interopRequireDefault(require("@material-ui/core/Select")); -var _MenuItem = _interopRequireDefault(require("@material-ui/core/MenuItem")); -var _FormControl = _interopRequireDefault(require("@material-ui/core/FormControl")); -var _OutlinedInput = _interopRequireDefault(require("@material-ui/core/OutlinedInput")); -var _InputLabel = _interopRequireDefault(require("@material-ui/core/InputLabel")); -var _styles = require("@material-ui/core/styles"); +var _material = require("@mui/material"); +var _withStyles = _interopRequireDefault(require("@mui/styles/withStyles")); var _r02_scan = _interopRequireDefault(require("./r02_scan")); var _layout = require("../../actions/layout"); var _shift = require("../../actions/shift"); @@ -54,125 +50,128 @@ 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(_MenuItem.default, { + const content = listShift.map(ref => /*#__PURE__*/_react.default.createElement(_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(_FormControl.default, { + return /*#__PURE__*/_react.default.createElement(_material.FormControl, { className: (0, _classnames.default)(classes.fieldShift), variant: "outlined" - }, /*#__PURE__*/_react.default.createElement(_InputLabel.default, { + }, /*#__PURE__*/_react.default.createElement(_material.InputLabel, { + id: "select-solvent-label", className: (0, _classnames.default)(classes.selectLabel, 'select-sv-bar-label') - }, "Solvent"), /*#__PURE__*/_react.default.createElement(_Select.default, { + }, "Solvent"), /*#__PURE__*/_react.default.createElement(_material.Select, { value: shiftRef, + labelId: "select-solvent-label", + label: "Solvent", onChange: onChange, - input: /*#__PURE__*/_react.default.createElement(_OutlinedInput.default, { - className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-shift'), - labelWidth: 60 - }) + className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-shift') }, content)); }; const layoutSelect = (classes, layoutSt, updateLayoutAct) => { const onChange = e => updateLayoutAct(e.target.value); - return /*#__PURE__*/_react.default.createElement(_FormControl.default, { - className: (0, _classnames.default)(classes.fieldLayout), - variant: "outlined" - }, /*#__PURE__*/_react.default.createElement(_InputLabel.default, { + 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(_Select.default, { + }, "Layout"), /*#__PURE__*/_react.default.createElement(_material.Select, { + labelId: "select-layout-label", + label: "Layout", value: layoutSt, onChange: onChange, - input: /*#__PURE__*/_react.default.createElement(_OutlinedInput.default, { - className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-layout'), - labelWidth: 60 - }) - }, /*#__PURE__*/_react.default.createElement(_MenuItem.default, { + 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(_MenuItem.default, { + }, "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(_MenuItem.default, { + }, "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(_MenuItem.default, { + }, "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(_MenuItem.default, { + }, "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(_MenuItem.default, { + }, "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(_MenuItem.default, { + }, "TGA (THERMOGRAVIMETRIC ANALYSIS)")), /*#__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(_MenuItem.default, { + }, "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(_MenuItem.default, { + }, /*#__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(_MenuItem.default, { + }, /*#__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(_MenuItem.default, { + }, /*#__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(_MenuItem.default, { + }, /*#__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(_MenuItem.default, { + }, /*#__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(_MenuItem.default, { + }, /*#__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(_MenuItem.default, { + }, "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(_MenuItem.default, { + }, "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(_MenuItem.default, { + }, "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(_MenuItem.default, { + }, "SEC")), /*#__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') - }, "SOPTION-DESORPTION")), /*#__PURE__*/_react.default.createElement(_MenuItem.default, { + }, "SOPTION-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(_MenuItem.default, { + }, "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(_MenuItem.default, { + }, "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")))); + }, "DLS INTENSITY")), /*#__PURE__*/_react.default.createElement(_MenuItem.default, { + value: _list_layout.LIST_LAYOUT.MASS_CHROMATOGRAM + }, /*#__PURE__*/_react.default.createElement("span", { + className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout') + }, "MASS CHROMATOGRAM")))); }; const Layout = _ref => { let { @@ -213,5 +212,4 @@ Layout.propTypes = { curveSt: _propTypes.default.object.isRequired, shiftSt: _propTypes.default.object.isRequired }; -var _default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(Layout)); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _withStyles.default)(styles)(Layout)); \ No newline at end of file diff --git a/dist/components/cmd_bar/r02_scan.js b/dist/components/cmd_bar/r02_scan.js index 3f37f996..d30ce659 100644 --- a/dist/components/cmd_bar/r02_scan.js +++ b/dist/components/cmd_bar/r02_scan.js @@ -10,16 +10,11 @@ var _propTypes = _interopRequireDefault(require("prop-types")); var _classnames = _interopRequireDefault(require("classnames")); var _reactRedux = require("react-redux"); var _redux = require("redux"); -var _Select = _interopRequireDefault(require("@material-ui/core/Select")); -var _MenuItem = _interopRequireDefault(require("@material-ui/core/MenuItem")); -var _FormControl = _interopRequireDefault(require("@material-ui/core/FormControl")); -var _OutlinedInput = _interopRequireDefault(require("@material-ui/core/OutlinedInput")); -var _InputLabel = _interopRequireDefault(require("@material-ui/core/InputLabel")); -var _styles = require("@material-ui/core/styles"); -var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip")); -var _CloudDoneOutlined = _interopRequireDefault(require("@material-ui/icons/CloudDoneOutlined")); -var _HowToRegOutlined = _interopRequireDefault(require("@material-ui/icons/HowToRegOutlined")); -var _RefreshOutlined = _interopRequireDefault(require("@material-ui/icons/RefreshOutlined")); +var _material = require("@mui/material"); +var _styles = require("@mui/styles"); +var _CloudDoneOutlined = _interopRequireDefault(require("@mui/icons-material/CloudDoneOutlined")); +var _HowToRegOutlined = _interopRequireDefault(require("@mui/icons-material/HowToRegOutlined")); +var _RefreshOutlined = _interopRequireDefault(require("@mui/icons-material/RefreshOutlined")); var _scan = require("../../actions/scan"); var _common = require("./common"); /* eslint-disable prefer-object-spread, function-paren-newline, @@ -36,7 +31,7 @@ const restoreIcon = (classes, hasEdit, isEdit) => hasEdit && isEdit ? /*#__PURE_ 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(_Tooltip.default, { +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)) @@ -45,7 +40,7 @@ const btnRestore = (classes, hasEdit, isEdit, toggleEditAct) => /*#__PURE__*/_re disabled: !hasEdit, onClick: toggleEditAct }, restoreIcon(classes, hasEdit, isEdit))); -const btnRrfresh = (classes, disabled, refreshAct) => /*#__PURE__*/_react.default.createElement(_Tooltip.default, { +const btnRrfresh = (classes, disabled, refreshAct) => /*#__PURE__*/_react.default.createElement(_material.Tooltip, { title: /*#__PURE__*/_react.default.createElement("span", { className: "txt-sv-tp" }, "Refresh Scan") @@ -63,7 +58,7 @@ 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(_MenuItem.default, { + const content = range.map(num => /*#__PURE__*/_react.default.createElement(_material.MenuItem, { value: num, key: num }, /*#__PURE__*/_react.default.createElement("span", { @@ -71,18 +66,18 @@ const scanSelect = (classes, feature, layoutSt, scanSt, onChange) => { }, `scan ${num}`))); const defaultValue = scanSt.isAuto || !feature.scanEditTarget ? feature.scanAutoTarget : feature.scanEditTarget; const selValue = target || defaultValue || 1; - return /*#__PURE__*/_react.default.createElement(_FormControl.default, { + return /*#__PURE__*/_react.default.createElement(_material.FormControl, { className: (0, _classnames.default)(classes.fieldScan), variant: "outlined" - }, /*#__PURE__*/_react.default.createElement(_InputLabel.default, { + }, /*#__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(_Select.default, { + }, "Current Scan"), /*#__PURE__*/_react.default.createElement(_material.Select, { + labelId: "select-scan-label", + label: "Current Scan", value: selValue, onChange: onChange, - input: /*#__PURE__*/_react.default.createElement(_OutlinedInput.default, { - className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-scan'), - labelWidth: 90 - }) + className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-scan') }, content)); }; const Scan = _ref => { @@ -122,5 +117,4 @@ Scan.propTypes = { resetScanTargetAct: _propTypes.default.func.isRequired, toggleScanIsAutoAct: _propTypes.default.func.isRequired }; -var _default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(Scan); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(Scan); \ No newline at end of file diff --git a/dist/components/cmd_bar/r03_threshold.js b/dist/components/cmd_bar/r03_threshold.js index 1ad24f2d..cc5f6835 100644 --- a/dist/components/cmd_bar/r03_threshold.js +++ b/dist/components/cmd_bar/r03_threshold.js @@ -10,14 +10,11 @@ var _propTypes = _interopRequireDefault(require("prop-types")); var _classnames = _interopRequireDefault(require("classnames")); var _reactRedux = require("react-redux"); var _redux = require("redux"); -var _TextField = _interopRequireDefault(require("@material-ui/core/TextField")); -var _InputAdornment = _interopRequireDefault(require("@material-ui/core/InputAdornment")); -var _core = require("@material-ui/core"); -var _styles = require("@material-ui/core/styles"); -var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip")); -var _CloudDoneOutlined = _interopRequireDefault(require("@material-ui/icons/CloudDoneOutlined")); -var _HowToRegOutlined = _interopRequireDefault(require("@material-ui/icons/HowToRegOutlined")); -var _RefreshOutlined = _interopRequireDefault(require("@material-ui/icons/RefreshOutlined")); +var _material = require("@mui/material"); +var _styles = require("@mui/styles"); +var _CloudDoneOutlined = _interopRequireDefault(require("@mui/icons-material/CloudDoneOutlined")); +var _HowToRegOutlined = _interopRequireDefault(require("@mui/icons-material/HowToRegOutlined")); +var _RefreshOutlined = _interopRequireDefault(require("@mui/icons-material/RefreshOutlined")); var _cfg = _interopRequireDefault(require("../../helpers/cfg")); var _threshold = require("../../actions/threshold"); var _common = require("./common"); @@ -30,7 +27,7 @@ const styles = () => Object.assign({ }, txtIcon: {} }, _common.commonStyle); -const txtPercent = () => /*#__PURE__*/_react.default.createElement(_InputAdornment.default, { +const txtPercent = () => /*#__PURE__*/_react.default.createElement(_material.InputAdornment, { position: "end" }, /*#__PURE__*/_react.default.createElement("span", { className: "txt-percent" @@ -43,9 +40,9 @@ const setThreshold = (classes, thresVal, updateThresholdValueAct) => { updateThresholdValueAct(e.target.value); } }; - return /*#__PURE__*/_react.default.createElement(_core.FormControl, { + return /*#__PURE__*/_react.default.createElement(_material.FormControl, { variant: "outlined" - }, /*#__PURE__*/_react.default.createElement(_TextField.default, { + }, /*#__PURE__*/_react.default.createElement(_material.TextField, { className: classes.field, id: "outlined-name", placeholder: "N.A.", @@ -63,7 +60,7 @@ const setThreshold = (classes, thresVal, updateThresholdValueAct) => { onBlur: onBlur, onKeyPress: onEnterPress, variant: "outlined" - }), /*#__PURE__*/_react.default.createElement(_core.InputLabel, { + }), /*#__PURE__*/_react.default.createElement(_material.InputLabel, { className: (0, _classnames.default)(classes.txtLabelBottomInput) }, "Threshold")); }; @@ -88,7 +85,7 @@ const Threshold = _ref => { const thresVal = thresValSt || feature.thresRef; return /*#__PURE__*/_react.default.createElement("span", { className: classes.groupRight - }, setThreshold(classes, thresVal, updateThresholdValueAct), /*#__PURE__*/_react.default.createElement(_Tooltip.default, { + }, setThreshold(classes, thresVal, updateThresholdValueAct), /*#__PURE__*/_react.default.createElement(_material.Tooltip, { title: /*#__PURE__*/_react.default.createElement("span", { className: "txt-sv-tp" }, "Restore Threshold") @@ -98,7 +95,7 @@ const Threshold = _ref => { onClick: resetThresholdValueAct }, /*#__PURE__*/_react.default.createElement(_RefreshOutlined.default, { className: classes.icon - }))), hideThresSt ? null : /*#__PURE__*/_react.default.createElement(_Tooltip.default, { + }))), hideThresSt ? null : /*#__PURE__*/_react.default.createElement(_material.Tooltip, { title: /*#__PURE__*/_react.default.createElement("span", { className: "txt-sv-tp" }, restoreTp(hasEdit, isEditSt)) @@ -131,5 +128,4 @@ Threshold.propTypes = { resetThresholdValueAct: _propTypes.default.func.isRequired, toggleThresholdIsEditAct: _propTypes.default.func.isRequired }; -var _default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(Threshold)); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(Threshold)); \ No newline at end of file diff --git a/dist/components/cmd_bar/r04_submit.js b/dist/components/cmd_bar/r04_submit.js index 26b8353d..9c5f3702 100644 --- a/dist/components/cmd_bar/r04_submit.js +++ b/dist/components/cmd_bar/r04_submit.js @@ -10,12 +10,8 @@ var _propTypes = _interopRequireDefault(require("prop-types")); var _classnames = _interopRequireDefault(require("classnames")); var _reactRedux = require("react-redux"); var _redux = require("redux"); -var _Select = _interopRequireDefault(require("@material-ui/core/Select")); -var _MenuItem = _interopRequireDefault(require("@material-ui/core/MenuItem")); -var _FormControl = _interopRequireDefault(require("@material-ui/core/FormControl")); -var _OutlinedInput = _interopRequireDefault(require("@material-ui/core/OutlinedInput")); -var _InputLabel = _interopRequireDefault(require("@material-ui/core/InputLabel")); -var _styles = require("@material-ui/core/styles"); +var _material = require("@mui/material"); +var _styles = require("@mui/styles"); var _submit = require("../../actions/submit"); var _r05_submit_btn = _interopRequireDefault(require("./r05_submit_btn")); var _r06_predict_btn = _interopRequireDefault(require("./r06_predict_btn")); @@ -40,24 +36,24 @@ const styles = () => Object.assign({ }, _common.commonStyle); const ascendSelect = (classes, hideSwitch, isAscendSt, toggleIsAscendAct) => { if (hideSwitch) return null; - return /*#__PURE__*/_react.default.createElement(_FormControl.default, { + return /*#__PURE__*/_react.default.createElement(_material.FormControl, { className: (0, _classnames.default)(classes.fieldOrder), variant: "outlined" - }, /*#__PURE__*/_react.default.createElement(_InputLabel.default, { + }, /*#__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(_Select.default, { + }, "Write Peaks"), /*#__PURE__*/_react.default.createElement(_material.Select, { + labelId: "select-sort-peaks-label", + label: "Write Peaks", value: isAscendSt, onChange: toggleIsAscendAct, - input: /*#__PURE__*/_react.default.createElement(_OutlinedInput.default, { - className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-order'), - labelWidth: 90 - }) - }, /*#__PURE__*/_react.default.createElement(_MenuItem.default, { + 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(_MenuItem.default, { + }, "Ascend")), /*#__PURE__*/_react.default.createElement(_material.MenuItem, { value: false, key: "descend" }, /*#__PURE__*/_react.default.createElement("span", { @@ -66,24 +62,32 @@ const ascendSelect = (classes, hideSwitch, isAscendSt, toggleIsAscendAct) => { }; const intensitySelect = (classes, hideSwitch, isIntensitySt, toggleIsIntensityAct) => { if (hideSwitch) return null; - return /*#__PURE__*/_react.default.createElement(_FormControl.default, { + return /*#__PURE__*/_react.default.createElement(_material.FormControl, { className: (0, _classnames.default)(classes.fieldIntensity), variant: "outlined" - }, /*#__PURE__*/_react.default.createElement(_InputLabel.default, { + }, /*#__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(_Select.default, { + }, "Write Intensity"), /*#__PURE__*/_react.default.createElement(_material.Select, { + labelId: "select-intensity-label", + label: "Write Intensity", value: isIntensitySt, onChange: toggleIsIntensityAct, - input: /*#__PURE__*/_react.default.createElement(_OutlinedInput.default, { - className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-intensity'), - labelWidth: 100 - }) - }, /*#__PURE__*/_react.default.createElement(_MenuItem.default, { + 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(_MenuItem.default, { + }, "Show")), /*#__PURE__*/_react.default.createElement(_material.MenuItem, { value: false, key: "descend" }, /*#__PURE__*/_react.default.createElement("span", { @@ -93,46 +97,62 @@ const intensitySelect = (classes, hideSwitch, isIntensitySt, toggleIsIntensityAc 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(_MenuItem.default, { + const options = decimals.map(d => /*#__PURE__*/_react.default.createElement(_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(_FormControl.default, { + return /*#__PURE__*/_react.default.createElement(_material.FormControl, { className: (0, _classnames.default)(classes.fieldDecimal), variant: "outlined" - }, /*#__PURE__*/_react.default.createElement(_InputLabel.default, { + }, /*#__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(_Select.default, { + }, "Decimal"), /*#__PURE__*/_react.default.createElement(_material.Select, { + labelId: "select-decimal-label", + label: "Decimal", value: decimalSt, onChange: updateDecimalAct, - input: /*#__PURE__*/_react.default.createElement(_OutlinedInput.default, { - className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-decimal'), - labelWidth: 60 - }) + className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-decimal') + // input={ + // ( + // + // ) + // } }, options)); }; const operationSelect = (classes, operations, operation, onChangeSelect) => { - const options = operations.map(o => /*#__PURE__*/_react.default.createElement(_MenuItem.default, { + const options = operations.map(o => /*#__PURE__*/_react.default.createElement(_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))); const selectedValue = operation.name || operations[0].name; - return /*#__PURE__*/_react.default.createElement(_FormControl.default, { + return /*#__PURE__*/_react.default.createElement(_material.FormControl, { className: (0, _classnames.default)(classes.fieldOpertaion), variant: "outlined" - }, /*#__PURE__*/_react.default.createElement(_InputLabel.default, { + }, /*#__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(_Select.default, { + }, "Submit"), /*#__PURE__*/_react.default.createElement(_material.Select, { + labelId: "select-submit-label", + label: "Submit", value: selectedValue, onChange: onChangeSelect, - input: /*#__PURE__*/_react.default.createElement(_OutlinedInput.default, { - className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-operation'), - labelWidth: 50 - }) + className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-operation') + // input={ + // ( + // + // ) + // } }, options)); }; const selectOperation = (name, operations, updateOperationAct) => { @@ -211,5 +231,4 @@ Submit.propTypes = { updateOperationAct: _propTypes.default.func.isRequired, updateDecimalAct: _propTypes.default.func.isRequired }; -var _default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(Submit); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(Submit); \ No newline at end of file diff --git a/dist/components/cmd_bar/r05_submit_btn.js b/dist/components/cmd_bar/r05_submit_btn.js index 5254355a..cd02c6ff 100644 --- a/dist/components/cmd_bar/r05_submit_btn.js +++ b/dist/components/cmd_bar/r05_submit_btn.js @@ -10,9 +10,9 @@ var _propTypes = _interopRequireDefault(require("prop-types")); var _reactRedux = require("react-redux"); var _classnames = _interopRequireDefault(require("classnames")); var _redux = require("redux"); -var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip")); -var _PlayCircleOutline = _interopRequireDefault(require("@material-ui/icons/PlayCircleOutline")); -var _styles = require("@material-ui/core/styles"); +var _Tooltip = _interopRequireDefault(require("@mui/material/Tooltip")); +var _PlayCircleOutline = _interopRequireDefault(require("@mui/icons-material/PlayCircleOutline")); +var _styles = require("@mui/styles"); var _chem = require("../../helpers/chem"); var _common = require("./common"); var _extractPeaksEdit = require("../../helpers/extractPeaksEdit"); @@ -118,5 +118,4 @@ BtnSubmit.propTypes = { cyclicvoltaSt: _propTypes.default.object.isRequired, curveSt: _propTypes.default.object }; -var _default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(BtnSubmit); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(BtnSubmit); \ No newline at end of file diff --git a/dist/components/cmd_bar/r06_predict_btn.js b/dist/components/cmd_bar/r06_predict_btn.js index d2e129d7..9452dac3 100644 --- a/dist/components/cmd_bar/r06_predict_btn.js +++ b/dist/components/cmd_bar/r06_predict_btn.js @@ -10,11 +10,10 @@ var _propTypes = _interopRequireDefault(require("prop-types")); var _reactRedux = require("react-redux"); var _classnames = _interopRequireDefault(require("classnames")); var _redux = require("redux"); -var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip")); -var _GpsFixedOutlined = _interopRequireDefault(require("@material-ui/icons/GpsFixedOutlined")); -var _HelpOutlineOutlined = _interopRequireDefault(require("@material-ui/icons/HelpOutlineOutlined")); -var _Button = _interopRequireDefault(require("@material-ui/core/Button")); -var _styles = require("@material-ui/core/styles"); +var _material = require("@mui/material"); +var _GpsFixedOutlined = _interopRequireDefault(require("@mui/icons-material/GpsFixedOutlined")); +var _HelpOutlineOutlined = _interopRequireDefault(require("@mui/icons-material/HelpOutlineOutlined")); +var _styles = require("@mui/styles"); var _common = require("./common"); var _format = _interopRequireDefault(require("../../helpers/format")); var _carbonFeatures = require("../../helpers/carbonFeatures"); @@ -55,7 +54,7 @@ const MuPredictButton = (0, _styles.withStyles)({ lineHeight: '20px', padding: 0 } -})(_Button.default); +})(_material.Button); const onClickFail = (layoutSt, simuCount, realCount) => { const feature = _format.default.is13CLayout(layoutSt) ? 'peak' : 'multiplet'; return () => alert(`Selected ${feature} count (${realCount}) must be larger than 0, and must be eqal or less than simulated count (${simuCount}).`); // eslint-disable-line @@ -107,7 +106,7 @@ const onClicUnknown = (feature, forecast, peaksEdit, layoutSt, scan, shiftSt, th 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(_Tooltip.default, { +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", { @@ -122,7 +121,7 @@ const renderBtnPredict = (classes, isIr, realCount, uniqCount, simuCount, color, }, counterText(classes, isIr, realCount, uniqCount, simuCount), /*#__PURE__*/_react.default.createElement(_GpsFixedOutlined.default, { className: classes.icon }))); -const renderBtnUnknown = (classes, onClick) => /*#__PURE__*/_react.default.createElement(_Tooltip.default, { +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", { @@ -221,5 +220,4 @@ BtnPredict.propTypes = { setUiViewerTypeAct: _propTypes.default.func.isRequired, curveSt: _propTypes.default.object }; -var _default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(BtnPredict); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(BtnPredict); \ No newline at end of file diff --git a/dist/components/cmd_bar/r07_wavelength_btn.js b/dist/components/cmd_bar/r07_wavelength_btn.js index 9c1be6c4..07c69af3 100644 --- a/dist/components/cmd_bar/r07_wavelength_btn.js +++ b/dist/components/cmd_bar/r07_wavelength_btn.js @@ -10,8 +10,8 @@ var _propTypes = _interopRequireDefault(require("prop-types")); var _reactRedux = require("react-redux"); var _classnames = _interopRequireDefault(require("classnames")); var _redux = require("redux"); -var _core = require("@material-ui/core"); -var _styles = require("@material-ui/core/styles"); +var _material = require("@mui/material"); +var _withStyles = _interopRequireDefault(require("@mui/styles/withStyles")); var _wavelength = require("../../actions/wavelength"); var _format = _interopRequireDefault(require("../../helpers/format")); var _common = require("./common"); @@ -32,21 +32,21 @@ const wavelengthSelect = (classes, waveLengthSt, layoutSt, updateWaveLengthAct) return /*#__PURE__*/_react.default.createElement("i", null); } const onChange = e => updateWaveLengthAct(e.target.value); - return /*#__PURE__*/_react.default.createElement(_core.FormControl, { + return /*#__PURE__*/_react.default.createElement(_material.FormControl, { className: (0, _classnames.default)(classes.fieldLayout), variant: "outlined" - }, /*#__PURE__*/_react.default.createElement(_core.InputLabel, { + }, /*#__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(_core.Select, { + }, "Wavelength"), /*#__PURE__*/_react.default.createElement(_material.Select, { + labelId: "select-wavelength-label", + label: "Wavelength", value: waveLengthSt, onChange: onChange, - input: /*#__PURE__*/_react.default.createElement(_core.OutlinedInput, { - className: (0, _classnames.default)(classes.selectInput, 'input-sv-bar-layout'), - labelWidth: 60 - }) + 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(_core.MenuItem, { + return /*#__PURE__*/_react.default.createElement(_material.MenuItem, { value: item }, /*#__PURE__*/_react.default.createElement("span", { className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout') @@ -79,5 +79,4 @@ Wavelength.propTypes = { waveLengthSt: _propTypes.default.object.isRequired, updateWaveLengthAct: _propTypes.default.func.isRequired }; -var _default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(Wavelength)); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _withStyles.default)(styles)(Wavelength)); \ No newline at end of file diff --git a/dist/components/cmd_bar/tri_btn.js b/dist/components/cmd_bar/tri_btn.js index a7f4df00..de0424ac 100644 --- a/dist/components/cmd_bar/tri_btn.js +++ b/dist/components/cmd_bar/tri_btn.js @@ -10,8 +10,8 @@ var _reactRedux = require("react-redux"); var _redux = require("redux"); var _classnames = _interopRequireDefault(require("classnames")); var _propTypes = _interopRequireDefault(require("prop-types")); -var _styles = require("@material-ui/core/styles"); -var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip")); +var _styles = require("@mui/styles"); +var _Tooltip = _interopRequireDefault(require("@mui/material/Tooltip")); var _cfg = _interopRequireDefault(require("../../helpers/cfg")); var _common = require("./common"); /* eslint-disable prefer-object-spread */ @@ -114,5 +114,4 @@ TriBtn.propTypes = { cb: _propTypes.default.func.isRequired, children: _propTypes.default.node.isRequired }; -var _default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(TriBtn)); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(TriBtn)); \ No newline at end of file diff --git a/dist/components/common/chem.js b/dist/components/common/chem.js index 3e9eaea5..7a15e0be 100644 --- a/dist/components/common/chem.js +++ b/dist/components/common/chem.js @@ -112,5 +112,4 @@ const SmaToSvg = sma => { }; /* eslint-enable */ -var _default = SmaToSvg; -exports.default = _default; \ No newline at end of file +var _default = exports.default = SmaToSvg; \ No newline at end of file diff --git a/dist/components/d3_line/index.js b/dist/components/d3_line/index.js index 00f5f8e4..f199a8a7 100644 --- a/dist/components/d3_line/index.js +++ b/dist/components/d3_line/index.js @@ -198,5 +198,4 @@ ViewerLine.propTypes = { isHidden: _propTypes.default.bool.isRequired, wavelength: _propTypes.default.object.isRequired }; -var _default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(ViewerLine); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(ViewerLine); \ No newline at end of file diff --git a/dist/components/d3_line/line_focus.js b/dist/components/d3_line/line_focus.js index 90950214..e4edfadc 100644 --- a/dist/components/d3_line/line_focus.js +++ b/dist/components/d3_line/line_focus.js @@ -600,7 +600,7 @@ 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.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.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.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.EMISSIONS, _list_layout.LIST_LAYOUT.DLS_INTENSITY, _list_layout.LIST_LAYOUT.MASS_CHROMATOGRAM].indexOf(layoutSt) < 0; } create(_ref) { let { @@ -685,5 +685,4 @@ class LineFocus { this.resetShouldUpdate(editPeakSt, integationSt, mtplySt); } } -var _default = LineFocus; -exports.default = _default; \ No newline at end of file +var _default = exports.default = LineFocus; \ No newline at end of file diff --git a/dist/components/d3_multi/index.js b/dist/components/d3_multi/index.js index 6e75d0da..cd92a756 100644 --- a/dist/components/d3_multi/index.js +++ b/dist/components/d3_multi/index.js @@ -200,5 +200,4 @@ ViewerMulti.propTypes = { addCylicVoltaMinPeakAct: _propTypes.default.func.isRequired, cLabel: _propTypes.default.string }; -var _default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(ViewerMulti); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(ViewerMulti); \ No newline at end of file diff --git a/dist/components/d3_multi/multi_focus.js b/dist/components/d3_multi/multi_focus.js index e10c66c7..689058aa 100644 --- a/dist/components/d3_multi/multi_focus.js +++ b/dist/components/d3_multi/multi_focus.js @@ -835,5 +835,4 @@ class MultiFocus { this.resetShouldUpdate(editPeakSt); } } -var _default = MultiFocus; -exports.default = _default; \ No newline at end of file +var _default = exports.default = MultiFocus; \ No newline at end of file diff --git a/dist/components/d3_rect/index.js b/dist/components/d3_rect/index.js index 0bf8bc40..1cb94605 100644 --- a/dist/components/d3_rect/index.js +++ b/dist/components/d3_rect/index.js @@ -148,5 +148,4 @@ ViewerRect.propTypes = { scrollUiWheelAct: _propTypes.default.func.isRequired, isHidden: _propTypes.default.bool.isRequired }; -var _default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(ViewerRect); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(ViewerRect); \ No newline at end of file diff --git a/dist/components/d3_rect/rect_focus.js b/dist/components/d3_rect/rect_focus.js index 91e0d64c..a0f74dab 100644 --- a/dist/components/d3_rect/rect_focus.js +++ b/dist/components/d3_rect/rect_focus.js @@ -224,5 +224,4 @@ class RectFocus { (0, _brush.default)(this, isUiAddIntgSt, isUiNoBrushSt); } } -var _default = RectFocus; -exports.default = _default; \ No newline at end of file +var _default = exports.default = RectFocus; \ No newline at end of file diff --git a/dist/components/forecast/comps.js b/dist/components/forecast/comps.js index 2870c56c..eb711478 100644 --- a/dist/components/forecast/comps.js +++ b/dist/components/forecast/comps.js @@ -8,16 +8,13 @@ exports.sectionSvg = exports.sectionInput = exports.notToRenderAnalysis = export var _react = _interopRequireDefault(require("react")); var _classnames = _interopRequireDefault(require("classnames")); var _reactSvgFileZoomPan = _interopRequireDefault(require("@complat/react-svg-file-zoom-pan")); -var _CheckCircleOutline = _interopRequireDefault(require("@material-ui/icons/CheckCircleOutline")); -var _ErrorOutline = _interopRequireDefault(require("@material-ui/icons/ErrorOutline")); -var _HighlightOff = _interopRequireDefault(require("@material-ui/icons/HighlightOff")); -var _HelpOutline = _interopRequireDefault(require("@material-ui/icons/HelpOutline")); -var _Help = _interopRequireDefault(require("@material-ui/icons/Help")); -var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip")); -var _Grid = _interopRequireDefault(require("@material-ui/core/Grid")); -var _TextField = _interopRequireDefault(require("@material-ui/core/TextField")); -var _CloudOff = _interopRequireDefault(require("@material-ui/icons/CloudOff")); -var _CircularProgress = _interopRequireDefault(require("@material-ui/core/CircularProgress")); +var _CheckCircleOutline = _interopRequireDefault(require("@mui/icons-material/CheckCircleOutline")); +var _ErrorOutline = _interopRequireDefault(require("@mui/icons-material/ErrorOutline")); +var _HighlightOff = _interopRequireDefault(require("@mui/icons-material/HighlightOff")); +var _HelpOutline = _interopRequireDefault(require("@mui/icons-material/HelpOutline")); +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")); /* eslint-disable react/function-component-definition, react/destructuring-assignment, max-len */ @@ -46,7 +43,7 @@ exports.TxtLabel = TxtLabel; const StatusIcon = status => { switch (status) { case 'accept': - return /*#__PURE__*/_react.default.createElement(_Tooltip.default, { + return /*#__PURE__*/_react.default.createElement(_material.Tooltip, { title: /*#__PURE__*/_react.default.createElement("span", { className: "txt-sv-tp" }, "Accept"), @@ -57,7 +54,7 @@ const StatusIcon = status => { } })); case 'warning': - return /*#__PURE__*/_react.default.createElement(_Tooltip.default, { + return /*#__PURE__*/_react.default.createElement(_material.Tooltip, { title: /*#__PURE__*/_react.default.createElement("span", { className: "txt-sv-tp" }, "Warning"), @@ -68,7 +65,7 @@ const StatusIcon = status => { } })); case 'reject': - return /*#__PURE__*/_react.default.createElement(_Tooltip.default, { + return /*#__PURE__*/_react.default.createElement(_material.Tooltip, { title: /*#__PURE__*/_react.default.createElement("span", { className: "txt-sv-tp" }, "Reject"), @@ -79,7 +76,7 @@ const StatusIcon = status => { } })); case 'missing': - return /*#__PURE__*/_react.default.createElement(_Tooltip.default, { + return /*#__PURE__*/_react.default.createElement(_material.Tooltip, { title: /*#__PURE__*/_react.default.createElement("span", { className: "txt-sv-tp" }, "Missing"), @@ -90,7 +87,7 @@ const StatusIcon = status => { } })); case 'unknown': - return /*#__PURE__*/_react.default.createElement(_Tooltip.default, { + return /*#__PURE__*/_react.default.createElement(_material.Tooltip, { title: /*#__PURE__*/_react.default.createElement("span", { className: "txt-sv-tp" }, "Not Support"), @@ -118,12 +115,12 @@ 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(_Grid.default, { + }, /*#__PURE__*/_react.default.createElement(_material.Grid, { container: true - }, /*#__PURE__*/_react.default.createElement(_Grid.default, { + }, /*#__PURE__*/_react.default.createElement(_material.Grid, { item: true, xs: 6 - }, /*#__PURE__*/_react.default.createElement(_TextField.default, { + }, /*#__PURE__*/_react.default.createElement(_material.TextField, { fullWidth: true, label: TxtLabel(classes, 'Molfile', 'txt-mol-label'), margin: "normal", @@ -139,7 +136,7 @@ const SectionRunning = () => /*#__PURE__*/_react.default.createElement("div", { style: titleStyle }, /*#__PURE__*/_react.default.createElement("h2", { style: txtStyle -}, /*#__PURE__*/_react.default.createElement(_CircularProgress.default, { +}, /*#__PURE__*/_react.default.createElement(_material.CircularProgress, { style: { color: 'blue', fontSize: 50 diff --git a/dist/components/forecast/ir_comps.js b/dist/components/forecast/ir_comps.js index 538a9cee..9c2b12e2 100644 --- a/dist/components/forecast/ir_comps.js +++ b/dist/components/forecast/ir_comps.js @@ -10,14 +10,9 @@ var _propTypes = _interopRequireDefault(require("prop-types")); var _reactRedux = require("react-redux"); var _redux = require("redux"); var _classnames = _interopRequireDefault(require("classnames")); -var _Select = _interopRequireDefault(require("@material-ui/core/Select")); -var _FormControl = _interopRequireDefault(require("@material-ui/core/FormControl")); -var _MenuItem = _interopRequireDefault(require("@material-ui/core/MenuItem")); -var _CheckCircleOutline = _interopRequireDefault(require("@material-ui/icons/CheckCircleOutline")); -var _HighlightOff = _interopRequireDefault(require("@material-ui/icons/HighlightOff")); -var _TableCell = _interopRequireDefault(require("@material-ui/core/TableCell")); -var _TableHead = _interopRequireDefault(require("@material-ui/core/TableHead")); -var _TableRow = _interopRequireDefault(require("@material-ui/core/TableRow")); +var _material = require("@mui/material"); +var _CheckCircleOutline = _interopRequireDefault(require("@mui/icons-material/CheckCircleOutline")); +var _HighlightOff = _interopRequireDefault(require("@mui/icons-material/HighlightOff")); var _comps = require("./comps"); var _forecast = require("../../actions/forecast"); /* eslint-disable react/function-component-definition, function-paren-newline, @@ -33,7 +28,7 @@ const baseSelectIrStatus = _ref => { setIrStatusAct } = _ref; const theStatus = ['accept', 'reject'].includes(status) ? status : ''; - return /*#__PURE__*/_react.default.createElement(_FormControl.default, null, /*#__PURE__*/_react.default.createElement(_Select.default, { + return /*#__PURE__*/_react.default.createElement(_material.FormControl, null, /*#__PURE__*/_react.default.createElement(_material.Select, { value: theStatus, onChange: e => { setIrStatusAct({ @@ -45,19 +40,19 @@ const baseSelectIrStatus = _ref => { svgs: [] }); } - }, /*#__PURE__*/_react.default.createElement(_MenuItem.default, { + }, /*#__PURE__*/_react.default.createElement(_material.MenuItem, { value: "accept" }, /*#__PURE__*/_react.default.createElement(_CheckCircleOutline.default, { style: { color: '#4caf50' } - })), /*#__PURE__*/_react.default.createElement(_MenuItem.default, { + })), /*#__PURE__*/_react.default.createElement(_material.MenuItem, { value: "reject" }, /*#__PURE__*/_react.default.createElement(_HighlightOff.default, { style: { color: '#e91e63' } - })), /*#__PURE__*/_react.default.createElement(_MenuItem.default, { + })), /*#__PURE__*/_react.default.createElement(_material.MenuItem, { value: "" }, /*#__PURE__*/_react.default.createElement("span", null)))); }; @@ -77,13 +72,13 @@ baseSelectIrStatus.defaultProps = { status: '' }; const SelectIrStatus = (0, _reactRedux.connect)(bssMapStateToProps, bssMapDispatchToProps)(baseSelectIrStatus); -const IrTableHeader = classes => /*#__PURE__*/_react.default.createElement(_TableHead.default, null, /*#__PURE__*/_react.default.createElement(_TableRow.default, null, /*#__PURE__*/_react.default.createElement(_TableCell.default, null), /*#__PURE__*/_react.default.createElement(_TableCell.default, { +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(_TableCell.default, { +}, (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(_TableCell.default, { +}, (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(_TableCell.default, { +}, (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')))); exports.IrTableHeader = IrTableHeader; @@ -117,18 +112,18 @@ const colorLabel = function (classes, idx) { className: (0, _classnames.default)(classes.txtLabel, extClsName) }, idx + 1)); }; -const IrTableBodyRow = (classes, idx, fg) => /*#__PURE__*/_react.default.createElement(_TableRow.default, { +const IrTableBodyRow = (classes, idx, fg) => /*#__PURE__*/_react.default.createElement(_material.TableRow, { key: `${idx}-${fg.name}` -}, /*#__PURE__*/_react.default.createElement(_TableCell.default, { +}, /*#__PURE__*/_react.default.createElement(_material.TableCell, { component: "th", scope: "row" -}, colorLabel(classes, idx)), /*#__PURE__*/_react.default.createElement(_TableCell.default, { +}, 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(_TableCell.default, { +}, (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(_TableCell.default, { +}, (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(_TableCell.default, { +}, (0, _comps.StatusIcon)(fg.status)), /*#__PURE__*/_react.default.createElement(_material.TableCell, { align: "right" }, /*#__PURE__*/_react.default.createElement(SelectIrStatus, { sma: fg.sma, diff --git a/dist/components/forecast/ir_viewer.js b/dist/components/forecast/ir_viewer.js index 0ab9c425..9caec92d 100644 --- a/dist/components/forecast/ir_viewer.js +++ b/dist/components/forecast/ir_viewer.js @@ -10,11 +10,8 @@ var _propTypes = _interopRequireDefault(require("prop-types")); var _classnames = _interopRequireDefault(require("classnames")); var _reactRedux = require("react-redux"); var _redux = require("redux"); -var _styles = require("@material-ui/core/styles"); -var _Table = _interopRequireDefault(require("@material-ui/core/Table")); -var _TableBody = _interopRequireDefault(require("@material-ui/core/TableBody")); -var _Paper = _interopRequireDefault(require("@material-ui/core/Paper")); -var _Grid = _interopRequireDefault(require("@material-ui/core/Grid")); +var _styles = require("@mui/styles"); +var _material = require("@mui/material"); var _comps = require("./comps"); var _ir_comps = require("./ir_comps"); const Styles = () => ({ @@ -65,12 +62,12 @@ const sectionTable = (classes, pds) => { fgs } = pds.output.result[0]; if (!fgs) return null; - return /*#__PURE__*/_react.default.createElement(_Paper.default, { + return /*#__PURE__*/_react.default.createElement(_material.Paper, { className: classes.tableRoot - }, /*#__PURE__*/_react.default.createElement(_Table.default, { + }, /*#__PURE__*/_react.default.createElement(_material.Table, { className: classes.table, size: "small" - }, (0, _ir_comps.IrTableHeader)(classes), /*#__PURE__*/_react.default.createElement(_TableBody.default, null, fgs.sort((a, b) => b.confidence - a.confidence).map((fg, idx) => (0, _ir_comps.IrTableBodyRow)(classes, idx, fg))))); + }, (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))))); }; const IrViewer = _ref => { let { @@ -82,15 +79,15 @@ const IrViewer = _ref => { } = _ref; return /*#__PURE__*/_react.default.createElement("div", { className: (0, _classnames.default)(classes.root, 'card-forecast-viewer') - }, /*#__PURE__*/_react.default.createElement(_Grid.default, { + }, /*#__PURE__*/_react.default.createElement(_material.Grid, { className: (0, _classnames.default)(classes.container), container: true - }, /*#__PURE__*/_react.default.createElement(_Grid.default, { + }, /*#__PURE__*/_react.default.createElement(_material.Grid, { item: true, xs: 4 - }, /*#__PURE__*/_react.default.createElement(_Paper.default, { + }, /*#__PURE__*/_react.default.createElement(_material.Paper, { className: classes.svgRoot - }, (0, _comps.sectionSvg)(classes, forecastSt.predictions))), /*#__PURE__*/_react.default.createElement(_Grid.default, { + }, (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)); @@ -110,5 +107,4 @@ IrViewer.propTypes = { IrViewer.defaultProps = { inputCb: false }; -var _default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(Styles))(IrViewer); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(Styles))(IrViewer); \ No newline at end of file diff --git a/dist/components/forecast/nmr_comps.js b/dist/components/forecast/nmr_comps.js index f823359b..f0cf960a 100644 --- a/dist/components/forecast/nmr_comps.js +++ b/dist/components/forecast/nmr_comps.js @@ -10,14 +10,9 @@ var _propTypes = _interopRequireDefault(require("prop-types")); var _classnames = _interopRequireDefault(require("classnames")); var _reactRedux = require("react-redux"); var _redux = require("redux"); -var _Select = _interopRequireDefault(require("@material-ui/core/Select")); -var _FormControl = _interopRequireDefault(require("@material-ui/core/FormControl")); -var _MenuItem = _interopRequireDefault(require("@material-ui/core/MenuItem")); -var _CheckCircleOutline = _interopRequireDefault(require("@material-ui/icons/CheckCircleOutline")); -var _HighlightOff = _interopRequireDefault(require("@material-ui/icons/HighlightOff")); -var _TableCell = _interopRequireDefault(require("@material-ui/core/TableCell")); -var _TableHead = _interopRequireDefault(require("@material-ui/core/TableHead")); -var _TableRow = _interopRequireDefault(require("@material-ui/core/TableRow")); +var _material = require("@mui/material"); +var _CheckCircleOutline = _interopRequireDefault(require("@mui/icons-material/CheckCircleOutline")); +var _HighlightOff = _interopRequireDefault(require("@mui/icons-material/HighlightOff")); var _comps = require("./comps"); var _forecast = require("../../actions/forecast"); /* eslint-disable react/function-component-definition, react/destructuring-assignment */ @@ -32,7 +27,7 @@ const baseSelectNmrStatus = _ref => { setNmrStatusAct } = _ref; const theStatus = ['accept', 'reject'].includes(status) ? status : ''; - return /*#__PURE__*/_react.default.createElement(_FormControl.default, null, /*#__PURE__*/_react.default.createElement(_Select.default, { + return /*#__PURE__*/_react.default.createElement(_material.FormControl, null, /*#__PURE__*/_react.default.createElement(_material.Select, { value: theStatus, onChange: e => { setNmrStatusAct({ @@ -45,19 +40,19 @@ const baseSelectNmrStatus = _ref => { svgs: [] }); } - }, /*#__PURE__*/_react.default.createElement(_MenuItem.default, { + }, /*#__PURE__*/_react.default.createElement(_material.MenuItem, { value: "accept" }, /*#__PURE__*/_react.default.createElement(_CheckCircleOutline.default, { style: { color: '#4caf50' } - })), /*#__PURE__*/_react.default.createElement(_MenuItem.default, { + })), /*#__PURE__*/_react.default.createElement(_material.MenuItem, { value: "reject" }, /*#__PURE__*/_react.default.createElement(_HighlightOff.default, { style: { color: '#e91e63' } - })), /*#__PURE__*/_react.default.createElement(_MenuItem.default, { + })), /*#__PURE__*/_react.default.createElement(_material.MenuItem, { value: "" }, /*#__PURE__*/_react.default.createElement("span", null)))); }; @@ -88,32 +83,32 @@ const realFormat = (val, status) => { } return numFormat(val); }; -const NmrTableHeader = classes => /*#__PURE__*/_react.default.createElement(_TableHead.default, null, /*#__PURE__*/_react.default.createElement(_TableRow.default, null, /*#__PURE__*/_react.default.createElement(_TableCell.default, null, (0, _comps.TxtLabel)(classes, 'Atom', 'txt-prd-table-title')), /*#__PURE__*/_react.default.createElement(_TableCell.default, { +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(_TableCell.default, { +}, (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(_TableCell.default, { +}, (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(_TableCell.default, { +}, (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(_TableCell.default, { +}, (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')))); exports.NmrTableHeader = NmrTableHeader; -const NmrTableBodyRow = (classes, row, idx) => /*#__PURE__*/_react.default.createElement(_TableRow.default, { +const NmrTableBodyRow = (classes, row, idx) => /*#__PURE__*/_react.default.createElement(_material.TableRow, { key: `${idx}-${row.atom}` -}, /*#__PURE__*/_react.default.createElement(_TableCell.default, { +}, /*#__PURE__*/_react.default.createElement(_material.TableCell, { component: "th", scope: "row" -}, (0, _comps.TxtLabel)(classes, row.atom, 'txt-prd-table-content')), /*#__PURE__*/_react.default.createElement(_TableCell.default, { +}, (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(_TableCell.default, { +}, (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(_TableCell.default, { +}, (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(_TableCell.default, { +}, (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(_TableCell.default, { +}, (0, _comps.StatusIcon)(row.status)), /*#__PURE__*/_react.default.createElement(_material.TableCell, { align: "right" }, /*#__PURE__*/_react.default.createElement(SelectNmrStatus, { idx: idx, diff --git a/dist/components/forecast/nmr_viewer.js b/dist/components/forecast/nmr_viewer.js index 0cfea4fb..6188d539 100644 --- a/dist/components/forecast/nmr_viewer.js +++ b/dist/components/forecast/nmr_viewer.js @@ -10,11 +10,8 @@ var _propTypes = _interopRequireDefault(require("prop-types")); var _classnames = _interopRequireDefault(require("classnames")); var _reactRedux = require("react-redux"); var _redux = require("redux"); -var _styles = require("@material-ui/core/styles"); -var _Table = _interopRequireDefault(require("@material-ui/core/Table")); -var _TableBody = _interopRequireDefault(require("@material-ui/core/TableBody")); -var _Paper = _interopRequireDefault(require("@material-ui/core/Paper")); -var _Grid = _interopRequireDefault(require("@material-ui/core/Grid")); +var _styles = require("@mui/styles"); +var _material = require("@mui/material"); var _comps = require("./comps"); var _nmr_comps = require("./nmr_comps"); const Styles = () => ({ @@ -62,12 +59,12 @@ const sectionTable = (classes, 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(_Paper.default, { + return /*#__PURE__*/_react.default.createElement(_material.Paper, { className: classes.tableRoot - }, /*#__PURE__*/_react.default.createElement(_Table.default, { + }, /*#__PURE__*/_react.default.createElement(_material.Table, { className: classes.table, size: "small" - }, (0, _nmr_comps.NmrTableHeader)(classes), /*#__PURE__*/_react.default.createElement(_TableBody.default, null, dict.shifts.sort((a, b) => a.atom - b.atom).map((row, idx) => (0, _nmr_comps.NmrTableBodyRow)(classes, row, idx))))); + }, (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))))); }; const NmrViewer = _ref => { let { @@ -79,15 +76,15 @@ const NmrViewer = _ref => { } = _ref; return /*#__PURE__*/_react.default.createElement("div", { className: (0, _classnames.default)(classes.root, 'card-forecast-viewer') - }, /*#__PURE__*/_react.default.createElement(_Grid.default, { + }, /*#__PURE__*/_react.default.createElement(_material.Grid, { className: (0, _classnames.default)(classes.container), container: true - }, /*#__PURE__*/_react.default.createElement(_Grid.default, { + }, /*#__PURE__*/_react.default.createElement(_material.Grid, { item: true, xs: 4 - }, /*#__PURE__*/_react.default.createElement(_Paper.default, { + }, /*#__PURE__*/_react.default.createElement(_material.Paper, { className: classes.svgRoot - }, (0, _comps.sectionSvg)(classes, forecastSt.predictions))), /*#__PURE__*/_react.default.createElement(_Grid.default, { + }, (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)); @@ -107,5 +104,4 @@ NmrViewer.propTypes = { NmrViewer.defaultProps = { inputCb: false }; -var _default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(Styles))(NmrViewer); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(Styles))(NmrViewer); \ No newline at end of file diff --git a/dist/components/forecast/section_loading.js b/dist/components/forecast/section_loading.js index f6f7a444..25e1f2b9 100644 --- a/dist/components/forecast/section_loading.js +++ b/dist/components/forecast/section_loading.js @@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", { }); exports.default = void 0; var _react = _interopRequireDefault(require("react")); -var _CircularProgress = _interopRequireDefault(require("@material-ui/core/CircularProgress")); -var _ErrorOutline = _interopRequireDefault(require("@material-ui/icons/ErrorOutline")); +var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress")); +var _ErrorOutline = _interopRequireDefault(require("@mui/icons-material/ErrorOutline")); const styleLoading = { alignItems: 'center', display: 'flex', @@ -54,5 +54,4 @@ class SectionLoading extends _react.default.Component { return loading ? this.renderLoading() : this.renderNotFound(); } } -var _default = SectionLoading; -exports.default = _default; \ No newline at end of file +var _default = exports.default = SectionLoading; \ No newline at end of file diff --git a/dist/components/forecast_viewer.js b/dist/components/forecast_viewer.js index 3d6a23c0..b84ea1e7 100644 --- a/dist/components/forecast_viewer.js +++ b/dist/components/forecast_viewer.js @@ -9,7 +9,7 @@ var _react = _interopRequireDefault(require("react")); var _propTypes = _interopRequireDefault(require("prop-types")); var _reactRedux = require("react-redux"); var _redux = require("redux"); -var _styles = require("@material-ui/core/styles"); +var _styles = require("@mui/styles"); var _index = _interopRequireDefault(require("./d3_line/index")); var _nmr_viewer = _interopRequireDefault(require("./forecast/nmr_viewer")); var _ir_viewer = _interopRequireDefault(require("./forecast/ir_viewer")); @@ -144,5 +144,4 @@ ForecastViewer.propTypes = { wavelength: _propTypes.default.object.isRequired, curveSt: _propTypes.default.object.isRequired }; -var _default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(ForecastViewer); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(ForecastViewer); \ No newline at end of file diff --git a/dist/components/multi_jcamps_viewer.js b/dist/components/multi_jcamps_viewer.js index 25b34668..94ef32b8 100644 --- a/dist/components/multi_jcamps_viewer.js +++ b/dist/components/multi_jcamps_viewer.js @@ -9,8 +9,8 @@ var _react = _interopRequireDefault(require("react")); var _propTypes = _interopRequireDefault(require("prop-types")); var _reactRedux = require("react-redux"); var _redux = require("redux"); -var _Grid = _interopRequireDefault(require("@material-ui/core/Grid")); -var _styles = require("@material-ui/core/styles"); +var _Grid = _interopRequireDefault(require("@mui/material/Grid")); +var _styles = require("@mui/styles"); var _index = _interopRequireDefault(require("./panel/index")); var _index2 = _interopRequireDefault(require("./cmd_bar/index")); var _index3 = _interopRequireDefault(require("./d3_multi/index")); @@ -144,5 +144,4 @@ MultiJcampsViewer.defaultProps = { yLabel: '', entities: [] }; -var _default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(MultiJcampsViewer); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _styles.withStyles)(styles))(MultiJcampsViewer); \ No newline at end of file diff --git a/dist/components/panel/compare.js b/dist/components/panel/compare.js index e20067e4..f95c783a 100644 --- a/dist/components/panel/compare.js +++ b/dist/components/panel/compare.js @@ -12,19 +12,12 @@ var _classnames = _interopRequireDefault(require("classnames")); var _reactRedux = require("react-redux"); var _redux = require("redux"); var _reactDropzone = _interopRequireDefault(require("react-dropzone")); -var _core = require("@material-ui/core"); -var _ExpandMore = _interopRequireDefault(require("@material-ui/icons/ExpandMore")); -var _HighlightOff = _interopRequireDefault(require("@material-ui/icons/HighlightOff")); -var _Table = _interopRequireDefault(require("@material-ui/core/Table")); -var _TableBody = _interopRequireDefault(require("@material-ui/core/TableBody")); -var _TableCell = _interopRequireDefault(require("@material-ui/core/TableCell")); -var _TableRow = _interopRequireDefault(require("@material-ui/core/TableRow")); -var _Divider = _interopRequireDefault(require("@material-ui/core/Divider")); -var _Typography = _interopRequireDefault(require("@material-ui/core/Typography")); -var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip")); -var _VisibilityOutlined = _interopRequireDefault(require("@material-ui/icons/VisibilityOutlined")); -var _VisibilityOffOutlined = _interopRequireDefault(require("@material-ui/icons/VisibilityOffOutlined")); -var _styles = require("@material-ui/core/styles"); +var _material = require("@mui/material"); +var _ExpandMore = _interopRequireDefault(require("@mui/icons-material/ExpandMore")); +var _HighlightOff = _interopRequireDefault(require("@mui/icons-material/HighlightOff")); +var _VisibilityOutlined = _interopRequireDefault(require("@mui/icons-material/VisibilityOutlined")); +var _VisibilityOffOutlined = _interopRequireDefault(require("@mui/icons-material/VisibilityOffOutlined")); +var _styles = require("@mui/styles"); var _format = _interopRequireDefault(require("../../helpers/format")); var _jcamp = require("../../actions/jcamp"); /* eslint-disable function-paren-newline, react/jsx-props-no-spreading, @@ -126,7 +119,7 @@ const tpHint = classes => /*#__PURE__*/_react.default.createElement("span", { }, "- 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(_Tooltip.default, { +const content = (classes, desc) => /*#__PURE__*/_react.default.createElement(_material.Tooltip, { title: tpHint(classes), placement: "bottom" }, /*#__PURE__*/_react.default.createElement("span", { @@ -179,22 +172,22 @@ const compareList = (classes, jcampSt, rmOthersOneAct, toggleShowAct) => { isShow: o.show, toggleShowCb: () => toggleShowAct(idx) })); - return /*#__PURE__*/_react.default.createElement(_Table.default, { + return /*#__PURE__*/_react.default.createElement(_material.Table, { className: classes.table - }, /*#__PURE__*/_react.default.createElement(_TableBody.default, null, rows.map(row => /*#__PURE__*/_react.default.createElement(_TableRow.default, { + }, /*#__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(_TableCell.default, { + }, /*#__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(_TableCell.default, { + }, 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(_TableCell.default, { + }, 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, { @@ -217,21 +210,21 @@ const ComparePanel = _ref2 => { rmOthersOneAct, toggleShowAct } = _ref2; - return /*#__PURE__*/_react.default.createElement(_core.Accordion, { + return /*#__PURE__*/_react.default.createElement(_material.Accordion, { expanded: expand, onChange: onExapnd, className: (0, _classnames.default)(classes.panel), TransitionProps: { unmountOnExit: true - } // increase ExpansionPanel performance - }, /*#__PURE__*/_react.default.createElement(_core.AccordionSummary, { + } // 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(_Typography.default, { + }, /*#__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(_Divider.default, null), inputOthers(classes, jcampSt), /*#__PURE__*/_react.default.createElement("div", { + }, "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))); }; @@ -252,5 +245,4 @@ ComparePanel.propTypes = { rmOthersOneAct: _propTypes.default.func.isRequired, toggleShowAct: _propTypes.default.func.isRequired }; -var _default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(ComparePanel)); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(ComparePanel)); \ No newline at end of file diff --git a/dist/components/panel/cyclic_voltamery_data.js b/dist/components/panel/cyclic_voltamery_data.js index f02c351d..308a5650 100644 --- a/dist/components/panel/cyclic_voltamery_data.js +++ b/dist/components/panel/cyclic_voltamery_data.js @@ -10,16 +10,13 @@ var _propTypes = _interopRequireDefault(require("prop-types")); var _classnames = _interopRequireDefault(require("classnames")); var _reactRedux = require("react-redux"); var _redux = require("redux"); -var _ExpandMore = _interopRequireDefault(require("@material-ui/icons/ExpandMore")); -var _AddCircleOutline = _interopRequireDefault(require("@material-ui/icons/AddCircleOutline")); -var _RemoveCircle = _interopRequireDefault(require("@material-ui/icons/RemoveCircle")); -var _Info = _interopRequireDefault(require("@material-ui/icons/Info")); -var _Help = _interopRequireDefault(require("@material-ui/icons/Help")); -var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip")); -var _Divider = _interopRequireDefault(require("@material-ui/core/Divider")); -var _Typography = _interopRequireDefault(require("@material-ui/core/Typography")); -var _styles = require("@material-ui/core/styles"); -var _core = require("@material-ui/core"); +var _ExpandMore = _interopRequireDefault(require("@mui/icons-material/ExpandMore")); +var _AddCircleOutline = _interopRequireDefault(require("@mui/icons-material/AddCircleOutline")); +var _RemoveCircle = _interopRequireDefault(require("@mui/icons-material/RemoveCircle")); +var _Info = _interopRequireDefault(require("@mui/icons-material/Info")); +var _Help = _interopRequireDefault(require("@mui/icons-material/Help")); +var _styles = require("@mui/styles"); +var _material = require("@mui/material"); var _cyclic_voltammetry = require("../../actions/cyclic_voltammetry"); var _ui = require("../../actions/ui"); var _list_ui = require("../../constants/list_ui"); @@ -159,73 +156,73 @@ const CyclicVoltammetryPanel = _ref => { jcampIdx }) })); - return /*#__PURE__*/_react.default.createElement(_core.Accordion, null, /*#__PURE__*/_react.default.createElement(_core.AccordionSummary, { + return /*#__PURE__*/_react.default.createElement(_material.Accordion, null, /*#__PURE__*/_react.default.createElement(_material.AccordionSummary, { expandIcon: /*#__PURE__*/_react.default.createElement(_ExpandMore.default, null), className: (0, _classnames.default)(classes.panelSummary) - }, /*#__PURE__*/_react.default.createElement(_Typography.default, { + }, /*#__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(_Divider.default, null), /*#__PURE__*/_react.default.createElement(_core.Table, { + }, "Voltammetry data"))), /*#__PURE__*/_react.default.createElement(_material.Divider, null), /*#__PURE__*/_react.default.createElement(_material.Table, { className: classes.table - }, /*#__PURE__*/_react.default.createElement(_core.TableHead, null, /*#__PURE__*/_react.default.createElement(_core.TableRow, null, /*#__PURE__*/_react.default.createElement(_core.TableCell, { + }, /*#__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') - }, "Max"), /*#__PURE__*/_react.default.createElement(_core.TableCell, { + }, "Max"), /*#__PURE__*/_react.default.createElement(_material.TableCell, { align: "left", className: (0, _classnames.default)(classes.tTxt, classes.square, 'txt-sv-panel-txt') - }, "Min"), /*#__PURE__*/_react.default.createElement(_core.TableCell, { + }, "Min"), /*#__PURE__*/_react.default.createElement(_material.TableCell, { align: "left", className: (0, _classnames.default)(classes.tTxt, classes.square, 'txt-sv-panel-txt') - }, "I \u03BB0", /*#__PURE__*/_react.default.createElement(_Tooltip.default, { + }, "I \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(_core.TableCell, { + }))), /*#__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(_Tooltip.default, { + }, "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(_core.TableCell, { + }))), /*#__PURE__*/_react.default.createElement(_material.TableCell, { align: "left", className: (0, _classnames.default)(classes.tTxt, classes.square, 'txt-sv-panel-txt') - }, "DeltaEp", /*#__PURE__*/_react.default.createElement(_Tooltip.default, { + }, "DeltaEp", /*#__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(_core.TableCell, { + }))), /*#__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) - })))), /*#__PURE__*/_react.default.createElement(_core.TableBody, null, rows.map(row => /*#__PURE__*/_react.default.createElement(_core.TableRow, { + })))), /*#__PURE__*/_react.default.createElement(_material.TableBody, null, rows.map(row => /*#__PURE__*/_react.default.createElement(_material.TableRow, { key: row.idx - }, /*#__PURE__*/_react.default.createElement(_core.TableCell, { + }, /*#__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), /*#__PURE__*/_react.default.createElement(_core.TableCell, { + }, row.max), /*#__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), /*#__PURE__*/_react.default.createElement(_core.TableCell, { + }, row.min), /*#__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(_core.TableCell, { + }, 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(_core.TableCell, { + }, row.ratio), /*#__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(_core.TableCell, { + }, 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, { @@ -233,7 +230,7 @@ const CyclicVoltammetryPanel = _ref => { onClick: row.remove })))))), /*#__PURE__*/_react.default.createElement("div", { className: (0, _classnames.default)(classes.rowRoot, classes.rowEven) - }, /*#__PURE__*/_react.default.createElement(_Tooltip.default, { + }, /*#__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") @@ -279,5 +276,4 @@ CyclicVoltammetryPanel.propTypes = { CyclicVoltammetryPanel.defaultProps = { jcampIdx: 0 }; -var _default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(CyclicVoltammetryPanel)); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(CyclicVoltammetryPanel)); \ No newline at end of file diff --git a/dist/components/panel/graph_selection.js b/dist/components/panel/graph_selection.js index 5bb814a7..b3cc59f7 100644 --- a/dist/components/panel/graph_selection.js +++ b/dist/components/panel/graph_selection.js @@ -10,11 +10,9 @@ var _propTypes = _interopRequireDefault(require("prop-types")); var _classnames = _interopRequireDefault(require("classnames")); var _reactRedux = require("react-redux"); var _redux = require("redux"); -var _ExpandMore = _interopRequireDefault(require("@material-ui/icons/ExpandMore")); -var _Divider = _interopRequireDefault(require("@material-ui/core/Divider")); -var _Typography = _interopRequireDefault(require("@material-ui/core/Typography")); -var _styles = require("@material-ui/core/styles"); -var _core = require("@material-ui/core"); +var _ExpandMore = _interopRequireDefault(require("@mui/icons-material/ExpandMore")); +var _styles = require("@mui/styles"); +var _material = require("@mui/material"); var _curve = require("../../actions/curve"); var _list_layout = require("../../constants/list_layout"); function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); } @@ -126,22 +124,22 @@ const GraphSelectionPanel = _ref => { filename }; }); - return /*#__PURE__*/_react.default.createElement(_core.Accordion, { + return /*#__PURE__*/_react.default.createElement(_material.Accordion, { "data-testid": "GraphSelectionPanel" - }, /*#__PURE__*/_react.default.createElement(_core.AccordionSummary, { + }, /*#__PURE__*/_react.default.createElement(_material.AccordionSummary, { expandIcon: /*#__PURE__*/_react.default.createElement(_ExpandMore.default, null), className: (0, _classnames.default)(classes.panelSummary) - }, /*#__PURE__*/_react.default.createElement(_Typography.default, { + }, /*#__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(_Divider.default, null), layoutSt === _list_layout.LIST_LAYOUT.AIF ? /*#__PURE__*/_react.default.createElement(_core.FormControlLabel, { - control: /*#__PURE__*/_react.default.createElement(_core.Switch, { + }, "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(_core.Tabs, { + }) : 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) => { @@ -156,12 +154,12 @@ const GraphSelectionPanel = _ref => { default: break; } - return /*#__PURE__*/_react.default.createElement(_core.Tab, { + return /*#__PURE__*/_react.default.createElement(_material.Tab, { key: i, value: subLayout, label: subLayoutName }); - })), /*#__PURE__*/_react.default.createElement(_core.List, null, itemsSubLayout.map(item => /*#__PURE__*/_react.default.createElement(_core.ListItem, { + })), /*#__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 @@ -178,7 +176,7 @@ const GraphSelectionPanel = _ref => { backgroundColor: item.color } }), item.filename !== '' ? /*#__PURE__*/_react.default.createElement("span", null, "File: ", item.filename) : null // eslint-disable-line - )))))) : /*#__PURE__*/_react.default.createElement(_core.List, null, items.map(item => /*#__PURE__*/_react.default.createElement(_core.ListItem, { + )))))) : /*#__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 @@ -219,5 +217,4 @@ GraphSelectionPanel.propTypes = { subLayoutsInfo: _propTypes.default.array, toggleShowAllCurveAct: _propTypes.default.func.isRequired }; -var _default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(GraphSelectionPanel)); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(GraphSelectionPanel)); \ No newline at end of file diff --git a/dist/components/panel/index.js b/dist/components/panel/index.js index 8c3eac4a..0fcc4064 100644 --- a/dist/components/panel/index.js +++ b/dist/components/panel/index.js @@ -10,7 +10,8 @@ var _propTypes = _interopRequireDefault(require("prop-types")); var _classnames = _interopRequireDefault(require("classnames")); var _reactRedux = require("react-redux"); var _redux = require("redux"); -var _styles = require("@material-ui/core/styles"); +var _styles = require("@mui/material/styles"); +var _withStyles = _interopRequireDefault(require("@mui/styles/withStyles")); var _info = _interopRequireDefault(require("./info")); var _peaks = _interopRequireDefault(require("./peaks")); var _compare = _interopRequireDefault(require("./compare")); @@ -20,11 +21,11 @@ var _graph_selection = _interopRequireDefault(require("./graph_selection")); var _cfg = _interopRequireDefault(require("../../helpers/cfg")); /* eslint-disable react/prop-types, react/require-default-props */ -const theme = (0, _styles.createTheme)({ +const theme = (0, _styles.createTheme)((0, _styles.adaptV4Theme)({ typography: { useNextVariants: true } -}); +})); const styles = () => ({ panels: { maxHeight: 'calc(90vh - 220px)', @@ -93,7 +94,9 @@ class PanelViewer extends _react.default.Component { const hideGraphSelection = listCurves === false || listCurves === undefined; return /*#__PURE__*/_react.default.createElement("div", { className: (0, _classnames.default)(classes.panels) - }, /*#__PURE__*/_react.default.createElement(_styles.MuiThemeProvider, { + }, /*#__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, @@ -126,7 +129,7 @@ class PanelViewer extends _react.default.Component { expand: expand === 'cyclicvolta', onExapnd: onExapndCyclicVolta, userManualLink: userManualLink ? userManualLink.cv : undefined - }))); + })))); } } const mapStateToProps = (state, _) => ( @@ -151,7 +154,6 @@ PanelViewer.propTypes = { curveSt: _propTypes.default.object.isRequired, subLayoutsInfo: _propTypes.default.object }; -var _default = (0, _reactRedux.connect)( +var _default = exports.default = (0, _reactRedux.connect)( // eslint-disable-line -mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(PanelViewer)); // eslint-disable-line -exports.default = _default; \ No newline at end of file +mapStateToProps, mapDispatchToProps)((0, _withStyles.default)(styles)(PanelViewer)); // eslint-disable-line \ No newline at end of file diff --git a/dist/components/panel/info.js b/dist/components/panel/info.js index 1e10ca9f..b819987c 100644 --- a/dist/components/panel/info.js +++ b/dist/components/panel/info.js @@ -12,11 +12,9 @@ var _reactRedux = require("react-redux"); var _redux = require("redux"); var _reactSvgFileZoomPan = _interopRequireDefault(require("@complat/react-svg-file-zoom-pan")); var _reactQuill = _interopRequireDefault(require("react-quill")); -var _core = require("@material-ui/core"); -var _ExpandMore = _interopRequireDefault(require("@material-ui/icons/ExpandMore")); -var _Divider = _interopRequireDefault(require("@material-ui/core/Divider")); -var _Typography = _interopRequireDefault(require("@material-ui/core/Typography")); -var _styles = require("@material-ui/core/styles"); +var _material = require("@mui/material"); +var _ExpandMore = _interopRequireDefault(require("@mui/icons-material/ExpandMore")); +var _styles = require("@mui/styles"); var _format = _interopRequireDefault(require("../../helpers/format")); /* eslint-disable no-mixed-operators, react/function-component-definition, react/require-default-props */ @@ -154,21 +152,21 @@ const InfoPanel = _ref => { originStack = integration.originStack; // eslint-disable-line } - return /*#__PURE__*/_react.default.createElement(_core.Accordion, { + return /*#__PURE__*/_react.default.createElement(_material.Accordion, { expanded: expand, onChange: onExapnd, className: (0, _classnames.default)(classes.panel), TransitionProps: { unmountOnExit: true - } // increase ExpansionPanel performance - }, /*#__PURE__*/_react.default.createElement(_core.AccordionSummary, { + } // 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(_Typography.default, { + }, /*#__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(_Divider.default, null), /*#__PURE__*/_react.default.createElement("div", { + }, "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) @@ -239,7 +237,6 @@ InfoPanel.propTypes = { canChangeDescription: _propTypes.default.bool.isRequired, onDescriptionChanged: _propTypes.default.func }; -var _default = (0, _reactRedux.connect)( +var _default = exports.default = (0, _reactRedux.connect)( // eslint-disable-line -mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(InfoPanel)); // eslint-disable-line -exports.default = _default; \ No newline at end of file +mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(InfoPanel)); // eslint-disable-line \ No newline at end of file diff --git a/dist/components/panel/multiplicity.js b/dist/components/panel/multiplicity.js index 89ba08a7..3b91f374 100644 --- a/dist/components/panel/multiplicity.js +++ b/dist/components/panel/multiplicity.js @@ -10,20 +10,11 @@ var _propTypes = _interopRequireDefault(require("prop-types")); var _classnames = _interopRequireDefault(require("classnames")); var _reactRedux = require("react-redux"); var _redux = require("redux"); -var _core = require("@material-ui/core"); -var _ExpandMore = _interopRequireDefault(require("@material-ui/icons/ExpandMore")); -var _Divider = _interopRequireDefault(require("@material-ui/core/Divider")); -var _Typography = _interopRequireDefault(require("@material-ui/core/Typography")); -var _Table = _interopRequireDefault(require("@material-ui/core/Table")); -var _TableBody = _interopRequireDefault(require("@material-ui/core/TableBody")); -var _TableCell = _interopRequireDefault(require("@material-ui/core/TableCell")); -var _TableRow = _interopRequireDefault(require("@material-ui/core/TableRow")); -var _HighlightOff = _interopRequireDefault(require("@material-ui/icons/HighlightOff")); -var _styles = require("@material-ui/core/styles"); -var _Checkbox = _interopRequireDefault(require("@material-ui/core/Checkbox")); -var _Button = _interopRequireDefault(require("@material-ui/core/Button")); -var _Tooltip = _interopRequireDefault(require("@material-ui/core/Tooltip")); -var _RefreshOutlined = _interopRequireDefault(require("@material-ui/icons/RefreshOutlined")); +var _material = require("@mui/material"); +var _ExpandMore = _interopRequireDefault(require("@mui/icons-material/ExpandMore")); +var _HighlightOff = _interopRequireDefault(require("@mui/icons-material/HighlightOff")); +var _styles = require("@mui/styles"); +var _RefreshOutlined = _interopRequireDefault(require("@mui/icons-material/RefreshOutlined")); var _multiplicity = require("../../actions/multiplicity"); var _multiplicity_select = _interopRequireDefault(require("./multiplicity_select")); var _multiplicity_coupling = _interopRequireDefault(require("./multiplicity_coupling")); @@ -127,7 +118,7 @@ const cBoxStyle = () => ({ }, checked: {} }); -const MUCheckbox = (0, _styles.withStyles)(cBoxStyle)(_Checkbox.default); +const MUCheckbox = (0, _styles.withStyles)(cBoxStyle)(_material.Checkbox); const createData = (idx, xExtent, peaks, shift, smExtext, mpyType, js, onClick, onRefresh) => ({ idx: idx + 1, xExtent, @@ -151,24 +142,24 @@ const pkList = (classes, row, shift, digits, rmMpyPeakByPanelAct) => row.peaks.m onClick: cb, className: classes.rmBtn }); - return /*#__PURE__*/_react.default.createElement(_TableRow.default, { + return /*#__PURE__*/_react.default.createElement(_material.TableRow, { key: pk.x, className: classes.tRow, hover: true - }, /*#__PURE__*/_react.default.createElement(_TableCell.default, { + }, /*#__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(_TableCell.default, { + }, `(${(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)); }); -const refreshBtn = (classes, onRefresh) => /*#__PURE__*/_react.default.createElement(_Tooltip.default, { +const refreshBtn = (classes, onRefresh) => /*#__PURE__*/_react.default.createElement(_material.Tooltip, { placement: "left", title: /*#__PURE__*/_react.default.createElement("span", { className: "txt-sv-tp" }, "Calculate Multiplicity") -}, /*#__PURE__*/_react.default.createElement(_Button.default, { +}, /*#__PURE__*/_react.default.createElement(_material.Button, { className: classes.btnRf, onClick: onRefresh }, /*#__PURE__*/_react.default.createElement(_RefreshOutlined.default, null))); @@ -231,9 +222,9 @@ const mpyList = (classes, digits, multiplicitySt, curveSt, clickMpyOneAct, rmMpy target: row })), refreshBtn(classes, row.onRefresh)), /*#__PURE__*/_react.default.createElement(_multiplicity_coupling.default, { row: row - })), /*#__PURE__*/_react.default.createElement(_Table.default, { + })), /*#__PURE__*/_react.default.createElement(_material.Table, { className: classes.table - }, /*#__PURE__*/_react.default.createElement(_TableBody.default, null, pkList(classes, row, shift, digits, rmMpyPeakByPanelAct)))))); + }, /*#__PURE__*/_react.default.createElement(_material.TableBody, null, pkList(classes, row, shift, digits, rmMpyPeakByPanelAct)))))); }; const MultiplicityPanel = _ref => { let { @@ -247,21 +238,21 @@ const MultiplicityPanel = _ref => { resetMpyOneAct } = _ref; const digits = 4; - return /*#__PURE__*/_react.default.createElement(_core.Accordion, { + return /*#__PURE__*/_react.default.createElement(_material.Accordion, { expanded: expand, onChange: onExapnd, className: (0, _classnames.default)(classes.panel), TransitionProps: { unmountOnExit: true - } // increase ExpansionPanel performance - }, /*#__PURE__*/_react.default.createElement(_core.AccordionSummary, { + } // 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(_Typography.default, { + }, /*#__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(_Divider.default, null), /*#__PURE__*/_react.default.createElement("div", { + }, "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))); }; @@ -287,5 +278,4 @@ MultiplicityPanel.propTypes = { resetMpyOneAct: _propTypes.default.func.isRequired, curveSt: _propTypes.default.object.isRequired }; -var _default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(MultiplicityPanel)); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(MultiplicityPanel)); \ No newline at end of file diff --git a/dist/components/panel/multiplicity_coupling.js b/dist/components/panel/multiplicity_coupling.js index 23b909d1..745a720f 100644 --- a/dist/components/panel/multiplicity_coupling.js +++ b/dist/components/panel/multiplicity_coupling.js @@ -10,9 +10,8 @@ var _reactRedux = require("react-redux"); var _redux = require("redux"); var _classnames = _interopRequireDefault(require("classnames")); var _propTypes = _interopRequireDefault(require("prop-types")); -var _styles = require("@material-ui/core/styles"); -var _TextField = _interopRequireDefault(require("@material-ui/core/TextField")); -var _InputAdornment = _interopRequireDefault(require("@material-ui/core/InputAdornment")); +var _styles = require("@mui/styles"); +var _material = require("@mui/material"); var _multiplicity = require("../../actions/multiplicity"); const styles = () => ({ jDiv: { @@ -37,12 +36,12 @@ const styles = () => ({ height: 24 } }); -const txtJ = () => /*#__PURE__*/_react.default.createElement(_InputAdornment.default, { +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(_InputAdornment.default, { +const txtHz = () => /*#__PURE__*/_react.default.createElement(_material.InputAdornment, { position: "end" }, /*#__PURE__*/_react.default.createElement("span", { className: "txt-cmd-hz" @@ -102,7 +101,7 @@ class MpyCoupling extends _react.default.Component { 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(_TextField.default, { + }, /*#__PURE__*/_react.default.createElement(_material.TextField, { className: (0, _classnames.default)(classes.txtField, 'txt-cmd-field'), placeholder: "-", value: value, @@ -130,5 +129,4 @@ MpyCoupling.propTypes = { row: _propTypes.default.object.isRequired, updateMpyJAct: _propTypes.default.func.isRequired }; -var _default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(MpyCoupling)); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(MpyCoupling)); \ No newline at end of file diff --git a/dist/components/panel/multiplicity_select.js b/dist/components/panel/multiplicity_select.js index d2ce8ea4..4cb74b74 100644 --- a/dist/components/panel/multiplicity_select.js +++ b/dist/components/panel/multiplicity_select.js @@ -10,9 +10,8 @@ var _propTypes = _interopRequireDefault(require("prop-types")); var _classnames = _interopRequireDefault(require("classnames")); var _reactRedux = require("react-redux"); var _redux = require("redux"); -var _FormControl = _interopRequireDefault(require("@material-ui/core/FormControl")); -var _TextField = _interopRequireDefault(require("@material-ui/core/TextField")); -var _styles = require("@material-ui/core/styles"); +var _material = require("@mui/material"); +var _styles = require("@mui/styles"); var _multiplicity = require("../../actions/multiplicity"); /* eslint-disable react/function-component-definition */ @@ -58,10 +57,10 @@ const MpySelect = _ref => { }); } }; - return /*#__PURE__*/_react.default.createElement(_FormControl.default, { + return /*#__PURE__*/_react.default.createElement(_material.FormControl, { className: (0, _classnames.default)(classes.formControl), variant: "outlined" - }, /*#__PURE__*/_react.default.createElement(_TextField.default, { + }, /*#__PURE__*/_react.default.createElement(_material.TextField, { className: (0, _classnames.default)(classes.txtField, 'txt-cmd-field'), value: mpyType, margin: "none", @@ -85,5 +84,4 @@ MpySelect.propTypes = { target: _propTypes.default.object.isRequired, selectMpyTypeAct: _propTypes.default.func.isRequired }; -var _default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(Styles)(MpySelect)); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(Styles)(MpySelect)); \ No newline at end of file diff --git a/dist/components/panel/peaks.js b/dist/components/panel/peaks.js index 789f5b2e..8bbe0a13 100644 --- a/dist/components/panel/peaks.js +++ b/dist/components/panel/peaks.js @@ -10,17 +10,10 @@ var _propTypes = _interopRequireDefault(require("prop-types")); var _classnames = _interopRequireDefault(require("classnames")); var _reactRedux = require("react-redux"); var _redux = require("redux"); -var _core = require("@material-ui/core"); -var _ExpandMore = _interopRequireDefault(require("@material-ui/icons/ExpandMore")); -var _Divider = _interopRequireDefault(require("@material-ui/core/Divider")); -var _Typography = _interopRequireDefault(require("@material-ui/core/Typography")); -var _Table = _interopRequireDefault(require("@material-ui/core/Table")); -var _TableBody = _interopRequireDefault(require("@material-ui/core/TableBody")); -var _TableCell = _interopRequireDefault(require("@material-ui/core/TableCell")); -var _TableHead = _interopRequireDefault(require("@material-ui/core/TableHead")); -var _TableRow = _interopRequireDefault(require("@material-ui/core/TableRow")); -var _HighlightOff = _interopRequireDefault(require("@material-ui/icons/HighlightOff")); -var _styles = require("@material-ui/core/styles"); +var _material = require("@mui/material"); +var _ExpandMore = _interopRequireDefault(require("@mui/icons-material/ExpandMore")); +var _HighlightOff = _interopRequireDefault(require("@mui/icons-material/HighlightOff")); +var _styles = require("@mui/styles"); var _chem = require("../../helpers/chem"); var _edit_peak = require("../../actions/edit_peak"); var _format = _interopRequireDefault(require("../../helpers/format")); @@ -98,36 +91,36 @@ const peakList = (peaks, digits, cbAct, classes, isPos) => { }); const rowKlass = isPos ? classes.tRowHeadPos : classes.tRowHeadNeg; const headTxt = isPos ? 'P+' : 'P-'; - return /*#__PURE__*/_react.default.createElement(_Table.default, { + return /*#__PURE__*/_react.default.createElement(_material.Table, { className: classes.table - }, /*#__PURE__*/_react.default.createElement(_TableHead.default, null, /*#__PURE__*/_react.default.createElement(_TableRow.default, { + }, /*#__PURE__*/_react.default.createElement(_material.TableHead, null, /*#__PURE__*/_react.default.createElement(_material.TableRow, { className: rowKlass - }, /*#__PURE__*/_react.default.createElement(_TableCell.default, { + }, /*#__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(_TableCell.default, { + }, /*#__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(_TableCell.default, { + }, "X"), /*#__PURE__*/_react.default.createElement(_material.TableCell, { align: "right", className: (0, _classnames.default)(classes.tTxtHeadXY, 'txt-sv-panel-head') - }, "Y"), /*#__PURE__*/_react.default.createElement(_TableCell.default, { + }, "Y"), /*#__PURE__*/_react.default.createElement(_material.TableCell, { align: "right", className: (0, _classnames.default)(classes.tTxtHead, 'txt-sv-panel-head') - }, "-"))), /*#__PURE__*/_react.default.createElement(_TableBody.default, null, rows.map(row => /*#__PURE__*/_react.default.createElement(_TableRow.default, { + }, "-"))), /*#__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(_TableCell.default, { + }, /*#__PURE__*/_react.default.createElement(_material.TableCell, { align: "right", className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt') - }, row.idx), /*#__PURE__*/_react.default.createElement(_TableCell.default, { + }, 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(_TableCell.default, { + }, 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(_TableCell.default, { + }, row.y.toExponential(2)), /*#__PURE__*/_react.default.createElement(_material.TableCell, { align: "right", className: (0, _classnames.default)(classes.tTxt, 'txt-sv-panel-txt') }, row.rmBtn))))); @@ -172,22 +165,22 @@ 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(_core.Accordion, { + return /*#__PURE__*/_react.default.createElement(_material.Accordion, { "data-testid": "PeaksPanelInfo", expanded: expand, onChange: onExapnd, className: (0, _classnames.default)(classes.panel), TransitionProps: { unmountOnExit: true - } // increase ExpansionPanel performance - }, /*#__PURE__*/_react.default.createElement(_core.AccordionSummary, { + } // 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(_Typography.default, { + }, /*#__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(_Divider.default, null), /*#__PURE__*/_react.default.createElement("div", { + }, "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))); }; @@ -212,7 +205,6 @@ PeakPanel.propTypes = { rmFromNegListAct: _propTypes.default.func.isRequired, curveSt: _propTypes.default.object.isRequired }; -var _default = (0, _reactRedux.connect)( +var _default = exports.default = (0, _reactRedux.connect)( // eslint-disable-line -mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(PeakPanel)); // eslint-disable-line -exports.default = _default; \ No newline at end of file +mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(PeakPanel)); // eslint-disable-line \ No newline at end of file diff --git a/dist/constants/action_type.js b/dist/constants/action_type.js index 9c874150..11bcdb14 100644 --- a/dist/constants/action_type.js +++ b/dist/constants/action_type.js @@ -4,29 +4,26 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.XRD = exports.UI = exports.THRESHOLD = exports.SUBMIT = exports.STATUS = exports.SIMULATION = exports.SHIFT = exports.SCAN = exports.MULTIPLICITY = exports.META = exports.MANAGER = exports.LAYOUT = exports.JCAMP = exports.INTEGRATION = exports.FORECAST = exports.EDITPEAK = exports.CYCLIC_VOLTA_METRY = exports.CURVE = void 0; -const THRESHOLD = { +const THRESHOLD = exports.THRESHOLD = { UPDATE_VALUE: 'THRESHOLD_UPDATE_VALUE', RESET_VALUE: 'THRESHOLD_RESET_VALUE', TOGGLE_ISEDIT: 'THRESHOLD_TOGGLE_ISEDIT', UPDATE_UPPER_VALUE: 'THRESHOLD_UPDATE_UPPER_VALUE', UPDATE_LOWER_VALUE: 'THRESHOLD_UPDATE_LOWER_VALUE' }; -exports.THRESHOLD = THRESHOLD; -const EDITPEAK = { +const EDITPEAK = exports.EDITPEAK = { ADD_POSITIVE: 'ADD_TO_POSITIVE_EDITPEAK_LIST', ADD_NEGATIVE: 'ADD_TO_NEGATIVE_EDITPEAK_LIST', RM_NEGATIVE: 'RM_FROM_NEGATIVE_EDITPEAK_LIST', RM_POSITIVE: 'RM_FROM_POSITIVE_EDITPEAK_LIST', SHIFT: 'EDITPEAK_SHIFT' }; -exports.EDITPEAK = EDITPEAK; -const STATUS = { +const STATUS = exports.STATUS = { TOGGLEBTNSUBMIT: 'TOGGLE_BTN_SUBMIT', TOGGLEBTNALL: 'TOGGLE_BTN_ALL', ENABLEBTNALL: 'ENABLE_BTN_ALL' }; -exports.STATUS = STATUS; -const MANAGER = { +const MANAGER = exports.MANAGER = { RESETALL: 'RESET_ALL', RESETSHIFT: 'RESET_SHIFT', RESET_INIT_COMMON: 'RESET_INIT_COMMON', @@ -34,24 +31,20 @@ const MANAGER = { RESET_INIT_MS: 'RESET_INIT_MS', RESET_INIT_COMMON_WITH_INTERGATION: 'RESET_INIT_COMMON_WITH_INTERGATION' }; -exports.MANAGER = MANAGER; -const LAYOUT = { +const LAYOUT = exports.LAYOUT = { UPDATE: 'UPDATE_LAYOUT' }; -exports.LAYOUT = LAYOUT; -const SHIFT = { +const SHIFT = exports.SHIFT = { SET_REF: 'SHIFT_SET_REF', SET_PEAK: 'SHIFT_SET_PEAK', RM_PEAK: 'SHIFT_RM_PEAK' }; -exports.SHIFT = SHIFT; -const SCAN = { +const SCAN = exports.SCAN = { SET_TARGET: 'SCAN_SET_TARGET', RESET_TARGET: 'SCAN_RESET_TARGET', TOGGLE_ISAUTO: 'SCAN_TOGGLE_ISAUTO' }; -exports.SCAN = SCAN; -const UI = { +const UI = exports.UI = { CLICK_TARGET: 'UI_CLICK_TARGET', VIEWER: { SET_TYPE: 'UI_VIEWER_SET_TYPE' @@ -69,22 +62,19 @@ const UI = { SCROLL: 'UI_WHEEL_SCROLL' } }; -exports.UI = UI; -const FORECAST = { +const FORECAST = exports.FORECAST = { INIT_STATUS: 'FORECAST_INIT_STATUS', SET_IR_STATUS: 'FORECAST_SET_IR_STATUS', SET_NMR_STATUS: 'FORECAST_SET_NMR_STATUS', CLEAR_STATUS: 'FORECAST_CLEAR_STATUS' }; -exports.FORECAST = FORECAST; -const SUBMIT = { +const SUBMIT = exports.SUBMIT = { TOGGLE_IS_ASCEND: 'SUBMIT_TOGGLE_IS_ASCEND', TOGGLE_IS_INTENSITY: 'SUBMIT_TOGGLE_IS_INTENSITY', UPDATE_OPERATION: 'SUBMIT_UPDATE_OPERATION', UPDATE_DECIMAL: 'SUBMIT_UPDATE_DECIMAL' }; -exports.SUBMIT = SUBMIT; -const INTEGRATION = { +const INTEGRATION = exports.INTEGRATION = { RM_ONE: 'INTEGRATION_RM_ONE', SET_REF: 'INTEGRATION_SET_REF', SET_FKR: 'INTEGRATION_SET_FKR', @@ -92,12 +82,10 @@ const INTEGRATION = { CLEAR_ALL: 'INTEGRATION_CLEAR_ALL', SWEEP: 'INTEGRATION_SWEEP' }; -exports.INTEGRATION = INTEGRATION; -const SIMULATION = { +const SIMULATION = exports.SIMULATION = { RESET_ALL_RDC: 'SIMULATION_RESET_ALL_RDC' }; -exports.SIMULATION = SIMULATION; -const MULTIPLICITY = { +const MULTIPLICITY = exports.MULTIPLICITY = { ONE_CLICK: 'MULTIPLICITY_ONE_CLICK', ONE_CLICK_BY_UI: 'MULTIPLICITY_ONE_CLICK_BY_UI', PEAK_RM_BY_PANEL: 'MULTIPLICITY_PEAK_RM_BY_PANEL', @@ -114,24 +102,20 @@ const MULTIPLICITY = { UPDATE_J: 'MULTIPLICITY_UPDATE_J', CLEAR_ALL: 'MULTIPLICITY_CLEAR_ALL' }; -exports.MULTIPLICITY = MULTIPLICITY; -const META = { +const META = exports.META = { UPDATE_PEAKS: 'META_UPDATE_PEAKS', UPDATE_PEAKS_RDC: 'META_UPDATE_PEAKS_RDC' }; -exports.META = META; -const JCAMP = { +const JCAMP = exports.JCAMP = { ADD_OTHERS: 'JCAMP_ADD_OTHERS', RM_OTHERS_ONE: 'JCAMP_RM_OTHERS_ONE', TOGGLE_SHOW: 'JCAMP_TOGGLE_SHOW', CLEAR_ALL: 'JCAMP_CLEAR_ALL' }; -exports.JCAMP = JCAMP; -const XRD = { +const XRD = exports.XRD = { UPDATE_WAVE_LENGTH: 'UPDATE_WAVE_LENGTH' }; -exports.XRD = XRD; -const CYCLIC_VOLTA_METRY = { +const CYCLIC_VOLTA_METRY = exports.CYCLIC_VOLTA_METRY = { ADD_PAIR_PEAKS: 'ADD_PAIR_PEAKS', REMOVE_PAIR_PEAKS: 'REMOVE_PAIR_PEAKS', ADD_MAX_PEAK: 'ADD_MAX_PEAK', @@ -145,10 +129,8 @@ const CYCLIC_VOLTA_METRY = { RESETALL: 'RESETALL_VOLTA_METRY', SET_REF: 'VOLTA_METRY_SET_REF' }; -exports.CYCLIC_VOLTA_METRY = CYCLIC_VOLTA_METRY; -const CURVE = { +const CURVE = exports.CURVE = { SELECT_WORKING_CURVE: 'SELECT_WORKING_CURVE', SET_ALL_CURVES: 'SET_ALL_CURVES', SET_SHOULD_SHOW_ALL_CURVES: 'SET_SHOULD_SHOW_ALL_CURVES' -}; -exports.CURVE = CURVE; \ No newline at end of file +}; \ No newline at end of file diff --git a/dist/constants/list_layout.js b/dist/constants/list_layout.js index 20d27fb2..4003c09a 100644 --- a/dist/constants/list_layout.js +++ b/dist/constants/list_layout.js @@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.LIST_LAYOUT = void 0; -const LIST_LAYOUT = { +const LIST_LAYOUT = exports.LIST_LAYOUT = { PLAIN: 'PLAIN', IR: 'IR', RAMAN: 'RAMAN', @@ -25,6 +25,6 @@ const LIST_LAYOUT = { AIF: 'AIF', EMISSIONS: 'Emissions', DLS_ACF: 'DLS ACF', - DLS_INTENSITY: 'DLS intensity' -}; -exports.LIST_LAYOUT = LIST_LAYOUT; \ No newline at end of file + DLS_INTENSITY: 'DLS intensity', + MASS_CHROMATOGRAM: 'MASS CHROMATOGRAM' +}; \ No newline at end of file diff --git a/dist/constants/list_shift.js b/dist/constants/list_shift.js index f1416675..940a70e8 100644 --- a/dist/constants/list_shift.js +++ b/dist/constants/list_shift.js @@ -210,8 +210,7 @@ const cC6D5Cl4 = { value: 125.96, label: 'C6D5Cl' }; -const LIST_SHIFT_13C = [noReference, cActicAcidD4Sept, cActicAcidD4S, cAcetoneD6Sep, cAcetoneD6Broad, cAcetonitrileD3Sep, cAcetonitrileD3S, cBenzeneT, cChloroformDT, cCyclohexaneD12Quin, cDichloromethaneD2Quin, cDmfD7Sep1, cDmfD7Sep2, cDmfD7T3, cDioxaneD8Quin, cDmsoD6, cEthanolD6Sep, cEthanolD6Quin, cMethanolD4Sep, cPyridineD5T1, cPyridineD5T2, cPyridineD5T3, cThfD8Quin1, cThfD8Quin2, cTmsS, cTolueneD8Sep1, cTolueneD8T2, cTolueneD8T3, cTolueneD8T4, cTolueneD8T5, cTfaDQ1, cTfaDQ2, cTrifluoroethanolD3Quin, cTrifluoroethanolD3Broad, cC6D5Cl1, cC6D5Cl2, cC6D5Cl3, cC6D5Cl4]; -exports.LIST_SHIFT_13C = LIST_SHIFT_13C; +const LIST_SHIFT_13C = exports.LIST_SHIFT_13C = [noReference, cActicAcidD4Sept, cActicAcidD4S, cAcetoneD6Sep, cAcetoneD6Broad, cAcetonitrileD3Sep, cAcetonitrileD3S, cBenzeneT, cChloroformDT, cCyclohexaneD12Quin, cDichloromethaneD2Quin, cDmfD7Sep1, cDmfD7Sep2, cDmfD7T3, cDioxaneD8Quin, cDmsoD6, cEthanolD6Sep, cEthanolD6Quin, cMethanolD4Sep, cPyridineD5T1, cPyridineD5T2, cPyridineD5T3, cThfD8Quin1, cThfD8Quin2, cTmsS, cTolueneD8Sep1, cTolueneD8T2, cTolueneD8T3, cTolueneD8T4, cTolueneD8T5, cTfaDQ1, cTfaDQ2, cTrifluoroethanolD3Quin, cTrifluoroethanolD3Broad, cC6D5Cl1, cC6D5Cl2, cC6D5Cl3, cC6D5Cl4]; const hActicAcidD4Quin = { name: 'Acetic acid-d4 (quin)', value: 2.04, @@ -396,16 +395,11 @@ const hTrifluoroethanolD32 = { value: 5.02, label: 'Trifluoroethanol-d3' }; -const LIST_SHIFT_1H = [noReference, hActicAcidD4Quin, hActicAcidD4S, hAcetoneD6Quin, hAcetonitrileD3Qquin, hBenzeneS, hChloroformDS, hCyclohexaneD12S, hDeuteriumOxideS, hDichloroethaneD4S, hDichloromethaneD2T, hDMFD7Quin1, hDMFD7Quin2, hDMFD7Broad3, hDioxaneD8Broad, hDMSOD6Quin, hEthanolD6Broad1, hEthanolD6S2, hEthanolD6S3, hMethanolD4Quin, hMethanolD4S, hNitromethaneD3S, hPyridineD5Broad1, hPyridineD5Broad2, hPyridineD5Broad3, hTHFD8S1, hTHFD8S2, hTMSS, hTolueneD8Quin, hTolueneD8Boad2, hTolueneD8S3, hTolueneD8Broad4, hTFADS, hTrifluoroethanolD31, hTrifluoroethanolD32]; -exports.LIST_SHIFT_1H = LIST_SHIFT_1H; -const LIST_SHIFT_19F = []; -exports.LIST_SHIFT_19F = LIST_SHIFT_19F; -const LIST_SHIFT_31P = []; -exports.LIST_SHIFT_31P = LIST_SHIFT_31P; -const LIST_SHIFT_15N = []; -exports.LIST_SHIFT_15N = LIST_SHIFT_15N; -const LIST_SHIFT_29Si = []; -exports.LIST_SHIFT_29Si = LIST_SHIFT_29Si; +const LIST_SHIFT_1H = exports.LIST_SHIFT_1H = [noReference, hActicAcidD4Quin, hActicAcidD4S, hAcetoneD6Quin, hAcetonitrileD3Qquin, hBenzeneS, hChloroformDS, hCyclohexaneD12S, hDeuteriumOxideS, hDichloroethaneD4S, hDichloromethaneD2T, hDMFD7Quin1, hDMFD7Quin2, hDMFD7Broad3, hDioxaneD8Broad, hDMSOD6Quin, hEthanolD6Broad1, hEthanolD6S2, hEthanolD6S3, hMethanolD4Quin, hMethanolD4S, hNitromethaneD3S, hPyridineD5Broad1, hPyridineD5Broad2, hPyridineD5Broad3, hTHFD8S1, hTHFD8S2, hTMSS, hTolueneD8Quin, hTolueneD8Boad2, hTolueneD8S3, hTolueneD8Broad4, hTFADS, hTrifluoroethanolD31, hTrifluoroethanolD32]; +const LIST_SHIFT_19F = exports.LIST_SHIFT_19F = []; +const LIST_SHIFT_31P = exports.LIST_SHIFT_31P = []; +const LIST_SHIFT_15N = exports.LIST_SHIFT_15N = []; +const LIST_SHIFT_29Si = exports.LIST_SHIFT_29Si = []; const getListShift = layoutSt => { switch (layoutSt) { case _list_layout.LIST_LAYOUT.H1: diff --git a/dist/constants/list_ui.js b/dist/constants/list_ui.js index 43cac62d..ad219334 100644 --- a/dist/constants/list_ui.js +++ b/dist/constants/list_ui.js @@ -4,12 +4,11 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.LIST_UI_VIEWER_TYPE = exports.LIST_UI_SWEEP_TYPE = exports.LIST_NON_BRUSH_TYPES = void 0; -const LIST_UI_VIEWER_TYPE = { +const LIST_UI_VIEWER_TYPE = exports.LIST_UI_VIEWER_TYPE = { SPECTRUM: 'spectrum', ANALYSIS: 'analysis' }; -exports.LIST_UI_VIEWER_TYPE = LIST_UI_VIEWER_TYPE; -const LIST_UI_SWEEP_TYPE = { +const LIST_UI_SWEEP_TYPE = exports.LIST_UI_SWEEP_TYPE = { ZOOMIN: 'zoom in', ZOOMRESET: 'zoom reset', INTEGRATION_ADD: 'integration add', @@ -33,6 +32,4 @@ const LIST_UI_SWEEP_TYPE = { CYCLIC_VOLTA_RM_PECKER: 'cyclic voltammetry remove pecker', CYCLIC_VOLTA_SET_REF: 'cyclic voltammetry set ref' }; -exports.LIST_UI_SWEEP_TYPE = LIST_UI_SWEEP_TYPE; -const LIST_NON_BRUSH_TYPES = [LIST_UI_SWEEP_TYPE.PEAK_ADD, LIST_UI_SWEEP_TYPE.PEAK_DELETE, LIST_UI_SWEEP_TYPE.ANCHOR_SHIFT, LIST_UI_SWEEP_TYPE.INTEGRATION_RM, LIST_UI_SWEEP_TYPE.INTEGRATION_SET_REF, LIST_UI_SWEEP_TYPE.MULTIPLICITY_PEAK_ADD, LIST_UI_SWEEP_TYPE.MULTIPLICITY_PEAK_RM, LIST_UI_SWEEP_TYPE.MULTIPLICITY_ONE_CLICK, LIST_UI_SWEEP_TYPE.MULTIPLICITY_ONE_RM, LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_ADD_MAX_PEAK, LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_RM_MAX_PEAK, LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_ADD_MIN_PEAK, LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_RM_MIN_PEAK, LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_ADD_PECKER, LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_RM_PECKER, LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_SET_REF]; -exports.LIST_NON_BRUSH_TYPES = LIST_NON_BRUSH_TYPES; \ No newline at end of file +const LIST_NON_BRUSH_TYPES = exports.LIST_NON_BRUSH_TYPES = [LIST_UI_SWEEP_TYPE.PEAK_ADD, LIST_UI_SWEEP_TYPE.PEAK_DELETE, LIST_UI_SWEEP_TYPE.ANCHOR_SHIFT, LIST_UI_SWEEP_TYPE.INTEGRATION_RM, LIST_UI_SWEEP_TYPE.INTEGRATION_SET_REF, LIST_UI_SWEEP_TYPE.MULTIPLICITY_PEAK_ADD, LIST_UI_SWEEP_TYPE.MULTIPLICITY_PEAK_RM, LIST_UI_SWEEP_TYPE.MULTIPLICITY_ONE_CLICK, LIST_UI_SWEEP_TYPE.MULTIPLICITY_ONE_RM, LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_ADD_MAX_PEAK, LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_RM_MAX_PEAK, LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_ADD_MIN_PEAK, LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_RM_MIN_PEAK, LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_ADD_PECKER, LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_RM_PECKER, LIST_UI_SWEEP_TYPE.CYCLIC_VOLTA_SET_REF]; \ No newline at end of file diff --git a/dist/constants/list_wavelength.js b/dist/constants/list_wavelength.js index 77a2c998..069761ea 100644 --- a/dist/constants/list_wavelength.js +++ b/dist/constants/list_wavelength.js @@ -28,5 +28,4 @@ const MoKalpha = { label: 'Mo K-alpha', unit: 'nm' }; -const LIST_WAVE_LENGTH = [CuKalpha, Fe, Co, MoKalpha]; -exports.LIST_WAVE_LENGTH = LIST_WAVE_LENGTH; \ No newline at end of file +const LIST_WAVE_LENGTH = exports.LIST_WAVE_LENGTH = [CuKalpha, Fe, Co, MoKalpha]; \ No newline at end of file diff --git a/dist/fn.js b/dist/fn.js index 9138b3a6..348a8fe8 100644 --- a/dist/fn.js +++ b/dist/fn.js @@ -20,5 +20,4 @@ const FN = Object.assign({}, _format.default, { CalcMpyCenter: _multiplicity_calc.calcMpyCenter, CarbonFeatures: _carbonFeatures.carbonFeatures }); -var _default = FN; -exports.default = _default; \ No newline at end of file +var _default = exports.default = FN; \ No newline at end of file diff --git a/dist/helpers/brush.js b/dist/helpers/brush.js index f92c45f1..4f4b8024 100644 --- a/dist/helpers/brush.js +++ b/dist/helpers/brush.js @@ -94,10 +94,9 @@ const MountBrush = (focus, isUiAddIntgSt, isUiNoBrushSt) => { } svg.on('wheel', wheeledCb); }; -var _default = MountBrush; // const resetedCb = () => reseted(main); +var _default = exports.default = MountBrush; // const resetedCb = () => reseted(main); // main.svg.on('dblclick', resetedCb); // const reseted = (main) => { // const { selectUiSweepAct } = main; // selectUiSweepAct({ xExtent: false, yExtent: false }); -// }; -exports.default = _default; \ No newline at end of file +// }; \ No newline at end of file diff --git a/dist/helpers/cfg.js b/dist/helpers/cfg.js index ae0364bc..cacd5484 100644 --- a/dist/helpers/cfg.js +++ b/dist/helpers/cfg.js @@ -50,5 +50,4 @@ const Config = { showTwoThreshold, hidePanelCyclicVolta }; -var _default = Config; -exports.default = _default; \ No newline at end of file +var _default = exports.default = Config; \ No newline at end of file diff --git a/dist/helpers/chem.js b/dist/helpers/chem.js index 88876dd1..d9a0518a 100644 --- a/dist/helpers/chem.js +++ b/dist/helpers/chem.js @@ -87,8 +87,7 @@ const convertTopic = (topic, layout, feature, offset) => { return calcXY(xs, ys, maxY, offset); }; exports.convertTopic = convertTopic; -const Topic2Seed = (0, _reselect.createSelector)(getTopic, getLayout, getFeature, getShiftOffset, convertTopic); -exports.Topic2Seed = Topic2Seed; +const Topic2Seed = exports.Topic2Seed = (0, _reselect.createSelector)(getTopic, getLayout, getFeature, getShiftOffset, convertTopic); const getOthers = (_, props) => props.comparisons; const calcRescaleXY = (xs, ys, minY, maxY, show) => { const sp = []; @@ -126,8 +125,7 @@ const convertComparisons = (layout, comparisons, feature) => { return calcRescaleXY(xs, ys, minY, maxY, show); }); }; -const GetComparisons = (0, _reselect.createSelector)(getLayout, getOthers, getFeature, convertComparisons); -exports.GetComparisons = GetComparisons; +const GetComparisons = exports.GetComparisons = (0, _reselect.createSelector)(getLayout, getOthers, getFeature, convertComparisons); const convertFrequency = (layout, feature) => { if (['1H', '13C', '19F', '31P', '15N', '29Si'].indexOf(layout) < 0) return false; const { @@ -136,8 +134,7 @@ const convertFrequency = (layout, feature) => { const freq = Array.isArray(observeFrequency) ? observeFrequency[0] : observeFrequency; return parseFloat(freq) || false; }; -const ToFrequency = (0, _reselect.createSelector)(getLayout, getFeature, convertFrequency); -exports.ToFrequency = ToFrequency; +const ToFrequency = exports.ToFrequency = (0, _reselect.createSelector)(getLayout, getFeature, convertFrequency); const getThreshold = state => state.threshold ? state.threshold.value * 1.0 : false; const Convert2Peak = function (feature, threshold, offset) { let upThreshold = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false; @@ -202,8 +199,7 @@ const Convert2Peak = function (feature, threshold, offset) { return peak; }; exports.Convert2Peak = Convert2Peak; -const Feature2Peak = (0, _reselect.createSelector)(getFeature, getThreshold, getShiftOffset, Convert2Peak); -exports.Feature2Peak = Feature2Peak; +const Feature2Peak = exports.Feature2Peak = (0, _reselect.createSelector)(getFeature, getThreshold, getShiftOffset, Convert2Peak); const Convert2MaxMinPeak = (layout, feature, offset) => { const peaks = { max: [], @@ -277,8 +273,7 @@ const Convert2MaxMinPeak = (layout, feature, offset) => { return peaks; }; exports.Convert2MaxMinPeak = Convert2MaxMinPeak; -const Feature2MaxMinPeak = (0, _reselect.createSelector)(getLayout, getFeature, getShiftOffset, Convert2MaxMinPeak); -exports.Feature2MaxMinPeak = Feature2MaxMinPeak; +const Feature2MaxMinPeak = exports.Feature2MaxMinPeak = (0, _reselect.createSelector)(getLayout, getFeature, getShiftOffset, Convert2MaxMinPeak); const convertThresEndPts = (feature, threshold) => { const { maxY, @@ -298,8 +293,7 @@ const convertThresEndPts = (feature, threshold) => { }]; return endPts; }; -const ToThresEndPts = (0, _reselect.createSelector)(getFeature, getThreshold, convertThresEndPts); -exports.ToThresEndPts = ToThresEndPts; +const ToThresEndPts = exports.ToThresEndPts = (0, _reselect.createSelector)(getFeature, getThreshold, convertThresEndPts); const getShiftPeak = state => { const { curve, @@ -324,12 +318,11 @@ const convertSfPeaks = (peak, offset) => { y: peak.y }]; }; -const ToShiftPeaks = (0, _reselect.createSelector)(getShiftPeak, getShiftOffset, convertSfPeaks); +const ToShiftPeaks = exports.ToShiftPeaks = (0, _reselect.createSelector)(getShiftPeak, getShiftOffset, convertSfPeaks); // - - - - - - - - - - - - - - - - - - - - - - // ExtractJcamp // - - - - - - - - - - - - - - - - - - - - - - -exports.ToShiftPeaks = ToShiftPeaks; const readLayout = jcamp => { const { xType, @@ -382,6 +375,9 @@ const readLayout = jcamp => { if (dataType.includes('DLS intensity')) { return _list_layout.LIST_LAYOUT.DLS_INTENSITY; } + if (dataType.includes('MASS CHROMATOGRAM')) { + return _list_layout.LIST_LAYOUT.MASS_CHROMATOGRAM; + } } return false; }; diff --git a/dist/helpers/format.js b/dist/helpers/format.js index e2eb4820..a6ba861a 100644 --- a/dist/helpers/format.js +++ b/dist/helpers/format.js @@ -134,6 +134,10 @@ const spectraOps = { [_list_layout.LIST_LAYOUT.DLS_INTENSITY]: { head: 'DLS', tail: '.' + }, + [_list_layout.LIST_LAYOUT.MASS_CHROMATOGRAM]: { + head: 'MASS CHROMATOGRAM', + tail: '.' } }; const rmRef = function (peaks, shift) { @@ -431,6 +435,7 @@ 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; const isDLSIntensityLayout = layoutSt => _list_layout.LIST_LAYOUT.DLS_INTENSITY === layoutSt; +const isMassChromatogramLayout = layoutSt => _list_layout.LIST_LAYOUT.MASS_CHROMATOGRAM === layoutSt; const getNmrTyp = layout => { switch (layout) { case _list_layout.LIST_LAYOUT.H1: @@ -526,7 +531,7 @@ const Format = { hasMultiCurves, isAIFLayout, isDLSACFLayout, - strNumberFixedDecimal + strNumberFixedDecimal, + isMassChromatogramLayout }; -var _default = Format; -exports.default = _default; \ No newline at end of file +var _default = exports.default = Format; \ No newline at end of file diff --git a/dist/helpers/multiplicity.js b/dist/helpers/multiplicity.js index 155038e2..c1a420b4 100644 --- a/dist/helpers/multiplicity.js +++ b/dist/helpers/multiplicity.js @@ -4,8 +4,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.mpyBasicPatterns = exports.groupInterval = exports.getInterval = void 0; -const mpyBasicPatterns = ['s', 'd', 't', 'q', 'quint', 'h', 'sept', 'o', 'n']; -exports.mpyBasicPatterns = mpyBasicPatterns; +const mpyBasicPatterns = exports.mpyBasicPatterns = ['s', 'd', 't', 'q', 'quint', 'h', 'sept', 'o', 'n']; const getInterval = peaks => { let itvs = []; for (let idx = 0; idx < peaks.length - 1; idx += 1) { diff --git a/dist/helpers/zoom.js b/dist/helpers/zoom.js index a54d1a41..623e15bc 100644 --- a/dist/helpers/zoom.js +++ b/dist/helpers/zoom.js @@ -21,5 +21,4 @@ const MountZoom = (main, zoomed) => { main.zoom.on('zoom', zoomedCb); main.svg.call(main.zoom).on('contextmenu.zoom', resetZoomCb); }; -var _default = MountZoom; -exports.default = _default; \ No newline at end of file +var _default = exports.default = MountZoom; \ No newline at end of file diff --git a/dist/index.js b/dist/index.js index a9976f61..e2f3dc52 100644 --- a/dist/index.js +++ b/dist/index.js @@ -3,9 +3,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault"); var _react = _interopRequireDefault(require("react")); var _reactDom = _interopRequireDefault(require("react-dom")); -var _InputBase = _interopRequireDefault(require("@material-ui/core/InputBase")); -var _Grid = _interopRequireDefault(require("@material-ui/core/Grid")); -var _Button = _interopRequireDefault(require("@material-ui/core/Button")); +var _material = require("@mui/material"); var _reactQuill = _interopRequireDefault(require("react-quill")); var _app = require("./app"); var _nmr1h_jcamp = _interopRequireDefault(require("./__tests__/fixtures/nmr1h_jcamp")); @@ -46,6 +44,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 _mass_chromatogram_jcamp = _interopRequireDefault(require("./__tests__/fixtures/mass_chromatogram_jcamp")); /* eslint-disable prefer-object-spread, default-param-last, no-nested-ternary */ const nmr1HEntity = _app.FN.ExtractJcamp(_nmr1h_jcamp.default); @@ -81,6 +80,7 @@ const aifEntity2 = _app.FN.ExtractJcamp(_aif_jcamp_2.default); const emissionsEntity = _app.FN.ExtractJcamp(_emissions_jcamp.default); const dlsAcfEntity = _app.FN.ExtractJcamp(_dls_acf_jcamp.default); const dlsIntensityEntity = _app.FN.ExtractJcamp(_dls_intensity_jcamp.default); +const massChromatogramEntity = _app.FN.ExtractJcamp(_mass_chromatogram_jcamp.default); class DemoWriteIr extends _react.default.Component { constructor(props) { super(props); @@ -174,6 +174,8 @@ class DemoWriteIr extends _react.default.Component { return dlsAcfEntity; case 'dls intensity': return dlsIntensityEntity; + case 'mass chromatogram': + return massChromatogramEntity; case 'ms': default: return msEntity; @@ -232,6 +234,7 @@ class DemoWriteIr extends _react.default.Component { case 'emissions': case 'dls acf': case 'dls intensity': + case 'mass chromatogram': default: return false; } @@ -538,151 +541,157 @@ class DemoWriteIr extends _react.default.Component { style: { margin: '0 0 15px 55px' } - }, /*#__PURE__*/_react.default.createElement(_Button.default, { + }, /*#__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(_Button.default, { + }, "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(_Button.default, { + }, "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(_Button.default, { + }, "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(_Button.default, { + }, "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(_Button.default, { + }, "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(_Button.default, { + }, "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(_Button.default, { + }, "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(_Button.default, { + }, "IR"), /*#__PURE__*/_react.default.createElement(_material.Button, { variant: "contained", style: { margin: '0 10px 0 10px' }, onClick: this.onClick('raman') - }, "RAMAN"), /*#__PURE__*/_react.default.createElement(_Button.default, { + }, "RAMAN"), /*#__PURE__*/_react.default.createElement(_material.Button, { variant: "contained", style: { margin: '0 10px 0 10px' }, onClick: this.onClick('uv/vis') - }, "UV/VIS"), /*#__PURE__*/_react.default.createElement(_Button.default, { + }, "UV/VIS"), /*#__PURE__*/_react.default.createElement(_material.Button, { variant: "contained", style: { margin: '0 10px 0 10px' }, onClick: this.onClick('hplc uv/vis') - }, "HPLC UV/VIS"), /*#__PURE__*/_react.default.createElement(_Button.default, { + }, "HPLC UV/VIS"), /*#__PURE__*/_react.default.createElement(_material.Button, { variant: "contained", style: { margin: '0 10px 0 10px' }, onClick: this.onClick('tga') - }, "TGA"), /*#__PURE__*/_react.default.createElement(_Button.default, { + }, "TGA"), /*#__PURE__*/_react.default.createElement(_material.Button, { variant: "contained", style: { margin: '0 10px 0 10px' }, onClick: this.onClick('xrd') - }, "XRD"), /*#__PURE__*/_react.default.createElement(_Button.default, { + }, "XRD"), /*#__PURE__*/_react.default.createElement(_material.Button, { variant: "contained", style: { margin: '0 10px 0 10px' }, onClick: this.onClick('cyclic volta') - }, "CV"), /*#__PURE__*/_react.default.createElement(_Button.default, { + }, "CV"), /*#__PURE__*/_react.default.createElement(_material.Button, { variant: "contained", style: { margin: '0 10px 0 10px' }, onClick: this.onClick('cds') - }, "CDS"), /*#__PURE__*/_react.default.createElement(_Button.default, { + }, "CDS"), /*#__PURE__*/_react.default.createElement(_material.Button, { variant: "contained", style: { margin: '0 10px 0 10px' }, onClick: this.onClick('sec') - }, "SEC"), /*#__PURE__*/_react.default.createElement(_Button.default, { + }, "SEC"), /*#__PURE__*/_react.default.createElement(_material.Button, { variant: "contained", style: { margin: '0 10px 0 10px' }, onClick: this.onClick('aif') - }, "SOPTION-DESORPTION"), /*#__PURE__*/_react.default.createElement(_Button.default, { + }, "SOPTION-DESORPTION"), /*#__PURE__*/_react.default.createElement(_material.Button, { variant: "contained", style: { margin: '0 10px 0 10px' }, onClick: this.onClick('emissions') - }, "EMISSIONS"), /*#__PURE__*/_react.default.createElement(_Button.default, { + }, "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(_Button.default, { + }, "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(_Button.default, { + }, "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(_Button.default, { + }, "MS"), /*#__PURE__*/_react.default.createElement(_material.Button, { + variant: "contained", + style: { + margin: '0 10px 0 10px' + }, + onClick: this.onClick('mass chromatogram') + }, "Mass chromatogram"), /*#__PURE__*/_react.default.createElement(_Button.default, { variant: "contained", style: { margin: '0 10px 0 10px' }, onClick: this.onClick('multi') - }, "Multi NMR"), /*#__PURE__*/_react.default.createElement(_Button.default, { + }, "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(_Button.default, { + }, "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(_Button.default, { + }, "Multi HPLC"), /*#__PURE__*/_react.default.createElement(_material.Button, { variant: "contained", style: { margin: '0 10px 0 10px' @@ -708,12 +717,12 @@ class DemoWriteIr extends _react.default.Component { toolbar: false }, readOnly: true - })), /*#__PURE__*/_react.default.createElement(_Grid.default, { + })), /*#__PURE__*/_react.default.createElement(_material.Grid, { container: true - }, /*#__PURE__*/_react.default.createElement(_Grid.default, { + }, /*#__PURE__*/_react.default.createElement(_material.Grid, { item: true, xs: 10 - }, /*#__PURE__*/_react.default.createElement(_InputBase.default, { + }, /*#__PURE__*/_react.default.createElement(_material.InputBase, { style: { margin: '0 0 0 63px' }, diff --git a/dist/layer_content.js b/dist/layer_content.js index c2208292..d19f7380 100644 --- a/dist/layer_content.js +++ b/dist/layer_content.js @@ -101,5 +101,4 @@ Content.propTypes = { operations: _propTypes.default.array.isRequired, layoutSt: _propTypes.default.string.isRequired }; -var _default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps))(Content); -exports.default = _default; \ No newline at end of file +var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps))(Content); \ No newline at end of file diff --git a/dist/layer_init.js b/dist/layer_init.js index d54f4705..e2fac642 100644 --- a/dist/layer_init.js +++ b/dist/layer_init.js @@ -9,7 +9,7 @@ var _react = _interopRequireDefault(require("react")); var _propTypes = _interopRequireDefault(require("prop-types")); var _reactRedux = require("react-redux"); var _redux = require("redux"); -var _styles = require("@material-ui/core/styles"); +var _styles = require("@mui/styles"); var _submit = require("./actions/submit"); var _manager = require("./actions/manager"); var _meta = require("./actions/meta"); @@ -214,7 +214,6 @@ LayerInit.propTypes = { setAllCurvesAct: _propTypes.default.func.isRequired, userManualLink: _propTypes.default.object // eslint-disable-line }; -var _default = (0, _reactRedux.connect)( +var _default = exports.default = (0, _reactRedux.connect)( // eslint-disable-line -mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(LayerInit)); // eslint-disable-line -exports.default = _default; \ No newline at end of file +mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(LayerInit)); // eslint-disable-line \ No newline at end of file diff --git a/dist/layer_prism.js b/dist/layer_prism.js index e30304a8..1c9dbf0d 100644 --- a/dist/layer_prism.js +++ b/dist/layer_prism.js @@ -9,8 +9,8 @@ var _react = _interopRequireDefault(require("react")); var _propTypes = _interopRequireDefault(require("prop-types")); var _reactRedux = require("react-redux"); var _redux = require("redux"); -var _Grid = _interopRequireDefault(require("@material-ui/core/Grid")); -var _styles = require("@material-ui/core/styles"); +var _Grid = _interopRequireDefault(require("@mui/material/Grid")); +var _styles = require("@mui/styles"); var _index = _interopRequireDefault(require("./components/panel/index")); var _index2 = _interopRequireDefault(require("./components/cmd_bar/index")); var _layer_content = _interopRequireDefault(require("./layer_content")); @@ -131,7 +131,6 @@ LayerPrism.propTypes = { canChangeDescription: _propTypes.default.bool.isRequired, onDescriptionChanged: _propTypes.default.func }; -var _default = (0, _reactRedux.connect)( +var _default = exports.default = (0, _reactRedux.connect)( // eslint-disable-line -mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(LayerPrism)); // eslint-disable-line -exports.default = _default; \ No newline at end of file +mapStateToProps, mapDispatchToProps)((0, _styles.withStyles)(styles)(LayerPrism)); // eslint-disable-line \ No newline at end of file diff --git a/dist/reducers/index.js b/dist/reducers/index.js index 0eed6edd..7757dfb2 100644 --- a/dist/reducers/index.js +++ b/dist/reducers/index.js @@ -44,5 +44,4 @@ const rootReducer = (0, _redux.combineReducers)({ cyclicvolta: _reducer_voltammetry.default, curve: _reducer_curve.default }); -var _default = rootReducer; -exports.default = _default; \ No newline at end of file +var _default = exports.default = rootReducer; \ No newline at end of file diff --git a/dist/reducers/reducer_curve.js b/dist/reducers/reducer_curve.js index 7816c399..7e244fd1 100644 --- a/dist/reducers/reducer_curve.js +++ b/dist/reducers/reducer_curve.js @@ -73,5 +73,4 @@ const curveReducer = function () { return state; } }; -var _default = curveReducer; -exports.default = _default; \ No newline at end of file +var _default = exports.default = curveReducer; \ No newline at end of file diff --git a/dist/reducers/reducer_edit_peak.js b/dist/reducers/reducer_edit_peak.js index 2fca5bf3..4cdb8232 100644 --- a/dist/reducers/reducer_edit_peak.js +++ b/dist/reducers/reducer_edit_peak.js @@ -208,5 +208,4 @@ const editPeakReducer = function () { } }; const undoableEditPeakReducer = (0, _reduxUndo.default)(editPeakReducer, _undo_redo_config.undoRedoConfig); -var _default = undoableEditPeakReducer; -exports.default = _default; \ No newline at end of file +var _default = exports.default = undoableEditPeakReducer; \ No newline at end of file diff --git a/dist/reducers/reducer_forecast.js b/dist/reducers/reducer_forecast.js index 7f06b9d1..cecf7278 100644 --- a/dist/reducers/reducer_forecast.js +++ b/dist/reducers/reducer_forecast.js @@ -119,5 +119,4 @@ const forecastReducer = function () { return state; } }; -var _default = forecastReducer; -exports.default = _default; \ No newline at end of file +var _default = exports.default = forecastReducer; \ No newline at end of file diff --git a/dist/reducers/reducer_integration.js b/dist/reducers/reducer_integration.js index 0d009fc7..0fd8b983 100644 --- a/dist/reducers/reducer_integration.js +++ b/dist/reducers/reducer_integration.js @@ -233,5 +233,4 @@ const integrationReducer = function () { } }; const undoableIntegrationReducer = (0, _reduxUndo.default)(integrationReducer, _undo_redo_config.undoRedoConfig); -var _default = undoableIntegrationReducer; -exports.default = _default; \ No newline at end of file +var _default = exports.default = undoableIntegrationReducer; \ No newline at end of file diff --git a/dist/reducers/reducer_jcamp.js b/dist/reducers/reducer_jcamp.js index 2044ac4e..a4d475f6 100644 --- a/dist/reducers/reducer_jcamp.js +++ b/dist/reducers/reducer_jcamp.js @@ -99,5 +99,4 @@ const layoutReducer = function () { return state; } }; -var _default = layoutReducer; -exports.default = _default; \ No newline at end of file +var _default = exports.default = layoutReducer; \ No newline at end of file diff --git a/dist/reducers/reducer_layout.js b/dist/reducers/reducer_layout.js index c99b8bda..95b82d53 100644 --- a/dist/reducers/reducer_layout.js +++ b/dist/reducers/reducer_layout.js @@ -21,5 +21,4 @@ const layoutReducer = function () { return state; } }; -var _default = layoutReducer; -exports.default = _default; \ No newline at end of file +var _default = exports.default = layoutReducer; \ No newline at end of file diff --git a/dist/reducers/reducer_manager.js b/dist/reducers/reducer_manager.js index 7924c69b..e7535ed5 100644 --- a/dist/reducers/reducer_manager.js +++ b/dist/reducers/reducer_manager.js @@ -16,5 +16,4 @@ const managerReducer = function () { return state; } }; -var _default = managerReducer; -exports.default = _default; \ No newline at end of file +var _default = exports.default = managerReducer; \ No newline at end of file diff --git a/dist/reducers/reducer_meta.js b/dist/reducers/reducer_meta.js index 9b64b1d3..c9b796a4 100644 --- a/dist/reducers/reducer_meta.js +++ b/dist/reducers/reducer_meta.js @@ -25,5 +25,4 @@ const metaReducer = function () { return state; } }; -var _default = metaReducer; -exports.default = _default; \ No newline at end of file +var _default = exports.default = metaReducer; \ No newline at end of file diff --git a/dist/reducers/reducer_multiplicity.js b/dist/reducers/reducer_multiplicity.js index 27029c7c..9785172f 100644 --- a/dist/reducers/reducer_multiplicity.js +++ b/dist/reducers/reducer_multiplicity.js @@ -196,5 +196,4 @@ const multiplicityReducer = function () { } }; const undoableMultiplicityReducer = (0, _reduxUndo.default)(multiplicityReducer, _undo_redo_config.undoRedoConfig); -var _default = undoableMultiplicityReducer; -exports.default = _default; \ No newline at end of file +var _default = exports.default = undoableMultiplicityReducer; \ No newline at end of file diff --git a/dist/reducers/reducer_scan.js b/dist/reducers/reducer_scan.js index 4d746422..e870a829 100644 --- a/dist/reducers/reducer_scan.js +++ b/dist/reducers/reducer_scan.js @@ -45,5 +45,4 @@ const scanReducer = function () { return state; } }; -var _default = scanReducer; -exports.default = _default; \ No newline at end of file +var _default = exports.default = scanReducer; \ No newline at end of file diff --git a/dist/reducers/reducer_shift.js b/dist/reducers/reducer_shift.js index 31d271e7..8d5511fc 100644 --- a/dist/reducers/reducer_shift.js +++ b/dist/reducers/reducer_shift.js @@ -242,5 +242,4 @@ const shiftReducer = function () { return state; } }; -var _default = shiftReducer; -exports.default = _default; \ No newline at end of file +var _default = exports.default = shiftReducer; \ No newline at end of file diff --git a/dist/reducers/reducer_simulation.js b/dist/reducers/reducer_simulation.js index 66390439..a74c426e 100644 --- a/dist/reducers/reducer_simulation.js +++ b/dist/reducers/reducer_simulation.js @@ -24,5 +24,4 @@ const simulatioinReducer = function () { return state; } }; -var _default = simulatioinReducer; -exports.default = _default; \ No newline at end of file +var _default = exports.default = simulatioinReducer; \ No newline at end of file diff --git a/dist/reducers/reducer_status.js b/dist/reducers/reducer_status.js index 0b444087..e0382afa 100644 --- a/dist/reducers/reducer_status.js +++ b/dist/reducers/reducer_status.js @@ -46,5 +46,4 @@ const statusReducer = function () { return initialState; } }; -var _default = statusReducer; -exports.default = _default; \ No newline at end of file +var _default = exports.default = statusReducer; \ No newline at end of file diff --git a/dist/reducers/reducer_submit.js b/dist/reducers/reducer_submit.js index 0cb0461e..5d672703 100644 --- a/dist/reducers/reducer_submit.js +++ b/dist/reducers/reducer_submit.js @@ -58,5 +58,4 @@ const submitReducer = function () { return state; } }; -var _default = submitReducer; -exports.default = _default; \ No newline at end of file +var _default = exports.default = submitReducer; \ No newline at end of file diff --git a/dist/reducers/reducer_threshold.js b/dist/reducers/reducer_threshold.js index 96960c21..a748e146 100644 --- a/dist/reducers/reducer_threshold.js +++ b/dist/reducers/reducer_threshold.js @@ -49,5 +49,4 @@ const thresholdReducer = function () { return state; } }; -var _default = thresholdReducer; -exports.default = _default; \ No newline at end of file +var _default = exports.default = thresholdReducer; \ No newline at end of file diff --git a/dist/reducers/reducer_ui.js b/dist/reducers/reducer_ui.js index c9f3e8c2..b1f6aff5 100644 --- a/dist/reducers/reducer_ui.js +++ b/dist/reducers/reducer_ui.js @@ -48,5 +48,4 @@ const uiReducer = function () { return state; } }; -var _default = uiReducer; -exports.default = _default; \ No newline at end of file +var _default = exports.default = uiReducer; \ No newline at end of file diff --git a/dist/reducers/reducer_voltammetry.js b/dist/reducers/reducer_voltammetry.js index eb22b26e..29e826d3 100644 --- a/dist/reducers/reducer_voltammetry.js +++ b/dist/reducers/reducer_voltammetry.js @@ -340,5 +340,4 @@ const cyclicVoltaReducer = function () { return state; } }; -var _default = cyclicVoltaReducer; -exports.default = _default; \ No newline at end of file +var _default = exports.default = cyclicVoltaReducer; \ No newline at end of file diff --git a/dist/reducers/reducer_wavelength.js b/dist/reducers/reducer_wavelength.js index 50ee50e4..424df2a1 100644 --- a/dist/reducers/reducer_wavelength.js +++ b/dist/reducers/reducer_wavelength.js @@ -19,5 +19,4 @@ const wavelengthReducer = function () { return state; } }; -var _default = wavelengthReducer; -exports.default = _default; \ No newline at end of file +var _default = exports.default = wavelengthReducer; \ No newline at end of file diff --git a/dist/reducers/undo_redo_config.js b/dist/reducers/undo_redo_config.js index cb64f144..b4248a57 100644 --- a/dist/reducers/undo_redo_config.js +++ b/dist/reducers/undo_redo_config.js @@ -6,14 +6,12 @@ Object.defineProperty(exports, "__esModule", { exports.undoRedoConfig = exports.undoRedoActions = void 0; var _reduxUndo = require("redux-undo"); var _action_type = require("../constants/action_type"); -const undoRedoActions = [_action_type.EDITPEAK.ADD_POSITIVE, _action_type.EDITPEAK.ADD_NEGATIVE, _action_type.EDITPEAK.RM_POSITIVE, _action_type.EDITPEAK.RM_NEGATIVE, _action_type.EDITPEAK.SHIFT, _action_type.MANAGER.RESETALL, _action_type.MANAGER.RESETSHIFT, _action_type.MANAGER.RESET_INIT_COMMON, _action_type.MANAGER.RESET_INIT_NMR, _action_type.MANAGER.RESET_INIT_MS, _action_type.MANAGER.RESET_INIT_COMMON_WITH_INTERGATION, _action_type.UI.SWEEP.SELECT_INTEGRATION, _action_type.UI.SWEEP.SELECT_MULTIPLICITY_RDC, _action_type.INTEGRATION.RM_ONE, _action_type.INTEGRATION.SET_REF, _action_type.INTEGRATION.SET_FKR, _action_type.INTEGRATION.RESET_ALL, _action_type.INTEGRATION.CLEAR_ALL, _action_type.MULTIPLICITY.PEAK_RM_BY_PANEL_RDC, _action_type.MULTIPLICITY.PEAK_RM_BY_UI_RDC, _action_type.MULTIPLICITY.PEAK_ADD_BY_UI_RDC, _action_type.MULTIPLICITY.RESET_ONE_RDC, _action_type.MULTIPLICITY.UPDATE_J, _action_type.MULTIPLICITY.TYPE_SELECT_RDC, _action_type.MULTIPLICITY.ONE_CLICK, _action_type.MULTIPLICITY.ONE_CLICK_BY_UI, _action_type.MULTIPLICITY.RESET_ALL_RDC, _action_type.MULTIPLICITY.CLEAR_ALL]; -exports.undoRedoActions = undoRedoActions; -const undoRedoConfig = { +const undoRedoActions = exports.undoRedoActions = [_action_type.EDITPEAK.ADD_POSITIVE, _action_type.EDITPEAK.ADD_NEGATIVE, _action_type.EDITPEAK.RM_POSITIVE, _action_type.EDITPEAK.RM_NEGATIVE, _action_type.EDITPEAK.SHIFT, _action_type.MANAGER.RESETALL, _action_type.MANAGER.RESETSHIFT, _action_type.MANAGER.RESET_INIT_COMMON, _action_type.MANAGER.RESET_INIT_NMR, _action_type.MANAGER.RESET_INIT_MS, _action_type.MANAGER.RESET_INIT_COMMON_WITH_INTERGATION, _action_type.UI.SWEEP.SELECT_INTEGRATION, _action_type.UI.SWEEP.SELECT_MULTIPLICITY_RDC, _action_type.INTEGRATION.RM_ONE, _action_type.INTEGRATION.SET_REF, _action_type.INTEGRATION.SET_FKR, _action_type.INTEGRATION.RESET_ALL, _action_type.INTEGRATION.CLEAR_ALL, _action_type.MULTIPLICITY.PEAK_RM_BY_PANEL_RDC, _action_type.MULTIPLICITY.PEAK_RM_BY_UI_RDC, _action_type.MULTIPLICITY.PEAK_ADD_BY_UI_RDC, _action_type.MULTIPLICITY.RESET_ONE_RDC, _action_type.MULTIPLICITY.UPDATE_J, _action_type.MULTIPLICITY.TYPE_SELECT_RDC, _action_type.MULTIPLICITY.ONE_CLICK, _action_type.MULTIPLICITY.ONE_CLICK_BY_UI, _action_type.MULTIPLICITY.RESET_ALL_RDC, _action_type.MULTIPLICITY.CLEAR_ALL]; +const undoRedoConfig = exports.undoRedoConfig = { debug: false, limit: 10, ignoreInitialState: true, filter: (0, _reduxUndo.includeAction)(undoRedoActions), clearHistoryType: [_action_type.EDITPEAK.SHIFT, _action_type.MANAGER.RESETALL, _action_type.MANAGER.RESETSHIFT, _action_type.MANAGER.RESET_INIT_COMMON, _action_type.MANAGER.RESET_INIT_NMR, _action_type.MANAGER.RESET_INIT_MS, _action_type.MANAGER.RESET_INIT_COMMON_WITH_INTERGATION], neverSkipReducer: [_action_type.EDITPEAK.SHIFT, _action_type.MANAGER.RESETALL, _action_type.MANAGER.RESETSHIFT, _action_type.MANAGER.RESET_INIT_COMMON, _action_type.MANAGER.RESET_INIT_NMR, _action_type.MANAGER.RESET_INIT_MS, _action_type.MANAGER.RESET_INIT_COMMON_WITH_INTERGATION] -}; -exports.undoRedoConfig = undoRedoConfig; \ No newline at end of file +}; \ No newline at end of file diff --git a/dist/sagas/saga_edit_peak.js b/dist/sagas/saga_edit_peak.js index b331ef2d..a68ad59d 100644 --- a/dist/sagas/saga_edit_peak.js +++ b/dist/sagas/saga_edit_peak.js @@ -61,7 +61,7 @@ function* addVirtualFactor(action) { }); } const editPeakSagas = [(0, _effects.takeEvery)(_action_type.SHIFT.SET_REF, addVirtualFactor), (0, _effects.takeEvery)(_action_type.SHIFT.SET_PEAK, addVirtualFactor)]; -var _default = editPeakSagas; +var _default = exports.default = editPeakSagas; /* LOGIC -no po - tg | picked | another | absoffset | prevOffset | relative | newOffset @@ -72,5 +72,4 @@ var _default = editPeakSagas; 3 | 20 0 +20 -100 -120 ------------------------------------------------------------------- -*/ -exports.default = _default; \ No newline at end of file +*/ \ No newline at end of file diff --git a/dist/sagas/saga_manager.js b/dist/sagas/saga_manager.js index 108103f0..e87aec57 100644 --- a/dist/sagas/saga_manager.js +++ b/dist/sagas/saga_manager.js @@ -94,5 +94,4 @@ function* resetInitCommonWithIntergation(action) { } } const managerSagas = [(0, _effects.takeEvery)(_action_type.MANAGER.RESETALL, resetShift), (0, _effects.takeEvery)(_action_type.MANAGER.RESET_INIT_NMR, resetInitNmr), (0, _effects.takeEvery)(_action_type.MANAGER.RESET_INIT_COMMON_WITH_INTERGATION, resetInitCommonWithIntergation)]; -var _default = managerSagas; -exports.default = _default; \ No newline at end of file +var _default = exports.default = managerSagas; \ No newline at end of file diff --git a/dist/sagas/saga_meta.js b/dist/sagas/saga_meta.js index 9ec49869..fb1ebbad 100644 --- a/dist/sagas/saga_meta.js +++ b/dist/sagas/saga_meta.js @@ -33,5 +33,4 @@ function* updateMetaPeaks(action) { }); } const metaSagas = [(0, _effects.takeEvery)(_action_type.META.UPDATE_PEAKS, updateMetaPeaks)]; -var _default = metaSagas; -exports.default = _default; \ No newline at end of file +var _default = exports.default = metaSagas; \ No newline at end of file diff --git a/dist/sagas/saga_multi_entities.js b/dist/sagas/saga_multi_entities.js index 2d8b0b94..fa644f9a 100644 --- a/dist/sagas/saga_multi_entities.js +++ b/dist/sagas/saga_multi_entities.js @@ -73,5 +73,4 @@ function* setCyclicVoltametry(action) { } } const multiEntitiesSagas = [(0, _effects.takeEvery)(_action_type.CURVE.SET_ALL_CURVES, setCyclicVoltametry)]; -var _default = multiEntitiesSagas; -exports.default = _default; \ No newline at end of file +var _default = exports.default = multiEntitiesSagas; \ No newline at end of file diff --git a/dist/sagas/saga_multiplicity.js b/dist/sagas/saga_multiplicity.js index e771f8e6..6c1ef7c1 100644 --- a/dist/sagas/saga_multiplicity.js +++ b/dist/sagas/saga_multiplicity.js @@ -379,5 +379,4 @@ function* selectMpyType(action) { }); } const multiplicitySagas = [(0, _effects.takeEvery)(_action_type.UI.SWEEP.SELECT_MULTIPLICITY, selectMpy), (0, _effects.takeEvery)(_action_type.MULTIPLICITY.PEAK_ADD_BY_UI_SAG, addUiPeakToStack), (0, _effects.takeEvery)(_action_type.MULTIPLICITY.PEAK_RM_BY_PANEL, rmPanelPeakFromStack), (0, _effects.takeEvery)(_action_type.MULTIPLICITY.PEAK_RM_BY_UI, rmUiPeakFromStack), (0, _effects.takeEvery)(_action_type.MULTIPLICITY.TYPE_SELECT, selectMpyType), (0, _effects.takeEvery)(_action_type.MULTIPLICITY.RESET_ONE, resetOne), (0, _effects.takeEvery)(_action_type.MANAGER.RESET_INIT_NMR, resetInitNmr)]; -var _default = multiplicitySagas; -exports.default = _default; \ No newline at end of file +var _default = exports.default = multiplicitySagas; \ No newline at end of file diff --git a/dist/sagas/saga_ui.js b/dist/sagas/saga_ui.js index 9efd74ec..48da5752 100644 --- a/dist/sagas/saga_ui.js +++ b/dist/sagas/saga_ui.js @@ -317,5 +317,4 @@ function* clickUiTarget(action) { } } const managerSagas = [(0, _effects.takeEvery)(_action_type.UI.CLICK_TARGET, clickUiTarget), (0, _effects.takeEvery)(_action_type.UI.SWEEP.SELECT, selectUiSweep), (0, _effects.takeEvery)(_action_type.UI.WHEEL.SCROLL, scrollUiWheel)]; -var _default = managerSagas; -exports.default = _default; \ No newline at end of file +var _default = exports.default = managerSagas; \ No newline at end of file diff --git a/dist/third_party/jAnalyzer.js b/dist/third_party/jAnalyzer.js index b6186956..84032a1d 100644 --- a/dist/third_party/jAnalyzer.js +++ b/dist/third_party/jAnalyzer.js @@ -15,7 +15,7 @@ const patterns = ['s', 'd', 't', 'q', 'quint', 'h', 'sept', 'o', 'n']; let symRatio = 1.5; let maxErrorIter1 = 2.5; // Hz let maxErrorIter2 = 1; // Hz -var _default = { +var _default = exports.default = { /** * The compilation process implements at the first stage a normalization procedure described by Golotvin et al. * embedding in peak-component-counting method described by Hoyes et al. @@ -138,7 +138,6 @@ var _default = { * @param {*} signal * @param {*} Jc */ -exports.default = _default; function updateSignal(signal, Jc) { // Update the limits of the signal let peaks = signal.peaksComp; // Always in Hz diff --git a/package.json b/package.json index ca9a1ef2..c493909b 100644 --- a/package.json +++ b/package.json @@ -8,33 +8,31 @@ }, "license": "AGPL-3.0", "dependencies": { - "@babel/preset-env": "^7.21.5", - "@babel/preset-react": "^7.18.6", "@complat/react-svg-file-zoom-pan": "1.1.1", - "@material-ui/core": "^4.10.0", - "@material-ui/icons": "^4.10.0", - "@mdi/js": "^4.7.95", - "@mdi/react": "^1.2.1", - "@testing-library/jest-dom": "^5.16.5", - "@testing-library/react": "12.1.5", + "@emotion/react": "^11.11.1", + "@emotion/styled": "^11.11.0", + "@mdi/js": "^7.2.96", + "@mdi/react": "^1.6.1", + "@mui/icons-material": "^5.14.9", + "@mui/material": "^5.14.9", + "@mui/styles": "^5.14.9", "@types/jest": "^29.5.0", "@types/node": "^18.15.11", "@types/react": "^18.0.34", "@types/react-dom": "^18.0.11", "babel-plugin-transform-object-rest-spread": "^6.26.0", "browserslist": "^4.21.5", - "classnames": "^2.2.6", + "classnames": "^2.3.2", "d3": "^5.16.0", "d3-brush": "3.0.0", "d3-selection": "^2.0.0", "d3-tip": "^0.9.1", "jcampconverter": "4.1.0", "ml-savitzky-golay-generalized": "1.1.1", - "prop-types": "^15.7.2", + "prop-types": "^15.8.1", "react-dropzone": "^8.0.3", "react-quill": "^2.0.0", "react-redux": "^7.2.0", - "react-svg-inline": "^2.1.1", "redux": "^4.1.1", "redux-saga": "^1.1.3", "redux-undo": "^1.1.0", @@ -62,6 +60,8 @@ "@babel/preset-env": "^7.21.5", "@babel/preset-react": "^7.18.6", "@storybook/react": "7.0.7", + "@testing-library/jest-dom": "^5.17.0", + "@testing-library/react": "12.1.5", "@types/enzyme": "^3.10.13", "@wojtekmaj/enzyme-adapter-react-17": "^0.8.0", "babel-loader": "8.2.5", diff --git a/src/__tests__/fixtures/mass_chromatogram_jcamp.js b/src/__tests__/fixtures/mass_chromatogram_jcamp.js new file mode 100644 index 00000000..84c6b83c --- /dev/null +++ b/src/__tests__/fixtures/mass_chromatogram_jcamp.js @@ -0,0 +1,3727 @@ +const massChromatogramJcamp = ` +##TITLE= +##JCAMP-DX=5.0 +##DATA TYPE=LINK +##BLOCKS=1 + + +$$ === CHEMSPECTRA SPECTRUM ORIG === +##TITLE= +##JCAMP-DX=5.00 +##DATA TYPE=MASS CHROMATOGRAM +##DATA CLASS=XYDATA +##$CSCATEGORY=SPECTRUM +##ORIGIN= +##OWNER= +##XUNITS=MINUTES +##YUNITS=Intensity +##XFACTOR=1.0 +##YFACTOR=1.0 +##FIRSTX=3.09275 +##LASTX=23.98963 +##MAXX=23.98963 +##MAXY=44507300.0 +##MINX=3.09275 +##MINY=7098.0 +##NPOINTS=3653 +##XYDATA= (XY..XY) +3.09275, 11371.0 +3.09848, 11994.0 +3.1042, 11039.0 +3.10992, 12490.0 +3.11565, 11945.0 +3.12137, 11221.0 +3.12708, 10713.0 +3.13282, 10587.0 +3.13853, 11863.0 +3.14425, 11242.0 +3.14997, 10622.0 +3.1557, 10471.0 +3.16142, 11327.0 +3.16713, 10539.0 +3.17287, 10241.0 +3.17858, 9590.0 +3.1843, 10936.0 +3.19003, 10738.0 +3.19575, 10964.0 +3.20147, 10015.0 +3.2072, 10505.0 +3.21292, 11106.0 +3.21863, 9464.0 +3.22437, 9942.0 +3.23008, 9930.0 +3.2358, 10021.0 +3.24153, 10224.0 +3.24725, 10842.0 +3.25297, 10229.0 +3.2587, 10188.0 +3.26442, 11836.0 +3.27013, 20632.0 +3.27587, 43393.0 +3.28158, 69479.0 +3.2873, 83824.0 +3.29303, 74529.0 +3.29875, 57657.0 +3.30447, 40009.0 +3.3102, 25747.0 +3.31592, 20365.0 +3.32163, 15505.0 +3.32735, 13225.0 +3.33308, 12021.0 +3.3388, 12464.0 +3.34452, 11409.0 +3.35025, 13074.0 +3.35597, 10281.0 +3.36168, 10730.0 +3.36742, 10672.0 +3.37313, 11240.0 +3.37885, 9256.0 +3.38458, 9407.0 +3.3903, 9236.0 +3.39602, 10442.0 +3.40175, 9946.0 +3.40747, 10257.0 +3.41318, 10566.0 +3.41892, 10308.0 +3.42463, 9599.0 +3.43035, 10206.0 +3.43608, 10780.0 +3.4418, 10750.0 +3.44752, 10616.0 +3.45325, 12588.0 +3.45897, 11714.0 +3.46468, 10794.0 +3.47042, 11427.0 +3.47613, 9298.0 +3.48185, 9921.0 +3.48757, 9846.0 +3.4933, 9348.0 +3.49902, 9420.0 +3.50473, 8821.0 +3.51047, 9728.0 +3.51618, 8646.0 +3.5219, 9345.0 +3.52763, 9765.0 +3.53335, 10051.0 +3.53907, 8914.0 +3.5448, 8853.0 +3.55052, 8167.0 +3.55623, 11090.0 +3.56197, 12058.0 +3.56768, 14487.0 +3.5734, 16196.0 +3.57913, 15546.0 +3.58485, 16167.0 +3.59057, 14354.0 +3.5963, 12930.0 +3.60202, 12158.0 +3.60773, 10330.0 +3.61347, 10356.0 +3.61918, 9865.0 +3.6249, 9221.0 +3.63063, 9235.0 +3.63635, 9700.0 +3.64207, 9723.0 +3.6478, 9578.0 +3.65352, 10333.0 +3.65923, 9099.0 +3.66495, 9055.0 +3.67068, 9784.0 +3.6764, 10459.0 +3.68212, 10910.0 +3.68785, 11109.0 +3.69357, 8803.0 +3.69928, 10361.0 +3.70502, 9705.0 +3.71073, 10229.0 +3.71645, 10338.0 +3.72218, 9532.0 +3.7279, 10626.0 +3.73362, 10460.0 +3.73935, 9977.0 +3.74507, 9993.0 +3.75078, 9240.0 +3.75652, 9796.0 +3.76223, 10325.0 +3.76795, 9811.0 +3.77368, 9229.0 +3.7794, 9568.0 +3.78512, 8614.0 +3.79085, 9357.0 +3.79657, 9347.0 +3.80228, 9838.0 +3.80802, 9269.0 +3.81373, 10048.0 +3.81945, 9863.0 +3.82518, 8434.0 +3.8309, 9206.0 +3.83662, 9082.0 +3.84233, 9587.0 +3.84807, 9670.0 +3.85378, 9430.0 +3.8595, 9949.0 +3.86523, 9111.0 +3.87095, 9829.0 +3.87667, 9514.0 +3.8824, 9010.0 +3.88812, 9333.0 +3.89383, 10490.0 +3.89957, 8688.0 +3.90528, 9396.0 +3.911, 9302.0 +3.91673, 9915.0 +3.92245, 9196.0 +3.92817, 10143.0 +3.9339, 9845.0 +3.93962, 10753.0 +3.94533, 12054.0 +3.95107, 12805.0 +3.95678, 12320.0 +3.9625, 14309.0 +3.96823, 12354.0 +3.97395, 10876.0 +3.97967, 10712.0 +3.9854, 10319.0 +3.99112, 9324.0 +3.99683, 10688.0 +4.00255, 10201.0 +4.00828, 10393.0 +4.014, 9460.0 +4.01972, 8767.0 +4.02545, 10014.0 +4.03117, 8564.0 +4.03688, 10041.0 +4.04262, 8651.0 +4.04833, 9730.0 +4.05405, 10993.0 +4.05978, 9652.0 +4.0655, 10002.0 +4.07122, 9273.0 +4.07695, 9351.0 +4.08267, 9958.0 +4.08838, 9479.0 +4.09412, 10230.0 +4.09983, 10231.0 +4.10555, 8518.0 +4.11128, 9380.0 +4.117, 9925.0 +4.12272, 9899.0 +4.12845, 9499.0 +4.13417, 10980.0 +4.13988, 12249.0 +4.14562, 14112.0 +4.15133, 17405.0 +4.15705, 16611.0 +4.16278, 15017.0 +4.1685, 13109.0 +4.17422, 12258.0 +4.17993, 10188.0 +4.18567, 10617.0 +4.19138, 10406.0 +4.1971, 11861.0 +4.20283, 9564.0 +4.20855, 11338.0 +4.21427, 9740.0 +4.22, 10102.0 +4.22572, 10353.0 +4.23143, 10339.0 +4.23717, 10367.0 +4.24288, 9303.0 +4.2486, 9723.0 +4.25433, 10850.0 +4.26005, 9780.0 +4.26577, 9031.0 +4.2715, 10290.0 +4.27722, 9941.0 +4.28293, 9634.0 +4.28867, 9236.0 +4.29438, 9579.0 +4.3001, 9785.0 +4.30583, 10125.0 +4.31155, 9579.0 +4.31727, 10048.0 +4.323, 11795.0 +4.32872, 11196.0 +4.33443, 9014.0 +4.34017, 8687.0 +4.34588, 10386.0 +4.3516, 9758.0 +4.35732, 10493.0 +4.36305, 10741.0 +4.36877, 11453.0 +4.37448, 12287.0 +4.38022, 13789.0 +4.38593, 13852.0 +4.39165, 14319.0 +4.39738, 15692.0 +4.4031, 14851.0 +4.40882, 15125.0 +4.41455, 15501.0 +4.42027, 14100.0 +4.42598, 13489.0 +4.43172, 15051.0 +4.43743, 15323.0 +4.44315, 13832.0 +4.44888, 14761.0 +4.4546, 14882.0 +4.46032, 16063.0 +4.46605, 15466.0 +4.47177, 15197.0 +4.47748, 15996.0 +4.48322, 15272.0 +4.48893, 15544.0 +4.49465, 15643.0 +4.50038, 14478.0 +4.5061, 15498.0 +4.51182, 14626.0 +4.51755, 14306.0 +4.52327, 14916.0 +4.52898, 14209.0 +4.5347, 14565.0 +4.54043, 15653.0 +4.54615, 15052.0 +4.55187, 14022.0 +4.5576, 15032.0 +4.56332, 14326.0 +4.56903, 15321.0 +4.57477, 15463.0 +4.58048, 15560.0 +4.5862, 14688.0 +4.59193, 15615.0 +4.59765, 15006.0 +4.60337, 15523.0 +4.6091, 14975.0 +4.61482, 14670.0 +4.62053, 15109.0 +4.62627, 15133.0 +4.63198, 14731.0 +4.6377, 14719.0 +4.64343, 15274.0 +4.64915, 14909.0 +4.65487, 14621.0 +4.6606, 16402.0 +4.66632, 14344.0 +4.67203, 16749.0 +4.67777, 15836.0 +4.68348, 14967.0 +4.6892, 15066.0 +4.69492, 16061.0 +4.70065, 14410.0 +4.70637, 16010.0 +4.71208, 15852.0 +4.71782, 15508.0 +4.72353, 14249.0 +4.72925, 16461.0 +4.73498, 16456.0 +4.7407, 13990.0 +4.74642, 15904.0 +4.75215, 16040.0 +4.75787, 15170.0 +4.76358, 17101.0 +4.76932, 16123.0 +4.77503, 14729.0 +4.78075, 16290.0 +4.78648, 16080.0 +4.7922, 16623.0 +4.79792, 15609.0 +4.80365, 16290.0 +4.80937, 15688.0 +4.81508, 16259.0 +4.82082, 15073.0 +4.82653, 16359.0 +4.83225, 15523.0 +4.83798, 15595.0 +4.8437, 15287.0 +4.84942, 15504.0 +4.85515, 16058.0 +4.86087, 17598.0 +4.86658, 16027.0 +4.8723, 17677.0 +4.87803, 18892.0 +4.88375, 20071.0 +4.88947, 20055.0 +4.8952, 20676.0 +4.90092, 19076.0 +4.90663, 17070.0 +4.91237, 18819.0 +4.91808, 18131.0 +4.9238, 17369.0 +4.92953, 18175.0 +4.93525, 16721.0 +4.94097, 18375.0 +4.9467, 17455.0 +4.95242, 16608.0 +4.95813, 15414.0 +4.96387, 16962.0 +4.96958, 17631.0 +4.9753, 17768.0 +4.98103, 16144.0 +4.98675, 17306.0 +4.99247, 17075.0 +4.9982, 17442.0 +5.00392, 15678.0 +5.00963, 16347.0 +5.01537, 16047.0 +5.02108, 19143.0 +5.0268, 19153.0 +5.03252, 19942.0 +5.03825, 20091.0 +5.04397, 18853.0 +5.04968, 19227.0 +5.05542, 18718.0 +5.06113, 18592.0 +5.06685, 19129.0 +5.07258, 17575.0 +5.0783, 17917.0 +5.08402, 18615.0 +5.08975, 17118.0 +5.09547, 17012.0 +5.10118, 17100.0 +5.10692, 17006.0 +5.11263, 17232.0 +5.11835, 18101.0 +5.12408, 18518.0 +5.1298, 18705.0 +5.13552, 17064.0 +5.14125, 16807.0 +5.14697, 18055.0 +5.15268, 16101.0 +5.15842, 16802.0 +5.16413, 16627.0 +5.16985, 16238.0 +5.17558, 15493.0 +5.1813, 15673.0 +5.18702, 16739.0 +5.19275, 15353.0 +5.19847, 14919.0 +5.20418, 16684.0 +5.2099, 16049.0 +5.21563, 15581.0 +5.22135, 15275.0 +5.22707, 16906.0 +5.2328, 15512.0 +5.23852, 15137.0 +5.24423, 16196.0 +5.24997, 15973.0 +5.25568, 14883.0 +5.2614, 14986.0 +5.26713, 15587.0 +5.27285, 15714.0 +5.27857, 15105.0 +5.2843, 15583.0 +5.29002, 16834.0 +5.29573, 16723.0 +5.30147, 17369.0 +5.30718, 16893.0 +5.3129, 17148.0 +5.31863, 16017.0 +5.32435, 16144.0 +5.33007, 15366.0 +5.3358, 15382.0 +5.34152, 14409.0 +5.34723, 14998.0 +5.35297, 14662.0 +5.35868, 14511.0 +5.3644, 16353.0 +5.37013, 14565.0 +5.37585, 14817.0 +5.38157, 14142.0 +5.38728, 16772.0 +5.39302, 15951.0 +5.39873, 14666.0 +5.40445, 14228.0 +5.41018, 15071.0 +5.4159, 13274.0 +5.42162, 14860.0 +5.42735, 15092.0 +5.43307, 15155.0 +5.43878, 15724.0 +5.44452, 14566.0 +5.45023, 15007.0 +5.45595, 14423.0 +5.46168, 14856.0 +5.4674, 14875.0 +5.47312, 13453.0 +5.47885, 13148.0 +5.48457, 14272.0 +5.49028, 16931.0 +5.49602, 20721.0 +5.50173, 22814.0 +5.50745, 23740.0 +5.51318, 23587.0 +5.5189, 24159.0 +5.52462, 26523.0 +5.53035, 26208.0 +5.53607, 26225.0 +5.54178, 22695.0 +5.54752, 21305.0 +5.55323, 21708.0 +5.55895, 21709.0 +5.56467, 19316.0 +5.5704, 20973.0 +5.57612, 19217.0 +5.58183, 19737.0 +5.58757, 19643.0 +5.59328, 20476.0 +5.599, 17819.0 +5.60473, 17208.0 +5.61045, 18974.0 +5.61617, 15968.0 +5.6219, 18746.0 +5.62762, 17472.0 +5.63333, 17514.0 +5.63907, 17115.0 +5.64478, 19353.0 +5.6505, 16774.0 +5.65623, 16202.0 +5.66195, 16664.0 +5.66767, 17493.0 +5.6734, 16899.0 +5.67912, 16670.0 +5.68483, 16780.0 +5.69057, 15828.0 +5.69628, 15750.0 +5.702, 15873.0 +5.70773, 17348.0 +5.71345, 16111.0 +5.71917, 15518.0 +5.7249, 16206.0 +5.73062, 17630.0 +5.73633, 17026.0 +5.74205, 16992.0 +5.74778, 16370.0 +5.7535, 15052.0 +5.75922, 15766.0 +5.76495, 15880.0 +5.77067, 16250.0 +5.77638, 16226.0 +5.78212, 16128.0 +5.78783, 17322.0 +5.79355, 16130.0 +5.79928, 16361.0 +5.805, 16564.0 +5.81072, 16343.0 +5.81645, 16947.0 +5.82217, 15757.0 +5.82788, 15902.0 +5.83362, 15176.0 +5.83933, 15290.0 +5.84505, 16005.0 +5.85078, 15282.0 +5.8565, 15271.0 +5.86222, 15448.0 +5.86795, 16439.0 +5.87367, 15576.0 +5.87938, 14162.0 +5.88512, 16820.0 +5.89083, 17620.0 +5.89655, 15738.0 +5.90227, 18224.0 +5.908, 16852.0 +5.91372, 17752.0 +5.91943, 16201.0 +5.92517, 16594.0 +5.93088, 17881.0 +5.9366, 17023.0 +5.94233, 18104.0 +5.94805, 22913.0 +5.95377, 23345.0 +5.9595, 23828.0 +5.96522, 23468.0 +5.97093, 22930.0 +5.97667, 22877.0 +5.98238, 22377.0 +5.9881, 21492.0 +5.99383, 23088.0 +5.99955, 21932.0 +6.00527, 21319.0 +6.011, 22782.0 +6.01672, 22542.0 +6.02243, 21618.0 +6.02817, 22386.0 +6.03388, 20852.0 +6.0396, 22344.0 +6.04533, 23759.0 +6.05105, 22695.0 +6.05677, 22101.0 +6.06248, 23481.0 +6.06822, 21417.0 +6.07393, 21155.0 +6.07965, 21803.0 +6.08538, 21536.0 +6.0911, 22709.0 +6.09682, 22083.0 +6.10255, 22307.0 +6.10827, 20892.0 +6.11398, 21274.0 +6.11972, 21368.0 +6.12543, 22891.0 +6.13115, 22022.0 +6.13688, 24741.0 +6.1426, 24405.0 +6.14832, 24245.0 +6.15405, 24042.0 +6.15977, 24042.0 +6.16548, 24187.0 +6.17122, 24091.0 +6.17693, 24007.0 +6.18265, 22934.0 +6.18838, 24197.0 +6.1941, 23264.0 +6.19982, 23299.0 +6.20555, 23068.0 +6.21127, 22609.0 +6.21698, 24001.0 +6.22272, 21559.0 +6.22843, 22660.0 +6.23415, 22170.0 +6.23987, 22463.0 +6.2456, 21705.0 +6.25132, 21014.0 +6.25703, 22096.0 +6.26277, 21763.0 +6.26848, 21344.0 +6.2742, 20669.0 +6.27993, 22540.0 +6.28565, 22563.0 +6.29137, 20916.0 +6.2971, 20802.0 +6.30282, 21466.0 +6.30853, 19754.0 +6.31427, 20385.0 +6.31998, 20029.0 +6.3257, 19709.0 +6.33143, 20184.0 +6.33715, 19479.0 +6.34287, 20443.0 +6.3486, 19887.0 +6.35432, 21541.0 +6.36003, 18323.0 +6.36577, 20027.0 +6.37148, 20132.0 +6.3772, 22301.0 +6.38293, 20707.0 +6.38865, 21773.0 +6.39437, 19939.0 +6.4001, 21006.0 +6.40582, 19940.0 +6.41153, 19305.0 +6.41725, 20098.0 +6.42298, 18951.0 +6.4287, 19123.0 +6.43442, 18502.0 +6.44015, 18517.0 +6.44587, 18863.0 +6.45158, 20139.0 +6.45732, 18576.0 +6.46303, 20525.0 +6.46875, 18535.0 +6.47448, 19168.0 +6.4802, 18406.0 +6.48592, 18011.0 +6.49165, 18303.0 +6.49737, 17959.0 +6.50308, 18929.0 +6.50882, 18927.0 +6.51453, 17760.0 +6.52025, 19451.0 +6.52598, 18133.0 +6.5317, 18715.0 +6.53742, 17202.0 +6.54315, 19029.0 +6.54887, 18082.0 +6.55458, 18138.0 +6.56032, 18298.0 +6.56603, 17100.0 +6.57175, 18456.0 +6.57748, 20144.0 +6.5832, 19423.0 +6.58892, 17179.0 +6.59463, 18189.0 +6.60037, 17790.0 +6.60608, 16660.0 +6.6118, 17927.0 +6.61753, 17772.0 +6.62325, 18898.0 +6.62897, 18235.0 +6.6347, 18057.0 +6.64042, 17638.0 +6.64613, 16894.0 +6.65187, 17342.0 +6.65758, 18391.0 +6.6633, 16530.0 +6.66903, 18009.0 +6.67475, 18372.0 +6.68047, 18723.0 +6.6862, 18219.0 +6.69192, 17542.0 +6.69763, 18227.0 +6.70337, 18345.0 +6.70908, 18366.0 +6.7148, 18723.0 +6.72053, 18214.0 +6.72625, 19225.0 +6.73197, 19166.0 +6.7377, 20527.0 +6.74342, 20907.0 +6.74913, 20482.0 +6.75487, 19524.0 +6.76058, 20265.0 +6.7663, 19193.0 +6.77202, 18800.0 +6.77775, 17995.0 +6.78347, 19079.0 +6.78918, 19465.0 +6.79492, 18562.0 +6.80063, 18720.0 +6.80635, 17481.0 +6.81208, 17805.0 +6.8178, 18201.0 +6.82352, 17928.0 +6.82925, 18666.0 +6.83497, 17158.0 +6.84068, 17090.0 +6.84642, 17310.0 +6.85213, 16602.0 +6.85785, 16607.0 +6.86358, 17319.0 +6.8693, 17393.0 +6.87502, 17724.0 +6.88075, 17330.0 +6.88647, 17845.0 +6.89218, 14863.0 +6.89792, 15610.0 +6.90363, 15477.0 +6.90935, 16500.0 +6.91508, 17185.0 +6.9208, 17044.0 +6.92652, 17271.0 +6.93223, 17387.0 +6.93797, 14689.0 +6.94368, 15934.0 +6.9494, 16128.0 +6.95513, 17424.0 +6.96085, 15943.0 +6.96657, 16162.0 +6.9723, 16786.0 +6.97802, 15712.0 +6.98373, 14542.0 +6.98947, 15949.0 +6.99518, 13687.0 +7.0009, 15329.0 +7.00663, 15206.0 +7.01235, 17484.0 +7.01807, 17982.0 +7.0238, 18657.0 +7.02952, 16829.0 +7.03523, 16020.0 +7.04097, 14588.0 +7.04668, 15089.0 +7.0524, 14305.0 +7.05813, 16036.0 +7.06385, 14775.0 +7.06957, 13844.0 +7.0753, 15383.0 +7.08102, 14904.0 +7.08673, 13732.0 +7.09247, 16139.0 +7.09818, 13986.0 +7.1039, 14471.0 +7.10962, 14567.0 +7.11535, 13794.0 +7.12107, 16417.0 +7.12678, 13595.0 +7.13252, 13807.0 +7.13823, 14925.0 +7.14395, 14823.0 +7.14968, 13050.0 +7.1554, 15075.0 +7.16112, 13637.0 +7.16685, 14131.0 +7.17257, 14163.0 +7.17828, 14108.0 +7.18402, 13785.0 +7.18973, 12707.0 +7.19545, 14841.0 +7.20118, 14165.0 +7.2069, 13430.0 +7.21262, 15079.0 +7.21835, 14763.0 +7.22407, 13014.0 +7.22978, 13554.0 +7.23552, 14606.0 +7.24123, 14331.0 +7.24695, 14726.0 +7.25268, 13758.0 +7.2584, 13973.0 +7.26412, 14005.0 +7.26983, 13246.0 +7.27557, 13961.0 +7.28128, 14992.0 +7.287, 12965.0 +7.29273, 13156.0 +7.29845, 14768.0 +7.30417, 12448.0 +7.3099, 13914.0 +7.31562, 14482.0 +7.32133, 12949.0 +7.32707, 14660.0 +7.33278, 14911.0 +7.3385, 13895.0 +7.34423, 13523.0 +7.34995, 14127.0 +7.35567, 13655.0 +7.3614, 14414.0 +7.36712, 14603.0 +7.37283, 14655.0 +7.37857, 13908.0 +7.38428, 15116.0 +7.39, 14849.0 +7.39573, 14286.0 +7.40145, 14361.0 +7.40717, 15000.0 +7.4129, 15152.0 +7.41862, 15986.0 +7.42433, 13388.0 +7.43007, 13709.0 +7.43578, 12803.0 +7.4415, 13848.0 +7.44722, 14921.0 +7.45295, 14787.0 +7.45867, 13551.0 +7.46438, 15900.0 +7.47012, 13867.0 +7.47583, 13454.0 +7.48155, 13194.0 +7.48728, 14102.0 +7.493, 16988.0 +7.49872, 19167.0 +7.50445, 18998.0 +7.51017, 19886.0 +7.51588, 17173.0 +7.52162, 17357.0 +7.52733, 15993.0 +7.53305, 15432.0 +7.53878, 15321.0 +7.5445, 16186.0 +7.55022, 17786.0 +7.55595, 15694.0 +7.56167, 15844.0 +7.56738, 16006.0 +7.57312, 14713.0 +7.57883, 15101.0 +7.58455, 14348.0 +7.59028, 14917.0 +7.596, 13927.0 +7.60172, 14839.0 +7.60745, 15001.0 +7.61317, 15375.0 +7.61888, 16458.0 +7.6246, 14924.0 +7.63033, 14006.0 +7.63605, 14570.0 +7.64177, 16116.0 +7.6475, 17043.0 +7.65322, 16863.0 +7.65893, 14366.0 +7.66467, 16282.0 +7.67038, 15324.0 +7.6761, 17225.0 +7.68183, 16123.0 +7.68755, 16400.0 +7.69327, 16287.0 +7.699, 16494.0 +7.70472, 16272.0 +7.71043, 16197.0 +7.71617, 15210.0 +7.72188, 14993.0 +7.7276, 15788.0 +7.73333, 16159.0 +7.73905, 15258.0 +7.74477, 15293.0 +7.7505, 14032.0 +7.75622, 14293.0 +7.76193, 13937.0 +7.76767, 13176.0 +7.77338, 13132.0 +7.7791, 13177.0 +7.78483, 14152.0 +7.79055, 12938.0 +7.79627, 13555.0 +7.80198, 14140.0 +7.80772, 14103.0 +7.81343, 12821.0 +7.81915, 13225.0 +7.82488, 13616.0 +7.8306, 12367.0 +7.83632, 13533.0 +7.84205, 12568.0 +7.84777, 13607.0 +7.85348, 13025.0 +7.85922, 14825.0 +7.86493, 14274.0 +7.87065, 12603.0 +7.87638, 13718.0 +7.8821, 13429.0 +7.88782, 13441.0 +7.89355, 11712.0 +7.89927, 12928.0 +7.90498, 12113.0 +7.91072, 11912.0 +7.91643, 11808.0 +7.92215, 12536.0 +7.92788, 13044.0 +7.9336, 12889.0 +7.93932, 12640.0 +7.94505, 13372.0 +7.95077, 12596.0 +7.95648, 12723.0 +7.96222, 11597.0 +7.96793, 12912.0 +7.97365, 12877.0 +7.97937, 13079.0 +7.9851, 11912.0 +7.99082, 12113.0 +7.99653, 12056.0 +8.00227, 12992.0 +8.00798, 13591.0 +8.0137, 12852.0 +8.01943, 12104.0 +8.02515, 12747.0 +8.03087, 12110.0 +8.0366, 10252.0 +8.04232, 11984.0 +8.04803, 11442.0 +8.05377, 12337.0 +8.05948, 12090.0 +8.0652, 10925.0 +8.07093, 13473.0 +8.07665, 10776.0 +8.08237, 11266.0 +8.0881, 12807.0 +8.09382, 12080.0 +8.09953, 13024.0 +8.10527, 11292.0 +8.11098, 12797.0 +8.1167, 11852.0 +8.12243, 12893.0 +8.12815, 12833.0 +8.13387, 12649.0 +8.13958, 12977.0 +8.14532, 12741.0 +8.15103, 13362.0 +8.15675, 13939.0 +8.16248, 12987.0 +8.1682, 13141.0 +8.17392, 12293.0 +8.17965, 12551.0 +8.18537, 12504.0 +8.19108, 12458.0 +8.19682, 12780.0 +8.20253, 13439.0 +8.20825, 13134.0 +8.21398, 12848.0 +8.2197, 13163.0 +8.22542, 13143.0 +8.23115, 12129.0 +8.23687, 12767.0 +8.24258, 12344.0 +8.24832, 12564.0 +8.25403, 13370.0 +8.25975, 11232.0 +8.26548, 10714.0 +8.2712, 12255.0 +8.27692, 11911.0 +8.28265, 12106.0 +8.28837, 12250.0 +8.29408, 10940.0 +8.29982, 11586.0 +8.30553, 11973.0 +8.31125, 11377.0 +8.31697, 12255.0 +8.3227, 11332.0 +8.32842, 11346.0 +8.33413, 11318.0 +8.33987, 11740.0 +8.34558, 11910.0 +8.3513, 11679.0 +8.35703, 10846.0 +8.36275, 10709.0 +8.36847, 10029.0 +8.3742, 12068.0 +8.37992, 10836.0 +8.38563, 10218.0 +8.39137, 10936.0 +8.39708, 11282.0 +8.4028, 10608.0 +8.40853, 11313.0 +8.41425, 12361.0 +8.41997, 10323.0 +8.4257, 10835.0 +8.43142, 11732.0 +8.43713, 10464.0 +8.44287, 11591.0 +8.44858, 13171.0 +8.4543, 11011.0 +8.46003, 10690.0 +8.46575, 10752.0 +8.47147, 9953.0 +8.47718, 9913.0 +8.48292, 11222.0 +8.48863, 10153.0 +8.49435, 10888.0 +8.50008, 10157.0 +8.5058, 12009.0 +8.51152, 11336.0 +8.51725, 11840.0 +8.52297, 11616.0 +8.52868, 11660.0 +8.53442, 11419.0 +8.54013, 11183.0 +8.54585, 10576.0 +8.55158, 11161.0 +8.5573, 10511.0 +8.56302, 11045.0 +8.56875, 10826.0 +8.57447, 11641.0 +8.58018, 9931.0 +8.58592, 11012.0 +8.59163, 10415.0 +8.59735, 12061.0 +8.60308, 10255.0 +8.6088, 10231.0 +8.61452, 11257.0 +8.62025, 9974.0 +8.62597, 11284.0 +8.63168, 8687.0 +8.63742, 10669.0 +8.64313, 11735.0 +8.64885, 10363.0 +8.65457, 10281.0 +8.6603, 9328.0 +8.66602, 11035.0 +8.67173, 11286.0 +8.67747, 9939.0 +8.68318, 10225.0 +8.6889, 9614.0 +8.69463, 11259.0 +8.70035, 10293.0 +8.70607, 10812.0 +8.7118, 11553.0 +8.71752, 11230.0 +8.72323, 10883.0 +8.72897, 10745.0 +8.73468, 10064.0 +8.7404, 11779.0 +8.74613, 10236.0 +8.75185, 10670.0 +8.75757, 12392.0 +8.7633, 9578.0 +8.76902, 10279.0 +8.77473, 10828.0 +8.78047, 10386.0 +8.78618, 10431.0 +8.7919, 10676.0 +8.79763, 10451.0 +8.80335, 12612.0 +8.80907, 11078.0 +8.8148, 10385.0 +8.82052, 12638.0 +8.82623, 10270.0 +8.83195, 12100.0 +8.83768, 10686.0 +8.8434, 11051.0 +8.84912, 11121.0 +8.85485, 10365.0 +8.86057, 10291.0 +8.86628, 10468.0 +8.87202, 10421.0 +8.87773, 10365.0 +8.88345, 11125.0 +8.88918, 10841.0 +8.8949, 11450.0 +8.90062, 11215.0 +8.90635, 11448.0 +8.91207, 10436.0 +8.91778, 9982.0 +8.92352, 11187.0 +8.92923, 11126.0 +8.93495, 11185.0 +8.94068, 10790.0 +8.9464, 10313.0 +8.95212, 10111.0 +8.95785, 9897.0 +8.96357, 10160.0 +8.96928, 10329.0 +8.97502, 9552.0 +8.98073, 10665.0 +8.98645, 10014.0 +8.99218, 10667.0 +8.9979, 9784.0 +9.00362, 10425.0 +9.00933, 9533.0 +9.01507, 10267.0 +9.02078, 10323.0 +9.0265, 10977.0 +9.03223, 11200.0 +9.03795, 10324.0 +9.04367, 10662.0 +9.0494, 10419.0 +9.05512, 10979.0 +9.06083, 10150.0 +9.06657, 11307.0 +9.07228, 10113.0 +9.078, 9914.0 +9.08373, 11452.0 +9.08945, 10056.0 +9.09517, 9676.0 +9.1009, 9295.0 +9.10662, 9132.0 +9.11233, 10162.0 +9.11807, 11062.0 +9.12378, 10996.0 +9.1295, 12762.0 +9.13523, 13140.0 +9.14095, 13950.0 +9.14667, 13310.0 +9.1524, 21578.0 +9.15812, 40785.0 +9.16383, 60839.0 +9.16955, 63459.0 +9.17528, 44202.0 +9.181, 28986.0 +9.18672, 21368.0 +9.19245, 15135.0 +9.19817, 15332.0 +9.20388, 16478.0 +9.20962, 15256.0 +9.21533, 14436.0 +9.22105, 13706.0 +9.22678, 16575.0 +9.2325, 15379.0 +9.23822, 18248.0 +9.24395, 17437.0 +9.24967, 16398.0 +9.25538, 18051.0 +9.26112, 21869.0 +9.26683, 22495.0 +9.27255, 21814.0 +9.27828, 20492.0 +9.284, 19584.0 +9.28972, 19291.0 +9.29545, 20440.0 +9.30117, 21508.0 +9.30688, 20833.0 +9.31262, 19142.0 +9.31833, 18594.0 +9.32405, 16596.0 +9.32978, 16977.0 +9.3355, 16376.0 +9.34122, 14597.0 +9.34693, 14241.0 +9.35267, 13321.0 +9.35838, 13031.0 +9.3641, 12120.0 +9.36983, 13394.0 +9.37555, 12659.0 +9.38127, 12299.0 +9.387, 12169.0 +9.39272, 10295.0 +9.39843, 11073.0 +9.40417, 11739.0 +9.40988, 11977.0 +9.4156, 10834.0 +9.42133, 11501.0 +9.42705, 10893.0 +9.43277, 10930.0 +9.4385, 10972.0 +9.44422, 11102.0 +9.44993, 10877.0 +9.45567, 10949.0 +9.46138, 9865.0 +9.4671, 11013.0 +9.47283, 11130.0 +9.47855, 9428.0 +9.48427, 11212.0 +9.49, 10133.0 +9.49572, 9406.0 +9.50143, 11022.0 +9.50717, 10153.0 +9.51288, 10822.0 +9.5186, 10041.0 +9.52432, 8945.0 +9.53005, 11076.0 +9.53577, 9731.0 +9.54148, 10234.0 +9.54722, 10521.0 +9.55293, 10054.0 +9.55865, 10357.0 +9.56438, 10650.0 +9.5701, 10298.0 +9.57582, 10113.0 +9.58155, 11493.0 +9.58727, 10194.0 +9.59298, 10298.0 +9.59872, 10416.0 +9.60443, 10016.0 +9.61015, 10154.0 +9.61588, 10326.0 +9.6216, 10762.0 +9.62732, 11098.0 +9.63305, 10358.0 +9.63877, 9846.0 +9.64448, 10063.0 +9.65022, 9800.0 +9.65593, 10387.0 +9.66165, 10200.0 +9.66738, 9572.0 +9.6731, 9712.0 +9.67882, 10631.0 +9.68453, 8842.0 +9.69027, 9651.0 +9.69598, 9957.0 +9.7017, 9528.0 +9.70743, 9972.0 +9.71315, 9334.0 +9.71887, 10836.0 +9.7246, 10887.0 +9.73032, 10571.0 +9.73603, 11051.0 +9.74177, 9798.0 +9.74748, 10505.0 +9.7532, 9760.0 +9.75893, 9721.0 +9.76465, 9901.0 +9.77037, 10739.0 +9.7761, 10592.0 +9.78182, 10761.0 +9.78753, 10166.0 +9.79327, 10228.0 +9.79898, 9572.0 +9.8047, 10245.0 +9.81043, 10984.0 +9.81615, 9489.0 +9.82187, 9400.0 +9.8276, 10062.0 +9.83332, 10587.0 +9.83903, 10875.0 +9.84477, 8498.0 +9.85048, 10196.0 +9.8562, 9363.0 +9.86192, 9759.0 +9.86765, 9456.0 +9.87337, 10211.0 +9.87908, 9834.0 +9.88482, 10597.0 +9.89053, 9127.0 +9.89625, 11190.0 +9.90198, 11080.0 +9.9077, 10441.0 +9.91342, 11619.0 +9.91915, 8956.0 +9.92487, 10213.0 +9.93058, 9114.0 +9.93632, 10453.0 +9.94203, 9722.0 +9.94775, 10412.0 +9.95348, 8851.0 +9.9592, 9371.0 +9.96492, 9902.0 +9.97065, 11365.0 +9.97637, 11246.0 +9.98208, 10357.0 +9.98782, 9737.0 +9.99353, 8651.0 +9.99925, 9903.0 +10.00498, 10307.0 +10.0107, 11046.0 +10.01642, 9569.0 +10.02215, 8765.0 +10.02787, 10006.0 +10.03358, 9336.0 +10.0393, 10176.0 +10.04503, 9168.0 +10.05075, 9029.0 +10.05647, 8991.0 +10.0622, 10279.0 +10.06792, 10602.0 +10.07363, 9596.0 +10.07937, 10602.0 +10.08508, 10084.0 +10.0908, 9512.0 +10.09653, 10306.0 +10.10225, 10025.0 +10.10797, 11705.0 +10.1137, 9824.0 +10.11942, 11887.0 +10.12513, 13253.0 +10.13087, 18069.0 +10.13658, 30203.0 +10.1423, 35734.0 +10.14803, 29983.0 +10.15375, 18995.0 +10.15947, 14288.0 +10.1652, 13159.0 +10.17092, 11717.0 +10.17663, 11476.0 +10.18237, 11421.0 +10.18808, 11000.0 +10.1938, 11370.0 +10.19952, 10452.0 +10.20525, 11652.0 +10.21097, 10133.0 +10.21668, 10223.0 +10.22242, 11031.0 +10.22813, 10024.0 +10.23385, 11428.0 +10.23958, 12007.0 +10.2453, 11267.0 +10.25102, 10542.0 +10.25675, 9983.0 +10.26247, 10295.0 +10.26818, 9756.0 +10.27392, 10818.0 +10.27963, 9584.0 +10.28535, 9403.0 +10.29108, 8208.0 +10.2968, 9839.0 +10.30252, 9345.0 +10.30825, 8664.0 +10.31397, 10850.0 +10.31968, 10171.0 +10.32542, 9677.0 +10.33113, 9811.0 +10.33685, 9565.0 +10.34258, 10154.0 +10.3483, 9004.0 +10.35402, 9307.0 +10.35975, 10110.0 +10.36547, 9254.0 +10.37118, 9630.0 +10.3769, 8945.0 +10.38263, 10523.0 +10.38835, 9373.0 +10.39407, 9778.0 +10.3998, 11451.0 +10.40552, 22786.0 +10.41123, 74596.0 +10.41697, 168731.0 +10.42268, 222457.0 +10.4284, 175035.0 +10.43413, 93092.0 +10.43985, 49560.0 +10.44557, 30550.0 +10.4513, 22886.0 +10.45702, 20377.0 +10.46273, 17495.0 +10.46847, 17056.0 +10.47418, 14501.0 +10.4799, 13675.0 +10.48563, 14720.0 +10.49135, 13225.0 +10.49707, 13358.0 +10.5028, 11642.0 +10.50852, 10963.0 +10.51423, 10710.0 +10.51997, 10294.0 +10.52568, 10346.0 +10.5314, 10939.0 +10.53713, 10372.0 +10.54285, 11223.0 +10.54857, 9852.0 +10.55428, 9798.0 +10.56002, 10739.0 +10.56573, 11212.0 +10.57145, 12295.0 +10.57718, 13223.0 +10.5829, 14825.0 +10.58862, 15895.0 +10.59435, 18753.0 +10.60007, 16992.0 +10.60578, 17124.0 +10.61152, 15630.0 +10.61723, 13976.0 +10.62295, 15815.0 +10.62868, 13237.0 +10.6344, 14231.0 +10.64012, 13891.0 +10.64585, 12519.0 +10.65157, 12056.0 +10.65728, 12956.0 +10.66302, 13531.0 +10.66873, 13842.0 +10.67445, 12881.0 +10.68018, 15140.0 +10.6859, 14625.0 +10.69162, 13866.0 +10.69735, 14169.0 +10.70307, 14398.0 +10.70878, 12015.0 +10.7145, 13690.0 +10.72023, 12177.0 +10.72595, 11625.0 +10.73167, 12662.0 +10.7374, 11887.0 +10.74312, 12707.0 +10.74883, 11579.0 +10.75457, 12340.0 +10.76028, 12672.0 +10.766, 13787.0 +10.77173, 15856.0 +10.77745, 18900.0 +10.78317, 22898.0 +10.7889, 26304.0 +10.79462, 25413.0 +10.80033, 24237.0 +10.80607, 18567.0 +10.81178, 15274.0 +10.8175, 14891.0 +10.82323, 11430.0 +10.82895, 13189.0 +10.83467, 11770.0 +10.8404, 10638.0 +10.84612, 11466.0 +10.85183, 11152.0 +10.85757, 11141.0 +10.86328, 10475.0 +10.869, 11562.0 +10.87473, 11640.0 +10.88045, 14421.0 +10.88617, 23135.0 +10.89188, 36220.0 +10.89762, 43254.0 +10.90333, 37464.0 +10.90905, 28340.0 +10.91478, 20823.0 +10.9205, 16734.0 +10.92622, 15953.0 +10.93195, 15343.0 +10.93767, 14895.0 +10.94338, 14751.0 +10.94912, 12831.0 +10.95483, 12653.0 +10.96055, 11913.0 +10.96628, 12529.0 +10.972, 11351.0 +10.97772, 11468.0 +10.98345, 11768.0 +10.98917, 12573.0 +10.99488, 12517.0 +11.00062, 11067.0 +11.00633, 10681.0 +11.01205, 11417.0 +11.01778, 12240.0 +11.0235, 12432.0 +11.02922, 11441.0 +11.03495, 10458.0 +11.04067, 12942.0 +11.04638, 12808.0 +11.05212, 12426.0 +11.05783, 11937.0 +11.06355, 11422.0 +11.06927, 12694.0 +11.075, 11353.0 +11.08072, 12408.0 +11.08643, 11529.0 +11.09217, 12976.0 +11.09788, 11948.0 +11.1036, 11535.0 +11.10933, 11316.0 +11.11505, 12148.0 +11.12077, 11677.0 +11.1265, 11779.0 +11.13222, 11002.0 +11.13793, 12472.0 +11.14367, 17135.0 +11.14938, 21600.0 +11.1551, 25015.0 +11.16083, 24117.0 +11.16655, 24683.0 +11.17227, 23475.0 +11.178, 23726.0 +11.18372, 22628.0 +11.18943, 20593.0 +11.19517, 22115.0 +11.20088, 19850.0 +11.2066, 18521.0 +11.21233, 18002.0 +11.21805, 16722.0 +11.22377, 18809.0 +11.2295, 16233.0 +11.23522, 17383.0 +11.24093, 16721.0 +11.24665, 16528.0 +11.25238, 16037.0 +11.2581, 15111.0 +11.26382, 14203.0 +11.26955, 13267.0 +11.27527, 17073.0 +11.28098, 40329.0 +11.28672, 134802.0 +11.29243, 358211.0 +11.29815, 542212.0 +11.30388, 464742.0 +11.3096, 247805.0 +11.31532, 118912.0 +11.32105, 71515.0 +11.32677, 50151.0 +11.33248, 40668.0 +11.33822, 33465.0 +11.34393, 29848.0 +11.34965, 27050.0 +11.35538, 23848.0 +11.3611, 22805.0 +11.36682, 21546.0 +11.37255, 21655.0 +11.37827, 20112.0 +11.38398, 19134.0 +11.38972, 19104.0 +11.39543, 19381.0 +11.40115, 19609.0 +11.40688, 18757.0 +11.4126, 19836.0 +11.41832, 20420.0 +11.42403, 18809.0 +11.42977, 17704.0 +11.43548, 17169.0 +11.4412, 14982.0 +11.44693, 15148.0 +11.45265, 16034.0 +11.45837, 15163.0 +11.4641, 15130.0 +11.46982, 15706.0 +11.47553, 13973.0 +11.48127, 13859.0 +11.48698, 14138.0 +11.4927, 13680.0 +11.49843, 13969.0 +11.50415, 12892.0 +11.50987, 12199.0 +11.5156, 12692.0 +11.52132, 12720.0 +11.52703, 11852.0 +11.53277, 13682.0 +11.53848, 14746.0 +11.5442, 13474.0 +11.54993, 14037.0 +11.55565, 13308.0 +11.56137, 13530.0 +11.5671, 13982.0 +11.57282, 12453.0 +11.57853, 12694.0 +11.58425, 11919.0 +11.58998, 12642.0 +11.5957, 12089.0 +11.60142, 12273.0 +11.60715, 11760.0 +11.61287, 11842.0 +11.61858, 12380.0 +11.62432, 12721.0 +11.63003, 12368.0 +11.63575, 13981.0 +11.64148, 16611.0 +11.6472, 12801.0 +11.65292, 11343.0 +11.65865, 11816.0 +11.66437, 12649.0 +11.67008, 10908.0 +11.67582, 10901.0 +11.68153, 11334.0 +11.68725, 11335.0 +11.69298, 10844.0 +11.6987, 11398.0 +11.70442, 10449.0 +11.71015, 11245.0 +11.71587, 9791.0 +11.72158, 10810.0 +11.72732, 9405.0 +11.73303, 10524.0 +11.73875, 11751.0 +11.74448, 10482.0 +11.7502, 11610.0 +11.75592, 10357.0 +11.76163, 10683.0 +11.76737, 12229.0 +11.77308, 11585.0 +11.7788, 12167.0 +11.78453, 12608.0 +11.79025, 12628.0 +11.79597, 12578.0 +11.8017, 12807.0 +11.80742, 11609.0 +11.81313, 11154.0 +11.81887, 10896.0 +11.82458, 11689.0 +11.8303, 9869.0 +11.83603, 12138.0 +11.84175, 26219.0 +11.84747, 104361.0 +11.8532, 398624.0 +11.85892, 813651.0 +11.86463, 898266.0 +11.87037, 575028.0 +11.87608, 266031.0 +11.8818, 111750.0 +11.88753, 58450.0 +11.89325, 40004.0 +11.89897, 32661.0 +11.9047, 27832.0 +11.91042, 23888.0 +11.91613, 20728.0 +11.92185, 21911.0 +11.92758, 19329.0 +11.9333, 18194.0 +11.93902, 15566.0 +11.94475, 15314.0 +11.95047, 13839.0 +11.95618, 13267.0 +11.96192, 15092.0 +11.96763, 13904.0 +11.97335, 13850.0 +11.97908, 14087.0 +11.9848, 13090.0 +11.99052, 11759.0 +11.99625, 11079.0 +12.00197, 12023.0 +12.00768, 11363.0 +12.01342, 11133.0 +12.01913, 10988.0 +12.02485, 12081.0 +12.03058, 13625.0 +12.0363, 17283.0 +12.04202, 31507.0 +12.04775, 44811.0 +12.05347, 46779.0 +12.05918, 36584.0 +12.06492, 27834.0 +12.07063, 18012.0 +12.07635, 15830.0 +12.08208, 14498.0 +12.0878, 14520.0 +12.09352, 12396.0 +12.09923, 12689.0 +12.10497, 11911.0 +12.11068, 12613.0 +12.1164, 10900.0 +12.12213, 14836.0 +12.12785, 22869.0 +12.13357, 60963.0 +12.1393, 191021.0 +12.14502, 452188.0 +12.15073, 579046.0 +12.15647, 453253.0 +12.16218, 225206.0 +12.1679, 86035.0 +12.17363, 38898.0 +12.17935, 25697.0 +12.18507, 20915.0 +12.1908, 20520.0 +12.19652, 17711.0 +12.20223, 17238.0 +12.20797, 15687.0 +12.21368, 13879.0 +12.2194, 13442.0 +12.22513, 13029.0 +12.23085, 11701.0 +12.23657, 13230.0 +12.2423, 19629.0 +12.24802, 44529.0 +12.25373, 101132.0 +12.25947, 154505.0 +12.26518, 150277.0 +12.2709, 95620.0 +12.27662, 44771.0 +12.28235, 21913.0 +12.28807, 15230.0 +12.29378, 13002.0 +12.29952, 11877.0 +12.30523, 12189.0 +12.31095, 12687.0 +12.31668, 10552.0 +12.3224, 11753.0 +12.32812, 11292.0 +12.33385, 11029.0 +12.33957, 11394.0 +12.34528, 11027.0 +12.35102, 11099.0 +12.35673, 10472.0 +12.36245, 10669.0 +12.36818, 10818.0 +12.3739, 10946.0 +12.37962, 9637.0 +12.38535, 9960.0 +12.39107, 9191.0 +12.39678, 10759.0 +12.40252, 9665.0 +12.40823, 10548.0 +12.41395, 9356.0 +12.41968, 9271.0 +12.4254, 9146.0 +12.43112, 10185.0 +12.43685, 9159.0 +12.44257, 9914.0 +12.44828, 9991.0 +12.454, 8861.0 +12.45973, 9856.0 +12.46545, 9393.0 +12.47117, 9793.0 +12.4769, 9660.0 +12.48262, 15030.0 +12.48833, 28034.0 +12.49407, 47985.0 +12.49978, 53176.0 +12.5055, 45835.0 +12.51123, 29246.0 +12.51695, 19664.0 +12.52267, 15083.0 +12.5284, 12328.0 +12.53412, 11635.0 +12.53983, 11285.0 +12.54557, 9994.0 +12.55128, 11185.0 +12.557, 11273.0 +12.56273, 10065.0 +12.56845, 9645.0 +12.57417, 9678.0 +12.5799, 10047.0 +12.58562, 9486.0 +12.59133, 10477.0 +12.59707, 10073.0 +12.60278, 9294.0 +12.6085, 10082.0 +12.61422, 11036.0 +12.61995, 10367.0 +12.62567, 11722.0 +12.63138, 9998.0 +12.63712, 11337.0 +12.64283, 10625.0 +12.64855, 11384.0 +12.65428, 9371.0 +12.66, 11348.0 +12.66572, 9716.0 +12.67145, 11101.0 +12.67717, 9779.0 +12.68288, 9695.0 +12.68862, 8596.0 +12.69433, 8388.0 +12.70005, 9026.0 +12.70578, 10166.0 +12.7115, 9636.0 +12.71722, 9618.0 +12.72295, 9018.0 +12.72867, 9444.0 +12.73438, 8563.0 +12.74012, 9313.0 +12.74583, 8490.0 +12.75155, 9169.0 +12.75728, 10135.0 +12.763, 9771.0 +12.76872, 10952.0 +12.77445, 11794.0 +12.78017, 13615.0 +12.78588, 13488.0 +12.7916, 14198.0 +12.79733, 15005.0 +12.80305, 14087.0 +12.80877, 13779.0 +12.8145, 13064.0 +12.82022, 12757.0 +12.82593, 11413.0 +12.83167, 11959.0 +12.83738, 11336.0 +12.8431, 10703.0 +12.84883, 12536.0 +12.85455, 11562.0 +12.86027, 11518.0 +12.866, 12398.0 +12.87172, 11809.0 +12.87743, 11491.0 +12.88317, 11490.0 +12.88888, 12283.0 +12.8946, 11318.0 +12.90033, 10531.0 +12.90605, 11974.0 +12.91177, 11911.0 +12.9175, 10764.0 +12.92322, 11559.0 +12.92893, 10124.0 +12.93467, 10687.0 +12.94038, 10372.0 +12.9461, 11755.0 +12.95182, 10791.0 +12.95755, 11224.0 +12.96327, 10201.0 +12.96898, 11442.0 +12.97472, 10810.0 +12.98043, 10140.0 +12.98615, 10634.0 +12.99188, 10619.0 +12.9976, 9980.0 +13.00332, 10522.0 +13.00905, 10094.0 +13.01477, 10461.0 +13.02048, 11544.0 +13.02622, 11591.0 +13.03193, 11398.0 +13.03765, 11032.0 +13.04338, 11272.0 +13.0491, 10772.0 +13.05482, 10474.0 +13.06055, 10717.0 +13.06627, 10075.0 +13.07198, 9003.0 +13.07772, 9949.0 +13.08343, 9112.0 +13.08915, 8883.0 +13.09488, 9478.0 +13.1006, 10394.0 +13.10632, 9270.0 +13.11205, 10939.0 +13.11777, 10902.0 +13.12348, 9409.0 +13.1292, 10797.0 +13.13493, 10147.0 +13.14065, 9220.0 +13.14637, 10507.0 +13.1521, 10629.0 +13.15782, 10370.0 +13.16353, 10949.0 +13.16927, 9152.0 +13.17498, 9793.0 +13.1807, 8684.0 +13.18643, 9787.0 +13.19215, 9394.0 +13.19787, 8561.0 +13.2036, 9320.0 +13.20932, 9501.0 +13.21503, 10310.0 +13.22077, 9698.0 +13.22648, 8852.0 +13.2322, 10379.0 +13.23793, 9338.0 +13.24365, 9664.0 +13.24937, 9405.0 +13.2551, 10202.0 +13.26082, 9446.0 +13.26653, 9311.0 +13.27227, 10174.0 +13.27798, 9577.0 +13.2837, 10365.0 +13.28943, 12972.0 +13.29515, 14550.0 +13.30087, 11846.0 +13.30658, 10284.0 +13.31232, 9852.0 +13.31803, 10138.0 +13.32375, 9747.0 +13.32948, 9467.0 +13.3352, 8512.0 +13.34092, 9811.0 +13.34665, 10313.0 +13.35237, 8362.0 +13.35808, 10039.0 +13.36382, 8787.0 +13.36953, 9070.0 +13.37525, 9259.0 +13.38098, 8876.0 +13.3867, 9404.0 +13.39242, 8988.0 +13.39815, 8750.0 +13.40387, 8947.0 +13.40958, 9138.0 +13.41532, 8573.0 +13.42103, 9429.0 +13.42675, 9064.0 +13.43248, 9560.0 +13.4382, 8591.0 +13.44392, 8236.0 +13.44965, 9086.0 +13.45537, 8830.0 +13.46108, 8815.0 +13.46682, 7828.0 +13.47253, 9305.0 +13.47825, 9463.0 +13.48397, 9422.0 +13.4897, 8800.0 +13.49542, 9349.0 +13.50113, 9526.0 +13.50687, 8539.0 +13.51258, 8725.0 +13.5183, 9329.0 +13.52403, 8377.0 +13.52975, 9175.0 +13.53547, 8849.0 +13.5412, 7098.0 +13.54692, 9177.0 +13.55263, 9835.0 +13.55837, 9305.0 +13.56408, 9818.0 +13.5698, 8894.0 +13.57553, 9143.0 +13.58125, 9041.0 +13.58697, 8188.0 +13.5927, 9300.0 +13.59842, 8552.0 +13.60413, 8976.0 +13.60987, 8859.0 +13.61558, 9272.0 +13.6213, 9249.0 +13.62703, 9065.0 +13.63275, 9906.0 +13.63847, 8766.0 +13.64418, 9323.0 +13.64992, 8869.0 +13.65563, 8912.0 +13.66135, 8539.0 +13.66708, 8723.0 +13.6728, 8236.0 +13.67852, 9349.0 +13.68425, 9488.0 +13.68997, 8597.0 +13.69568, 9967.0 +13.70142, 9918.0 +13.70713, 9749.0 +13.71285, 9228.0 +13.71858, 8371.0 +13.7243, 9519.0 +13.73002, 9251.0 +13.73575, 9268.0 +13.74147, 8904.0 +13.74718, 9228.0 +13.75292, 9594.0 +13.75863, 9402.0 +13.76435, 9198.0 +13.77008, 9388.0 +13.7758, 9612.0 +13.78152, 8753.0 +13.78725, 8595.0 +13.79297, 8981.0 +13.79868, 9810.0 +13.80442, 9134.0 +13.81013, 9276.0 +13.81585, 8801.0 +13.82157, 8377.0 +13.8273, 8639.0 +13.83302, 8712.0 +13.83873, 10494.0 +13.84447, 9796.0 +13.85018, 8871.0 +13.8559, 7563.0 +13.86163, 8674.0 +13.86735, 9334.0 +13.87307, 8932.0 +13.8788, 8598.0 +13.88452, 7784.0 +13.89023, 8698.0 +13.89597, 8617.0 +13.90168, 8336.0 +13.9074, 8827.0 +13.91313, 8999.0 +13.91885, 8765.0 +13.92457, 8890.0 +13.9303, 8531.0 +13.93602, 9811.0 +13.94173, 8476.0 +13.94747, 8912.0 +13.95318, 8531.0 +13.9589, 9730.0 +13.96463, 9014.0 +13.97035, 10380.0 +13.97607, 10701.0 +13.9818, 10208.0 +13.98752, 10115.0 +13.99323, 10285.0 +13.99895, 8711.0 +14.00468, 9206.0 +14.0104, 10093.0 +14.01612, 9542.0 +14.02185, 8665.0 +14.02757, 9737.0 +14.03328, 8973.0 +14.03902, 10796.0 +14.04473, 9486.0 +14.05045, 9249.0 +14.05618, 9279.0 +14.0619, 9410.0 +14.06762, 8132.0 +14.07335, 8525.0 +14.07907, 9078.0 +14.08478, 8290.0 +14.09052, 9521.0 +14.09623, 8614.0 +14.10195, 9374.0 +14.10768, 9222.0 +14.1134, 9305.0 +14.11912, 8557.0 +14.12485, 9115.0 +14.13057, 9389.0 +14.13628, 8484.0 +14.14202, 8893.0 +14.14773, 8703.0 +14.15345, 9385.0 +14.15917, 10178.0 +14.1649, 9004.0 +14.17062, 8713.0 +14.17633, 8957.0 +14.18207, 10219.0 +14.18778, 9326.0 +14.1935, 11783.0 +14.19923, 13453.0 +14.20495, 12129.0 +14.21067, 11007.0 +14.2164, 10051.0 +14.22212, 10400.0 +14.22783, 9335.0 +14.23357, 9538.0 +14.23928, 9574.0 +14.245, 8911.0 +14.25073, 9754.0 +14.25645, 9098.0 +14.26217, 8630.0 +14.2679, 9621.0 +14.27362, 8803.0 +14.27933, 8201.0 +14.28507, 9232.0 +14.29078, 9464.0 +14.2965, 9369.0 +14.30223, 8512.0 +14.30795, 9314.0 +14.31367, 9806.0 +14.3194, 9453.0 +14.32512, 11128.0 +14.33083, 11319.0 +14.33655, 9619.0 +14.34228, 10236.0 +14.348, 9157.0 +14.35372, 8910.0 +14.35945, 9796.0 +14.36517, 8664.0 +14.37088, 9394.0 +14.37662, 9495.0 +14.38233, 10825.0 +14.38805, 9123.0 +14.39378, 8582.0 +14.3995, 9664.0 +14.40522, 10185.0 +14.41095, 10010.0 +14.41667, 9741.0 +14.42238, 9250.0 +14.42812, 8847.0 +14.43383, 8669.0 +14.43955, 9063.0 +14.44528, 8751.0 +14.451, 9914.0 +14.45672, 8466.0 +14.46245, 9440.0 +14.46817, 8766.0 +14.47388, 9610.0 +14.47962, 8334.0 +14.48533, 8826.0 +14.49105, 9449.0 +14.49678, 8996.0 +14.5025, 9775.0 +14.50822, 11306.0 +14.51393, 10006.0 +14.51967, 8292.0 +14.52538, 9302.0 +14.5311, 9254.0 +14.53683, 8759.0 +14.54255, 8689.0 +14.54827, 9484.0 +14.554, 9052.0 +14.55972, 8725.0 +14.56543, 9004.0 +14.57117, 8354.0 +14.57688, 9279.0 +14.5826, 9488.0 +14.58833, 9630.0 +14.59405, 9735.0 +14.59977, 10057.0 +14.6055, 9881.0 +14.61122, 8934.0 +14.61693, 9974.0 +14.62267, 8558.0 +14.62838, 8970.0 +14.6341, 11437.0 +14.63983, 9247.0 +14.64555, 9363.0 +14.65127, 8811.0 +14.657, 9548.0 +14.66272, 9910.0 +14.66843, 9327.0 +14.67415, 10170.0 +14.67988, 9685.0 +14.6856, 9525.0 +14.69132, 9207.0 +14.69705, 9605.0 +14.70277, 10253.0 +14.70848, 9622.0 +14.71422, 10194.0 +14.71993, 9068.0 +14.72565, 9653.0 +14.73138, 8801.0 +14.7371, 9483.0 +14.74282, 9687.0 +14.74855, 10612.0 +14.75427, 8947.0 +14.75998, 9861.0 +14.76572, 12008.0 +14.77143, 18294.0 +14.77715, 33705.0 +14.78288, 55477.0 +14.7886, 72570.0 +14.79432, 75164.0 +14.80005, 66365.0 +14.80577, 51838.0 +14.81148, 39224.0 +14.81722, 27892.0 +14.82293, 23730.0 +14.82865, 20238.0 +14.83438, 17288.0 +14.8401, 17190.0 +14.84582, 15574.0 +14.85153, 15545.0 +14.85727, 14926.0 +14.86298, 14763.0 +14.8687, 15006.0 +14.87443, 13710.0 +14.88015, 12415.0 +14.88587, 10829.0 +14.8916, 13657.0 +14.89732, 12990.0 +14.90303, 12356.0 +14.90877, 12620.0 +14.91448, 11456.0 +14.9202, 12650.0 +14.92593, 12585.0 +14.93165, 12537.0 +14.93737, 15111.0 +14.9431, 12908.0 +14.94882, 12622.0 +14.95453, 12877.0 +14.96027, 12653.0 +14.96598, 11069.0 +14.9717, 12564.0 +14.97743, 11243.0 +14.98315, 12983.0 +14.98887, 12867.0 +14.9946, 10979.0 +15.00032, 11922.0 +15.00603, 11637.0 +15.01177, 12576.0 +15.01748, 12428.0 +15.0232, 11362.0 +15.02892, 11673.0 +15.03465, 11504.0 +15.04037, 12090.0 +15.04608, 11594.0 +15.05182, 12274.0 +15.05753, 13612.0 +15.06325, 19811.0 +15.06898, 28154.0 +15.0747, 34458.0 +15.08042, 33365.0 +15.08615, 29173.0 +15.09187, 23488.0 +15.09758, 19163.0 +15.10332, 17770.0 +15.10903, 15011.0 +15.11475, 14881.0 +15.12048, 13475.0 +15.1262, 13166.0 +15.13192, 13698.0 +15.13765, 12160.0 +15.14337, 15731.0 +15.14908, 13544.0 +15.15482, 16136.0 +15.16053, 14321.0 +15.16625, 14020.0 +15.17198, 13814.0 +15.1777, 13852.0 +15.18342, 12779.0 +15.18915, 12225.0 +15.19487, 12350.0 +15.20058, 13264.0 +15.2063, 12169.0 +15.21203, 12435.0 +15.21775, 12161.0 +15.22347, 12359.0 +15.2292, 12869.0 +15.23492, 11802.0 +15.24063, 10693.0 +15.24637, 15404.0 +15.25208, 26654.0 +15.2578, 125501.0 +15.26353, 676637.0 +15.26925, 2803911.0 +15.27497, 6767388.0 +15.2807, 12446910.0 +15.28642, 18053860.0 +15.29213, 23276850.0 +15.29787, 27394670.0 +15.30358, 30781540.0 +15.3093, 33327960.0 +15.31503, 35766360.0 +15.32075, 37676580.0 +15.32647, 39042790.0 +15.3322, 40470450.0 +15.33792, 41877010.0 +15.34363, 43021550.0 +15.34937, 43880060.0 +15.35508, 44205050.0 +15.3608, 44190710.0 +15.36652, 44317640.0 +15.37225, 44507300.0 +15.37797, 44435420.0 +15.38368, 31045670.0 +15.38942, 5394202.0 +15.39513, 2465241.0 +15.40085, 1643706.0 +15.40658, 1224674.0 +15.4123, 1041938.0 +15.41802, 971103.0 +15.42375, 882728.0 +15.42947, 709657.0 +15.43518, 557931.0 +15.44092, 468228.0 +15.44663, 411340.0 +15.45235, 362256.0 +15.45808, 325958.0 +15.4638, 306183.0 +15.46952, 276430.0 +15.47525, 254565.0 +15.48097, 238102.0 +15.48668, 227731.0 +15.49242, 214615.0 +15.49813, 202679.0 +15.50385, 190800.0 +15.50958, 187778.0 +15.5153, 176257.0 +15.52102, 168781.0 +15.52675, 163542.0 +15.53247, 155992.0 +15.53818, 148983.0 +15.5439, 144460.0 +15.54963, 136820.0 +15.55535, 135002.0 +15.56107, 127980.0 +15.5668, 124354.0 +15.57252, 121124.0 +15.57823, 115780.0 +15.58397, 110414.0 +15.58968, 105167.0 +15.5954, 103113.0 +15.60113, 102713.0 +15.60685, 97085.0 +15.61257, 95839.0 +15.6183, 92059.0 +15.62402, 93276.0 +15.62973, 90941.0 +15.63547, 91802.0 +15.64118, 86981.0 +15.6469, 86843.0 +15.65263, 81977.0 +15.65835, 80315.0 +15.66407, 75706.0 +15.6698, 77288.0 +15.67552, 73956.0 +15.68123, 72891.0 +15.68697, 71995.0 +15.69268, 73604.0 +15.6984, 66034.0 +15.70412, 70009.0 +15.70985, 68614.0 +15.71557, 64774.0 +15.72128, 63046.0 +15.72702, 64182.0 +15.73273, 68590.0 +15.73845, 85363.0 +15.74418, 125119.0 +15.7499, 186516.0 +15.75562, 277734.0 +15.76135, 503657.0 +15.76707, 884156.0 +15.77278, 1134108.0 +15.77852, 927814.0 +15.78423, 576093.0 +15.78995, 341071.0 +15.79568, 222270.0 +15.8014, 167526.0 +15.80712, 132292.0 +15.81285, 113786.0 +15.81857, 101367.0 +15.82428, 92677.0 +15.83002, 89500.0 +15.83573, 103881.0 +15.84145, 134467.0 +15.84718, 167050.0 +15.8529, 176462.0 +15.85862, 154097.0 +15.86435, 124713.0 +15.87007, 99636.0 +15.87578, 84836.0 +15.8815, 74994.0 +15.88723, 72488.0 +15.89295, 66699.0 +15.89867, 62613.0 +15.9044, 59595.0 +15.91012, 58157.0 +15.91583, 56364.0 +15.92157, 54832.0 +15.92728, 55651.0 +15.933, 52916.0 +15.93873, 53561.0 +15.94445, 52911.0 +15.95017, 58671.0 +15.9559, 60928.0 +15.96162, 56647.0 +15.96733, 54415.0 +15.97307, 50136.0 +15.97878, 50854.0 +15.9845, 49603.0 +15.99023, 46935.0 +15.99595, 45335.0 +16.00167, 45986.0 +16.0074, 43970.0 +16.01312, 43199.0 +16.01883, 44280.0 +16.02457, 43212.0 +16.03028, 43187.0 +16.036, 42248.0 +16.04173, 42910.0 +16.04745, 41815.0 +16.05317, 41970.0 +16.05888, 41532.0 +16.06462, 38992.0 +16.07033, 41131.0 +16.07605, 45804.0 +16.08178, 79263.0 +16.0875, 227369.0 +16.09322, 672766.0 +16.09895, 1420202.0 +16.10467, 1834614.0 +16.11038, 1496068.0 +16.11612, 875304.0 +16.12183, 473075.0 +16.12755, 281859.0 +16.13328, 201075.0 +16.139, 148166.0 +16.14472, 120056.0 +16.15045, 98323.0 +16.15617, 88881.0 +16.16188, 77954.0 +16.16762, 71056.0 +16.17333, 67472.0 +16.17905, 67096.0 +16.18478, 60422.0 +16.1905, 61808.0 +16.19622, 62497.0 +16.20195, 62981.0 +16.20767, 64874.0 +16.21338, 63475.0 +16.21912, 62769.0 +16.22483, 61052.0 +16.23055, 57783.0 +16.23627, 56284.0 +16.242, 57607.0 +16.24772, 54299.0 +16.25343, 54378.0 +16.25917, 49513.0 +16.26488, 50553.0 +16.2706, 46772.0 +16.27633, 47239.0 +16.28205, 45625.0 +16.28777, 47596.0 +16.2935, 44520.0 +16.29922, 46448.0 +16.30493, 46864.0 +16.31067, 44523.0 +16.31638, 43409.0 +16.3221, 42464.0 +16.32783, 44863.0 +16.33355, 45755.0 +16.33927, 45999.0 +16.345, 45845.0 +16.35072, 44042.0 +16.35643, 43369.0 +16.36217, 40944.0 +16.36788, 40661.0 +16.3736, 38865.0 +16.37933, 39757.0 +16.38505, 46382.0 +16.39077, 63767.0 +16.39648, 93098.0 +16.40222, 120198.0 +16.40793, 128079.0 +16.41365, 111464.0 +16.41938, 91332.0 +16.4251, 76561.0 +16.43082, 65786.0 +16.43655, 59996.0 +16.44227, 55694.0 +16.44798, 52930.0 +16.45372, 51093.0 +16.45943, 49672.0 +16.46515, 48448.0 +16.47088, 43080.0 +16.4766, 46660.0 +16.48232, 43888.0 +16.48805, 43299.0 +16.49377, 41419.0 +16.49948, 39952.0 +16.50522, 40633.0 +16.51093, 39840.0 +16.51665, 39211.0 +16.52238, 39666.0 +16.5281, 38047.0 +16.53382, 38188.0 +16.53955, 40036.0 +16.54527, 38230.0 +16.55098, 36739.0 +16.55672, 37770.0 +16.56243, 39340.0 +16.56815, 38629.0 +16.57387, 37174.0 +16.5796, 38164.0 +16.58532, 38090.0 +16.59103, 36499.0 +16.59677, 36363.0 +16.60248, 35796.0 +16.6082, 35237.0 +16.61393, 36693.0 +16.61965, 44344.0 +16.62537, 58430.0 +16.6311, 83956.0 +16.63682, 109581.0 +16.64253, 117858.0 +16.64827, 110784.0 +16.65398, 95942.0 +16.6597, 85055.0 +16.66543, 74781.0 +16.67115, 67899.0 +16.67687, 61034.0 +16.6826, 58352.0 +16.68832, 53058.0 +16.69403, 50107.0 +16.69977, 49193.0 +16.70548, 45890.0 +16.7112, 43505.0 +16.71693, 43572.0 +16.72265, 45128.0 +16.72837, 43158.0 +16.73408, 43442.0 +16.73982, 41651.0 +16.74553, 42289.0 +16.75125, 39330.0 +16.75698, 38726.0 +16.7627, 41114.0 +16.76842, 39496.0 +16.77415, 39516.0 +16.77987, 37795.0 +16.78558, 37834.0 +16.79132, 40536.0 +16.79703, 38782.0 +16.80275, 39899.0 +16.80848, 36675.0 +16.8142, 39338.0 +16.81992, 37032.0 +16.82565, 37668.0 +16.83137, 41909.0 +16.83708, 40643.0 +16.84282, 44497.0 +16.84853, 43288.0 +16.85425, 45956.0 +16.85998, 45930.0 +16.8657, 46688.0 +16.87142, 46792.0 +16.87715, 45550.0 +16.88287, 45334.0 +16.88858, 46220.0 +16.89432, 46245.0 +16.90003, 43411.0 +16.90575, 43996.0 +16.91147, 44522.0 +16.9172, 45894.0 +16.92292, 45783.0 +16.92863, 45130.0 +16.93437, 44599.0 +16.94008, 43759.0 +16.9458, 43603.0 +16.95153, 43276.0 +16.95725, 42648.0 +16.96297, 40217.0 +16.9687, 41911.0 +16.97442, 42403.0 +16.98013, 41372.0 +16.98587, 40597.0 +16.99158, 43162.0 +16.9973, 40894.0 +17.00303, 41482.0 +17.00875, 42860.0 +17.01447, 39271.0 +17.0202, 41350.0 +17.02592, 39228.0 +17.03163, 40936.0 +17.03737, 39151.0 +17.04308, 40962.0 +17.0488, 38853.0 +17.05453, 39669.0 +17.06025, 39204.0 +17.06597, 40006.0 +17.0717, 39636.0 +17.07742, 39586.0 +17.08313, 38438.0 +17.08885, 39275.0 +17.09458, 38211.0 +17.1003, 37637.0 +17.10602, 39571.0 +17.11175, 40382.0 +17.11747, 39532.0 +17.12318, 38874.0 +17.12892, 40838.0 +17.13463, 39542.0 +17.14035, 36424.0 +17.14608, 39997.0 +17.1518, 37984.0 +17.15752, 39405.0 +17.16325, 40058.0 +17.16897, 40281.0 +17.17468, 39022.0 +17.18042, 39478.0 +17.18613, 39631.0 +17.19185, 37191.0 +17.19758, 40310.0 +17.2033, 39194.0 +17.20902, 38412.0 +17.21475, 39269.0 +17.22047, 39980.0 +17.22618, 40361.0 +17.23192, 38504.0 +17.23763, 40628.0 +17.24335, 39660.0 +17.24908, 38185.0 +17.2548, 40932.0 +17.26052, 39737.0 +17.26623, 39987.0 +17.27197, 41779.0 +17.27768, 40074.0 +17.2834, 41641.0 +17.28913, 41863.0 +17.29485, 39814.0 +17.30057, 39309.0 +17.3063, 40036.0 +17.31202, 40769.0 +17.31773, 40168.0 +17.32347, 39832.0 +17.32918, 39733.0 +17.3349, 40946.0 +17.34063, 40620.0 +17.34635, 39935.0 +17.35207, 37228.0 +17.3578, 42999.0 +17.36352, 39748.0 +17.36923, 40018.0 +17.37497, 40572.0 +17.38068, 40625.0 +17.3864, 40889.0 +17.39213, 42077.0 +17.39785, 41370.0 +17.40357, 39976.0 +17.4093, 39802.0 +17.41502, 42698.0 +17.42073, 40353.0 +17.42647, 42713.0 +17.43218, 41715.0 +17.4379, 42022.0 +17.44362, 42613.0 +17.44935, 43529.0 +17.45507, 43008.0 +17.46078, 41752.0 +17.46652, 43692.0 +17.47223, 42125.0 +17.47795, 42665.0 +17.48368, 43474.0 +17.4894, 44371.0 +17.49512, 45591.0 +17.50085, 43303.0 +17.50657, 45609.0 +17.51228, 42756.0 +17.51802, 41627.0 +17.52373, 42537.0 +17.52945, 42605.0 +17.53518, 43638.0 +17.5409, 42412.0 +17.54662, 43879.0 +17.55235, 43427.0 +17.55807, 43661.0 +17.56378, 44998.0 +17.56952, 45629.0 +17.57523, 42888.0 +17.58095, 46476.0 +17.58668, 44188.0 +17.5924, 47403.0 +17.59812, 43941.0 +17.60383, 45731.0 +17.60957, 42308.0 +17.61528, 45298.0 +17.621, 46685.0 +17.62673, 45550.0 +17.63245, 46146.0 +17.63817, 46995.0 +17.6439, 45368.0 +17.64962, 46733.0 +17.65533, 47859.0 +17.66107, 47842.0 +17.66678, 47009.0 +17.6725, 50114.0 +17.67823, 48556.0 +17.68395, 46062.0 +17.68967, 47387.0 +17.6954, 48914.0 +17.70112, 47398.0 +17.70683, 46184.0 +17.71257, 46487.0 +17.71828, 48595.0 +17.724, 48733.0 +17.72973, 48792.0 +17.73545, 50096.0 +17.74117, 49659.0 +17.7469, 48174.0 +17.75262, 47159.0 +17.75833, 48775.0 +17.76407, 48766.0 +17.76978, 50600.0 +17.7755, 49167.0 +17.78122, 49888.0 +17.78695, 50578.0 +17.79267, 48665.0 +17.79838, 50989.0 +17.80412, 50762.0 +17.80983, 49841.0 +17.81555, 48785.0 +17.82128, 51571.0 +17.827, 49110.0 +17.83272, 52387.0 +17.83845, 51196.0 +17.84417, 52333.0 +17.84988, 53436.0 +17.85562, 51867.0 +17.86133, 53973.0 +17.86705, 49804.0 +17.87278, 51603.0 +17.8785, 52453.0 +17.88422, 51693.0 +17.88995, 53207.0 +17.89567, 54090.0 +17.90138, 52263.0 +17.90712, 52247.0 +17.91283, 53025.0 +17.91855, 50918.0 +17.92428, 53732.0 +17.93, 53674.0 +17.93572, 52674.0 +17.94143, 54677.0 +17.94717, 53848.0 +17.95288, 55790.0 +17.9586, 57051.0 +17.96433, 55461.0 +17.97005, 54725.0 +17.97577, 55535.0 +17.9815, 57273.0 +17.98722, 57576.0 +17.99293, 57787.0 +17.99867, 57715.0 +18.00438, 58878.0 +18.0101, 58435.0 +18.01583, 55992.0 +18.02155, 59400.0 +18.02727, 59447.0 +18.033, 58629.0 +18.03872, 56281.0 +18.04443, 59402.0 +18.05017, 58892.0 +18.05588, 59591.0 +18.0616, 58064.0 +18.06733, 59321.0 +18.07305, 62719.0 +18.07877, 58145.0 +18.0845, 59819.0 +18.09022, 59847.0 +18.09593, 60438.0 +18.10167, 61228.0 +18.10738, 59079.0 +18.1131, 63519.0 +18.11882, 61772.0 +18.12455, 62431.0 +18.13027, 62131.0 +18.13598, 60462.0 +18.14172, 61363.0 +18.14743, 62744.0 +18.15315, 65478.0 +18.15888, 62902.0 +18.1646, 63429.0 +18.17032, 64144.0 +18.17605, 64050.0 +18.18177, 64553.0 +18.18748, 63365.0 +18.19322, 67309.0 +18.19893, 64709.0 +18.20465, 64132.0 +18.21038, 66592.0 +18.2161, 64595.0 +18.22182, 66491.0 +18.22755, 64946.0 +18.23327, 67524.0 +18.23898, 68668.0 +18.24472, 67404.0 +18.25043, 69760.0 +18.25615, 66065.0 +18.26188, 68495.0 +18.2676, 68518.0 +18.27332, 70717.0 +18.27905, 66925.0 +18.28477, 67881.0 +18.29048, 70554.0 +18.2962, 70358.0 +18.30193, 67679.0 +18.30765, 69071.0 +18.31337, 69194.0 +18.3191, 71628.0 +18.32482, 69899.0 +18.33053, 69948.0 +18.33627, 73400.0 +18.34198, 72597.0 +18.3477, 73059.0 +18.35343, 74142.0 +18.35915, 73480.0 +18.36487, 75296.0 +18.3706, 74004.0 +18.37632, 73911.0 +18.38203, 76234.0 +18.38777, 72913.0 +18.39348, 74821.0 +18.3992, 74242.0 +18.40493, 76913.0 +18.41065, 75172.0 +18.41637, 76187.0 +18.4221, 75645.0 +18.42782, 76151.0 +18.43353, 78002.0 +18.43927, 76802.0 +18.44498, 77899.0 +18.4507, 77987.0 +18.45643, 76362.0 +18.46215, 78792.0 +18.46787, 78018.0 +18.47358, 78798.0 +18.47932, 77666.0 +18.48503, 79385.0 +18.49075, 80420.0 +18.49648, 77769.0 +18.5022, 80374.0 +18.50792, 81385.0 +18.51365, 79819.0 +18.51937, 81365.0 +18.52508, 82816.0 +18.53082, 85065.0 +18.53653, 80205.0 +18.54225, 85068.0 +18.54798, 81571.0 +18.5537, 84100.0 +18.55942, 85284.0 +18.56515, 83695.0 +18.57087, 85661.0 +18.57658, 85847.0 +18.58232, 87024.0 +18.58803, 86549.0 +18.59375, 86237.0 +18.59948, 88338.0 +18.6052, 84772.0 +18.61092, 86079.0 +18.61665, 89470.0 +18.62237, 87270.0 +18.62808, 88017.0 +18.6338, 86212.0 +18.63953, 86823.0 +18.64525, 90379.0 +18.65097, 91316.0 +18.6567, 90244.0 +18.66242, 91070.0 +18.66813, 90991.0 +18.67387, 92056.0 +18.67958, 91936.0 +18.6853, 91246.0 +18.69103, 93848.0 +18.69675, 94653.0 +18.70247, 94494.0 +18.7082, 91887.0 +18.71392, 93368.0 +18.71963, 93198.0 +18.72537, 92070.0 +18.73108, 95405.0 +18.7368, 93055.0 +18.74253, 96247.0 +18.74825, 95260.0 +18.75397, 97768.0 +18.7597, 96996.0 +18.76542, 98126.0 +18.77113, 98922.0 +18.77687, 100140.0 +18.78258, 101136.0 +18.7883, 102095.0 +18.79403, 104087.0 +18.79975, 106051.0 +18.80547, 108025.0 +18.81118, 115573.0 +18.81692, 114465.0 +18.82263, 127309.0 +18.82835, 133794.0 +18.83408, 141333.0 +18.8398, 151285.0 +18.84552, 167938.0 +18.85125, 170334.0 +18.85697, 183112.0 +18.86268, 187873.0 +18.86842, 201304.0 +18.87413, 200752.0 +18.87985, 215066.0 +18.88558, 217818.0 +18.8913, 219599.0 +18.89702, 223119.0 +18.90275, 222193.0 +18.90847, 215964.0 +18.91418, 218037.0 +18.91992, 207230.0 +18.92563, 203733.0 +18.93135, 200629.0 +18.93708, 197912.0 +18.9428, 192156.0 +18.94852, 188216.0 +18.95425, 183408.0 +18.95997, 185229.0 +18.96568, 179149.0 +18.97142, 178416.0 +18.97713, 177250.0 +18.98285, 173293.0 +18.98857, 172475.0 +18.9943, 169691.0 +19.00002, 168324.0 +19.00573, 168773.0 +19.01147, 171655.0 +19.01718, 171903.0 +19.0229, 167107.0 +19.02863, 168777.0 +19.03435, 167777.0 +19.04007, 164237.0 +19.0458, 165018.0 +19.05152, 163276.0 +19.05723, 161991.0 +19.06297, 162725.0 +19.06868, 164369.0 +19.0744, 161054.0 +19.08013, 160821.0 +19.08585, 160759.0 +19.09157, 161162.0 +19.0973, 158336.0 +19.10302, 158575.0 +19.10873, 162848.0 +19.11447, 161709.0 +19.12018, 158016.0 +19.1259, 156922.0 +19.13163, 161620.0 +19.13735, 158692.0 +19.14307, 158549.0 +19.14878, 160521.0 +19.15452, 157498.0 +19.16023, 158307.0 +19.16595, 159880.0 +19.17168, 157466.0 +19.1774, 158179.0 +19.18312, 157604.0 +19.18885, 155205.0 +19.19457, 153753.0 +19.20028, 157269.0 +19.20602, 159448.0 +19.21173, 155991.0 +19.21745, 159108.0 +19.22318, 155777.0 +19.2289, 155073.0 +19.23462, 159027.0 +19.24035, 154203.0 +19.24607, 159284.0 +19.25178, 158400.0 +19.25752, 156997.0 +19.26323, 157673.0 +19.26895, 157216.0 +19.27468, 159283.0 +19.2804, 155386.0 +19.28612, 157738.0 +19.29185, 154512.0 +19.29757, 156253.0 +19.30328, 157427.0 +19.30902, 156745.0 +19.31473, 153122.0 +19.32045, 159548.0 +19.32617, 159254.0 +19.3319, 157969.0 +19.33762, 157368.0 +19.34333, 156781.0 +19.34907, 158675.0 +19.35478, 158758.0 +19.3605, 156472.0 +19.36623, 159804.0 +19.37195, 152192.0 +19.37767, 154675.0 +19.3834, 156339.0 +19.38912, 155774.0 +19.39483, 155659.0 +19.40057, 157141.0 +19.40628, 158576.0 +19.412, 158438.0 +19.41773, 160737.0 +19.42345, 154710.0 +19.42917, 157469.0 +19.4349, 159643.0 +19.44062, 161755.0 +19.44633, 155886.0 +19.45207, 156896.0 +19.45778, 159599.0 +19.4635, 160973.0 +19.46923, 160221.0 +19.47495, 157148.0 +19.48067, 157740.0 +19.4864, 157976.0 +19.49212, 159606.0 +19.49783, 160827.0 +19.50355, 155350.0 +19.50928, 153254.0 +19.515, 157035.0 +19.52072, 158406.0 +19.52645, 162690.0 +19.53217, 155787.0 +19.53788, 160316.0 +19.54362, 159921.0 +19.54933, 162327.0 +19.55505, 162006.0 +19.56078, 161983.0 +19.5665, 164106.0 +19.57222, 166594.0 +19.57795, 166278.0 +19.58367, 167098.0 +19.58938, 170325.0 +19.59512, 172114.0 +19.60083, 170192.0 +19.60655, 169976.0 +19.61228, 170427.0 +19.618, 167457.0 +19.62372, 172870.0 +19.62945, 169128.0 +19.63517, 168253.0 +19.64088, 171000.0 +19.64662, 165602.0 +19.65233, 167458.0 +19.65805, 164653.0 +19.66377, 165483.0 +19.6695, 164270.0 +19.67522, 162361.0 +19.68093, 168315.0 +19.68667, 167263.0 +19.69238, 163879.0 +19.6981, 163818.0 +19.70383, 162004.0 +19.70955, 163765.0 +19.71527, 168543.0 +19.721, 162865.0 +19.72672, 163536.0 +19.73243, 164562.0 +19.73817, 161304.0 +19.74388, 162885.0 +19.7496, 161704.0 +19.75533, 164523.0 +19.76105, 164770.0 +19.76677, 161224.0 +19.7725, 164407.0 +19.77822, 164308.0 +19.78393, 163778.0 +19.78967, 164074.0 +19.79538, 164252.0 +19.8011, 162076.0 +19.80683, 160489.0 +19.81255, 163678.0 +19.81827, 161381.0 +19.824, 159291.0 +19.82972, 159620.0 +19.83543, 163074.0 +19.84115, 164693.0 +19.84688, 162663.0 +19.8526, 163712.0 +19.85832, 162684.0 +19.86405, 160777.0 +19.86977, 161614.0 +19.87548, 161856.0 +19.88122, 161179.0 +19.88693, 163455.0 +19.89265, 163712.0 +19.89838, 162108.0 +19.9041, 159727.0 +19.90982, 157599.0 +19.91555, 161032.0 +19.92127, 158004.0 +19.92698, 165599.0 +19.93272, 160722.0 +19.93843, 162384.0 +19.94415, 161403.0 +19.94988, 161545.0 +19.9556, 162802.0 +19.96132, 163693.0 +19.96705, 161193.0 +19.97277, 161613.0 +19.97848, 161153.0 +19.98422, 162134.0 +19.98993, 161301.0 +19.99565, 162362.0 +20.00138, 163457.0 +20.0071, 161443.0 +20.01282, 159805.0 +20.01853, 161334.0 +20.02427, 161500.0 +20.02998, 161022.0 +20.0357, 163554.0 +20.04143, 160977.0 +20.04715, 160544.0 +20.05287, 163202.0 +20.0586, 162958.0 +20.06432, 156804.0 +20.07003, 160509.0 +20.07577, 162869.0 +20.08148, 161540.0 +20.0872, 159668.0 +20.09293, 160866.0 +20.09865, 159834.0 +20.10437, 159370.0 +20.1101, 156566.0 +20.11582, 162961.0 +20.12153, 159983.0 +20.12727, 158223.0 +20.13298, 157155.0 +20.1387, 156643.0 +20.14443, 160025.0 +20.15015, 156653.0 +20.15587, 160119.0 +20.1616, 158867.0 +20.16732, 159317.0 +20.17303, 158448.0 +20.17875, 160370.0 +20.18448, 160511.0 +20.1902, 157312.0 +20.19592, 157204.0 +20.20165, 156435.0 +20.20737, 160596.0 +20.21308, 156846.0 +20.21882, 160581.0 +20.22453, 159743.0 +20.23025, 159450.0 +20.23598, 158763.0 +20.2417, 160805.0 +20.24742, 157835.0 +20.25315, 158149.0 +20.25887, 158413.0 +20.26458, 159283.0 +20.27032, 162592.0 +20.27603, 160118.0 +20.28175, 159497.0 +20.28748, 158060.0 +20.2932, 159380.0 +20.29892, 154903.0 +20.30465, 158937.0 +20.31037, 157823.0 +20.31608, 158558.0 +20.32182, 156155.0 +20.32753, 154696.0 +20.33325, 158446.0 +20.33898, 156160.0 +20.3447, 156186.0 +20.35042, 157560.0 +20.35613, 155805.0 +20.36187, 154733.0 +20.36758, 156281.0 +20.3733, 159314.0 +20.37903, 158797.0 +20.38475, 158948.0 +20.39047, 156304.0 +20.3962, 156174.0 +20.40192, 160317.0 +20.40763, 157647.0 +20.41337, 157750.0 +20.41908, 159601.0 +20.4248, 152553.0 +20.43053, 159285.0 +20.43625, 160403.0 +20.44197, 156770.0 +20.4477, 160661.0 +20.45342, 157689.0 +20.45913, 157889.0 +20.46487, 157828.0 +20.47058, 157995.0 +20.4763, 159611.0 +20.48203, 161415.0 +20.48775, 158302.0 +20.49347, 157137.0 +20.4992, 155920.0 +20.50492, 159781.0 +20.51063, 158668.0 +20.51637, 157947.0 +20.52208, 157721.0 +20.5278, 157285.0 +20.53352, 158879.0 +20.53925, 156960.0 +20.54497, 156196.0 +20.55068, 158506.0 +20.55642, 159142.0 +20.56213, 159323.0 +20.56785, 161573.0 +20.57358, 158432.0 +20.5793, 157345.0 +20.58502, 159990.0 +20.59075, 158084.0 +20.59647, 161789.0 +20.60218, 156620.0 +20.60792, 157788.0 +20.61363, 156855.0 +20.61935, 155526.0 +20.62508, 156956.0 +20.6308, 157069.0 +20.63652, 158289.0 +20.64225, 157094.0 +20.64797, 155894.0 +20.65368, 155558.0 +20.65942, 156968.0 +20.66513, 158840.0 +20.67085, 157221.0 +20.67658, 160270.0 +20.6823, 158004.0 +20.68802, 157152.0 +20.69373, 158128.0 +20.69947, 157925.0 +20.70518, 158689.0 +20.7109, 157281.0 +20.71663, 156974.0 +20.72235, 158700.0 +20.72807, 160674.0 +20.7338, 154992.0 +20.73952, 158946.0 +20.74523, 157200.0 +20.75097, 159498.0 +20.75668, 154613.0 +20.7624, 156160.0 +20.76813, 159760.0 +20.77385, 157485.0 +20.77957, 162224.0 +20.7853, 159901.0 +20.79102, 159214.0 +20.79673, 154089.0 +20.80247, 158982.0 +20.80818, 158285.0 +20.8139, 161495.0 +20.81963, 159234.0 +20.82535, 156340.0 +20.83107, 158540.0 +20.8368, 159387.0 +20.84252, 155437.0 +20.84823, 158007.0 +20.85397, 155548.0 +20.85968, 154826.0 +20.8654, 157698.0 +20.87112, 157334.0 +20.87685, 160889.0 +20.88257, 157133.0 +20.88828, 156422.0 +20.89402, 156987.0 +20.89973, 160008.0 +20.90545, 157006.0 +20.91118, 159444.0 +20.9169, 154949.0 +20.92262, 155876.0 +20.92835, 156854.0 +20.93407, 155313.0 +20.93978, 157338.0 +20.94552, 157672.0 +20.95123, 154175.0 +20.95695, 160448.0 +20.96268, 160760.0 +20.9684, 156244.0 +20.97412, 158319.0 +20.97985, 155166.0 +20.98557, 157011.0 +20.99128, 158686.0 +20.99702, 154568.0 +21.00273, 156693.0 +21.00845, 156858.0 +21.01418, 154542.0 +21.0199, 156208.0 +21.02562, 157961.0 +21.03135, 154841.0 +21.03707, 153512.0 +21.04278, 155739.0 +21.0485, 162240.0 +21.05423, 156656.0 +21.05995, 157324.0 +21.06567, 156273.0 +21.0714, 160299.0 +21.07712, 157466.0 +21.08283, 157831.0 +21.08857, 157662.0 +21.09428, 156917.0 +21.1, 154459.0 +21.10573, 158163.0 +21.11145, 156761.0 +21.11717, 157607.0 +21.1229, 160093.0 +21.12862, 155456.0 +21.13433, 157040.0 +21.14007, 155470.0 +21.14578, 158094.0 +21.1515, 159258.0 +21.15723, 157728.0 +21.16295, 155587.0 +21.16867, 160190.0 +21.1744, 157144.0 +21.18012, 156035.0 +21.18583, 156814.0 +21.19157, 155097.0 +21.19728, 154005.0 +21.203, 158402.0 +21.20872, 156242.0 +21.21445, 158167.0 +21.22017, 154276.0 +21.22588, 155704.0 +21.23162, 155182.0 +21.23733, 159593.0 +21.24305, 158619.0 +21.24878, 157665.0 +21.2545, 156657.0 +21.26022, 157460.0 +21.26595, 159770.0 +21.27167, 158022.0 +21.27738, 156741.0 +21.28312, 157718.0 +21.28883, 158598.0 +21.29455, 157704.0 +21.30028, 155978.0 +21.306, 159120.0 +21.31172, 154649.0 +21.31745, 155412.0 +21.32317, 156253.0 +21.32888, 155714.0 +21.33462, 156250.0 +21.34033, 154202.0 +21.34605, 157073.0 +21.35178, 157789.0 +21.3575, 157558.0 +21.36322, 157246.0 +21.36895, 156929.0 +21.37467, 155389.0 +21.38038, 155543.0 +21.3861, 158231.0 +21.39183, 153352.0 +21.39755, 158399.0 +21.40327, 157628.0 +21.409, 156819.0 +21.41472, 156490.0 +21.42043, 157700.0 +21.42617, 158344.0 +21.43188, 157585.0 +21.4376, 159475.0 +21.44333, 156990.0 +21.44905, 155682.0 +21.45477, 157488.0 +21.4605, 157878.0 +21.46622, 157417.0 +21.47193, 155357.0 +21.47767, 158240.0 +21.48338, 157112.0 +21.4891, 156761.0 +21.49483, 155936.0 +21.50055, 157699.0 +21.50627, 158229.0 +21.512, 156886.0 +21.51772, 160844.0 +21.52343, 154683.0 +21.52917, 156724.0 +21.53488, 155986.0 +21.5406, 159196.0 +21.54633, 156829.0 +21.55205, 157300.0 +21.55777, 155090.0 +21.56348, 158687.0 +21.56922, 159928.0 +21.57493, 157864.0 +21.58065, 157546.0 +21.58638, 155557.0 +21.5921, 156544.0 +21.59782, 157064.0 +21.60355, 159515.0 +21.60927, 154103.0 +21.61498, 159040.0 +21.62072, 155979.0 +21.62643, 154666.0 +21.63215, 153556.0 +21.63788, 155014.0 +21.6436, 155510.0 +21.64932, 155511.0 +21.65505, 154537.0 +21.66077, 154340.0 +21.66648, 154726.0 +21.67222, 158647.0 +21.67793, 156841.0 +21.68365, 156920.0 +21.68938, 155112.0 +21.6951, 158318.0 +21.70082, 154178.0 +21.70655, 156694.0 +21.71227, 155760.0 +21.71798, 155799.0 +21.7237, 154147.0 +21.72943, 154172.0 +21.73515, 157436.0 +21.74087, 155445.0 +21.7466, 157049.0 +21.75232, 155597.0 +21.75803, 156118.0 +21.76377, 157424.0 +21.76948, 151813.0 +21.7752, 159429.0 +21.78093, 156801.0 +21.78665, 157192.0 +21.79237, 157185.0 +21.7981, 153954.0 +21.80382, 157065.0 +21.80953, 157004.0 +21.81527, 157413.0 +21.82098, 155246.0 +21.8267, 156554.0 +21.83243, 161223.0 +21.83815, 156559.0 +21.84387, 154187.0 +21.8496, 158778.0 +21.85532, 156376.0 +21.86103, 156349.0 +21.86677, 154729.0 +21.87248, 155274.0 +21.8782, 156800.0 +21.88393, 158533.0 +21.88965, 155028.0 +21.89537, 152941.0 +21.90108, 159259.0 +21.90682, 153386.0 +21.91253, 156234.0 +21.91825, 157843.0 +21.92398, 155932.0 +21.9297, 157772.0 +21.93542, 158374.0 +21.94115, 157144.0 +21.94687, 156796.0 +21.95258, 157306.0 +21.95832, 158752.0 +21.96403, 157777.0 +21.96975, 156064.0 +21.97548, 158408.0 +21.9812, 153327.0 +21.98692, 156550.0 +21.99265, 156494.0 +21.99837, 157281.0 +22.00408, 155469.0 +22.00982, 157588.0 +22.01553, 155435.0 +22.02125, 157415.0 +22.02698, 158906.0 +22.0327, 157284.0 +22.03842, 156841.0 +22.04415, 155254.0 +22.04987, 153316.0 +22.05558, 156537.0 +22.06132, 158979.0 +22.06703, 153236.0 +22.07275, 159464.0 +22.07847, 156662.0 +22.0842, 154267.0 +22.08992, 153977.0 +22.09563, 157952.0 +22.10137, 158636.0 +22.10708, 158161.0 +22.1128, 154529.0 +22.11853, 158121.0 +22.12425, 153857.0 +22.12997, 154916.0 +22.1357, 155255.0 +22.14142, 156508.0 +22.14713, 159686.0 +22.15287, 157634.0 +22.15858, 155202.0 +22.1643, 154343.0 +22.17003, 156052.0 +22.17575, 154094.0 +22.18147, 153998.0 +22.1872, 158909.0 +22.19292, 155941.0 +22.19863, 157907.0 +22.20437, 155032.0 +22.21008, 155867.0 +22.2158, 156307.0 +22.22153, 154636.0 +22.22725, 156649.0 +22.23297, 157101.0 +22.2387, 158044.0 +22.24442, 155264.0 +22.25013, 156627.0 +22.25585, 155189.0 +22.26158, 154981.0 +22.2673, 154720.0 +22.27302, 151759.0 +22.27875, 157930.0 +22.28447, 156113.0 +22.29018, 158139.0 +22.29592, 158123.0 +22.30163, 158604.0 +22.30735, 153718.0 +22.31308, 156075.0 +22.3188, 156569.0 +22.32452, 156288.0 +22.33025, 157835.0 +22.33597, 155577.0 +22.34168, 154385.0 +22.34742, 155982.0 +22.35313, 156476.0 +22.35885, 158713.0 +22.36458, 156853.0 +22.3703, 155852.0 +22.37602, 157867.0 +22.38175, 155704.0 +22.38747, 159273.0 +22.39318, 153831.0 +22.39892, 156437.0 +22.40463, 156370.0 +22.41035, 150854.0 +22.41607, 155630.0 +22.4218, 158468.0 +22.42752, 159093.0 +22.43323, 155883.0 +22.43897, 156523.0 +22.44468, 154399.0 +22.4504, 155485.0 +22.45613, 156441.0 +22.46185, 154588.0 +22.46757, 157869.0 +22.4733, 156637.0 +22.47902, 155792.0 +22.48473, 158714.0 +22.49047, 156260.0 +22.49618, 159624.0 +22.5019, 155369.0 +22.50763, 156576.0 +22.51335, 154105.0 +22.51907, 154293.0 +22.5248, 159204.0 +22.53052, 156793.0 +22.53623, 157576.0 +22.54197, 157639.0 +22.54768, 157758.0 +22.5534, 154513.0 +22.55913, 156459.0 +22.56485, 157058.0 +22.57057, 155658.0 +22.5763, 156313.0 +22.58202, 154447.0 +22.58773, 157688.0 +22.59345, 152684.0 +22.59918, 153869.0 +22.6049, 156083.0 +22.61062, 158171.0 +22.61635, 157302.0 +22.62207, 158406.0 +22.62778, 156658.0 +22.63352, 157850.0 +22.63923, 155399.0 +22.64495, 157436.0 +22.65068, 156348.0 +22.6564, 155467.0 +22.66212, 156197.0 +22.66785, 158592.0 +22.67357, 157005.0 +22.67928, 155316.0 +22.68502, 158724.0 +22.69073, 156406.0 +22.69645, 156931.0 +22.70218, 157059.0 +22.7079, 153833.0 +22.71362, 156821.0 +22.71935, 155619.0 +22.72507, 159533.0 +22.73078, 157291.0 +22.73652, 155211.0 +22.74223, 155721.0 +22.74795, 160509.0 +22.75367, 155593.0 +22.7594, 156378.0 +22.76512, 159382.0 +22.77083, 158559.0 +22.77657, 158178.0 +22.78228, 155925.0 +22.788, 155860.0 +22.79373, 157983.0 +22.79945, 156855.0 +22.80517, 153206.0 +22.8109, 156056.0 +22.81662, 153914.0 +22.82233, 158632.0 +22.82807, 155365.0 +22.83378, 157205.0 +22.8395, 156908.0 +22.84523, 156548.0 +22.85095, 156344.0 +22.85667, 155590.0 +22.8624, 155536.0 +22.86812, 155929.0 +22.87383, 153926.0 +22.87957, 159244.0 +22.88528, 157580.0 +22.891, 153992.0 +22.89673, 157608.0 +22.90245, 159069.0 +22.90817, 155181.0 +22.9139, 158085.0 +22.91962, 157572.0 +22.92533, 157700.0 +22.93105, 158660.0 +22.93678, 156620.0 +22.9425, 155935.0 +22.94822, 158306.0 +22.95395, 154405.0 +22.95967, 153871.0 +22.96538, 156843.0 +22.97112, 156256.0 +22.97683, 159295.0 +22.98255, 156024.0 +22.98828, 156736.0 +22.994, 158478.0 +22.99972, 160205.0 +23.00545, 157636.0 +23.01117, 157419.0 +23.01688, 154805.0 +23.02262, 157748.0 +23.02833, 157617.0 +23.03405, 154721.0 +23.03978, 160540.0 +23.0455, 155246.0 +23.05122, 156802.0 +23.05695, 155454.0 +23.06267, 156665.0 +23.06838, 160405.0 +23.07412, 158735.0 +23.07983, 157408.0 +23.08555, 156843.0 +23.09128, 155969.0 +23.097, 156637.0 +23.10272, 154465.0 +23.10843, 160153.0 +23.11417, 153735.0 +23.11988, 157569.0 +23.1256, 155088.0 +23.13133, 156213.0 +23.13705, 155565.0 +23.14277, 155943.0 +23.1485, 155133.0 +23.15422, 159123.0 +23.15993, 155759.0 +23.16567, 158747.0 +23.17138, 157518.0 +23.1771, 156213.0 +23.18283, 154569.0 +23.18855, 158550.0 +23.19427, 159117.0 +23.2, 156778.0 +23.20572, 157030.0 +23.21143, 155474.0 +23.21717, 157705.0 +23.22288, 160389.0 +23.2286, 155519.0 +23.23433, 158043.0 +23.24005, 157310.0 +23.24577, 157807.0 +23.2515, 160216.0 +23.25722, 154501.0 +23.26293, 156421.0 +23.26867, 155963.0 +23.27438, 157190.0 +23.2801, 157747.0 +23.28582, 153753.0 +23.29155, 156919.0 +23.29727, 154910.0 +23.30298, 157118.0 +23.30872, 157128.0 +23.31443, 155414.0 +23.32015, 157181.0 +23.32588, 154852.0 +23.3316, 159523.0 +23.33732, 157273.0 +23.34305, 153975.0 +23.34877, 160026.0 +23.35448, 156809.0 +23.36022, 157700.0 +23.36593, 155416.0 +23.37165, 159601.0 +23.37738, 158023.0 +23.3831, 157194.0 +23.38882, 157596.0 +23.39455, 157766.0 +23.40027, 155983.0 +23.40598, 157949.0 +23.41172, 157091.0 +23.41743, 158998.0 +23.42315, 156591.0 +23.42888, 156643.0 +23.4346, 156515.0 +23.44032, 155186.0 +23.44603, 156762.0 +23.45177, 154211.0 +23.45748, 159446.0 +23.4632, 156532.0 +23.46893, 158054.0 +23.47465, 156257.0 +23.48037, 157079.0 +23.4861, 156878.0 +23.49182, 158055.0 +23.49753, 160052.0 +23.50327, 156467.0 +23.50898, 158094.0 +23.5147, 154718.0 +23.52043, 154476.0 +23.52615, 155215.0 +23.53187, 152831.0 +23.5376, 156731.0 +23.54332, 158261.0 +23.54903, 158613.0 +23.55477, 155337.0 +23.56048, 159606.0 +23.5662, 156585.0 +23.57193, 154976.0 +23.57765, 156365.0 +23.58337, 158933.0 +23.5891, 155462.0 +23.59482, 156000.0 +23.60053, 155979.0 +23.60627, 158141.0 +23.61198, 157679.0 +23.6177, 158582.0 +23.62342, 156677.0 +23.62915, 157252.0 +23.63487, 158128.0 +23.64058, 155762.0 +23.64632, 157310.0 +23.65203, 157516.0 +23.65775, 157829.0 +23.66348, 157018.0 +23.6692, 155428.0 +23.67492, 157111.0 +23.68065, 159128.0 +23.68637, 157070.0 +23.69208, 157597.0 +23.69782, 159677.0 +23.70353, 152778.0 +23.70925, 156500.0 +23.71498, 159472.0 +23.7207, 155356.0 +23.72642, 155987.0 +23.73215, 154752.0 +23.73787, 156257.0 +23.74358, 157915.0 +23.74932, 161736.0 +23.75503, 157429.0 +23.76075, 159545.0 +23.76648, 157061.0 +23.7722, 156925.0 +23.77792, 157374.0 +23.78363, 156119.0 +23.78937, 155684.0 +23.79508, 158004.0 +23.8008, 159811.0 +23.80653, 157962.0 +23.81225, 157504.0 +23.81797, 157558.0 +23.8237, 156190.0 +23.82942, 158809.0 +23.83513, 158474.0 +23.84087, 159628.0 +23.84658, 158608.0 +23.8523, 152463.0 +23.85803, 157758.0 +23.86375, 157486.0 +23.86947, 160479.0 +23.8752, 157397.0 +23.88092, 157908.0 +23.88663, 158140.0 +23.89237, 160040.0 +23.89808, 156543.0 +23.9038, 157742.0 +23.90953, 156536.0 +23.91525, 155681.0 +23.92097, 156814.0 +23.9267, 157706.0 +23.93242, 155954.0 +23.93813, 154452.0 +23.94387, 153397.0 +23.94958, 156467.0 +23.9553, 156032.0 +23.96102, 157019.0 +23.96675, 158431.0 +23.97247, 157243.0 +23.97818, 161812.0 +23.98392, 158534.0 +23.98963, 156383.0 +$$ === 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=MASS CHROMATOGRAMPEAKTABLE +##DATA CLASS=PEAKTABLE +##$CSCATEGORY=EDIT_PEAK +##$CSTHRESHOLD=1.05 +##MAXX=23.98963 +##MAXY=44507300.0 +##MINX=3.09275 +##MINY=7098.0 +##$CSSOLVENTNAME= +##$CSSOLVENTVALUE=0 +##$CSSOLVENTX=0 +##NPOINTS=0 +##PEAKTABLE= (XY..XY) +##END= + + +$$ === CHEMSPECTRA PEAK TABLE AUTO === +##TITLE= +##JCAMP-DX=5.00 +##DATA TYPE=MASS CHROMATOGRAMPEAKTABLE +##DATA CLASS=PEAKTABLE +##$CSCATEGORY=AUTO_PEAK +##$CSTHRESHOLD=1.05 +##MAXX=23.98963 +##MAXY=44507300.0 +##MINX=3.09275 +##MINY=7098.0 +##NPOINTS=0 +##PEAKTABLE= (XY..XY) +##END= + +##END= + +`; +export default massChromatogramJcamp; diff --git a/src/__tests__/units/components/cmd_bar/01_viewer.test.js b/src/__tests__/units/components/cmd_bar/01_viewer.test.js new file mode 100644 index 00000000..994f026b --- /dev/null +++ b/src/__tests__/units/components/cmd_bar/01_viewer.test.js @@ -0,0 +1,49 @@ +import configureStore from 'redux-mock-store' +import { Provider } from 'react-redux' +import { render } from '@testing-library/react'; +import '@testing-library/jest-dom'; +import Viewer from '../../../../components/cmd_bar/01_viewer' +import { LIST_UI_VIEWER_TYPE } from '../../../../constants/list_ui'; +import { LIST_LAYOUT } from '../../../../constants/list_layout'; + +const mockStore = configureStore([]); +const store = mockStore({ + ui: LIST_UI_VIEWER_TYPE.SPECTRUM, + layout: LIST_LAYOUT.H1, +}); + +const dispatchMock = () => Promise.resolve({}); +store.dispatch = jest.fn(dispatchMock); + +describe('', () => { + let AppWrapper; + beforeEach(() => { + AppWrapper = ({ store, children}) => { + return {children} + } + }); + + it('Render Viewer', async () => { + const renderer = + + + + ; + const { queryByTestId } = render(renderer); + const renderResult = queryByTestId('Viewer'); + expect(renderResult).toBeInTheDocument(); + expect(renderResult.childElementCount).toEqual(2); + }); + + it('Render Viewer in editor only mode', () => { + const renderer = + + + + ; + const { queryByTestId } = render(renderer); + const renderResult = queryByTestId('Viewer'); + expect(renderResult).toBeInTheDocument(); + expect(renderResult.childElementCount).toEqual(1); + }); +}) diff --git a/src/__tests__/units/components/cmd_bar/02_zoom.test.js b/src/__tests__/units/components/cmd_bar/02_zoom.test.js new file mode 100644 index 00000000..b7422aef --- /dev/null +++ b/src/__tests__/units/components/cmd_bar/02_zoom.test.js @@ -0,0 +1,35 @@ +import configureStore from 'redux-mock-store' +import { Provider } from 'react-redux' +import { render } from '@testing-library/react'; +import '@testing-library/jest-dom'; +import Zoom from '../../../../components/cmd_bar/02_zoom'; +import { LIST_UI_SWEEP_TYPE } from '../../../../constants/list_ui'; + +const mockStore = configureStore([]); +const store = mockStore({ + ui:{ sweepType: LIST_UI_SWEEP_TYPE.ZOOMIN }, +}); + +const dispatchMock = () => Promise.resolve({}); +store.dispatch = jest.fn(dispatchMock); + +describe('', () => { + let AppWrapper; + beforeEach(() => { + AppWrapper = ({ store, children}) => { + return {children} + } + }); + + it('Render Zoom', async () => { + const renderer = + + + + ; + const { queryByTestId } = render(renderer); + const renderResult = queryByTestId('Zoom'); + expect(renderResult).toBeInTheDocument(); + expect(renderResult.childElementCount).toEqual(2); + }); +}) \ No newline at end of file diff --git a/src/__tests__/units/components/common/draw.test.jsx b/src/__tests__/units/components/common/draw.test.jsx new file mode 100644 index 00000000..9a1a46ac --- /dev/null +++ b/src/__tests__/units/components/common/draw.test.jsx @@ -0,0 +1,24 @@ +import { render } from '@testing-library/react'; +import '@testing-library/jest-dom'; +import { drawMain } from '../../../../components/common/draw'; +import { useEffect } from 'react'; +describe('common/draw', () => { + it('.drawMain()', () => { + function TestComponent({}) { + useEffect(() => { + drawMain('.testsvg', 100, 100) + }, []); + return ( +
+ ) + } + + const { queryByTestId } = render(); + const renderResult = queryByTestId('testsvg'); + expect(renderResult).toBeInTheDocument(); + const svgElement = document.querySelector('svg'); + expect(svgElement).toHaveClass('d3Svg'); + expect(svgElement).toHaveAttribute('preserveAspectRatio', 'xMinYMin meet'); + expect(svgElement).toHaveAttribute('viewBox', '0 0 100 100'); + }); +}) diff --git a/src/__tests__/units/components/panel/peaks.test.js b/src/__tests__/units/components/panel/peaks.test.js index 83d0883d..68ab184a 100644 --- a/src/__tests__/units/components/panel/peaks.test.js +++ b/src/__tests__/units/components/panel/peaks.test.js @@ -5,6 +5,8 @@ import configureStore from 'redux-mock-store' import { Provider } from 'react-redux'; import '@testing-library/jest-dom' import { LIST_LAYOUT } from "../../../../constants/list_layout"; +import { createTheme } from "@mui/material"; +import { ThemeProvider } from "@mui/styles"; const mockStore = configureStore([]); const store = mockStore({ @@ -48,6 +50,11 @@ const failedStore = mockStore({ const dispatchMock = () => Promise.resolve({}); store.dispatch = jest.fn(dispatchMock); +const theme = createTheme({ + typography: { + useNextVariants: true + }, +}); describe("", () => { let AppWrapper; @@ -60,7 +67,9 @@ describe("", () => { test('Render peaks panel info', () => { const renderer = - {}} /> + + {}} /> + ; const {queryByTestId} = render(renderer); @@ -70,7 +79,9 @@ describe("", () => { test('Render peaks panel with invalid store list', () => { const renderer = - {}} /> + + {}} /> + ; const {queryByTestId} = render(renderer); diff --git a/src/__tests__/units/helpers/chem.test.tsx b/src/__tests__/units/helpers/chem.test.tsx index 1a69b410..cb775a67 100644 --- a/src/__tests__/units/helpers/chem.test.tsx +++ b/src/__tests__/units/helpers/chem.test.tsx @@ -9,6 +9,7 @@ import { LIST_SHIFT_1H } from "../../../constants/list_shift"; import { LIST_LAYOUT } from "../../../constants/list_layout"; import emissionsJcamp from "../../fixtures/emissions_jcamp"; import dlsAcfJcamp from "../../fixtures/dls_acf_jcamp"; +import massChromatogramJcamp from "../../fixtures/mass_chromatogram_jcamp"; function checkExtractSucceed(extractedData: any, forLayout: string) { const { spectra, features, layout } = extractedData @@ -109,6 +110,22 @@ describe('Test for chem helper', () => { checkSpectraInfo(extractedData, 'DLS intensity') }) }) + + describe('Extract Mass Chromatogram', () => { + let extractedData: { spectra: any, features: any, layout: any } + + beforeAll(() => { + extractedData = ExtractJcamp(massChromatogramJcamp) + }) + + it('Extract succeed ', () => { + checkExtractSucceed(extractedData, LIST_LAYOUT.MASS_CHROMATOGRAM) + }) + + it('Check spectra info ', () => { + checkSpectraInfo(extractedData, 'MASS CHROMATOGRAM') + }) + }) }) diff --git a/src/components/cmd_bar/01_viewer.js b/src/components/cmd_bar/01_viewer.js index 4568ebe4..d1dff1a2 100644 --- a/src/components/cmd_bar/01_viewer.js +++ b/src/components/cmd_bar/01_viewer.js @@ -5,10 +5,10 @@ import { bindActionCreators, compose } from 'redux'; import classNames from 'classnames'; import PropTypes from 'prop-types'; -import { withStyles } from '@material-ui/core/styles'; -import SpellcheckOutlinedIcon from '@material-ui/icons/SpellcheckOutlined'; -import TimelineOutlinedIcon from '@material-ui/icons/TimelineOutlined'; -import Tooltip from '@material-ui/core/Tooltip'; +import withStyles from '@mui/styles/withStyles'; +import SpellcheckOutlinedIcon from '@mui/icons-material/SpellcheckOutlined'; +import TimelineOutlinedIcon from '@mui/icons-material/TimelineOutlined'; +import Tooltip from '@mui/material/Tooltip'; import { setUiViewerType } from '../../actions/ui'; import Cfg from '../../helpers/cfg'; @@ -31,7 +31,7 @@ const Viewer = ({ const onViewAnalysis = () => setUiViewerTypeAct(LIST_UI_VIEWER_TYPE.ANALYSIS); return ( - + Spectrum Viewer}> setUiSweepTypeAct(LIST_UI_SWEEP_TYPE.ZOOMRESET); return ( - + Zoom In}> ( diff --git a/src/components/cmd_bar/07_pecker.js b/src/components/cmd_bar/07_pecker.js index 35b0ce04..5fccae59 100644 --- a/src/components/cmd_bar/07_pecker.js +++ b/src/components/cmd_bar/07_pecker.js @@ -7,8 +7,8 @@ import { bindActionCreators, compose } from 'redux'; import classNames from 'classnames'; import PropTypes from 'prop-types'; -import { withStyles } from '@material-ui/core/styles'; -import Tooltip from '@material-ui/core/Tooltip'; +import withStyles from '@mui/styles/withStyles'; +import Tooltip from '@mui/material/Tooltip'; import { setUiSweepType } from '../../actions/ui'; diff --git a/src/components/cmd_bar/common.js b/src/components/cmd_bar/common.js index 3f024b2f..bda1a265 100644 --- a/src/components/cmd_bar/common.js +++ b/src/components/cmd_bar/common.js @@ -1,5 +1,5 @@ -import { withStyles } from '@material-ui/core/styles'; -import Button from '@material-ui/core/Button'; +import { withStyles } from '@mui/styles'; +import Button from '@mui/material/Button'; const MuButton = withStyles({ root: { @@ -12,6 +12,7 @@ const MuButton = withStyles({ minWidth: 30, padding: 0, width: 30, + color: 'black', }, })(Button); diff --git a/src/components/cmd_bar/index.js b/src/components/cmd_bar/index.js index b534f96a..6df98e8c 100644 --- a/src/components/cmd_bar/index.js +++ b/src/components/cmd_bar/index.js @@ -5,7 +5,7 @@ import { connect } from 'react-redux'; import { bindActionCreators, compose } from 'redux'; import PropTypes from 'prop-types'; -import { withStyles } from '@material-ui/core/styles'; +import withStyles from '@mui/styles/withStyles'; import { commonStyle } from './common'; import Viewer from './01_viewer'; diff --git a/src/components/cmd_bar/r01_layout.js b/src/components/cmd_bar/r01_layout.js index 3cd2786a..0d2aeb01 100644 --- a/src/components/cmd_bar/r01_layout.js +++ b/src/components/cmd_bar/r01_layout.js @@ -6,12 +6,10 @@ import classNames from 'classnames'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; -import Select from '@material-ui/core/Select'; -import MenuItem from '@material-ui/core/MenuItem'; -import FormControl from '@material-ui/core/FormControl'; -import OutlinedInput from '@material-ui/core/OutlinedInput'; -import InputLabel from '@material-ui/core/InputLabel'; -import { withStyles } from '@material-ui/core/styles'; +import { + Select, FormControl, MenuItem, InputLabel, +} from '@mui/material'; +import withStyles from '@mui/styles/withStyles'; import Scan from './r02_scan'; import { updateLayout } from '../../actions/layout'; @@ -66,20 +64,15 @@ const shiftSelect = ( className={classNames(classes.fieldShift)} variant="outlined" > - + Solvent @@ -93,22 +86,16 @@ const layoutSelect = (classes, layoutSt, updateLayoutAct) => { return ( - + Layout ); diff --git a/src/components/cmd_bar/r02_scan.js b/src/components/cmd_bar/r02_scan.js index 62ad330a..4fc8a0b3 100644 --- a/src/components/cmd_bar/r02_scan.js +++ b/src/components/cmd_bar/r02_scan.js @@ -6,16 +6,13 @@ import classNames from 'classnames'; import { connect } from 'react-redux'; import { bindActionCreators, compose } from 'redux'; -import Select from '@material-ui/core/Select'; -import MenuItem from '@material-ui/core/MenuItem'; -import FormControl from '@material-ui/core/FormControl'; -import OutlinedInput from '@material-ui/core/OutlinedInput'; -import InputLabel from '@material-ui/core/InputLabel'; -import { withStyles } from '@material-ui/core/styles'; -import Tooltip from '@material-ui/core/Tooltip'; -import CloudDoneOutlinedIcon from '@material-ui/icons/CloudDoneOutlined'; -import HowToRegOutlinedIcon from '@material-ui/icons/HowToRegOutlined'; -import RefreshOutlinedIcon from '@material-ui/icons/RefreshOutlined'; +import { + Select, MenuItem, FormControl, InputLabel, Tooltip, +} from '@mui/material'; +import { withStyles } from '@mui/styles'; +import CloudDoneOutlinedIcon from '@mui/icons-material/CloudDoneOutlined'; +import HowToRegOutlinedIcon from '@mui/icons-material/HowToRegOutlined'; +import RefreshOutlinedIcon from '@mui/icons-material/RefreshOutlined'; import { setScanTarget, resetScanTarget, toggleScanIsAuto, @@ -103,20 +100,15 @@ const scanSelect = ( className={classNames(classes.fieldScan)} variant="outlined" > - + Current Scan diff --git a/src/components/cmd_bar/r03_threshold.js b/src/components/cmd_bar/r03_threshold.js index 81118815..a76991e0 100644 --- a/src/components/cmd_bar/r03_threshold.js +++ b/src/components/cmd_bar/r03_threshold.js @@ -6,14 +6,13 @@ import classNames from 'classnames'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; -import TextField from '@material-ui/core/TextField'; -import InputAdornment from '@material-ui/core/InputAdornment'; -import { FormControl, InputLabel } from '@material-ui/core'; -import { withStyles } from '@material-ui/core/styles'; -import Tooltip from '@material-ui/core/Tooltip'; -import CloudDoneOutlinedIcon from '@material-ui/icons/CloudDoneOutlined'; -import HowToRegOutlinedIcon from '@material-ui/icons/HowToRegOutlined'; -import RefreshOutlinedIcon from '@material-ui/icons/RefreshOutlined'; +import { + TextField, InputAdornment, Tooltip, FormControl, InputLabel, +} from '@mui/material'; +import { withStyles } from '@mui/styles'; +import CloudDoneOutlinedIcon from '@mui/icons-material/CloudDoneOutlined'; +import HowToRegOutlinedIcon from '@mui/icons-material/HowToRegOutlined'; +import RefreshOutlinedIcon from '@mui/icons-material/RefreshOutlined'; import Cfg from '../../helpers/cfg'; import { diff --git a/src/components/cmd_bar/r04_submit.js b/src/components/cmd_bar/r04_submit.js index d83b0596..f7acdf37 100644 --- a/src/components/cmd_bar/r04_submit.js +++ b/src/components/cmd_bar/r04_submit.js @@ -6,12 +6,10 @@ import classNames from 'classnames'; import { connect } from 'react-redux'; import { bindActionCreators, compose } from 'redux'; -import Select from '@material-ui/core/Select'; -import MenuItem from '@material-ui/core/MenuItem'; -import FormControl from '@material-ui/core/FormControl'; -import OutlinedInput from '@material-ui/core/OutlinedInput'; -import InputLabel from '@material-ui/core/InputLabel'; -import { withStyles } from '@material-ui/core/styles'; +import { + Select, MenuItem, FormControl, InputLabel, +} from '@mui/material'; +import { withStyles } from '@mui/styles'; import { toggleIsAscend, toggleIsIntensity, @@ -52,20 +50,15 @@ const ascendSelect = ( className={classNames(classes.fieldOrder)} variant="outlined" > - + Write Peaks - ) - } + className={classNames(classes.selectInput, 'input-sv-bar-intensity')} + // input={ + // ( + // + // ) + // } > @@ -140,20 +136,23 @@ const decimalSelect = ( className={classNames(classes.fieldDecimal)} variant="outlined" > - + Decimal @@ -177,20 +176,23 @@ const operationSelect = ( className={classNames(classes.fieldOpertaion)} variant="outlined" > - + Submit diff --git a/src/components/cmd_bar/r05_submit_btn.js b/src/components/cmd_bar/r05_submit_btn.js index 0ffd6ffb..fce6830d 100644 --- a/src/components/cmd_bar/r05_submit_btn.js +++ b/src/components/cmd_bar/r05_submit_btn.js @@ -7,9 +7,9 @@ import { connect } from 'react-redux'; import classNames from 'classnames'; import { bindActionCreators, compose } from 'redux'; -import Tooltip from '@material-ui/core/Tooltip'; -import PlayCircleOutlineIcon from '@material-ui/icons/PlayCircleOutline'; -import { withStyles } from '@material-ui/core/styles'; +import Tooltip from '@mui/material/Tooltip'; +import PlayCircleOutlineIcon from '@mui/icons-material/PlayCircleOutline'; +import { withStyles } from '@mui/styles'; import { Convert2Scan, Convert2Thres, diff --git a/src/components/cmd_bar/r06_predict_btn.js b/src/components/cmd_bar/r06_predict_btn.js index 8619b837..2924486a 100644 --- a/src/components/cmd_bar/r06_predict_btn.js +++ b/src/components/cmd_bar/r06_predict_btn.js @@ -7,11 +7,12 @@ import { connect } from 'react-redux'; import classNames from 'classnames'; import { bindActionCreators, compose } from 'redux'; -import Tooltip from '@material-ui/core/Tooltip'; -import GpsFixedOutlinedIcon from '@material-ui/icons/GpsFixedOutlined'; -import HelpOutlineOutlinedIcon from '@material-ui/icons/HelpOutlineOutlined'; -import Button from '@material-ui/core/Button'; -import { withStyles } from '@material-ui/core/styles'; +import { + Tooltip, Button, +} from '@mui/material'; +import GpsFixedOutlinedIcon from '@mui/icons-material/GpsFixedOutlined'; +import HelpOutlineOutlinedIcon from '@mui/icons-material/HelpOutlineOutlined'; +import { withStyles } from '@mui/styles'; import { commonStyle } from './common'; import Format from '../../helpers/format'; diff --git a/src/components/cmd_bar/r07_wavelength_btn.js b/src/components/cmd_bar/r07_wavelength_btn.js index 9ab03696..ce70e30c 100644 --- a/src/components/cmd_bar/r07_wavelength_btn.js +++ b/src/components/cmd_bar/r07_wavelength_btn.js @@ -7,9 +7,9 @@ import classNames from 'classnames'; import { bindActionCreators } from 'redux'; import { - FormControl, InputLabel, Select, OutlinedInput, MenuItem, -} from '@material-ui/core'; -import { withStyles } from '@material-ui/core/styles'; + FormControl, InputLabel, Select, MenuItem, +} from '@mui/material'; +import withStyles from '@mui/styles/withStyles'; import { updateWaveLength } from '../../actions/wavelength'; import Format from '../../helpers/format'; import { commonStyle } from './common'; @@ -43,20 +43,15 @@ const wavelengthSelect = (classes, waveLengthSt, layoutSt, updateWaveLengthAct) className={classNames(classes.fieldLayout)} variant="outlined" > - + Wavelength