@insync-stageplayer/measurements 0.5.9 → 0.5.10
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/client/MeasurementDataClient.d.ts +2 -2
- package/lib/client/MeasurementDataClient.d.ts.map +1 -1
- package/lib/client/MeasurementDataClient.js +2 -2
- package/lib/client/MeasurementDataClient.js.map +1 -1
- package/lib/client/OnlineMeasurementDataClient.d.ts.map +1 -1
- package/lib/client/OnlineMeasurementDataClient.js +3 -10
- package/lib/client/OnlineMeasurementDataClient.js.map +1 -1
- package/lib/client/index.d.ts +0 -1
- package/lib/client/index.d.ts.map +1 -1
- package/lib/client/index.js +0 -1
- package/lib/client/index.js.map +1 -1
- package/lib/client/offline/offline.d.ts +1 -1
- package/lib/client/offline/offline.d.ts.map +1 -1
- package/lib/client/offline/offline.js +2 -5
- package/lib/client/offline/offline.js.map +1 -1
- package/lib/client/sbf.d.ts +2 -1
- package/lib/client/sbf.d.ts.map +1 -1
- package/lib/components/MeasurementsTable/CheckboxCell.d.ts +1 -1
- package/lib/components/MeasurementsTable/CheckboxCell.d.ts.map +1 -1
- package/lib/components/MeasurementsTable/CheckboxCell.js +3 -3
- package/lib/components/MeasurementsTable/CheckboxCell.js.map +1 -1
- package/lib/components/MeasurementsTable/ColorPicker.d.ts +1 -0
- package/lib/components/MeasurementsTable/ColorPicker.d.ts.map +1 -1
- package/lib/components/MeasurementsTable/ColumnSorting.d.ts.map +1 -1
- package/lib/components/MeasurementsTable/ColumnSorting.js +2 -1
- package/lib/components/MeasurementsTable/ColumnSorting.js.map +1 -1
- package/lib/components/MeasurementsTable/filters.d.ts +1 -0
- package/lib/components/MeasurementsTable/filters.d.ts.map +1 -1
- package/lib/components/MeasurementsTable/filters.js +1 -1
- package/lib/components/MeasurementsTable/filters.js.map +1 -1
- package/lib/hooks/useTimedMeasurementData.d.ts.map +1 -1
- package/lib/hooks/useTimedMeasurementData.js +7 -7
- package/lib/hooks/useTimedMeasurementData.js.map +1 -1
- package/lib/hooks/useWindowedMeasurementData.d.ts.map +1 -1
- package/lib/hooks/useWindowedMeasurementData.js +11 -8
- package/lib/hooks/useWindowedMeasurementData.js.map +1 -1
- package/lib/types.d.ts +0 -20
- package/lib/types.d.ts.map +1 -1
- package/lib/types.js.map +1 -1
- package/package.json +2 -2
- package/lib/client/signalviewer/SignalViewerDataClient.d.ts +0 -38
- package/lib/client/signalviewer/SignalViewerDataClient.d.ts.map +0 -1
- package/lib/client/signalviewer/SignalViewerDataClient.js +0 -164
- package/lib/client/signalviewer/SignalViewerDataClient.js.map +0 -1
- package/lib/client/signalviewer/SignalViewerDataClient.worker.d.ts +0 -74
- package/lib/client/signalviewer/SignalViewerDataClient.worker.d.ts.map +0 -1
- package/lib/client/signalviewer/SignalViewerDataClient.worker.js +0 -212
- package/lib/client/signalviewer/SignalViewerDataClient.worker.js.map +0 -1
|
@@ -13,7 +13,7 @@ export declare type FetchMeasurementDataArgs = {
|
|
|
13
13
|
/**
|
|
14
14
|
* Measurements to retrieve data for.
|
|
15
15
|
*/
|
|
16
|
-
measurements:
|
|
16
|
+
measurements: string[];
|
|
17
17
|
/**
|
|
18
18
|
* Time from where data is being retrieved
|
|
19
19
|
*/
|
|
@@ -43,7 +43,7 @@ export declare type CreateMeasurementDataObservableArgs = {
|
|
|
43
43
|
/**
|
|
44
44
|
* The measurements we want to retrieve a single row for.
|
|
45
45
|
*/
|
|
46
|
-
measurements:
|
|
46
|
+
measurements: string[];
|
|
47
47
|
/**
|
|
48
48
|
* The amount of rows we want
|
|
49
49
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MeasurementDataClient.d.ts","sourceRoot":"","sources":["../../src/client/MeasurementDataClient.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,UAAU,EAAM,MAAM,MAAM,CAAC;AAWtC,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAsB,MAAM,iBAAiB,CAAC;AAEjE,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAEzD,oBAAY,wBAAwB,GAAG;IACrC;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,YAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"MeasurementDataClient.d.ts","sourceRoot":"","sources":["../../src/client/MeasurementDataClient.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,UAAU,EAAM,MAAM,MAAM,CAAC;AAWtC,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAsB,MAAM,iBAAiB,CAAC;AAEjE,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAEzD,oBAAY,wBAAwB,GAAG;IACrC;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,IAAI,EAAE,OAAO,GAAG,OAAO,GAAG,SAAS,CAAC;CACrC,CAAC;AAEF,oBAAY,mCAAmC,GAAG;IAChD;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;IAC1B;;OAEG;IACH,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,GAAG,OAAO,GAAG,SAAS,CAAC;CACtC,CAAC;AAEF,oBAAY,cAAc,GAAG;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,oBAAY,2CAA2C,GAAG,IAAI,CAC5D,mCAAmC,EACnC,UAAU,CACX,GAAG;IACF;;OAEG;IACH,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,oBAAY,mBAAmB,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,GAAG;IACzD,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,oBAAY,qBAAqB,GAAG;IAClC,eAAe,EAAE,iBAAiB,CAAC,OAAO,CAAC;IAC3C,KAAK,EAAE,WAAW,CAAC;CACpB,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC;;OAEG;IACH,aAAa,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAAC;IAEhE,gBAAgB,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IAE9C,YAAY,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IAC1C;;OAEG;IACH,oBAAoB,EAAE,CACpB,IAAI,EAAE,wBAAwB,KAC3B,OAAO,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;IACxC;;OAEG;IACH,+BAA+B,EAAE,CAC/B,IAAI,EAAE,mCAAmC,KACtC,UAAU,CAAC,UAAU,CAAC,qBAAqB,CAAC,CAAC,CAAC;IACnD;;;;;;;;OAQG;IACH,uCAAuC,EAAE,CACvC,IAAI,EAAE,2CAA2C,KAC9C,UAAU,CAAC,UAAU,CAAC,qBAAqB,CAAC,CAAC,CAAC;CACpD;AAED;;;GAGG;AACH,8BAAsB,6BACpB,YAAW,qBAAqB;IAEhC,QAAQ,CAAC,oBAAoB,EAAE,qBAAqB,CAAC,sBAAsB,CAAC,CAAC;IAE7E,QAAQ,CAAC,aAAa,EAAE,qBAAqB,CAAC,eAAe,CAAC,CAAC;IAE/D,QAAQ,CAAC,gBAAgB,EAAE,qBAAqB,CAAC,kBAAkB,CAAC,CAAC;IAErE,QAAQ,CAAC,YAAY,EAAE,qBAAqB,CAAC,cAAc,CAAC,CAAC;IAE7D,+BAA+B,SACvB,mCAAmC,mDAqDzC;IAEF,uCAAuC,SAC/B,2CAA2C;yBAM5B,kBAAkB,OAAO;eACnC,WAAW;QAiEtB;CACH"}
|
|
@@ -12,7 +12,7 @@ import { debug } from "./debug";
|
|
|
12
12
|
export class AbstractMeasurementDataClient {
|
|
13
13
|
constructor() {
|
|
14
14
|
this.createMeasurementDataObservable = (args) => {
|
|
15
|
-
const { time$, file, measurements, rows, limit, unit } = args;
|
|
15
|
+
const { time$, file, measurements: measurementIds, rows, limit, unit, } = args;
|
|
16
16
|
const asyncSubject = createAsyncSubject();
|
|
17
17
|
const sub = time$
|
|
18
18
|
.pipe(tap(debug("time")), tap(() => {
|
|
@@ -23,7 +23,7 @@ export class AbstractMeasurementDataClient {
|
|
|
23
23
|
*/
|
|
24
24
|
exhaustMap((offset) => this.fetchMeasurementData({
|
|
25
25
|
file,
|
|
26
|
-
measurements,
|
|
26
|
+
measurements: measurementIds,
|
|
27
27
|
offset,
|
|
28
28
|
unit: unit || "MILLI",
|
|
29
29
|
rows,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MeasurementDataClient.js","sourceRoot":"","sources":["../../src/client/MeasurementDataClient.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAc,EAAE,EAAE,MAAM,MAAM,CAAC;AACtC,OAAO,EACL,GAAG,EACH,UAAU,EACV,UAAU,EACV,QAAQ,EACR,IAAI,EACJ,QAAQ,EAER,YAAY,GACb,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAc,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AA+HhC;;;GAGG;AACH,MAAM,OAAgB,6BAA6B;IAAnD;QAWE,oCAA+B,GAAG,CAChC,IAAyC,EACzC,EAAE;YACF,MAAM,
|
|
1
|
+
{"version":3,"file":"MeasurementDataClient.js","sourceRoot":"","sources":["../../src/client/MeasurementDataClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OnlineMeasurementDataClient.d.ts","sourceRoot":"","sources":["../../src/client/OnlineMeasurementDataClient.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,iBAAiB,EAAE,MAAM,IAAI,CAAC;AAEvC,OAAO,EACL,6BAA6B,EAC7B,wBAAwB,EACxB,mBAAmB,EACpB,MAAM,yBAAyB,CAAC;AAoCjC,aAAK,kCAAkC,GAAG;IACxC;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF;;;;;;;GAOG;AACH,qBAAa,2BAA4B,SAAQ,6BAA6B;IAC5E,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,YAAY,CAA4B;IAChD,OAAO,CAAC,YAAY,CAAuC;IAC3D,OAAO,CAAC,SAAS,CAAuC;IACxD,OAAO,CAAC,GAAG,CAAK;gBAEJ,EACV,WAAW,EACX,WAAW,GACZ,EAAE,kCAAkC;IAQrC;;OAEG;IACH,OAAO,KAAK,WAAW,GAiBtB;IAED;;;OAGG;IACH,OAAO,CAAC,MAAM;IAMd,aAAa,SAAgB,MAAM,oCAkEjC;IAEF,oBAAoB,SAAgB,wBAAwB,
|
|
1
|
+
{"version":3,"file":"OnlineMeasurementDataClient.d.ts","sourceRoot":"","sources":["../../src/client/OnlineMeasurementDataClient.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,iBAAiB,EAAE,MAAM,IAAI,CAAC;AAEvC,OAAO,EACL,6BAA6B,EAC7B,wBAAwB,EACxB,mBAAmB,EACpB,MAAM,yBAAyB,CAAC;AAoCjC,aAAK,kCAAkC,GAAG;IACxC;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF;;;;;;;GAOG;AACH,qBAAa,2BAA4B,SAAQ,6BAA6B;IAC5E,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,YAAY,CAA4B;IAChD,OAAO,CAAC,YAAY,CAAuC;IAC3D,OAAO,CAAC,SAAS,CAAuC;IACxD,OAAO,CAAC,GAAG,CAAK;gBAEJ,EACV,WAAW,EACX,WAAW,GACZ,EAAE,kCAAkC;IAQrC;;OAEG;IACH,OAAO,KAAK,WAAW,GAiBtB;IAED;;;OAGG;IACH,OAAO,CAAC,MAAM;IAMd,aAAa,SAAgB,MAAM,oCAkEjC;IAEF,oBAAoB,SAAgB,wBAAwB,wCAgC1D;IAEF,gBAAgB,SAAgB,GAAG,6CAyBjC;IAEF,YAAY,SAAgB,GAAG,kDAwB7B;IAEK,OAAO;CAWf"}
|
|
@@ -112,21 +112,14 @@ export class OnlineMeasurementDataClient extends AbstractMeasurementDataClient {
|
|
|
112
112
|
});
|
|
113
113
|
this.fetchMeasurementData = (args) => __awaiter(this, void 0, void 0, function* () {
|
|
114
114
|
// If this is a legacy measurement, use sbf api instead.
|
|
115
|
-
if (isSBF(args.file))
|
|
116
|
-
|
|
117
|
-
return measurement.index.join("/");
|
|
118
|
-
}) });
|
|
119
|
-
return sbf.fetchData(this.sbfEndpoint, options);
|
|
120
|
-
}
|
|
115
|
+
if (isSBF(args.file))
|
|
116
|
+
return sbf.fetchData(this.sbfEndpoint, args);
|
|
121
117
|
const id = this.nextId();
|
|
122
118
|
const observable$ = this.connection$.pipe(tap(debug("msg")), handleError(), matchingResponse(id), filter(MeasurementsTypes.isDataResponse), tap(debug("Retrieved data")), map((response) => response.data.measurements));
|
|
123
|
-
const convertedArgs = Object.assign(Object.assign({}, args), { measurements: args.measurements.map((m) => m.index.join("/")) });
|
|
124
119
|
this.connection$.next({
|
|
125
120
|
action: "data",
|
|
126
121
|
id,
|
|
127
|
-
params: {
|
|
128
|
-
convertedArgs,
|
|
129
|
-
},
|
|
122
|
+
params: Object.assign({}, args),
|
|
130
123
|
});
|
|
131
124
|
try {
|
|
132
125
|
return yield observable$.toPromise();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OnlineMeasurementDataClient.js","sourceRoot":"","sources":["../../src/client/OnlineMeasurementDataClient.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA;;GAEG;AACH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAgB,UAAU,EAAE,MAAM,MAAM,CAAC;AACpE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAC3E,OAAO,EAAE,SAAS,EAAoB,MAAM,gBAAgB,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,IAAI,CAAC;AACvC,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EACL,6BAA6B,GAG9B,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,GAAG,MAAM,OAAO,CAAC;AAE7B;;;;GAIG;AACH,MAAM,KAAK,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;AAEtE;;;GAGG;AACH,MAAM,WAAW,GAAG,GAAM,EAAE,CAC1B,SAAS,CAAC,CAAC,CAAI,EAAE,EAAE;IACjB,IAAI,iBAAiB,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE;QACxC,OAAO,UAAU,CACf,IAAI,KAAK,CACP,uBAAuB,CAAC,CAAC,IAAI,cAAc,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAClE,CACF,CAAC;KACH;IACD,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;AACf,CAAC,CAAC,CAAC;AAEL;;;GAGG;AACH,MAAM,gBAAgB,GAAG,CAAC,EAAU,EAAE,EAAE,CACtC,IAAI,CACF,MAAM,CAAC,iBAAiB,CAAC,UAAU,CAAC,EACpC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAC1B,CAAC;AAaJ;;;;;;;GAOG;AACH,MAAM,OAAO,2BAA4B,SAAQ,6BAA6B;IAQ5E,YAAY,EACV,WAAW,EACX,WAAW,GACwB;QACnC,KAAK,EAAE,CAAC;QARF,iBAAY,GAA6B,SAAS,CAAC;QACnD,cAAS,GAA6B,SAAS,CAAC;QAChD,QAAG,GAAG,CAAC,CAAC;QA6ChB,kBAAa,GAAG,CAAO,IAAY,EAAE,EAAE;YACrC,qDAAqD;YACrD,IAAI,KAAK,CAAC,IAAI,CAAC;gBAAE,OAAO,GAAG,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;YAEtE,iGAAiG;YACjG,MAAM,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;YAEzB,iHAAiH;YACjH,4DAA4D;YAC5D,MAAM,mBAAmB,GAAG,CAC1B,IAA6C,EAC7C,QAAQ,EAAc,EACC,EAAE;gBACzB,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;oBACjD,MAAM,QAAQ,GAAG,CAAC,GAAG,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;oBACxC,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE;wBAC1B,OAAO,CAAC,GAAG,GAAG,EAAE,GAAG,mBAAmB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;qBAC1D;oBAED,MAAM,EAAE,IAAI,KAAqB,KAAK,EAArB,WAAW,UAAK,KAAK,EAAhC,QAAwB,CAAQ,CAAC;oBAEvC,OAAO;wBACL,GAAG,GAAG;wDAED,WAAW,KACd,IAAI,EACJ,KAAK,EAAE,QAAQ;qBAElB,CAAC;gBACJ,CAAC,EAAE,EAA2B,CAAC,CAAC;gBAEhC,OAAO,MAAM,CAAC;YAChB,CAAC,CAAC;YAEF,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CACvC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EACjB,WAAW,EAAE,EACb,gBAAgB,CAAC,EAAE,CAAC,EACpB,GAAG,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC,EAChC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;gBACR,MAAM,EAAE,GAAG,CAAuC,CAAC;gBACnD,MAAM,SAAS,GAAG,mBAAmB,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBACxD,OAAO,SAAS,CAAC;YACnB,CAAC,CAAC,CACH,CAAC;YAEF,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;gBACpB,MAAM,EAAE,UAAU;gBAClB,EAAE;gBACF,MAAM,EAAE;oBACN,IAAI;iBACL;aACF,CAAC,CAAC;YAEH,IAAI;gBACF,OAAO,MAAM,WAAW,CAAC,SAAS,EAAE,CAAC;aACtC;YAAC,OAAO,GAAG,EAAE;gBACZ,IAAI,YAAY,GACd,sEAAsE,CAAC;gBACzE,IAAI,GAAG,YAAY,KAAK,EAAE;oBACxB,YAAY;wBACV,SAAS;4BACT,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;iBAC/D;gBACD,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;aAC/B;QACH,CAAC,CAAA,CAAC;QAEF,yBAAoB,GAAG,CAAO,IAA8B,EAAE,EAAE;YAC9D,wDAAwD;
|
|
1
|
+
{"version":3,"file":"OnlineMeasurementDataClient.js","sourceRoot":"","sources":["../../src/client/OnlineMeasurementDataClient.ts"],"names":[],"mappings":"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"}
|
package/lib/client/index.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/client/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAC;AACxC,cAAc,+BAA+B,CAAC
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/client/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAC;AACxC,cAAc,+BAA+B,CAAC"}
|
package/lib/client/index.js
CHANGED
package/lib/client/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/client/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAC;AACxC,cAAc,+BAA+B,CAAC
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/client/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAC;AACxC,cAAc,+BAA+B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"offline.d.ts","sourceRoot":"","sources":["../../../src/client/offline/offline.js"],"names":[],"mappings":"AA+BO,oCAFI,MAAM,gBAchB;AAeM,mCAHI,gBAAgB;;
|
|
1
|
+
{"version":3,"file":"offline.d.ts","sourceRoot":"","sources":["../../../src/client/offline/offline.js"],"names":[],"mappings":"AA+BO,oCAFI,MAAM,gBAchB;AAeM,mCAHI,gBAAgB;;GA6B1B;;;;;kBArCa,MAAM,EAAE;YACR,MAAM;WACN,MAAM;;;;UACN,MAAM"}
|
|
@@ -54,7 +54,7 @@ export const fetchMetadata = (path) => __awaiter(void 0, void 0, void 0, functio
|
|
|
54
54
|
});
|
|
55
55
|
/**
|
|
56
56
|
* @typedef {Object} FetchDataOptions
|
|
57
|
-
* @property {
|
|
57
|
+
* @property {string[]} measurements The measurement we're retrieving data for.
|
|
58
58
|
* @property {number} offset
|
|
59
59
|
* @property {number} limit
|
|
60
60
|
* @property {string} file The file we're retrieving data for.
|
|
@@ -66,10 +66,7 @@ export const fetchMetadata = (path) => __awaiter(void 0, void 0, void 0, functio
|
|
|
66
66
|
*/
|
|
67
67
|
export const fetchData = (options) => __awaiter(void 0, void 0, void 0, function* () {
|
|
68
68
|
const { measurements, offset, limit = 0, file, rows } = options, rest = __rest(options, ["measurements", "offset", "limit", "file", "rows"]);
|
|
69
|
-
const
|
|
70
|
-
measurement.index.join("/");
|
|
71
|
-
});
|
|
72
|
-
const libArgs = Object.assign(Object.assign({}, rest), { file: file.replace("file://", ""), streams: measurementIds.map((id) => ({ id })), resolution: rows === 1 ? undefined : rows, start: offset / 1000,
|
|
69
|
+
const libArgs = Object.assign(Object.assign({}, rest), { file: file.replace("file://", ""), streams: measurements.map((id) => ({ id })), resolution: rows === 1 ? undefined : rows, start: offset / 1000,
|
|
73
70
|
// sbfreader doesn't like limit of 0.
|
|
74
71
|
end: (offset + (limit <= 0 ? 1000000 : limit)) / 1000 });
|
|
75
72
|
return getReader()
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"offline.js","sourceRoot":"","sources":["../../../src/client/offline/offline.js"],"names":[],"mappings":"AAAA;;;;GAIG;;;;;;;;;;;;;;;;;;;;;AAEH,8EAA8E;AAC9E,MAAM,SAAS,GAAG,CAAC,GAAG,EAAE;IACtB,IAAI,MAAM,CAAC;IACX,IAAI,KAAK,CAAC;IACV,IAAI;QACF,0CAA0C;QAC1C,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;KAC/B;IAAC,OAAO,GAAG,EAAE;QACZ,KAAK,GAAG,IAAI,KAAK,CACf,wEAAwE,CACzE,CAAC;KACH;IAED,OAAO,GAAG,EAAE;QACV,IAAI,KAAK,EAAE;YACT,MAAM,KAAK,CAAC;SACb;QACD,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC;AACJ,CAAC,CAAC,EAAE,CAAC;AAEL;;;GAGG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAO,IAAI,EAAE,EAAE;IAC1C,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;IAC9C,MAAM,QAAQ,GAAG,MAAM,SAAS,EAAE,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IAC1D,MAAM,EAAE,QAAQ,GAAG,EAAE,EAAE,GAAG,QAAQ,CAAC;IAEnC,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iCAC9B,CAAC,KACJ,EAAE,EAAE,CAAC,CAAC,IAAI,EACV,IAAI,EAAE,CAAC,CAAC,IAAI,EACZ,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,IACzB,CAAC,CAAC;IACJ,OAAO,MAAM,CAAC;AAChB,CAAC,CAAA,CAAC;AAEF;;;;;;GAMG;AAEH;;;;GAIG;AACH,MAAM,CAAC,MAAM,SAAS,GAAG,CAAO,OAAO,EAAE,EAAE;IACzC,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,KAAK,GAAG,CAAC,EAAE,IAAI,EAAE,IAAI,KAAc,OAAO,EAAhB,IAAI,UAAK,OAAO,EAAlE,mDAAwD,CAAU,CAAC;IAEzE,MAAM,
|
|
1
|
+
{"version":3,"file":"offline.js","sourceRoot":"","sources":["../../../src/client/offline/offline.js"],"names":[],"mappings":"AAAA;;;;GAIG;;;;;;;;;;;;;;;;;;;;;AAEH,8EAA8E;AAC9E,MAAM,SAAS,GAAG,CAAC,GAAG,EAAE;IACtB,IAAI,MAAM,CAAC;IACX,IAAI,KAAK,CAAC;IACV,IAAI;QACF,0CAA0C;QAC1C,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;KAC/B;IAAC,OAAO,GAAG,EAAE;QACZ,KAAK,GAAG,IAAI,KAAK,CACf,wEAAwE,CACzE,CAAC;KACH;IAED,OAAO,GAAG,EAAE;QACV,IAAI,KAAK,EAAE;YACT,MAAM,KAAK,CAAC;SACb;QACD,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC;AACJ,CAAC,CAAC,EAAE,CAAC;AAEL;;;GAGG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAO,IAAI,EAAE,EAAE;IAC1C,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;IAC9C,MAAM,QAAQ,GAAG,MAAM,SAAS,EAAE,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;IAC1D,MAAM,EAAE,QAAQ,GAAG,EAAE,EAAE,GAAG,QAAQ,CAAC;IAEnC,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iCAC9B,CAAC,KACJ,EAAE,EAAE,CAAC,CAAC,IAAI,EACV,IAAI,EAAE,CAAC,CAAC,IAAI,EACZ,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,IACzB,CAAC,CAAC;IACJ,OAAO,MAAM,CAAC;AAChB,CAAC,CAAA,CAAC;AAEF;;;;;;GAMG;AAEH;;;;GAIG;AACH,MAAM,CAAC,MAAM,SAAS,GAAG,CAAO,OAAO,EAAE,EAAE;IACzC,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,KAAK,GAAG,CAAC,EAAE,IAAI,EAAE,IAAI,KAAc,OAAO,EAAhB,IAAI,UAAK,OAAO,EAAlE,mDAAwD,CAAU,CAAC;IAEzE,MAAM,OAAO,mCACR,IAAI,KACP,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,EACjC,OAAO,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAC3C,UAAU,EAAE,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,EACzC,KAAK,EAAE,MAAM,GAAG,IAAI;QACpB,qCAAqC;QACrC,GAAG,EAAE,CAAC,MAAM,GAAG,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,IAAI,GACtD,CAAC;IAEF,OAAO,SAAS,EAAE;SACf,OAAO,CAAC,OAAO,CAAC;SAChB,IAAI,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE;QACpB,OAAO,OAAO,CAAC,MAAM,CACnB,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,iCACpB,GAAG,KACN,CAAC,IAAI,CAAC,EAAE,IAAI;iBACT,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;iBACvB,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAC9C,EACF,EAAE,CACH,CAAC;IACJ,CAAC,CAAC,CAAC;AACP,CAAC,CAAA,CAAC"}
|
package/lib/client/sbf.d.ts
CHANGED
|
@@ -18,7 +18,7 @@ export declare const fetchDataMetadata: (endpoint: string, file: string) => Prom
|
|
|
18
18
|
file: string;
|
|
19
19
|
id: string;
|
|
20
20
|
}[]>;
|
|
21
|
-
|
|
21
|
+
declare type FetchDataOptions = {
|
|
22
22
|
file: string;
|
|
23
23
|
offset: number;
|
|
24
24
|
limit?: number;
|
|
@@ -33,4 +33,5 @@ export declare type FetchDataOptions = {
|
|
|
33
33
|
* @returns
|
|
34
34
|
*/
|
|
35
35
|
export declare const fetchData: (endpoint: string, options: FetchDataOptions) => Promise<MeasurementsTypes.DataMap>;
|
|
36
|
+
export {};
|
|
36
37
|
//# sourceMappingURL=sbf.d.ts.map
|
package/lib/client/sbf.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sbf.d.ts","sourceRoot":"","sources":["../../src/client/sbf.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAsC7C;;;;;;GAMG;AACH,eAAO,MAAM,iBAAiB,aAAoB,MAAM,QAAQ,MAAM;UApC9D,MAAM;WACL,MAAM,EAAE;UACT,MAAM;SACP,MAAM;SACN,MAAM;kBACG,MAAM;eACT,MAAM;eACN,MAAM;;;IAwDlB,CAAC;AAEF,
|
|
1
|
+
{"version":3,"file":"sbf.d.ts","sourceRoot":"","sources":["../../src/client/sbf.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAsC7C;;;;;;GAMG;AACH,eAAO,MAAM,iBAAiB,aAAoB,MAAM,QAAQ,MAAM;UApC9D,MAAM;WACL,MAAM,EAAE;UACT,MAAM;SACP,MAAM;SACN,MAAM;kBACG,MAAM;eACT,MAAM;eACN,MAAM;;;IAwDlB,CAAC;AAEF,aAAK,gBAAgB,GAAG;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,CAAC;AASF;;;;;;GAMG;AACH,eAAO,MAAM,SAAS,aACV,MAAM,WACP,gBAAgB,uCAiD1B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CheckboxCell.d.ts","sourceRoot":"","sources":["../../../src/components/MeasurementsTable/CheckboxCell.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAqB,MAAM,OAAO,CAAC;AAG1C,aAAK,iBAAiB,GAAG;IACvB;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IACX,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,aAAK,sBAAsB,GAAG;IAC5B;;OAEG;IACH,
|
|
1
|
+
{"version":3,"file":"CheckboxCell.d.ts","sourceRoot":"","sources":["../../../src/components/MeasurementsTable/CheckboxCell.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAqB,MAAM,OAAO,CAAC;AAG1C,aAAK,iBAAiB,GAAG;IACvB;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IACX,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,aAAK,sBAAsB,GAAG;IAC5B;;OAEG;IACH,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAapD,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,iBAAiB,EAAE,KAAK,CAAC,EAAE,CAAC,sBAAsB,CAW9D,CAAC"}
|
|
@@ -22,8 +22,8 @@ export const CheckboxCell = ({ id, rowToDisable, }) => {
|
|
|
22
22
|
* @param props
|
|
23
23
|
* @returns
|
|
24
24
|
*/
|
|
25
|
-
export const YAxisCheckboxCell = ({
|
|
26
|
-
const {
|
|
27
|
-
return (React.createElement("input", { type: "checkbox", checked:
|
|
25
|
+
export const YAxisCheckboxCell = ({ yaxisLeftPos, }) => {
|
|
26
|
+
const { selected } = useContext(SelectedContext);
|
|
27
|
+
return (React.createElement("input", { type: "checkbox", checked: selected.indexOf(yaxisLeftPos) !== -1, onChange: () => { } }));
|
|
28
28
|
};
|
|
29
29
|
//# sourceMappingURL=CheckboxCell.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CheckboxCell.js","sourceRoot":"","sources":["../../../src/components/MeasurementsTable/CheckboxCell.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAiBpD;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,YAAY,GAAgC,CAAC,EACxD,EAAE,EACF,YAAY,GACb,EAAE,EAAE;IACH,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,eAAe,CAAC,CAAC;IACzD,OAAO,CACL,+BACE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,EACnC,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EACpC,QAAQ,EAAE,GAAG,EAAE,GAAE,CAAC,EAClB,QAAQ,EAAE,YAAY,GACtB,CACH,CAAC;AACJ,CAAC,CAAC;AAEF;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAqC,CAAC,
|
|
1
|
+
{"version":3,"file":"CheckboxCell.js","sourceRoot":"","sources":["../../../src/components/MeasurementsTable/CheckboxCell.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAiBpD;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,YAAY,GAAgC,CAAC,EACxD,EAAE,EACF,YAAY,GACb,EAAE,EAAE;IACH,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,eAAe,CAAC,CAAC;IACzD,OAAO,CACL,+BACE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,EACnC,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EACpC,QAAQ,EAAE,GAAG,EAAE,GAAE,CAAC,EAClB,QAAQ,EAAE,YAAY,GACtB,CACH,CAAC;AACJ,CAAC,CAAC;AAEF;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAqC,CAAC,EAClE,YAAY,GACb,EAAE,EAAE;IACH,MAAM,EAAE,QAAQ,EAAE,GAAG,UAAU,CAAC,eAAe,CAAC,CAAC;IACjD,OAAO,CACL,+BACE,IAAI,EAAE,UAAU,EAChB,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,EAC9C,QAAQ,EAAE,GAAG,EAAE,GAAE,CAAC,GAClB,CACH,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ColorPicker.d.ts","sourceRoot":"","sources":["../../../src/components/MeasurementsTable/ColorPicker.tsx"],"names":[],"mappings":"AAMA,QAAA,MAAM,WAAW,UAAW,GAAG,gBAM9B,CAAC;AAEF,eAAe,WAAW,CAAC"}
|
|
1
|
+
{"version":3,"file":"ColorPicker.d.ts","sourceRoot":"","sources":["../../../src/components/MeasurementsTable/ColorPicker.tsx"],"names":[],"mappings":";AAMA,QAAA,MAAM,WAAW,UAAW,GAAG,gBAM9B,CAAC;AAEF,eAAe,WAAW,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ColumnSorting.d.ts","sourceRoot":"","sources":["../../../src/components/MeasurementsTable/ColumnSorting.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAEhD,aAAK,kBAAkB,GAAG;IACxB,MAAM,EAAE,WAAW,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;CACpD,CAAC;
|
|
1
|
+
{"version":3,"file":"ColumnSorting.d.ts","sourceRoot":"","sources":["../../../src/components/MeasurementsTable/ColumnSorting.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAEhD,aAAK,kBAAkB,GAAG;IACxB,MAAM,EAAE,WAAW,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;CACpD,CAAC;AAOF;;;;GAIG;AACH,eAAO,MAAM,aAAa,UAAW,kBAAkB,uBAGtD,CAAC"}
|
|
@@ -5,6 +5,7 @@ import React from "react";
|
|
|
5
5
|
* @returns
|
|
6
6
|
*/
|
|
7
7
|
export const ColumnSorting = (props) => {
|
|
8
|
-
|
|
8
|
+
const { isSorted, isSortedDesc } = props.column;
|
|
9
|
+
return isSorted ? React.createElement("span", null, isSortedDesc ? ` ↓` : ` ↑`) : null;
|
|
9
10
|
};
|
|
10
11
|
//# sourceMappingURL=ColumnSorting.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ColumnSorting.js","sourceRoot":"","sources":["../../../src/components/MeasurementsTable/ColumnSorting.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"ColumnSorting.js","sourceRoot":"","sources":["../../../src/components/MeasurementsTable/ColumnSorting.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAa1B;;;;GAIG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,KAAyB,EAAE,EAAE;IACzD,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,KAAK,CAAC,MAA+B,CAAC;IACzE,OAAO,QAAQ,CAAC,CAAC,CAAC,kCAAO,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAQ,CAAC,CAAC,CAAC,IAAI,CAAC;AACrE,CAAC,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
import { FilterValue, IdType, Row } from "react-table";
|
|
2
|
+
export declare function textMatcher<T extends object>(match: string, id: IdType<T>): (row: Row<T>) => boolean;
|
|
2
3
|
export declare function textFilter<T extends object>(rows: Array<Row<T>>, id: IdType<T>, filterValue: FilterValue): Row<T>[];
|
|
3
4
|
//# sourceMappingURL=filters.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filters.d.ts","sourceRoot":"","sources":["../../../src/components/MeasurementsTable/filters.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"filters.d.ts","sourceRoot":"","sources":["../../../src/components/MeasurementsTable/filters.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAEvD,wBAAgB,WAAW,CAAC,CAAC,SAAS,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC,SAC3D,IAAI,CAAC,CAAC,aAIpB;AAED,wBAAgB,UAAU,CAAC,CAAC,SAAS,MAAM,EACzC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EACnB,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC,EACb,WAAW,EAAE,WAAW,YAGzB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filters.js","sourceRoot":"","sources":["../../../src/components/MeasurementsTable/filters.ts"],"names":[],"mappings":"AAEA,
|
|
1
|
+
{"version":3,"file":"filters.js","sourceRoot":"","sources":["../../../src/components/MeasurementsTable/filters.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,WAAW,CAAmB,KAAa,EAAE,EAAa;IACxE,OAAO,CAAC,GAAW,EAAE,EAAE;QACrB,MAAM,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QAC9B,OAAO,GAAG,GAAG,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;IACtD,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,UAAU,CACxB,IAAmB,EACnB,EAAa,EACb,WAAwB;IAExB,OAAO,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC;AACnD,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useTimedMeasurementData.d.ts","sourceRoot":"","sources":["../../src/hooks/useTimedMeasurementData.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAE7C,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAIzD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,mCAAmC,EAAE,MAAM,WAAW,CAAC;AAKhE;;GAEG;AACH,oBAAY,8BAA8B,GAAG,IAAI,CAC/C,mCAAmC,EACnC,MAAM,GAAG,OAAO,CACjB,GAAG;IACF;;OAEG;IACH,KAAK,EAAE,KAAK,CAAC;CACd,CAAC;AAEF,aAAK,UAAU,GAAG;IAChB,eAAe,EAAE,iBAAiB,CAAC,OAAO,CAAC;IAC3C,KAAK,EAAE,WAAW,CAAC;CACpB,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,uBAAuB,YACzB,8BAA8B,
|
|
1
|
+
{"version":3,"file":"useTimedMeasurementData.d.ts","sourceRoot":"","sources":["../../src/hooks/useTimedMeasurementData.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAE7C,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAIzD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,mCAAmC,EAAE,MAAM,WAAW,CAAC;AAKhE;;GAEG;AACH,oBAAY,8BAA8B,GAAG,IAAI,CAC/C,mCAAmC,EACnC,MAAM,GAAG,OAAO,CACjB,GAAG;IACF;;OAEG;IACH,KAAK,EAAE,KAAK,CAAC;CACd,CAAC;AAEF,aAAK,UAAU,GAAG;IAChB,eAAe,EAAE,iBAAiB,CAAC,OAAO,CAAC;IAC3C,KAAK,EAAE,WAAW,CAAC;CACpB,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,uBAAuB,YACzB,8BAA8B,2BAmKxC,CAAC"}
|
|
@@ -12,7 +12,7 @@ import { useMeasurementsModule } from "./useMeasurementsModule";
|
|
|
12
12
|
*/
|
|
13
13
|
export const useTimedMeasurementData = (options) => {
|
|
14
14
|
const { client, selector } = useMeasurementsModule();
|
|
15
|
-
const { rows, measurements, limit, timer, unit } = options;
|
|
15
|
+
const { rows, measurements: measurementIds, limit, timer, unit } = options;
|
|
16
16
|
/**
|
|
17
17
|
* Create a map with files, we need these to get the start time of a file. So that we can create a timer with an offset.
|
|
18
18
|
*/
|
|
@@ -25,23 +25,23 @@ export const useTimedMeasurementData = (options) => {
|
|
|
25
25
|
*/
|
|
26
26
|
const measurementScale = useSelector((s) => selector(s).measurementScale);
|
|
27
27
|
const dataScale = useSelector((s) => selector(s).dataScale);
|
|
28
|
-
const { measurements
|
|
28
|
+
const { measurements, loading, didInvalidate } = useMeasurements();
|
|
29
29
|
const [state, setState] = useState({
|
|
30
30
|
loading: false,
|
|
31
31
|
});
|
|
32
32
|
useEffect(() => {
|
|
33
33
|
if (loading || didInvalidate)
|
|
34
34
|
return;
|
|
35
|
-
const observable$ = from(
|
|
35
|
+
const observable$ = from(measurements).pipe(filter((m) => measurementIds.indexOf(m.id) !== -1),
|
|
36
36
|
// Request are on a per file basis.
|
|
37
|
-
groupBy((m) => m.file), switchMap((grouped) => grouped.pipe(toArray(), switchMap((
|
|
37
|
+
groupBy((m) => m.file), switchMap((grouped) => grouped.pipe(toArray(), switchMap((measurements) => {
|
|
38
38
|
//
|
|
39
39
|
// The measurements in the app have an ID like (ROOT:/32322/WAVE) that
|
|
40
40
|
// is incompatible with the IDs of the API (just WAVE). So we keep track of a map
|
|
41
41
|
// that contains the mapping from the IDs used by the API to the ones used in the
|
|
42
42
|
// app so we can map them back later.
|
|
43
43
|
//
|
|
44
|
-
const nameIdMap =
|
|
44
|
+
const nameIdMap = measurements.reduce((acc, c) => {
|
|
45
45
|
return Object.assign(Object.assign({}, acc), { [c.name]: c.id });
|
|
46
46
|
}, {});
|
|
47
47
|
// Retrieve the file in which theses measurements are stored.
|
|
@@ -57,7 +57,7 @@ export const useTimedMeasurementData = (options) => {
|
|
|
57
57
|
.createMeasurementDataObservable({
|
|
58
58
|
rows,
|
|
59
59
|
limit,
|
|
60
|
-
measurements,
|
|
60
|
+
measurements: measurements.map((m) => m.index.join("/")),
|
|
61
61
|
time$,
|
|
62
62
|
unit,
|
|
63
63
|
file: grouped.key,
|
|
@@ -109,8 +109,8 @@ export const useTimedMeasurementData = (options) => {
|
|
|
109
109
|
};
|
|
110
110
|
}, [
|
|
111
111
|
measurements,
|
|
112
|
-
allMeasurements,
|
|
113
112
|
client,
|
|
113
|
+
measurementIds,
|
|
114
114
|
rows,
|
|
115
115
|
limit,
|
|
116
116
|
filesById,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useTimedMeasurementData.js","sourceRoot":"","sources":["../../src/hooks/useTimedMeasurementData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAErD,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAIhF,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAG5B,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAoBhE;;;;;GAKG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAG,CACrC,OAAuC,EACvC,EAAE;IACF,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,qBAAqB,EAAE,CAAC;IACrD,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"useTimedMeasurementData.js","sourceRoot":"","sources":["../../src/hooks/useTimedMeasurementData.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useWindowedMeasurementData.d.ts","sourceRoot":"","sources":["../../src/hooks/useWindowedMeasurementData.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,2CAA2C,EAAE,MAAM,WAAW,CAAC;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAG7C,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAGzD,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AAGjD;;GAEG;AACH,oBAAY,iCAAiC,GAAG,IAAI,CAClD,2CAA2C,EAC3C,MAAM,GAAG,OAAO,CACjB,GAAG;IACF;;OAEG;IACH,KAAK,EAAE,KAAK,CAAC;CACd,CAAC;AAEF,aAAK,UAAU,GAAG;IAChB,eAAe,EAAE,iBAAiB,CAAC,OAAO,CAAC;IAC3C,KAAK,EAAE,WAAW,CAAC;CACpB,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,0BAA0B,YAC5B,iCAAiC,
|
|
1
|
+
{"version":3,"file":"useWindowedMeasurementData.d.ts","sourceRoot":"","sources":["../../src/hooks/useWindowedMeasurementData.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,2CAA2C,EAAE,MAAM,WAAW,CAAC;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAG7C,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAGzD,OAAO,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AAGjD;;GAEG;AACH,oBAAY,iCAAiC,GAAG,IAAI,CAClD,2CAA2C,EAC3C,MAAM,GAAG,OAAO,CACjB,GAAG;IACF;;OAEG;IACH,KAAK,EAAE,KAAK,CAAC;CACd,CAAC;AAEF,aAAK,UAAU,GAAG;IAChB,eAAe,EAAE,iBAAiB,CAAC,OAAO,CAAC;IAC3C,KAAK,EAAE,WAAW,CAAC;CACpB,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,0BAA0B,YAC5B,iCAAiC,2BAyK3C,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { useEffect, useState, useMemo } from "react";
|
|
2
2
|
import { useMeasurements } from "./useMeasurements";
|
|
3
3
|
import { from } from "rxjs";
|
|
4
|
-
import { map, groupBy, switchMap, toArray, scan } from "rxjs/operators";
|
|
4
|
+
import { map, filter, groupBy, switchMap, toArray, scan } from "rxjs/operators";
|
|
5
5
|
import { useSelector } from "react-redux";
|
|
6
6
|
import { useMeasurementsModule } from "./useMeasurementsModule";
|
|
7
7
|
/**
|
|
@@ -10,13 +10,13 @@ import { useMeasurementsModule } from "./useMeasurementsModule";
|
|
|
10
10
|
* @returns
|
|
11
11
|
*/
|
|
12
12
|
export const useWindowedMeasurementData = (options) => {
|
|
13
|
-
const { rows, measurements, visibleWindow, unit, timer } = options;
|
|
13
|
+
const { rows, measurements: measurementIds, visibleWindow, unit, timer, } = options;
|
|
14
14
|
const { client, selector } = useMeasurementsModule();
|
|
15
15
|
// The timer will give back timestamps in "realtime" in microseconds, so for example: 1500635719101123 (Fri Jul 21 2017 13:15:19 GMT+0200 (Central European Summer Time) {}).
|
|
16
16
|
// We will need to use the measurement scale and the start of the measurementfiles to calculate the offset time for a given measurement.
|
|
17
17
|
const measurementScale = useSelector((s) => selector(s).measurementScale);
|
|
18
18
|
const dataScale = useSelector((s) => selector(s).dataScale);
|
|
19
|
-
const { measurements
|
|
19
|
+
const { measurements } = useMeasurements();
|
|
20
20
|
const [state, setState] = useState({
|
|
21
21
|
loading: false,
|
|
22
22
|
});
|
|
@@ -28,7 +28,10 @@ export const useWindowedMeasurementData = (options) => {
|
|
|
28
28
|
return files.reduce((acc, c) => (Object.assign(Object.assign({}, acc), { [c.path]: c })), {});
|
|
29
29
|
}, [files]);
|
|
30
30
|
useEffect(() => {
|
|
31
|
-
const observable$ = from(measurements).pipe(
|
|
31
|
+
const observable$ = from(measurements).pipe(filter((m) => measurementIds.indexOf(m.id) !== -1),
|
|
32
|
+
// Request are on a per file basis.
|
|
33
|
+
groupBy((m) => m.file), switchMap((grouped) => grouped.pipe(toArray(), switchMap((measurements) => {
|
|
34
|
+
var _a, _b;
|
|
32
35
|
//
|
|
33
36
|
// The measurements in the app have an ID like (ROOT:/32322/WAVE) that
|
|
34
37
|
// is incompatible with the IDs of the API (just WAVE). So we keep track of a map
|
|
@@ -39,8 +42,8 @@ export const useWindowedMeasurementData = (options) => {
|
|
|
39
42
|
return Object.assign(Object.assign({}, acc), { [c.name]: c.id });
|
|
40
43
|
}, {});
|
|
41
44
|
// Retrieve the file in which theses measurements are stored.
|
|
42
|
-
const fileObj = filesById[grouped.key];
|
|
43
|
-
const start = fileObj.timing.start;
|
|
45
|
+
const fileObj = filesById[grouped === null || grouped === void 0 ? void 0 : grouped.key];
|
|
46
|
+
const start = (_b = (_a = fileObj === null || fileObj === void 0 ? void 0 : fileObj.timing) === null || _a === void 0 ? void 0 : _a.start) !== null && _b !== void 0 ? _b : 0;
|
|
44
47
|
// We'll map the timer to have an offset and for the time to be scaled using the measurement scale.
|
|
45
48
|
const time$ = timer.state.pipe(map((timerState) => {
|
|
46
49
|
const offsetTime = timerState.time - start;
|
|
@@ -51,7 +54,7 @@ export const useWindowedMeasurementData = (options) => {
|
|
|
51
54
|
.createWindowedMeasurementDataObservable({
|
|
52
55
|
rows,
|
|
53
56
|
visibleWindow,
|
|
54
|
-
measurements,
|
|
57
|
+
measurements: measurements.map((m) => m.index.join("/")),
|
|
55
58
|
// times are on a per-file basis, so this will use the offset of the file
|
|
56
59
|
time$,
|
|
57
60
|
file: grouped.key,
|
|
@@ -104,8 +107,8 @@ export const useWindowedMeasurementData = (options) => {
|
|
|
104
107
|
};
|
|
105
108
|
}, [
|
|
106
109
|
client,
|
|
110
|
+
measurementIds,
|
|
107
111
|
measurements,
|
|
108
|
-
allMeasurements,
|
|
109
112
|
options,
|
|
110
113
|
rows,
|
|
111
114
|
visibleWindow,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useWindowedMeasurementData.js","sourceRoot":"","sources":["../../src/hooks/useWindowedMeasurementData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAIpD,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,GAAG,
|
|
1
|
+
{"version":3,"file":"useWindowedMeasurementData.js","sourceRoot":"","sources":["../../src/hooks/useWindowedMeasurementData.ts"],"names":[],"mappings":"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"}
|
package/lib/types.d.ts
CHANGED
|
@@ -18,11 +18,6 @@ export declare module MeasurementsTypes {
|
|
|
18
18
|
};
|
|
19
19
|
};
|
|
20
20
|
dataScale: number;
|
|
21
|
-
sampleRate: number;
|
|
22
|
-
minX: number;
|
|
23
|
-
minY: number;
|
|
24
|
-
maxX: number;
|
|
25
|
-
maxY: number;
|
|
26
21
|
};
|
|
27
22
|
type Request = {
|
|
28
23
|
action: string;
|
|
@@ -47,26 +42,12 @@ export declare module MeasurementsTypes {
|
|
|
47
42
|
type MetadataResponseMeasurement = {
|
|
48
43
|
type: "measurement";
|
|
49
44
|
} & Pick<Measurement, "name" | "min" | "max" | "yaxisLeftPos" | "unit" | "frequency" | "dataScale">;
|
|
50
|
-
type MetadataResponseSignal = Pick<Measurement, "name" | "min" | "max" | "yaxisLeftPos" | "unit" | "frequency" | "dataScale" | "sampleRate" | "minX" | "minY" | "maxX" | "maxY">;
|
|
51
|
-
type MetadataResponseGroups = {
|
|
52
|
-
groups: MetadataResponseGrp[];
|
|
53
|
-
};
|
|
54
45
|
type MetadataResponseGroup = {
|
|
55
46
|
type: "group";
|
|
56
47
|
name: string;
|
|
57
48
|
children: MetadataResponseNode[];
|
|
58
49
|
};
|
|
59
|
-
type MetadataResponseGrp = {
|
|
60
|
-
groupID: string;
|
|
61
|
-
name: string;
|
|
62
|
-
sampleRate: number;
|
|
63
|
-
dataScale: number;
|
|
64
|
-
signals: MetadataResponseSignal[];
|
|
65
|
-
};
|
|
66
50
|
type MetadataResponseNode = MetadataResponseMeasurement | MetadataResponseGroup;
|
|
67
|
-
type MetadataResponseDat = {
|
|
68
|
-
metadata: MetadataResponseGroups;
|
|
69
|
-
};
|
|
70
51
|
type MetadataResponseData = {
|
|
71
52
|
metadata: MetadataResponseGroup;
|
|
72
53
|
};
|
|
@@ -76,7 +57,6 @@ export declare module MeasurementsTypes {
|
|
|
76
57
|
};
|
|
77
58
|
};
|
|
78
59
|
type DataResponse = Response<DataResponseData>;
|
|
79
|
-
type MetadataRespons = Response<MetadataResponseDat>;
|
|
80
60
|
type MetadataResponse = Response<MetadataResponseData>;
|
|
81
61
|
type ErrorResponse = Response<ErrorResponseData>;
|
|
82
62
|
type DataMap = {
|
package/lib/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,sBAAc,iBAAiB,CAAC;IAC9B,KAAY,WAAW,GAAG;QACxB,EAAE,EAAE,MAAM,CAAC;QACX,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,EAAE,MAAM,CAAC;QAClB,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,GAAG,EAAE,MAAM,CAAC;QACZ,GAAG,EAAE,MAAM,CAAC;QACZ,YAAY,EAAE,MAAM,CAAC;QACrB,KAAK,EAAE,MAAM,EAAE,CAAC;QAChB,KAAK,EAAE,MAAM,CAAC;QACd,GAAG,EAAE,MAAM,CAAC;QACZ,kBAAkB,CAAC,EAAE;YACnB,IAAI,EAAE;gBACJ,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;aACvB,CAAC;SACH,CAAC;QACF,SAAS,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
|
package/lib/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,KAAQ,iBAAiB,
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,KAAQ,iBAAiB,CA2I9B;AA3ID,WAAc,iBAAiB;IA4E7B,SAAgB,QAAQ,CAAC,KAAc;QACrC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,CAAC;IACrD,CAAC;IAFe,0BAAQ,WAEvB,CAAA;IAED,SAAgB,UAAU,CACxB,KAAc;QAEd,MAAM,MAAM,GAAG,KAAY,CAAC;QAC5B,OAAO,CACL,QAAQ,CAAC,MAAM,CAAC;YAChB,MAAM,CAAC,IAAI,KAAK,SAAS;YACzB,OAAO,MAAM,CAAC,EAAE,KAAK,QAAQ,CAC9B,CAAC;IACJ,CAAC;IATe,4BAAU,aASzB,CAAA;IAED,SAAgB,eAAe,CAAC,KAAc;;QAC5C,MAAM,MAAM,GAAG,KAAY,CAAC;QAC5B,OAAO,CACL,QAAQ,CAAC,MAAM,CAAC;aAChB,MAAA,MAAM,CAAC,IAAI,0CAAE,KAAK,CAAA;YAClB,OAAO,CAAA,MAAA,MAAM,CAAC,IAAI,0CAAE,KAAK,CAAC,OAAO,CAAA,KAAK,QAAQ,CAC/C,CAAC;IACJ,CAAC;IAPe,iCAAe,kBAO9B,CAAA;IAED,SAAgB,cAAc,CAAC,KAAc;;QAC3C,MAAM,MAAM,GAAG,KAAY,CAAC;QAC5B,OAAO,CACL,QAAQ,CAAC,MAAM,CAAC;YAChB,OAAO,CAAA,MAAA,MAAM,CAAC,IAAI,0CAAE,YAAY,CAAA,KAAK,QAAQ;YAC7C,OAAO,CAAA,MAAA,MAAM,CAAC,IAAI,0CAAE,IAAI,CAAA,KAAK,QAAQ,CACtC,CAAC;IACJ,CAAC;IAPe,gCAAc,iBAO7B,CAAA;IAED,SAAgB,gBAAgB,CAAC,KAAc;QAC7C,MAAM,MAAM,GAAG,KAAY,CAAC;QAC5B,OAAO,QAAQ,CAAC,MAAM,CAAC,IAAI,OAAO,MAAM,CAAC,WAAW,KAAK,QAAQ,CAAC;IACpE,CAAC;IAHe,kCAAgB,mBAG/B,CAAA;IAED,SAAgB,uBAAuB,CACrC,KAAc;QAEd,MAAM,MAAM,GAAG,KAAY,CAAC;QAC5B,OAAO,CACL,QAAQ,CAAC,MAAM,CAAC;YAChB,MAAM,CAAC,IAAI,KAAK,OAAO;YACvB,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAC/B,CAAC;IACJ,CAAC;IATe,yCAAuB,0BAStC,CAAA;IAED,SAAgB,6BAA6B,CAC3C,KAAc;QAEd,MAAM,MAAM,GAAG,KAAY,CAAC;QAC5B,OAAO,QAAQ,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,KAAK,aAAa,CAAC;IAC3D,CAAC;IALe,+CAA6B,gCAK5C,CAAA;IAED,SAAgB,sBAAsB,CACpC,KAAc;QAEd,OAAO,CACL,uBAAuB,CAAC,KAAK,CAAC,IAAI,6BAA6B,CAAC,KAAK,CAAC,CACvE,CAAC;IACJ,CAAC;IANe,wCAAsB,yBAMrC,CAAA;AACH,CAAC,EA3Ia,iBAAiB,KAAjB,iBAAiB,QA2I9B"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@insync-stageplayer/measurements",
|
|
3
|
-
"version": "0.5.
|
|
3
|
+
"version": "0.5.10",
|
|
4
4
|
"description": "Module for measurement data in stageplayer",
|
|
5
5
|
"author": "David Ammeraal <david.ammeraal@gmail.com>",
|
|
6
6
|
"homepage": "https://github.com/Noterik/insync-stageplayer#readme",
|
|
@@ -53,5 +53,5 @@
|
|
|
53
53
|
"optionalDependencies": {
|
|
54
54
|
"sbfreader": "^1.0.0-alpha.5"
|
|
55
55
|
},
|
|
56
|
-
"gitHead": "
|
|
56
|
+
"gitHead": "f46cbe42c93715b8ae117fb5206eb895d898732b"
|
|
57
57
|
}
|
|
@@ -1,38 +0,0 @@
|
|
|
1
|
-
import { AbstractMeasurementDataClient, FetchMeasurementDataArgs } from "../MeasurementDataClient";
|
|
2
|
-
declare type SignalViewerDataClientOptions = {
|
|
3
|
-
/**
|
|
4
|
-
* Endpoint (URL) to send requests for HDF files.
|
|
5
|
-
*/
|
|
6
|
-
hdfEndpoint: string;
|
|
7
|
-
/**
|
|
8
|
-
* Endpoint (URL) to send requests for SBF files.
|
|
9
|
-
*/
|
|
10
|
-
sbfEndpoint: string;
|
|
11
|
-
};
|
|
12
|
-
/**
|
|
13
|
-
* Implementation of MeasurementDataClient for the online environment.
|
|
14
|
-
*
|
|
15
|
-
* This either uses websockets for HDF5 files, or sends HTTP requests to the SBF server depending on which files we're
|
|
16
|
-
* retrieving for.
|
|
17
|
-
*
|
|
18
|
-
* SBF files are considered legacy, and there is no support for retrieving measurement data using websockets.
|
|
19
|
-
*/
|
|
20
|
-
export declare class SignalViewerDataClient extends AbstractMeasurementDataClient {
|
|
21
|
-
private hdfEndpoint;
|
|
22
|
-
private sbfEndpoint;
|
|
23
|
-
private cId;
|
|
24
|
-
private promises;
|
|
25
|
-
constructor({ hdfEndpoint, sbfEndpoint }: SignalViewerDataClientOptions);
|
|
26
|
-
/**
|
|
27
|
-
* Returns a number and increments the cId. Used for "tagging" requests to the endpoint so we can recognise matching response.
|
|
28
|
-
* @returns number
|
|
29
|
-
*/
|
|
30
|
-
private nextId;
|
|
31
|
-
fetchMetadata: (file: string) => Promise<any>;
|
|
32
|
-
fetchMeasurementData: (args: FetchMeasurementDataArgs) => Promise<any>;
|
|
33
|
-
fetchOverlayData: (args: any) => Promise<any>;
|
|
34
|
-
fetchReqData: (args: any) => Promise<any>;
|
|
35
|
-
destroy(): void;
|
|
36
|
-
}
|
|
37
|
-
export {};
|
|
38
|
-
//# sourceMappingURL=SignalViewerDataClient.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"SignalViewerDataClient.d.ts","sourceRoot":"","sources":["../../../src/client/signalviewer/SignalViewerDataClient.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,6BAA6B,EAC7B,wBAAwB,EACzB,MAAM,0BAA0B,CAAC;AAmBlC,aAAK,6BAA6B,GAAG;IACnC;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAIF;;;;;;;GAOG;AACH,qBAAa,sBAAuB,SAAQ,6BAA6B;IACvE,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,GAAG,CAAK;IAChB,OAAO,CAAC,QAAQ,CAIP;gBAEG,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE,6BAA6B;IAsBvE;;;OAGG;IACH,OAAO,CAAC,MAAM;IAMd,aAAa,SAAgB,MAAM,kBAoBjC;IAEF,oBAAoB,SAAgB,wBAAwB,kBA0C1D;IAEF,gBAAgB,SAAgB,GAAG,kBAsBjC;IAEF,YAAY,SAAgB,GAAG,kBAqB7B;IAEK,OAAO;CAOf"}
|
|
@@ -1,164 +0,0 @@
|
|
|
1
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
-
});
|
|
9
|
-
};
|
|
10
|
-
/**
|
|
11
|
-
* Contains implementation of MeasurementDataClient for the online environment.
|
|
12
|
-
*/
|
|
13
|
-
import { of, throwError } from "rxjs";
|
|
14
|
-
import { switchMap } from "rxjs/operators";
|
|
15
|
-
import { MeasurementsTypes } from "../..";
|
|
16
|
-
import { AbstractMeasurementDataClient, } from "../MeasurementDataClient";
|
|
17
|
-
import SignalViewerDataClientWorker from "./SignalViewerDataClient.worker";
|
|
18
|
-
/**
|
|
19
|
-
* Operator that handles responses from the measurement server, returns an error if the response contains an error.
|
|
20
|
-
* @returns
|
|
21
|
-
*/
|
|
22
|
-
const handleError = () => switchMap((r) => {
|
|
23
|
-
if (MeasurementsTypes.isErrorResponse(r)) {
|
|
24
|
-
return throwError(new Error(`Server error, code: ${r.code}, message: ${r.data.error.message}`));
|
|
25
|
-
}
|
|
26
|
-
return of(r);
|
|
27
|
-
});
|
|
28
|
-
let signalViewerDataClientWorker;
|
|
29
|
-
/**
|
|
30
|
-
* Implementation of MeasurementDataClient for the online environment.
|
|
31
|
-
*
|
|
32
|
-
* This either uses websockets for HDF5 files, or sends HTTP requests to the SBF server depending on which files we're
|
|
33
|
-
* retrieving for.
|
|
34
|
-
*
|
|
35
|
-
* SBF files are considered legacy, and there is no support for retrieving measurement data using websockets.
|
|
36
|
-
*/
|
|
37
|
-
export class SignalViewerDataClient extends AbstractMeasurementDataClient {
|
|
38
|
-
constructor({ hdfEndpoint, sbfEndpoint }) {
|
|
39
|
-
super();
|
|
40
|
-
this.cId = 0;
|
|
41
|
-
this.promises = [];
|
|
42
|
-
this.fetchMetadata = (file) => __awaiter(this, void 0, void 0, function* () {
|
|
43
|
-
const id = this.nextId();
|
|
44
|
-
let res = () => { };
|
|
45
|
-
let rej = () => { };
|
|
46
|
-
// Create promise around worker call
|
|
47
|
-
const p = new Promise((resolve, reject) => {
|
|
48
|
-
signalViewerDataClientWorker.postMessage({
|
|
49
|
-
func: "fetchMetadata",
|
|
50
|
-
id: id,
|
|
51
|
-
args: [file],
|
|
52
|
-
});
|
|
53
|
-
res = resolve;
|
|
54
|
-
rej = reject;
|
|
55
|
-
});
|
|
56
|
-
this.promises[id] = { promise: p, resolve: res, reject: rej };
|
|
57
|
-
// wait till worker returns with the response
|
|
58
|
-
return yield this.promises[id].promise;
|
|
59
|
-
});
|
|
60
|
-
this.fetchMeasurementData = (args) => __awaiter(this, void 0, void 0, function* () {
|
|
61
|
-
debugger;
|
|
62
|
-
const id = this.nextId();
|
|
63
|
-
let res = () => { };
|
|
64
|
-
let rej = () => { };
|
|
65
|
-
const convertedArgs = Object.assign(Object.assign({}, args), { measurements: args.measurements.map((m) => {
|
|
66
|
-
const secondMicroSecond = 1000000;
|
|
67
|
-
const epsilon = 0.08;
|
|
68
|
-
const yRange = m.maxY - m.minY;
|
|
69
|
-
const localZoom = (args.limit === undefined
|
|
70
|
-
? m.maxX * secondMicroSecond - m.minX * secondMicroSecond
|
|
71
|
-
: args.limit - args.offset) /
|
|
72
|
-
(m.maxX * secondMicroSecond - m.minX * secondMicroSecond);
|
|
73
|
-
const localEpsilon = Math.abs(((yRange * epsilon) / 100) * localZoom);
|
|
74
|
-
return {
|
|
75
|
-
name: m.index.join("/"),
|
|
76
|
-
epsilon: localEpsilon,
|
|
77
|
-
};
|
|
78
|
-
}) });
|
|
79
|
-
// Create promise around worker call
|
|
80
|
-
const p = new Promise((resolve, reject) => {
|
|
81
|
-
signalViewerDataClientWorker.postMessage({
|
|
82
|
-
func: "fetchMeasurementData",
|
|
83
|
-
id: id,
|
|
84
|
-
args: [convertedArgs],
|
|
85
|
-
});
|
|
86
|
-
res = resolve;
|
|
87
|
-
rej = reject;
|
|
88
|
-
});
|
|
89
|
-
this.promises[id] = { promise: p, resolve: res, reject: rej };
|
|
90
|
-
// wait till worker returns with the response
|
|
91
|
-
return yield this.promises[id].promise;
|
|
92
|
-
});
|
|
93
|
-
this.fetchOverlayData = (args) => __awaiter(this, void 0, void 0, function* () {
|
|
94
|
-
debugger;
|
|
95
|
-
const id = this.nextId();
|
|
96
|
-
let res = () => { };
|
|
97
|
-
let rej = () => { };
|
|
98
|
-
// Create promise around worker call
|
|
99
|
-
const p = new Promise((resolve, reject) => {
|
|
100
|
-
signalViewerDataClientWorker.postMessage({
|
|
101
|
-
func: "fetchOverlayData",
|
|
102
|
-
id: id,
|
|
103
|
-
args: [args],
|
|
104
|
-
});
|
|
105
|
-
res = resolve;
|
|
106
|
-
rej = reject;
|
|
107
|
-
});
|
|
108
|
-
this.promises[id] = { promise: p, resolve: res, reject: rej };
|
|
109
|
-
// wait till worker returns with the response
|
|
110
|
-
return yield this.promises[id].promise;
|
|
111
|
-
});
|
|
112
|
-
this.fetchReqData = (args) => __awaiter(this, void 0, void 0, function* () {
|
|
113
|
-
const id = this.nextId();
|
|
114
|
-
let res = () => { };
|
|
115
|
-
let rej = () => { };
|
|
116
|
-
// Create promise around worker call
|
|
117
|
-
const p = new Promise((resolve, reject) => {
|
|
118
|
-
signalViewerDataClientWorker.postMessage({
|
|
119
|
-
func: "fetchReqData",
|
|
120
|
-
id: id,
|
|
121
|
-
args: [args],
|
|
122
|
-
});
|
|
123
|
-
res = resolve;
|
|
124
|
-
rej = reject;
|
|
125
|
-
});
|
|
126
|
-
this.promises[id] = { promise: p, resolve: res, reject: rej };
|
|
127
|
-
// wait till worker returns with the response
|
|
128
|
-
return yield this.promises[id].promise;
|
|
129
|
-
});
|
|
130
|
-
this.hdfEndpoint = hdfEndpoint;
|
|
131
|
-
this.sbfEndpoint = sbfEndpoint;
|
|
132
|
-
// initialize worker class
|
|
133
|
-
signalViewerDataClientWorker = new SignalViewerDataClientWorker({
|
|
134
|
-
hdfEndpoint,
|
|
135
|
-
sbfEndpoint,
|
|
136
|
-
});
|
|
137
|
-
signalViewerDataClientWorker.onmessage = (event) => {
|
|
138
|
-
this.promises[event.data.id].resolve(event.data.response);
|
|
139
|
-
};
|
|
140
|
-
// first "constructor" message to worker
|
|
141
|
-
signalViewerDataClientWorker.postMessage({
|
|
142
|
-
func: "constructor",
|
|
143
|
-
id: this.cId,
|
|
144
|
-
args: [this.hdfEndpoint, this.sbfEndpoint],
|
|
145
|
-
});
|
|
146
|
-
}
|
|
147
|
-
/**
|
|
148
|
-
* Returns a number and increments the cId. Used for "tagging" requests to the endpoint so we can recognise matching response.
|
|
149
|
-
* @returns number
|
|
150
|
-
*/
|
|
151
|
-
nextId() {
|
|
152
|
-
let nextId = this.cId + 1;
|
|
153
|
-
this.cId = nextId;
|
|
154
|
-
return nextId;
|
|
155
|
-
}
|
|
156
|
-
destroy() {
|
|
157
|
-
signalViewerDataClientWorker.postMessage({
|
|
158
|
-
func: "destroy",
|
|
159
|
-
id: 0,
|
|
160
|
-
args: [],
|
|
161
|
-
});
|
|
162
|
-
}
|
|
163
|
-
}
|
|
164
|
-
//# sourceMappingURL=SignalViewerDataClient.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"SignalViewerDataClient.js","sourceRoot":"","sources":["../../../src/client/signalviewer/SignalViewerDataClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,74 +0,0 @@
|
|
|
1
|
-
import { MeasurementsTypes } from "../..";
|
|
2
|
-
import { FetchMeasurementDataArgs, MeasurementMetadata } from "../MeasurementDataClient";
|
|
3
|
-
declare type SignalViewerDataClientOptions = {
|
|
4
|
-
/**
|
|
5
|
-
* Endpoint (URL) to send requests for HDF files.
|
|
6
|
-
*/
|
|
7
|
-
hdfEndpoint: string;
|
|
8
|
-
/**
|
|
9
|
-
* Endpoint (URL) to send requests for SBF files.
|
|
10
|
-
*/
|
|
11
|
-
sbfEndpoint: string;
|
|
12
|
-
};
|
|
13
|
-
export default class SignalViewerDataClientWorker {
|
|
14
|
-
private hdfEndpoint;
|
|
15
|
-
private sbfEndpoint;
|
|
16
|
-
private _connection$;
|
|
17
|
-
private subscription;
|
|
18
|
-
private keepAlive;
|
|
19
|
-
constructor({ hdfEndpoint, sbfEndpoint }: SignalViewerDataClientOptions);
|
|
20
|
-
/**
|
|
21
|
-
* A cached connection observable.
|
|
22
|
-
*/
|
|
23
|
-
private get connection$();
|
|
24
|
-
/**
|
|
25
|
-
* Operator that handles responses from the measurement server, returns an error if the response contains an error.
|
|
26
|
-
* @returns
|
|
27
|
-
*/
|
|
28
|
-
postMessage: (message: TRequest) => void;
|
|
29
|
-
onmessage: (message: MessageEvent<TResponse>) => void;
|
|
30
|
-
fetchMetadata: (file: string, id: number) => Promise<{
|
|
31
|
-
name: string;
|
|
32
|
-
index: string[];
|
|
33
|
-
unit: string;
|
|
34
|
-
min: number;
|
|
35
|
-
max: number;
|
|
36
|
-
yaxisLeftPos: string;
|
|
37
|
-
frequency: number;
|
|
38
|
-
dataScale: number;
|
|
39
|
-
file: string;
|
|
40
|
-
id: string;
|
|
41
|
-
}[] | {
|
|
42
|
-
response: MeasurementMetadata[];
|
|
43
|
-
id: any;
|
|
44
|
-
}>;
|
|
45
|
-
fetchMeasurementData: (args: FetchMeasurementDataArgs, id: number) => Promise<MeasurementsTypes.DataMap | {
|
|
46
|
-
response: {
|
|
47
|
-
[key: string]: [number, number][];
|
|
48
|
-
};
|
|
49
|
-
id: any;
|
|
50
|
-
}>;
|
|
51
|
-
fetchOverlayData: (args: any, id: number) => Promise<{
|
|
52
|
-
response: MeasurementsTypes.DataResponse;
|
|
53
|
-
id: any;
|
|
54
|
-
}>;
|
|
55
|
-
fetchReqData: (args: any, id: number) => Promise<{
|
|
56
|
-
response: MeasurementsTypes.DataResponse;
|
|
57
|
-
id: any;
|
|
58
|
-
}>;
|
|
59
|
-
destroy(): void;
|
|
60
|
-
}
|
|
61
|
-
declare type TRequest = {
|
|
62
|
-
func: string;
|
|
63
|
-
id: number;
|
|
64
|
-
args: any[];
|
|
65
|
-
};
|
|
66
|
-
declare type TResponse = {
|
|
67
|
-
myresponse: number;
|
|
68
|
-
};
|
|
69
|
-
export interface IRequestWorker {
|
|
70
|
-
postMessage: (message: TResponse) => void;
|
|
71
|
-
onmessage: (message: MessageEvent<TRequest>) => void;
|
|
72
|
-
}
|
|
73
|
-
export {};
|
|
74
|
-
//# sourceMappingURL=SignalViewerDataClient.worker.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"SignalViewerDataClient.worker.d.ts","sourceRoot":"","sources":["../../../src/client/signalviewer/SignalViewerDataClient.worker.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,OAAO,CAAC;AAC1C,OAAO,EACL,wBAAwB,EACxB,mBAAmB,EACpB,MAAM,0BAA0B,CAAC;AAYlC,aAAK,6BAA6B,GAAG;IACnC;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAIF,MAAM,CAAC,OAAO,OAAO,4BAA4B;IAC/C,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,YAAY,CAA4B;IAChD,OAAO,CAAC,YAAY,CAAuC;IAC3D,OAAO,CAAC,SAAS,CAAuC;gBAE5C,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE,6BAA6B;IAOvE;;OAEG;IACH,OAAO,KAAK,WAAW,GA4BtB;IAED;;;OAGG;IAaH,WAAW,YAAa,QAAQ,UAE9B;IAEF,SAAS,YAAa,aAAa,SAAS,CAAC,UAE3C;IAEF,aAAa,SAAgB,MAAM,MAAM,MAAM;;;;;;;;;;;;;;OAgD7C;IAEF,oBAAoB,SAAgB,wBAAwB,MAAM,MAAM;;;;;OAiCtE;IAEF,gBAAgB,SAAgB,GAAG,MAAM,MAAM;;;OAwB7C;IAEF,YAAY,SAAgB,GAAG,MAAM,MAAM;;;OAwBzC;IAEK,OAAO;CAWf;AAED,aAAK,QAAQ,GAAG;IACd,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,GAAG,EAAE,CAAC;CACb,CAAC;AACF,aAAK,SAAS,GAAG;IACf,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,CAAC,OAAO,EAAE,SAAS,KAAK,IAAI,CAAC;IAC1C,SAAS,EAAE,CAAC,OAAO,EAAE,YAAY,CAAC,QAAQ,CAAC,KAAK,IAAI,CAAC;CACtD"}
|
|
@@ -1,212 +0,0 @@
|
|
|
1
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
-
});
|
|
9
|
-
};
|
|
10
|
-
import { interval } from "rxjs";
|
|
11
|
-
import { map, take, tap, retryWhen, delay } from "rxjs/operators";
|
|
12
|
-
import { webSocket } from "rxjs/webSocket";
|
|
13
|
-
import * as sbf from "../sbf";
|
|
14
|
-
const worker = self;
|
|
15
|
-
/**
|
|
16
|
-
* Checks if a given path is a path to a SBF file.
|
|
17
|
-
* @param p A path.
|
|
18
|
-
* @returns
|
|
19
|
-
*/
|
|
20
|
-
const isSBF = (p) => p.endsWith(".sbf") || p.endsWith(".SBF");
|
|
21
|
-
let signalViewerDataClientWorker;
|
|
22
|
-
export default class SignalViewerDataClientWorker {
|
|
23
|
-
constructor({ hdfEndpoint, sbfEndpoint }) {
|
|
24
|
-
this.subscription = undefined;
|
|
25
|
-
this.keepAlive = undefined;
|
|
26
|
-
/**
|
|
27
|
-
* Operator that handles responses from the measurement server, returns an error if the response contains an error.
|
|
28
|
-
* @returns
|
|
29
|
-
*/
|
|
30
|
-
/*handleError = <T>() =>
|
|
31
|
-
switchMap((r: T) => {
|
|
32
|
-
if (MeasurementsTypes.isErrorResponse(r)) {
|
|
33
|
-
return throwError(
|
|
34
|
-
new Error(
|
|
35
|
-
`Server error, code: ${r.code}, message: ${r.data.error.message}`
|
|
36
|
-
)
|
|
37
|
-
);
|
|
38
|
-
}
|
|
39
|
-
return of(r);
|
|
40
|
-
});*/
|
|
41
|
-
this.postMessage = (message) => {
|
|
42
|
-
// needed for exporting the postmessage in this class, not actually used
|
|
43
|
-
};
|
|
44
|
-
this.onmessage = (message) => {
|
|
45
|
-
// needed for exporting the onmessage in this class, not actually used
|
|
46
|
-
};
|
|
47
|
-
this.fetchMetadata = (file, id) => __awaiter(this, void 0, void 0, function* () {
|
|
48
|
-
// If this is a legacy SBF file, use SBF api instead.
|
|
49
|
-
if (isSBF(file))
|
|
50
|
-
return sbf.fetchDataMetadata(file, this.sbfEndpoint);
|
|
51
|
-
//flatten signals from groups to a single depth array that contains all the information per signal
|
|
52
|
-
const handleSignals = (metadata) => {
|
|
53
|
-
let result = [];
|
|
54
|
-
metadata.groups.forEach((group) => {
|
|
55
|
-
group.signals.forEach((signal) => {
|
|
56
|
-
result.push(Object.assign(Object.assign({}, signal), { dataScale: group.dataScale, frequency: signal.sampleRate, min: signal.minY, max: signal.maxY, file, index: [group.name, signal.name] }));
|
|
57
|
-
});
|
|
58
|
-
});
|
|
59
|
-
return result;
|
|
60
|
-
};
|
|
61
|
-
const observable$ = this._connection$.pipe(take(1), map((response) => {
|
|
62
|
-
const _r = response;
|
|
63
|
-
const r = handleSignals(_r.data.metadata);
|
|
64
|
-
return { response: r, id: response.id };
|
|
65
|
-
}));
|
|
66
|
-
this.connection$.next({
|
|
67
|
-
action: "metadata",
|
|
68
|
-
id,
|
|
69
|
-
params: {
|
|
70
|
-
file,
|
|
71
|
-
},
|
|
72
|
-
});
|
|
73
|
-
try {
|
|
74
|
-
return yield observable$.toPromise();
|
|
75
|
-
}
|
|
76
|
-
catch (err) {
|
|
77
|
-
throw new Error("Something went wrong in websocket connection.");
|
|
78
|
-
}
|
|
79
|
-
});
|
|
80
|
-
this.fetchMeasurementData = (args, id) => __awaiter(this, void 0, void 0, function* () {
|
|
81
|
-
// If this is a legacy measurement, use sbf api instead.
|
|
82
|
-
if (isSBF(args.file)) {
|
|
83
|
-
const options = Object.assign(Object.assign({}, args), { measurements: args.measurements.map((measurement) => {
|
|
84
|
-
return measurement.index.join("/");
|
|
85
|
-
}) });
|
|
86
|
-
return sbf.fetchData(this.sbfEndpoint, options);
|
|
87
|
-
}
|
|
88
|
-
const observable$ = this.connection$.pipe(take(1), map((response) => {
|
|
89
|
-
const _r = response;
|
|
90
|
-
return { response: _r.data.measurements, id: response.id };
|
|
91
|
-
}));
|
|
92
|
-
this.connection$.next({
|
|
93
|
-
action: "data",
|
|
94
|
-
id,
|
|
95
|
-
params: Object.assign({}, args),
|
|
96
|
-
});
|
|
97
|
-
try {
|
|
98
|
-
return yield observable$.toPromise();
|
|
99
|
-
}
|
|
100
|
-
catch (err) {
|
|
101
|
-
throw new Error("Something went wrong in websocket connection.");
|
|
102
|
-
}
|
|
103
|
-
});
|
|
104
|
-
this.fetchOverlayData = (args, id) => __awaiter(this, void 0, void 0, function* () {
|
|
105
|
-
const { overlayData, dataType } = args;
|
|
106
|
-
const observable$ = this.connection$.pipe(take(1), map((response) => {
|
|
107
|
-
const _r = response;
|
|
108
|
-
return { response: _r, id: response.id };
|
|
109
|
-
}));
|
|
110
|
-
this.connection$.next({
|
|
111
|
-
action: dataType,
|
|
112
|
-
id,
|
|
113
|
-
params: Object.assign({}, overlayData),
|
|
114
|
-
});
|
|
115
|
-
try {
|
|
116
|
-
return yield observable$.toPromise();
|
|
117
|
-
}
|
|
118
|
-
catch (err) {
|
|
119
|
-
throw new Error(err + "Something went wrong in websocket connection.");
|
|
120
|
-
}
|
|
121
|
-
});
|
|
122
|
-
this.fetchReqData = (args, id) => __awaiter(this, void 0, void 0, function* () {
|
|
123
|
-
const { markerData, dataType } = args;
|
|
124
|
-
const observable$ = this.connection$.pipe(take(1), map((response) => {
|
|
125
|
-
const _r = response;
|
|
126
|
-
return { response: _r, id: response.id };
|
|
127
|
-
}));
|
|
128
|
-
this.connection$.next({
|
|
129
|
-
action: dataType,
|
|
130
|
-
id,
|
|
131
|
-
params: Object.assign({}, markerData),
|
|
132
|
-
});
|
|
133
|
-
try {
|
|
134
|
-
return yield observable$.toPromise();
|
|
135
|
-
}
|
|
136
|
-
catch (err) {
|
|
137
|
-
throw new Error(err + "Something went wrong in websocket connection.");
|
|
138
|
-
}
|
|
139
|
-
});
|
|
140
|
-
this.hdfEndpoint = hdfEndpoint;
|
|
141
|
-
this.sbfEndpoint = sbfEndpoint;
|
|
142
|
-
// Create a webSocket observable. Please read the RxJS documentation for more information about webSocket.
|
|
143
|
-
this._connection$ = webSocket(this.hdfEndpoint);
|
|
144
|
-
}
|
|
145
|
-
/**
|
|
146
|
-
* A cached connection observable.
|
|
147
|
-
*/
|
|
148
|
-
get connection$() {
|
|
149
|
-
if (!this.subscription)
|
|
150
|
-
this.subscription = this._connection$
|
|
151
|
-
.pipe(retryWhen((errors) => errors.pipe(tap((error) => {
|
|
152
|
-
console.error("Websocket connection error", error);
|
|
153
|
-
}), delay(500))))
|
|
154
|
-
.subscribe();
|
|
155
|
-
// We create an interval observable that will emit a keep-alive signal to the HDF endpoint every 5 seconds.
|
|
156
|
-
// The Java server closes the connection otherwise, and this might cause problems.
|
|
157
|
-
if (!this.keepAlive) {
|
|
158
|
-
this.keepAlive = interval(5000)
|
|
159
|
-
.pipe(tap(() => {
|
|
160
|
-
this._connection$.next("keepalive");
|
|
161
|
-
}))
|
|
162
|
-
.subscribe();
|
|
163
|
-
}
|
|
164
|
-
return this._connection$;
|
|
165
|
-
}
|
|
166
|
-
destroy() {
|
|
167
|
-
if (this.keepAlive) {
|
|
168
|
-
this.keepAlive.unsubscribe();
|
|
169
|
-
this.keepAlive = undefined;
|
|
170
|
-
}
|
|
171
|
-
if (this.subscription) {
|
|
172
|
-
this.subscription.unsubscribe();
|
|
173
|
-
this.subscription = undefined;
|
|
174
|
-
}
|
|
175
|
-
}
|
|
176
|
-
}
|
|
177
|
-
// receive messages and internally pass them through to the correct function
|
|
178
|
-
worker.onmessage = (message) => {
|
|
179
|
-
const func = message.data.func;
|
|
180
|
-
const id = message.data.id;
|
|
181
|
-
const args = message.data.args;
|
|
182
|
-
switch (func) {
|
|
183
|
-
case "constructor":
|
|
184
|
-
const hdfEndpoint = args[0];
|
|
185
|
-
const sbfEndpoint = args[1];
|
|
186
|
-
signalViewerDataClientWorker = new SignalViewerDataClientWorker({
|
|
187
|
-
hdfEndpoint,
|
|
188
|
-
sbfEndpoint,
|
|
189
|
-
});
|
|
190
|
-
break;
|
|
191
|
-
case "fetchMetadata":
|
|
192
|
-
const file = args[0];
|
|
193
|
-
signalViewerDataClientWorker.fetchMetadata(file, id).then((response) => {
|
|
194
|
-
// Send to the main thread
|
|
195
|
-
worker.postMessage(response);
|
|
196
|
-
});
|
|
197
|
-
break;
|
|
198
|
-
case "fetchMeasurementData":
|
|
199
|
-
const requestedMeasurements = args[0];
|
|
200
|
-
signalViewerDataClientWorker
|
|
201
|
-
.fetchMeasurementData(requestedMeasurements, id)
|
|
202
|
-
.then((response) => {
|
|
203
|
-
// Send to the main thread
|
|
204
|
-
worker.postMessage(response);
|
|
205
|
-
});
|
|
206
|
-
break;
|
|
207
|
-
case "destroy":
|
|
208
|
-
signalViewerDataClientWorker.destroy();
|
|
209
|
-
break;
|
|
210
|
-
}
|
|
211
|
-
};
|
|
212
|
-
//# sourceMappingURL=SignalViewerDataClient.worker.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"SignalViewerDataClient.worker.js","sourceRoot":"","sources":["../../../src/client/signalviewer/SignalViewerDataClient.worker.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,QAAQ,EAAgB,MAAM,MAAM,CAAC;AAC9C,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAClE,OAAO,EAAE,SAAS,EAAoB,MAAM,gBAAgB,CAAC;AAM7D,OAAO,KAAK,GAAG,MAAM,QAAQ,CAAC;AAE9B,MAAM,MAAM,GAAG,IAAW,CAAC;AAE3B;;;;GAIG;AACH,MAAM,KAAK,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;AAatE,IAAI,4BAA0D,CAAC;AAE/D,MAAM,CAAC,OAAO,OAAO,4BAA4B;IAO/C,YAAY,EAAE,WAAW,EAAE,WAAW,EAAiC;QAH/D,iBAAY,GAA6B,SAAS,CAAC;QACnD,cAAS,GAA6B,SAAS,CAAC;QA0CxD;;;WAGG;QACH;;;;;;;;;;YAUI;QAEJ,gBAAW,GAAG,CAAC,OAAiB,EAAE,EAAE;YAClC,wEAAwE;QAC1E,CAAC,CAAC;QAEF,cAAS,GAAG,CAAC,OAAgC,EAAE,EAAE;YAC/C,sEAAsE;QACxE,CAAC,CAAC;QAEF,kBAAa,GAAG,CAAO,IAAY,EAAE,EAAU,EAAE,EAAE;YACjD,qDAAqD;YACrD,IAAI,KAAK,CAAC,IAAI,CAAC;gBAAE,OAAO,GAAG,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;YAEtE,kGAAkG;YAClG,MAAM,aAAa,GAAG,CACpB,QAAkD,EAC3B,EAAE;gBACzB,IAAI,MAAM,GAA0B,EAAE,CAAC;gBAEvC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;oBAChC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;wBAC/B,MAAM,CAAC,IAAI,iCACN,MAAM,KACT,SAAS,EAAE,KAAK,CAAC,SAAS,EAC1B,SAAS,EAAE,MAAM,CAAC,UAAU,EAC5B,GAAG,EAAE,MAAM,CAAC,IAAI,EAChB,GAAG,EAAE,MAAM,CAAC,IAAI,EAChB,IAAI,EACJ,KAAK,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,IAChC,CAAC;oBACL,CAAC,CAAC,CAAC;gBACL,CAAC,CAAC,CAAC;gBACH,OAAO,MAAM,CAAC;YAChB,CAAC,CAAC;YAEF,MAAM,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC,IAAI,CACxC,IAAI,CAAC,CAAC,CAAC,EACP,GAAG,CAAC,CAAC,QAAa,EAAE,EAAE;gBACpB,MAAM,EAAE,GAAG,QAA6C,CAAC;gBACzD,MAAM,CAAC,GAAG,aAAa,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAC1C,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAC;YAC1C,CAAC,CAAC,CACH,CAAC;YAEF,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;gBACpB,MAAM,EAAE,UAAU;gBAClB,EAAE;gBACF,MAAM,EAAE;oBACN,IAAI;iBACL;aACF,CAAC,CAAC;YAEH,IAAI;gBACF,OAAO,MAAM,WAAW,CAAC,SAAS,EAAE,CAAC;aACtC;YAAC,OAAO,GAAG,EAAE;gBACZ,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;aAClE;QACH,CAAC,CAAA,CAAC;QAEF,yBAAoB,GAAG,CAAO,IAA8B,EAAE,EAAU,EAAE,EAAE;YAC1E,wDAAwD;YACxD,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBACpB,MAAM,OAAO,mCACR,IAAI,KACP,YAAY,EAAE,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE;wBAClD,OAAO,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBACrC,CAAC,CAAC,GACH,CAAC;gBACF,OAAO,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;aACjD;YAED,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CACvC,IAAI,CAAC,CAAC,CAAC,EACP,GAAG,CAAC,CAAC,QAAa,EAAE,EAAE;gBACpB,MAAM,EAAE,GAAG,QAA0C,CAAC;gBACtD,OAAO,EAAE,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAC;YAC7D,CAAC,CAAC,CACH,CAAC;YAEF,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;gBACpB,MAAM,EAAE,MAAM;gBACd,EAAE;gBACF,MAAM,oBACD,IAAI,CACR;aACF,CAAC,CAAC;YAEH,IAAI;gBACF,OAAO,MAAM,WAAW,CAAC,SAAS,EAAE,CAAC;aACtC;YAAC,OAAO,GAAG,EAAE;gBACZ,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;aAClE;QACH,CAAC,CAAA,CAAC;QAEF,qBAAgB,GAAG,CAAO,IAAS,EAAE,EAAU,EAAE,EAAE;YACjD,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;YAEvC,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CACvC,IAAI,CAAC,CAAC,CAAC,EACP,GAAG,CAAC,CAAC,QAAa,EAAE,EAAE;gBACpB,MAAM,EAAE,GAAG,QAA0C,CAAC;gBACtD,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAC;YAC3C,CAAC,CAAC,CACH,CAAC;YAEF,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;gBACpB,MAAM,EAAE,QAAQ;gBAChB,EAAE;gBACF,MAAM,oBACD,WAAW,CACf;aACF,CAAC,CAAC;YAEH,IAAI;gBACF,OAAO,MAAM,WAAW,CAAC,SAAS,EAAE,CAAC;aACtC;YAAC,OAAO,GAAG,EAAE;gBACZ,MAAM,IAAI,KAAK,CAAC,GAAG,GAAG,+CAA+C,CAAC,CAAC;aACxE;QACH,CAAC,CAAA,CAAC;QAEF,iBAAY,GAAG,CAAO,IAAS,EAAE,EAAU,EAAE,EAAE;YAC7C,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;YAEtC,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CACvC,IAAI,CAAC,CAAC,CAAC,EACP,GAAG,CAAC,CAAC,QAAa,EAAE,EAAE;gBACpB,MAAM,EAAE,GAAG,QAA0C,CAAC;gBACtD,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAC;YAC3C,CAAC,CAAC,CACH,CAAC;YAEF,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;gBACpB,MAAM,EAAE,QAAQ;gBAChB,EAAE;gBACF,MAAM,oBACD,UAAU,CACd;aACF,CAAC,CAAC;YAEH,IAAI;gBACF,OAAO,MAAM,WAAW,CAAC,SAAS,EAAE,CAAC;aACtC;YAAC,OAAO,GAAG,EAAE;gBACZ,MAAM,IAAI,KAAK,CAAC,GAAG,GAAG,+CAA+C,CAAC,CAAC;aACxE;QACH,CAAC,CAAA,CAAC;QAtMA,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,0GAA0G;QAC1G,IAAI,CAAC,YAAY,GAAG,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAClD,CAAC;IAED;;OAEG;IACH,IAAY,WAAW;QACrB,IAAI,CAAC,IAAI,CAAC,YAAY;YACpB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY;iBAClC,IAAI,CACH,SAAS,CAAC,CAAC,MAAM,EAAE,EAAE,CACnB,MAAM,CAAC,IAAI,CACT,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;gBACZ,OAAO,CAAC,KAAK,CAAC,4BAA4B,EAAE,KAAK,CAAC,CAAC;YACrD,CAAC,CAAC,EACF,KAAK,CAAC,GAAG,CAAC,CACX,CACF,CACF;iBACA,SAAS,EAAE,CAAC;QAEjB,2GAA2G;QAC3G,kFAAkF;QAClF,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACnB,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC,IAAI,CAAC;iBAC5B,IAAI,CACH,GAAG,CAAC,GAAG,EAAE;gBACP,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YACtC,CAAC,CAAC,CACH;iBACA,SAAS,EAAE,CAAC;SAChB;QAED,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAmKM,OAAO;QACZ,IAAI,IAAI,CAAC,SAAS,EAAE;YAClB,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;YAC7B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;SAC5B;QAED,IAAI,IAAI,CAAC,YAAY,EAAE;YACrB,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC;YAChC,IAAI,CAAC,YAAY,GAAG,SAAS,CAAC;SAC/B;IACH,CAAC;CACF;AAgBD,4EAA4E;AAC5E,MAAM,CAAC,SAAS,GAAG,CAAC,OAA+B,EAAE,EAAE;IACrD,MAAM,IAAI,GAAW,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC;IACvC,MAAM,EAAE,GAAW,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;IACnC,MAAM,IAAI,GAAU,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC;IAEtC,QAAQ,IAAI,EAAE;QACZ,KAAK,aAAa;YAChB,MAAM,WAAW,GAAW,IAAI,CAAC,CAAC,CAAC,CAAC;YACpC,MAAM,WAAW,GAAW,IAAI,CAAC,CAAC,CAAC,CAAC;YACpC,4BAA4B,GAAG,IAAI,4BAA4B,CAAC;gBAC9D,WAAW;gBACX,WAAW;aACZ,CAAC,CAAC;YACH,MAAM;QACR,KAAK,eAAe;YAClB,MAAM,IAAI,GAAW,IAAI,CAAC,CAAC,CAAC,CAAC;YAC7B,4BAA4B,CAAC,aAAa,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;gBACrE,0BAA0B;gBAC1B,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YAC/B,CAAC,CAAC,CAAC;YACH,MAAM;QACR,KAAK,sBAAsB;YACzB,MAAM,qBAAqB,GAA6B,IAAI,CAAC,CAAC,CAAC,CAAC;YAChE,4BAA4B;iBACzB,oBAAoB,CAAC,qBAAqB,EAAE,EAAE,CAAC;iBAC/C,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;gBACjB,0BAA0B;gBAC1B,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;YAC/B,CAAC,CAAC,CAAC;YACL,MAAM;QACR,KAAK,SAAS;YACZ,4BAA4B,CAAC,OAAO,EAAE,CAAC;YACvC,MAAM;KACT;AACH,CAAC,CAAC"}
|