brandxtech/frontend
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev_environment' of gitlab.com:brandx/bxt-app into dev_environment

Browse source
This commit is contained in:
Carter 2025-10-29 11:03:33 -06:00
commit b63724fbfd
2 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/pbHelpers/ComponentTypes/DragerGasDongle.ts
View file

@ -170,6 +170,7 @@ export function dragerGasDongle(subtype: number = 0): ComponentTypeExtension {
let firstTime: Moment | undefined; let firstTime: Moment | undefined;
let lastTime: Moment | undefined; let lastTime: Moment | undefined;
let valMap: Map<number, number[]> = new Map<number, number[]>(); let valMap: Map<number, number[]> = new Map<number, number[]>();
if(measurement.type === quack.MeasurementType.MEASUREMENT_TYPE_PPM){
measurement.values.forEach((vals, i) => { measurement.values.forEach((vals, i) => {
let avgVals: Point[] = []; let avgVals: Point[] = [];
let newLineData: LineData = { let newLineData: LineData = {
@ -205,6 +206,14 @@ export function dragerGasDongle(subtype: number = 0): ComponentTypeExtension {
valMap = new Map<number, number[]>(); valMap = new Map<number, number[]>();
} }
}); });
} else {
chartData = simpleLineChartData(
quack.ComponentType.COMPONENT_TYPE_DRAGER_GAS_DONGLE,
measurement,
smoothingAverages,
filters
);
}
} else { } else {
chartData = simpleLineChartData( chartData = simpleLineChartData(
quack.ComponentType.COMPONENT_TYPE_DRAGER_GAS_DONGLE, quack.ComponentType.COMPONENT_TYPE_DRAGER_GAS_DONGLE,
@ -212,6 +221,7 @@ export function dragerGasDongle(subtype: number = 0): ComponentTypeExtension {
smoothingAverages, smoothingAverages,
filters filters
); );
console.log(chartData)
} }
return chartData; return chartData;
}, },

1
src/pbHelpers/MeasurementDescriber.ts
View file

@ -176,6 +176,7 @@ export class MeasurementDescriber {
this.details.unit = "mV"; this.details.unit = "mV";
this.details.graph = GraphType.MULTILINE; this.details.graph = GraphType.MULTILINE;
this.details.unit = "mV"; this.details.unit = "mV";
this.details.decimals = 0
// this.details.nodeDetails = { // this.details.nodeDetails = {
// colours: ["white", "black", "red", "blue"], // colours: ["white", "black", "red", "blue"],
// labels: ["millivolt1", "millivolt2", "millivolt3", "millivolt4"] // labels: ["millivolt1", "millivolt2", "millivolt3", "millivolt4"]