AllSpiceMirrors/ThunderScope
7
Fork 0
mirror of https://github.com/EEVengers/ThunderScope.git synced 2025-04-22 17:43:44 +00:00
Files Issues Releases Activity

fixed small changeChannel bug

Browse Source
This commit is contained in:
Jason Bonnell 2021-03-25 14:55:11 -04:00
parent 28a77b357f
commit dba006e124
3 changed files with 4 additions and 4 deletions
Software/waveview/src
components/sidebar/widgets
triggerWidget.tsxverticalWidget.tsx
util
plumber.ts

4
Software/waveview/src/components/sidebar/widgets/triggerWidget.tsx
View File

@ -22,10 +22,10 @@ class TriggerWidget extends React.Component<any, any> {
changeChannel = (channelNumber: number) => {
let chStatus = (this.props.verticalWidget.settings as any[]).map(x => x.status > 0);
let setChState = setChHelper(chStatus[0], chStatus[1], chStatus[2], chStatus[3], channelNumber);
Plumber.getInstance().handleSetchState(setChState);
Plumber.getInstance().handleSetChState(setChState);
this.props.dispatch({type: 'vertical/setChannelOrder', payload: setChState.chOrder});
this.props.dispatch({type: 'trigger/changeChannel', payload: channelNumber});
this.props.dispatch({type: 'vertical/changeChannelStatus', payload: channelNumber});
this.props.dispatch({type: 'vertical/changeChannelStatus', payload: channelNumber - 1});
}
// Trigger Type

2
Software/waveview/src/components/sidebar/widgets/verticalWidget.tsx
View File

@ -58,7 +58,7 @@ class VerticalWidget extends React.Component<any, any> {
chStatus[channelNumber] = !chStatus[channelNumber];
let triggerCh = this.props.triggerWidget.triggerChannel;
let setChState = setChHelper(chStatus[0], chStatus[1], chStatus[2], chStatus[3], triggerCh);
Plumber.getInstance().handleSetchState(setChState);
Plumber.getInstance().handleSetChState(setChState);
this.props.dispatch({type: 'vertical/setChannelOrder', payload: setChState.chOrder})
this.props.dispatch({type: 'trigger/changeChannel', payload: triggerCh});
this.props.dispatch({type: 'vertical/changeChannelStatus', payload: channelNumber});

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

@ -112,7 +112,7 @@ export class Plumber {
}
}
public handleSetchState(s: SetChState) {
public handleSetChState(s: SetChState) {
let setChArgs: PlumberArgs = {
headCheck: () => true,
bodyCheck: () => true,