Add layer style palette Spectrum Third

Author: dr-jts

modules/app/src/main/java/org/locationtech/jtstest/testbuilder/LayerStylePanel.java

@@ -580,7 +580,7 @@ public void stateChanged(ChangeEvent e) {
   }
 
   //-----------------------------------------
-  static String[] paletteNames = { "Basic", "Varying", "Spectrum", "Spectrum Random" }; 
+  static String[] paletteNames = { "Basic", "Varying", "Spectrum", "Spectrum Random", "Spectrum Third" }; 
 
   private static int getPaletteType(JComboBox comboPal) {
     String palName = (String)comboPal.getSelectedItem();
@@ -589,6 +589,7 @@ private static int getPaletteType(JComboBox comboPal) {
     if (palName.equalsIgnoreCase(paletteNames[1])) paletteType = Palette.TYPE_VARY;
     if (palName.equalsIgnoreCase(paletteNames[2])) paletteType = Palette.TYPE_SPECTRUM;
     if (palName.equalsIgnoreCase(paletteNames[3])) paletteType = Palette.TYPE_SPECTRUM_RANDOM;
+    if (palName.equalsIgnoreCase(paletteNames[4])) paletteType = Palette.TYPE_SPECTRUM_THIRD;
     return paletteType;
   }
 
@@ -597,6 +598,7 @@ private static void setPaletteType(JComboBox comboPal, int paletteType) {
     if (paletteType == Palette.TYPE_VARY) index = 1;
     if (paletteType == Palette.TYPE_SPECTRUM) index = 2;
     if (paletteType == Palette.TYPE_SPECTRUM_RANDOM) index = 3;
+    if (paletteType == Palette.TYPE_SPECTRUM_THIRD) index = 4;
     comboPal.setSelectedIndex(index);
   }
 

modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/style/Palette.java

@@ -22,16 +22,19 @@ public class Palette {
   public static final int TYPE_VARY = 2;
   public static final int TYPE_SPECTRUM = 3;
   public static final int TYPE_SPECTRUM_RANDOM = 4;
+  public static final int TYPE_SPECTRUM_THIRD = 5;
 
   private static final float BRIGHT_RANGE = 0.1f;
   private static final float SAT_RANGE = 0.2f;
 
   public static HSBPalette customPalette(int paletteType, Color clrBase, int numHues) {
-    HSBPalette pal = null;
+    
     float sat = ColorUtil.getSaturation(clrBase);
     float bright = ColorUtil.getBrightness(clrBase);
+    float hue = ColorUtil.getHue(clrBase);
+    
+    HSBPalette pal = null;
     if (TYPE_VARY == paletteType) {
-      float hue = ColorUtil.getHue(clrBase);
       pal = new HSBPalette(5, hue, HSBPalette.HUE_WIDTH / 2,
           3, sat - SAT_RANGE/2, sat + SAT_RANGE/2,
           3, bright - BRIGHT_RANGE/2, bright + BRIGHT_RANGE/2
@@ -43,6 +46,9 @@ else if (TYPE_SPECTRUM == paletteType) {
     else if (TYPE_SPECTRUM_RANDOM == paletteType) {
       return HSBPalette.createSpectrumIncremental(0.23f, sat, bright);
     }
+    else if (TYPE_SPECTRUM_THIRD == paletteType) {
+      return HSBPalette.createSpectrumRange(numHues, 0.333f, hue, sat, bright);
+    }
     return pal;
   }
 

modules/app/src/main/java/org/locationtech/jtstest/util/HSBPalette.java

@@ -44,6 +44,13 @@ public static HSBPalette createSpectrumIncremental(float hInc, float s, float b)
     return pal;
   }
 
+  public static HSBPalette createSpectrumRange(int numHue, float hueRange, float h, float s, float b) {
+    return new HSBPalette(numHue, h, hueRange,
+        1, s, s,
+        1, b, b
+        ); 
+  }
+  
   private void setHueInc(float hInc) {
       this.hInc = hInc;
    }
@@ -74,7 +81,7 @@ public HSBPalette(
     this.numB = numB;
     this.hBase = hBase;
     this.hRange = hRange;
-    this.h1 = hBase - hRange / 2;
+    this.h1 = hBase;
     this.sLo = sLo;
     this.bLo = bLo;
     // TODO: make this mod 1