Index: trunk/src_plugins/import_mucs/mucs.c =================================================================== --- trunk/src_plugins/import_mucs/mucs.c (revision 6747) +++ trunk/src_plugins/import_mucs/mucs.c (revision 6748) @@ -26,10 +26,7 @@ * */ -/* -This program imports unixplot format line and via data into a -geda .pcb -*/ +/* This plugin imports unixplot format line and via data into pcb-rnd */ #include "config.h" @@ -66,9 +63,9 @@ if (!fname || !*fname) { fname = pcb_gui->fileselect(_("Load mucs routing session Resource File..."), - _("Picks a mucs session resource file to load.\n" - "This file could be generated by mucs-pcb\n"), - default_file, ".pl", "unixplot", HID_FILESELECT_READ); + _("Picks a mucs session resource file to load.\n" + "This file could be generated by mucs-pcb\n"), + default_file, ".pl", "unixplot", HID_FILESELECT_READ); if (fname == NULL) PCB_ACT_FAIL(LoadMucsFrom); if (default_file != NULL) { @@ -86,57 +83,52 @@ return 1; } - while ((c = getc(fi)) != EOF) - { - pcb_printf("Char: %d \n", c); - switch(c) - { - case 's': - x1 = 100*(getc (fi) + (getc (fi) * 256)); - y1 = 100*(getc (fi) + (getc (fi) * 256)); - x2 = 100*(getc (fi) + (getc (fi) * 256)); - y2 = 100*(getc (fi) + (getc (fi) * 256)); - - pcb_printf ("s--%i %i %i %i ???\n", x1, y1, x2, y2); - break; - case 'l': - x1 = 100*(getc (fi) + (getc (fi) * 256)); - y1 = 100*(getc (fi) + (getc (fi) * 256)); - x2 = 100*(getc (fi) + (getc (fi) * 256)); - y2 = 100*(getc (fi) + (getc (fi) * 256)); - pcb_printf ("Line[%d %d %d %d 2000 ""]\n",x1,y1,x2,y2); - break; - case 'c': - x1 = 100*(getc (fi) + (getc (fi) * 256)); - y1 = 100*(getc (fi) + (getc (fi) * 256)); - r = 100*(getc (fi) + (getc (fi) * 256)); - pcb_printf ("Via[%d %d 6000 2500 \"\" ""]\n",x1, y1); - break; - case 'n': - x1 = 100*(getc (fi) + (getc (fi) * 256)); - y1 = 100*(getc (fi) + (getc (fi) * 256)); - pcb_printf ("Line[%d %d %d %d 2000 ""]\n",x1,y1,x2,y2); - x2=x1; - y2=y1; - break; - case 'a': - x1 = 100*((getc (fi) * 256) + getc (fi)); - y1 = 100*((getc (fi) * 256) + getc (fi)); - x2 = 100*((getc (fi) * 256) + getc (fi)); - y2 = 100*((getc (fi) * 256) + getc (fi)); - r = 100*((getc (fi) * 256) + getc (fi)); - pcb_printf - ("a--stroke newpath\n%d %d %d %d %d arc\n", - x1, y1, x2, y2, r); - break; - case 'e': - break; - case 't': - while (r != '\0' && r != EOF) - r = getc (fi); - break; + while ((c = getc(fi)) != EOF) { + pcb_printf("Char: %d \n", c); + switch (c) { + case 's': + x1 = 100 * (getc(fi) + (getc(fi) * 256)); + y1 = 100 * (getc(fi) + (getc(fi) * 256)); + x2 = 100 * (getc(fi) + (getc(fi) * 256)); + y2 = 100 * (getc(fi) + (getc(fi) * 256)); + pcb_printf("s--%i %i %i %i ???\n", x1, y1, x2, y2); + break; + case 'l': + x1 = 100 * (getc(fi) + (getc(fi) * 256)); + y1 = 100 * (getc(fi) + (getc(fi) * 256)); + x2 = 100 * (getc(fi) + (getc(fi) * 256)); + y2 = 100 * (getc(fi) + (getc(fi) * 256)); + pcb_printf("Line[%d %d %d %d 2000 " "]\n", x1, y1, x2, y2); + break; + case 'c': + x1 = 100 * (getc(fi) + (getc(fi) * 256)); + y1 = 100 * (getc(fi) + (getc(fi) * 256)); + r = 100 * (getc(fi) + (getc(fi) * 256)); + pcb_printf("Via[%d %d 6000 2500 \"\" " "]\n", x1, y1); + break; + case 'n': + x1 = 100 * (getc(fi) + (getc(fi) * 256)); + y1 = 100 * (getc(fi) + (getc(fi) * 256)); + pcb_printf("Line[%d %d %d %d 2000 " "]\n", x1, y1, x2, y2); + x2 = x1; + y2 = y1; + break; + case 'a': + x1 = 100 * ((getc(fi) * 256) + getc(fi)); + y1 = 100 * ((getc(fi) * 256) + getc(fi)); + x2 = 100 * ((getc(fi) * 256) + getc(fi)); + y2 = 100 * ((getc(fi) * 256) + getc(fi)); + r = 100 * ((getc(fi) * 256) + getc(fi)); + pcb_printf("a--stroke newpath\n%d %d %d %d %d arc\n", x1, y1, x2, y2, r); + break; + case 'e': + break; + case 't': + while (r != '\0' && r != EOF) + r = getc(fi); + break; + } } - } fclose(fi); return 0; } @@ -156,6 +148,5 @@ pcb_uninit_t hid_import_mucs_init() { PCB_REGISTER_ACTIONS(mucs_action_list, mucs_cookie) - return hid_mucs_uninit; + return hid_mucs_uninit; } -