Skip to content
Draft
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
31f0b64
Refactor Geom class
Faye-yufan Oct 9, 2023
f23980d
prepare data for geom line, path, ribbon and polygon
Faye-yufan Oct 10, 2023
7309f5d
geom_ribbon has a different linetype
Faye-yufan Oct 10, 2023
d7e36f9
set up the special D3 data binding
Faye-yufan Oct 10, 2023
e693d59
update each individual graphical element
Faye-yufan Oct 10, 2023
64a737e
add linkActions logic
Faye-yufan Oct 10, 2023
6e6237c
delete the old 'draw_geom' function
Faye-yufan Oct 10, 2023
a9d97f9
remove if-else for group geom
Faye-yufan Oct 13, 2023
ab17af9
Create GroupGeom/UngroupGeom virtual classes and convert `prepare_dat…
Faye-yufan Oct 19, 2023
6e51832
optimize some code and add some todos
Faye-yufan Oct 21, 2023
abaca42
Add selecting group code in GroupGeom
Faye-yufan Oct 21, 2023
5a6a152
move the `setup_data_binding()` from Geom to GroupGeom
Faye-yufan Oct 31, 2023
18bd925
Refactor methods to use class properties; align GroupGeom method name…
Faye-yufan Nov 4, 2023
e703595
Create `setup_eActions()` in GroupGeom
Faye-yufan Nov 5, 2023
08b5907
create GeomSegment class
Faye-yufan Nov 5, 2023
2c29444
Create GeomLinerange, GeomVline class
Faye-yufan Nov 5, 2023
c207aec
Create GeomHline class
Faye-yufan Nov 5, 2023
7346550
create GeomText class
Faye-yufan Nov 5, 2023
4ea7bc0
create GeomPoint class
Faye-yufan Nov 5, 2023
079df5b
Merge branch 'master' into renderer-geom-refactor
Faye-yufan Dec 27, 2023
ee7615c
merge master
Faye-yufan Dec 27, 2023
7d2eb64
add get_values function
Faye-yufan Dec 27, 2023
48107c5
Remove code for handling .variable aes
Faye-yufan Dec 27, 2023
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
19 changes: 2 additions & 17 deletions inst/htmljs/animint.js
Original file line number Diff line number Diff line change
Expand Up @@ -933,7 +933,7 @@ var animint = function (to_select, json_file) {
});
});
}//download_chunk.

// update_geom is responsible for obtaining a chunk of downloaded
// data, and then calling draw_geom to actually draw it.
var draw_geom = function(g_info, chunk, selector_name, PANEL){
Expand All @@ -951,22 +951,7 @@ var animint = function (to_select, json_file) {
var selected, values;
var new_arrays = [];
if(0 < aes_name.indexOf(".variable")){
selected_arrays.forEach(function(old_array){
var some_data = chunk;
old_array.forEach(function(value){
if(some_data.hasOwnProperty(value)) {
some_data = some_data[value];
} else {
some_data = {};
}
})
values = d3.keys(some_data);
values.forEach(function(s_name){
var selected = Selectors[s_name].selected;
var new_array = old_array.concat(s_name).concat(selected);
new_arrays.push(new_array);
})
})
// Some code for handling .variable aes, put comment here as placeholder for testing
}else{//not .variable aes:
if(aes_name == "PANEL"){
selected = PANEL;
Expand Down