Hochschulprojekte
/
f1vis
0
0
Fork 0
Code Issues Pull Requests Activity

Fixed undefined time texts

This commit is contained in:
sirsandmann 2017-12-29 17:12:01 +01:00
parent 0846729561
commit bc09c1eb17
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
js/diagrams.js
View File

@ -97,6 +97,7 @@ function createLineGraph(containerId, raceData){
.attr("data-line", driverLapData.driver.driverId) .attr("data-line", driverLapData.driver.driverId)
.attr("data-opacitychange", 0) .attr("data-opacitychange", 0)
.attr("data-highlighted", 0) .attr("data-highlighted", 0)
.attr("data-elemtype", elemTypes.linepoint)
.attr("fill", getColorValue(driverIndex, enhancedLapData.length)) .attr("fill", getColorValue(driverIndex, enhancedLapData.length))
.attr("cx", function(d, i) {return x(d.lap) }) .attr("cx", function(d, i) {return x(d.lap) })
.attr("cy", function(d, i) { return y(d.position) }) .attr("cy", function(d, i) { return y(d.position) })
@ -234,7 +235,7 @@ function createLineGraph(containerId, raceData){
var textArr = []; var textArr = [];
var circleId = "circle-linepoint-" + d.lap + "-" + d.driverId; var circleId = "circle-linepoint-" + d.lap + "-" + d.driverId;
var circle = d3.select("#" + circleId); var circle = d3.select("#" + circleId);
// Add interactivity // Add interactivity
// Use D3 to select element, change color and size // Use D3 to select element, change color and size
if(dataType === elemTypes.linepoint){ if(dataType === elemTypes.linepoint){
@ -299,11 +300,18 @@ function createLineGraph(containerId, raceData){
} }
function getLapTextArray(raceData, d){ function getLapTextArray(raceData, d){
var driverText = getDriverCodeById(raceData,d.driverId); var driverText = getDriverCodeById(raceData,d.driverId);
var lapText = "Lap: " + d.lap; var lapText = "Lap: " + d.lap;
var posText = "Pos: " + d.position; var posText = "Pos: " + d.position;
var timeText = "Time: " + d.time;
return [driverText, lapText, posText, timeText]; var returnArr = [driverText, lapText, posText];
if(d.time){
var timeText = "Time: " + d.time;
returnArr.push(timeText);
}
return returnArr;
} }
function getPitStopTextArray(raceData, d){ function getPitStopTextArray(raceData, d){