Added ECAPE, adjusted watch parallelogram colors.

a-urq · Aug 14, 2023 · d7ab3f3 · d7ab3f3
1 parent a34a524
commit d7ab3f3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/bin/com/ameliaWx/radarView/RadarMapInset.class b/bin/com/ameliaWx/radarView/RadarMapInset.class
diff --git a/bin/com/ameliaWx/radarView/RadarPanel.class b/bin/com/ameliaWx/radarView/RadarPanel.class
diff --git a/src/com/ameliaWx/radarView/RadarMapInset.java b/src/com/ameliaWx/radarView/RadarMapInset.java
@@ -416,17 +416,14 @@ public BufferedImage drawMapInset(double lat, double lon, double extent, int siz
 		gg = spcWatches.createGraphics();
 
 		BasicStroke clr2 = new BasicStroke(4, BasicStroke.CAP_ROUND, BasicStroke.JOIN_MITER);
-		BasicStroke blk2 = new BasicStroke(7, BasicStroke.CAP_ROUND, BasicStroke.JOIN_MITER);
+		BasicStroke blk2 = new BasicStroke(8, BasicStroke.CAP_ROUND, BasicStroke.JOIN_MITER);
 
 		gg.setStroke(blk2);
 
 		for (int p = 0; p < RadarView.watchParallelograms.size(); p++) {
 			ArrayList<PointD> polygon = RadarView.watchParallelograms.get(p);
 			String name = RadarView.spcWatchNames.get(p).trim();
 
-			System.out.println("intrf: " + name);
-			System.out.println("intrf: " + Arrays.toString(polygon.toArray()));
-
 			gg.setColor(new Color(0, 0, 0, 0));
 			if ("TOR".equals(name))
 				gg.setColor(new Color(0, 0, 0, 255));
@@ -466,9 +463,9 @@ public BufferedImage drawMapInset(double lat, double lon, double extent, int siz
 
 			gg.setColor(new Color(0, 0, 0, 0));
 			if ("TOR".equals(name))
-				gg.setColor(new Color(255, 64, 64, 255));
+				gg.setColor(new Color(150, 0, 0, 255));
 			if ("SVR".equals(name))
-				gg.setColor(new Color(255, 255, 64, 255));
+				gg.setColor(new Color(128, 128, 0, 255));
 
 			for (int i = 0; i < polygon.size(); i++) {
 				int j = i + 1;

diff --git a/src/com/ameliaWx/radarView/RadarPanel.java b/src/com/ameliaWx/radarView/RadarPanel.java
@@ -954,7 +954,7 @@ private void drawSpcWatches(double ulLon, double ulLat, double lrLon, double lrL
 
 		if (RadarView.viewStormScaleWarnings) {
 			BasicStroke clr = new BasicStroke(4, BasicStroke.CAP_ROUND, BasicStroke.JOIN_MITER);
-			BasicStroke blk = new BasicStroke(7, BasicStroke.CAP_ROUND, BasicStroke.JOIN_MITER);
+			BasicStroke blk = new BasicStroke(8, BasicStroke.CAP_ROUND, BasicStroke.JOIN_MITER);
 
 			g.setStroke(blk);
 
@@ -1000,9 +1000,9 @@ private void drawSpcWatches(double ulLon, double ulLat, double lrLon, double lrL
 
 				g.setColor(new Color(0, 0, 0, 0));
 				if ("TOR".equals(name))
-					g.setColor(new Color(255, 64, 64, 255));
+					g.setColor(new Color(150, 0, 0, 255));
 				if ("SVR".equals(name))
-					g.setColor(new Color(255, 255, 64, 255));
+					g.setColor(new Color(128, 128, 0, 255));
 
 				for (int i = 0; i < polygon.size(); i++) {
 					int j = i + 1;