Xshift FIX

2 files changed, 5 insertions, 9 deletions

diff --git a/blocks/eda-frontend/src/components/SchematicEditor/SimulationScreen.js b/blocks/eda-frontend/src/components/SchematicEditor/SimulationScreen.js
index 477c1409..86ccf84a 100644
--- a/blocks/eda-frontend/src/components/SchematicEditor/SimulationScreen.js
+++ b/blocks/eda-frontend/src/components/SchematicEditor/SimulationScreen.js
@@ -89,10 +89,6 @@ export default function SimulationScreen ({ open, close }) {
 
     const addPointToGraph = (id, point) => {
       const refId = chartIdList.current[id]
-      if (point[1] > datapointsRef.current[refId].datapointXMax) {
-        datapointsRef.current[refId].datapointXMax = point[1] + 2
-        datapointsRef.current[refId].datapointXMin = datapointsRef.current[refId].datapointXMin + 2
-      }
       if (graphsRef.current[refId] !== undefined) {
         graphsRef.current[refId].addPointToQueue(id, point)
       } else {
diff --git a/blocks/eda-frontend/src/components/Shared/Graph.js b/blocks/eda-frontend/src/components/Shared/Graph.js
index a71963d2..1d0afcda 100644
--- a/blocks/eda-frontend/src/components/Shared/Graph.js
+++ b/blocks/eda-frontend/src/components/Shared/Graph.js
@@ -34,15 +34,15 @@ class Graph extends React.Component {
 
               function addPoints () {
                 while (!pointList.isEmpty()) {
-                  const xmax = datapoint.datapointXMax
+                  const xmax = chart.xAxis[0].max
+                  const xmin = chart.xAxis[0].min
+                  const xshift = (xmax - xmin) * 0.2
                   const point = pointList.peek()
                   const x = parseFloat(point[1])
                   if (x > xmax) {
-                    datapoint.datapointXMax = datapoint.datapointXMax + 4
-                    datapoint.datapointXMin = datapoint.datapointXMin + 4
                     chart.xAxis[0].update({
-                      max: datapoint.datapointXMax,
-                      min: datapoint.datapointXMin
+                      max: xmax + xshift,
+                      min: xmin + xshift
                     })
                     chart.redraw()
                   }