Skip to content

Update parsing of sampling to match tsp specification #354

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 17, 2025
Merged

Update parsing of sampling to match tsp specification #354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c3224d
Update parsing of sampling to match tsp specification
Oct 1, 2025
f97fb3a
Further update parsing of sampling to match tsp specification
bhufmann Oct 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion local-libs/traceviewer-libs/base/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"src"
],
"dependencies": {
"tsp-typescript-client": "^0.8.0"
"tsp-typescript-client": "^0.9.0"
},
"devDependencies": {
"@typescript-eslint/eslint-plugin": "^6.0.0",
Expand Down
2 changes: 1 addition & 1 deletion local-libs/traceviewer-libs/react-components/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"react-virtualized": "^9.21.0",
"timeline-chart": "^0.4.2",
"traceviewer-base": "0.9.1",
"tsp-typescript-client": "^0.8.0"
"tsp-typescript-client": "^0.9.0"
},
"devDependencies": {
"@testing-library/react": "^15.0.6",
Expand Down
13 changes: 6 additions & 7 deletions local-libs/traceviewer-libs/react-components/src/components/generic-xy-output-component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,8 +320,7 @@ export class GenericXYOutputComponent extends AbstractTreeOutputComponent<Generi

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

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

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

private buildLineOrScatterChartData(seriesObj: XYSeries[], mode: ChartMode): GenericXYData {
const xValues = seriesObj[0].xValues;
const xValues = seriesObj[0].xValues ?? seriesObj[0].xRanges ?? seriesObj[0].xCategories;
const unit = seriesObj[0]?.xValuesDescription?.unit || '';
const labels = this.buildLabels(xValues, unit);
const labels = this.buildLabels(xValues as Sampling, unit);

const datasets: GenericXYData['datasets'] = seriesObj.map(s => {
const color = this.colors.get(s.seriesName);
Expand All @@ -388,7 +387,7 @@ export class GenericXYOutputComponent extends AbstractTreeOutputComponent<Generi

private buildLabels(xValues: Sampling, unit: string): string[] {
if (isRangeSampling(xValues)) {
return xValues.map(range => `[${range[0]} ${unit}, ${range[1]} ${unit}]`);
return xValues.map(range => `[${range.start} ${unit}, ${range.end} ${unit}]`);
} else if (isCategorySampling(xValues)) {
return xValues.map(val => `${val} ${unit}`);
} else if (isTimestampSampling(xValues)) {
Expand Down
2 changes: 1 addition & 1 deletion vscode-trace-common/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
],
"dependencies": {
"traceviewer-base": "^0.9.1",
"tsp-typescript-client": "^0.8.0",
"tsp-typescript-client": "^0.9.0",
"vscode-messenger": "^0.5.0"
},
"devDependencies": {
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9786,10 +9786,10 @@ tslib@^2.1.0, tslib@^2.3.0, tslib@^2.4.0:
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f"
integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==

tsp-typescript-client@^0.8.0:
version "0.8.0"
resolved "https://registry.yarnpkg.com/tsp-typescript-client/-/tsp-typescript-client-0.8.0.tgz#954a58acf53e52e57796e5fc2e3fe1f512c2af45"
integrity sha512-dad+EVvP3bIosuskKzZxPwiuT47ewq0rXOrg/SMnFqdE5QVXyn3MhDcXFYH9iNxRvu2zQcb+DMigN/WOcdMrEQ==
tsp-typescript-client@^0.9.0:
version "0.9.0"
resolved "https://registry.npmjs.org/tsp-typescript-client/-/tsp-typescript-client-0.9.0.tgz#631b57635560f23a96dd8391db345bb0e645b7c5"
integrity sha512-tftuTbID6t9m+hJ6LRHbCC5dkRL//OcGladeDtbiwe1Te/HknO8XmYNvsx0xRa8MpPUG9Th15ON4whXfzzBUew==
dependencies:
json-bigint sidorares/json-bigint#2c0a5f896d7888e68e5f4ae3c7ea5cd42fd54473
node-fetch "^2.6.0"
Expand Down
Loading