Skip to content

Commit

Permalink
Merge branch 'main' into ali-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
gha3mi committed Feb 4, 2024
2 parents 940ac7a + 4fb9199 commit 307f65e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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: "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.

Expand Down Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions src/colormaps_info.f90
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -635,7 +635,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",&
Expand All @@ -649,7 +649,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",&
Expand All @@ -663,7 +663,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",&
Expand All @@ -677,7 +677,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",&
Expand Down

0 comments on commit 307f65e

Please sign in to comment.