Skip to content

Commit eae62ef

Browse files
sglyonsglyon
authored
Merge branch 'master' into dash-sankey-diagram
2 parents 02fe5c4 + eb7c481 commit eae62ef

22 files changed

+1200
-33
lines changed

‎Manifest.toml‎

Lines changed: 26 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,9 @@ version = "3.14.0"
100100

101101
[[ColorTypes]]
102102
deps = ["FixedPointNumbers", "Random"]
103-
git-tree-sha1 = "32a2b8af383f11cbb65803883837a149d10dfe8a"
103+
git-tree-sha1 = "024fe24d83e4a5bf5fc80501a314ce0d1aa35597"
104104
uuid = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
105-
version = "0.10.12"
105+
version = "0.11.0"
106106

107107
[[ColorVectorSpace]]
108108
deps = ["ColorTypes", "FixedPointNumbers", "LinearAlgebra", "SpecialFunctions", "Statistics", "TensorCore"]
@@ -165,12 +165,6 @@ git-tree-sha1 = "8af600ca3179b193698472376a133c1caf3f2adc"
165165
uuid = "1b08a953-4be3-4667-9a23-9da06441d987"
166166
version = "1.17.1"
167167

168-
[[DashCytoscape]]
169-
deps = ["Dash"]
170-
git-tree-sha1 = "553be75f181bf33a0816833e2244b82f3a80da4f"
171-
uuid = "1b08a953-4be3-4667-9a23-85cc21bfd5e9"
172-
version = "0.3.0"
173-
174168
[[DashHtmlComponents]]
175169
deps = ["DashBase"]
176170
git-tree-sha1 = "14ad028d5a5fa708589e38cf05ff853ab0bac7f5"
@@ -230,10 +224,10 @@ deps = ["Random", "Serialization", "Sockets"]
230224
uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"
231225

232226
[[Distributions]]
233-
deps = ["FillArrays", "LinearAlgebra", "PDMats", "Printf", "QuadGK", "Random", "SparseArrays", "SpecialFunctions", "Statistics", "StatsBase", "StatsFuns"]
234-
git-tree-sha1 = "7a58635041e0b5485d56c49d24f10c314841f93c"
227+
deps = ["ChainRulesCore", "FillArrays", "LinearAlgebra", "PDMats", "Printf", "QuadGK", "Random", "SparseArrays", "SpecialFunctions", "Statistics", "StatsBase", "StatsFuns"]
228+
git-tree-sha1 = "f4efaa4b5157e0cdb8283ae0b5428bc9208436ed"
235229
uuid = "31c24e10-a181-5473-b8eb-7969acd0382f"
236-
version = "0.25.12"
230+
version = "0.25.16"
237231

238232
[[DocStringExtensions]]
239233
deps = ["LibGit2"]
@@ -297,9 +291,9 @@ uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee"
297291

298292
[[FillArrays]]
299293
deps = ["LinearAlgebra", "Random", "SparseArrays", "Statistics"]
300-
git-tree-sha1 = "7c365bdef6380b29cfc5caaf99688cd7489f9b87"
294+
git-tree-sha1 = "a3b7b041753094f3b17ffa9d2e2e07d8cace09cd"
301295
uuid = "1a297f60-69ca-5386-bcde-b61e274b549b"
302-
version = "0.12.2"
296+
version = "0.12.3"
303297

304298
[[FixedPointNumbers]]
305299
deps = ["Statistics"]
@@ -343,9 +337,9 @@ version = "1.1.0"
343337

344338
[[HTTP]]
345339
deps = ["Base64", "Dates", "IniFile", "Logging", "MbedTLS", "NetworkOptions", "Sockets", "URIs"]
346-
git-tree-sha1 = "44e3b40da000eab4ccb1aecdc4801c040026aeb5"
340+
git-tree-sha1 = "60ed5f1643927479f845b0135bb369b031b541fa"
347341
uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3"
348-
version = "0.9.13"
342+
version = "0.9.14"
349343

350344
[[Hiccup]]
351345
deps = ["MacroTools", "Test"]
@@ -355,9 +349,9 @@ version = "0.2.2"
355349

356350
[[ImageCore]]
357351
deps = ["AbstractFFTs", "ColorVectorSpace", "Colors", "FixedPointNumbers", "Graphics", "MappedArrays", "MosaicViews", "OffsetArrays", "PaddedViews", "Reexport"]
358-
git-tree-sha1 = "75f7fea2b3601b58f24ee83617b528e57160cbfd"
352+
git-tree-sha1 = "595155739d361589b3d074386f77c107a8ada6f7"
359353
uuid = "a09fc81d-aa75-5fe9-8630-4744c3626534"
360-
version = "0.9.1"
354+
version = "0.9.2"
361355

362356
[[ImageFiltering]]
363357
deps = ["CatIndices", "ComputationalResources", "DataStructures", "FFTViews", "FFTW", "ImageCore", "LinearAlgebra", "OffsetArrays", "Requires", "SparseArrays", "StaticArrays", "Statistics", "TiledIteration"]
@@ -647,9 +641,9 @@ version = "1.2.0"
647641

648642
[[Missings]]
649643
deps = ["DataAPI"]
650-
git-tree-sha1 = "f8c673ccc215eb50fcadb285f522420e29e69e1c"
644+
git-tree-sha1 = "2ca267b08821e86c5ef4376cffed98a46c2cb205"
651645
uuid = "e1d29d7a-bbdc-5cf2-9ac0-f12de2c33e28"
652-
version = "0.4.5"
646+
version = "1.0.1"
653647

654648
[[Mmap]]
655649
uuid = "a63ad114-7e13-5084-954f-fe012c677804"
@@ -725,9 +719,9 @@ version = "0.3.3"
725719

