# HG changeset patch # User Tuomo Valkonen # Date 1575659961 -7200 # Node ID bda471ea9d676da48a53a30248862d6783358f9f # Parent 5b18eb027b0325feb209b693673705e4e32d96a3 Do not depend on Images, just ColorTypes diff -r 5b18eb027b03 -r bda471ea9d67 Manifest.toml --- a/Manifest.toml Thu Dec 05 17:12:55 2019 +0200 +++ b/Manifest.toml Fri Dec 06 21:19:21 2019 +0200 @@ -1,29 +1,11 @@ # This file is machine-generated - editing it directly is not advised -[[AbstractFFTs]] -deps = ["LinearAlgebra"] -git-tree-sha1 = "051c95d6836228d120f5f4b984dd5aba1624f716" -uuid = "621f4979-c628-5d54-868e-fcf4e3e8185c" -version = "0.5.0" - [[AlgTools]] deps = ["DelimitedFiles", "Printf"] path = "../AlgTools" uuid = "c46e2e78-5339-41fd-a966-983ff60ab8e7" version = "0.1.0" -[[AxisAlgorithms]] -deps = ["LinearAlgebra", "Random", "SparseArrays", "WoodburyMatrices"] -git-tree-sha1 = "a4d07a1c313392a77042855df46c5f534076fab9" -uuid = "13072b0f-2c55-5437-9ae7-d433b7a33950" -version = "1.0.0" - -[[AxisArrays]] -deps = ["Dates", "IntervalSets", "IterTools", "RangeArrays"] -git-tree-sha1 = "d63ba0315a1d287c9467e61e932578f2fdd048e0" -uuid = "39de3d68-74b9-583c-8d2d-e117c070f3a9" -version = "0.3.3" - [[Base64]] uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" @@ -33,48 +15,18 @@ uuid = "b99e7846-7c00-51b0-8f62-c81ae34c0232" version = "0.5.8" -[[CatIndices]] -deps = ["CustomUnitRanges", "OffsetArrays", "Test"] -git-tree-sha1 = "254cf73ea369d2e39bfd6c5eb27a2296cfaed68c" -uuid = "aafaddc9-749c-510e-ac4f-586e18779b91" -version = "0.2.0" - [[ColorTypes]] deps = ["FixedPointNumbers", "Random"] git-tree-sha1 = "10050a24b09e8e41b951e9976b109871ce98d965" uuid = "3da002f7-5984-5a60-b8a6-cbb66c0b333f" version = "0.8.0" -[[ColorVectorSpace]] -deps = ["ColorTypes", "Colors", "FixedPointNumbers", "LinearAlgebra", "SpecialFunctions", "Statistics", "StatsBase"] -git-tree-sha1 = "459894c2b9f1ffab7e31792b689aeb5e25786d5c" -uuid = "c3611d14-8923-5661-9e6a-0046d554d3a4" -version = "0.7.1" - [[Colors]] deps = ["ColorTypes", "FixedPointNumbers", "InteractiveUtils", "Printf", "Reexport"] git-tree-sha1 = "c9c1845d6bf22e34738bee65c357a69f416ed5d1" uuid = "5ae59095-9a9b-59fe-a467-6f913c188581" version = "0.9.6" -[[Compat]] -deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "Test", "UUIDs", "Unicode"] -git-tree-sha1 = "ed2c4abadf84c53d9e58510b5fc48912c2336fbb" -uuid = "34da2185-b29b-5c13-b0c7-acf172513d20" -version = "2.2.0" - -[[ComputationalResources]] -deps = ["Test"] -git-tree-sha1 = "89e7e7ed20af73d9f78877d2b8d1194e7b6ff13d" -uuid = "ed09eef8-17a6-5b46-8889-db040fac31e3" -version = "0.3.0" - -[[Conda]] -deps = ["JSON", "VersionParsing"] -git-tree-sha1 = "9a11d428dcdc425072af4aea19ab1e8c3e01c032" -uuid = "8f4d0f93-b110-5947-807f-2305c1781a2d" -version = "1.3.0" - [[ConstructionBase]] git-tree-sha1 = "a2a6a5fea4d6f730ec4c18a76d27ec10e8ec1c50" uuid = "187b0558-2788-49d3-abe0-74a17ed4e7c9" @@ -86,18 +38,6 @@ uuid = "d38c429a-6771-53c6-b99e-75d170b6e991" version = "0.5.1" -[[CoordinateTransformations]] -deps = ["Compat", "Rotations", "StaticArrays"] -git-tree-sha1 = "47f05d0b7f4999609f92e657147df000818c1f24" -uuid = "150eb455-5306-5404-9cee-2592286d6298" -version = "0.5.0" - -[[CustomUnitRanges]] -deps = ["Test"] -git-tree-sha1 = "0a106457a1831555857e18ac9617279c22fc393b" -uuid = "dc8bdbbb-1ca9-579f-8c36-e416f6a65cce" -version = "0.2.0" - [[DataAPI]] git-tree-sha1 = "674b67f344687a88310213ddfa8a2b3c76cc4252" uuid = "9a962f9c-6df0-11e9-0e5d-c546b8b5ee8a" @@ -117,33 +57,15 @@ deps = ["Mmap"] uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab" -[[Distances]] -deps = ["LinearAlgebra", "Statistics"] -git-tree-sha1 = "23717536c81b63e250f682b0e0933769eecd1411" -uuid = "b4f34e82-e78d-54a5-968a-f98e89d6e8f7" -version = "0.8.2" - [[Distributed]] deps = ["Random", "Serialization", "Sockets"] uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" [[FFMPEG]] deps = ["BinaryProvider", "Libdl"] -git-tree-sha1 = "f65cf703281fb7917beca5ead1c67e6d60ef9597" +git-tree-sha1 = "9143266ba77d3313a4cf61d8333a1970e8c5d8b6" uuid = "c87230d0-a227-11e9-1b43-d7ebe4e7570a" -version = "0.2.3" - -[[FFTViews]] -deps = ["CustomUnitRanges", "FFTW"] -git-tree-sha1 = "1ba17a68391b2b3a0626ffb597c45e482cf7b5f0" -uuid = "4f61f5a4-77b1-5117-aa51-3ab5ef4ef0cd" -version = "0.3.0" - -[[FFTW]] -deps = ["AbstractFFTs", "BinaryProvider", "Conda", "Libdl", "LinearAlgebra", "Reexport"] -git-tree-sha1 = "4cfd3d43819228b9e73ab46600d0af0aa5cedceb" -uuid = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341" -version = "1.1.0" +version = "0.2.4" [[FileIO]] deps = ["Pkg"] @@ -168,94 +90,10 @@ uuid = "4d00f742-c7ba-57c2-abde-4428a4b178cb" version = "0.7.6" -[[Graphics]] -deps = ["Colors", "Compat", "NaNMath"] -git-tree-sha1 = "e3ead4211073d4117a0d2ef7d1efc5c8092c8412" -uuid = "a2bd30eb-e257-5431-a919-1863eab51364" -version = "0.4.0" - -[[IdentityRanges]] -deps = ["OffsetArrays", "Test"] -git-tree-sha1 = "b8c36c6083fd14e2a82c5974225702126e894f23" -uuid = "bbac6d45-d8f3-5730-bfe4-7a449cd117ca" -version = "0.3.0" - -[[ImageAxes]] -deps = ["AxisArrays", "Colors", "FixedPointNumbers", "ImageCore", "MappedArrays", "Reexport", "SimpleTraits"] -git-tree-sha1 = "0da90109d2574cf540fae8e8c58dfdf1c7e347ce" -uuid = "2803e5a7-5153-5ecf-9a86-9b4c37f5f5ac" -version = "0.6.1" - -[[ImageCore]] -deps = ["ColorTypes", "Colors", "FFTW", "FixedPointNumbers", "Graphics", "MappedArrays", "OffsetArrays", "PaddedViews", "Reexport"] -git-tree-sha1 = "5ea0410ea092ca0e928a663bb581e0d059f6745c" -uuid = "a09fc81d-aa75-5fe9-8630-4744c3626534" -version = "0.8.5" - -[[ImageDistances]] -deps = ["ColorVectorSpace", "Colors", "Distances", "ImageCore", "LinearAlgebra", "MappedArrays", "Statistics"] -git-tree-sha1 = "9c6277ac5eef326c685997cd8ccdea2f901fe5a6" -uuid = "51556ac3-7006-55f5-8cb3-34580c88182d" -version = "0.2.5" - -[[ImageFiltering]] -deps = ["CatIndices", "ColorVectorSpace", "Colors", "ComputationalResources", "DataStructures", "FFTViews", "FFTW", "FixedPointNumbers", "ImageCore", "LinearAlgebra", "MappedArrays", "OffsetArrays", "Requires", "StaticArrays", "Statistics", "TiledIteration"] -git-tree-sha1 = "13d066701b1c4673323c4ecc73d4037bc0e62ca7" -uuid = "6a3955dd-da59-5b1f-98d4-e7296123deb5" -version = "0.6.6" - -[[ImageMetadata]] -deps = ["AxisArrays", "ColorVectorSpace", "Colors", "FixedPointNumbers", "ImageAxes", "ImageCore", "IndirectArrays"] -git-tree-sha1 = "4d9ec4bb0fe4bf08c3890cb4f1274c1a63fd31ee" -uuid = "bc367c6b-8a6b-528e-b4bd-a4b897500b49" -version = "0.7.2" - -[[ImageMorphology]] -deps = ["Colors", "FixedPointNumbers", "ImageCore"] -git-tree-sha1 = "2ea6e55a36166321ca735b8eaf74936180e2ad5d" -uuid = "787d08f9-d448-5407-9aad-5290dd7ab264" -version = "0.2.4" - -[[ImageShow]] -deps = ["Base64", "ColorTypes", "Colors", "FileIO", "FixedPointNumbers", "ImageCore", "OffsetArrays", "Requires"] -git-tree-sha1 = "c23323afc82b6b553e6b2244d531e50858ea392c" -uuid = "4e3cecfd-b093-5904-9786-8bbb286a6a31" -version = "0.2.0" - -[[ImageTransformations]] -deps = ["AxisAlgorithms", "ColorTypes", "ColorVectorSpace", "Colors", "CoordinateTransformations", "FixedPointNumbers", "IdentityRanges", "ImageCore", "Interpolations", "OffsetArrays", "StaticArrays"] -git-tree-sha1 = "4cf03fc72d8877d5e58c1c72d176340ad4e28fda" -uuid = "02fcd773-0e25-5acc-982a-7f6622650795" -version = "0.8.0" - -[[Images]] -deps = ["AxisArrays", "Base64", "ColorTypes", "ColorVectorSpace", "Colors", "FileIO", "FixedPointNumbers", "Graphics", "ImageAxes", "ImageCore", "ImageDistances", "ImageFiltering", "ImageMetadata", "ImageMorphology", "ImageShow", "ImageTransformations", "IndirectArrays", "MappedArrays", "OffsetArrays", "Random", "Reexport", "SparseArrays", "StaticArrays", "Statistics", "StatsBase", "TiledIteration"] -git-tree-sha1 = "dd29d28b83c992fb8421ab875a7e089d3cc023fc" -uuid = "916415d5-f1e6-5110-898d-aaa5f9f070e0" -version = "0.19.0" - -[[IndirectArrays]] -deps = ["Compat", "Test"] -git-tree-sha1 = "b6e249be10a3381b2c72ac82f2d13d70067cb2bd" -uuid = "9b13fd28-a010-5f03-acff-a1bbcff69959" -version = "0.5.0" - [[InteractiveUtils]] deps = ["Markdown"] uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240" -[[Interpolations]] -deps = ["AxisAlgorithms", "LinearAlgebra", "OffsetArrays", "Random", "Ratios", "SharedArrays", "SparseArrays", "StaticArrays", "WoodburyMatrices"] -git-tree-sha1 = "f5bf159a7705e2a705b0effa1be0c3d18e288fe1" -uuid = "a98d9a8b-a2ab-59e6-89dd-64a1c18fca59" -version = "0.12.5" - -[[IntervalSets]] -deps = ["Dates", "Statistics"] -git-tree-sha1 = "4214b48a62eb8f2c292b2ee34a508c256c0cdbc9" -uuid = "8197267c-284f-5f27-9208-e0e47529a953" -version = "0.3.2" - [[IterTools]] git-tree-sha1 = "05110a2ab1fc5f932622ffea2a003221f4782c18" uuid = "c8e1da08-722c-5040-9ed9-7db0dc04731e" @@ -286,11 +124,6 @@ uuid = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09" version = "0.5.3" -[[MappedArrays]] -git-tree-sha1 = "e2a02fe7ee86a10c707ff1756ab1650b40b140bb" -uuid = "dbb5928d-eab1-5f90-85c2-b9b0edb7c900" -version = "0.2.2" - [[Markdown]] deps = ["Base64"] uuid = "d6f4376e-aef5-505a-96c1-9c027394607a" @@ -315,29 +148,12 @@ uuid = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3" version = "0.3.3" -[[OffsetArrays]] -git-tree-sha1 = "1ae707306f6e33dbb37d0742e08828562772b73f" -uuid = "6fe1bfb0-de20-5000-8ca7-80f57d26f881" -version = "0.11.2" - -[[OpenSpecFun_jll]] -deps = ["Libdl", "Pkg"] -git-tree-sha1 = "65f672edebf3f4e613ddf37db9dcbd7a407e5e90" -uuid = "efe28fd5-8261-553b-a9e1-b2916fc3738e" -version = "0.5.3+1" - [[OrderedCollections]] deps = ["Random", "Serialization", "Test"] git-tree-sha1 = "c4c13474d23c60d20a67b217f1d7f22a40edf8f1" uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d" version = "1.1.0" -[[PaddedViews]] -deps = ["OffsetArrays", "Test"] -git-tree-sha1 = "7da3e7e1a58cffbf10177553ae95f17b92516912" -uuid = "5432bcbf-9aad-5242-b902-cca2824c8663" -version = "0.4.2" - [[Parsers]] deps = ["Dates", "Test"] git-tree-sha1 = "0139ba59ce9bc680e2925aec5b7db79065d60556" @@ -378,18 +194,6 @@ deps = ["Serialization"] uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" -[[RangeArrays]] -deps = ["Compat"] -git-tree-sha1 = "d925adfd5b01cb46fde89dc9548d167b3b136f4a" -uuid = "b3c3ace0-ae52-54e7-9d0b-2c1406fd6b9d" -version = "0.3.1" - -[[Ratios]] -deps = ["Compat"] -git-tree-sha1 = "cdbbe0f350581296f3a2e3e7a91b214121934407" -uuid = "c84ed2f1-dad5-54f0-aa8e-dbefe2724439" -version = "0.3.1" - [[RecipesBase]] git-tree-sha1 = "7bdce29bc9b2f5660a6e5e64d64d91ec941f6aa2" uuid = "3cdcf5f2-1ef4-517c-9805-6587b60abb01" @@ -407,12 +211,6 @@ uuid = "ae029012-a4dd-5104-9daa-d747884805df" version = "0.5.2" -[[Rotations]] -deps = ["LinearAlgebra", "StaticArrays", "Statistics"] -git-tree-sha1 = "4fa94411637e4f4ca4d9b5bfa64d7042541d67b3" -uuid = "6038ab10-8711-5258-84ad-4b1120ba62dc" -version = "0.12.0" - [[SHA]] uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce" @@ -425,22 +223,12 @@ uuid = "efcf1570-3423-57d1-acb7-fd33fddbac46" version = "0.5.2" -[[SharedArrays]] -deps = ["Distributed", "Mmap", "Random", "Serialization"] -uuid = "1a1011a3-84de-559e-8e89-a11a2f7dc383" - [[Showoff]] deps = ["Dates"] git-tree-sha1 = "e032c9df551fb23c9f98ae1064de074111b7bc39" uuid = "992d4aef-0814-514b-bc4d-f2e9a6c4116f" version = "0.3.1" -[[SimpleTraits]] -deps = ["InteractiveUtils", "MacroTools"] -git-tree-sha1 = "2bdf3b6300a9d66fe29ee8bb51ba100c4df9ecbc" -uuid = "699a6c99-e7fa-54fc-8d76-47d257e15c1d" -version = "0.9.1" - [[Sockets]] uuid = "6462fe0b-24de-5631-8697-dd941f90decc" @@ -454,12 +242,6 @@ deps = ["LinearAlgebra", "Random"] uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" -[[SpecialFunctions]] -deps = ["OpenSpecFun_jll"] -git-tree-sha1 = "268052ee908b2c086cc0011f528694f02f3e2408" -uuid = "276daf66-3868-5448-9aa4-cd146d93841b" -version = "0.9.0" - [[StaticArrays]] deps = ["LinearAlgebra", "Random", "Statistics"] git-tree-sha1 = "5a3bcb6233adabde68ebc97be66e95dcb787424c" @@ -480,27 +262,9 @@ deps = ["Distributed", "InteractiveUtils", "Logging", "Random"] uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" -[[TiledIteration]] -deps = ["OffsetArrays", "Test"] -git-tree-sha1 = "58f6f07d3b54a363ec283a8f5fc9fb4ecebde656" -uuid = "06e1c1a7-607b-532d-9fad-de7d9aa2abac" -version = "0.2.3" - [[UUIDs]] deps = ["Random", "SHA"] uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" [[Unicode]] uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5" - -[[VersionParsing]] -deps = ["Compat"] -git-tree-sha1 = "c9d5aa108588b978bd859554660c8a5c4f2f7669" -uuid = "81def892-9a0e-5fdd-b105-ffc91e053289" -version = "1.1.3" - -[[WoodburyMatrices]] -deps = ["LinearAlgebra", "Random", "SparseArrays", "Test"] -git-tree-sha1 = "21772c33b447757ec7d3e61fcdfb9ea5c47eedcf" -uuid = "efce3f68-66dc-5838-9240-27a6d6f5f9b6" -version = "0.4.1" diff -r 5b18eb027b03 -r bda471ea9d67 Project.toml --- a/Project.toml Thu Dec 05 17:12:55 2019 +0200 +++ b/Project.toml Fri Dec 06 21:19:21 2019 +0200 @@ -5,8 +5,8 @@ [deps] AlgTools = "c46e2e78-5339-41fd-a966-983ff60ab8e7" +ColorTypes = "3da002f7-5984-5a60-b8a6-cbb66c0b333f" FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549" -Images = "916415d5-f1e6-5110-898d-aaa5f9f070e0" Measures = "442fdcdd-2543-5da2-b0f3-8c86c306513e" Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7" diff -r 5b18eb027b03 -r bda471ea9d67 src/Visualise.jl --- a/src/Visualise.jl Thu Dec 05 17:12:55 2019 +0200 +++ b/src/Visualise.jl Fri Dec 06 21:19:21 2019 +0200 @@ -7,7 +7,9 @@ using Printf using FileIO using Setfield -using Images, Plots, Measures +using ColorTypes: Gray +using Plots +using Measures using AlgTools.Util using AlgTools.StructTools