@insync-stageplayer/measurements 0.4.21 → 0.4.23
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 +1 -0
- package/lib/client/MeasurementDataClient.d.ts.map +1 -1
- package/lib/client/MeasurementDataClient.js.map +1 -1
- package/lib/client/OnlineMeasurementDataClient.d.ts.map +1 -1
- package/lib/client/OnlineMeasurementDataClient.js +10 -2
- package/lib/client/OnlineMeasurementDataClient.js.map +1 -1
- package/lib/client/sbf.d.ts +1 -0
- package/lib/client/sbf.d.ts.map +1 -1
- package/lib/client/sbf.js.map +1 -1
- package/lib/components/MeasurementsChooser.d.ts +4 -0
- package/lib/components/MeasurementsChooser.d.ts.map +1 -1
- package/lib/components/MeasurementsChooser.js +49 -8
- package/lib/components/MeasurementsChooser.js.map +1 -1
- package/lib/components/MeasurementsModuleProvider.d.ts.map +1 -1
- package/lib/components/MeasurementsModuleProvider.js +8 -2
- package/lib/components/MeasurementsModuleProvider.js.map +1 -1
- package/lib/components/MeasurementsTable/CheckboxCell.d.ts +1 -0
- package/lib/components/MeasurementsTable/CheckboxCell.d.ts.map +1 -1
- package/lib/components/MeasurementsTable/CheckboxCell.js +2 -2
- package/lib/components/MeasurementsTable/CheckboxCell.js.map +1 -1
- package/lib/components/MeasurementsTable/ColorPicker.d.ts +0 -1
- package/lib/components/MeasurementsTable/ColorPicker.d.ts.map +1 -1
- package/lib/components/MeasurementsTable/MeasurementsTable.d.ts +8 -0
- package/lib/components/MeasurementsTable/MeasurementsTable.d.ts.map +1 -1
- package/lib/components/MeasurementsTable/MeasurementsTable.js +36 -12
- package/lib/components/MeasurementsTable/MeasurementsTable.js.map +1 -1
- package/lib/hooks/useMeasurements.d.ts +2 -0
- package/lib/hooks/useMeasurements.d.ts.map +1 -1
- package/lib/hooks/useMeasurements.js +9 -2
- package/lib/hooks/useMeasurements.js.map +1 -1
- package/lib/hooks/useMeasurementsModule.d.ts +2 -0
- package/lib/hooks/useMeasurementsModule.d.ts.map +1 -1
- package/lib/hooks/useTimedMeasurementData.d.ts.map +1 -1
- package/lib/hooks/useTimedMeasurementData.js +3 -1
- package/lib/hooks/useTimedMeasurementData.js.map +1 -1
- package/lib/hooks/useWindowedMeasurementData.d.ts.map +1 -1
- package/lib/hooks/useWindowedMeasurementData.js +4 -2
- package/lib/hooks/useWindowedMeasurementData.js.map +1 -1
- package/lib/redux/measurements.slice.d.ts +16 -1
- package/lib/redux/measurements.slice.d.ts.map +1 -1
- package/lib/redux/measurements.slice.js +19 -1
- package/lib/redux/measurements.slice.js.map +1 -1
- package/lib/redux/reducer.d.ts +2 -0
- package/lib/redux/reducer.d.ts.map +1 -1
- package/lib/types.d.ts +7 -1
- package/lib/types.d.ts.map +1 -1
- package/lib/types.js.map +1 -1
- package/package.json +4 -4
|
@@ -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,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;
|
|
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"}
|
|
@@ -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;
|
|
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,
|
|
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"}
|
|
@@ -101,7 +101,13 @@ export class OnlineMeasurementDataClient extends AbstractMeasurementDataClient {
|
|
|
101
101
|
return yield observable$.toPromise();
|
|
102
102
|
}
|
|
103
103
|
catch (err) {
|
|
104
|
-
|
|
104
|
+
let errorMessage = "Something went wrong in websocket connection while fetching metadata";
|
|
105
|
+
if (err instanceof Error) {
|
|
106
|
+
errorMessage =
|
|
107
|
+
"Error: " +
|
|
108
|
+
err.message.substring(err.message.indexOf("message: ") + 9);
|
|
109
|
+
}
|
|
110
|
+
throw new Error(errorMessage);
|
|
105
111
|
}
|
|
106
112
|
});
|
|
107
113
|
this.fetchMeasurementData = (args) => __awaiter(this, void 0, void 0, function* () {
|
|
@@ -119,7 +125,9 @@ export class OnlineMeasurementDataClient extends AbstractMeasurementDataClient {
|
|
|
119
125
|
return yield observable$.toPromise();
|
|
120
126
|
}
|
|
121
127
|
catch (err) {
|
|
122
|
-
|
|
128
|
+
// eslint-disable-next-line no-console
|
|
129
|
+
console.log("Websocket error: ", err);
|
|
130
|
+
throw new Error("Something went wrong in websocket connection while fetching data");
|
|
123
131
|
}
|
|
124
132
|
});
|
|
125
133
|
this.fetchOverlayData = (args) => __awaiter(this, void 0, void 0, function* () {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OnlineMeasurementDataClient.js","sourceRoot":"","sources":["../../src/client/OnlineMeasurementDataClient.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"OnlineMeasurementDataClient.js","sourceRoot":"","sources":["../../src/client/OnlineMeasurementDataClient.ts"],"names":[],"mappings":"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"}
|
package/lib/client/sbf.d.ts
CHANGED
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;
|
|
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"}
|
package/lib/client/sbf.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sbf.js","sourceRoot":"","sources":["../../src/client/sbf.ts"],"names":[],"mappings":";;;;;;;;;
|
|
1
|
+
{"version":3,"file":"sbf.js","sourceRoot":"","sources":["../../src/client/sbf.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,6 +18,10 @@ export declare type MeasurementsChooserProps = Omit<React.HTMLAttributes<HTMLDiv
|
|
|
18
18
|
* Function used to generate a new color for a measurements.
|
|
19
19
|
*/
|
|
20
20
|
generateColor?: () => string;
|
|
21
|
+
/**
|
|
22
|
+
*
|
|
23
|
+
*/
|
|
24
|
+
dataViewerId: string;
|
|
21
25
|
};
|
|
22
26
|
/**
|
|
23
27
|
* A component that provides functionality to select measurements. The measurements are grouped
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MeasurementsChooser.d.ts","sourceRoot":"","sources":["../../src/components/MeasurementsChooser.tsx"],"names":[],"mappings":"AAQA,OAAO,KAAgC,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"MeasurementsChooser.d.ts","sourceRoot":"","sources":["../../src/components/MeasurementsChooser.tsx"],"names":[],"mappings":"AAQA,OAAO,KAAgC,MAAM,OAAO,CAAC;AAcrD,oBAAY,wBAAwB,GAAG,IAAI,CACzC,KAAK,CAAC,cAAc,CAAC,cAAc,CAAC,EACpC,UAAU,CACX,GAAG;IACF;;OAEG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB;;;;OAIG;IACH,QAAQ,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IAC1C;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,MAAM,CAAC;IAC7B;;OAEG;IACH,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,mBAAmB,EAAE,KAAK,CAAC,EAAE,CAAC,wBAAwB,CAyMlE,CAAC"}
|
|
@@ -15,7 +15,7 @@ import React, { useCallback, useState } from "react";
|
|
|
15
15
|
import { MeasurementsTable } from "./MeasurementsTable";
|
|
16
16
|
import { useMeasurements } from "../hooks/useMeasurements";
|
|
17
17
|
import { useDispatch, useSelector } from "react-redux";
|
|
18
|
-
import { selectLastColorIndex, updateMeasurement, updateMeasurements, } from "../redux/measurements.slice";
|
|
18
|
+
import { selectLastColorIndex, selectLastColorIndexPerDataViewer, setDataScale, updateMeasurement, updateMeasurements, } from "../redux/measurements.slice";
|
|
19
19
|
import { useMeasurementsModule } from "../hooks/useMeasurementsModule";
|
|
20
20
|
/**
|
|
21
21
|
* A component that provides functionality to select measurements. The measurements are grouped
|
|
@@ -30,7 +30,7 @@ import { useMeasurementsModule } from "../hooks/useMeasurementsModule";
|
|
|
30
30
|
* @returns
|
|
31
31
|
*/
|
|
32
32
|
export const MeasurementsChooser = (props) => {
|
|
33
|
-
const { selected, onChange, generateColor = randomColor, single } = props, rest = __rest(props, ["selected", "onChange", "generateColor", "single"]);
|
|
33
|
+
const { selected, onChange, generateColor = randomColor, single, dataViewerId } = props, rest = __rest(props, ["selected", "onChange", "generateColor", "single", "dataViewerId"]);
|
|
34
34
|
const dispatch = useDispatch();
|
|
35
35
|
const { measurements, loading, error } = useMeasurements();
|
|
36
36
|
const { selector } = useMeasurementsModule();
|
|
@@ -42,7 +42,9 @@ export const MeasurementsChooser = (props) => {
|
|
|
42
42
|
return selector(s).colors;
|
|
43
43
|
});
|
|
44
44
|
const lastColorIndex = useSelector((s) => selectLastColorIndex(selector(s)));
|
|
45
|
+
const lastColorIndexPerDataViewer = useSelector((s) => selectLastColorIndexPerDataViewer(selector(s), dataViewerId));
|
|
45
46
|
const [open, setOpen] = useState(0);
|
|
47
|
+
const globallyUniqueMeasurementColors = useSelector((s) => selector(s).globallyUniqueMeasurementColors);
|
|
46
48
|
/**
|
|
47
49
|
* Measurements grouped by file.
|
|
48
50
|
*/
|
|
@@ -65,26 +67,65 @@ export const MeasurementsChooser = (props) => {
|
|
|
65
67
|
}
|
|
66
68
|
return generateColor();
|
|
67
69
|
}, [lastColorIndex, colors, generateColor]);
|
|
70
|
+
const nextColorDataViewerSpecific = useCallback((id) => {
|
|
71
|
+
if (colors[lastColorIndexPerDataViewer + 1]) {
|
|
72
|
+
return colors[lastColorIndexPerDataViewer + 1];
|
|
73
|
+
}
|
|
74
|
+
return generateColor();
|
|
75
|
+
}, [lastColorIndexPerDataViewer, colors, generateColor]);
|
|
68
76
|
const handleChange = useCallback((selected) => {
|
|
69
|
-
const measurementsWithoutColor =
|
|
70
|
-
|
|
71
|
-
|
|
77
|
+
const measurementsWithoutColor = globallyUniqueMeasurementColors
|
|
78
|
+
? measurements
|
|
79
|
+
.filter((m) => selected.indexOf(m.id) !== -1 && m.color === undefined)
|
|
80
|
+
.map((m) => {
|
|
81
|
+
var _a;
|
|
82
|
+
return (Object.assign(Object.assign({}, m), { color: nextColor(), colorPerDataViewer: {
|
|
83
|
+
byId: Object.assign(Object.assign({}, (_a = m.colorPerDataViewer) === null || _a === void 0 ? void 0 : _a.byId), { [dataViewerId]: nextColor() }),
|
|
84
|
+
} }));
|
|
85
|
+
})
|
|
86
|
+
: measurements
|
|
87
|
+
.filter((m) => {
|
|
88
|
+
var _a;
|
|
89
|
+
return selected.indexOf(m.id) !== -1 &&
|
|
90
|
+
((_a = m.colorPerDataViewer) === null || _a === void 0 ? void 0 : _a.byId[dataViewerId]) === undefined;
|
|
91
|
+
})
|
|
92
|
+
.map((m) => {
|
|
93
|
+
var _a, _b, _c;
|
|
94
|
+
return (Object.assign(Object.assign({}, m), { color: m.color === undefined ? nextColor() : m.color, colorPerDataViewer: {
|
|
95
|
+
byId: Object.assign(Object.assign({}, (_a = m.colorPerDataViewer) === null || _a === void 0 ? void 0 : _a.byId), { [dataViewerId]: ((_b = m.colorPerDataViewer) === null || _b === void 0 ? void 0 : _b.byId[dataViewerId]) === undefined
|
|
96
|
+
? nextColorDataViewerSpecific(dataViewerId)
|
|
97
|
+
: (_c = m.colorPerDataViewer) === null || _c === void 0 ? void 0 : _c.byId[dataViewerId] }),
|
|
98
|
+
} }));
|
|
99
|
+
});
|
|
72
100
|
dispatch(updateMeasurements(measurementsWithoutColor));
|
|
73
101
|
onChange(selected);
|
|
74
|
-
}, [
|
|
102
|
+
}, [
|
|
103
|
+
measurements,
|
|
104
|
+
globallyUniqueMeasurementColors,
|
|
105
|
+
dataViewerId,
|
|
106
|
+
dispatch,
|
|
107
|
+
onChange,
|
|
108
|
+
nextColor,
|
|
109
|
+
nextColorDataViewerSpecific,
|
|
110
|
+
]);
|
|
75
111
|
const handleYAxisPosChange = useCallback((selected) => {
|
|
112
|
+
var _a;
|
|
76
113
|
const measurementsWithoutColor = measurements
|
|
77
114
|
.filter((m) => selected.indexOf(m.id) !== -1 && m.color === undefined)
|
|
78
115
|
.map((m) => (Object.assign(Object.assign({}, m), { color: nextColor() })));
|
|
116
|
+
const selectedDataScales = measurements.filter((m) => selected.indexOf(m.id) !== -1 && m.dataScale !== undefined);
|
|
117
|
+
const selectedDataScale = ((_a = selectedDataScales[0]) === null || _a === void 0 ? void 0 : _a.dataScale) || 1;
|
|
79
118
|
dispatch(updateMeasurements(measurementsWithoutColor));
|
|
119
|
+
dispatch(setDataScale(selectedDataScale));
|
|
80
120
|
onChange(selected);
|
|
81
121
|
}, [measurements, dispatch, onChange, nextColor]);
|
|
82
122
|
/**
|
|
83
123
|
* The scale of the model for which the measurement data was recorded.
|
|
84
124
|
*/
|
|
85
125
|
const measurementScale = useSelector((s) => selector(s).measurementScale);
|
|
126
|
+
const dataScale = useSelector((s) => selector(s).dataScale);
|
|
86
127
|
const formatFrequency = (v) => {
|
|
87
|
-
return Number(v * Math.sqrt(measurementScale)).toFixed(0) + " Hz";
|
|
128
|
+
return (Number(v * Math.sqrt(measurementScale / dataScale)).toFixed(0) + " Hz");
|
|
88
129
|
};
|
|
89
130
|
if (loading) {
|
|
90
131
|
return React.createElement(IndeterminateLoadingIndicator, null);
|
|
@@ -98,6 +139,6 @@ export const MeasurementsChooser = (props) => {
|
|
|
98
139
|
return parts[parts.length - 1];
|
|
99
140
|
})()),
|
|
100
141
|
React.createElement(AccordionItemBody, { style: { height: "200px" } },
|
|
101
|
-
React.createElement(MeasurementsTable, { single: single, measurements: groups[k], selected: selected, onChange: handleChange, onColorChange: handleColorChange, onYAxisPosChange: handleYAxisPosChange, formatFrequency: formatFrequency })))))));
|
|
142
|
+
React.createElement(MeasurementsTable, { single: single, measurements: groups[k], selected: selected, onChange: handleChange, onColorChange: handleColorChange, onYAxisPosChange: handleYAxisPosChange, formatFrequency: formatFrequency, globallyUniqueMeasurementColors: globallyUniqueMeasurementColors, dataViewerId: dataViewerId })))))));
|
|
102
143
|
};
|
|
103
144
|
//# sourceMappingURL=MeasurementsChooser.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MeasurementsChooser.js","sourceRoot":"","sources":["../../src/components/MeasurementsChooser.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,EACL,SAAS,EACT,aAAa,EACb,iBAAiB,EACjB,oBAAoB,EACpB,6BAA6B,GAC9B,MAAM,mCAAmC,CAAC;AAC3C,OAAO,WAAW,MAAM,aAAa,CAAC;AACtC,OAAO,KAAK,EAAE,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAErD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AACvD,OAAO,EACL,oBAAoB,EACpB,iBAAiB,EACjB,kBAAkB,GACnB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,qBAAqB,EAAE,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"MeasurementsChooser.js","sourceRoot":"","sources":["../../src/components/MeasurementsChooser.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MeasurementsModuleProvider.d.ts","sourceRoot":"","sources":["../../src/components/MeasurementsModuleProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA6B,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"MeasurementsModuleProvider.d.ts","sourceRoot":"","sources":["../../src/components/MeasurementsModuleProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA6B,MAAM,OAAO,CAAC;AAGlD,OAAO,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAClD,OAAO,EAGL,mBAAmB,EAGnB,uBAAuB,EAIxB,MAAM,6BAA6B,CAAC;AAErC,aAAK,+BAA+B,GAAG,CAAC,KAAK,EAAE,GAAG,KAAK,uBAAuB,CAAC;AAE/E,aAAK,uBAAuB,GAAG;IAC7B,MAAM,EAAE,qBAAqB,CAAC;IAC9B,QAAQ,EAAE,+BAA+B,CAAC;IAC1C,iBAAiB,EAAE;QACjB,YAAY,EAAE,UAAU,CAAC,OAAO,mBAAmB,CAAC,YAAY,CAAC,CAAC;KACnE,CAAC;CACH,CAAC;AAEF,eAAO,MAAM,yBAAyB,wCACuC,CAAC;AA2B9E,aAAK,+BAA+B,GAAG;IACrC;;OAEG;IACH,QAAQ,EAAE,+BAA+B,CAAC;IAC1C;;OAEG;IACH,MAAM,EAAE,qBAAqB,CAAC;CAC/B,CAAC;AAEF;;;;;;;;;GASG;AACH,eAAO,MAAM,0BAA0B,EAAE,KAAK,CAAC,EAAE,CAAC,+BAA+B,CA+D9E,CAAC"}
|
|
@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
};
|
|
10
10
|
import React, { useEffect, useMemo } from "react";
|
|
11
11
|
import { useDispatch, useSelector } from "react-redux";
|
|
12
|
-
import { invalidate, measurementsAdapter, measurementsError, measurementsLoading, measurementsReceived, } from "../redux/measurements.slice";
|
|
12
|
+
import { invalidate, measurementsAdapter, measurementsError, measurementsLoading, measurementsReceived, setGloballyUniqueMeasurementColors, setDataScale, } from "../redux/measurements.slice";
|
|
13
13
|
export const MeasurementsModuleContext = React.createContext({});
|
|
14
14
|
/**
|
|
15
15
|
* Fetches all measurements for all given files using the provided client.
|
|
@@ -44,7 +44,7 @@ export const MeasurementsModuleProvider = (props) => {
|
|
|
44
44
|
measurements: measurementsAdapter.getSelectors(selector),
|
|
45
45
|
};
|
|
46
46
|
}, [selector]);
|
|
47
|
-
const { files, loading, didInvalidate } = useSelector((s) => {
|
|
47
|
+
const { files, loading, didInvalidate, globallyUniqueMeasurementColors, dataScale, } = useSelector((s) => {
|
|
48
48
|
const state = selector(s);
|
|
49
49
|
return state;
|
|
50
50
|
});
|
|
@@ -69,6 +69,12 @@ export const MeasurementsModuleProvider = (props) => {
|
|
|
69
69
|
});
|
|
70
70
|
})();
|
|
71
71
|
}, [files, didInvalidate, client, dispatch, loading]);
|
|
72
|
+
useEffect(() => {
|
|
73
|
+
dispatch(setGloballyUniqueMeasurementColors(globallyUniqueMeasurementColors));
|
|
74
|
+
}, [dispatch, globallyUniqueMeasurementColors]);
|
|
75
|
+
useEffect(() => {
|
|
76
|
+
dispatch(setDataScale(dataScale));
|
|
77
|
+
}, [dispatch, dataScale]);
|
|
72
78
|
return (React.createElement(MeasurementsModuleContext.Provider, { value: { client, selector, entitiesSelectors } }, children));
|
|
73
79
|
};
|
|
74
80
|
//# sourceMappingURL=MeasurementsModuleProvider.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MeasurementsModuleProvider.js","sourceRoot":"","sources":["../../src/components/MeasurementsModuleProvider.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"MeasurementsModuleProvider.js","sourceRoot":"","sources":["../../src/components/MeasurementsModuleProvider.tsx"],"names":[],"mappings":"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"}
|
|
@@ -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;
|
|
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,CAY9D,CAAC"}
|
|
@@ -9,9 +9,9 @@ import { SelectedContext } from "./SelectedContext";
|
|
|
9
9
|
* @param props
|
|
10
10
|
* @returns
|
|
11
11
|
*/
|
|
12
|
-
export const CheckboxCell = ({ id }) => {
|
|
12
|
+
export const CheckboxCell = ({ id, rowToDisable, }) => {
|
|
13
13
|
const { selected, single } = useContext(SelectedContext);
|
|
14
|
-
return (React.createElement("input", { type: single ? "radio" : "checkbox", checked: selected.indexOf(id) !== -1, onChange: () => { } }));
|
|
14
|
+
return (React.createElement("input", { type: single ? "radio" : "checkbox", checked: selected.indexOf(id) !== -1, onChange: () => { }, disabled: rowToDisable }));
|
|
15
15
|
};
|
|
16
16
|
/**
|
|
17
17
|
* A component used in MeasurementTable to show if this row is selected. Uses SelectedContext to keep track of currently
|
|
@@ -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;
|
|
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,MAAM,EAAE,GAAG,UAAU,CAAC,eAAe,CAAC,CAAC;IAEzD,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":"
|
|
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"}
|
|
@@ -42,6 +42,14 @@ declare type MeasurementsTableProps = Omit<React.HTMLAttributes<HTMLDivElement>,
|
|
|
42
42
|
* Callback when color of meaurement is changed.
|
|
43
43
|
*/
|
|
44
44
|
onColorChange?: (id: string, color: string) => void;
|
|
45
|
+
/**
|
|
46
|
+
* Use globally unique measurement colors or not
|
|
47
|
+
*/
|
|
48
|
+
globallyUniqueMeasurementColors?: boolean;
|
|
49
|
+
/**
|
|
50
|
+
* Data viewer id this measurementstable is used for
|
|
51
|
+
*/
|
|
52
|
+
dataViewerId: string;
|
|
45
53
|
};
|
|
46
54
|
/**
|
|
47
55
|
* A component to render a list of measurements in a table. This table provides functionalities like:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MeasurementsTable.d.ts","sourceRoot":"","sources":["../../../src/components/MeasurementsTable/MeasurementsTable.tsx"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,KAAyC,MAAM,OAAO,CAAC;AAkB9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,OAAO,CAAC;AAE1C,OAAO,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"MeasurementsTable.d.ts","sourceRoot":"","sources":["../../../src/components/MeasurementsTable/MeasurementsTable.tsx"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,KAAyC,MAAM,OAAO,CAAC;AAkB9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,OAAO,CAAC;AAE1C,OAAO,kCAAkC,CAAC;AAG1C,aAAK,sBAAsB,GAAG,IAAI,CAChC,KAAK,CAAC,cAAc,CAAC,cAAc,CAAC,EACpC,UAAU,CACX,GAAG;IACF;;OAEG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,YAAY,EAAE,iBAAiB,CAAC,WAAW,EAAE,CAAC;IAC9C;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB;;;OAGG;IACH,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IACxC;;;OAGG;IACH,gBAAgB,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IAChD;;;OAGG;IACH,eAAe,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC;IACxC;;OAEG;IACH,aAAa,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACpD;;OAEG;IACH,+BAA+B,CAAC,EAAE,OAAO,CAAC;IAC1C;;OAEG;IACH,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAkHF;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,iBAAiB,UAAW,sBAAsB,gBA+Q9D,CAAC"}
|
|
@@ -128,8 +128,9 @@ const defaultOnChange = () => { };
|
|
|
128
128
|
* @returns
|
|
129
129
|
*/
|
|
130
130
|
export const MeasurementsTable = (props) => {
|
|
131
|
-
const { selected = [], measurements, onChange = defaultOnChange, onColorChange, onYAxisPosChange, widths, single, formatFrequency } = props, rest = __rest(props, ["selected", "measurements", "onChange", "onColorChange", "onYAxisPosChange", "widths", "single", "formatFrequency"]);
|
|
131
|
+
const { selected = [], measurements, onChange = defaultOnChange, onColorChange, onYAxisPosChange, widths, single, formatFrequency, globallyUniqueMeasurementColors, dataViewerId } = props, rest = __rest(props, ["selected", "measurements", "onChange", "onColorChange", "onYAxisPosChange", "widths", "single", "formatFrequency", "globallyUniqueMeasurementColors", "dataViewerId"]);
|
|
132
132
|
const [showColorPicker, setShowColorPicker] = useState();
|
|
133
|
+
let selectedDataScaleValue = 0;
|
|
133
134
|
// This doesn't work correctly, the column separators between the top row and rest don't align nicely.
|
|
134
135
|
const scrollbarWidth = useScrollbarWidth();
|
|
135
136
|
const widthProps = useCallback((index, defaultVal = undefined) => {
|
|
@@ -141,19 +142,25 @@ export const MeasurementsTable = (props) => {
|
|
|
141
142
|
}, [widths]);
|
|
142
143
|
const columns = useMemo(() => [
|
|
143
144
|
createColumn(Object.assign({ Header: React.createElement("div", { "aria-label": "Active" }), accessor: "id", Cell: (data) => {
|
|
144
|
-
return React.createElement(CheckboxCell, { id: data.value
|
|
145
|
+
return (React.createElement(CheckboxCell, { id: data.value, rowToDisable: selected.length !== 0 &&
|
|
146
|
+
data.row.original.dataScale !== selectedDataScaleValue }));
|
|
145
147
|
}, disableFilters: true, disableResizing: true, disableSortBy: true, maxWidth: 30 }, widthProps(0, 35))),
|
|
146
148
|
createColumn(Object.assign({ id: "stageplayer_name_filter", Header: "Name", accessor: "name" }, widthProps(1))),
|
|
147
149
|
createColumn(Object.assign({ Header: "Unit", accessor: "unit" }, widthProps(2, 35))),
|
|
148
150
|
createColumn(Object.assign({ Header: "Min", accessor: "min" }, widthProps(3, 50))),
|
|
149
151
|
createColumn(Object.assign({ Header: "Max", accessor: "max" }, widthProps(4, 50))),
|
|
152
|
+
createColumn(Object.assign({ Header: "Data Scale", accessor: "dataScale" }, widthProps(4, 50))),
|
|
150
153
|
createColumn(Object.assign({ Header: "Sample Rate", id: "sampleRate", accessor: "frequency", Cell: (data) => {
|
|
151
154
|
return formatFrequency ? formatFrequency(data.value) : data.value;
|
|
152
155
|
}, readable: "sample rate", disableFilters: true }, widthProps(5, 100))),
|
|
153
156
|
createColumn(Object.assign({ Header: "Y-Axis Left Position", accessor: "yaxisLeftPos", Cell: (data) => {
|
|
154
157
|
return React.createElement(YAxisCheckboxCell, { yaxisLeftPos: data.row.id });
|
|
155
158
|
}, disableFilters: true }, widthProps(4, 50))),
|
|
156
|
-
createColumn(Object.assign(Object.assign({ Header: React.createElement("div", { "aria-label": "Color" }),
|
|
159
|
+
createColumn(Object.assign(Object.assign({ Header: React.createElement("div", { "aria-label": "Color" }), id: "color", accessor: (row) => globallyUniqueMeasurementColors
|
|
160
|
+
? "color"
|
|
161
|
+
: row.colorPerDataViewer
|
|
162
|
+
? row.colorPerDataViewer.byId[dataViewerId]
|
|
163
|
+
: "color", Cell: (data) => {
|
|
157
164
|
return (React.createElement(ColorCell, { showColorPicker: data.row.id === showColorPicker, color: data.value, onChangeColorPickerVisibility: (shouldShow) => {
|
|
158
165
|
if (shouldShow) {
|
|
159
166
|
setShowColorPicker(data.row.id);
|
|
@@ -165,7 +172,16 @@ export const MeasurementsTable = (props) => {
|
|
|
165
172
|
onColorChange && onColorChange(data.row.original.id, clr);
|
|
166
173
|
} }));
|
|
167
174
|
}, disableFilters: true }, widthProps(6, 36)), { disableResizing: true, disableSortBy: true, selectable: false })),
|
|
168
|
-
], [
|
|
175
|
+
], [
|
|
176
|
+
onColorChange,
|
|
177
|
+
widthProps,
|
|
178
|
+
showColorPicker,
|
|
179
|
+
formatFrequency,
|
|
180
|
+
globallyUniqueMeasurementColors,
|
|
181
|
+
dataViewerId,
|
|
182
|
+
selected.length,
|
|
183
|
+
selectedDataScaleValue,
|
|
184
|
+
]);
|
|
169
185
|
const { getTableProps, getTableBodyProps, headerGroups, rows, prepareRow } = useTable({
|
|
170
186
|
columns,
|
|
171
187
|
data: measurements,
|
|
@@ -188,8 +204,12 @@ export const MeasurementsTable = (props) => {
|
|
|
188
204
|
React.createElement(TableBodyContainer, null,
|
|
189
205
|
React.createElement(TableBody, Object.assign({}, getTableBodyProps()), rows.map((row, i) => {
|
|
190
206
|
prepareRow(row);
|
|
207
|
+
if (selected.indexOf(row.values.id) !== -1)
|
|
208
|
+
selectedDataScaleValue = row.original.dataScale;
|
|
191
209
|
return (React.createElement(Tr, Object.assign({}, row.getRowProps(), { tabIndex: 0, selected: selected.indexOf(row.values.id) !== -1, onKeyDown: (e) => {
|
|
192
|
-
if (e.key === "Enter"
|
|
210
|
+
if (e.key === "Enter" &&
|
|
211
|
+
(selected.length === 0 ||
|
|
212
|
+
row.original.dataScale === selectedDataScaleValue)) {
|
|
193
213
|
onChange && onChange(toggle(selected, row.values.id));
|
|
194
214
|
}
|
|
195
215
|
else if (e.key === "ArrowDown") {
|
|
@@ -212,14 +232,18 @@ export const MeasurementsTable = (props) => {
|
|
|
212
232
|
}
|
|
213
233
|
} }), row.cells.map((cell) => {
|
|
214
234
|
const clickHandler = () => {
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
: onYAxisPosChange &&
|
|
220
|
-
onYAxisPosChange(single
|
|
235
|
+
if (selected.length === 0 ||
|
|
236
|
+
cell.row.original.dataScale === selectedDataScaleValue) {
|
|
237
|
+
cell.column.selectable && onChange
|
|
238
|
+
? onChange(single
|
|
221
239
|
? [cell.row.original.id]
|
|
222
|
-
: toggle(selected, cell.row.original.id))
|
|
240
|
+
: toggle(selected, cell.row.original.id))
|
|
241
|
+
: onYAxisPosChange &&
|
|
242
|
+
onYAxisPosChange(single
|
|
243
|
+
? [cell.row.original.id]
|
|
244
|
+
: toggle(selected, cell.row.original.id));
|
|
245
|
+
selectedDataScaleValue = cell.row.original.dataScale;
|
|
246
|
+
}
|
|
223
247
|
};
|
|
224
248
|
return (React.createElement(Td, Object.assign({}, cell.getCellProps(), { onClick: clickHandler }),
|
|
225
249
|
React.createElement(Truncated, { title: cell.value }, cell.render("Cell"))));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MeasurementsTable.js","sourceRoot":"","sources":["../../../src/components/MeasurementsTable/MeasurementsTable.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA;;;;GAIG;AACH,OAAO,KAAK,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAC9D,OAAO,EACL,QAAQ,EAER,UAAU,EACV,aAAa,EACb,gBAAgB,EAChB,SAAS,GACV,MAAM,aAAa,CAAC;AACrB,OAAO,MAAM,MAAM,mBAAmB,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACjE,OAAO,KAAK,OAAO,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAGhD,OAAO,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"MeasurementsTable.js","sourceRoot":"","sources":["../../../src/components/MeasurementsTable/MeasurementsTable.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useMeasurements.d.ts","sourceRoot":"","sources":["../../src/hooks/useMeasurements.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,eAAO,MAAM,eAAe
|
|
1
|
+
{"version":3,"file":"useMeasurements.d.ts","sourceRoot":"","sources":["../../src/hooks/useMeasurements.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,eAAO,MAAM,eAAe;;;;;;;CAyB3B,CAAC"}
|
|
@@ -5,13 +5,20 @@ import { useMeasurementsModule } from "./useMeasurementsModule";
|
|
|
5
5
|
*/
|
|
6
6
|
export const useMeasurements = () => {
|
|
7
7
|
const { selector, entitiesSelectors } = useMeasurementsModule();
|
|
8
|
-
const { error, loading, didInvalidate } = useSelector((s) => {
|
|
8
|
+
const { error, loading, didInvalidate, globallyUniqueMeasurementColors, dataScale, } = useSelector((s) => {
|
|
9
9
|
const state = selector(s);
|
|
10
10
|
return state;
|
|
11
11
|
});
|
|
12
12
|
if (error)
|
|
13
13
|
console.error(error);
|
|
14
14
|
const measurements = useSelector(entitiesSelectors.measurements.selectAll);
|
|
15
|
-
return {
|
|
15
|
+
return {
|
|
16
|
+
measurements,
|
|
17
|
+
loading,
|
|
18
|
+
error,
|
|
19
|
+
didInvalidate,
|
|
20
|
+
globallyUniqueMeasurementColors,
|
|
21
|
+
dataScale,
|
|
22
|
+
};
|
|
16
23
|
};
|
|
17
24
|
//# sourceMappingURL=useMeasurements.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useMeasurements.js","sourceRoot":"","sources":["../../src/hooks/useMeasurements.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEhE;;GAEG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,GAAG,EAAE;IAClC,MAAM,EAAE,QAAQ,EAAE,iBAAiB,EAAE,GAAG,qBAAqB,EAAE,CAAC;IAChE,MAAM,
|
|
1
|
+
{"version":3,"file":"useMeasurements.js","sourceRoot":"","sources":["../../src/hooks/useMeasurements.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEhE;;GAEG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,GAAG,EAAE;IAClC,MAAM,EAAE,QAAQ,EAAE,iBAAiB,EAAE,GAAG,qBAAqB,EAAE,CAAC;IAChE,MAAM,EACJ,KAAK,EACL,OAAO,EACP,aAAa,EACb,+BAA+B,EAC/B,SAAS,GACV,GAAG,WAAW,CAAC,CAAC,CAAC,EAAE,EAAE;QACpB,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC1B,OAAO,KAAK,CAAC;IACf,CAAC,CAAC,CAAC;IAEH,IAAI,KAAK;QAAE,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAEhC,MAAM,YAAY,GAAG,WAAW,CAAC,iBAAiB,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;IAE3E,OAAO;QACL,YAAY;QACZ,OAAO;QACP,KAAK;QACL,aAAa;QACb,+BAA+B;QAC/B,SAAS;KACV,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -11,6 +11,8 @@ export declare const useMeasurementsModule: () => {
|
|
|
11
11
|
measurementScale: number;
|
|
12
12
|
files: import("../redux/measurements.slice").MeasurementsFile[];
|
|
13
13
|
colors: string[];
|
|
14
|
+
globallyUniqueMeasurementColors: boolean;
|
|
15
|
+
dataScale: number;
|
|
14
16
|
};
|
|
15
17
|
entitiesSelectors: {
|
|
16
18
|
measurements: import("@reduxjs/toolkit").EntitySelectors<import("..").MeasurementsTypes.Measurement, unknown>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useMeasurementsModule.d.ts","sourceRoot":"","sources":["../../src/hooks/useMeasurementsModule.ts"],"names":[],"mappings":"AAGA;;;IAGI;AACJ,eAAO,MAAM,qBAAqB
|
|
1
|
+
{"version":3,"file":"useMeasurementsModule.d.ts","sourceRoot":"","sources":["../../src/hooks/useMeasurementsModule.ts"],"names":[],"mappings":"AAGA;;;IAGI;AACJ,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;CASjC,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"}
|
|
@@ -24,6 +24,7 @@ export const useTimedMeasurementData = (options) => {
|
|
|
24
24
|
* The scale of the model for which the measurement data was recorded.
|
|
25
25
|
*/
|
|
26
26
|
const measurementScale = useSelector((s) => selector(s).measurementScale);
|
|
27
|
+
const dataScale = useSelector((s) => selector(s).dataScale);
|
|
27
28
|
const { measurements, loading, didInvalidate } = useMeasurements();
|
|
28
29
|
const [state, setState] = useState({
|
|
29
30
|
loading: false,
|
|
@@ -49,7 +50,7 @@ export const useTimedMeasurementData = (options) => {
|
|
|
49
50
|
// We'll map the timer to have an offset and for the time to be scaled using the measurement scale.
|
|
50
51
|
const time$ = timer.state.pipe(map((timerState) => {
|
|
51
52
|
const offset = timerState.time - start;
|
|
52
|
-
const time = offset * Math.sqrt(measurementScale);
|
|
53
|
+
const time = offset * Math.sqrt(measurementScale / dataScale);
|
|
53
54
|
return time;
|
|
54
55
|
}));
|
|
55
56
|
return client
|
|
@@ -115,6 +116,7 @@ export const useTimedMeasurementData = (options) => {
|
|
|
115
116
|
filesById,
|
|
116
117
|
timer,
|
|
117
118
|
measurementScale,
|
|
119
|
+
dataScale,
|
|
118
120
|
unit,
|
|
119
121
|
loading,
|
|
120
122
|
didInvalidate,
|
|
@@ -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,cAAc,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IAE3E;;OAEG;IACH,MAAM,KAAK,GAAG,WAAW,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IACpD,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE;QAC7B,OAAO,KAAK,CAAC,MAAM,CACjB,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,iCACP,GAAG,KACN,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,IACX,EACF,EAAyC,CAC1C,CAAC;IACJ,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IAEZ;;OAEG;IACH,MAAM,gBAAgB,GAAG,WAAW,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,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"}
|
|
@@ -15,6 +15,7 @@ export const useWindowedMeasurementData = (options) => {
|
|
|
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
|
+
const dataScale = useSelector((s) => selector(s).dataScale);
|
|
18
19
|
const { measurements } = useMeasurements();
|
|
19
20
|
const [state, setState] = useState({
|
|
20
21
|
loading: false,
|
|
@@ -45,14 +46,14 @@ export const useWindowedMeasurementData = (options) => {
|
|
|
45
46
|
// We'll map the timer to have an offset and for the time to be scaled using the measurement scale.
|
|
46
47
|
const time$ = timer.state.pipe(map((timerState) => {
|
|
47
48
|
const offsetTime = timerState.time - start;
|
|
48
|
-
const scaledOffsetTime = offsetTime * Math.sqrt(measurementScale);
|
|
49
|
+
const scaledOffsetTime = offsetTime * Math.sqrt(measurementScale / dataScale);
|
|
49
50
|
return scaledOffsetTime;
|
|
50
51
|
}));
|
|
51
52
|
return client
|
|
52
53
|
.createWindowedMeasurementDataObservable({
|
|
53
54
|
rows,
|
|
54
55
|
visibleWindow,
|
|
55
|
-
measurements: measurements.map((m) => m.
|
|
56
|
+
measurements: measurements.map((m) => m.index.join("/")),
|
|
56
57
|
// times are on a per-file basis, so this will use the offset of the file
|
|
57
58
|
time$,
|
|
58
59
|
file: grouped.key,
|
|
@@ -111,6 +112,7 @@ export const useWindowedMeasurementData = (options) => {
|
|
|
111
112
|
rows,
|
|
112
113
|
visibleWindow,
|
|
113
114
|
measurementScale,
|
|
115
|
+
dataScale,
|
|
114
116
|
unit,
|
|
115
117
|
timer.state,
|
|
116
118
|
filesById,
|
|
@@ -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,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAEhF,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAG1C,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAoBhE;;;;GAIG;AACH,MAAM,CAAC,MAAM,0BAA0B,GAAG,CACxC,OAA0C,EAC1C,EAAE;IACF,MAAM,EACJ,IAAI,EACJ,YAAY,EAAE,cAAc,EAC5B,aAAa,EACb,IAAI,EACJ,KAAK,GACN,GAAG,OAAO,CAAC;IAEZ,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,qBAAqB,EAAE,CAAC;IAErD,6KAA6K;IAC7K,wIAAwI;IACxI,MAAM,gBAAgB,GAAG,WAAW,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"useWindowedMeasurementData.js","sourceRoot":"","sources":["../../src/hooks/useWindowedMeasurementData.ts"],"names":[],"mappings":"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"}
|
|
@@ -52,6 +52,14 @@ declare type State = EntityState<MeasurementsTypes.Measurement> & {
|
|
|
52
52
|
* The list of colors that should be applied to the measurements when activated.
|
|
53
53
|
*/
|
|
54
54
|
colors: string[];
|
|
55
|
+
/**
|
|
56
|
+
* Use unique colors for all data viewers, or only per data viewer
|
|
57
|
+
*/
|
|
58
|
+
globallyUniqueMeasurementColors: boolean;
|
|
59
|
+
/**
|
|
60
|
+
* The scale of the data for which the measurements where recorded.
|
|
61
|
+
*/
|
|
62
|
+
dataScale: number;
|
|
55
63
|
};
|
|
56
64
|
declare const measurementsSlice: import("@reduxjs/toolkit").Slice<EntityState<MeasurementsTypes.Measurement> & {
|
|
57
65
|
error: Error | undefined;
|
|
@@ -60,6 +68,8 @@ declare const measurementsSlice: import("@reduxjs/toolkit").Slice<EntityState<Me
|
|
|
60
68
|
measurementScale: number;
|
|
61
69
|
files: MeasurementsFile[];
|
|
62
70
|
colors: string[];
|
|
71
|
+
globallyUniqueMeasurementColors: boolean;
|
|
72
|
+
dataScale: number;
|
|
63
73
|
}, {
|
|
64
74
|
createMeasurement: {
|
|
65
75
|
<S extends EntityState<MeasurementsTypes.Measurement>>(state: boolean extends (S extends never ? true : false) ? EntityState<MeasurementsTypes.Measurement> : S, entity: MeasurementsTypes.Measurement): S;
|
|
@@ -87,14 +97,17 @@ declare const measurementsSlice: import("@reduxjs/toolkit").Slice<EntityState<Me
|
|
|
87
97
|
measurementsLoading: (state: State) => void;
|
|
88
98
|
measurementsError: (state: State, action: PayloadAction<Error>) => void;
|
|
89
99
|
invalidate: (state: State) => void;
|
|
100
|
+
setGloballyUniqueMeasurementColors: (state: State, action: PayloadAction<boolean>) => void;
|
|
101
|
+
setDataScale: (state: State, action: PayloadAction<number>) => void;
|
|
90
102
|
}, "measurements">;
|
|
91
|
-
export declare const setFiles: import("@reduxjs/toolkit").ActionCreatorWithPayload<MeasurementsFile[], string>, createMeasurement: import("@reduxjs/toolkit").ActionCreatorWithPayload<MeasurementsTypes.Measurement, string>, updateMeasurement: import("@reduxjs/toolkit").ActionCreatorWithPayload<import("@reduxjs/toolkit").Update<MeasurementsTypes.Measurement>, string>, updateMeasurements: import("@reduxjs/toolkit").ActionCreatorWithPayload<MeasurementsTypes.Measurement[] | Record<import("@reduxjs/toolkit").EntityId, MeasurementsTypes.Measurement>, string>, invalidate: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, measurementsReceived: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, string>, measurementsLoading: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, measurementsError: import("@reduxjs/toolkit").ActionCreatorWithPayload<Error, string>;
|
|
103
|
+
export declare const setFiles: import("@reduxjs/toolkit").ActionCreatorWithPayload<MeasurementsFile[], string>, createMeasurement: import("@reduxjs/toolkit").ActionCreatorWithPayload<MeasurementsTypes.Measurement, string>, updateMeasurement: import("@reduxjs/toolkit").ActionCreatorWithPayload<import("@reduxjs/toolkit").Update<MeasurementsTypes.Measurement>, string>, updateMeasurements: import("@reduxjs/toolkit").ActionCreatorWithPayload<MeasurementsTypes.Measurement[] | Record<import("@reduxjs/toolkit").EntityId, MeasurementsTypes.Measurement>, string>, invalidate: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, measurementsReceived: import("@reduxjs/toolkit").ActionCreatorWithPayload<any, string>, measurementsLoading: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, measurementsError: import("@reduxjs/toolkit").ActionCreatorWithPayload<Error, string>, setGloballyUniqueMeasurementColors: import("@reduxjs/toolkit").ActionCreatorWithPayload<boolean, string>, setDataScale: import("@reduxjs/toolkit").ActionCreatorWithPayload<number, string>;
|
|
92
104
|
/**
|
|
93
105
|
* Selects (from the state) the index of the color that should be applied to the next measurements
|
|
94
106
|
* @param state The state from which the value should be selected.
|
|
95
107
|
* @returns
|
|
96
108
|
*/
|
|
97
109
|
export declare const selectLastColorIndex: (state: State) => number;
|
|
110
|
+
export declare const selectLastColorIndexPerDataViewer: (state: State, dataViewerId: string) => number;
|
|
98
111
|
export declare type MeasurementsModuleState = ReturnType<typeof measurementsSlice.reducer>;
|
|
99
112
|
declare const _default: import("redux").Reducer<EntityState<MeasurementsTypes.Measurement> & {
|
|
100
113
|
error: Error | undefined;
|
|
@@ -103,6 +116,8 @@ declare const _default: import("redux").Reducer<EntityState<MeasurementsTypes.Me
|
|
|
103
116
|
measurementScale: number;
|
|
104
117
|
files: MeasurementsFile[];
|
|
105
118
|
colors: string[];
|
|
119
|
+
globallyUniqueMeasurementColors: boolean;
|
|
120
|
+
dataScale: number;
|
|
106
121
|
}, import("redux").AnyAction>;
|
|
107
122
|
export default _default;
|
|
108
123
|
//# sourceMappingURL=measurements.slice.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"measurements.slice.d.ts","sourceRoot":"","sources":["../../src/redux/measurements.slice.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAGL,WAAW,EACX,aAAa,EACd,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAE7C;;GAEG;AACH,oBAAY,gBAAgB,GAAG;IAC7B;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,MAAM,EAAE;QACN,KAAK,EAAE,MAAM,CAAC;QACd,GAAG,EAAE,MAAM,CAAC;KACb,CAAC;CACH,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,mBAAmB,yEACsB,CAAC;AAEvD,aAAK,KAAK,GAAG,WAAW,CAAC,iBAAiB,CAAC,WAAW,CAAC,GAAG;IACxD;;OAEG;IACH,KAAK,EAAE,gBAAgB,EAAE,CAAC;IAC1B;;OAEG;IACH,gBAAgB,EAAE,MAAM,CAAC;IACzB;;OAEG;IACH,KAAK,EAAE,KAAK,GAAG,SAAS,CAAC;IACzB;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,aAAa,EAAE,OAAO,CAAC;IACvB;;OAEG;IACH,MAAM,EAAE,MAAM,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"measurements.slice.d.ts","sourceRoot":"","sources":["../../src/redux/measurements.slice.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAGL,WAAW,EACX,aAAa,EACd,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAE7C;;GAEG;AACH,oBAAY,gBAAgB,GAAG;IAC7B;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,MAAM,EAAE;QACN,KAAK,EAAE,MAAM,CAAC;QACd,GAAG,EAAE,MAAM,CAAC;KACb,CAAC;CACH,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,mBAAmB,yEACsB,CAAC;AAEvD,aAAK,KAAK,GAAG,WAAW,CAAC,iBAAiB,CAAC,WAAW,CAAC,GAAG;IACxD;;OAEG;IACH,KAAK,EAAE,gBAAgB,EAAE,CAAC;IAC1B;;OAEG;IACH,gBAAgB,EAAE,MAAM,CAAC;IACzB;;OAEG;IACH,KAAK,EAAE,KAAK,GAAG,SAAS,CAAC;IACzB;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,aAAa,EAAE,OAAO,CAAC;IACvB;;OAEG;IACH,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB;;OAEG;IACH,+BAA+B,EAAE,OAAO,CAAC;IACzC;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AA2CF,QAAA,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;sBAlCH,KAAK,UAAU,cAAc,gBAAgB,EAAE,CAAC;kCAGpC,KAAK,UAAU,cAAc,GAAG,CAAC;iCAKlC,KAAK;+BAKP,KAAK,UAAU,cAAc,KAAK,CAAC;wBAK1C,KAAK;gDAKhB,KAAK,UACJ,cAAc,OAAO,CAAC;0BAKV,KAAK,UAAU,cAAc,MAAM,CAAC;kBA6B1D,CAAC;AAEH,eAAO,MACL,QAAQ,mFACR,iBAAiB,8FACjB,iBAAiB,iIACjB,kBAAkB,6KAClB,UAAU,kEACV,oBAAoB,oEACpB,mBAAmB,kEACnB,iBAAiB,sEACjB,kCAAkC,wEAClC,YAAY,qEACe,CAAC;AAE9B;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,UAAW,KAAK,WAWhD,CAAC;AAEF,eAAO,MAAM,iCAAiC,UACrC,KAAK,gBACE,MAAM,WAgBrB,CAAC;AAEF,oBAAY,uBAAuB,GAAG,UAAU,CAC9C,OAAO,iBAAiB,CAAC,OAAO,CACjC,CAAC;;;;;;;;;;;AAEF,wBAAyC"}
|
|
@@ -31,6 +31,12 @@ const reducers = {
|
|
|
31
31
|
invalidate: (state) => {
|
|
32
32
|
state.didInvalidate = true;
|
|
33
33
|
},
|
|
34
|
+
setGloballyUniqueMeasurementColors: (state, action) => {
|
|
35
|
+
state.globallyUniqueMeasurementColors = action.payload;
|
|
36
|
+
},
|
|
37
|
+
setDataScale: (state, action) => {
|
|
38
|
+
state.dataScale = action.payload;
|
|
39
|
+
},
|
|
34
40
|
};
|
|
35
41
|
const measurementsSlice = createSlice({
|
|
36
42
|
name: "measurements",
|
|
@@ -52,10 +58,12 @@ const measurementsSlice = createSlice({
|
|
|
52
58
|
"#bcbd22",
|
|
53
59
|
"#17becf",
|
|
54
60
|
],
|
|
61
|
+
globallyUniqueMeasurementColors: true,
|
|
62
|
+
dataScale: 1,
|
|
55
63
|
}),
|
|
56
64
|
reducers,
|
|
57
65
|
});
|
|
58
|
-
export const { setFiles, createMeasurement, updateMeasurement, updateMeasurements, invalidate, measurementsReceived, measurementsLoading, measurementsError, } = measurementsSlice.actions;
|
|
66
|
+
export const { setFiles, createMeasurement, updateMeasurement, updateMeasurements, invalidate, measurementsReceived, measurementsLoading, measurementsError, setGloballyUniqueMeasurementColors, setDataScale, } = measurementsSlice.actions;
|
|
59
67
|
/**
|
|
60
68
|
* Selects (from the state) the index of the color that should be applied to the next measurements
|
|
61
69
|
* @param state The state from which the value should be selected.
|
|
@@ -68,5 +76,15 @@ export const selectLastColorIndex = (state) => {
|
|
|
68
76
|
}, -1);
|
|
69
77
|
return index;
|
|
70
78
|
};
|
|
79
|
+
export const selectLastColorIndexPerDataViewer = (state, dataViewerId) => {
|
|
80
|
+
const index = state.ids.reduce((acc, curr) => {
|
|
81
|
+
var _a, _b;
|
|
82
|
+
const measurement = state.entities[curr];
|
|
83
|
+
return Math.max(((_a = measurement === null || measurement === void 0 ? void 0 : measurement.colorPerDataViewer) === null || _a === void 0 ? void 0 : _a.byId[dataViewerId])
|
|
84
|
+
? state.colors.indexOf((_b = measurement === null || measurement === void 0 ? void 0 : measurement.colorPerDataViewer) === null || _b === void 0 ? void 0 : _b.byId[dataViewerId])
|
|
85
|
+
: -1, acc);
|
|
86
|
+
}, -1);
|
|
87
|
+
return index;
|
|
88
|
+
};
|
|
71
89
|
export default measurementsSlice.reducer;
|
|
72
90
|
//# sourceMappingURL=measurements.slice.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"measurements.slice.js","sourceRoot":"","sources":["../../src/redux/measurements.slice.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EACL,mBAAmB,EACnB,WAAW,GAGZ,MAAM,kBAAkB,CAAC;AAwB1B;;GAEG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAC9B,mBAAmB,EAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"measurements.slice.js","sourceRoot":"","sources":["../../src/redux/measurements.slice.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EACL,mBAAmB,EACnB,WAAW,GAGZ,MAAM,kBAAkB,CAAC;AAwB1B;;GAEG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAC9B,mBAAmB,EAAiC,CAAC;AAqCvD;;GAEG;AACH,MAAM,QAAQ,GAAG;IACf,iBAAiB,EAAE,mBAAmB,CAAC,MAAM;IAC7C,iBAAiB,EAAE,mBAAmB,CAAC,SAAS;IAChD,kBAAkB,EAAE,mBAAmB,CAAC,UAAU;IAClD,QAAQ,EAAE,CAAC,KAAY,EAAE,MAAyC,EAAE,EAAE;QACpE,KAAK,CAAC,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC;IAC/B,CAAC;IACD,oBAAoB,EAAE,CAAC,KAAY,EAAE,MAA0B,EAAE,EAAE;QACjE,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC;QACtB,mBAAmB,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IACxD,CAAC;IAED,mBAAmB,EAAE,CAAC,KAAY,EAAE,EAAE;QACpC,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC;QACrB,KAAK,CAAC,aAAa,GAAG,KAAK,CAAC;IAC9B,CAAC;IAED,iBAAiB,EAAE,CAAC,KAAY,EAAE,MAA4B,EAAE,EAAE;QAChE,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC;QACtB,KAAK,CAAC,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC;IAC/B,CAAC;IAED,UAAU,EAAE,CAAC,KAAY,EAAE,EAAE;QAC3B,KAAK,CAAC,aAAa,GAAG,IAAI,CAAC;IAC7B,CAAC;IAED,kCAAkC,EAAE,CAClC,KAAY,EACZ,MAA8B,EAC9B,EAAE;QACF,KAAK,CAAC,+BAA+B,GAAG,MAAM,CAAC,OAAO,CAAC;IACzD,CAAC;IAED,YAAY,EAAE,CAAC,KAAY,EAAE,MAA6B,EAAE,EAAE;QAC5D,KAAK,CAAC,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC;IACnC,CAAC;CACF,CAAC;AAEF,MAAM,iBAAiB,GAAG,WAAW,CAAC;IACpC,IAAI,EAAE,cAAc;IACpB,YAAY,EAAE,mBAAmB,CAAC,eAAe,CAAC;QAChD,KAAK,EAAE,SAA8B;QACrC,OAAO,EAAE,KAAK;QACd,aAAa,EAAE,IAAI;QACnB,gBAAgB,EAAE,CAAC;QACnB,KAAK,EAAE,EAAwB;QAC/B,MAAM,EAAE;YACN,SAAS;YACT,SAAS;YACT,SAAS;YACT,SAAS;YACT,SAAS;YACT,SAAS;YACT,SAAS;YACT,SAAS;YACT,SAAS;YACT,SAAS;SACV;QACD,+BAA+B,EAAE,IAAI;QACrC,SAAS,EAAE,CAAC;KACb,CAAC;IACF,QAAQ;CACT,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,EACX,QAAQ,EACR,iBAAiB,EACjB,iBAAiB,EACjB,kBAAkB,EAClB,UAAU,EACV,oBAAoB,EACpB,mBAAmB,EACnB,iBAAiB,EACjB,kCAAkC,EAClC,YAAY,GACb,GAAG,iBAAiB,CAAC,OAAO,CAAC;AAE9B;;;;GAIG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,KAAY,EAAE,EAAE;IACnD,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,GAAW,EAAE,IAAI,EAAE,EAAE;QACnD,MAAM,WAAW,GAAG,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAEzC,OAAO,IAAI,CAAC,GAAG,CACb,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,KAAK,EAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAClE,GAAG,CACJ,CAAC;IACJ,CAAC,EAAE,CAAC,CAAW,CAAC,CAAC;IAEjB,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,iCAAiC,GAAG,CAC/C,KAAY,EACZ,YAAoB,EACpB,EAAE;IACF,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,GAAW,EAAE,IAAI,EAAE,EAAE;;QACnD,MAAM,WAAW,GAAG,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAEzC,OAAO,IAAI,CAAC,GAAG,CACb,CAAA,MAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,kBAAkB,0CAAE,IAAI,CAAC,YAAY,CAAC;YACjD,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAClB,MAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,kBAAkB,0CAAE,IAAI,CAAC,YAAY,CAAC,CACpD;YACH,CAAC,CAAC,CAAC,CAAC,EACN,GAAG,CACJ,CAAC;IACJ,CAAC,EAAE,CAAC,CAAW,CAAC,CAAC;IAEjB,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAMF,eAAe,iBAAiB,CAAC,OAAO,CAAC"}
|
package/lib/redux/reducer.d.ts
CHANGED
|
@@ -5,5 +5,7 @@ export declare const measurementsModuleReducer: import("redux").Reducer<import("
|
|
|
5
5
|
measurementScale: number;
|
|
6
6
|
files: import("./measurements.slice").MeasurementsFile[];
|
|
7
7
|
colors: string[];
|
|
8
|
+
globallyUniqueMeasurementColors: boolean;
|
|
9
|
+
dataScale: number;
|
|
8
10
|
}, import("redux").AnyAction>;
|
|
9
11
|
//# sourceMappingURL=reducer.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reducer.d.ts","sourceRoot":"","sources":["../../src/redux/reducer.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,yBAAyB
|
|
1
|
+
{"version":3,"file":"reducer.d.ts","sourceRoot":"","sources":["../../src/redux/reducer.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,yBAAyB;;;;;;;;;6BAAoB,CAAC"}
|
package/lib/types.d.ts
CHANGED
|
@@ -12,6 +12,12 @@ export declare module MeasurementsTypes {
|
|
|
12
12
|
index: string[];
|
|
13
13
|
start: number;
|
|
14
14
|
end: number;
|
|
15
|
+
colorPerDataViewer?: {
|
|
16
|
+
byId: {
|
|
17
|
+
[key: string]: string;
|
|
18
|
+
};
|
|
19
|
+
};
|
|
20
|
+
dataScale: number;
|
|
15
21
|
};
|
|
16
22
|
type Request = {
|
|
17
23
|
action: string;
|
|
@@ -35,7 +41,7 @@ export declare module MeasurementsTypes {
|
|
|
35
41
|
};
|
|
36
42
|
type MetadataResponseMeasurement = {
|
|
37
43
|
type: "measurement";
|
|
38
|
-
} & Pick<Measurement, "name" | "min" | "max" | "yaxisLeftPos" | "unit" | "frequency">;
|
|
44
|
+
} & Pick<Measurement, "name" | "min" | "max" | "yaxisLeftPos" | "unit" | "frequency" | "dataScale">;
|
|
39
45
|
type MetadataResponseGroup = {
|
|
40
46
|
type: "group";
|
|
41
47
|
name: string;
|
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;
|
|
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.4.
|
|
3
|
+
"version": "0.4.23",
|
|
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",
|
|
@@ -30,8 +30,8 @@
|
|
|
30
30
|
},
|
|
31
31
|
"dependencies": {
|
|
32
32
|
"@insync-stageplayer/common": "^0.4.12",
|
|
33
|
-
"@insync-stageplayer/time": "^0.4.
|
|
34
|
-
"@insync-stageplayer/ui-components": "^0.4.
|
|
33
|
+
"@insync-stageplayer/time": "^0.4.22",
|
|
34
|
+
"@insync-stageplayer/ui-components": "^0.4.23",
|
|
35
35
|
"@reduxjs/toolkit": "^1.5.1",
|
|
36
36
|
"@types/randomcolor": "^0.5.5",
|
|
37
37
|
"insync-date": "^1.1.2",
|
|
@@ -53,5 +53,5 @@
|
|
|
53
53
|
"optionalDependencies": {
|
|
54
54
|
"sbfreader": "^1.0.0-alpha.5"
|
|
55
55
|
},
|
|
56
|
-
"gitHead": "
|
|
56
|
+
"gitHead": "da93bfae3c7964f787ac364889b933ad5109efae"
|
|
57
57
|
}
|