Fix: Script Gen- Sweep Graph Preview Cuts Off End of Graph (#46)

* TSP-947 Script generation infrastructure first cut

* TSP-947 Fix multiple channel issue in script

* TSP-948 Fix linting issues

* TSP-Script-Gen-UI- Linting done (both angular and rust)

* TSP-Script-Gen-UI step and sweep points update fixed to show on plot

* TSP-Script-Gen All linitng done with standalones

* TSP-960-Scrolling input containers to view done

* TSP-Scrip-Gen-UI- Scroll into view feature done

* Script-Gen-UI- UI changes done (through reviews from UX team)

* Revert "Merge branch 'main' into task/TSP-960-style-layout"

This reverts commit 12b90fcd4c35917273d40a01e1c5f21dfc5ac79e, reversing
changes made to beb512d73be7731c565fec696796c0cd47e5878a.

* Reapply "Merge branch 'main' into task/TSP-960-style-layout"

This reverts commit 712497e134fc83278e4ec837ff50212ac1f77484.

* TSP-960-Scroll-Into-View done with UI changes

* TSP-944-resizing and layout of the input containers done

* Script-Gen-UI- Fixed the error and bias plot background color

* Script-Gen-UI- Sweep color fix

* Script-Gen-UI- fixed arrows and step add and remove button

* TSP-944- Input panes reflow when shrunk done

* Added styles to timing popup

* Removed files as per review comment

* tsp-1123-Fix start and stop CSS in Step and Sweep Section

* Fix start and stop border in step and sweep

* tsp-1123-Fix leaking CSS in start and stop

* Task/tsp-1201-Correct the spelling of the "Aperture" textbox in the Timing tab

* task/tsp-1199-fix-automation name & IDs are missing for the combo box and textboxes in the Timing Tab

* fix automation IDs for measure delay and rate

* remove duplicate automationID from input-numeric

* TSP-1202-add automation Names and automationIDs for Bias

* Fix automation names for NPLC and Aperture in Timing

* fix issue with automation names in timing and bias (script-gen)

* fix: bias plot range for source range AUTO

* fix: tsp-1230 and tsp-1231
-The automation name & IDs are missing for the combo box and textboxes in the Step
-The automation name & IDs are missing for the combo box and textboxes in the Sweep

* fix: Script Gen- Sweep Graph Preview Cuts Off End of Graph

* refactor: move repeated code into function generatePlotData()

---------

Co-authored-by: GT, Shreya <[email protected]>
Co-authored-by: Rajeshwari Kiwad <[email protected]>

Author: 3 people

script-gen-ui/src/app/components/main-sweep/plot-container/plot-sweep/plot-sweep.component.ts

@@ -260,17 +260,21 @@ export class PlotSweepComponent
         (_, i) => startValue + i * stepSize
       ).flat();
 
-      this.plotData1.y = Array.from(
-        { length: this.numSteps },
-        () => sweepValues
-      ).flat();
-
-      this.plotData1.x = Array.from({ length: this.numSteps }, (_, i) =>
-        Array.from({ length: numberOfPoints }, (_, j) => i + j / numberOfPoints)
-      ).flat();
+      this.generatePlotData(sweepValues, numberOfPoints);
     }
   }
 
+  private generatePlotData(sweepValues: number[], numberOfPoints: number) {
+    const numSteps = this.numSteps || 0;
+    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);
+  }
+
   // the plots are rendered only after the DOM is created, so we need to render them after the DOM is loaded
   ngAfterViewInit(): void {
     if (this.style?.value == 'LIN' && this.list == false) {
@@ -331,7 +335,7 @@ export class PlotSweepComponent
     if (this.style?.value === 'LOG') {
       if (this.start && this.stop && this.numSteps && this.numPoints) {
         const numberOfPoints = this.numPoints.value;
-        const numSteps = this.numSteps;
+        // const numSteps = this.numSteps;
         const startValue = this.start.value > 0 ? this.start.value : 1e-12;
         const stopValue = this.stop.value > 0 ? this.stop.value : 1e-12;
         const stepFactor = Math.pow(
@@ -344,14 +348,7 @@ export class PlotSweepComponent
           (_, i) => startValue * Math.pow(stepFactor, i)
         );
 
-        this.plotData1.y = Array.from(
-          { length: numSteps },
-          () => sweepValues
-        ).flat();
-
-        this.plotData1.x = Array.from({ length: numSteps }, (_, i) =>
-          sweepValues.map((_, j) => i + j / numberOfPoints)
-        ).flat();
+        this.generatePlotData(sweepValues, numberOfPoints);
 
         console.log('LOG sweep plotData1.x:', this.plotData1.x);
         console.log('LOG sweep plotData1.y:', this.plotData1.y);
@@ -367,17 +364,11 @@ export class PlotSweepComponent
     // console.log('listSweep: step and sweep', this.listSweep, this.numPoints, this.numSteps);
     if (this.listSweep && this.numPoints && this.numSteps) {
       const numberOfPoints = this.numPoints.value;
-      const numSteps = this.numSteps;
+      // const numSteps = this.numSteps;
 
       const sweepValues = this.listSweep.map((pf) => pf?.value ?? 0);
-      this.plotData1.y = Array.from(
-        { length: numSteps },
-        () => sweepValues
-      ).flat();
 
-      this.plotData1.x = Array.from({ length: numSteps }, (_, i) =>
-        Array.from({ length: numberOfPoints }, (_, j) => i + j / numberOfPoints)
-      ).flat();
+      this.generatePlotData(sweepValues, numberOfPoints);
 
       this.plotData1.line.shape = 'hv';
       // console.log('List sweep plotData1.x:', this.plotData1.x);