AllSpiceMirrors/ThunderScope
7
Fork 0
mirror of https://github.com/EEVengers/ThunderScope.git synced 2025-04-08 06:25:30 +00:00
Files Issues Releases Activity

bugfixes

Browse Source
This commit is contained in:
Ratan Varghese 2021-03-23 05:17:51 -04:00
parent 5bd2362ee4
commit bdce389ead
2 changed files with 9 additions and 7 deletions
Software/waveview/src
components/graph
graph.tsx
util
testpoints.ts

2
Software/waveview/src/components/graph/graph.tsx
View File

@ -16,7 +16,7 @@ import TestPoints from '../../util/testpoints';
class Graph extends React.Component<any, any> {
static instanceList: Graph[] = [];
timerID: number = 0;
generator: TestPoints = new TestPoints(500, 50);
generator: TestPoints = new TestPoints(50, 50);
componentDidMount() {
Graph.instanceList.push(this);

14
Software/waveview/src/util/testpoints.ts
View File

@ -63,20 +63,22 @@ class TestPoints {
var chMax = (doMath) ? order.length + 1: order.length;
var perChannel = Math.floor(body.length/chMax);
let xOffset = (this.lastX < xLimit) ? this.lastX : 0;
for(var channel = 0; channel < this.getDataMaxCh; channel++) {
let mathCh = (channel == this.getDataMaxCh-1) && doMath;
let dataCh = order.includes(channel + 1);
var cppChannel = 0;
for(var uiChannel = 0; uiChannel < this.getDataMaxCh; uiChannel++) {
let mathCh = (uiChannel == this.getDataMaxCh-1) && doMath;
let dataCh = order.includes(uiChannel + 1);
if(mathCh || dataCh) {
for(var i = 0; i < perChannel; i++) {
var x = xOffset + i;
if(x != 0 && !this.scope_data[channel][x-1]) {
if(x != 0 && !this.scope_data[uiChannel][x-1]) {
//Adding a channel while other channels in middle of screen
//causes an error.
break;
}
let y = body[channel*perChannel + i];
this.scope_data[channel][x] = {x: x, y: y};
let y = body[cppChannel*perChannel + i];
this.scope_data[uiChannel][x] = {x: x, y: y};
}
cppChannel++;
}
}
this.lastX = xOffset + perChannel;