Skip to content

Commit dc3a465

Browse files
committed
Further update parsing of sampling to match tsp specification
The tsp-typescript-client was modified to comply to tsp specification for sampling, update accordingly here. Account for new xRanges and xCategories for generic xy output component. Signed-off-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
1 parent 9c3224d commit dc3a465

1 file changed

Lines changed: 5 additions & 6 deletions

File tree

local-libs/traceviewer-libs/react-components/src/components/generic-xy-output-component.tsx

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -320,8 +320,7 @@ export class GenericXYOutputComponent extends AbstractTreeOutputComponent<Generi
320320

321321
const style = (series[0] as any)?.style?.values?.['series-type'] as string | undefined;
322322
const st = style?.toLowerCase();
323-
const xv = series[0].xValues as Sampling;
324-
this.isTimeAxis = isTimestampSampling(xv);
323+
this.isTimeAxis = !!series[0].xValues;
325324
this.mode = st === 'scatter' ? ChartMode.SCATTER : st === 'line' ? ChartMode.LINE : ChartMode.BAR;
326325

327326
const xy = this.buildXYData(series, this.mode);
@@ -342,9 +341,9 @@ export class GenericXYOutputComponent extends AbstractTreeOutputComponent<Generi
342341
}
343342

344343
private buildBarChartData(seriesObj: XYSeries[]): GenericXYData {
345-
const xValues = seriesObj[0].xValues;
344+
const xValues = seriesObj[0].xValues ?? seriesObj[0].xRanges ?? seriesObj[0].xCategories;
346345
const unit = seriesObj[0]?.xValuesDescription?.unit || '';
347-
const labels = this.buildLabels(xValues, unit);
346+
const labels = this.buildLabels(xValues as Sampling, unit);
348347
const datasets: GenericXYData['datasets'] = seriesObj.map(s => {
349348
const color = this.colors.get(s.seriesName);
350349
return {
@@ -361,9 +360,9 @@ export class GenericXYOutputComponent extends AbstractTreeOutputComponent<Generi
361360
}
362361

363362
private buildLineOrScatterChartData(seriesObj: XYSeries[], mode: ChartMode): GenericXYData {
364-
const xValues = seriesObj[0].xValues;
363+
const xValues = seriesObj[0].xValues ?? seriesObj[0].xRanges ?? seriesObj[0].xCategories;
365364
const unit = seriesObj[0]?.xValuesDescription?.unit || '';
366-
const labels = this.buildLabels(xValues, unit);
365+
const labels = this.buildLabels(xValues as Sampling, unit);
367366

368367
const datasets: GenericXYData['datasets'] = seriesObj.map(s => {
369368
const color = this.colors.get(s.seriesName);

0 commit comments

Comments
 (0)