Test update 2 (#32)

* Update code for custom button configurations

currently there needs to be a config json so makers can appear properly.
(bug: markers appear incorrectly if you try to setup again, must be the offset from the red border)
- added "done" button during marker or region selection
-added openarrowmarker in region selection dialog
-made bobrustpalette receive a screenshot of the color area, split it into 4 by 16 grid and map the coords relative to screen. getSizeButton is changed to work with the brush size limit of 100
-palette generator is unused now.
- made the coordinate record in its own file
-made circleCache load circle_config.json and create one with defaults if it doesn't exist. made for easier testing.
- added config file related functions to ApplicationWindow.
Thanks for the developer for explaining and helping me make this work.

* Test update to fix scaling

---------

Co-authored-by: oussama mrissa <oussama.mrissa@sesame.com.tn>

Author: Kariaro

.gitignore

@@ -24,3 +24,4 @@ bin/
 # project
 bobrust.properties
 hs_err_pid*.log
+button_config.json

build.gradle

@@ -20,7 +20,7 @@ project.ext {
     gsonVersion  = '2.10.1'
 
     majorVersion = '0'
-    minorVersion = '5'
+    minorVersion = '6'
 }
 
 version = "${majorVersion}.${minorVersion}.${getBuildId()}" + ""

src/main/java/com/bobrust/generator/CircleCache.java

@@ -1,82 +1,75 @@
 package com.bobrust.generator;
 
-class CircleCache {	
-	private static final Scanline[] CIRCLE_0 = generateCircle(1);
-	private static final Scanline[] CIRCLE_1 = generateCircle(4);
-	private static final Scanline[] CIRCLE_2 = generateCircle(8);
-	private static final Scanline[] CIRCLE_3 = generateCircle(12);
-	private static final Scanline[] CIRCLE_4 = generateCircle(19);
-	private static final Scanline[] CIRCLE_5 = generateCircle(26); // 25 // Might be larger
+import com.bobrust.robot.BobRustPainter;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+class CircleCache {
+	private static final Logger LOGGER = LogManager.getLogger(BobRustPainter.class);
+
+	private static final Scanline[] CIRCLE_0;
+	private static final Scanline[] CIRCLE_1;
+	private static final Scanline[] CIRCLE_2;
+	private static final Scanline[] CIRCLE_3;
+	private static final Scanline[] CIRCLE_4;
+	private static final Scanline[] CIRCLE_5;
 
-	public static final Scanline[][] CIRCLE_CACHE = { CIRCLE_0, CIRCLE_1, CIRCLE_2, CIRCLE_3, CIRCLE_4, CIRCLE_5 };
+	public static final Scanline[][] CIRCLE_CACHE;
 	public static final int[] CIRCLE_CACHE_LENGTH;
-	
-	static {
+
+	// Default circle values
+    public static final int DEFAULT_CIRCLE_0_VALUE = 3;
+    public static final int DEFAULT_CIRCLE_1_VALUE = 6;
+    public static final int DEFAULT_CIRCLE_2_VALUE = 12;
+    public static final int DEFAULT_CIRCLE_3_VALUE = 25;
+    public static final int DEFAULT_CIRCLE_4_VALUE = 50;
+    public static final int DEFAULT_CIRCLE_5_VALUE = 100;
+
+    static {
+		CIRCLE_0 = generateCircle(DEFAULT_CIRCLE_0_VALUE);
+		CIRCLE_1 = generateCircle(DEFAULT_CIRCLE_1_VALUE);
+		CIRCLE_2 = generateCircle(DEFAULT_CIRCLE_2_VALUE);
+		CIRCLE_3 = generateCircle(DEFAULT_CIRCLE_3_VALUE);
+		CIRCLE_4 = generateCircle(DEFAULT_CIRCLE_4_VALUE);
+		CIRCLE_5 = generateCircle(DEFAULT_CIRCLE_5_VALUE);
+		CIRCLE_CACHE = new Scanline[][] {
+			CIRCLE_0, CIRCLE_1, CIRCLE_2, CIRCLE_3, CIRCLE_4, CIRCLE_5
+        };
 		CIRCLE_CACHE_LENGTH = new int[CIRCLE_CACHE.length];
 		for (int i = 0; i < CIRCLE_CACHE.length; i++) {
 			CIRCLE_CACHE_LENGTH[i] = CIRCLE_CACHE[i].length;
 		}
 	}
-	
-	/*public static void main(String[] args) {
-		// 1, 4, 8, 12, 19, 25
-		// 18 full match but 19 matches area
-		// 24 full match but 25 matches area
-		generateCircle(24);
-	}*/
-	
+
 	private static Scanline[] generateCircle(int size) {
+		LOGGER.info("circle size " +size);
 		boolean[] grid = new boolean[size * size];
 		for (int i = 0; i < size * size; i++) {
 			double px = (int) (i % size) + 0.5;
 			double py = (int) (i / size) + 0.5;
 			double x = (px / (double) size) * 2.0 - 1;
 			double y = (py / (double) size) * 2.0 - 1;
-			
-			double magnitudeSqr = x*x + y*y;
+
+			double magnitudeSqr = x * x + y * y;
 			grid[i] = magnitudeSqr <= 1;
 		}
-		
-		/*{
-			BufferedImage bi = new BufferedImage(size, size, BufferedImage.TYPE_INT_RGB);
-			int[] pixels = ((DataBufferInt) bi.getRaster().getDataBuffer()).getData();
-			for (int i = 0; i < grid.length; i++) {
-				pixels[i] = grid[i] ? 0x000000 : 0xffffff;
-			}
-			
-			DebugUtil.debugShowImage(bi, 13);
-		}*/
-		
+
 		Scanline[] scanlines = new Scanline[size];
 		for (int i = 0; i < size; i++) {
 			int start = size;
 			int end = 0;
 			for (int j = 0; j < size; j++) {
 				if (grid[i * size + j]) {
 					start = Math.min(start, j);
-					end = Math.max(end, j );
+					end = Math.max(end, j);
 				}
 			}
-			
+
 			if (start <= end) {
 				int off = size / 2;
 				scanlines[i] = new Scanline(i - off, start - off, end - off);
 			}
 		}
-		
-		/*{
-			int off = size / 2;
-			BufferedImage bi = new BufferedImage(size, size, BufferedImage.TYPE_INT_RGB);
-			int[] pixels = ((DataBufferInt) bi.getRaster().getDataBuffer()).getData();
-			Arrays.fill(pixels, 0xffffff);
-			for (Scanline line : scanlines) {
-				for (int x = line.x1; x <= line.x2; x++) {
-					pixels[(line.y + off) * size + (x + off)] = 0x000000;
-				}
-			}
-			DebugUtil.debugShowImage(bi, 13);
-		}*/
-		
 		return scanlines;
 	}
 }