react-science 3.1.0 → 4.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/app/hooks/file-loading.d.ts +3 -2
- package/lib/app/hooks/file-loading.d.ts.map +1 -1
- package/lib/app/hooks/file-loading.js +12 -12
- package/lib/app/hooks/file-loading.js.map +1 -1
- package/lib/app/panels/SignalProcessingPanel.js +1 -1
- package/lib/app/panels/SignalProcessingPanel.js.map +1 -1
- package/lib/app-data/loaders/biologicLoader.d.ts +2 -2
- package/lib/app-data/loaders/biologicLoader.d.ts.map +1 -1
- package/lib/app-data/loaders/biologicLoader.js +4 -4
- package/lib/app-data/loaders/biologicLoader.js.map +1 -1
- package/lib/app-data/loaders/cdfLoader.d.ts +2 -2
- package/lib/app-data/loaders/cdfLoader.d.ts.map +1 -1
- package/lib/app-data/loaders/cdfLoader.js +6 -9
- package/lib/app-data/loaders/cdfLoader.js.map +1 -1
- package/lib/app-data/loaders/jcampLoader.d.ts +2 -2
- package/lib/app-data/loaders/jcampLoader.d.ts.map +1 -1
- package/lib/app-data/loaders/jcampLoader.js +10 -13
- package/lib/app-data/loaders/jcampLoader.js.map +1 -1
- package/lib/app-data/loaders/loadMeasurements.d.ts +4 -3
- package/lib/app-data/loaders/loadMeasurements.d.ts.map +1 -1
- package/lib/app-data/loaders/loadMeasurements.js +3 -3
- package/lib/app-data/loaders/loadMeasurements.js.map +1 -1
- package/lib/app-data/loaders/proprietary/agilent/cary500Loader.d.ts +3 -2
- package/lib/app-data/loaders/proprietary/agilent/cary500Loader.d.ts.map +1 -1
- package/lib/app-data/loaders/proprietary/agilent/cary500Loader.js +4 -9
- package/lib/app-data/loaders/proprietary/agilent/cary500Loader.js.map +1 -1
- package/lib/app-data/loaders/spcLoader.d.ts +2 -2
- package/lib/app-data/loaders/spcLoader.d.ts.map +1 -1
- package/lib/app-data/loaders/spcLoader.js +3 -8
- package/lib/app-data/loaders/spcLoader.js.map +1 -1
- package/lib/app-data/loaders/utility/measurementLoader.d.ts +2 -2
- package/lib/app-data/loaders/utility/measurementLoader.d.ts.map +1 -1
- package/lib/app-data/loaders/utility/measurementLoader.js.map +1 -1
- package/lib/app-data/loaders/wdfLoader.d.ts +2 -2
- package/lib/app-data/loaders/wdfLoader.d.ts.map +1 -1
- package/lib/app-data/loaders/wdfLoader.js +3 -9
- package/lib/app-data/loaders/wdfLoader.js.map +1 -1
- package/lib/components/index.d.ts +2 -1
- package/lib/components/index.d.ts.map +1 -1
- package/lib/components/index.js +2 -1
- package/lib/components/index.js.map +1 -1
- package/lib/components/info-panel/InfoPanel.d.ts.map +1 -1
- package/lib/components/info-panel/InfoPanel.js +1 -1
- package/lib/components/info-panel/InfoPanel.js.map +1 -1
- package/lib/components/logger/FifoLoggerDialog.d.ts +10 -0
- package/lib/components/logger/FifoLoggerDialog.d.ts.map +1 -0
- package/lib/components/logger/FifoLoggerDialog.js +55 -0
- package/lib/components/logger/FifoLoggerDialog.js.map +1 -0
- package/lib/components/logger/FifoLoggerProvider.d.ts +7 -0
- package/lib/components/logger/FifoLoggerProvider.d.ts.map +1 -0
- package/lib/components/logger/FifoLoggerProvider.js +10 -0
- package/lib/components/logger/FifoLoggerProvider.js.map +1 -0
- package/lib/components/logger/FifoLoggerToolbarItem.d.ts +2 -0
- package/lib/components/logger/FifoLoggerToolbarItem.d.ts.map +1 -0
- package/lib/components/logger/FifoLoggerToolbarItem.js +39 -0
- package/lib/components/logger/FifoLoggerToolbarItem.js.map +1 -0
- package/lib/components/logger/index.d.ts +5 -0
- package/lib/components/logger/index.d.ts.map +1 -0
- package/lib/components/logger/index.js +21 -0
- package/lib/components/logger/index.js.map +1 -0
- package/lib/components/logger/loggerContext.d.ts +4 -0
- package/lib/components/logger/loggerContext.d.ts.map +1 -0
- package/lib/components/logger/loggerContext.js +6 -0
- package/lib/components/logger/loggerContext.js.map +1 -0
- package/lib/components/logger/useFifoLogger.d.ts +3 -0
- package/lib/components/logger/useFifoLogger.d.ts.map +1 -0
- package/lib/components/logger/useFifoLogger.js +25 -0
- package/lib/components/logger/useFifoLogger.js.map +1 -0
- package/lib/components/table/Table.d.ts +2 -3
- package/lib/components/table/Table.d.ts.map +1 -1
- package/lib/components/table/Table.js +2 -2
- package/lib/components/table/Table.js.map +1 -1
- package/lib/components/table/TableHeader.d.ts +1 -1
- package/lib/components/table/TableHeader.d.ts.map +1 -1
- package/lib/components/table/TableHeader.js +2 -2
- package/lib/components/table/TableHeader.js.map +1 -1
- package/lib/components/table/TableRow.d.ts +1 -1
- package/lib/components/table/TableRow.d.ts.map +1 -1
- package/lib/components/table/TableRow.js +9 -22
- package/lib/components/table/TableRow.js.map +1 -1
- package/lib/components/table/tableContext.d.ts +0 -2
- package/lib/components/table/tableContext.d.ts.map +1 -1
- package/lib/components/table/tableContext.js +1 -1
- package/lib/components/table/tableContext.js.map +1 -1
- package/lib/components/toolbar/TooltipHelpContent.d.ts +11 -0
- package/lib/components/toolbar/TooltipHelpContent.d.ts.map +1 -0
- package/lib/components/toolbar/TooltipHelpContent.js +102 -0
- package/lib/components/toolbar/TooltipHelpContent.js.map +1 -0
- package/lib/components/toolbar/index.d.ts +1 -0
- package/lib/components/toolbar/index.d.ts.map +1 -1
- package/lib/components/toolbar/index.js +1 -0
- package/lib/components/toolbar/index.js.map +1 -1
- package/lib-esm/app/hooks/file-loading.d.ts +3 -2
- package/lib-esm/app/hooks/file-loading.d.ts.map +1 -1
- package/lib-esm/app/hooks/file-loading.js +9 -9
- package/lib-esm/app/hooks/file-loading.js.map +1 -1
- package/lib-esm/app/panels/SignalProcessingPanel.js +1 -1
- package/lib-esm/app/panels/SignalProcessingPanel.js.map +1 -1
- package/lib-esm/app-data/loaders/biologicLoader.d.ts +2 -2
- package/lib-esm/app-data/loaders/biologicLoader.d.ts.map +1 -1
- package/lib-esm/app-data/loaders/biologicLoader.js +4 -4
- package/lib-esm/app-data/loaders/biologicLoader.js.map +1 -1
- package/lib-esm/app-data/loaders/cdfLoader.d.ts +2 -2
- package/lib-esm/app-data/loaders/cdfLoader.d.ts.map +1 -1
- package/lib-esm/app-data/loaders/cdfLoader.js +6 -9
- package/lib-esm/app-data/loaders/cdfLoader.js.map +1 -1
- package/lib-esm/app-data/loaders/jcampLoader.d.ts +2 -2
- package/lib-esm/app-data/loaders/jcampLoader.d.ts.map +1 -1
- package/lib-esm/app-data/loaders/jcampLoader.js +10 -13
- package/lib-esm/app-data/loaders/jcampLoader.js.map +1 -1
- package/lib-esm/app-data/loaders/loadMeasurements.d.ts +4 -3
- package/lib-esm/app-data/loaders/loadMeasurements.d.ts.map +1 -1
- package/lib-esm/app-data/loaders/loadMeasurements.js +3 -3
- package/lib-esm/app-data/loaders/loadMeasurements.js.map +1 -1
- package/lib-esm/app-data/loaders/proprietary/agilent/cary500Loader.d.ts +3 -2
- package/lib-esm/app-data/loaders/proprietary/agilent/cary500Loader.d.ts.map +1 -1
- package/lib-esm/app-data/loaders/proprietary/agilent/cary500Loader.js +5 -10
- package/lib-esm/app-data/loaders/proprietary/agilent/cary500Loader.js.map +1 -1
- package/lib-esm/app-data/loaders/spcLoader.d.ts +2 -2
- package/lib-esm/app-data/loaders/spcLoader.d.ts.map +1 -1
- package/lib-esm/app-data/loaders/spcLoader.js +4 -9
- package/lib-esm/app-data/loaders/spcLoader.js.map +1 -1
- package/lib-esm/app-data/loaders/utility/measurementLoader.d.ts +2 -2
- package/lib-esm/app-data/loaders/utility/measurementLoader.d.ts.map +1 -1
- package/lib-esm/app-data/loaders/utility/measurementLoader.js.map +1 -1
- package/lib-esm/app-data/loaders/wdfLoader.d.ts +2 -2
- package/lib-esm/app-data/loaders/wdfLoader.d.ts.map +1 -1
- package/lib-esm/app-data/loaders/wdfLoader.js +3 -9
- package/lib-esm/app-data/loaders/wdfLoader.js.map +1 -1
- package/lib-esm/components/index.d.ts +2 -1
- package/lib-esm/components/index.d.ts.map +1 -1
- package/lib-esm/components/index.js +2 -1
- package/lib-esm/components/index.js.map +1 -1
- package/lib-esm/components/info-panel/InfoPanel.d.ts.map +1 -1
- package/lib-esm/components/info-panel/InfoPanel.js +1 -1
- package/lib-esm/components/info-panel/InfoPanel.js.map +1 -1
- package/lib-esm/components/logger/FifoLoggerDialog.d.ts +10 -0
- package/lib-esm/components/logger/FifoLoggerDialog.d.ts.map +1 -0
- package/lib-esm/components/logger/FifoLoggerDialog.js +48 -0
- package/lib-esm/components/logger/FifoLoggerDialog.js.map +1 -0
- package/lib-esm/components/logger/FifoLoggerProvider.d.ts +7 -0
- package/lib-esm/components/logger/FifoLoggerProvider.d.ts.map +1 -0
- package/lib-esm/components/logger/FifoLoggerProvider.js +6 -0
- package/lib-esm/components/logger/FifoLoggerProvider.js.map +1 -0
- package/lib-esm/components/logger/FifoLoggerToolbarItem.d.ts +2 -0
- package/lib-esm/components/logger/FifoLoggerToolbarItem.d.ts.map +1 -0
- package/lib-esm/components/logger/FifoLoggerToolbarItem.js +35 -0
- package/lib-esm/components/logger/FifoLoggerToolbarItem.js.map +1 -0
- package/lib-esm/components/logger/index.d.ts +5 -0
- package/lib-esm/components/logger/index.d.ts.map +1 -0
- package/lib-esm/components/logger/index.js +5 -0
- package/lib-esm/components/logger/index.js.map +1 -0
- package/lib-esm/components/logger/loggerContext.d.ts +4 -0
- package/lib-esm/components/logger/loggerContext.d.ts.map +1 -0
- package/lib-esm/components/logger/loggerContext.js +3 -0
- package/lib-esm/components/logger/loggerContext.js.map +1 -0
- package/lib-esm/components/logger/useFifoLogger.d.ts +3 -0
- package/lib-esm/components/logger/useFifoLogger.d.ts.map +1 -0
- package/lib-esm/components/logger/useFifoLogger.js +20 -0
- package/lib-esm/components/logger/useFifoLogger.js.map +1 -0
- package/lib-esm/components/table/Table.d.ts +2 -3
- package/lib-esm/components/table/Table.d.ts.map +1 -1
- package/lib-esm/components/table/Table.js +2 -2
- package/lib-esm/components/table/Table.js.map +1 -1
- package/lib-esm/components/table/TableHeader.d.ts +1 -1
- package/lib-esm/components/table/TableHeader.d.ts.map +1 -1
- package/lib-esm/components/table/TableHeader.js +2 -2
- package/lib-esm/components/table/TableHeader.js.map +1 -1
- package/lib-esm/components/table/TableRow.d.ts +1 -1
- package/lib-esm/components/table/TableRow.d.ts.map +1 -1
- package/lib-esm/components/table/TableRow.js +6 -19
- package/lib-esm/components/table/TableRow.js.map +1 -1
- package/lib-esm/components/table/tableContext.d.ts +0 -2
- package/lib-esm/components/table/tableContext.d.ts.map +1 -1
- package/lib-esm/components/table/tableContext.js +1 -1
- package/lib-esm/components/table/tableContext.js.map +1 -1
- package/lib-esm/components/toolbar/TooltipHelpContent.d.ts +11 -0
- package/lib-esm/components/toolbar/TooltipHelpContent.d.ts.map +1 -0
- package/lib-esm/components/toolbar/TooltipHelpContent.js +95 -0
- package/lib-esm/components/toolbar/TooltipHelpContent.js.map +1 -0
- package/lib-esm/components/toolbar/index.d.ts +1 -0
- package/lib-esm/components/toolbar/index.d.ts.map +1 -1
- package/lib-esm/components/toolbar/index.js +1 -0
- package/lib-esm/components/toolbar/index.js.map +1 -1
- package/package.json +7 -5
- package/src/app/hooks/file-loading.ts +12 -10
- package/src/app/panels/SignalProcessingPanel.tsx +1 -1
- package/src/app-data/loaders/biologicLoader.ts +6 -5
- package/src/app-data/loaders/cdfLoader.ts +8 -13
- package/src/app-data/loaders/jcampLoader.ts +11 -15
- package/src/app-data/loaders/loadMeasurements.ts +6 -5
- package/src/app-data/loaders/proprietary/agilent/cary500Loader.ts +8 -16
- package/src/app-data/loaders/spcLoader.ts +6 -12
- package/src/app-data/loaders/utility/measurementLoader.ts +2 -3
- package/src/app-data/loaders/wdfLoader.ts +5 -12
- package/src/components/index.ts +2 -1
- package/src/components/info-panel/InfoPanel.tsx +0 -1
- package/src/components/logger/FifoLoggerDialog.tsx +129 -0
- package/src/components/logger/FifoLoggerProvider.tsx +15 -0
- package/src/components/logger/FifoLoggerToolbarItem.tsx +59 -0
- package/src/components/logger/index.ts +4 -0
- package/src/components/logger/loggerContext.ts +4 -0
- package/src/components/logger/useFifoLogger.ts +22 -0
- package/src/components/table/Table.tsx +1 -6
- package/src/components/table/TableHeader.tsx +2 -2
- package/src/components/table/TableRow.tsx +4 -23
- package/src/components/table/tableContext.ts +1 -1
- package/src/components/toolbar/TooltipHelpContent.tsx +173 -0
- package/src/components/toolbar/index.ts +1 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tableContext.d.ts","sourceRoot":"","sources":["../../../src/components/table/tableContext.ts"],"names":[],"mappings":";AAEA,eAAO,MAAM,YAAY
|
|
1
|
+
{"version":3,"file":"tableContext.d.ts","sourceRoot":"","sources":["../../../src/components/table/tableContext.ts"],"names":[],"mappings":";AAEA,eAAO,MAAM,YAAY;;EAA+B,CAAC;AACzD,wBAAgB,eAAe;;EAG9B"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.useTableContext = exports.TableContext = void 0;
|
|
4
4
|
const react_1 = require("react");
|
|
5
|
-
exports.TableContext = (0, react_1.createContext)({
|
|
5
|
+
exports.TableContext = (0, react_1.createContext)({ color: '' });
|
|
6
6
|
function useTableContext() {
|
|
7
7
|
const context = (0, react_1.useContext)(exports.TableContext);
|
|
8
8
|
return context;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tableContext.js","sourceRoot":"","sources":["../../../src/components/table/tableContext.ts"],"names":[],"mappings":";;;AAAA,iCAAkD;AAErC,QAAA,YAAY,GAAG,IAAA,qBAAa,EAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"tableContext.js","sourceRoot":"","sources":["../../../src/components/table/tableContext.ts"],"names":[],"mappings":";;;AAAA,iCAAkD;AAErC,QAAA,YAAY,GAAG,IAAA,qBAAa,EAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;AACzD,SAAgB,eAAe;IAC7B,MAAM,OAAO,GAAG,IAAA,kBAAU,EAAC,oBAAY,CAAC,CAAC;IACzC,OAAO,OAAO,CAAC;AACjB,CAAC;AAHD,0CAGC"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { CSSProperties } from 'react';
|
|
2
|
+
export interface TooltipItem {
|
|
3
|
+
title: string;
|
|
4
|
+
shortcuts?: string[];
|
|
5
|
+
subTitles?: Array<Pick<TooltipItem, 'title' | 'shortcuts'>>;
|
|
6
|
+
description?: string;
|
|
7
|
+
link?: string;
|
|
8
|
+
style?: CSSProperties;
|
|
9
|
+
}
|
|
10
|
+
export declare function TooltipHelpContent(props: TooltipItem): import("react/jsx-runtime").JSX.Element;
|
|
11
|
+
//# sourceMappingURL=TooltipHelpContent.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"TooltipHelpContent.d.ts","sourceRoot":"","sources":["../../../src/components/toolbar/TooltipHelpContent.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AA6EtC,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,SAAS,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,GAAG,WAAW,CAAC,CAAC,CAAC;IAC5D,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,aAAa,CAAC;CACvB;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,WAAW,2CA0CpD"}
|
|
@@ -0,0 +1,102 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.TooltipHelpContent = void 0;
|
|
7
|
+
const jsx_runtime_1 = require("react/jsx-runtime");
|
|
8
|
+
const styled_1 = __importDefault(require("@emotion/styled"));
|
|
9
|
+
const shortcutBoxSize = 1.5;
|
|
10
|
+
const FlexContainer = styled_1.default.div `
|
|
11
|
+
display: flex;
|
|
12
|
+
justify-content: space-between;
|
|
13
|
+
flex-wrap: wrap;
|
|
14
|
+
align-items: center;
|
|
15
|
+
`;
|
|
16
|
+
const Title = styled_1.default.span `
|
|
17
|
+
font-size: ${({ size }) => size};
|
|
18
|
+
flex: 1;
|
|
19
|
+
padding: 5px 0;
|
|
20
|
+
text-align: left;
|
|
21
|
+
`;
|
|
22
|
+
const Description = styled_1.default.p `
|
|
23
|
+
padding-top: 1rem;
|
|
24
|
+
font-size: 0.7rem;
|
|
25
|
+
text-align: left;
|
|
26
|
+
`;
|
|
27
|
+
const ShortcutItem = styled_1.default.div `
|
|
28
|
+
display: flex;
|
|
29
|
+
justify-content: center;
|
|
30
|
+
align-items: center;
|
|
31
|
+
padding: 0.2rem;
|
|
32
|
+
border: 1px solid;
|
|
33
|
+
border-radius: 4px;
|
|
34
|
+
height: ${shortcutBoxSize}rem;
|
|
35
|
+
min-width: ${shortcutBoxSize}rem;
|
|
36
|
+
margin-left: 5px;
|
|
37
|
+
font-size: 0.75rem;
|
|
38
|
+
font-weight: bold;
|
|
39
|
+
`;
|
|
40
|
+
const SubTitleItem = styled_1.default.div `
|
|
41
|
+
position: relative;
|
|
42
|
+
padding-left: 15px;
|
|
43
|
+
box-sizing: border-box;
|
|
44
|
+
|
|
45
|
+
&::before {
|
|
46
|
+
position: absolute;
|
|
47
|
+
top: ${shortcutBoxSize / 2}rem;
|
|
48
|
+
left: 0;
|
|
49
|
+
width: 10px;
|
|
50
|
+
height: 1px;
|
|
51
|
+
margin: auto;
|
|
52
|
+
content: '';
|
|
53
|
+
border-bottom: 1px solid;
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
&::after {
|
|
57
|
+
position: absolute;
|
|
58
|
+
top: 0;
|
|
59
|
+
bottom: 0;
|
|
60
|
+
left: 0;
|
|
61
|
+
width: 1px;
|
|
62
|
+
height: 100%;
|
|
63
|
+
content: '';
|
|
64
|
+
border-left: 1px solid;
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
&:last-child::after {
|
|
68
|
+
height: ${shortcutBoxSize / 2}rem;
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
&:first-child {
|
|
72
|
+
margin: 0;
|
|
73
|
+
}
|
|
74
|
+
`;
|
|
75
|
+
function TooltipHelpContent(props) {
|
|
76
|
+
const { title, shortcuts = [], subTitles = [], description = '', link, style = {}, } = props;
|
|
77
|
+
return ((0, jsx_runtime_1.jsxs)("div", { style: {
|
|
78
|
+
color: 'white',
|
|
79
|
+
width: '250px',
|
|
80
|
+
padding: '0.5rem',
|
|
81
|
+
...style,
|
|
82
|
+
}, children: [(0, jsx_runtime_1.jsxs)(FlexContainer, { children: [(0, jsx_runtime_1.jsx)(Title, { size: "0.9rem", children: title }), (0, jsx_runtime_1.jsx)(ShortCuts, { shortcuts: shortcuts })] }), (0, jsx_runtime_1.jsx)(SubTitles, { items: subTitles }), (description || link) && ((0, jsx_runtime_1.jsxs)(Description, { children: [description, link && ((0, jsx_runtime_1.jsx)("a", { style: description ? { paddingLeft: '5px' } : {}, target: "_blank", href: link, rel: "noreferrer", children: "Learn more" }))] }))] }));
|
|
83
|
+
}
|
|
84
|
+
exports.TooltipHelpContent = TooltipHelpContent;
|
|
85
|
+
function ShortCuts({ shortcuts }) {
|
|
86
|
+
return ((0, jsx_runtime_1.jsx)("div", { style: {
|
|
87
|
+
display: 'flex',
|
|
88
|
+
textWrap: 'nowrap',
|
|
89
|
+
}, children: shortcuts.map((key) => {
|
|
90
|
+
return ((0, jsx_runtime_1.jsx)(ShortcutItem, { children: (0, jsx_runtime_1.jsx)("span", { children: key }) }, key));
|
|
91
|
+
}) }));
|
|
92
|
+
}
|
|
93
|
+
function SubTitles({ items }) {
|
|
94
|
+
if (!items || items.length === 0) {
|
|
95
|
+
return null;
|
|
96
|
+
}
|
|
97
|
+
return ((0, jsx_runtime_1.jsx)("ul", { style: {
|
|
98
|
+
paddingLeft: '5px',
|
|
99
|
+
listStyle: 'none',
|
|
100
|
+
}, children: items.map(({ shortcuts = [], title }) => ((0, jsx_runtime_1.jsx)(SubTitleItem, { children: (0, jsx_runtime_1.jsxs)(FlexContainer, { children: [(0, jsx_runtime_1.jsx)(Title, { size: "0.7rem", children: title }), (0, jsx_runtime_1.jsx)(ShortCuts, { shortcuts: shortcuts })] }) }, title))) }));
|
|
101
|
+
}
|
|
102
|
+
//# sourceMappingURL=TooltipHelpContent.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"TooltipHelpContent.js","sourceRoot":"","sources":["../../../src/components/toolbar/TooltipHelpContent.tsx"],"names":[],"mappings":";;;;;;;AAAA,6DAAqC;AAGrC,MAAM,eAAe,GAAG,GAAG,CAAC;AAE5B,MAAM,aAAa,GAAG,gBAAM,CAAC,GAAG,CAAA;;;;;CAK/B,CAAC;AAMF,MAAM,KAAK,GAAG,gBAAM,CAAC,IAAI,CAAY;eACtB,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI;;;;CAIhC,CAAC;AACF,MAAM,WAAW,GAAG,gBAAM,CAAC,CAAC,CAAA;;;;CAI3B,CAAC;AAEF,MAAM,YAAY,GAAG,gBAAM,CAAC,GAAG,CAAA;;;;;;;YAOnB,eAAe;eACZ,eAAe;;;;CAI7B,CAAC;AAEF,MAAM,YAAY,GAAG,gBAAM,CAAC,GAAG,CAAA;;;;;;;WAOpB,eAAe,GAAG,CAAC;;;;;;;;;;;;;;;;;;;;;cAqBhB,eAAe,GAAG,CAAC;;;;;;CAMhC,CAAC;AAWF,SAAgB,kBAAkB,CAAC,KAAkB;IACnD,MAAM,EACJ,KAAK,EACL,SAAS,GAAG,EAAE,EACd,SAAS,GAAG,EAAE,EACd,WAAW,GAAG,EAAE,EAChB,IAAI,EACJ,KAAK,GAAG,EAAE,GACX,GAAG,KAAK,CAAC;IAEV,OAAO,CACL,iCACE,KAAK,EAAE;YACL,KAAK,EAAE,OAAO;YACd,KAAK,EAAE,OAAO;YACd,OAAO,EAAE,QAAQ;YACjB,GAAG,KAAK;SACT,aAED,wBAAC,aAAa,eACZ,uBAAC,KAAK,IAAC,IAAI,EAAC,QAAQ,YAAE,KAAK,GAAS,EACpC,uBAAC,SAAS,IAAC,SAAS,EAAE,SAAS,GAAI,IACrB,EAChB,uBAAC,SAAS,IAAC,KAAK,EAAE,SAAS,GAAI,EAE9B,CAAC,WAAW,IAAI,IAAI,CAAC,IAAI,CACxB,wBAAC,WAAW,eACT,WAAW,EACX,IAAI,IAAI,CACP,8BACE,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,EAChD,MAAM,EAAC,QAAQ,EACf,IAAI,EAAE,IAAI,EACV,GAAG,EAAC,YAAY,2BAGd,CACL,IACW,CACf,IACG,CACP,CAAC;AACJ,CAAC;AA1CD,gDA0CC;AAED,SAAS,SAAS,CAAC,EAAE,SAAS,EAA2B;IACvD,OAAO,CACL,gCACE,KAAK,EAAE;YACL,OAAO,EAAE,MAAM;YACf,QAAQ,EAAE,QAAQ;SACnB,YAEA,SAAS,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YACrB,OAAO,CACL,uBAAC,YAAY,cACX,2CAAO,GAAG,GAAQ,IADD,GAAG,CAEP,CAChB,CAAC;QACJ,CAAC,CAAC,GACE,CACP,CAAC;AACJ,CAAC;AAED,SAAS,SAAS,CAAC,EAAE,KAAK,EAA4B;IACpD,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACjC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,CACL,+BACE,KAAK,EAAE;YACL,WAAW,EAAE,KAAK;YAClB,SAAS,EAAE,MAAM;SAClB,YAEA,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,GAAG,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CACxC,uBAAC,YAAY,cACX,wBAAC,aAAa,eACZ,uBAAC,KAAK,IAAC,IAAI,EAAC,QAAQ,YAAE,KAAK,GAAS,EACpC,uBAAC,SAAS,IAAC,SAAS,EAAE,SAAS,GAAI,IACrB,IAJC,KAAK,CAKT,CAChB,CAAC,GACC,CACN,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/toolbar/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,cAAc,2BAA2B,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/toolbar/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,cAAc,2BAA2B,CAAC;AAC1C,cAAc,sBAAsB,CAAC"}
|
|
@@ -16,4 +16,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
17
|
__exportStar(require("./Toolbar"), exports);
|
|
18
18
|
__exportStar(require("./PanelPreferencesToolbar"), exports);
|
|
19
|
+
__exportStar(require("./TooltipHelpContent"), exports);
|
|
19
20
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/toolbar/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4CAA0B;AAC1B,4DAA0C"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/toolbar/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4CAA0B;AAC1B,4DAA0C;AAC1C,uDAAqC"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { UseQueryResult } from '@tanstack/react-query';
|
|
2
|
+
import type { FifoLogger } from 'fifo-logger';
|
|
2
3
|
import { FileCollection } from 'filelist-utils';
|
|
3
|
-
import { AppDispatch } from '../../app-data
|
|
4
|
-
type LoadFn = (files: File[] | FileCollection, dispatch: AppDispatch) => Promise<void>;
|
|
4
|
+
import { AppDispatch } from '../../app-data';
|
|
5
|
+
type LoadFn = (files: File[] | FileCollection, logger: FifoLogger, dispatch: AppDispatch) => Promise<void>;
|
|
5
6
|
export declare function useLoadFileCollectionFromHash(onLoad: LoadFn): UseQueryResult<true | null>;
|
|
6
7
|
export declare function useDropFiles(onLoad: LoadFn): (files: File[]) => void;
|
|
7
8
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-loading.d.ts","sourceRoot":"","sources":["../../../src/app/hooks/file-loading.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"file-loading.d.ts","sourceRoot":"","sources":["../../../src/app/hooks/file-loading.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACjE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,cAAc,EAA+B,MAAM,gBAAgB,CAAC;AAG7E,OAAO,EAAE,WAAW,EAAkB,MAAM,gBAAgB,CAAC;AAG7D,KAAK,MAAM,GAAG,CACZ,KAAK,EAAE,IAAI,EAAE,GAAG,cAAc,EAC9B,MAAM,EAAE,UAAU,EAClB,QAAQ,EAAE,WAAW,KAClB,OAAO,CAAC,IAAI,CAAC,CAAC;AAEnB,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,MAAM,GACb,cAAc,CAAC,IAAI,GAAG,IAAI,CAAC,CAsB7B;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,WAI/B,IAAI,EAAE,UAKjB"}
|
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
import { useQuery } from '@tanstack/react-query';
|
|
2
2
|
import { fileCollectionFromWebSource } from 'filelist-utils';
|
|
3
3
|
import { useCallback } from 'react';
|
|
4
|
-
import { useAppDispatch } from '../../app-data
|
|
5
|
-
import { useHashSearchParams } from '../../components
|
|
4
|
+
import { useAppDispatch } from '../../app-data';
|
|
5
|
+
import { useFifoLogger, useHashSearchParams } from '../../components';
|
|
6
6
|
export function useLoadFileCollectionFromHash(onLoad) {
|
|
7
|
+
const logger = useFifoLogger();
|
|
7
8
|
const appDispatch = useAppDispatch();
|
|
8
9
|
const hashParams = useHashSearchParams();
|
|
9
10
|
const filelistUrl = hashParams.get('filelist');
|
|
10
|
-
|
|
11
|
+
return useQuery({
|
|
11
12
|
queryKey: ['filelist', filelistUrl],
|
|
12
13
|
queryFn: async () => {
|
|
13
14
|
if (!filelistUrl) {
|
|
@@ -20,17 +21,16 @@ export function useLoadFileCollectionFromHash(onLoad) {
|
|
|
20
21
|
entries: data,
|
|
21
22
|
baseURL,
|
|
22
23
|
});
|
|
23
|
-
void onLoad(fileCollection, appDispatch);
|
|
24
|
+
void onLoad(fileCollection, logger, appDispatch);
|
|
24
25
|
return true;
|
|
25
26
|
},
|
|
26
27
|
});
|
|
27
|
-
return query;
|
|
28
28
|
}
|
|
29
29
|
export function useDropFiles(onLoad) {
|
|
30
30
|
const dispatch = useAppDispatch();
|
|
31
|
-
const
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
31
|
+
const logger = useFifoLogger();
|
|
32
|
+
return useCallback((files) => {
|
|
33
|
+
void onLoad(files, logger, dispatch);
|
|
34
|
+
}, [dispatch, onLoad, logger]);
|
|
35
35
|
}
|
|
36
36
|
//# sourceMappingURL=file-loading.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-loading.js","sourceRoot":"","sources":["../../../src/app/hooks/file-loading.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"file-loading.js","sourceRoot":"","sources":["../../../src/app/hooks/file-loading.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAkB,MAAM,uBAAuB,CAAC;AAEjE,OAAO,EAAkB,2BAA2B,EAAE,MAAM,gBAAgB,CAAC;AAC7E,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AAEpC,OAAO,EAAe,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAQtE,MAAM,UAAU,6BAA6B,CAC3C,MAAc;IAEd,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAC/B,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;IACrC,MAAM,UAAU,GAAG,mBAAmB,EAAE,CAAC;IACzC,MAAM,WAAW,GAAG,UAAU,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAC/C,OAAO,QAAQ,CAAC;QACd,QAAQ,EAAE,CAAC,UAAU,EAAE,WAAW,CAAC;QACnC,OAAO,EAAE,KAAK,IAAI,EAAE;YAClB,IAAI,CAAC,WAAW,EAAE,CAAC;gBACjB,OAAO,IAAI,CAAC;YACd,CAAC;YACD,MAAM,OAAO,GAAG,MAAM,KAAK,CAAC,WAAW,CAAC,CAAC;YACzC,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;YAClC,MAAM,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;YACrD,MAAM,cAAc,GAAG,MAAM,2BAA2B,CAAC;gBACvD,OAAO,EAAE,IAAI;gBACb,OAAO;aACR,CAAC,CAAC;YACH,KAAK,MAAM,CAAC,cAAc,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;YACjD,OAAO,IAAI,CAAC;QACd,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,MAAc;IACzC,MAAM,QAAQ,GAAG,cAAc,EAAE,CAAC;IAClC,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAC/B,OAAO,WAAW,CAChB,CAAC,KAAa,EAAE,EAAE;QAChB,KAAK,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IACvC,CAAC,EACD,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,CAC3B,CAAC;AACJ,CAAC"}
|
|
@@ -18,7 +18,7 @@ const defaultFilters = filterXY.anyOf.map(({ properties }) => {
|
|
|
18
18
|
});
|
|
19
19
|
export function SignalProcessingPanel(props) {
|
|
20
20
|
const { filters = [], onChange } = props;
|
|
21
|
-
return (_jsxs("div", { children: [_jsxs(Table, { children: [_jsxs(Table.Header, { children: [_jsx(ValueRenderers.Header, { value: " " }), _jsx(ValueRenderers.Header, { value: "Name" }), _jsx(ValueRenderers.Header, { value: "Options" })] }), filters.map(({ name, options }, i) => (_jsxs(Table.Row, {
|
|
21
|
+
return (_jsxs("div", { children: [_jsxs(Table, { children: [_jsxs(Table.Header, { children: [_jsx(ValueRenderers.Header, { value: " " }), _jsx(ValueRenderers.Header, { value: "Name" }), _jsx(ValueRenderers.Header, { value: "Options" })] }), filters.map(({ name, options }, i) => (_jsxs(Table.Row, { bordered: true, children: [_jsx(ValueRenderers.Component, { children: _jsxs("div", { style: { display: 'flex', gap: '3px' }, children: [_jsx(Button, { style: { width: '15px' }, intent: "success", onClick: () => {
|
|
22
22
|
const newFilters = [...filters];
|
|
23
23
|
newFilters.splice(i + 1, 0, getDefaultFilter(defaultFilters[0]));
|
|
24
24
|
onChange?.(newFilters);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SignalProcessingPanel.js","sourceRoot":"","sources":["../../../src/app/panels/SignalProcessingPanel.tsx"],"names":[],"mappings":";AACA,OAAO,QAAQ,MAAM,0CAA0C,CAAC;AAEhE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAgBvE,mDAAmD;AACnD,MAAM,cAAc,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE;IAC3D,MAAM,OAAO,GAAsC,EAAE,CAAC;IACtD,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CACvC,UAAU,EAAE,OAAO,EAAE,UAAU,IAAI,EAAE,CACtC,EAAE,CAAC;QACF,OAAO,CAAC,GAAG,CAAC,GAAG;YACb,YAAY,EAAE,KAAK,CAAC,OAAO;YAC3B,OAAO,EAAE,KAAK,CAAC,IAAI;YACnB,WAAW,EAAE,KAAK,CAAC,WAAW;SAC/B,CAAC;IACJ,CAAC;IAED,OAAO;QACL,IAAI,EAAE,UAAU,CAAC,IAAI,CAAC,KAA6B;QACnD,OAAO;KACR,CAAC;AACJ,CAAC,CAAC,CAAC;AACH,MAAM,UAAU,qBAAqB,CAAC,KAAiC;IACrE,MAAM,EAAE,OAAO,GAAG,EAAE,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;IAEzC,OAAO,CACL,0BACE,MAAC,KAAK,eACJ,MAAC,KAAK,CAAC,MAAM,eACX,KAAC,cAAc,CAAC,MAAM,IAAC,KAAK,EAAC,GAAG,GAAG,EACnC,KAAC,cAAc,CAAC,MAAM,IAAC,KAAK,EAAC,MAAM,GAAG,EACtC,KAAC,cAAc,CAAC,MAAM,IAAC,KAAK,EAAC,SAAS,GAAG,IAC5B,EACd,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,CACrC,MAAC,KAAK,CAAC,GAAG,IAAY,
|
|
1
|
+
{"version":3,"file":"SignalProcessingPanel.js","sourceRoot":"","sources":["../../../src/app/panels/SignalProcessingPanel.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
+
import type { FifoLogger } from 'fifo-logger';
|
|
1
2
|
import type { FileCollection } from 'filelist-utils';
|
|
2
3
|
import type { Measurements } from '../index';
|
|
3
|
-
import { ParserLog } from './utility/parserLog';
|
|
4
4
|
/**
|
|
5
5
|
*
|
|
6
6
|
* @param fileCollection - the dragged file/files
|
|
7
7
|
* @param logs - pass to append errors to the logs, it mutates the external array.
|
|
8
8
|
* @returns - new measurements object to be merged
|
|
9
9
|
*/
|
|
10
|
-
export declare function biologicLoader(fileCollection: FileCollection,
|
|
10
|
+
export declare function biologicLoader(fileCollection: FileCollection, logger?: FifoLogger): Promise<Partial<Measurements>>;
|
|
11
11
|
//# sourceMappingURL=biologicLoader.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"biologicLoader.d.ts","sourceRoot":"","sources":["../../../src/app-data/loaders/biologicLoader.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"biologicLoader.d.ts","sourceRoot":"","sources":["../../../src/app-data/loaders/biologicLoader.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAErD,OAAO,KAAK,EAAmB,YAAY,EAAE,MAAM,UAAU,CAAC;AAO9D;;;;;GAKG;AACH,wBAAsB,cAAc,CAClC,cAAc,EAAE,cAAc,EAC9B,MAAM,CAAC,EAAE,UAAU,GAClB,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CA2DhC"}
|
|
@@ -1,13 +1,12 @@
|
|
|
1
1
|
import { parseMPR, parseMPT } from 'biologic-converter';
|
|
2
2
|
import { getMeasurementInfoFromFile } from './utility/getMeasurementInfoFromFile';
|
|
3
|
-
import { createLogEntry } from './utility/parserLog';
|
|
4
3
|
/**
|
|
5
4
|
*
|
|
6
5
|
* @param fileCollection - the dragged file/files
|
|
7
6
|
* @param logs - pass to append errors to the logs, it mutates the external array.
|
|
8
7
|
* @returns - new measurements object to be merged
|
|
9
8
|
*/
|
|
10
|
-
export async function biologicLoader(fileCollection,
|
|
9
|
+
export async function biologicLoader(fileCollection, logger) {
|
|
11
10
|
const measurements = {};
|
|
12
11
|
const entries = [];
|
|
13
12
|
for (const file of fileCollection.files) {
|
|
@@ -50,8 +49,8 @@ export async function biologicLoader(fileCollection, logs) {
|
|
|
50
49
|
catch (error) {
|
|
51
50
|
//send error to UI to show to User ?
|
|
52
51
|
if (error instanceof Error) {
|
|
53
|
-
if (
|
|
54
|
-
|
|
52
|
+
if (logger) {
|
|
53
|
+
logger.error(error);
|
|
55
54
|
}
|
|
56
55
|
else {
|
|
57
56
|
throw error;
|
|
@@ -59,6 +58,7 @@ export async function biologicLoader(fileCollection, logs) {
|
|
|
59
58
|
}
|
|
60
59
|
}
|
|
61
60
|
}
|
|
61
|
+
logger?.debug(`Loaded ${entries.length} entries with biologicLoader`);
|
|
62
62
|
measurements.iv = { entries };
|
|
63
63
|
return measurements;
|
|
64
64
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"biologicLoader.js","sourceRoot":"","sources":["../../../src/app-data/loaders/biologicLoader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"biologicLoader.js","sourceRoot":"","sources":["../../../src/app-data/loaders/biologicLoader.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
+
import type { FifoLogger } from 'fifo-logger';
|
|
1
2
|
import type { FileCollection } from 'filelist-utils';
|
|
2
3
|
import type { Measurements } from '../index';
|
|
3
|
-
|
|
4
|
-
export declare function cdfLoader(fileCollection: FileCollection, logs?: ParserLog[]): Promise<Partial<Measurements>>;
|
|
4
|
+
export declare function cdfLoader(fileCollection: FileCollection, logger?: FifoLogger): Promise<Partial<Measurements>>;
|
|
5
5
|
//# sourceMappingURL=cdfLoader.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cdfLoader.d.ts","sourceRoot":"","sources":["../../../src/app-data/loaders/cdfLoader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"cdfLoader.d.ts","sourceRoot":"","sources":["../../../src/app-data/loaders/cdfLoader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAIrD,OAAO,KAAK,EAAoC,YAAY,EAAE,MAAM,UAAU,CAAC;AAI/E,wBAAsB,SAAS,CAC7B,cAAc,EAAE,cAAc,EAC9B,MAAM,CAAC,EAAE,UAAU,GAClB,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CA+DhC"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { NetCDFReader } from 'netcdfjs';
|
|
2
2
|
import { assert } from '../../components/index';
|
|
3
3
|
import { getMeasurementInfoFromFile } from './utility/getMeasurementInfoFromFile';
|
|
4
|
-
|
|
5
|
-
export async function cdfLoader(fileCollection, logs) {
|
|
4
|
+
export async function cdfLoader(fileCollection, logger) {
|
|
6
5
|
const newMeasurements = {};
|
|
7
6
|
let kind;
|
|
7
|
+
let count = 0;
|
|
8
8
|
for (const file of fileCollection) {
|
|
9
9
|
if (/\.cdf$/i.test(file.name)) {
|
|
10
10
|
try {
|
|
@@ -36,17 +36,13 @@ export async function cdfLoader(fileCollection, logs) {
|
|
|
36
36
|
: chromatogram(reader),
|
|
37
37
|
};
|
|
38
38
|
newMeasurements[kind]?.entries.push(newMeasurement);
|
|
39
|
+
count++;
|
|
39
40
|
}
|
|
40
41
|
catch (error) {
|
|
41
42
|
if (error instanceof Error) {
|
|
42
43
|
//send error to UI ?
|
|
43
|
-
if (
|
|
44
|
-
|
|
45
|
-
error,
|
|
46
|
-
parser: 'cdfLoader',
|
|
47
|
-
message: 'error parsing file from cdfLoader',
|
|
48
|
-
relativePath: file.relativePath,
|
|
49
|
-
}));
|
|
44
|
+
if (logger) {
|
|
45
|
+
logger.error(error);
|
|
50
46
|
}
|
|
51
47
|
else {
|
|
52
48
|
throw error;
|
|
@@ -55,6 +51,7 @@ export async function cdfLoader(fileCollection, logs) {
|
|
|
55
51
|
}
|
|
56
52
|
}
|
|
57
53
|
}
|
|
54
|
+
logger?.debug(`Loaded ${count} measurements with cdfLoader`);
|
|
58
55
|
return newMeasurements;
|
|
59
56
|
}
|
|
60
57
|
function chromatogramWithMassSpectra(reader) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cdfLoader.js","sourceRoot":"","sources":["../../../src/app-data/loaders/cdfLoader.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cdfLoader.js","sourceRoot":"","sources":["../../../src/app-data/loaders/cdfLoader.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
+
import type { FifoLogger } from 'fifo-logger';
|
|
1
2
|
import type { FileCollection } from 'filelist-utils';
|
|
2
3
|
import type { Measurements } from '../index';
|
|
3
|
-
import { ParserLog } from './utility/parserLog';
|
|
4
4
|
/**
|
|
5
5
|
*
|
|
6
6
|
* @param fileCollection - the dragged file/files
|
|
7
7
|
* @param logger - whether to log to console or not
|
|
8
8
|
* @returns - new measurements object to be merged
|
|
9
9
|
*/
|
|
10
|
-
export declare function jcampLoader(fileCollection: FileCollection,
|
|
10
|
+
export declare function jcampLoader(fileCollection: FileCollection, logger?: FifoLogger): Promise<Partial<Measurements>>;
|
|
11
11
|
//# sourceMappingURL=jcampLoader.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jcampLoader.d.ts","sourceRoot":"","sources":["../../../src/app-data/loaders/jcampLoader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"jcampLoader.d.ts","sourceRoot":"","sources":["../../../src/app-data/loaders/jcampLoader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAIrD,OAAO,KAAK,EAAmB,YAAY,EAAE,MAAM,UAAU,CAAC;AAI9D;;;;;GAKG;AACH,wBAAsB,WAAW,CAC/B,cAAc,EAAE,cAAc,EAC9B,MAAM,CAAC,EAAE,UAAU,GAClB,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAsDhC"}
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
import { convert } from 'jcampconverter';
|
|
2
2
|
import { assert } from '../../components/index';
|
|
3
3
|
import { getMeasurementInfoFromFile } from './utility/getMeasurementInfoFromFile';
|
|
4
|
-
import { createLogEntry } from './utility/parserLog';
|
|
5
4
|
/**
|
|
6
5
|
*
|
|
7
6
|
* @param fileCollection - the dragged file/files
|
|
8
7
|
* @param logger - whether to log to console or not
|
|
9
8
|
* @returns - new measurements object to be merged
|
|
10
9
|
*/
|
|
11
|
-
export async function jcampLoader(fileCollection,
|
|
10
|
+
export async function jcampLoader(fileCollection, logger) {
|
|
11
|
+
let count = 0;
|
|
12
12
|
const newMeasurements = {};
|
|
13
13
|
for (const file of fileCollection) {
|
|
14
14
|
if (/(?:\.jdx|\.dx)$/i.test(file.name)) {
|
|
@@ -43,21 +43,16 @@ export async function jcampLoader(fileCollection, logs) {
|
|
|
43
43
|
meta: measurement.meta,
|
|
44
44
|
data: normalizeSpectra(measurement.spectra),
|
|
45
45
|
};
|
|
46
|
+
count++;
|
|
46
47
|
Object.assign(newMeasurement.info, measurement.info);
|
|
47
48
|
newMeasurements[kind]?.entries.push(newMeasurement);
|
|
48
49
|
}
|
|
49
50
|
}
|
|
50
51
|
}
|
|
51
52
|
catch (error) {
|
|
52
|
-
// send error to UI ?
|
|
53
53
|
if (error instanceof Error) {
|
|
54
|
-
if (
|
|
55
|
-
|
|
56
|
-
error,
|
|
57
|
-
parser: 'jcamp converter',
|
|
58
|
-
relativePath: file.relativePath,
|
|
59
|
-
message: 'error parsing jdx or dx file',
|
|
60
|
-
}));
|
|
54
|
+
if (logger) {
|
|
55
|
+
logger?.error(error);
|
|
61
56
|
}
|
|
62
57
|
else {
|
|
63
58
|
throw error;
|
|
@@ -66,6 +61,7 @@ export async function jcampLoader(fileCollection, logs) {
|
|
|
66
61
|
}
|
|
67
62
|
}
|
|
68
63
|
}
|
|
64
|
+
logger?.debug(`Loaded ${count} measurements with jcampLoader`);
|
|
69
65
|
return newMeasurements;
|
|
70
66
|
}
|
|
71
67
|
function normalizeSpectra(spectra) {
|
|
@@ -90,10 +86,11 @@ function normalizeSpectra(spectra) {
|
|
|
90
86
|
const variable = variables[key];
|
|
91
87
|
if (variable.label)
|
|
92
88
|
continue;
|
|
93
|
-
|
|
94
|
-
if (variable.units && !
|
|
95
|
-
|
|
89
|
+
let label = variable.name || variable.symbol || key;
|
|
90
|
+
if (variable.units && !label.includes(variable.units)) {
|
|
91
|
+
label += ` [${variable.units}]`;
|
|
96
92
|
}
|
|
93
|
+
variable.label = label;
|
|
97
94
|
}
|
|
98
95
|
}
|
|
99
96
|
data.push({ variables });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jcampLoader.js","sourceRoot":"","sources":["../../../src/app-data/loaders/jcampLoader.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"jcampLoader.js","sourceRoot":"","sources":["../../../src/app-data/loaders/jcampLoader.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,14 @@
|
|
|
1
|
+
import type { FifoLogger } from 'fifo-logger';
|
|
1
2
|
import type { FileCollection } from 'filelist-utils';
|
|
2
|
-
import {
|
|
3
|
+
import { Enhancers, Measurements } from '../index';
|
|
3
4
|
import { MeasurementsLoader } from './utility/measurementLoader';
|
|
4
5
|
import type { ParserLog } from './utility/parserLog';
|
|
5
6
|
export interface LoadOptions {
|
|
6
7
|
loaders?: MeasurementsLoader[];
|
|
7
8
|
enhancers?: Partial<Enhancers>;
|
|
8
|
-
logger?:
|
|
9
|
+
logger?: FifoLogger;
|
|
9
10
|
}
|
|
10
|
-
export declare function loadMeasurements(fileCollection: FileCollection, options
|
|
11
|
+
export declare function loadMeasurements(fileCollection: FileCollection, options: LoadOptions): Promise<{
|
|
11
12
|
measurements: Partial<Measurements>;
|
|
12
13
|
logs: ParserLog[];
|
|
13
14
|
}>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loadMeasurements.d.ts","sourceRoot":"","sources":["../../../src/app-data/loaders/loadMeasurements.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAGrD,OAAO,
|
|
1
|
+
{"version":3,"file":"loadMeasurements.d.ts","sourceRoot":"","sources":["../../../src/app-data/loaders/loadMeasurements.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAGrD,OAAO,EAAW,SAAS,EAAmB,YAAY,EAAE,MAAM,UAAU,CAAC;AAE7E,OAAO,EACL,kBAAkB,EAEnB,MAAM,6BAA6B,CAAC;AACrC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAErD,MAAM,WAAW,WAAW;IAC1B,OAAO,CAAC,EAAE,kBAAkB,EAAE,CAAC;IAC/B,SAAS,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IAC/B,MAAM,CAAC,EAAE,UAAU,CAAC;CACrB;AAED,wBAAsB,gBAAgB,CACpC,cAAc,EAAE,cAAc,EAC9B,OAAO,EAAE,WAAW;;;GAkBrB"}
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
import { xMinMaxValues } from 'ml-spectra-processing';
|
|
2
2
|
import { enhance } from '../index';
|
|
3
3
|
import { mergeMeasurements, } from './utility/measurementLoader';
|
|
4
|
-
export async function loadMeasurements(fileCollection, options
|
|
4
|
+
export async function loadMeasurements(fileCollection, options) {
|
|
5
5
|
const measurements = {};
|
|
6
6
|
const logs = [];
|
|
7
|
-
const { loaders = [], enhancers = {}, logger
|
|
7
|
+
const { loaders = [], enhancers = {}, logger } = options;
|
|
8
8
|
for (const loader of loaders) {
|
|
9
9
|
// TODO: load in parallel
|
|
10
10
|
// eslint-disable-next-line no-await-in-loop
|
|
11
|
-
const loaderData = await loader(fileCollection, logger
|
|
11
|
+
const loaderData = await loader(fileCollection, logger);
|
|
12
12
|
for (const { entries } of Object.values(loaderData)) {
|
|
13
13
|
for (const entry of entries) {
|
|
14
14
|
computeMinMax(entry);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loadMeasurements.js","sourceRoot":"","sources":["../../../src/app-data/loaders/loadMeasurements.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"loadMeasurements.js","sourceRoot":"","sources":["../../../src/app-data/loaders/loadMeasurements.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAEtD,OAAO,EAAE,OAAO,EAA4C,MAAM,UAAU,CAAC;AAE7E,OAAO,EAEL,iBAAiB,GAClB,MAAM,6BAA6B,CAAC;AASrC,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,cAA8B,EAC9B,OAAoB;IAEpB,MAAM,YAAY,GAA0B,EAAE,CAAC;IAC/C,MAAM,IAAI,GAAgB,EAAE,CAAC;IAC7B,MAAM,EAAE,OAAO,GAAG,EAAE,EAAE,SAAS,GAAG,EAAE,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACzD,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,yBAAyB;QACzB,4CAA4C;QAC5C,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;QACxD,KAAK,MAAM,EAAE,OAAO,EAAE,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;YACpD,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;gBAC5B,aAAa,CAAC,KAAK,CAAC,CAAC;YACvB,CAAC;QACH,CAAC;QACD,OAAO,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QAC/B,iBAAiB,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;IAC9C,CAAC;IACD,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;AAChC,CAAC;AAED,SAAS,aAAa,CAAC,WAA4B;IACjD,KAAK,MAAM,KAAK,IAAI,WAAW,CAAC,IAAI,EAAE,CAAC;QACrC,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC;YACtD,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC/B,qCAAqC;gBACrC,OAAO;YACT,CAAC;YACD,IAAI,QAAQ,CAAC,GAAG,KAAK,SAAS,IAAI,QAAQ,CAAC,GAAG,KAAK,SAAS,EAAE,CAAC;gBAC7D,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;gBAClD,QAAQ,CAAC,GAAG,GAAG,GAAG,CAAC;gBACnB,QAAQ,CAAC,GAAG,GAAG,GAAG,CAAC;YACrB,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
+
import type { FifoLogger } from 'fifo-logger';
|
|
1
2
|
import type { FileCollection } from 'filelist-utils';
|
|
2
|
-
import { Measurements
|
|
3
|
-
export declare function cary500Loader(fileCollection: FileCollection,
|
|
3
|
+
import { Measurements } from '../../../index';
|
|
4
|
+
export declare function cary500Loader(fileCollection: FileCollection, logger?: FifoLogger): Promise<Partial<Measurements>>;
|
|
4
5
|
//# sourceMappingURL=cary500Loader.d.ts.map
|