From 11e60a275afbd10654df957e7f79565c15e83d51 Mon Sep 17 00:00:00 2001 From: vmagnin Date: Sun, 4 Feb 2024 12:24:41 +0100 Subject: [PATCH 1/2] README.md: updated the CUBEHELIX URL --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 63640b2..0a1fe1c 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ This Fortran library is independent of any graphical toolkit: its main functionality is to convert a real value to RGB values that you can use with any drawing toolkit. It offers various methods and options to manage colormaps. It includes: * a few basic colormaps: "grey", "fire", "rainbow", "inverted_rainbow", "zebra", "black_body" -* the Dave Green's [cubehelix](https://www.mrao.cam.ac.uk/~dag/CUBEHELIX/) colormap, +* the Dave Green's [cubehelix](https://people.phy.cam.ac.uk/dag9/CUBEHELIX/) colormap, * the "magma", "inferno","plasma", "viridis" [matplotlib colormaps](https://bids.github.io/colormap/), * the 222 colormaps of the *Scientific colour maps* collection v8.0.1 by Fabio Crameri. See Fabio Crameri's poster ["Scientific Colour Maps"](https://www.fabiocrameri.ch/ws/media-library/a17d02961b3a4544961416de2d7900a4/posterscientificcolourmaps_crameri.pdf) for more information and my [No Bijection!](NO_BIJECTION.md) text about the mysteries and wonders of colors. @@ -171,7 +171,7 @@ As any work, a colormap should be cited: * "In Search of a Perfect Colormap", http://inversed.ru/Blog_2.htm #### Specific colormaps -* Cubehelix (Dave Green, public domain): https://www.mrao.cam.ac.uk/~dag/CUBEHELIX/ +* Cubehelix (Dave Green, public domain): https://people.phy.cam.ac.uk/dag9/CUBEHELIX/ * Scientific colour maps (Fabio Crameri, MIT license): * https://www.fabiocrameri.ch/colourmaps/ * https://s-ink.org/colour-map-guideline From 4fb91990b418340f186f44e9b07b6f35f1962555 Mon Sep 17 00:00:00 2001 From: vmagnin Date: Sun, 4 Feb 2024 12:28:49 +0100 Subject: [PATCH 2/2] Fixes issue #24 The discrete versions of the "bamako" scientific colormaps have been put in the "Diverging" category but they should be in the "Sequential" category with the continuous version. src/colormaps_info.f90 --- src/colormaps_info.f90 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/colormaps_info.f90 b/src/colormaps_info.f90 index 2c45f3e..05f5bda 100644 --- a/src/colormaps_info.f90 +++ b/src/colormaps_info.f90 @@ -21,7 +21,7 @@ ! SOFTWARE. !------------------------------------------------------------------------------- ! Contributed by gha3mi: 2023-11-05 -! Last modification: gha3mi 2024-01-06 +! Last modification: gha3mi 2024-01-06, vmagnin 2024-02-04 !------------------------------------------------------------------------------- module forcolormap_info @@ -610,7 +610,7 @@ pure elemental subroutine set_all(this) call this%colormaps(i)%set_info(& name = "bamako10",& family = "bamako",& - gradient = "Diverging",& + gradient = "Sequential",& palette = "Discrete",& levels = 10, & colorbar = "bamako10_colorbar.ppm",& @@ -624,7 +624,7 @@ pure elemental subroutine set_all(this) call this%colormaps(i)%set_info(& name = "bamako100",& family = "bamako",& - gradient = "Diverging",& + gradient = "Sequential",& palette = "Discrete",& levels = 100, & colorbar = "bamako100_colorbar.ppm",& @@ -638,7 +638,7 @@ pure elemental subroutine set_all(this) call this%colormaps(i)%set_info(& name = "bamako25",& family = "bamako",& - gradient = "Diverging",& + gradient = "Sequential",& palette = "Discrete",& levels = 25, & colorbar = "bamako25_colorbar.ppm",& @@ -652,7 +652,7 @@ pure elemental subroutine set_all(this) call this%colormaps(i)%set_info(& name = "bamako50",& family = "bamako",& - gradient = "Diverging",& + gradient = "Sequential",& palette = "Discrete",& levels = 50, & colorbar = "bamako50_colorbar.ppm",&