AllSpiceMirrors/ThunderScope
7
Fork 0
mirror of https://github.com/EEVengers/ThunderScope.git synced 2025-04-14 23:59:19 +00:00
Files Issues Releases Activity

measurementWidget now uses vertical units

Browse Source
This commit is contained in:
Jason Bonnell 2021-03-22 15:21:27 -04:00
parent 3c4729df5c
commit 414671373d
2 changed files with 38 additions and 12 deletions
Software/waveview/src
components/sidebar/widgets
measurementsWidget.tsx
util
plumber.ts

44
Software/waveview/src/components/sidebar/widgets/measurementsWidget.tsx
View File

@ -6,6 +6,7 @@ import GraphStatus from '../../../configuration/enums/graphStatus';
import CMD from '../../../configuration/enums/cmd';
import {Plumber, PlumberArgs} from '../../../util/plumber';
import ControlMode from '../../../configuration/enums/controlMode';
class MeasurementsWidget extends React.Component<any, any> {
static instanceList: MeasurementsWidget[] = [];
@ -128,7 +129,10 @@ class MeasurementsWidget extends React.Component<any, any> {
className="Channel1-MaxValue"
style={{color: this.props.settings.colors.channel[0]}}>
{this.props.measurementsWidget.max[0].value}
{this.props.measurementsWidget.max[0].unit}
{this.props.verticalWidget.settings[0].controlMode === ControlMode.Course
&& this.props.verticalWidget.timePerDivision[0].course.unit.toString()}
{this.props.verticalWidget.settings[0].controlMode === ControlMode.Fine
&& + this.props.verticalWidget.timePerDivision[0].fine.unit.toString()}
</label>
<div className="ClearBlock"></div>
<label
@ -140,7 +144,10 @@ class MeasurementsWidget extends React.Component<any, any> {
className="Channel1-MinValue"
style={{color: this.props.settings.colors.channel[0]}}>
{this.props.measurementsWidget.min[0].value}
{this.props.measurementsWidget.min[0].unit}
{this.props.verticalWidget.settings[0].controlMode === ControlMode.Course
&& this.props.verticalWidget.timePerDivision[0].course.unit.toString()}
{this.props.verticalWidget.settings[0].controlMode === ControlMode.Fine
&& + this.props.verticalWidget.timePerDivision[0].fine.unit.toString()}
</label>
<div className="ClearBlock"></div>
</div>
@ -162,7 +169,10 @@ class MeasurementsWidget extends React.Component<any, any> {
className="Channel2-MaxValue"
style={{color: this.props.settings.colors.channel[1]}}>
{this.props.measurementsWidget.max[1].value}
{this.props.measurementsWidget.max[1].unit}
{this.props.verticalWidget.settings[1].controlMode === ControlMode.Course
&& this.props.verticalWidget.timePerDivision[1].course.unit.toString()}
{this.props.verticalWidget.settings[1].controlMode === ControlMode.Fine
&& + this.props.verticalWidget.timePerDivision[1].fine.unit.toString()}
</label>
<div className="ClearBlock"></div>
<label
@ -174,7 +184,10 @@ class MeasurementsWidget extends React.Component<any, any> {
className="Channel2-MinValue"
style={{color: this.props.settings.colors.channel[1]}}>
{this.props.measurementsWidget.min[1].value}
{this.props.measurementsWidget.min[1].unit}
{this.props.verticalWidget.settings[1].controlMode === ControlMode.Course
&& this.props.verticalWidget.timePerDivision[1].course.unit.toString()}
{this.props.verticalWidget.settings[1].controlMode === ControlMode.Fine
&& + this.props.verticalWidget.timePerDivision[1].fine.unit.toString()}
</label>
<div className="ClearBlock"></div>
</div>
@ -196,7 +209,10 @@ class MeasurementsWidget extends React.Component<any, any> {
className="Channel3-MaxValue"
style={{color: this.props.settings.colors.channel[2]}}>
{this.props.measurementsWidget.max[2].value}
{this.props.measurementsWidget.max[2].unit}
{this.props.verticalWidget.settings[2].controlMode === ControlMode.Course
&& this.props.verticalWidget.timePerDivision[2].course.unit.toString()}
{this.props.verticalWidget.settings[2].controlMode === ControlMode.Fine
&& + this.props.verticalWidget.timePerDivision[2].fine.unit.toString()}
</label>
<div className="ClearBlock"></div>
<label
@ -208,7 +224,10 @@ class MeasurementsWidget extends React.Component<any, any> {
className="Channel3-MinValue"
style={{color: this.props.settings.colors.channel[2]}}>
{this.props.measurementsWidget.min[2].value}
{this.props.measurementsWidget.min[2].unit}
{this.props.verticalWidget.settings[2].controlMode === ControlMode.Course
&& this.props.verticalWidget.timePerDivision[2].course.unit.toString()}
{this.props.verticalWidget.settings[2].controlMode === ControlMode.Fine
&& + this.props.verticalWidget.timePerDivision[2].fine.unit.toString()}
</label>
<div className="ClearBlock"></div>
</div>
@ -230,7 +249,10 @@ class MeasurementsWidget extends React.Component<any, any> {
className="Channel4-MaxValue"
style={{color: this.props.settings.colors.channel[3]}}>
{this.props.measurementsWidget.max[3].value}
{this.props.measurementsWidget.max[3].unit}
{this.props.verticalWidget.settings[3].controlMode === ControlMode.Course
&& this.props.verticalWidget.timePerDivision[3].course.unit.toString()}
{this.props.verticalWidget.settings[3].controlMode === ControlMode.Fine
&& + this.props.verticalWidget.timePerDivision[3].fine.unit.toString()}
</label>
<div className="ClearBlock"></div>
<label
@ -242,7 +264,10 @@ class MeasurementsWidget extends React.Component<any, any> {
className="Channel4-MinValue"
style={{color: this.props.settings.colors.channel[3]}}>
{this.props.measurementsWidget.min[3].value}
{this.props.measurementsWidget.min[3].unit}
{this.props.verticalWidget.settings[3].controlMode === ControlMode.Course
&& this.props.verticalWidget.timePerDivision[3].course.unit.toString()}
{this.props.verticalWidget.settings[3].controlMode === ControlMode.Fine
&& + this.props.verticalWidget.timePerDivision[3].fine.unit.toString()}
</label>
<div className="ClearBlock"></div>
</div>
@ -253,9 +278,10 @@ class MeasurementsWidget extends React.Component<any, any> {
}
}
function mapStateToProps(state: { measurementsWidget: any, settings: any, graph: any }) {
function mapStateToProps(state: { measurementsWidget: any, verticalWidget: any, settings: any, graph: any }) {
return {
measurementsWidget: state.measurementsWidget,
verticalWidget: state.verticalWidget,
settings: state.settings,
graph: state.graph
};

6
Software/waveview/src/util/plumber.ts
View File

@ -53,7 +53,7 @@ export class Plumber {
this.bridge.read(rxBuff, (err: NodeJS.ErrnoException, bytesRead: number, bytes: Uint8Array) => {
var bytes16 = new Uint16Array(bytes.buffer);
var dataSize = bytes16[2];
if(!args.headCheck(args, bytes16) || dataSize == 0) {
if(!args.headCheck(args, bytes16) || dataSize === 0) {
this.nextCycle();
return;
}
@ -85,7 +85,7 @@ export class Plumber {
if(args.cmd <= CMD.CMD_GetData4) {
return false;
}
else if(args.cmd == CMD.CMD_RampDemo) {
else if(args.cmd === CMD.CMD_RampDemo) {
return false;
}
return true;
@ -117,7 +117,7 @@ export class Plumber {
let a64s = new BigInt64Array(a.buffer);
var res: MaxMinResult[] = [];
for(var i = 0; i < args.writeData.length; i++) {
if(args.writeData[i] != 0) {
if(args.writeData[i] !== 0) {
res.push({ch: i + 1, x: Number(a64u[i]), y: Number(a64s[i + maxCh])});
}
}