Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add mass chromatogram layout #166

Draft
wants to merge 2 commits into
base: development
Choose a base branch
from
Draft

add mass chromatogram layout #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
766742c
feat: update UI to material v5 (#157)
baolanlequang Sep 25, 2023
31132c0
add mass chromatogram layout
f-idiris Oct 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/testing.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Testing
on: push

jobs:
build:
testing:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
Expand Down
14 changes: 7 additions & 7 deletions dist/components/cmd_bar/01_viewer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -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"
Expand Down Expand Up @@ -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;
var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _withStyles.default)(styles))(Viewer);
14 changes: 7 additions & 7 deletions dist/components/cmd_bar/02_zoom.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -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"
Expand Down Expand Up @@ -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;
var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _withStyles.default)(styles))(Zoom);
9 changes: 4 additions & 5 deletions dist/components/cmd_bar/03_peak.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -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;
var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _withStyles.default)(styles))(Peak);
9 changes: 4 additions & 5 deletions dist/components/cmd_bar/04_integration.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -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;
var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _withStyles.default)(styles)(Integration));
7 changes: 3 additions & 4 deletions dist/components/cmd_bar/05_multiplicity.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -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;
var _default = exports.default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)((0, _withStyles.default)(styles)(Multiplicity));
11 changes: 5 additions & 6 deletions dist/components/cmd_bar/06_undo_redo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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;
var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _withStyles.default)(styles))(UndoRedo);
7 changes: 3 additions & 4 deletions dist/components/cmd_bar/07_pecker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down Expand Up @@ -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;
var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _withStyles.default)(styles))(Pecker);
13 changes: 6 additions & 7 deletions dist/components/cmd_bar/common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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',
Expand Down Expand Up @@ -96,7 +96,6 @@ const commonStyle = {
transform: 'scale(0.75)'
}
};
exports.commonStyle = commonStyle;
const focusStyle = (criteria, cls) => criteria ? [cls.btnHt] : [];

// eslint-disable-line
Expand Down
5 changes: 2 additions & 3 deletions dist/components/cmd_bar/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
Expand Down Expand Up @@ -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;
var _default = exports.default = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _withStyles.default)(styles))(CmdBar);
Loading