From 46d9bcc3bbcc4e98a7cda57cbe29bccd87c6aee0 Mon Sep 17 00:00:00 2001 From: Nicolas Payette Date: Mon, 11 Nov 2024 18:33:11 +0000 Subject: [PATCH] use LAJOLLA palette for biomass maps in example --- .../examples/BasicScenarioWithUI.java | 4 +- .../gui/palettes/PaletteColorMap.java | 1 + .../VesselFieldPortrayalFactory.java | 4 +- gui/src/main/resources/palettes/lajolla.txt | 256 ++++++++++++++++++ 4 files changed, 261 insertions(+), 4 deletions(-) create mode 100644 gui/src/main/resources/palettes/lajolla.txt diff --git a/examples/src/main/java/uk/ac/ox/poseidon/examples/BasicScenarioWithUI.java b/examples/src/main/java/uk/ac/ox/poseidon/examples/BasicScenarioWithUI.java index e00723530..a485ba6bd 100644 --- a/examples/src/main/java/uk/ac/ox/poseidon/examples/BasicScenarioWithUI.java +++ b/examples/src/main/java/uk/ac/ox/poseidon/examples/BasicScenarioWithUI.java @@ -38,7 +38,7 @@ public BasicScenarioWithUI(final BasicScenario scenario) { ), "Species A Biomass", new NumberGridWithCapacityPortrayalFactory( - TURKU, + LAJOLLA, "Biomass", false, scenario.getBiomassGridA(), @@ -46,7 +46,7 @@ public BasicScenarioWithUI(final BasicScenario scenario) { ), "Species B Biomass", new NumberGridWithCapacityPortrayalFactory( - TURKU, + LAJOLLA, "Biomass", false, scenario.getBiomassGridB(), diff --git a/gui/src/main/java/uk/ac/ox/poseidon/gui/palettes/PaletteColorMap.java b/gui/src/main/java/uk/ac/ox/poseidon/gui/palettes/PaletteColorMap.java index 809e0807b..bade848e3 100644 --- a/gui/src/main/java/uk/ac/ox/poseidon/gui/palettes/PaletteColorMap.java +++ b/gui/src/main/java/uk/ac/ox/poseidon/gui/palettes/PaletteColorMap.java @@ -17,6 +17,7 @@ public class PaletteColorMap extends AbstractColorMap { public static final String IMOLA = "imola"; + public static final String LAJOLLA = "lajolla"; public static final String OLERON = "oleron"; public static final String TURKU = "turku"; private static final Color TRANSPARENT = new Color(0, 0, 0, 0); diff --git a/gui/src/main/java/uk/ac/ox/poseidon/gui/portrayals/VesselFieldPortrayalFactory.java b/gui/src/main/java/uk/ac/ox/poseidon/gui/portrayals/VesselFieldPortrayalFactory.java index 547058113..00f4730ad 100644 --- a/gui/src/main/java/uk/ac/ox/poseidon/gui/portrayals/VesselFieldPortrayalFactory.java +++ b/gui/src/main/java/uk/ac/ox/poseidon/gui/portrayals/VesselFieldPortrayalFactory.java @@ -31,7 +31,7 @@ import uk.ac.ox.poseidon.core.Simulation; import uk.ac.ox.poseidon.core.SimulationScopeFactory; -import static java.awt.Color.BLACK; +import static java.awt.Color.*; import static sim.portrayal.simple.OrientedPortrayal2D.SHAPE_COMPASS; @Getter @@ -52,7 +52,7 @@ protected ContinuousPortrayal2D newInstance(final Simulation simulation) { new SimplePortrayal2D(), 0, SCALE, - BLACK, + WHITE, SHAPE_COMPASS ) ); diff --git a/gui/src/main/resources/palettes/lajolla.txt b/gui/src/main/resources/palettes/lajolla.txt new file mode 100644 index 000000000..5616c36bc --- /dev/null +++ b/gui/src/main/resources/palettes/lajolla.txt @@ -0,0 +1,256 @@ +0.098791 0.099669 0.000088 +0.102398 0.100814 0.002016 +0.105856 0.102014 0.003932 +0.109170 0.103273 0.005840 +0.112474 0.104439 0.007746 +0.115773 0.105695 0.009656 +0.119086 0.106937 0.011760 +0.122370 0.108079 0.013670 +0.125765 0.109344 0.015595 +0.129083 0.110536 0.017532 +0.132479 0.111731 0.019486 +0.135832 0.112947 0.021462 +0.139249 0.114096 0.023462 +0.142721 0.115314 0.025492 +0.146188 0.116556 0.027555 +0.149714 0.117765 0.029655 +0.153215 0.119010 0.031796 +0.156820 0.120223 0.033961 +0.160419 0.121466 0.036412 +0.164141 0.122736 0.038709 +0.167834 0.124034 0.041058 +0.171613 0.125365 0.043253 +0.175448 0.126668 0.045600 +0.179347 0.128031 0.047889 +0.183292 0.129370 0.050218 +0.187338 0.130777 0.052456 +0.191398 0.132157 0.054749 +0.195552 0.133574 0.057052 +0.199759 0.135025 0.059373 +0.204093 0.136445 0.061524 +0.208438 0.137979 0.063852 +0.212867 0.139428 0.066100 +0.217399 0.141015 0.068401 +0.221979 0.142548 0.070615 +0.226668 0.144129 0.072894 +0.231424 0.145750 0.075110 +0.236255 0.147356 0.077324 +0.241152 0.148993 0.079626 +0.246126 0.150675 0.082053 +0.251203 0.152365 0.084452 +0.256313 0.154101 0.086925 +0.261529 0.155889 0.089444 +0.266808 0.157647 0.092067 +0.272159 0.159456 0.094750 +0.277620 0.161336 0.097443 +0.283142 0.163196 0.100219 +0.288738 0.165057 0.103107 +0.294406 0.167020 0.106026 +0.300173 0.168975 0.108981 +0.306035 0.170932 0.112027 +0.311930 0.172936 0.115071 +0.317951 0.174991 0.118267 +0.324033 0.177046 0.121403 +0.330210 0.179135 0.124669 +0.336449 0.181231 0.127997 +0.342792 0.183380 0.131345 +0.349191 0.185585 0.134755 +0.355681 0.187779 0.138191 +0.362234 0.189962 0.141663 +0.368872 0.192199 0.145203 +0.375570 0.194487 0.148714 +0.382348 0.196763 0.152311 +0.389208 0.199025 0.155973 +0.396126 0.201339 0.159588 +0.403111 0.203702 0.163305 +0.410167 0.206055 0.167007 +0.417279 0.208396 0.170707 +0.424448 0.210766 0.174453 +0.431694 0.213130 0.178213 +0.438972 0.215530 0.181919 +0.446327 0.217923 0.185715 +0.453734 0.220327 0.189437 +0.461197 0.222709 0.193178 +0.468712 0.225073 0.196918 +0.476277 0.227476 0.200586 +0.483887 0.229823 0.204310 +0.491568 0.232214 0.207943 +0.499268 0.234569 0.211570 +0.507032 0.236904 0.215121 +0.514841 0.239198 0.218665 +0.522691 0.241494 0.222129 +0.530585 0.243739 0.225557 +0.538526 0.245982 0.228915 +0.546498 0.248220 0.232200 +0.554505 0.250369 0.235417 +0.562556 0.252534 0.238525 +0.570622 0.254658 0.241596 +0.578732 0.256723 0.244541 +0.586863 0.258774 0.247442 +0.595019 0.260780 0.250209 +0.603195 0.262762 0.252927 +0.611383 0.264701 0.255529 +0.619582 0.266626 0.258022 +0.627779 0.268526 0.260449 +0.635979 0.270408 0.262772 +0.644165 0.272236 0.264987 +0.652346 0.274100 0.267119 +0.660500 0.275957 0.269192 +0.668632 0.277791 0.271140 +0.676724 0.279653 0.273014 +0.684764 0.281520 0.274801 +0.692762 0.283434 0.276532 +0.700683 0.285371 0.278167 +0.708537 0.287376 0.279741 +0.716305 0.289458 0.281228 +0.723970 0.291602 0.282691 +0.731535 0.293812 0.284053 +0.738987 0.296143 0.285370 +0.746299 0.298576 0.286641 +0.753474 0.301124 0.287867 +0.760502 0.303810 0.289058 +0.767360 0.306647 0.290172 +0.774048 0.309620 0.291279 +0.780555 0.312723 0.292319 +0.786871 0.316022 0.293327 +0.792976 0.319454 0.294303 +0.798871 0.323061 0.295249 +0.804548 0.326810 0.296165 +0.809995 0.330734 0.297055 +0.815214 0.334831 0.297889 +0.820195 0.339049 0.298716 +0.824940 0.343407 0.299513 +0.829449 0.347900 0.300265 +0.833714 0.352506 0.300996 +0.837741 0.357235 0.301703 +0.841532 0.362040 0.302385 +0.845096 0.366931 0.303044 +0.848438 0.371886 0.303681 +0.851566 0.376920 0.304295 +0.854494 0.381975 0.304888 +0.857225 0.387073 0.305464 +0.859779 0.392203 0.306015 +0.862161 0.397340 0.306537 +0.864380 0.402483 0.307036 +0.866454 0.407633 0.307521 +0.868402 0.412782 0.308001 +0.870213 0.417898 0.308478 +0.871931 0.423001 0.308939 +0.873540 0.428101 0.309379 +0.875064 0.433164 0.309804 +0.876507 0.438212 0.310225 +0.877887 0.443229 0.310636 +0.879200 0.448215 0.311034 +0.880462 0.453182 0.311418 +0.881681 0.458116 0.311798 +0.882852 0.463019 0.312180 +0.883997 0.467910 0.312564 +0.885105 0.472767 0.312945 +0.886191 0.477603 0.313322 +0.887249 0.482417 0.313691 +0.888294 0.487206 0.314051 +0.889321 0.491971 0.314404 +0.890332 0.496706 0.314759 +0.891333 0.501443 0.315120 +0.892326 0.506138 0.315483 +0.893303 0.510831 0.315840 +0.894281 0.515501 0.316190 +0.895249 0.520158 0.316534 +0.896210 0.524808 0.316878 +0.897169 0.529444 0.317222 +0.898117 0.534052 0.317567 +0.899069 0.538669 0.317912 +0.900015 0.543262 0.318255 +0.900957 0.547848 0.318598 +0.901898 0.552429 0.318940 +0.902840 0.557003 0.319282 +0.903774 0.561563 0.319625 +0.904711 0.566120 0.319970 +0.905648 0.570671 0.320313 +0.906580 0.575224 0.320652 +0.907514 0.579777 0.320985 +0.908445 0.584316 0.321317 +0.909375 0.588853 0.321654 +0.910310 0.593404 0.321998 +0.911239 0.597943 0.322345 +0.912171 0.602489 0.322690 +0.913105 0.607042 0.323029 +0.914040 0.611586 0.323367 +0.914970 0.616139 0.323706 +0.915902 0.620702 0.324049 +0.916845 0.625260 0.324396 +0.917784 0.629830 0.324746 +0.918718 0.634415 0.325101 +0.919662 0.638998 0.325460 +0.920604 0.643592 0.325826 +0.921555 0.648201 0.326200 +0.922507 0.652822 0.326584 +0.923462 0.657468 0.326981 +0.924416 0.662121 0.327392 +0.925379 0.666780 0.327822 +0.926347 0.671471 0.328275 +0.927318 0.676184 0.328757 +0.928297 0.680911 0.329270 +0.929285 0.685678 0.329814 +0.930283 0.690460 0.330396 +0.931285 0.695281 0.331033 +0.932296 0.700132 0.331753 +0.933319 0.705021 0.332557 +0.934357 0.709951 0.333431 +0.935409 0.714920 0.334417 +0.936478 0.719941 0.335521 +0.937557 0.725011 0.336755 +0.938655 0.730132 0.338153 +0.939775 0.735308 0.339755 +0.940913 0.740544 0.341539 +0.942077 0.745845 0.343556 +0.943262 0.751218 0.345825 +0.944473 0.756645 0.348394 +0.945709 0.762144 0.351264 +0.946974 0.767714 0.354472 +0.948266 0.773354 0.358043 +0.949586 0.779063 0.362002 +0.950938 0.784838 0.366377 +0.952312 0.790667 0.371170 +0.953719 0.796554 0.376445 +0.955147 0.802494 0.382156 +0.956597 0.808479 0.388366 +0.958072 0.814491 0.395050 +0.959559 0.820530 0.402205 +0.961064 0.826587 0.409861 +0.962575 0.832640 0.417961 +0.964092 0.838685 0.426519 +0.965612 0.844713 0.435518 +0.967132 0.850700 0.444911 +0.968639 0.856648 0.454686 +0.970133 0.862544 0.464801 +0.971612 0.868368 0.475238 +0.973070 0.874110 0.485938 +0.974498 0.879773 0.496891 +0.975902 0.885348 0.508061 +0.977278 0.890823 0.519386 +0.978614 0.896200 0.530851 +0.979924 0.901469 0.542424 +0.981192 0.906636 0.554064 +0.982426 0.911693 0.565746 +0.983617 0.916646 0.577452 +0.984777 0.921492 0.589147 +0.985893 0.926235 0.600822 +0.986977 0.930880 0.612445 +0.988017 0.935424 0.624015 +0.989027 0.939877 0.635493 +0.989999 0.944235 0.646891 +0.990934 0.948505 0.658185 +0.991836 0.952694 0.669370 +0.992705 0.956799 0.680431 +0.993538 0.960832 0.691381 +0.994334 0.964785 0.702202 +0.995098 0.968676 0.712897 +0.995829 0.972501 0.723465 +0.996528 0.976256 0.733910 +0.997193 0.979964 0.744228 +0.997826 0.983613 0.754434 +0.998426 0.987220 0.764524 +0.998993 0.990779 0.774513 +0.999523 0.994303 0.784423 +1.000000 0.997796 0.794247