Skip to content

D3 refactoring rebased #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
conorato merged 47 commits into from
Aug 27, 2020
Merged

D3 refactoring rebased #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
7452909
Remove some useless comments (for ex. function headers)
Jun 21, 2020
1e688c3
Extract csv read from d3 to a react custom hook
Jun 22, 2020
6f3d32e
display a spinner while data is loading
Jun 22, 2020
9a8a980
Remove barchart from spectrogram
Jul 23, 2020
b3d0578
Extract methods and constant so code is executed in a more coherent o…
Jul 23, 2020
5e14fa2
export less functions so d3 code is clearer
Jul 26, 2020
a18a975
use the _ for files and folders
Jul 26, 2020
c1ab38a
added fcts to set axes and domains
Jul 26, 2020
c35f6d3
reviewed convertsources and removed all constants passed in parameters
Jul 27, 2020
98cd03f
changed csv file sleep stages for labels instead of integers
Jul 27, 2020
099cd22
deleted stages & created preproc function
Jul 27, 2020
c62fd49
changed annotations to have sleep stage labels instead of indexes
Jul 27, 2020
ba8c788
add use of moment js
Jul 27, 2020
b8690fd
fixed date & 3rd transition offset bug
Jul 28, 2020
582219d
fixed wrong hour in spectrogram
Jul 28, 2020
66e0b87
fixed tooltip and & first bar chart
Jul 28, 2020
dab67d7
renamed bar chart to evolutive bar chart & fixed some bug transitions…
Aug 9, 2020
7d5b075
moved linear x axis with other axes creation
Aug 9, 2020
33029b4
Add a waypoint direction component
Aug 9, 2020
8a25d1b
remove transitions
Aug 9, 2020
e07c551
transition from timeline to instance with onExit & onEnter callbacks …
Aug 9, 2020
7ba379e
fixed transition from instance chart to bar chart using onEnter & onE…
Aug 9, 2020
4acf7fd
bar chart callbacks changed data
Aug 9, 2020
6700ba7
changed callbacks to considerate from which state and to which state …
Aug 9, 2020
0f9792c
moved state callbacks creation to seperate file
Aug 9, 2020
bf35e5d
reorganized parameters
Aug 9, 2020
fd254ee
cleaned stacked bar chart
Aug 9, 2020
adf5bfb
fixed transition so that all rectangles add up (from and leave from b…
Aug 10, 2020
4686a45
solved concurrency bug where no transition is loaded
Aug 16, 2020
b6ff981
fixed broken visualisation when scrolling too fast
Aug 16, 2020
d232dd0
deleted console logs
Aug 16, 2020
84988d8
fixed constant names and calls with constant hypnogram
Aug 16, 2020
7483777
fixed constant names
Aug 16, 2020
065bd8e
used data from component
Aug 16, 2020
09b137e
added dimension & margin to constant fiel
Aug 16, 2020
2a657d7
merged spectrogram and init spectrogram in same file
Aug 16, 2020
a6fe544
deleted file and joined into spectrogram
Aug 16, 2020
c8cee4f
created axes & scales functions
Aug 16, 2020
f703446
changed spectro data key to lower case & added for loop chart creation
Aug 16, 2020
134b982
fixed name convention
Aug 17, 2020
18e67fd
used canvas to display rectangles and removed bins
Aug 17, 2020
6d40aa2
added refactoring of set domain on scales
Aug 17, 2020
29b5b09
removed preproc file and rewrote preprocess function
Aug 17, 2020
8e5b066
reduced colorbar width
Aug 17, 2020
405442b
added spectro titles
Aug 17, 2020
e570869
Reformat code
abelfodil Aug 24, 2020
afd8a3a
Update lock files
abelfodil Aug 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
540 changes: 302 additions & 238 deletions polydodo/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion polydodo/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"d3": "^5.16.0",
"d3-tip": "^0.9.1",
"headroom.js": "^0.11.0",
"moment": "2.24.0",
"moment": "^2.27.0",
"node-sass": "4.13.1",
"nouislider": "14.1.1",
"prop-types": "^15.7.2",
Expand Down
20 changes: 10 additions & 10 deletions polydodo/src/assets/css/visualisation.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
svg {
display: inline-block;
/* background-color: #181C28; */
}
}

.axis {
color: black;
Expand Down Expand Up @@ -39,7 +39,7 @@ svg {

.brush .extent {
stroke: black;
fill-opacity: .125;
fill-opacity: 0.125;
shape-rendering: crispEdges;
}

Expand All @@ -49,26 +49,26 @@ svg {

.label-sleepType {
opacity: 0;
fill:black;
font-size:"25px";
fill: black;
font-size: '25px';
font-weight: 600;
text-anchor: start;
alignment-baseline: "middle";
alignment-baseline: 'middle';
}

.pourcentage {
text-anchor: middle;
font-family: sans-serif;
font-size: 20px;
fill: black;
text-anchor: middle;
font-family: sans-serif;
font-size: 20px;
fill: black;
}

/***** Tooltip *****/
.d3-tip {
line-height: 1;
padding: 12px;
border-radius: 2px;
color: #0D0D0D;
color: #0d0d0d;
background: rgba(235, 235, 235, 0.9);
/* Color Theme Swatches in Hex */
}
Loading