From 4eb25265c27daf9a3fdfee691ff9236b33ba9935 Mon Sep 17 00:00:00 2001 From: sirsandmann Date: Tue, 19 Dec 2017 21:35:47 +0100 Subject: [PATCH] Added Tick Data for Y-Axis --- js/diagrams.js | 36 ++++++++++++++++++++++++++++++++++-- js/util.js | 6 +++--- 2 files changed, 37 insertions(+), 5 deletions(-) diff --git a/js/diagrams.js b/js/diagrams.js index 78bbae2..0076e29 100644 --- a/js/diagrams.js +++ b/js/diagrams.js @@ -98,9 +98,24 @@ function createLineGraph(containerId, raceData){ // Add the Y Axis on both sides svg.append("g") - .call(d3.axisLeft(y)); + .call( + d3.axisLeft(y) + .ticks(raceData.drivers.length) + .tickFormat(function(d) { + console.log(getDriverCodeFromPosAndLap(raceData, 0, d) + " " + d); + return getDriverCodeFromPosAndLap(raceData, 0, d) + " " + d; + }) + ); + svg.append("g") - .call(d3.axisRight(y)) + .call( + d3.axisRight(y) + .ticks(raceData.drivers.length) + .tickFormat(function(d) { + console.log(getDriverCodeFromPosAndLap(raceData, raceData.lapTimes.size, d) + " " + d); + return d + " " + getDriverCodeFromPosAndLap(raceData, raceData.lapTimes.size, d) ; + }) + ) .attr("transform", "translate( " + (width) + ", 0 )"); function handleClickOnPoint(d,i){ @@ -208,4 +223,21 @@ function createLineGraph(containerId, raceData){ return lapTextArr; } + function getDriverCodeFromPosAndLap(raceData, lapNr, pos){ + var driverCode = ""; + if(lapNr == 0){ + driverCode = getDriverCodeById(raceData, raceData.qualifying[pos - 1].driverId); + }else if(lapNr == raceData.lapTimes.size){ + var resultPos = raceData.results[pos -1].position; + var resultLaps = raceData.results[pos -1].laps; + //making sure the Driver finished and drove all laps + if(resultPos && resultLaps == raceData.lapTimes.size){ + driverCode = getDriverCodeById(raceData,raceData.results[pos -1].driverId); + } + }else{ + //TODO hier Adden + } + return driverCode; + } + } diff --git a/js/util.js b/js/util.js index 56fb667..24486be 100644 --- a/js/util.js +++ b/js/util.js @@ -86,11 +86,11 @@ function getDriverCodeAndPositionArray(raceData, lapNumber){ return posDriverCode; } -function getDriverCodeById(raceData,driverId){ - return raceData.drivers.filter(driv=> driv.driverId == driverId)[0].code; +function getDriverCodeById(raceData, driverId){ + return raceData.drivers.filter(driv => driv.driverId == driverId)[0].code; } -function removeDuplicates(result,obj){ +function removeDuplicates(result,obj){ if (result.indexOf(obj) < 0 ) result.push(obj); return result; }