diff pads2gpcb/writeelem.c @ 69:a7f0e9bb3fb7

pads2gpcb: struct coord_pair introduced
author Mychaela Falconia <falcon@ivan.Harhan.ORG>
date Sun, 31 Jan 2016 23:41:00 +0000
parents b7f49f029bc3
children be1fe110b6ab
line wrap: on
line diff
--- a/pads2gpcb/writeelem.c	Sun Jan 31 23:19:37 2016 +0000
+++ b/pads2gpcb/writeelem.c	Sun Jan 31 23:41:00 2016 +0000
@@ -44,10 +44,10 @@
 	char mask_buf[DIM_OUT_BUFSIZE], *mask_str;
 	char *flagstr;
 
-	x1_str = output_gpcb_dimension(pad->x1, x1_buf);
-	y1_str = output_gpcb_dimension(-pad->y1, y1_buf);
-	x2_str = output_gpcb_dimension(pad->x2, x2_buf);
-	y2_str = output_gpcb_dimension(-pad->y2, y2_buf);
+	x1_str = output_gpcb_dimension(pad->end1.x, x1_buf);
+	y1_str = output_gpcb_dimension(-pad->end1.y, y1_buf);
+	x2_str = output_gpcb_dimension(pad->end2.x, x2_buf);
+	y2_str = output_gpcb_dimension(-pad->end2.y, y2_buf);
 	thickness_str = output_gpcb_dimension(pad->thickness, thickness_buf);
 	clearance_str = output_gpcb_dimension(pad->clearance, clearance_buf);
 	mask_str = output_gpcb_dimension(pad->mask, mask_buf);
@@ -78,10 +78,10 @@
 	char y2_buf[DIM_OUT_BUFSIZE], *y2_str;
 	char thickness_buf[DIM_OUT_BUFSIZE], *thickness_str;
 
-	x1_str = output_gpcb_dimension(obj->x1, x1_buf);
-	y1_str = output_gpcb_dimension(-obj->y1, y1_buf);
-	x2_str = output_gpcb_dimension(obj->x2, x2_buf);
-	y2_str = output_gpcb_dimension(-obj->y2, y2_buf);
+	x1_str = output_gpcb_dimension(obj->end1.x, x1_buf);
+	y1_str = output_gpcb_dimension(-obj->end1.y, y1_buf);
+	x2_str = output_gpcb_dimension(obj->end2.x, x2_buf);
+	y2_str = output_gpcb_dimension(-obj->end2.y, y2_buf);
 	thickness_str = output_gpcb_dimension(obj->thickness, thickness_buf);
 
 	fprintf(outf, "\tElementLine[%s %s %s %s %s]\n",
@@ -99,8 +99,8 @@
 	char height_buf[DIM_OUT_BUFSIZE], *height_str;
 	char thickness_buf[DIM_OUT_BUFSIZE], *thickness_str;
 
-	centrex_str = output_gpcb_dimension(obj->centre_x, centrex_buf);
-	centrey_str = output_gpcb_dimension(-obj->centre_y, centrey_buf);
+	centrex_str = output_gpcb_dimension(obj->centre.x, centrex_buf);
+	centrey_str = output_gpcb_dimension(-obj->centre.y, centrey_buf);
 	width_str = output_gpcb_dimension(obj->width, width_buf);
 	height_str = output_gpcb_dimension(obj->height, height_buf);
 	thickness_str = output_gpcb_dimension(obj->thickness, thickness_buf);