Skip to content

fix sweep plot x values for increasing number of points #14

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 1 commit into from
Sep 23, 2025
Merged

fix sweep plot x values for increasing number of points #14

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 19 additions & 11 deletions ...pt-gen-ui/src/app/components/main-sweep/plot-container/plot-sweep/plot-sweep.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@ import { PlotUtils } from '../plot-utils';
styleUrl: './plot-sweep.component.scss',
})
export class PlotSweepComponent
implements AfterViewInit, OnInit, OnDestroy, OnChanges
{
implements AfterViewInit, OnInit, OnDestroy, OnChanges {
@Input() sweepChannel: SweepChannel | undefined;
@Input() sweepGlobalParameters: SweepGlobalParameters | undefined;
@Input() stepGlobalParameters: StepGlobalParameters | undefined;
Expand Down Expand Up @@ -91,6 +90,7 @@ export class PlotSweepComponent
size: 9,
},
dtick: 1,
range: [0, 10],
// tick0: 0,
showtickprefix: 'none',
showticksuffix: 'all',
Expand Down Expand Up @@ -207,7 +207,7 @@ export class PlotSweepComponent
};
private plotData = [this.plotData1, this.plotData2];

constructor(public elementRef: ElementRef) {}
constructor(public elementRef: ElementRef) { }

ngOnChanges(changes: SimpleChanges): void {
if (changes['isActive'] && !changes['isActive'].isFirstChange()) {
Expand Down Expand Up @@ -291,26 +291,31 @@ export class PlotSweepComponent
}
}

private generatePlotDataxy(sweepValues: number[]) {
private generatePlotDataxy(sweepValues: number[], xData?: number[]) {
if (this.numPoints && this.numSteps) {
const numSteps = this.numSteps;
const numberOfPoints = this.numPoints?.value;
this.plotData1.y = Array.from({ length: numSteps }, () => sweepValues)
.flat()
.concat(sweepValues[sweepValues.length - 1]);

this.plotData1.x = Array.from({ length: numSteps }, (_, i) =>
Array.from({ length: numberOfPoints }, (_, j) => i + j / numberOfPoints)
)
.flat()
.concat(numSteps);
if (xData) {
this.plotData1.x = xData;
} else {
this.plotData1.x = Array.from({ length: numSteps }, (_, i) =>
Array.from({ length: numberOfPoints }, (_, j) => i + j / numberOfPoints)
)
.flat()
.concat(numSteps);
}
}
}

private generatePlotData(sweepValues: number[], type: string) {
if (this.numPoints && this.numSteps) {
const targetLength = this.plotWidth / this.numPoints.value;
const targetLength = this.plotWidth / this.numSteps;
if (this.numPoints?.value > targetLength) {
let xData: number[] = [];
if (type == 'LIN') {
const interpolated = PlotUtils.linearInterpolation(
sweepValues,
Expand All @@ -324,11 +329,14 @@ export class PlotSweepComponent
);
sweepValues = interpolated.y;
}
this.generatePlotDataxy(sweepValues);
xData = Array.from({ length: this.numSteps }, (_, i) =>
Array.from({ length: sweepValues.length }, (_, j) => i + j / sweepValues.length)).flat().concat(this.numSteps)
this.generatePlotDataxy(sweepValues, xData);
} else {
this.generatePlotDataxy(sweepValues);
}
this.plotLayout.xaxis.dtick = this.numSteps / 10;
this.plotLayout.xaxis.range = [0, this.numSteps];
}
}

Expand Down
Loading