Error handler and interface fix

Author: fabiogamba98

resources/input.file

@@ -2,7 +2,7 @@ H87 T0101 M06
 G94 G97 C400 S260 M04 M08
 G00 X10 Y10 
 G01 X20 Y20
-G01 X30 Y50 
+H01 X30 Y50 
 G02 X45 Y10 I34 J67
 G01 X20 Y20
 G01 X20 Y20

resources/input5G03.file

@@ -8,6 +8,6 @@ G03 X200 Y250 I200 J200
 G01 X50 Y250
 G03 X0 Y200 I50 J200
 G01 X0 Y50
-G03 X50 Y0 I50 J50
+G03 X50 Y0 I50 J100
 G00 X100 Y100 
 M05 M09 M30 

src/GCODECompiler/GCODEHandler.java

@@ -28,7 +28,7 @@ public class GCODEHandler {
 	public static final int CIRCLE_NOT_CONNECTING = 21;
 	public static final int LAST_WARNING = 30;
 
-	List<String> errorList;
+	static List<String> errorList;
 	TokenStream lexerStream;
 
 	public GCODEHandler (TokenStream ls) {
@@ -37,7 +37,7 @@ public GCODEHandler (TokenStream ls) {
 		lexerStream = ls;
 	}
 
-	public List<String> getErrorList() {
+	public static List<String> getErrorList() {
 		return errorList;
 	}
 
@@ -48,18 +48,24 @@ void handleError(String[] tokenNames, RecognitionException e, String h, String m
 		if (e.token.getType() >=0)
 			type = tokenNames[e.token.getType()]; 
 		if (e.token.getType() == GCODELexer.SCAN_ERROR)
-			st = "Lexical Error " + TOKEN_ERROR + " at ";
+			st = "Errore lessicale " + TOKEN_ERROR + " a ";
 		else
-			st = "Syntax Error " + ERR_ON_SYNTAX + " at ";
+			st = "Errore sintattico " + ERR_ON_SYNTAX + " a ";
 		st +=	"[" + e.token.getLine() + ", " + (e.token.getCharPositionInLine()+1) + "]: " + 
-				"Found ";
+				"rilevato ";
 		st += type;
 
+		//System.out.println(m);
+		//System.out.println(m.substring(m.indexOf("expecting") + 10 , m.length()));
+		
+		m = " è stato rilevato '" + e.token.getText() + "' invece del comando " + m.substring(m.indexOf("expecting") + 10 , m.length()) + ".";
 
 		if (e instanceof MissingTokenException)
 		   st = st + m;		
 		else /*if(e.token.getType() == MISSING_CHAR)*/
 			st += " ('" + e.token.getText() + "')" + m;
+		
+		//Interfaccia.setData(st + "\n");
 		errorList.add(st);
 
 	}
@@ -97,9 +103,19 @@ else if (code < LAST_SEMANTIC_ERROR)
 
 		if (code == TOKEN_ERROR)
 			st += "Unrecognized token '" + tk.getText() + "'";
-							
-		errorList.add(st); 
-		System.out.println(st);
+		
+		
+		
+		if(!errorList.contains(st)) {
+			//System.out.println("questo è il comp che cicla: " + s  + " questo è quello da aggiungere: " + st);
+			Interfaccia.setData(st + "\n\n");
+			errorList.add(st);
+		}
+		
+		
+		
+		//System.out.println(st);
+	
 	}
 
 //utilizzato per creare movimenti e tagli G00 G01
@@ -179,9 +195,10 @@ public void printExit(List<String> e) {
 			data = "";
 			System.out.print(config+"	");
 			System.out.println(recognizeExit(config));
-			data = config+ "	" + recognizeExit(config) + "\n";
+			data = config + "	" + recognizeExit(config) + "\n";
 			Interfaccia.setData(data);
 		}
+		Interfaccia.setData("\n");
 		System.out.println();
 	}
 

src/myPackage/Graphic.java

@@ -95,6 +95,15 @@ public void paintComponent(Graphics g) {
 				float startAngle = (float) (180/Math.PI*Math.atan2(y1-y0, x1-x0));
 				float endAngle = (float) (180/Math.PI*Math.atan2(y2-y0, x2-x0));
 
+				float endDist = (float)Math.sqrt((x2-x0)*(x2-x0) + (y2-y0)*(y2-y0));
+				float startDist = (float)Math.sqrt((x1-x0)*(x1-x0) + (y1-y0)*(y1-y0));
+				
+				if(endDist != startDist) {
+					//System.out.println("Il comando -> " + com + " non può collegare il punto: " + x1 + ";" + (500 - y1) + " con il punto " + x2 + ";" + (500 - y2) +".");
+					String assad ="Il comando -> " + com + " non può collegare il punto: " + x1 + ";" + (500 - y1) + " con il punto " + x2 + ";" + (500 - y2) +".";
+					ParserLauncher.getParser().getHandler().myErrorHandler(21, assad);
+				}
+				
 				//System.out.println(x0 + " " + y0 + " " + x1 + " " + y1 + " " + x2 + " " + y2 + " " + r + " " + x + " " + y + " " + width + " " + height + " " + startAngle + " " + endAngle);
 				if(startAngle - endAngle > 0)
 					g.drawArc((int)x, (int)y, (int)width, (int)height, (int)(360.0 - startAngle), (int)(startAngle - endAngle));

src/myPackage/Interfaccia.java

@@ -162,6 +162,7 @@ public Interfaccia() throws IOException{
 
         mainpanel.setLayout(new GridBagLayout());
         /*GridBagConstraints*/ gbc = new GridBagConstraints();
+        gbc.insets  = new Insets(10, 10, 10, 10);
 
      	// Row 0 - Filename
      		// Col 0

src/myPackage/ParserLauncher.java

@@ -9,6 +9,7 @@
 
 import org.antlr.runtime.RecognitionException;
 
+import GCODECompiler.GCODEHandler;
 import GCODECompiler.GCODEParser;
 
 public class ParserLauncher {
@@ -38,14 +39,29 @@ public static void avvio(Interfaccia a) throws FileNotFoundException, IOExceptio
 				System.out.println ("Errori rilevati");
 				for (String msg : parser.getErrorList())
 					System.out.println (++i + " - " + msg);
+				
+				/*int j = 0;
+				for(String d:GCODEHandler.getErrorList()) {
+					System.out.println(++j + d);
+					//Interfaccia.setData(d + "\n");
+		        }*/
 //questo dovrebbe andare alla fine del disegno visto che il programma genera i warning durante la pittura
 //perchè qui stampa solo gli errori al momento della fine del parsing
-				parser.getErrorList().forEach(error -> {
+				//parser.getErrorList().forEach(error -> {
+				/*GCODEHandler.getErrorList().forEach(error -> {
 					int j=0;
+					System.out.println (++j + " strano " + error);
 					Interfaccia.setData("\n"+ ++j + " - "+error.toString());
 					});
 				
-				}	
+				}*/
+				
+				int j = 0;
+				Interfaccia.setData("Lista di errori e warning rilevati:\n");
+				for(String s:GCODEHandler.getErrorList()) {
+					Interfaccia.setData(s + "\n\n");
+				}
+			}
 	}
 
 	public static void main (String[] args) throws FileNotFoundException, IOException, RecognitionException {