Merge pull request #28 from callumrollo/patch-1

Add new categorical colourmaps
callumrollo · Jul 10, 2023 · c4d448a · c4d448a
2 parents 090f129 + 4c64a7e
commit c4d448a
Show file tree

Hide file tree

Showing 7 changed files with 502 additions and 4 deletions.
diff --git a/cmcrameri/__init__.py b/cmcrameri/__init__.py
@@ -18,6 +18,6 @@
 
 __authors__ = ["Callum Rollo <c.rollo@outlook.com>"]
 
-__version__ = "1.6"
+__version__ = "1.7"
 
 __scm_version__ = "8.0"
diff --git a/cmcrameri/cm.py b/cmcrameri/cm.py
@@ -54,9 +54,7 @@
     "fes",
 )
 
-_cmap_base_names_categorical = tuple(
-    name for name in _cmap_names_sequential if name not in {"batlowW", "batlowK"}
-)
+_cmap_base_names_categorical = tuple(_cmap_names_sequential)
 _cmap_names_categorical = tuple(f"{name}S" for name in _cmap_base_names_categorical)
 
 _cmap_base_names_cyclic = (

diff --git a/cmcrameri/cmaps/batlowKS.txt b/cmcrameri/cmaps/batlowKS.txt
@@ -0,0 +1,100 @@
+0.016676 0.020805 0.040926
+0.992327 0.752258 0.837411
+0.470163 0.486878 0.256263
+0.223875 0.335205 0.373382
+0.897497 0.633246 0.378392
+0.107108 0.184867 0.269059
+0.687116 0.574882 0.225646
+0.328820 0.410492 0.331523
+0.981321 0.682490 0.605457
+0.068488 0.100766 0.152589
+0.569640 0.531896 0.225527
+0.804750 0.608616 0.279601
+0.274509 0.376117 0.361011
+0.992190 0.714678 0.719411
+0.165185 0.271594 0.349751
+0.394979 0.447862 0.293185
+0.954635 0.656758 0.495641
+0.197620 0.309004 0.368560
+0.993369 0.733990 0.781210
+0.988078 0.696918 0.658823
+0.970572 0.669090 0.551044
+0.050791 0.067321 0.102713
+0.248040 0.356207 0.370513
+0.430690 0.466885 0.274441
+0.520571 0.510686 0.237742
+0.362484 0.429877 0.311671
+0.743621 0.592038 0.243777
+0.622908 0.552706 0.219927
+0.858490 0.622430 0.328424
+0.302196 0.394351 0.346861
+0.136532 0.232929 0.319290
+0.083960 0.137520 0.207794
+0.932258 0.645422 0.440094
+0.832738 0.615797 0.302634
+0.121115 0.209147 0.296005
+0.990548 0.705621 0.689085
+0.094703 0.160735 0.239260
+0.774885 0.600715 0.259821
+0.033368 0.045525 0.075874
+0.654734 0.564090 0.220932
+0.181627 0.291307 0.361153
+0.993109 0.724127 0.750045
+0.261272 0.366537 0.366454
+0.288066 0.385286 0.354445
+0.916166 0.639285 0.408837
+0.494624 0.498687 0.246567
+0.345204 0.420032 0.321843
+0.452752 0.478193 0.263941
+0.719564 0.584984 0.234456
+0.376052 0.437473 0.303829
+0.062687 0.086805 0.130275
+0.881759 0.628691 0.356360
+0.212903 0.324666 0.372427
+0.945901 0.651792 0.471788
+0.409865 0.455890 0.285134
+0.977270 0.676622 0.582278
+0.985601 0.690608 0.636061
+0.962180 0.661914 0.519470
+0.548059 0.522809 0.230107
+0.237895 0.347739 0.372498
+0.592021 0.540910 0.222121
+0.074651 0.115786 0.175929
+0.313300 0.401202 0.340581
+0.152785 0.255619 0.338342
+0.993154 0.741661 0.805017
+0.845911 0.619182 0.315228
+0.983608 0.686511 0.620805
+0.870443 0.625595 0.342158
+0.042445 0.056896 0.089845
+0.507407 0.504671 0.242024
+0.607329 0.546853 0.220680
+0.189708 0.300392 0.365328
+0.320954 0.405818 0.336139
+0.939378 0.648573 0.455903
+0.254684 0.361484 0.368675
+0.420126 0.461346 0.279789
+0.924528 0.642336 0.424388
+0.353725 0.424919 0.316817
+0.974117 0.672815 0.566713
+0.703364 0.580033 0.229505
+0.079090 0.126414 0.191829
+0.992818 0.746912 0.821120
+0.482209 0.492743 0.251350
+0.128699 0.221162 0.308145
+0.089103 0.148960 0.223655
+0.057478 0.077174 0.116136
+0.024857 0.032994 0.060093
+0.295048 0.389818 0.350777
+0.638727 0.558451 0.219989
+0.989428 0.701226 0.673958
+0.759394 0.596478 0.251322
+0.534121 0.516742 0.233730
+0.205358 0.317078 0.370890
+0.230971 0.341661 0.373219
+0.819001 0.612280 0.290739
+0.281227 0.380740 0.357873
+0.441559 0.472499 0.269167
+0.113916 0.197039 0.282951
+0.385381 0.442632 0.298528
+0.993318 0.729004 0.765555
diff --git a/cmcrameri/cmaps/batlowWS.txt b/cmcrameri/cmaps/batlowWS.txt
@@ -0,0 +1,100 @@
+1.000000 0.995792 0.995630
+0.004637 0.098343 0.349833
+0.487926 0.528073 0.219689
+0.907149 0.672180 0.516481
+0.126576 0.372589 0.382340
+0.742823 0.614585 0.265760
+0.994914 0.819823 0.804891
+0.066347 0.261923 0.377420
+0.287175 0.456145 0.316006
+0.049465 0.191514 0.365883
+0.611435 0.570616 0.197082
+0.196804 0.417914 0.358876
+0.086163 0.319146 0.384832
+0.960963 0.719053 0.649193
+1.000000 0.919515 0.917749
+0.841438 0.647106 0.393892
+0.386976 0.492625 0.265584
+0.074722 0.290850 0.381694
+0.678626 0.593304 0.218155
+0.797642 0.632594 0.328440
+0.031891 0.146753 0.358229
+1.000000 0.960136 0.959490
+0.876785 0.659459 0.456431
+0.336283 0.474399 0.291064
+0.240272 0.437545 0.339169
+0.999489 0.873048 0.867823
+0.982258 0.764508 0.728333
+0.102811 0.346633 0.385611
+0.935018 0.689766 0.578695
+0.547198 0.548608 0.201224
+0.059056 0.230019 0.372281
+0.158287 0.396424 0.373569
+0.432844 0.508841 0.243475
+1.000000 0.897109 0.894081
+0.176781 0.407449 0.366938
+0.578726 0.559444 0.196644
+0.516956 0.538156 0.209364
+0.859944 0.653422 0.425620
+0.820812 0.640231 0.361344
+0.054774 0.211752 0.369266
+0.644949 0.581983 0.204022
+0.093708 0.333047 0.385618
+0.972482 0.739853 0.688143
+1.000000 0.940497 0.939436
+0.921295 0.679968 0.546917
+0.263409 0.446918 0.327894
+0.141488 0.384800 0.378701
+0.042104 0.169711 0.362175
+1.000000 0.978494 0.978119
+0.948316 0.702501 0.612626
+0.361443 0.483493 0.278338
+0.711566 0.604272 0.239170
+0.989780 0.791754 0.767880
+0.070259 0.276546 0.379654
+0.459940 0.518331 0.231262
+0.113716 0.359846 0.384591
+0.218027 0.427911 0.349563
+0.997972 0.847203 0.838249
+0.079937 0.305058 0.383472
+0.771646 0.624066 0.296099
+0.311512 0.465284 0.303650
+0.062771 0.246598 0.374979
+0.019623 0.122982 0.354106
+0.892407 0.665555 0.486558
+0.406433 0.499522 0.256044
+0.082923 0.312102 0.384210
+0.207271 0.422956 0.354373
+0.348821 0.478945 0.284696
+0.757569 0.619447 0.280559
+1.000000 0.930178 0.928808
+0.012565 0.110825 0.351981
+0.251759 0.442260 0.333629
+0.941729 0.695707 0.595351
+0.998889 0.860347 0.853484
+0.899867 0.668767 0.501512
+0.060869 0.238500 0.373673
+0.928203 0.684556 0.562590
+0.531919 0.543327 0.204958
+0.057021 0.221141 0.370813
+0.966899 0.728920 0.668419
+0.594947 0.564990 0.196125
+0.275221 0.451550 0.322012
+0.323850 0.469853 0.297387
+0.186615 0.412757 0.363076
+0.884727 0.662478 0.471563
+0.661828 0.587663 0.210168
+0.089792 0.326111 0.385310
+0.045968 0.180761 0.364057
+0.628129 0.576301 0.199637
+0.868550 0.656464 0.441129
+0.695248 0.598847 0.227875
+0.850921 0.650319 0.409880
+0.954746 0.710260 0.630581
+0.999842 0.885298 0.881323
+0.992638 0.805795 0.786803
+0.419564 0.504170 0.249730
+1.000000 0.950480 0.949652
+0.052254 0.201845 0.367610
+0.986319 0.777917 0.748321
+0.977623 0.751759 0.708191
diff --git a/cmcrameri/cmaps/glasgowS.txt b/cmcrameri/cmaps/glasgowS.txt
@@ -0,0 +1,100 @@
+0.211814 0.073933 0.220614
+0.858966 0.828649 1.000000
+0.427481 0.441071 0.175407
+0.440132 0.177274 0.021779
+0.413025 0.638583 0.645243
+0.322081 0.105091 0.125200
+0.626365 0.734528 0.828485
+0.454737 0.317610 0.004415
+0.386730 0.540655 0.416564
+0.516658 0.689484 0.744470
+0.406895 0.492129 0.296246
+0.269678 0.089618 0.171150
+0.381923 0.126188 0.076360
+0.445764 0.382645 0.062145
+0.731886 0.777311 0.907767
+0.456875 0.250148 0.002164
+0.374584 0.589162 0.535623
+0.437407 0.413058 0.116496
+0.396727 0.516529 0.356539
+0.791130 0.801282 0.951537
+0.451503 0.350465 0.020328
+0.414377 0.146437 0.048631
+0.678516 0.755682 0.867780
+0.572491 0.712585 0.787664
+0.461151 0.664862 0.697624
+0.417154 0.467178 0.235803
+0.453341 0.213916 0.007473
+0.456468 0.284425 0.000954
+0.295807 0.097347 0.147964
+0.242186 0.081714 0.195392
+0.377957 0.564659 0.476156
+0.350367 0.113897 0.101701
+0.383080 0.611744 0.587688
+0.365754 0.119348 0.089337
+0.422307 0.454320 0.205544
+0.282835 0.093477 0.159435
+0.227493 0.077670 0.207907
+0.335847 0.109312 0.113645
+0.382037 0.552651 0.446408
+0.308833 0.101183 0.136575
+0.395249 0.625111 0.616945
+0.391693 0.528626 0.386586
+0.398422 0.135031 0.062973
+0.455733 0.301082 0.001850
+0.441874 0.398142 0.088480
+0.448311 0.195330 0.013206
+0.599715 0.723689 0.808335
+0.412008 0.479754 0.266048
+0.256166 0.085604 0.183121
+0.544745 0.701195 0.766413
+0.760499 0.788895 0.929016
+0.455915 0.232298 0.004146
+0.652537 0.745146 0.848224
+0.453365 0.334073 0.009869
+0.428639 0.160657 0.033747
+0.375126 0.576794 0.505857
+0.824030 0.814568 0.975362
+0.488577 0.677395 0.721630
+0.432553 0.427358 0.145642
+0.435484 0.651905 0.672199
+0.448998 0.366705 0.038112
+0.704765 0.766320 0.887483
+0.401799 0.504382 0.326401
+0.456916 0.267488 0.001104
+0.376461 0.598692 0.557980
+0.454104 0.325833 0.006679
+0.315407 0.103164 0.130930
+0.379891 0.558642 0.461292
+0.430028 0.434275 0.160429
+0.262979 0.087669 0.177114
+0.414572 0.473483 0.250924
+0.456547 0.241301 0.003037
+0.613104 0.729139 0.818466
+0.219795 0.075756 0.214237
+0.406537 0.140384 0.055873
+0.665527 0.750416 0.858005
+0.434786 0.168726 0.027345
+0.456132 0.292781 0.001245
+0.452515 0.342277 0.014455
+0.530729 0.695382 0.755540
+0.394203 0.522582 0.371565
+0.558666 0.706933 0.777122
+0.289335 0.095451 0.153667
+0.390172 0.130335 0.069771
+0.376341 0.570698 0.491019
+0.276290 0.091604 0.165243
+0.448005 0.658436 0.685102
+0.389198 0.534645 0.401588
+0.502581 0.683485 0.733182
+0.373764 0.122514 0.082919
+0.423742 0.645273 0.658904
+0.474730 0.671184 0.709796
+0.718176 0.771756 0.897528
+0.443903 0.390456 0.075044
+0.421787 0.153204 0.041226
+0.456736 0.276029 0.000916
+0.455272 0.309376 0.002863
+0.435017 0.420275 0.130954
+0.450334 0.358597 0.028028
+0.374498 0.582935 0.520736