Skip to content

Reverted files and updated geochart chart window code #418

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.

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

Open
wants to merge 32 commits into
base: horizon
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
d4d4c34
Update chart.arr
Klu002 Jan 8, 2021
574f7ed
Update plot-list.arr
Klu002 Jan 8, 2021
9ab929e
Update plot.arr
Klu002 Jan 8, 2021
68a10e4
Update chart-lib.js
Klu002 Jan 8, 2021
e0da7b1
Add files via upload
Klu002 Jan 18, 2021
36fb256
Add files via upload
Klu002 Jan 18, 2021
47f0848
First commit
Jan 18, 2021
44456d8
Update chart-lib.js
Klu002 Jan 19, 2021
ac9fe04
Update plot-lib.js
Klu002 Jan 19, 2021
1c80a16
added geochart to values, changing all names to geochart
schornb Apr 28, 2021
b8e2ed7
added missing return sttatement in render function
Klu002 Apr 28, 2021
0db881f
chart lib fixed
schornb Apr 28, 2021
5022317
Merge branch 'master' of https://github.com/schornb/code.pyret.org in…
Klu002 Apr 28, 2021
63446d5
Merge branch 'horizon' of https://github.com/schornb/code.pyret.org i…
Klu002 Apr 28, 2021
f70bdc0
fixed merge conflicts
Klu002 Apr 29, 2021
25a950e
minor syntax fixes
schornb Apr 29, 2021
6897caf
editing chart.arr render-chart function for geomap
schornb May 4, 2021
f38ab61
reset plot js files
Klu002 May 4, 2021
731fae3
reset plot arr files
Klu002 May 4, 2021
173bf7e
reset plot arr files
Klu002 May 4, 2021
2ee2def
reset plot arr files
Klu002 May 4, 2021
1100700
basic functionality
Klu002 May 18, 2021
83a372e
geoChart now correctly uses data
Klu002 May 18, 2021
5cddc4b
added ability to change region
schornb May 23, 2021
51fb03e
changed type of region parameter
Klu002 May 23, 2021
59462a2
fixing change region
schornb May 23, 2021
5c5b092
change color to value
schornb May 23, 2021
aef5158
changed only files that needed changes
schornb Jan 19, 2022
e79dca9
reverted to current copy
schornb Jan 21, 2022
a28222f
add geochart functionality
schornb Jan 21, 2022
2e32236
edited package.json files
schornb Jan 21, 2022
e1fb6eb
added new line on json files
schornb Jan 27, 2022
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
Prev Previous commit
Next Next commit
changed only files that needed changes
  • Loading branch information
schornb committed Jan 19, 2022
commit aef51580f0ee03df11495f4edce4ddf396e6c2f5
8 changes: 3 additions & 5 deletions src/web/arr/trove/chart.arr
Original file line number Diff line number Diff line change
Expand Up @@ -784,15 +784,13 @@ fun labeled-histogram-from-list(labels :: List<String>, values :: List<Number>)
end

fun geochart-from-list(
region-labels :: List<String>,
values :: List<Number>) -> DataSeries block:
region-labels :: P.LoS,
values :: P.LoN) -> DataSeries block:
region-length = region-labels.length()
values-length = values.length()
when region-length <> values-length:
raise("geochart: region-labels and values should have the same length")
end
values.each(check-num)
region-labels.each(check-string)
default-geochart-series.{
tab: to-table2(region-labels, values)
} ^ geochart-series
Expand Down Expand Up @@ -1253,4 +1251,4 @@ from-list = {
labeled-box-plot: labeled-box-plot-from-list,
box-plot: box-plot-from-list,
geochart: geochart-from-list,
}
}
Loading