retropilot
/
cabana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cabana: remove byteStyles from entries

main
Andy Haden 2017-08-04 12:36:06 -07:00
parent 8cc581e403
commit 75134701f7
3 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/MessageBytes.js
View File

@ -85,7 +85,8 @@ export default class MessageBytes extends Component {
ctx.clearRect(0,0,180,15);
for(let i = 0; i < message.byteStateChangeCounts.length; i++) {
const hexData = mostRecentMsg.hexData.substr(i * 2, 2);
ctx.fillStyle = mostRecentMsg.byteStyles[i].backgroundColor;
ctx.fillStyle = message.byteColors[i];
ctx.fillRect(i * 20, 0, 20, 15);

16
src/components/explorer.js
View File

@ -287,6 +287,7 @@ export default class Explorer extends Component {
timeWindow() {
const {routeStartTime, currentParts} = this.props;
if(routeStartTime) {
const partStartOffset = currentParts[0] * 60,
partEndOffset = (currentParts[1] + 1) * 60;
@ -312,13 +313,14 @@ export default class Explorer extends Component {
}
}
return samples.map((entry) => {
return {x: entry.time,
relTime: entry.time - this.props.firstCanTime,
y: entry.signals[signalName],
unit: msg.frame.signals[signalName].unit,
color: `rgba(${msg.frame.signals[signalName].colors().join(",")}, 0.5)`,
signalName}
return samples.filter((e) => e.signals[signalName])
.map((entry) => {
return {x: entry.time,
relTime: entry.time - this.props.firstCanTime,
y: entry.signals[signalName],
unit: msg.frame.signals[signalName].unit,
color: `rgba(${msg.frame.signals[signalName].colors().join(",")}, 0.5)`,
signalName}
});
}

6
src/utils/dbc.js
View File

@ -94,7 +94,6 @@ function parseMessage(dbc, time, address, data, timeStart, lastParsedMessage) {
signals: dbc.getSignalValues(address, data),
relTime,
hexData,
byteStyles: new Array(8).fill({}),
byteStateChangeTimes}
return {msgEntry, byteStateChangeCounts};
@ -122,11 +121,6 @@ function setMessageByteColors(message, maxByteStateChangeCount) {
'rgb(' + Math.round(red) + ',0,0)'
);
for(let i = 0; i < message.entries.length; i++) {
message.entries[i].byteStyles = message.entries[i].byteStyles.map((style, idx) => {
return {backgroundColor: message.byteColors[idx], ...style};
});
}
return message;