Fix TestBuilder rainbox palette to not wrap totally

Signed-off-by: Martin Davis <[email protected]>
locationtech · Aug 15, 2019 · a535d02 · a535d02
1 parent 5237cf7
commit a535d02
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/render/LayerRenderer.java b/modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/render/LayerRenderer.java
@@ -133,7 +133,7 @@ private static HSBPalette customPalette(Color clrBase, int numHues) {
           );
     }
     else if (DisplayParameters.FILL_RAINBOW == DisplayParameters.fillType()) {
-      return HSBPalette.createRainbowSequential(numHues, 0.4f, 1);
+      return HSBPalette.createRainbow(numHues, 0.4f, 1);
     }
     else if (DisplayParameters.FILL_RAINBOW_RANDOM == DisplayParameters.fillType()) {
       return PAL_RAINBOW_INCREMENTAL;

diff --git a/modules/app/src/main/java/org/locationtech/jtstest/util/HSBPalette.java b/modules/app/src/main/java/org/locationtech/jtstest/util/HSBPalette.java
@@ -6,7 +6,14 @@
 
 public class HSBPalette {
 
-  public static HSBPalette createRainbowSequential(int numHue, float s, float b) {
+  public static HSBPalette createRainbow(int numHue, float s, float b) {
+    return new HSBPalette(numHue, 0, 1 - 0.08333f,
+        1, s, s,
+        1, b, b
+        ); 
+  }
+
+  public static HSBPalette createRainbowWrap(int numHue, float s, float b) {
     return new HSBPalette(numHue, 0, 1,
         1, s, s,
         1, b, b