Skip to content

Commit 762a1d7

Browse files
committed
add mass chromatogram layout
1 parent 3c54b03 commit 762a1d7

File tree

14 files changed

+3797
-5
lines changed

14 files changed

+3797
-5
lines changed

dist/components/cmd_bar/r01_layout.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,11 @@ const layoutSelect = (classes, layoutSt, updateLayoutAct) => {
172172
value: _list_layout.LIST_LAYOUT.DLS_INTENSITY
173173
}, /*#__PURE__*/_react.default.createElement("span", {
174174
className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout')
175-
}, "DLS INTENSITY"))));
175+
}, "DLS INTENSITY")), /*#__PURE__*/_react.default.createElement(_MenuItem.default, {
176+
value: _list_layout.LIST_LAYOUT.MASS_CHROMATOGRAM
177+
}, /*#__PURE__*/_react.default.createElement("span", {
178+
className: (0, _classnames.default)(classes.txtOpt, 'option-sv-bar-layout')
179+
}, "MASS CHROMATOGRAM"))));
176180
};
177181
const Layout = _ref => {
178182
let {

dist/components/d3_line/line_focus.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,7 @@ class LineFocus {
600600
return null;
601601
}
602602
reverseXAxis(layoutSt) {
603-
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;
603+
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;
604604
}
605605
create(_ref) {
606606
let {

dist/constants/list_layout.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ const LIST_LAYOUT = {
2525
AIF: 'AIF',
2626
EMISSIONS: 'Emissions',
2727
DLS_ACF: 'DLS ACF',
28-
DLS_INTENSITY: 'DLS intensity'
28+
DLS_INTENSITY: 'DLS intensity',
29+
MASS_CHROMATOGRAM: 'MASS CHROMATOGRAM'
2930
};
3031
exports.LIST_LAYOUT = LIST_LAYOUT;

dist/helpers/chem.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,9 @@ const readLayout = jcamp => {
382382
if (dataType.includes('DLS intensity')) {
383383
return _list_layout.LIST_LAYOUT.DLS_INTENSITY;
384384
}
385+
if (dataType.includes('MASS CHROMATOGRAM')) {
386+
return _list_layout.LIST_LAYOUT.MASS_CHROMATOGRAM;
387+
}
385388
}
386389
return false;
387390
};

dist/helpers/format.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,10 @@ const spectraOps = {
134134
[_list_layout.LIST_LAYOUT.DLS_INTENSITY]: {
135135
head: 'DLS',
136136
tail: '.'
137+
},
138+
[_list_layout.LIST_LAYOUT.MASS_CHROMATOGRAM]: {
139+
head: 'MASS CHROMATOGRAM',
140+
tail: '.'
137141
}
138142
};
139143
const rmRef = function (peaks, shift) {
@@ -431,6 +435,7 @@ const isAIFLayout = layoutSt => _list_layout.LIST_LAYOUT.AIF === layoutSt;
431435
const isEmissionsLayout = layoutSt => _list_layout.LIST_LAYOUT.EMISSIONS === layoutSt;
432436
const isDLSACFLayout = layoutSt => _list_layout.LIST_LAYOUT.DLS_ACF === layoutSt;
433437
const isDLSIntensityLayout = layoutSt => _list_layout.LIST_LAYOUT.DLS_INTENSITY === layoutSt;
438+
const isMassChromatogramLayout = layoutSt => _list_layout.LIST_LAYOUT.MASS_CHROMATOGRAM === layoutSt;
434439
const getNmrTyp = layout => {
435440
switch (layout) {
436441
case _list_layout.LIST_LAYOUT.H1:
@@ -526,7 +531,8 @@ const Format = {
526531
hasMultiCurves,
527532
isAIFLayout,
528533
isDLSACFLayout,
529-
strNumberFixedDecimal
534+
strNumberFixedDecimal,
535+
isMassChromatogramLayout
530536
};
531537
var _default = Format;
532538
exports.default = _default;

dist/index.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ var _dls_acf_jcamp = _interopRequireDefault(require("./__tests__/fixtures/dls_ac
4646
var _dls_intensity_jcamp = _interopRequireDefault(require("./__tests__/fixtures/dls_intensity_jcamp"));
4747
var _qDescValue = require("./__tests__/fixtures/qDescValue");
4848
require("./__tests__/style/svg.css");
49+
var _mass_chromatogram_jcamp = _interopRequireDefault(require("./__tests__/fixtures/mass_chromatogram_jcamp"));
4950
/* eslint-disable prefer-object-spread, default-param-last, no-nested-ternary */
5051

5152
const nmr1HEntity = _app.FN.ExtractJcamp(_nmr1h_jcamp.default);
@@ -81,6 +82,7 @@ const aifEntity2 = _app.FN.ExtractJcamp(_aif_jcamp_2.default);
8182
const emissionsEntity = _app.FN.ExtractJcamp(_emissions_jcamp.default);
8283
const dlsAcfEntity = _app.FN.ExtractJcamp(_dls_acf_jcamp.default);
8384
const dlsIntensityEntity = _app.FN.ExtractJcamp(_dls_intensity_jcamp.default);
85+
const massChromatogramEntity = _app.FN.ExtractJcamp(_mass_chromatogram_jcamp.default);
8486
class DemoWriteIr extends _react.default.Component {
8587
constructor(props) {
8688
super(props);
@@ -174,6 +176,8 @@ class DemoWriteIr extends _react.default.Component {
174176
return dlsAcfEntity;
175177
case 'dls intensity':
176178
return dlsIntensityEntity;
179+
case 'mass chromatogram':
180+
return massChromatogramEntity;
177181
case 'ms':
178182
default:
179183
return msEntity;
@@ -232,6 +236,7 @@ class DemoWriteIr extends _react.default.Component {
232236
case 'emissions':
233237
case 'dls acf':
234238
case 'dls intensity':
239+
case 'mass chromatogram':
235240
default:
236241
return false;
237242
}
@@ -665,6 +670,12 @@ class DemoWriteIr extends _react.default.Component {
665670
},
666671
onClick: this.onClick('ms')
667672
}, "MS"), /*#__PURE__*/_react.default.createElement(_Button.default, {
673+
variant: "contained",
674+
style: {
675+
margin: '0 10px 0 10px'
676+
},
677+
onClick: this.onClick('mass chromatogram')
678+
}, "Mass chromatogram"), /*#__PURE__*/_react.default.createElement(_Button.default, {
668679
variant: "contained",
669680
style: {
670681
margin: '0 10px 0 10px'

0 commit comments

Comments
 (0)