Index: trunk/src/action_helper.c =================================================================== --- trunk/src/action_helper.c (revision 12596) +++ trunk/src/action_helper.c (revision 12597) @@ -99,13 +99,13 @@ *x = ((pcb_element_t *) ptr2)->MarkX; *y = ((pcb_element_t *) ptr2)->MarkY; break; - case PCB_TYPE_POLYGON: + case PCB_TYPE_POLY: *x = ((pcb_poly_t *) ptr2)->Points[0].X; *y = ((pcb_poly_t *) ptr2)->Points[0].Y; break; case PCB_TYPE_LINE_POINT: - case PCB_TYPE_POLYGON_POINT: + case PCB_TYPE_POLY_POINT: *x = ((pcb_point_t *) ptr3)->X; *y = ((pcb_point_t *) ptr3)->Y; break; Index: trunk/src/change.h =================================================================== --- trunk/src/change.h (revision 12596) +++ trunk/src/change.h (revision 12597) @@ -39,10 +39,10 @@ * some defines */ #define PCB_CHANGENAME_TYPES \ - (PCB_TYPE_VIA | PCB_TYPE_PIN | PCB_TYPE_PAD | PCB_TYPE_TEXT | PCB_TYPE_ELEMENT | PCB_TYPE_SUBC | PCB_TYPE_ELEMENT_NAME | PCB_TYPE_LINE | PCB_TYPE_ARC | PCB_TYPE_POLYGON | PCB_TYPE_SUBC_PART | PCB_TYPE_SUBC) + (PCB_TYPE_VIA | PCB_TYPE_PIN | PCB_TYPE_PAD | PCB_TYPE_TEXT | PCB_TYPE_ELEMENT | PCB_TYPE_SUBC | PCB_TYPE_ELEMENT_NAME | PCB_TYPE_LINE | PCB_TYPE_ARC | PCB_TYPE_POLY | PCB_TYPE_SUBC_PART | PCB_TYPE_SUBC) #define PCB_CHANGESIZE_TYPES \ - (PCB_TYPE_POLYGON | PCB_TYPE_VIA | PCB_TYPE_PIN | PCB_TYPE_PAD | PCB_TYPE_LINE | \ + (PCB_TYPE_POLY | PCB_TYPE_VIA | PCB_TYPE_PIN | PCB_TYPE_PAD | PCB_TYPE_LINE | \ PCB_TYPE_ARC | PCB_TYPE_TEXT | PCB_TYPE_ELEMENT_NAME | PCB_TYPE_ELEMENT | PCB_TYPE_SUBC | PCB_TYPE_SUBC_PART ) #define PCB_CHANGE2NDSIZE_TYPES \ @@ -50,7 +50,7 @@ /* We include polygons here only to inform the user not to do it that way. */ #define PCB_CHANGECLEARSIZE_TYPES \ - (PCB_TYPE_PIN | PCB_TYPE_PAD | PCB_TYPE_VIA | PCB_TYPE_LINE | PCB_TYPE_ARC | PCB_TYPE_POLYGON | PCB_TYPE_SUBC| PCB_TYPE_SUBC_PART) + (PCB_TYPE_PIN | PCB_TYPE_PAD | PCB_TYPE_VIA | PCB_TYPE_LINE | PCB_TYPE_ARC | PCB_TYPE_POLY | PCB_TYPE_SUBC| PCB_TYPE_SUBC_PART) #define PCB_CHANGENONETLIST_TYPES \ (PCB_TYPE_ELEMENT | PCB_TYPE_SUBC) @@ -62,7 +62,7 @@ (PCB_TYPE_ELEMENT | PCB_TYPE_SUBC | PCB_TYPE_PIN | PCB_TYPE_VIA | PCB_TYPE_SUBC_PART) #define PCB_CHANGEJOIN_TYPES \ - (PCB_TYPE_ARC | PCB_TYPE_LINE | PCB_TYPE_TEXT | PCB_TYPE_POLYGON) + (PCB_TYPE_ARC | PCB_TYPE_LINE | PCB_TYPE_TEXT | PCB_TYPE_POLY) #define PCB_CHANGETHERMAL_TYPES \ (PCB_TYPE_PIN | PCB_TYPE_VIA | PCB_TYPE_SUBC_PART) Index: trunk/src/change_act.c =================================================================== --- trunk/src/change_act.c (revision 12596) +++ trunk/src/change_act.c (revision 12597) @@ -86,7 +86,7 @@ } if (strcmp(argv[1], "style") == 0) { - if ((type == PCB_TYPE_NONE) || (type == PCB_TYPE_POLYGON)) /* workaround: pcb_search_screen(PCB_CHANGECLEARSIZE_TYPES) wouldn't return elements */ + if ((type == PCB_TYPE_NONE) || (type == PCB_TYPE_POLY)) /* workaround: pcb_search_screen(PCB_CHANGECLEARSIZE_TYPES) wouldn't return elements */ type = pcb_search_screen(x, y, PCB_CHANGE2NDSIZE_TYPES, &ptr1, &ptr2, &ptr3); if (pcb_get_style_size(funcid, &value, type, 2) != 0) return 1; Index: trunk/src/const.h =================================================================== --- trunk/src/const.h (revision 12596) +++ trunk/src/const.h (revision 12597) @@ -61,7 +61,7 @@ PCB_TYPE_VIA = 0x00001, PCB_TYPE_ELEMENT = 0x00002, PCB_TYPE_LINE = 0x00004, - PCB_TYPE_POLYGON = 0x00008, + PCB_TYPE_POLY = 0x00008, PCB_TYPE_TEXT = 0x00010, PCB_TYPE_RATLINE = 0x00020, PCB_TYPE_SUBC = 0x00040, /* TODO: should be 0x00002 once PCB_TYPE_ELEMENT is removed */ @@ -69,7 +69,7 @@ PCB_TYPE_PIN = 0x00100, /* objects that are part */ PCB_TYPE_PAD = 0x00200, /* 'pin' of SMD element */ PCB_TYPE_ELEMENT_NAME = 0x00400, /* of others */ - PCB_TYPE_POLYGON_POINT = 0x00800, + PCB_TYPE_POLY_POINT = 0x00800, PCB_TYPE_LINE_POINT = 0x01000, PCB_TYPE_ELEMENT_LINE = 0x02000, PCB_TYPE_ARC = 0x04000, @@ -84,8 +84,8 @@ /* groups/properties */ PCB_TYPEMASK_PIN = (PCB_TYPE_VIA | PCB_TYPE_PIN | PCB_TYPE_PSTK | PCB_TYPE_SUBC_PART), - PCB_TYPEMASK_TERM = (PCB_TYPEMASK_PIN | PCB_TYPE_SUBC_PART | PCB_TYPE_LINE | PCB_TYPE_ARC | PCB_TYPE_POLYGON | PCB_TYPE_TEXT), - PCB_TYPEMASK_LOCK = (PCB_TYPE_VIA | PCB_TYPE_LINE | PCB_TYPE_ARC | PCB_TYPE_POLYGON | PCB_TYPE_ELEMENT | PCB_TYPE_SUBC | PCB_TYPE_TEXT | PCB_TYPE_ELEMENT_NAME | PCB_TYPE_LOCKED), + PCB_TYPEMASK_TERM = (PCB_TYPEMASK_PIN | PCB_TYPE_SUBC_PART | PCB_TYPE_LINE | PCB_TYPE_ARC | PCB_TYPE_POLY | PCB_TYPE_TEXT), + PCB_TYPEMASK_LOCK = (PCB_TYPE_VIA | PCB_TYPE_LINE | PCB_TYPE_ARC | PCB_TYPE_POLY | PCB_TYPE_ELEMENT | PCB_TYPE_SUBC | PCB_TYPE_TEXT | PCB_TYPE_ELEMENT_NAME | PCB_TYPE_LOCKED), PCB_TYPEMASK_ALL = (~0) /* all bits set */ } pcb_obj_type_t; Index: trunk/src/copy.h =================================================================== --- trunk/src/copy.h (revision 12596) +++ trunk/src/copy.h (revision 12597) @@ -36,7 +36,7 @@ */ #define PCB_COPY_TYPES \ (PCB_TYPE_VIA | PCB_TYPE_PSTK | PCB_TYPE_LINE | PCB_TYPE_TEXT | PCB_TYPE_ELEMENT | \ - PCB_TYPE_SUBC | PCB_TYPE_ELEMENT_NAME | PCB_TYPE_POLYGON | PCB_TYPE_ARC) + PCB_TYPE_SUBC | PCB_TYPE_ELEMENT_NAME | PCB_TYPE_POLY | PCB_TYPE_ARC) void *pcb_copy_obj(int, void *, void *, void *, pcb_coord_t, pcb_coord_t); Index: trunk/src/crosshair.c =================================================================== --- trunk/src/crosshair.c (revision 12596) +++ trunk/src/crosshair.c (revision 12597) @@ -418,7 +418,7 @@ break; } - case PCB_TYPE_POLYGON: + case PCB_TYPE_POLY: { pcb_poly_t *polygon = (pcb_poly_t *) pcb_crosshair.AttachedObject.Ptr2; @@ -517,7 +517,7 @@ break; } - case PCB_TYPE_POLYGON_POINT: + case PCB_TYPE_POLY_POINT: { pcb_poly_t *polygon; pcb_point_t *point; @@ -1437,7 +1437,7 @@ ans = PCB_TYPE_NONE; if (conf_core.editor.snap_pin) - ans = pcb_search_grid_slop(pcb_crosshair.X, pcb_crosshair.Y, PCB_TYPE_POLYGON_POINT, &ptr1, &ptr2, &ptr3); + ans = pcb_search_grid_slop(pcb_crosshair.X, pcb_crosshair.Y, PCB_TYPE_POLY_POINT, &ptr1, &ptr2, &ptr3); if (ans != PCB_TYPE_NONE) { pcb_point_t *pnt = (pcb_point_t *) ptr3; Index: trunk/src/data.c =================================================================== --- trunk/src/data.c (revision 12596) +++ trunk/src/data.c (revision 12597) @@ -505,7 +505,7 @@ PCB_ENDALL_LOOP; PCB_POLY_ALL_LOOP(data); { - pcb_object_operation(&MoveFunctions, &ctx, PCB_TYPE_POLYGON, layer, polygon, polygon); + pcb_object_operation(&MoveFunctions, &ctx, PCB_TYPE_POLY, layer, polygon, polygon); } PCB_ENDALL_LOOP; } @@ -530,7 +530,7 @@ if (type & PCB_OBJ_TEXT) PCB_TEXT_ALL_LOOP(data); { if (PCB_FLAG_TEST(mask, text)) vtp0_append(dst, text); } PCB_ENDALL_LOOP; - if (type & PCB_OBJ_POLYGON) PCB_POLY_ALL_LOOP(data); { + if (type & PCB_OBJ_POLY) PCB_POLY_ALL_LOOP(data); { if (PCB_FLAG_TEST(mask, polygon)) vtp0_append(dst, polygon); } PCB_ENDALL_LOOP; } @@ -552,7 +552,7 @@ if (type & PCB_OBJ_TEXT) PCB_TEXT_ALL_LOOP(data); { if (text->term != NULL) vtp0_append(dst, text); } PCB_ENDALL_LOOP; - if (type & PCB_OBJ_POLYGON) PCB_POLY_ALL_LOOP(data); { + if (type & PCB_OBJ_POLY) PCB_POLY_ALL_LOOP(data); { if (polygon->term != NULL) vtp0_append(dst, polygon); } PCB_ENDALL_LOOP; } @@ -584,7 +584,7 @@ pcb_layer_t *ly = data->Layer + lid; if (types & PCB_OBJ_LINE) rsearch(ly->line_tree); if (types & PCB_OBJ_TEXT) rsearch(ly->text_tree); - if (types & PCB_OBJ_POLYGON) rsearch(ly->polygon_tree); + if (types & PCB_OBJ_POLY) rsearch(ly->polygon_tree); if (types & PCB_OBJ_ARC) rsearch(ly->arc_tree); } Index: trunk/src/draw.c =================================================================== --- trunk/src/draw.c (revision 12596) +++ trunk/src/draw.c (revision 12597) @@ -638,7 +638,7 @@ case PCB_TYPE_ELEMENT_NAME: pcb_text_invalidate_erase((pcb_layer_t *) lptr, (pcb_text_t *) ptr); break; - case PCB_TYPE_POLYGON: + case PCB_TYPE_POLY: pcb_poly_invalidate_erase((pcb_poly_t *) ptr); break; case PCB_TYPE_ELEMENT: @@ -688,7 +688,7 @@ if (obj->parent.layer->meta.real.vis) pcb_text_invalidate_draw(obj->parent.layer, (pcb_text_t *)obj); break; - case PCB_OBJ_POLYGON: + case PCB_OBJ_POLY: if (obj->parent.layer->meta.real.vis) pcb_poly_invalidate_draw(obj->parent.layer, (pcb_poly_t *)obj); break; @@ -728,7 +728,7 @@ switch(obj->type) { case PCB_OBJ_LINE: pcb_line_draw_label((pcb_line_t *)obj); return; case PCB_OBJ_ARC: pcb_arc_draw_label((pcb_arc_t *)obj); return; - case PCB_OBJ_POLYGON: pcb_poly_draw_label((pcb_poly_t *)obj); return; + case PCB_OBJ_POLY: pcb_poly_draw_label((pcb_poly_t *)obj); return; case PCB_OBJ_TEXT: pcb_text_draw_label((pcb_text_t *)obj); return; default: break; } Index: trunk/src/find.h =================================================================== --- trunk/src/find.h (revision 12596) +++ trunk/src/find.h (revision 12597) @@ -57,9 +57,9 @@ #define PCB_LOOKUP_FIRST \ (PCB_TYPE_PIN | PCB_TYPE_PAD | PCB_TYPE_PSTK) #define PCB_LOOKUP_MORE \ - (PCB_TYPE_VIA | PCB_TYPE_LINE | PCB_TYPE_RATLINE | PCB_TYPE_POLYGON | PCB_TYPE_ARC | PCB_TYPE_SUBC_PART) + (PCB_TYPE_VIA | PCB_TYPE_LINE | PCB_TYPE_RATLINE | PCB_TYPE_POLY | PCB_TYPE_ARC | PCB_TYPE_SUBC_PART) #define PCB_SILK_TYPE \ - (PCB_TYPE_LINE | PCB_TYPE_ARC | PCB_TYPE_POLYGON) + (PCB_TYPE_LINE | PCB_TYPE_ARC | PCB_TYPE_POLY) pcb_bool pcb_intersect_line_line(pcb_line_t *, pcb_line_t *); pcb_bool pcb_intersect_line_arc(pcb_line_t *, pcb_arc_t *); Index: trunk/src/find_drc.c =================================================================== --- trunk/src/find_drc.c (revision 12596) +++ trunk/src/find_drc.c (revision 12597) @@ -105,7 +105,7 @@ switch (thing_type) { case PCB_TYPE_LINE: case PCB_TYPE_ARC: - case PCB_TYPE_POLYGON: + case PCB_TYPE_POLY: case PCB_TYPE_PIN: case PCB_TYPE_VIA: case PCB_TYPE_PSTK: @@ -146,7 +146,7 @@ *y = arc->Y; break; } - case PCB_TYPE_POLYGON: + case PCB_TYPE_POLY: { pcb_poly_t *polygon = (pcb_poly_t *) thing_ptr3; *x = (polygon->Clipped->contours->xmin + polygon->Clipped->contours->xmax) / 2; @@ -879,7 +879,7 @@ switch (thing_type) { case PCB_TYPE_LINE: case PCB_TYPE_ARC: - case PCB_TYPE_POLYGON: + case PCB_TYPE_POLY: pcb_layervis_change_group_vis(pcb_layer_id(PCB->Data, (pcb_layer_t *) thing_ptr1), pcb_true, pcb_true); } pcb_center_display(X, Y); Index: trunk/src/find_lookup.c =================================================================== --- trunk/src/find_lookup.c (revision 12596) +++ trunk/src/find_lookup.c (revision 12597) @@ -186,7 +186,7 @@ if (User) pcb_undo_add_obj_to_flag(Ptr); PCB_FLAG_SET(TheFlag, (Ptr)); - make_callback(PCB_TYPE_POLYGON, Ptr, from_type, from_ptr, type); + make_callback(PCB_TYPE_POLY, Ptr, from_type, from_ptr, type); POLYGONLIST_ENTRY((L), PolygonList[(L)].Number) = (Ptr); PolygonList[(L)].Number++; #ifdef DEBUG @@ -194,7 +194,7 @@ printf("ADD_ARC_TO_LIST overflow! lay=%d, num=%d size=%d\n", L, PolygonList[(L)].Number, PolygonList[(L)].Size); #endif if (drc && !PCB_FLAG_TEST(PCB_FLAG_SELECTED, (Ptr))) - return (SetThing(PCB_TYPE_POLYGON, LAYER_PTR(L), (Ptr), (Ptr))); + return (SetThing(PCB_TYPE_POLY, LAYER_PTR(L), (Ptr), (Ptr))); return pcb_false; } @@ -875,17 +875,17 @@ y1 = pv->Y - (PIN_SIZE(pv) + 1 + Bloat) / 2; y2 = pv->Y + (PIN_SIZE(pv) + 1 + Bloat) / 2; if (pcb_poly_is_rect_in_p(x1, y1, x2, y2, &i->polygon) - && ADD_PV_TO_LIST(pv, PCB_TYPE_POLYGON, &i->polygon, PCB_FCT_COPPER)) + && ADD_PV_TO_LIST(pv, PCB_TYPE_POLY, &i->polygon, PCB_FCT_COPPER)) longjmp(i->env, 1); } else if (PCB_FLAG_TEST(PCB_FLAG_OCTAGON, pv)) { pcb_polyarea_t *oct = pcb_poly_from_octagon(pv->X, pv->Y, PIN_SIZE(pv) / 2, PCB_FLAG_SQUARE_GET(pv)); - if (pcb_poly_isects_poly(oct, &i->polygon, pcb_true) && ADD_PV_TO_LIST(pv, PCB_TYPE_POLYGON, &i->polygon, PCB_FCT_COPPER)) + if (pcb_poly_isects_poly(oct, &i->polygon, pcb_true) && ADD_PV_TO_LIST(pv, PCB_TYPE_POLY, &i->polygon, PCB_FCT_COPPER)) longjmp(i->env, 1); } else { if (pcb_poly_is_point_in_p(pv->X, pv->Y, PIN_SIZE(pv) * 0.5 + Bloat, &i->polygon) - && ADD_PV_TO_LIST(pv, PCB_TYPE_POLYGON, &i->polygon, PCB_FCT_COPPER)) + && ADD_PV_TO_LIST(pv, PCB_TYPE_POLY, &i->polygon, PCB_FCT_COPPER)) longjmp(i->env, 1); } } @@ -898,7 +898,7 @@ struct lo_info *i = (struct lo_info *) cl; if (!PCB_FLAG_TEST(TheFlag, ps) && pcb_pstk_intersect_poly(ps, &i->polygon)) { - if (ADD_PS_TO_LIST(ps, PCB_TYPE_POLYGON, &i->polygon, PCB_FCT_COPPER)) + if (ADD_PS_TO_LIST(ps, PCB_TYPE_POLY, &i->polygon, PCB_FCT_COPPER)) longjmp(i->env, 1); } @@ -1594,7 +1594,7 @@ struct lo_info *i = (struct lo_info *) cl; if (!PCB_FLAG_TEST(TheFlag, line) && pcb_is_line_in_poly(line, &i->polygon)) { - if (ADD_LINE_TO_LIST(i->layer, line, PCB_TYPE_POLYGON, &i->polygon, PCB_FCT_COPPER)) + if (ADD_LINE_TO_LIST(i->layer, line, PCB_TYPE_POLY, &i->polygon, PCB_FCT_COPPER)) longjmp(i->env, 1); } return PCB_R_DIR_NOT_FOUND; @@ -1608,7 +1608,7 @@ if (!arc->Thickness) return 0; if (!PCB_FLAG_TEST(TheFlag, arc) && pcb_is_arc_in_poly(arc, &i->polygon)) { - if (ADD_ARC_TO_LIST(i->layer, arc, PCB_TYPE_POLYGON, &i->polygon, PCB_FCT_COPPER)) + if (ADD_ARC_TO_LIST(i->layer, arc, PCB_TYPE_POLY, &i->polygon, PCB_FCT_COPPER)) longjmp(i->env, 1); } return 0; @@ -1621,7 +1621,7 @@ if (!PCB_FLAG_TEST(TheFlag, pad) && i->layer == (PCB_FLAG_TEST(PCB_FLAG_ONSOLDER, pad) ? PCB_SOLDER_SIDE : PCB_COMPONENT_SIDE) && pcb_is_pad_in_poly(pad, &i->polygon)) { - if (ADD_PAD_TO_LIST(i->layer, pad, PCB_TYPE_POLYGON, &i->polygon, PCB_FCT_COPPER)) + if (ADD_PAD_TO_LIST(i->layer, pad, PCB_TYPE_POLY, &i->polygon, PCB_FCT_COPPER)) longjmp(i->env, 1); } return PCB_R_DIR_NOT_FOUND; @@ -1635,7 +1635,7 @@ if (!PCB_FLAG_TEST(TheFlag, rat)) { if (((rat->group1 == i->layer) && IsRatPointOnPoly(&rat->Point1, &i->polygon)) || ((rat->group2 == i->layer) && IsRatPointOnPoly(&rat->Point2, &i->polygon))) { - if (ADD_RAT_TO_LIST(rat, PCB_TYPE_POLYGON, &i->polygon, PCB_FCT_RAT)) + if (ADD_RAT_TO_LIST(rat, PCB_TYPE_POLY, &i->polygon, PCB_FCT_RAT)) longjmp(i->env, 1); } } @@ -1678,7 +1678,7 @@ pcb_poly_t *polygon = (pcb_poly_t *)b; if (!PCB_FLAG_TEST(TheFlag, polygon) && pcb_is_poly_in_poly(polygon, Polygon) - && ADD_POLYGON_TO_LIST(layer, polygon, PCB_TYPE_POLYGON, Polygon, PCB_FCT_COPPER)) + && ADD_POLYGON_TO_LIST(layer, polygon, PCB_TYPE_POLY, Polygon, PCB_FCT_COPPER)) return pcb_true; } pcb_r_end(&it); Index: trunk/src/find_misc.c =================================================================== --- trunk/src/find_misc.c (revision 12596) +++ trunk/src/find_misc.c (revision 12597) @@ -210,7 +210,7 @@ break; } - case PCB_OBJ_POLYGON: + case PCB_OBJ_POLY: { pcb_layer_id_t layer = pcb_layer_id(PCB->Data, obj->parent.layer); if (ADD_POLYGON_TO_LIST(layer, (pcb_poly_t *)obj, 0, NULL, PCB_FCT_START)) @@ -302,7 +302,7 @@ switch(type) { case PCB_OBJ_LINE: return PCB_TYPE_LINE; case PCB_OBJ_TEXT: return PCB_TYPE_TEXT; - case PCB_OBJ_POLYGON: return PCB_TYPE_POLYGON; + case PCB_OBJ_POLY: return PCB_TYPE_POLY; case PCB_OBJ_ARC: return PCB_TYPE_ARC; case PCB_OBJ_RAT: return PCB_TYPE_RATLINE; case PCB_OBJ_PAD: return PCB_TYPE_PAD; Index: trunk/src/flag_str.c =================================================================== --- trunk/src/flag_str.c (revision 12596) +++ trunk/src/flag_str.c (revision 12597) @@ -59,7 +59,7 @@ {FN(PCB_FLAG_HOLE), N("hole"), PCB_TYPEMASK_PIN, "For pins and vias, this flag means that the pin or via is a hole without a copper annulus." }, {FN(PCB_FLAG_RAT), N("rat"), PCB_TYPE_RATLINE, "If set for a line, indicates that this line is a rat line instead of a copper trace." }, {FN(PCB_FLAG_PININPOLY), N("pininpoly"), PCB_TYPEMASK_PIN | PCB_TYPE_PAD, "For pins and pads, this flag is used internally to indicate that the pin or pad overlaps a polygon on some layer." }, - {FN(PCB_FLAG_CLEARPOLY), N("clearpoly"), PCB_TYPE_POLYGON, "For polygons, this flag means that pins and vias will normally clear these polygons (thus, thermals are required for electrical connection). When clear, polygons will solidly connect to pins and vias. " }, + {FN(PCB_FLAG_CLEARPOLY), N("clearpoly"), PCB_TYPE_POLY, "For polygons, this flag means that pins and vias will normally clear these polygons (thus, thermals are required for electrical connection). When clear, polygons will solidly connect to pins and vias. " }, {FN(PCB_FLAG_HIDENAME), N("hidename"), PCB_TYPE_ELEMENT, "For elements, when set the name of the element is hidden." }, {FN(PCB_FLAG_DISPLAYNAME), N("showname"), PCB_TYPE_ELEMENT, "OBSOLETE: For elements, when set the names of pins are shown." }, {FN(PCB_FLAG_CLEARLINE), N("clearline"), PCB_TYPE_LINE | PCB_TYPE_ARC | PCB_TYPE_TEXT | PCB_TYPE_PSTK, "For lines and arcs, the line/arc will clear polygons instead of connecting to them." }, @@ -74,11 +74,11 @@ {FN(PCB_FLAG_DRC), N("drc"), PCB_TYPEMASK_ALL, "Set for objects that fail DRC: flag like FOUND flag for DRC checking."}, {FN(PCB_FLAG_LOCK), N("lock"), PCB_TYPEMASK_ALL, "Set for locked objects."}, {FN(PCB_FLAG_EDGE2), N("edge2"), PCB_TYPEMASK_ALL, "For pads, indicates that the second point is closer to the edge. For pins, indicates that the pin is closer to a horizontal edge and thus pinout text should be vertical. (Padr.Point2 is closer to outside edge also pinout text for pins is vertical)" }, - {FN(PCB_FLAG_FULLPOLY), N("fullpoly"), PCB_TYPE_POLYGON, "For polygons, the full polygon is drawn (i.e. all parts instead of only the biggest one)." }, + {FN(PCB_FLAG_FULLPOLY), N("fullpoly"), PCB_TYPE_POLY, "For polygons, the full polygon is drawn (i.e. all parts instead of only the biggest one)." }, {FN(PCB_FLAG_NOPASTE), N("nopaste"), PCB_TYPE_PAD, "Pad should not receive solderpaste. This is to support fiducials" }, {FN(PCB_FLAG_NONETLIST), N("nonetlist"), PCB_TYPEMASK_ALL, "element is not on the netlist and should not interfere with the netlist "}, - {FN(PCB_FLAG_TERMNAME), N("termname"), PCB_TYPE_LINE | PCB_TYPE_ARC | PCB_TYPE_POLYGON | PCB_TYPE_TEXT | PCB_TYPE_PIN | PCB_TYPE_PAD | PCB_TYPE_SUBC, "when set the names of pins are shown."}, - {FN(PCB_FLAG_CLEARPOLYPOLY), N("clearpolypoly"), PCB_TYPE_POLYGON, "For polygons, apply clearance to nearby polygons" }, + {FN(PCB_FLAG_TERMNAME), N("termname"), PCB_TYPE_LINE | PCB_TYPE_ARC | PCB_TYPE_POLY | PCB_TYPE_TEXT | PCB_TYPE_PIN | PCB_TYPE_PAD | PCB_TYPE_SUBC, "when set the names of pins are shown."}, + {FN(PCB_FLAG_CLEARPOLYPOLY), N("clearpolypoly"), PCB_TYPE_POLY, "For polygons, apply clearance to nearby polygons" }, {FN(PCB_FLAG_DYNTEXT), N("dyntext"), PCB_TYPE_TEXT, "For text: dynamic string (substitute %patterns%)"}, {FN(PCB_FLAG_FLOATER), N("floater"), PCB_TYPEMASK_ALL, "subc part can be moved after subc placing"} }; Index: trunk/src/gui_act.c =================================================================== --- trunk/src/gui_act.c (revision 12596) +++ trunk/src/gui_act.c (revision 12597) @@ -56,7 +56,7 @@ #include "obj_pinvia_draw.h" #include "obj_pad_draw.h" -#define CLONE_TYPES PCB_TYPE_LINE | PCB_TYPE_ARC | PCB_TYPE_VIA | PCB_TYPE_POLYGON +#define CLONE_TYPES PCB_TYPE_LINE | PCB_TYPE_ARC | PCB_TYPE_VIA | PCB_TYPE_POLY /* --------------------------------------------------------------------------- */ /* Toggle actions are kept for compatibility; new code should use the conf system instead */ @@ -526,7 +526,7 @@ } /* toggle terminal ID print for subcircuit parts */ - type = pcb_search_screen(x, y, PCB_TYPE_SUBC | PCB_TYPE_SUBC_PART | PCB_TYPE_VIA | PCB_TYPE_LINE | PCB_TYPE_ARC | PCB_TYPE_POLYGON | PCB_TYPE_TEXT, (void **)&ptr1, (void **)&ptr2, (void **)&ptr3); + type = pcb_search_screen(x, y, PCB_TYPE_SUBC | PCB_TYPE_SUBC_PART | PCB_TYPE_VIA | PCB_TYPE_LINE | PCB_TYPE_ARC | PCB_TYPE_POLY | PCB_TYPE_TEXT, (void **)&ptr1, (void **)&ptr2, (void **)&ptr3); if (type) { pcb_any_obj_t *obj = ptr2; pcb_opctx_t opctx; @@ -543,7 +543,7 @@ case PCB_TYPE_VIA: case PCB_TYPE_LINE: case PCB_TYPE_ARC: - case PCB_TYPE_POLYGON: + case PCB_TYPE_POLY: case PCB_TYPE_TEXT: pcb_obj_invalidate_label(type, ptr1, ptr2, ptr3); break; @@ -1229,7 +1229,7 @@ pcb_event(PCB_EVENT_ROUTE_STYLES_CHANGED, NULL); break; - case PCB_TYPE_POLYGON: + case PCB_TYPE_POLY: layer = (pcb_layer_t *) ptr1; break; Index: trunk/src/insert.h =================================================================== --- trunk/src/insert.h (revision 12596) +++ trunk/src/insert.h (revision 12597) @@ -31,7 +31,7 @@ #include "config.h" -#define PCB_INSERT_TYPES (PCB_TYPE_POLYGON | PCB_TYPE_LINE | PCB_TYPE_ARC | PCB_TYPE_RATLINE) +#define PCB_INSERT_TYPES (PCB_TYPE_POLY | PCB_TYPE_LINE | PCB_TYPE_ARC | PCB_TYPE_RATLINE) /* --------------------------------------------------------------------------- * prototypes Index: trunk/src/move.h =================================================================== --- trunk/src/move.h (revision 12596) +++ trunk/src/move.h (revision 12597) @@ -42,9 +42,9 @@ #define PCB_MOVE_TYPES \ (PCB_TYPE_VIA | PCB_TYPE_PSTK | PCB_TYPE_LINE | PCB_TYPE_TEXT | PCB_TYPE_ELEMENT | PCB_TYPE_SUBC | PCB_TYPE_ELEMENT_NAME | \ - PCB_TYPE_POLYGON | PCB_TYPE_POLYGON_POINT | PCB_TYPE_LINE_POINT | PCB_TYPE_ARC | PCB_TYPE_ARC_POINT) + PCB_TYPE_POLY | PCB_TYPE_POLY_POINT | PCB_TYPE_LINE_POINT | PCB_TYPE_ARC | PCB_TYPE_ARC_POINT) #define PCB_MOVETOLAYER_TYPES \ - (PCB_TYPE_LINE | PCB_TYPE_TEXT | PCB_TYPE_POLYGON | PCB_TYPE_RATLINE | PCB_TYPE_ARC) + (PCB_TYPE_LINE | PCB_TYPE_TEXT | PCB_TYPE_POLY | PCB_TYPE_RATLINE | PCB_TYPE_ARC) /* --------------------------------------------------------------------------- Index: trunk/src/obj_common.c =================================================================== --- trunk/src/obj_common.c (revision 12596) +++ trunk/src/obj_common.c (revision 12597) @@ -45,7 +45,7 @@ case PCB_OBJ_POINT: return "point"; case PCB_OBJ_LINE: return "line"; case PCB_OBJ_TEXT: return "text"; - case PCB_OBJ_POLYGON: return "polygon"; + case PCB_OBJ_POLY: return "polygon"; case PCB_OBJ_ARC: return "arc"; case PCB_OBJ_RAT: return "ratline"; case PCB_OBJ_PAD: return "pad"; @@ -73,7 +73,7 @@ case PCB_TYPE_LINE: case PCB_TYPE_ARC: case PCB_TYPE_TEXT: - case PCB_TYPE_POLYGON: + case PCB_TYPE_POLY: case PCB_TYPE_PAD: case PCB_TYPE_PIN: case PCB_TYPE_PSTK: @@ -85,7 +85,7 @@ case PCB_TYPE_SUBC: *res = *(pcb_box_t *)Ptr1; return 0; - case PCB_TYPE_POLYGON_POINT: + case PCB_TYPE_POLY_POINT: case PCB_TYPE_LINE_POINT: *res = *(pcb_box_t *)Ptr3; return 0; Index: trunk/src/obj_common.h =================================================================== --- trunk/src/obj_common.h (revision 12596) +++ trunk/src/obj_common.h (revision 12597) @@ -42,7 +42,7 @@ PCB_OBJ_POINT = 0x000001, PCB_OBJ_LINE = 0x000002, PCB_OBJ_TEXT = 0x000004, - PCB_OBJ_POLYGON = 0x000008, + PCB_OBJ_POLY = 0x000008, PCB_OBJ_ARC = 0x000010, PCB_OBJ_RAT = 0x000020, PCB_OBJ_PAD = 0x000040, @@ -200,7 +200,7 @@ #define PCB_OBJ_HAS_CLEARANCE(obj) \ ( \ - ((obj)->type == PCB_OBJ_POLYGON) ? \ + ((obj)->type == PCB_OBJ_POLY) ? \ PCB_POLY_HAS_CLEARANCE(obj) : PCB_NONPOLY_HAS_CLEARANCE(obj) \ ) Index: trunk/src/obj_poly.c =================================================================== --- trunk/src/obj_poly.c (revision 12596) +++ trunk/src/obj_poly.c (revision 12597) @@ -61,7 +61,7 @@ pcb_poly_t *new_obj; new_obj = calloc(sizeof(pcb_poly_t), 1); - new_obj->type = PCB_OBJ_POLYGON; + new_obj->type = PCB_OBJ_POLY; new_obj->Attributes.post_change = pcb_obj_attrib_post_change; PCB_SET_PARENT(new_obj, layer, layer); @@ -245,7 +245,7 @@ Layer->polygon_tree = pcb_r_create_tree(NULL, 0, 0); pcb_r_insert_entry(Layer->polygon_tree, (pcb_box_t *) polygon, 0); PCB_SET_PARENT(polygon, layer, Layer); - pcb_poly_clear_from_poly(Layer->parent, PCB_TYPE_POLYGON, Layer, polygon); + pcb_poly_clear_from_poly(Layer->parent, PCB_TYPE_POLY, Layer, polygon); } /* creates a new polygon on a layer */ @@ -443,7 +443,7 @@ { if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Polygon)) return (NULL); - pcb_undo_add_obj_to_clear_poly(PCB_TYPE_POLYGON, Layer, Polygon, Polygon, pcb_true); + pcb_undo_add_obj_to_clear_poly(PCB_TYPE_POLY, Layer, Polygon, Polygon, pcb_true); pcb_undo_add_obj_to_flag(Polygon); PCB_FLAG_TOGGLE(PCB_FLAG_CLEARPOLY, Polygon); pcb_poly_init_clip(PCB->Data, Layer, Polygon); @@ -486,7 +486,7 @@ Polygon->Points[ctx->insert.idx] = save; pcb_board_set_changed_flag(pcb_true); - pcb_undo_add_obj_to_insert_point(PCB_TYPE_POLYGON_POINT, Layer, Polygon, &Polygon->Points[ctx->insert.idx]); + pcb_undo_add_obj_to_insert_point(PCB_TYPE_POLY_POINT, Layer, Polygon, &Polygon->Points[ctx->insert.idx]); pcb_poly_bbox(Polygon); pcb_r_insert_entry(Layer->polygon_tree, (pcb_box_t *) Polygon, 0); @@ -508,14 +508,14 @@ return (NULL); pcb_poly_invalidate_erase(poly); if (PCB_FLAG_TEST(PCB_FLAG_CLEARPOLYPOLY, poly)) { - pcb_undo_add_obj_to_clear_poly(PCB_TYPE_POLYGON, Layer, poly, poly, pcb_false); - pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_POLYGON, Layer, poly); + pcb_undo_add_obj_to_clear_poly(PCB_TYPE_POLY, Layer, poly, poly, pcb_false); + pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_POLY, Layer, poly); } pcb_undo_add_obj_to_flag(poly); PCB_FLAG_TOGGLE(PCB_FLAG_CLEARPOLYPOLY, poly); if (PCB_FLAG_TEST(PCB_FLAG_CLEARPOLYPOLY, poly)) { - pcb_undo_add_obj_to_clear_poly(PCB_TYPE_POLYGON, Layer, poly, poly, pcb_true); - pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_POLYGON, Layer, poly); + pcb_undo_add_obj_to_clear_poly(PCB_TYPE_POLY, Layer, poly, poly, pcb_true); + pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_POLY, Layer, poly); } pcb_poly_invalidate_draw(Layer, poly); return poly; @@ -641,7 +641,7 @@ } if (Layer == ctx->move.dst_layer) return (Polygon); - pcb_undo_add_obj_to_move_to_layer(PCB_TYPE_POLYGON, Layer, Polygon, Polygon); + pcb_undo_add_obj_to_move_to_layer(PCB_TYPE_POLY, Layer, Polygon, Polygon); if (Layer->meta.real.vis) pcb_poly_invalidate_erase(Polygon); /* Move all of the thermals with the polygon */ @@ -720,7 +720,7 @@ if (!ctx->remove.bulk) pcb_draw(); } - pcb_undo_move_obj_to_remove(PCB_TYPE_POLYGON, Layer, Polygon, Polygon); + pcb_undo_move_obj_to_remove(PCB_TYPE_POLY, Layer, Polygon, Polygon); PCB_CLEAR_PARENT(Polygon); return NULL; } @@ -755,7 +755,7 @@ } /* Copy the polygon to the undo list */ - pcb_undo_add_obj_to_remove_contour(PCB_TYPE_POLYGON, Layer, Polygon); + pcb_undo_add_obj_to_remove_contour(PCB_TYPE_POLY, Layer, Polygon); contour_start = (contour == 0) ? 0 : Polygon->HoleIndex[contour - 1]; contour_end = (contour == Polygon->HoleIndexN) ? Polygon->PointN : Polygon->HoleIndex[contour]; @@ -807,7 +807,7 @@ pcb_poly_invalidate_erase(Polygon); /* insert the polygon-point into the undo list */ - pcb_undo_add_obj_to_remove_point(PCB_TYPE_POLYGON_POINT, Layer, Polygon, point_idx); + pcb_undo_add_obj_to_remove_point(PCB_TYPE_POLY_POINT, Layer, Polygon, point_idx); pcb_r_delete_entry(Layer->polygon_tree, (pcb_box_t *) Polygon); /* remove point from list, keep point order */ @@ -849,7 +849,7 @@ pcb_r_insert_entry(Layer->polygon_tree, (pcb_box_t *) polygon, 0); pcb_poly_init_clip(PCB->Data, Layer, polygon); pcb_poly_invalidate_draw(Layer, polygon); - pcb_undo_add_obj_to_create(PCB_TYPE_POLYGON, Layer, polygon, polygon); + pcb_undo_add_obj_to_create(PCB_TYPE_POLY, Layer, polygon, polygon); pcb_poly_ppclear(polygon); return (polygon); } @@ -875,7 +875,7 @@ { static pcb_flag_values_t pcb_poly_flags = 0; if (pcb_poly_flags == 0) - pcb_poly_flags = pcb_obj_valid_flags(PCB_TYPE_POLYGON); + pcb_poly_flags = pcb_obj_valid_flags(PCB_TYPE_POLY); if ((ctx->chgflag.flag & pcb_poly_flags) != ctx->chgflag.flag) return NULL; @@ -885,7 +885,7 @@ if (ctx->chgflag.flag & (PCB_FLAG_CLEARPOLY | PCB_FLAG_CLEARPOLYPOLY)) - pcb_poly_restore_to_poly(ctx->chgflag.pcb->Data, PCB_TYPE_POLYGON, Polygon->parent.layer, Polygon); + pcb_poly_restore_to_poly(ctx->chgflag.pcb->Data, PCB_TYPE_POLY, Polygon->parent.layer, Polygon); PCB_FLAG_CHANGE(ctx->chgflag.how, ctx->chgflag.flag, Polygon); @@ -893,7 +893,7 @@ pcb_poly_init_clip(ctx->chgflag.pcb->Data, Polygon->parent.layer, Polygon); if (ctx->chgflag.flag & (PCB_FLAG_CLEARPOLY | PCB_FLAG_CLEARPOLYPOLY)) - pcb_poly_clear_from_poly(ctx->chgflag.pcb->Data, PCB_TYPE_POLYGON, Polygon->parent.layer, Polygon); + pcb_poly_clear_from_poly(ctx->chgflag.pcb->Data, PCB_TYPE_POLY, Polygon->parent.layer, Polygon); return Polygon; } Index: trunk/src/obj_poly.h =================================================================== --- trunk/src/obj_poly.h (revision 12596) +++ trunk/src/obj_poly.h (revision 12597) @@ -206,7 +206,7 @@ if ((layer != NULL) && (layer->parent->parent_type == PCB_PARENT_BOARD)) { \ if (layer->is_bound) layer = layer->meta.bound.real; \ if (PCB_POLY_HAS_CLEARANCE(poly) && (layer != NULL)) \ - pcb_poly_clear_from_poly(layer->parent, PCB_TYPE_POLYGON, layer, poly); \ + pcb_poly_clear_from_poly(layer->parent, PCB_TYPE_POLY, layer, poly); \ } \ } \ } while(0) @@ -219,7 +219,7 @@ if ((layer != NULL) && (layer->parent->parent_type == PCB_PARENT_BOARD)) { \ if (layer->is_bound) layer = layer->meta.bound.real; \ if (PCB_POLY_HAS_CLEARANCE(poly) && (layer != NULL)) \ - pcb_poly_restore_to_poly(layer->parent, PCB_TYPE_POLYGON, layer, poly); \ + pcb_poly_restore_to_poly(layer->parent, PCB_TYPE_POLY, layer, poly); \ } \ } \ } while(0) Index: trunk/src/obj_pstk_proto.c =================================================================== --- trunk/src/obj_pstk_proto.c (revision 12596) +++ trunk/src/obj_pstk_proto.c (revision 12597) @@ -81,7 +81,7 @@ for(n = 0, o = (pcb_any_obj_t **)objs->array; n < vtp0_len(objs); n++,o++) { switch((*o)->type) { case PCB_OBJ_LINE: - case PCB_OBJ_POLYGON: + case PCB_OBJ_POLY: ts->len++; break; case PCB_OBJ_VIA: @@ -121,7 +121,7 @@ ts->shape[n].data.line.square = 0; ts->shape[n].clearance = (*(pcb_line_t **)o)->Clearance; break; - case PCB_OBJ_POLYGON: + case PCB_OBJ_POLY: { pcb_cardinal_t p, len; pcb_poly_t *poly = *(pcb_poly_t **)o; Index: trunk/src/obj_subc.c =================================================================== --- trunk/src/obj_subc.c (revision 12596) +++ trunk/src/obj_subc.c (revision 12597) @@ -210,7 +210,7 @@ pcb_layer_t *source = o->parent.layer; pcb_layer_t *target = (source->meta.bound.type & PCB_LYT_TOP) ? top : bottom; switch(o->type) { - case PCB_OBJ_POLYGON: + case PCB_OBJ_POLY: pcb_polyop_move_to_layer_low(NULL, source, (pcb_poly_t *)o, target); break; case PCB_OBJ_LINE: @@ -765,7 +765,7 @@ } polylist_foreach(&sl->Polygon, &it, poly) { - pcb_object_operation(opfunc, ctx, PCB_TYPE_POLYGON, sl, poly, poly); + pcb_object_operation(opfunc, ctx, PCB_TYPE_POLY, sl, poly, poly); pcb_box_bump_box_noflt(&sc->BoundingBox, &poly->BoundingBox); } Index: trunk/src/obj_subc_parent.h =================================================================== --- trunk/src/obj_subc_parent.h (revision 12596) +++ trunk/src/obj_subc_parent.h (revision 12597) @@ -67,7 +67,7 @@ return pcb_gobj_parent_subc(obj->parent_type, &obj->parent); case PCB_OBJ_LINE: - case PCB_OBJ_POLYGON: + case PCB_OBJ_POLY: case PCB_OBJ_TEXT: case PCB_OBJ_ARC: return pcb_lobj_parent_subc(obj->parent_type, &obj->parent); Index: trunk/src/obj_term.c =================================================================== --- trunk/src/obj_term.c (revision 12596) +++ trunk/src/obj_term.c (revision 12597) @@ -217,7 +217,7 @@ else pcb_attribute_remove(&r->obj->Attributes, "term"); - if (r->obj->type == PCB_OBJ_POLYGON) + if (r->obj->type == PCB_OBJ_POLY) pcb_poly_init_clip(r->obj->parent.layer->parent, r->obj->parent.layer, (pcb_poly_t *)r->obj); return res; @@ -269,7 +269,7 @@ PCB_FLAG_CLEAR(PCB_FLAG_CLEARPOLY, r); undo_term_rename_swap(r); - if (obj->type == PCB_OBJ_POLYGON) + if (obj->type == PCB_OBJ_POLY) pcb_poly_init_clip(obj->parent.layer->parent, obj->parent.layer, (pcb_poly_t *)obj); pcb_undo_inc_serial(); Index: trunk/src/operation.c =================================================================== --- trunk/src/operation.c (revision 12596) +++ trunk/src/operation.c (revision 12597) @@ -65,12 +65,12 @@ return (F->Text(ctx, (pcb_layer_t *) Ptr1, (pcb_text_t *) Ptr2)); break; - case PCB_TYPE_POLYGON: + case PCB_TYPE_POLY: if (F->Polygon) return (F->Polygon(ctx, (pcb_layer_t *) Ptr1, (pcb_poly_t *) Ptr2)); break; - case PCB_TYPE_POLYGON_POINT: + case PCB_TYPE_POLY_POINT: if (F->Point) return (F->Point(ctx, (pcb_layer_t *) Ptr1, (pcb_poly_t *) Ptr2, (pcb_point_t *) Ptr3)); break; @@ -177,7 +177,7 @@ } /* check polygons */ - if (type & PCB_TYPE_POLYGON && F->Polygon) { + if (type & PCB_TYPE_POLY && F->Polygon) { PCB_POLY_VISIBLE_LOOP(pcb->Data); { if (PCB_FLAG_TEST(PCB_FLAG_SELECTED, polygon)) { Index: trunk/src/polygon.c =================================================================== --- trunk/src/polygon.c (revision 12596) +++ trunk/src/polygon.c (revision 12597) @@ -1491,7 +1491,7 @@ line.Point2 = Polygon->Points[next]; line.Thickness = 0; if (pcb_is_point_on_line(p->X, p->Y, 0.0, &line)) { - pcb_remove_object(PCB_TYPE_POLYGON_POINT, Layer, Polygon, p); + pcb_remove_object(PCB_TYPE_POLY_POINT, Layer, Polygon, p); changed = pcb_true; } } @@ -1644,7 +1644,7 @@ pcb_added_lines = 0; /* add to undo list */ - pcb_undo_add_obj_to_create(PCB_TYPE_POLYGON, CURRENT, polygon, polygon); + pcb_undo_add_obj_to_create(PCB_TYPE_POLY, CURRENT, polygon, polygon); pcb_undo_inc_serial(); } @@ -1699,7 +1699,7 @@ pcb_undo_save_serial(); Flags = ((pcb_poly_t *) pcb_crosshair.AttachedObject.Ptr2)->Flags; pcb_poly_to_polygons_on_layer(PCB->Data, (pcb_layer_t *) pcb_crosshair.AttachedObject.Ptr1, result, Flags); - pcb_remove_object(PCB_TYPE_POLYGON, + pcb_remove_object(PCB_TYPE_POLY, pcb_crosshair.AttachedObject.Ptr1, pcb_crosshair.AttachedObject.Ptr2, pcb_crosshair.AttachedObject.Ptr3); pcb_undo_restore_serial(); pcb_undo_inc_serial(); @@ -1765,7 +1765,7 @@ SubtractArc((pcb_arc_t *) ptr2, Polygon); Polygon->NoHolesValid = 0; return PCB_R_DIR_FOUND_CONTINUE; - case PCB_TYPE_POLYGON: + case PCB_TYPE_POLY: if (ptr2 != Polygon) { SubtractPolyPoly((pcb_poly_t *) ptr2, Polygon); Polygon->NoHolesValid = 0; @@ -1800,7 +1800,7 @@ case PCB_TYPE_ARC: UnsubtractArc((pcb_arc_t *) ptr2, Layer, Polygon); return PCB_R_DIR_FOUND_CONTINUE; - case PCB_TYPE_POLYGON: + case PCB_TYPE_POLY: if (ptr2 != Polygon) { UnsubtractPolyPoly((pcb_poly_t *) ptr2, Polygon); return PCB_R_DIR_FOUND_CONTINUE; @@ -1898,7 +1898,7 @@ if (!PCB_NONPOLY_HAS_CLEARANCE((pcb_pstk_t *)ptr2)) return 0; goto doit; - case PCB_TYPE_POLYGON: + case PCB_TYPE_POLY: if (!PCB_POLY_HAS_CLEARANCE((pcb_poly_t *) ptr2)) return 0; goto doit; @@ -1967,7 +1967,7 @@ { if (Data->parent_type != PCB_PARENT_BOARD) /* clear/restore only on boards */ return; - if (type == PCB_TYPE_POLYGON) + if (type == PCB_TYPE_POLY) pcb_poly_init_clip(PCB->Data, (pcb_layer_t *) ptr1, (pcb_poly_t *) ptr2); pcb_poly_plows(Data, type, ptr1, ptr2, add_plow); } @@ -1976,7 +1976,7 @@ { if (Data->parent_type != PCB_PARENT_BOARD) /* clear/restore only on boards */ return; - if (type == PCB_TYPE_POLYGON) + if (type == PCB_TYPE_POLY) pcb_poly_init_clip(Data, (pcb_layer_t *) ptr1, (pcb_poly_t *) ptr2); pcb_poly_plows(Data, type, ptr1, ptr2, subtract_plow); } @@ -2154,7 +2154,7 @@ newone->BoundingBox.X2 = p->contours->xmax + 1; newone->BoundingBox.Y1 = p->contours->ymin; newone->BoundingBox.Y2 = p->contours->ymax + 1; - pcb_undo_add_obj_to_create(PCB_TYPE_POLYGON, layer, newone, newone); + pcb_undo_add_obj_to_create(PCB_TYPE_POLY, layer, newone, newone); newone->Clipped = p; p = p->f; /* go to next pline */ newone->Clipped->b = newone->Clipped->f = newone->Clipped; /* unlink from others */ @@ -2263,7 +2263,7 @@ pcb_poly_invalidate_draw(Layer, Polygon); /* add to undo list */ - pcb_undo_add_obj_to_create(PCB_TYPE_POLYGON, Layer, Polygon, Polygon); + pcb_undo_add_obj_to_create(PCB_TYPE_POLY, Layer, Polygon, Polygon); } while ((pa = pa->f) != Input); Index: trunk/src/polygon_act.c =================================================================== --- trunk/src/polygon_act.c (revision 12596) +++ trunk/src/polygon_act.c (revision 12597) @@ -68,7 +68,7 @@ void *ptr1, *ptr2, *ptr3; pcb_gui->get_coords(_("Select an Object"), &x, &y); - if ((type = pcb_search_screen(x, y, PCB_TYPE_POLYGON, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) { + if ((type = pcb_search_screen(x, y, PCB_TYPE_POLY, &ptr1, &ptr2, &ptr3)) != PCB_TYPE_NONE) { pcb_poly_morph((pcb_layer_t *) ptr1, (pcb_poly_t *) ptr3); pcb_draw(); pcb_undo_inc_serial(); Index: trunk/src/rats.c =================================================================== --- trunk/src/rats.c (revision 12596) +++ trunk/src/rats.c (revision 12597) @@ -697,7 +697,7 @@ * not a daisy chain). Further prefer to pick an existing * via in the Net to make that connection. */ - if (conn1->obj->type == PCB_OBJ_POLYGON && + if (conn1->obj->type == PCB_OBJ_POLY && (polygon = (pcb_poly_t *) conn1->obj) && !(distance == 0 && firstpoint && firstpoint->obj->type == PCB_OBJ_VIA) && pcb_poly_is_point_in_p_ignore_holes(conn2->X, conn2->Y, polygon)) { @@ -707,7 +707,7 @@ theSubnet = next; havepoints = pcb_true; } - else if (conn2->obj->type == PCB_OBJ_POLYGON && + else if (conn2->obj->type == PCB_OBJ_POLY && (polygon = (pcb_poly_t *) conn2->obj) && !(distance == 0 && firstpoint && firstpoint->obj->type == PCB_OBJ_VIA) && pcb_poly_is_point_in_p_ignore_holes(conn1->X, conn1->Y, polygon)) { Index: trunk/src/remove.h =================================================================== --- trunk/src/remove.h (revision 12596) +++ trunk/src/remove.h (revision 12597) @@ -36,7 +36,7 @@ */ #define PCB_REMOVE_TYPES \ (PCB_TYPE_VIA | PCB_TYPE_PSTK | PCB_TYPE_LINE_POINT | PCB_TYPE_LINE | PCB_TYPE_TEXT | PCB_TYPE_ELEMENT | PCB_TYPE_SUBC | \ - PCB_TYPE_POLYGON_POINT | PCB_TYPE_POLYGON | PCB_TYPE_RATLINE | PCB_TYPE_ARC | PCB_TYPE_ARC_POINT) + PCB_TYPE_POLY_POINT | PCB_TYPE_POLY | PCB_TYPE_RATLINE | PCB_TYPE_ARC | PCB_TYPE_ARC_POINT) pcb_bool pcb_remove_selected(void); void *pcb_remove_object(int, void *, void *, void *); Index: trunk/src/search.c =================================================================== --- trunk/src/search.c (revision 12596) +++ trunk/src/search.c (revision 12597) @@ -1177,7 +1177,7 @@ Type &= (PCB_TYPE_ELEMENT_NAME | PCB_TYPE_TEXT); } if (conf_core.editor.thin_draw || conf_core.editor.thin_draw_poly) { - Type &= ~PCB_TYPE_POLYGON; + Type &= ~PCB_TYPE_POLY; } if (Type & PCB_TYPE_RATLINE && PCB->RatOn && @@ -1233,9 +1233,9 @@ } if (SearchLayer->meta.real.vis) { if ((HigherAvail & (PCB_TYPE_PIN | PCB_TYPE_PAD)) == 0 && - Type & PCB_TYPE_POLYGON_POINT && + Type & PCB_TYPE_POLY_POINT && SearchPointByLocation(objst, req_flag, (pcb_layer_t **) Result1, (pcb_poly_t **) Result2, (pcb_point_t **) Result3)) - return (PCB_TYPE_POLYGON_POINT); + return (PCB_TYPE_POLY_POINT); if ((HigherAvail & (PCB_TYPE_PIN | PCB_TYPE_PAD)) == 0 && Type & PCB_TYPE_LINE_POINT && @@ -1259,7 +1259,7 @@ && SearchTextByLocation(objst, req_flag, (pcb_layer_t **) Result1, (pcb_text_t **) Result2, (pcb_text_t **) Result3)) return (PCB_TYPE_TEXT); - if (Type & PCB_TYPE_POLYGON && + if (Type & PCB_TYPE_POLY && SearchPolygonByLocation(objst, req_flag, (pcb_layer_t **) Result1, (pcb_poly_t **) Result2, (pcb_poly_t **) Result3)) { if (HigherAvail) { pcb_box_t *box = &(*(pcb_poly_t **) Result2)->BoundingBox; @@ -1267,10 +1267,10 @@ if (HigherBound < area) break; else - return (PCB_TYPE_POLYGON); + return (PCB_TYPE_POLY); } else - return (PCB_TYPE_POLYGON); + return (PCB_TYPE_POLY); } } } @@ -1417,15 +1417,15 @@ PCB_ENDALL_LOOP; } - if (type == PCB_TYPE_POLYGON || type == PCB_TYPE_POLYGON_POINT) { + if (type == PCB_TYPE_POLY || type == PCB_TYPE_POLY_POINT) { PCB_POLY_ALL_LOOP(Base); { if (polygon->ID == ID) { *Result1 = (void *) layer; *Result2 = *Result3 = (void *) polygon; - return (PCB_TYPE_POLYGON); + return (PCB_TYPE_POLY); } - if (type == PCB_TYPE_POLYGON_POINT) + if (type == PCB_TYPE_POLY_POINT) PCB_POLY_POINT_LOOP(polygon); { if (point->ID == ID) { @@ -1432,7 +1432,7 @@ *Result1 = (void *) layer; *Result2 = (void *) polygon; *Result3 = (void *) point; - return (PCB_TYPE_POLYGON_POINT); + return (PCB_TYPE_POLY_POINT); } } PCB_END_LOOP; Index: trunk/src/select.c =================================================================== --- trunk/src/select.c (revision 12596) +++ trunk/src/select.c (revision 12597) @@ -176,7 +176,7 @@ break; } - case PCB_TYPE_POLYGON: + case PCB_TYPE_POLY: { pcb_poly_t *poly = (pcb_poly_t *) ptr2; @@ -369,7 +369,7 @@ if (PCB_POLYGON_NEAR_BOX(polygon, Box) && !PCB_FLAG_TEST(PCB_FLAG_LOCK, polygon) && PCB_FLAG_TEST(PCB_FLAG_SELECTED, polygon) != Flag) { - append(PCB_TYPE_POLYGON, layer, polygon); + append(PCB_TYPE_POLY, layer, polygon); if (layer->meta.real.vis) pcb_poly_invalidate_draw(layer, polygon); } @@ -528,7 +528,7 @@ case PCB_OBJ_LINE: return PCB_LINE_NEAR_BOX((pcb_line_t *)obj, box); case PCB_OBJ_ETEXT: case PCB_OBJ_TEXT: return PCB_TEXT_NEAR_BOX((pcb_text_t *)obj, box); - case PCB_OBJ_POLYGON: return PCB_POLYGON_NEAR_BOX((pcb_poly_t *)obj, box); + case PCB_OBJ_POLY: return PCB_POLYGON_NEAR_BOX((pcb_poly_t *)obj, box); case PCB_OBJ_ARC: return PCB_ARC_NEAR_BOX((pcb_arc_t *)obj, box); case PCB_OBJ_PAD: return PCB_PAD_NEAR_BOX((pcb_pad_t *)obj, box); case PCB_OBJ_PSTK: return pcb_pstk_near_box((pcb_pstk_t *)obj, box); Index: trunk/src/select.h =================================================================== --- trunk/src/select.h (revision 12596) +++ trunk/src/select.h (revision 12597) @@ -33,7 +33,7 @@ #include "operation.h" #define PCB_SELECT_TYPES \ - (PCB_TYPE_VIA | PCB_TYPE_LINE | PCB_TYPE_TEXT | PCB_TYPE_POLYGON | PCB_TYPE_ELEMENT | PCB_TYPE_SUBC | \ + (PCB_TYPE_VIA | PCB_TYPE_LINE | PCB_TYPE_TEXT | PCB_TYPE_POLY | PCB_TYPE_ELEMENT | PCB_TYPE_SUBC | \ PCB_TYPE_PIN | PCB_TYPE_PAD | PCB_TYPE_PSTK | PCB_TYPE_ELEMENT_NAME | PCB_TYPE_RATLINE | PCB_TYPE_ARC) pcb_bool pcb_select_object(pcb_board_t *pcb); Index: trunk/src/thermal.c =================================================================== --- trunk/src/thermal.c (revision 12596) +++ trunk/src/thermal.c (revision 12597) @@ -614,7 +614,7 @@ case PCB_OBJ_LINE: return pcb_thermal_area_line(pcb, (pcb_line_t *)obj, lid); - case PCB_OBJ_POLYGON: + case PCB_OBJ_POLY: return pcb_thermal_area_poly(pcb, (pcb_poly_t *)obj, lid); case PCB_OBJ_PSTK: Index: trunk/src/tool_insert.c =================================================================== --- trunk/src/tool_insert.c (revision 12596) +++ trunk/src/tool_insert.c (revision 12597) @@ -65,7 +65,7 @@ } else { /* get starting point of nearest segment */ - if (pcb_crosshair.AttachedObject.Type == PCB_TYPE_POLYGON) { + if (pcb_crosshair.AttachedObject.Type == PCB_TYPE_POLY) { fake.poly = (pcb_poly_t *) pcb_crosshair.AttachedObject.Ptr2; polyIndex = pcb_poly_get_lowest_distance_point(fake.poly, Note.X, Note.Y); fake.line.Point1 = fake.poly->Points[polyIndex]; @@ -81,8 +81,8 @@ /* second notify, insert new point into object */ case PCB_CH_STATE_SECOND: - if (pcb_crosshair.AttachedObject.Type == PCB_TYPE_POLYGON) - pcb_insert_point_in_object(PCB_TYPE_POLYGON, + if (pcb_crosshair.AttachedObject.Type == PCB_TYPE_POLY) + pcb_insert_point_in_object(PCB_TYPE_POLY, pcb_crosshair.AttachedObject.Ptr1, fake.poly, &polyIndex, InsertedPoint.X, InsertedPoint.Y, pcb_false, pcb_false); else Index: trunk/src/tool_polyhole.c =================================================================== --- trunk/src/tool_polyhole.c (revision 12596) +++ trunk/src/tool_polyhole.c (revision 12597) @@ -43,7 +43,7 @@ /* first notify, lookup object */ case PCB_CH_STATE_FIRST: pcb_crosshair.AttachedObject.Type = - pcb_search_screen(Note.X, Note.Y, PCB_TYPE_POLYGON, + pcb_search_screen(Note.X, Note.Y, PCB_TYPE_POLY, &pcb_crosshair.AttachedObject.Ptr1, &pcb_crosshair.AttachedObject.Ptr2, &pcb_crosshair.AttachedObject.Ptr3); if (pcb_crosshair.AttachedObject.Type == PCB_TYPE_NONE) { Index: trunk/src/tool_rectangle.c =================================================================== --- trunk/src/tool_rectangle.c (revision 12596) +++ trunk/src/tool_rectangle.c (revision 12597) @@ -66,7 +66,7 @@ 2 * conf_core.design.clearance, pcb_flag_make(flags))) != NULL) { pcb_obj_add_attribs(polygon, PCB->pen_attr); - pcb_undo_add_obj_to_create(PCB_TYPE_POLYGON, CURRENT, polygon, polygon); + pcb_undo_add_obj_to_create(PCB_TYPE_POLY, CURRENT, polygon, polygon); pcb_undo_inc_serial(); pcb_poly_invalidate_draw(CURRENT, polygon); pcb_draw(); Index: trunk/src/undo_old.c =================================================================== --- trunk/src/undo_old.c (revision 12596) +++ trunk/src/undo_old.c (revision 12597) @@ -581,15 +581,15 @@ int type; /* lookup entry (polygon not point was saved) by it's ID */ - assert(Entry->Kind == PCB_TYPE_POLYGON); + assert(Entry->Kind == PCB_TYPE_POLY); type = pcb_search_obj_by_id(PCB->Data, (void **) &layer, (void **) &polygon, &ptr3, Entry->ID, Entry->Kind); switch (type) { - case PCB_TYPE_POLYGON: /* restore the removed point */ + case PCB_TYPE_POLY: /* restore the removed point */ { /* recover the point */ if (pcb_undo_and_draw && layer->meta.real.vis) pcb_poly_invalidate_erase(polygon); - pcb_insert_point_in_object(PCB_TYPE_POLYGON, layer, polygon, + pcb_insert_point_in_object(PCB_TYPE_POLY, layer, polygon, &Entry->Data.RemovedPoint.Index, Entry->Data.RemovedPoint.X, Entry->Data.RemovedPoint.Y, pcb_true, Entry->Data.RemovedPoint.last_in_contour); @@ -599,7 +599,7 @@ pcb_poly_invalidate_draw(layer, polygon); Entry->Type = PCB_UNDO_INSERT_POINT; Entry->ID = Entry->Data.RemovedPoint.ID; - Entry->Kind = PCB_TYPE_POLYGON_POINT; + Entry->Kind = PCB_TYPE_POLY_POINT; return (pcb_true); } @@ -622,11 +622,11 @@ pcb_cardinal_t hole; pcb_bool last_in_contour = pcb_false; - assert(Entry->Kind == PCB_TYPE_POLYGON_POINT); + assert(Entry->Kind == PCB_TYPE_POLY_POINT); /* lookup entry by it's ID */ type = pcb_search_obj_by_id(PCB->Data, (void **) &layer, (void **) &polygon, (void **) &pnt, Entry->ID, Entry->Kind); switch (type) { - case PCB_TYPE_POLYGON_POINT: /* removes an inserted polygon point */ + case PCB_TYPE_POLY_POINT: /* removes an inserted polygon point */ { if (pcb_undo_and_draw && layer->meta.real.vis) pcb_poly_invalidate_erase(polygon); @@ -647,10 +647,10 @@ Entry->Data.RemovedPoint.Y = pnt->Y; Entry->Data.RemovedPoint.ID = pnt->ID; Entry->ID = polygon->ID; - Entry->Kind = PCB_TYPE_POLYGON; + Entry->Kind = PCB_TYPE_POLY; Entry->Type = PCB_UNDO_REMOVE_POINT; Entry->Data.RemovedPoint.Index = point_idx; - pcb_destroy_object(PCB->Data, PCB_TYPE_POLYGON_POINT, layer, polygon, pnt); + pcb_destroy_object(PCB->Data, PCB_TYPE_POLY_POINT, layer, polygon, pnt); if (pcb_undo_and_draw && layer->meta.real.vis) pcb_poly_invalidate_draw(layer, polygon); return (pcb_true); @@ -691,7 +691,7 @@ DrawRecoveredObject((pcb_any_obj_t *)ptr2); obj = (pcb_any_obj_t *) pcb_move_obj_to_buffer(PCB, PCB->Data, RemoveList, type, ptr1, ptr2, ptr3); - if (Entry->Kind == PCB_TYPE_POLYGON) + if (Entry->Kind == PCB_TYPE_POLY) pcb_poly_init_clip(PCB->Data, (pcb_layer_t *) ptr1b, (pcb_poly_t *) obj); return (pcb_true); } @@ -702,7 +702,7 @@ */ static pcb_bool UndoRemoveContour(UndoListTypePtr Entry) { - assert(Entry->Kind == PCB_TYPE_POLYGON); + assert(Entry->Kind == PCB_TYPE_POLY); return UndoSwapCopiedObject(Entry); } @@ -712,7 +712,7 @@ */ static pcb_bool UndoInsertContour(UndoListTypePtr Entry) { - assert(Entry->Kind == PCB_TYPE_POLYGON); + assert(Entry->Kind == PCB_TYPE_POLY); return UndoSwapCopiedObject(Entry); } @@ -978,12 +978,12 @@ if (!Locked) { switch (Type) { - case PCB_TYPE_POLYGON_POINT: + case PCB_TYPE_POLY_POINT: { /* save the ID of the parent object; else it will be * impossible to recover the point */ - undo = GetUndoSlot(PCB_UNDO_REMOVE_POINT, PCB_OBJECT_ID(polygon), PCB_TYPE_POLYGON); + undo = GetUndoSlot(PCB_UNDO_REMOVE_POINT, PCB_OBJECT_ID(polygon), PCB_TYPE_POLY); undo->Data.RemovedPoint.X = polygon->Points[index].X; undo->Data.RemovedPoint.Y = polygon->Points[index].Y; undo->Data.RemovedPoint.ID = polygon->Points[index].ID; Index: trunk/src_plugins/autocrop/autocrop.c =================================================================== --- trunk/src_plugins/autocrop/autocrop.c (revision 12596) +++ trunk/src_plugins/autocrop/autocrop.c (revision 12597) @@ -181,7 +181,7 @@ * XXX tree activity. */ Mypcb_poly_move(PCB->Data, layer, polygon, dx, dy); - pcb_undo_add_obj_to_move(PCB_TYPE_POLYGON, NULL, NULL, polygon, dx, dy); + pcb_undo_add_obj_to_move(PCB_TYPE_POLY, NULL, NULL, polygon, dx, dy); } PCB_ENDALL_LOOP; } Index: trunk/src_plugins/autoroute/autoroute.c =================================================================== --- trunk/src_plugins/autoroute/autoroute.c (revision 12596) +++ trunk/src_plugins/autoroute/autoroute.c (revision 12597) @@ -1011,7 +1011,7 @@ case PCB_OBJ_VIA: rb = AddPin(layergroupboxes, (pcb_pin_t *) connection->obj, pcb_true, rd->styles[j]); break; - case PCB_OBJ_POLYGON: + case PCB_OBJ_POLY: rb = AddPolygon(layergroupboxes, pcb_layer_id(PCB->Data, (pcb_layer_t *) connection->ptr1), Index: trunk/src_plugins/diag/diag.c =================================================================== --- trunk/src_plugins/diag/diag.c (revision 12596) +++ trunk/src_plugins/diag/diag.c (revision 12597) @@ -304,7 +304,7 @@ } #define PCB_FORCECOLOR_TYPES \ - (PCB_TYPE_VIA | PCB_TYPE_PIN | PCB_TYPE_PAD | PCB_TYPE_TEXT | PCB_TYPE_ELEMENT | PCB_TYPE_SUBC | PCB_TYPE_ELEMENT_NAME | PCB_TYPE_LINE | PCB_TYPE_ARC | PCB_TYPE_POLYGON | PCB_TYPE_SUBC_PART | PCB_TYPE_SUBC | PCB_TYPE_RATLINE) + (PCB_TYPE_VIA | PCB_TYPE_PIN | PCB_TYPE_PAD | PCB_TYPE_TEXT | PCB_TYPE_ELEMENT | PCB_TYPE_SUBC | PCB_TYPE_ELEMENT_NAME | PCB_TYPE_LINE | PCB_TYPE_ARC | PCB_TYPE_POLY | PCB_TYPE_SUBC_PART | PCB_TYPE_SUBC | PCB_TYPE_RATLINE) static const char forcecolor_syntax[] = "forcecolor(#RRGGBB)\n"; static const char forcecolor_help[] = "change selected element's color to #RRGGBB, reset if does not start with '#'"; Index: trunk/src_plugins/dialogs/dlg_flag_edit.c =================================================================== --- trunk/src_plugins/dialogs/dlg_flag_edit.c (revision 12596) +++ trunk/src_plugins/dialogs/dlg_flag_edit.c (revision 12597) @@ -36,7 +36,7 @@ } fe_ctx_t; #define PCB_FLAGEDIT_TYPES \ - (PCB_TYPE_VIA | PCB_TYPE_ELEMENT | PCB_TYPE_LINE | PCB_TYPE_POLYGON | \ + (PCB_TYPE_VIA | PCB_TYPE_ELEMENT | PCB_TYPE_LINE | PCB_TYPE_POLY | \ PCB_TYPE_TEXT | PCB_TYPE_SUBC | PCB_TYPE_PIN | PCB_TYPE_PAD | PCB_TYPE_ARC) static void fe_attr_chg(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr) Index: trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/object.c =================================================================== --- trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/object.c (revision 12596) +++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/object.c (revision 12597) @@ -129,7 +129,7 @@ break; case OM_POLYGON: if (obj->layer != -1) { - pcb_move_obj(PCB_TYPE_POLYGON, PCB->Data->Layer + obj->layer, obj->obj.p, obj->obj.p, dx, dy); + pcb_move_obj(PCB_TYPE_POLY, PCB->Data->Layer + obj->layer, obj->obj.p, obj->obj.p, dx, dy); return 0; } } Index: trunk/src_plugins/io_hyp/write.c =================================================================== --- trunk/src_plugins/io_hyp/write.c (revision 12596) +++ trunk/src_plugins/io_hyp/write.c (revision 12597) @@ -401,7 +401,7 @@ case PCB_OBJ_PAD: write_pad(wr, (pcb_pad_t *) o->obj); break; - case PCB_OBJ_POLYGON: + case PCB_OBJ_POLY: write_poly(wr, (pcb_poly_t *) o->obj); break; Index: trunk/src_plugins/io_lihata/read.c =================================================================== --- trunk/src_plugins/io_lihata/read.c (revision 12596) +++ trunk/src_plugins/io_lihata/read.c (revision 12597) @@ -536,7 +536,7 @@ unsigned char intconn = 0; parse_id(&poly->ID, obj, 8); - parse_flags(&poly->Flags, lht_dom_hash_get(obj, "flags"), PCB_TYPE_POLYGON, &intconn); + parse_flags(&poly->Flags, lht_dom_hash_get(obj, "flags"), PCB_TYPE_POLY, &intconn); pcb_attrib_compat_set_intconn(&poly->Attributes, intconn); parse_attributes(&poly->Attributes, lht_dom_hash_get(obj, "attributes")); Index: trunk/src_plugins/io_lihata/write.c =================================================================== --- trunk/src_plugins/io_lihata/write.c (revision 12596) +++ trunk/src_plugins/io_lihata/write.c (revision 12597) @@ -387,7 +387,7 @@ obj = lht_dom_node_alloc(LHT_HASH, buff); lht_dom_hash_put(obj, build_attributes(&poly->Attributes)); - lht_dom_hash_put(obj, build_flags(&poly->Flags, PCB_TYPE_POLYGON, poly->intconn)); + lht_dom_hash_put(obj, build_flags(&poly->Flags, PCB_TYPE_POLY, poly->intconn)); if ((wrver >= 3) && (poly->Clearance > 0)) lht_dom_hash_put(obj, build_textf("clearance", CFMT, poly->Clearance)); Index: trunk/src_plugins/io_pcb/file.c =================================================================== --- trunk/src_plugins/io_pcb/file.c (revision 12596) +++ trunk/src_plugins/io_pcb/file.c (revision 12597) @@ -532,7 +532,7 @@ textlist_foreach(&layer->Polygon, &it, polygon) { int p, i = 0; pcb_cardinal_t hole = 0; - fprintf(FP, "\tPolygon(%s)\n\t(", F2S(polygon, PCB_TYPE_POLYGON)); + fprintf(FP, "\tPolygon(%s)\n\t(", F2S(polygon, PCB_TYPE_POLY)); for (p = 0; p < polygon->PointN; p++) { pcb_point_t *point = &polygon->Points[p]; Index: trunk/src_plugins/io_pcb/parse_y.c =================================================================== --- trunk/src_plugins/io_pcb/parse_y.c (revision 12596) +++ trunk/src_plugins/io_pcb/parse_y.c (revision 12597) @@ -2407,7 +2407,7 @@ " line: %i\n" " description: 'ignored polygon (< 3 points in a contour)'\n", yyfilename, pcb_lineno); - pcb_destroy_object(yyData, PCB_TYPE_POLYGON, Layer, Polygon, Polygon); + pcb_destroy_object(yyData, PCB_TYPE_POLY, Layer, Polygon, Polygon); } else { Index: trunk/src_plugins/io_pcb/parse_y.y =================================================================== --- trunk/src_plugins/io_pcb/parse_y.y (revision 12596) +++ trunk/src_plugins/io_pcb/parse_y.y (revision 12597) @@ -1187,7 +1187,7 @@ " line: %i\n" " description: 'ignored polygon (< 3 points in a contour)'\n", yyfilename, pcb_lineno); - pcb_destroy_object(yyData, PCB_TYPE_POLYGON, Layer, Polygon, Polygon); + pcb_destroy_object(yyData, PCB_TYPE_POLY, Layer, Polygon, Polygon); } else { Index: trunk/src_plugins/lib_gtk_common/dlg_drc.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_drc.c (revision 12596) +++ trunk/src_plugins/lib_gtk_common/dlg_drc.c (revision 12597) @@ -227,7 +227,7 @@ switch (violation->object_type_list[i]) { case PCB_TYPE_LINE: case PCB_TYPE_ARC: - case PCB_TYPE_POLYGON: + case PCB_TYPE_POLY: pcb_layervis_change_group_vis(pcb_layer_id(PCB->Data, (pcb_layer_t *) ptr1), pcb_true, pcb_true); } pcb_draw_obj((pcb_any_obj_t *)ptr2); Index: trunk/src_plugins/query/query_access.c =================================================================== --- trunk/src_plugins/query/query_access.c (revision 12596) +++ trunk/src_plugins/query/query_access.c (revision 12597) @@ -66,7 +66,7 @@ static void list_poly_cb(void *ctx, pcb_board_t *pcb, pcb_layer_t *layer, pcb_poly_t *poly) { - APPEND(ctx, PCB_OBJ_POLYGON, poly, PCB_PARENT_LAYER, layer); + APPEND(ctx, PCB_OBJ_POLY, poly, PCB_PARENT_LAYER, layer); } static int list_element_cb(void *ctx, pcb_board_t *pcb, pcb_element_t *element, int enter) @@ -114,7 +114,7 @@ (mask & PCB_OBJ_LINE) ? list_line_cb : NULL, (mask & PCB_OBJ_ARC) ? list_arc_cb : NULL, (mask & PCB_OBJ_TEXT) ? list_text_cb : NULL, - (mask & PCB_OBJ_POLYGON) ? list_poly_cb : NULL, + (mask & PCB_OBJ_POLY) ? list_poly_cb : NULL, (mask & PCB_OBJ_ELEMENT) ? list_element_cb : NULL, (mask & PCB_OBJ_ELINE) ? list_eline_cb : NULL, (mask & PCB_OBJ_EARC) ? list_earc_cb : NULL, @@ -716,7 +716,7 @@ /* case PCB_OBJ_POINT: return field_point(obj, fld, res);*/ case PCB_OBJ_LINE: return field_line(obj, fld, res); case PCB_OBJ_TEXT: return field_text(obj, fld, res); - case PCB_OBJ_POLYGON: return field_polygon(obj, fld, res); + case PCB_OBJ_POLY: return field_polygon(obj, fld, res); case PCB_OBJ_ARC: return field_arc(obj, fld, res); case PCB_OBJ_RAT: return field_rat(obj, fld, res); case PCB_OBJ_PAD: return field_pad(obj, fld, res); Index: trunk/src_plugins/query/query_l.c =================================================================== --- trunk/src_plugins/query/query_l.c (revision 12596) +++ trunk/src_plugins/query/query_l.c (revision 12597) @@ -970,7 +970,7 @@ case 13: YY_RULE_SETUP #line 55 "query_l.l" -{ qry_lval.n = make_constant(qry_text, PCB_OBJ_POLYGON); return T_CONST; } +{ qry_lval.n = make_constant(qry_text, PCB_OBJ_POLY); return T_CONST; } YY_BREAK case 14: YY_RULE_SETUP Index: trunk/src_plugins/query/query_l.l =================================================================== --- trunk/src_plugins/query/query_l.l (revision 12596) +++ trunk/src_plugins/query/query_l.l (revision 12597) @@ -52,7 +52,7 @@ "POINT" { qry_lval.n = make_constant(yytext, PCB_OBJ_POINT); return T_CONST; } "LINE" { qry_lval.n = make_constant(yytext, PCB_OBJ_LINE); return T_CONST; } "TEXT" { qry_lval.n = make_constant(yytext, PCB_OBJ_TEXT); return T_CONST; } -"POLYGON" { qry_lval.n = make_constant(yytext, PCB_OBJ_POLYGON); return T_CONST; } +"POLYGON" { qry_lval.n = make_constant(yytext, PCB_OBJ_POLY); return T_CONST; } "ARC" { qry_lval.n = make_constant(yytext, PCB_OBJ_ARC); return T_CONST; } "RAT" { qry_lval.n = make_constant(yytext, PCB_OBJ_RAT); return T_CONST; } "PAD" { qry_lval.n = make_constant(yytext, PCB_OBJ_PAD); return T_CONST; } Index: trunk/src_plugins/report/report.c =================================================================== --- trunk/src_plugins/report/report.c (revision 12596) +++ trunk/src_plugins/report/report.c (revision 12597) @@ -309,7 +309,7 @@ pcb_layer_id(PCB->Data, (pcb_layer_t *) ptr1), gen_locked(Arc), gen_term(Arc)); break; } - case PCB_TYPE_POLYGON: + case PCB_TYPE_POLY: { pcb_poly_t *Polygon; #ifndef NDEBUG @@ -328,7 +328,7 @@ "It has %d holes and resides on layer %d.\n" "%s" "%s%s%s", USER_UNITMASK, Polygon->ID, - pcb_strflg_f2s(Polygon->Flags, PCB_TYPE_POLYGON, NULL), + pcb_strflg_f2s(Polygon->Flags, PCB_TYPE_POLY, NULL), Polygon->BoundingBox.X1, Polygon->BoundingBox.Y1, Polygon->BoundingBox.X2, Polygon->BoundingBox.Y2, Polygon->PointN, Polygon->PointMax - Polygon->PointN, @@ -477,7 +477,7 @@ break; } case PCB_TYPE_LINE_POINT: - case PCB_TYPE_POLYGON_POINT: + case PCB_TYPE_POLY_POINT: { pcb_point_t *point = (pcb_point_t *) ptr2; report = pcb_strdup_printf("%m+POINT ID# %ld.\n" Index: trunk/src_plugins/report/report.h =================================================================== --- trunk/src_plugins/report/report.h (revision 12596) +++ trunk/src_plugins/report/report.h (revision 12597) @@ -30,8 +30,8 @@ #include "config.h" #define REPORT_TYPES \ - (PCB_TYPE_VIA | PCB_TYPE_LINE | PCB_TYPE_TEXT | PCB_TYPE_POLYGON | PCB_TYPE_ELEMENT | \ + (PCB_TYPE_VIA | PCB_TYPE_LINE | PCB_TYPE_TEXT | PCB_TYPE_POLY | PCB_TYPE_ELEMENT | \ PCB_TYPE_RATLINE | PCB_TYPE_PIN | PCB_TYPE_PAD | PCB_TYPE_ELEMENT_NAME | PCB_TYPE_ARC \ - | PCB_TYPE_POLYGON_POINT | PCB_TYPE_LINE_POINT | PCB_TYPE_SUBC_PART | PCB_TYPE_SUBC) + | PCB_TYPE_POLY_POINT | PCB_TYPE_LINE_POINT | PCB_TYPE_SUBC_PART | PCB_TYPE_SUBC) #endif Index: trunk/src_plugins/rubberband_orig/rubberband.c =================================================================== --- trunk/src_plugins/rubberband_orig/rubberband.c (revision 12596) +++ trunk/src_plugins/rubberband_orig/rubberband.c (revision 12597) @@ -762,7 +762,7 @@ CheckPinForRubberbandConnection(rbnd, (pcb_pin_t *) Ptr1); break; - case PCB_TYPE_POLYGON: + case PCB_TYPE_POLY: if (pcb_layer_flags_((pcb_layer_t *)Ptr1) & PCB_LYT_COPPER) CheckPolygonForRubberbandConnection(rbnd, (pcb_layer_t *) Ptr1, (pcb_poly_t *) Ptr2); break;