726720
[[OffsetArrays]]
727721
deps = ["Adapt"]
728-
git-tree-sha1 = "c0f4a4836e5f3e0763243b8324200af6d0e0f90c"
722+
git-tree-sha1 = "c870a0d713b51e4b49be6432eff0e26a4325afee"
729723
uuid = "6fe1bfb0-de20-5000-8ca7-80f57d26f881"
730-
version = "1.10.5"
724+
version = "1.10.6"
731725

732726
[[OpenBLAS_jll]]
733727
deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"]
@@ -804,9 +798,9 @@ version = "2.0.14"
804798

805799
[[PooledArrays]]
806800
deps = ["DataAPI", "Future"]
807-
git-tree-sha1 = "cde4ce9d6f33219465b55162811d8de8139c0414"
801+
git-tree-sha1 = "a193d6ad9c45ada72c14b731a318bedd3c2f00cf"
808802
uuid = "2dfb63ee-cc39-5dd5-95bd-886bf059d720"
809-
version = "1.2.1"
803+
version = "1.3.0"
810804

811805
[[Preferences]]
812806
deps = ["TOML"]
@@ -888,9 +882,9 @@ uuid = "321657f4-b219-11e9-178b-2701a2544e81"
888882
version = "2.1.3"
889883

890884
[[ScientificTypesBase]]
891-
git-tree-sha1 = "8a476e63390bfc987aa3cca02d90ea1dbf8b457e"
885+
git-tree-sha1 = "9c1a0dea3b442024c54ca6a318e8acf842eab06f"
892886
uuid = "30f210dd-8aff-4c5f-94ba-8e64358c1161"
893-
version = "2.1.0"
887+
version = "2.2.0"
894888

895889
[[SentinelArrays]]
896890
deps = ["Dates", "Random"]
@@ -965,15 +959,15 @@ version = "1.0.0"
965959

966960
[[StatsBase]]
967961
deps = ["DataAPI", "DataStructures", "LinearAlgebra", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics", "StatsAPI"]
968-
git-tree-sha1 = "fed1ec1e65749c4d96fc20dd13bea72b55457e62"
962+
git-tree-sha1 = "8cbbc098554648c84f79a463c9ff0fd277144b6c"
969963
uuid = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
970-
version = "0.33.9"
964+
version = "0.33.10"
971965

972966
[[StatsFuns]]
973-
deps = ["IrrationalConstants", "LogExpFunctions", "Reexport", "Rmath", "SpecialFunctions"]
974-
git-tree-sha1 = "20d1bb720b9b27636280f751746ba4abb465f19d"
967+
deps = ["ChainRulesCore", "IrrationalConstants", "LogExpFunctions", "Reexport", "Rmath", "SpecialFunctions"]
968+
git-tree-sha1 = "46d7ccc7104860c38b11966dd1f72ff042f382e4"
975969
uuid = "4c63d2b9-4356-54db-8cca-17b64c39e42c"
976-
version = "0.9.9"
970+
version = "0.9.10"
977971

978972
[[StringEncodings]]
979973
deps = ["Libiconv_jll"]
@@ -1015,9 +1009,9 @@ version = "1.0.1"
10151009

10161010
[[TableTraitsUtils]]
10171011
deps = ["DataValues", "IteratorInterfaceExtensions", "Missings", "TableTraits"]
1018-
git-tree-sha1 = "8fc12ae66deac83e44454e61b02c37b326493233"
1012+
git-tree-sha1 = "78fecfe140d7abb480b53a44f3f85b6aa373c293"
10191013
uuid = "382cd787-c1b6-5bf2-a167-d5b971a19bda"
1020-
version = "1.0.1"
1014+
version = "1.0.2"
10211015

10221016
[[Tables]]
10231017
deps = ["DataAPI", "DataValueInterfaces", "IteratorInterfaceExtensions", "LinearAlgebra", "TableTraits", "Test"]

‎Project.toml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
33
Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
44
Dash = "1b08a953-4be3-4667-9a23-3db579824955"
55
DashCoreComponents = "1b08a953-4be3-4667-9a23-9da06441d987"
6-
DashCytoscape = "1b08a953-4be3-4667-9a23-85cc21bfd5e9"
76
DashHtmlComponents = "1b08a953-4be3-4667-9a23-24100242a84a"
87
DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
98
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"

‎dash/3d-scatter-plots.jl‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
using Dash
2+
using DashCoreComponents
3+
using DashHtmlComponents
4+
using PlotlyJS, CSV, DataFrames
5+
6+
df = dataset(DataFrame, "iris")
7+
8+
app = dash(external_stylesheets=["https://codepen.io/chriddyp/pen/bWLwgP.css"])
9+
10+
app.layout = html_div() do
11+
dcc_graph(id="scatter-plot"),
12+
html_p("Petal Width:"),
13+
dcc_rangeslider(
14+
id="range-slider",
15+
min=0, max=2.5, step=0.1,
16+
marks=Dict("0" => "0", "2.5" => "2.5"),
17+
value=[0.5, 2]
18+
)
19+
end
20+
21+
callback!(app, Output("scatter-plot", "figure"), Input("range-slider", "value")) do val
22+
low = val[1]
23+
high = val[2]
24+
mask = df[df.petal_width .> low, :]
25+
mask = mask[mask.petal_width .< high, :]
26+
27+
fig = plot(
28+
mask,
29+
kind="scatter3d",
30+
mode="markers",
31+
x=:sepal_length,
32+
y=:sepal_width,
33+
z=:petal_width,
34+
color=:species,
35+
hover_data=[:petal_width]
36+
)
37+
38+
return fig
39+
end
40+
41+
run_server(app, "0.0.0.0", 8080)

0 commit comments

Comments
 (0)