Index: trunk/doc/developer/renames =================================================================== --- trunk/doc/developer/renames (revision 9327) +++ trunk/doc/developer/renames (revision 9328) @@ -1630,3 +1630,20 @@ MoveVia -> pcb_viaop_move DestroyVia -> pcb_viaop_destroy RemoveVia -> pcb_viaop_remove +AddPolygonToBuffer -> pcb_polyop_add_to_buffer +MovePolygonToBuffer -> pcb_polyop_move_to_buffer +ChangePolygonClearSize -> pcb_polyop_change_clear_size +ChangePolyClear -> pcb_polyop_change_clear +InsertPointIntoPolygon -> pcb_polyop_insert_point +MovePolygon -> pcb_polyop_move +MovePolygonPoint -> pcb_polyop_move_point +MovePolygonToLayerLowLevel -> pcb_polyop_move_to_layer_low +MovePolygonToLayer -> pcb_polyop_move_to_layer +DestroyPolygon -> pcb_polyop_destroy +DestroyPolygonPoint -> pcb_polyop_destroy_point +RemovePolygon_op -> pcb_polyop_remove +RemovePolygonContour -> pcb_polyop_remove_counter +RemovePolygonPoint -> pcb_polyop_remove_point +CopyPolygon -> pcb_polyop_copy +Rotate90Polygon -> pcb_polyop_rotate90 +ChgFlagPolygon -> pcb_polyop_change_flag Index: trunk/src/buffer.c =================================================================== --- trunk/src/buffer.c (revision 9327) +++ trunk/src/buffer.c (revision 9328) @@ -55,7 +55,7 @@ static pcb_opfunc_t AddBufferFunctions = { pcb_lineop_add_to_buffer, AddTextToBuffer, - AddPolygonToBuffer, + pcb_polyop_add_to_buffer, pcb_viaop_add_to_buffer, pcb_elemop_add_to_buffer, NULL, @@ -72,7 +72,7 @@ static pcb_opfunc_t MoveBufferFunctions = { pcb_lineop_move_to_buffer, MoveTextToBuffer, - MovePolygonToBuffer, + pcb_polyop_move_to_buffer, pcb_viaop_move_to_buffer, pcb_elemop_move_to_buffer, NULL, @@ -639,7 +639,7 @@ PCB_END_LOOP; PCB_POLY_LOOP(sourcelayer); { - if (CopyPolygon(&ctx, destlayer, polygon)) + if (pcb_polyop_copy(&ctx, destlayer, polygon)) changed = 1; } PCB_END_LOOP; Index: trunk/src/change.c =================================================================== --- trunk/src/change.c (revision 9327) +++ trunk/src/change.c (revision 9328) @@ -47,7 +47,7 @@ static pcb_opfunc_t ChangeSizeFunctions = { pcb_lineop_change_size, ChangeTextSize, - ChangePolyClear, + pcb_polyop_change_clear, pcb_viaop_change_size, pcb_elemop_change_size, /* changes silk screen line width */ pcb_elemop_change_name_size, @@ -64,7 +64,7 @@ static pcb_opfunc_t Change1stSizeFunctions = { pcb_lineop_change_size, ChangeTextSize, - ChangePolyClear, + pcb_polyop_change_clear, pcb_viaop_change_size, pcb_elemop_change_1st_size, pcb_elemop_change_name_size, @@ -115,7 +115,7 @@ static pcb_opfunc_t ChangeClearSizeFunctions = { pcb_lineop_change_clear_size, NULL, - ChangePolygonClearSize, /* just to tell the user not to :-) */ + pcb_polyop_change_clear_size, /* just to tell the user not to :-) */ pcb_viaop_change_clear_size, pcb_elemop_change_clear_size, NULL, Index: trunk/src/copy.c =================================================================== --- trunk/src/copy.c (revision 9327) +++ trunk/src/copy.c (revision 9328) @@ -45,7 +45,7 @@ static pcb_opfunc_t CopyFunctions = { pcb_lineop_copy, CopyText, - CopyPolygon, + pcb_polyop_copy, pcb_viaop_copy, pcb_elemop_copy, NULL, Index: trunk/src/flag.c =================================================================== --- trunk/src/flag.c (revision 9327) +++ trunk/src/flag.c (revision 9328) @@ -34,7 +34,7 @@ pcb_opfunc_t ChgFlagFunctions = { pcb_lineop_change_flag, ChgFlagText, - ChgFlagPolygon, + pcb_polyop_change_flag, NULL, NULL, NULL, Index: trunk/src/insert.c =================================================================== --- trunk/src/insert.c (revision 9327) +++ trunk/src/insert.c (revision 9328) @@ -47,7 +47,7 @@ static pcb_opfunc_t InsertFunctions = { pcb_lineop_insert_point, NULL, - InsertPointIntoPolygon, + pcb_polyop_insert_point, NULL, NULL, NULL, Index: trunk/src/move.c =================================================================== --- trunk/src/move.c (revision 9327) +++ trunk/src/move.c (revision 9328) @@ -51,7 +51,7 @@ pcb_opfunc_t MoveFunctions = { pcb_lineop_move, MoveText, - MovePolygon, + pcb_polyop_move, pcb_viaop_move, pcb_elemop_move, pcb_elemop_move_name, @@ -58,7 +58,7 @@ NULL, NULL, pcb_lineop_move_point, - MovePolygonPoint, + pcb_polyop_move_point, pcb_arcop_move, NULL, NULL, @@ -68,7 +68,7 @@ static pcb_opfunc_t MoveToLayerFunctions = { pcb_lineop_move_to_layer, MoveTextToLayer, - MovePolygonToLayer, + pcb_polyop_move_to_layer, NULL, NULL, NULL, Index: trunk/src/obj_poly.c =================================================================== --- trunk/src/obj_poly.c (revision 9327) +++ trunk/src/obj_poly.c (revision 9328) @@ -318,7 +318,7 @@ /*** ops ***/ /* copies a polygon to buffer */ -void *AddPolygonToBuffer(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon) +void *pcb_polyop_add_to_buffer(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon) { pcb_layer_t *layer = &ctx->buffer.dst->Layer[pcb_layer_id(ctx->buffer.src, Layer)]; pcb_polygon_t *polygon; @@ -340,7 +340,7 @@ /* moves a polygon to buffer. Doesn't allocate memory for the points */ -void *MovePolygonToBuffer(pcb_opctx_t *ctx, pcb_layer_t * layer, pcb_polygon_t * polygon) +void *pcb_polyop_move_to_buffer(pcb_opctx_t *ctx, pcb_layer_t * layer, pcb_polygon_t * polygon) { pcb_layer_t *lay = &ctx->buffer.dst->Layer[pcb_layer_id(ctx->buffer.src, layer)]; @@ -361,7 +361,7 @@ } /* Handle attempts to change the clearance of a polygon. */ -void *ChangePolygonClearSize(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *poly) +void *pcb_polyop_change_clear_size(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *poly) { static int shown_this_message = 0; if (!shown_this_message) { @@ -376,7 +376,7 @@ } /* changes the CLEARPOLY flag of a polygon */ -void *ChangePolyClear(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon) +void *pcb_polyop_change_clear(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon) { if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Polygon)) return (NULL); @@ -389,7 +389,7 @@ } /* inserts a point into a polygon */ -void *InsertPointIntoPolygon(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon) +void *pcb_polyop_insert_point(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon) { pcb_point_t save; pcb_cardinal_t n; @@ -445,7 +445,7 @@ } /* moves a polygon */ -void *MovePolygon(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon) +void *pcb_polyop_move(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon) { if (Layer->meta.real.vis) { ErasePolygon(Polygon); @@ -462,7 +462,7 @@ } /* moves a polygon-point */ -void *MovePolygonPoint(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon, pcb_point_t *Point) +void *pcb_polyop_move_point(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon, pcb_point_t *Point) { if (Layer->meta.real.vis) { ErasePolygon(Polygon); @@ -481,7 +481,7 @@ } /* moves a polygon between layers; lowlevel routines */ -void *MovePolygonToLayerLowLevel(pcb_opctx_t *ctx, pcb_layer_t * Source, pcb_polygon_t * polygon, pcb_layer_t * Destination) +void *pcb_polyop_move_to_layer_low(pcb_opctx_t *ctx, pcb_layer_t * Source, pcb_polygon_t * polygon, pcb_layer_t * Destination) { pcb_r_delete_entry(Source->polygon_tree, (pcb_box_t *) polygon); @@ -519,7 +519,7 @@ } /* moves a polygon between layers */ -void *MovePolygonToLayer(pcb_opctx_t *ctx, pcb_layer_t * Layer, pcb_polygon_t * Polygon) +void *pcb_polyop_move_to_layer(pcb_opctx_t *ctx, pcb_layer_t * Layer, pcb_polygon_t * Polygon) { pcb_polygon_t *newone; struct mptlc d; @@ -541,7 +541,7 @@ pcb_r_search(PCB->Data->pin_tree, &Polygon->BoundingBox, NULL, mptl_pin_callback, &d, NULL); d.type = PCB_TYPE_VIA; pcb_r_search(PCB->Data->via_tree, &Polygon->BoundingBox, NULL, mptl_pin_callback, &d, NULL); - newone = (struct pcb_polygon_s *) MovePolygonToLayerLowLevel(ctx, Layer, Polygon, ctx->move.dst_layer); + newone = (struct pcb_polygon_s *) pcb_polyop_move_to_layer_low(ctx, Layer, Polygon, ctx->move.dst_layer); pcb_poly_init_clip(PCB->Data, ctx->move.dst_layer, newone); if (ctx->move.dst_layer->meta.real.vis) { DrawPolygon(ctx->move.dst_layer, newone); @@ -552,7 +552,7 @@ /* destroys a polygon from a layer */ -void *DestroyPolygon(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon) +void *pcb_polyop_destroy(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon) { pcb_r_delete_entry(Layer->polygon_tree, (pcb_box_t *) Polygon); pcb_poly_free_fields(Polygon); @@ -563,7 +563,7 @@ } /* removes a polygon-point from a polygon and destroys the data */ -void *DestroyPolygonPoint(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon, pcb_point_t *Point) +void *pcb_polyop_destroy_point(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon, pcb_point_t *Point) { pcb_cardinal_t point_idx; pcb_cardinal_t i; @@ -577,7 +577,7 @@ contour_points = contour_end - contour_start; if (contour_points <= 3) - return RemovePolygonContour(ctx, Layer, Polygon, contour); + return pcb_polyop_remove_counter(ctx, Layer, Polygon, contour); pcb_r_delete_entry(Layer->polygon_tree, (pcb_box_t *) Polygon); @@ -598,7 +598,7 @@ } /* removes a polygon from a layer */ -void *RemovePolygon_op(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon) +void *pcb_polyop_remove(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon) { /* erase from screen */ if (Layer->meta.real.vis) { @@ -619,12 +619,12 @@ ctx.remove.bulk = pcb_false; ctx.remove.destroy_target = NULL; - return RemovePolygon_op(&ctx, Layer, Polygon); + return pcb_polyop_remove(&ctx, Layer, Polygon); } /* Removes a contour from a polygon. If removing the outer contour, it removes the whole polygon. */ -void *RemovePolygonContour(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon, pcb_cardinal_t contour) +void *pcb_polyop_remove_counter(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon, pcb_cardinal_t contour) { pcb_cardinal_t contour_start, contour_end, contour_points; pcb_cardinal_t i; @@ -666,7 +666,7 @@ } /* removes a polygon-point from a polygon */ -void *RemovePolygonPoint(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon, pcb_point_t *Point) +void *pcb_polyop_remove_point(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon, pcb_point_t *Point) { pcb_cardinal_t point_idx; pcb_cardinal_t i; @@ -680,7 +680,7 @@ contour_points = contour_end - contour_start; if (contour_points <= 3) - return RemovePolygonContour(ctx, Layer, Polygon, contour); + return pcb_polyop_remove_counter(ctx, Layer, Polygon, contour); if (Layer->meta.real.vis) ErasePolygon(Polygon); @@ -714,7 +714,7 @@ } /* copies a polygon */ -void *CopyPolygon(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon) +void *pcb_polyop_copy(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon) { pcb_polygon_t *polygon; @@ -729,7 +729,7 @@ return (polygon); } -void *Rotate90Polygon(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon) +void *pcb_polyop_rotate90(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon) { if (Layer->meta.real.vis) ErasePolygon(Polygon); @@ -745,7 +745,7 @@ } #define PCB_POLY_FLAGS (PCB_FLAG_FOUND | PCB_FLAG_CLEARPOLY | PCB_FLAG_FULLPOLY | PCB_FLAG_SELECTED | PCB_FLAG_AUTO | PCB_FLAG_LOCK | PCB_FLAG_VISIT) -void *ChgFlagPolygon(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon) +void *pcb_polyop_change_flag(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon) { if ((ctx->chgflag.flag & PCB_POLY_FLAGS) != ctx->chgflag.flag) return NULL; Index: trunk/src/obj_poly_op.h =================================================================== --- trunk/src/obj_poly_op.h (revision 9327) +++ trunk/src/obj_poly_op.h (revision 9328) @@ -28,22 +28,22 @@ #include "operation.h" -void *AddPolygonToBuffer(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon); -void *MovePolygonToBuffer(pcb_opctx_t *ctx, pcb_layer_t * layer, pcb_polygon_t * polygon); -void *ChangePolygonClearSize(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *poly); -void *ChangePolyClear(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon); -void *InsertPointIntoPolygon(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon); -void *MovePolygon(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon); -void *MovePolygonPoint(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon, pcb_point_t *Point); -void *MovePolygonToLayerLowLevel(pcb_opctx_t *ctx, pcb_layer_t * Source, pcb_polygon_t * polygon, pcb_layer_t * Destination); -void *MovePolygonToLayer(pcb_opctx_t *ctx, pcb_layer_t * Layer, pcb_polygon_t * Polygon); -void *DestroyPolygon(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon); -void *DestroyPolygonPoint(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon, pcb_point_t *Point); -void *RemovePolygon_op(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon); -void *RemovePolygonContour(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon, pcb_cardinal_t contour); -void *RemovePolygonPoint(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon, pcb_point_t *Point); -void *CopyPolygon(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon); -void *Rotate90Polygon(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon); -void *ChgFlagPolygon(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon); +void *pcb_polyop_add_to_buffer(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon); +void *pcb_polyop_move_to_buffer(pcb_opctx_t *ctx, pcb_layer_t * layer, pcb_polygon_t * polygon); +void *pcb_polyop_change_clear_size(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *poly); +void *pcb_polyop_change_clear(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon); +void *pcb_polyop_insert_point(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon); +void *pcb_polyop_move(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon); +void *pcb_polyop_move_point(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon, pcb_point_t *Point); +void *pcb_polyop_move_to_layer_low(pcb_opctx_t *ctx, pcb_layer_t * Source, pcb_polygon_t * polygon, pcb_layer_t * Destination); +void *pcb_polyop_move_to_layer(pcb_opctx_t *ctx, pcb_layer_t * Layer, pcb_polygon_t * Polygon); +void *pcb_polyop_destroy(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon); +void *pcb_polyop_destroy_point(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon, pcb_point_t *Point); +void *pcb_polyop_remove(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon); +void *pcb_polyop_remove_counter(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon, pcb_cardinal_t contour); +void *pcb_polyop_remove_point(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon, pcb_point_t *Point); +void *pcb_polyop_copy(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon); +void *pcb_polyop_rotate90(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon); +void *pcb_polyop_change_flag(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_polygon_t *Polygon); Index: trunk/src/remove.c =================================================================== --- trunk/src/remove.c (revision 9327) +++ trunk/src/remove.c (revision 9328) @@ -42,7 +42,7 @@ static pcb_opfunc_t RemoveFunctions = { pcb_lineop_remove, RemoveText_op, - RemovePolygon_op, + pcb_polyop_remove, pcb_viaop_remove, pcb_elemop_remove, NULL, @@ -49,7 +49,7 @@ NULL, NULL, pcb_lineop_remove_point, - RemovePolygonPoint, + pcb_polyop_remove_point, pcb_arcop_remve, RemoveRat, pcb_arcop_remove_point, @@ -59,7 +59,7 @@ static pcb_opfunc_t DestroyFunctions = { pcb_lineop_destroy, DestroyText, - DestroyPolygon, + pcb_polyop_destroy, pcb_viaop_destroy, pcb_elemop_destroy, NULL, @@ -66,7 +66,7 @@ NULL, NULL, NULL, - DestroyPolygonPoint, + pcb_polyop_destroy_point, pcb_arcop_destroy, DestroyRat, NULL, Index: trunk/src/rotate.c =================================================================== --- trunk/src/rotate.c (revision 9327) +++ trunk/src/rotate.c (revision 9328) @@ -55,7 +55,7 @@ pcb_opfunc_t Rotate90Functions = { pcb_lineop_rotate90, Rotate90Text, - Rotate90Polygon, + pcb_polyop_rotate90, NULL, pcb_elemop_rotate90, pcb_elemop_rotate90_name,