Index: trunk/doc/developer/renames =================================================================== --- trunk/doc/developer/renames (revision 9322) +++ trunk/doc/developer/renames (revision 9323) @@ -1514,3 +1514,21 @@ ResetStackAndVisibility -> pcb_layervis_reset_stack SaveStackAndVisibility -> pcb_layervis_save_stack RestoreStackAndVisibility -> pcb_layervis_restore_stack +AddArcToBuffer -> pcb_arcop_add_to_buffer +MoveArcToBuffer -> pcb_arcop_move_to_buffer +ChangeArcSize -> pcb_arcop_change_size +ChangeArcClearSize -> pcb_arcop_change_clear_size +ChangeArcRadius -> pcb_arcop_change_radius +ChangeArcAngle -> pcb_arcop_change_angle +ChangeArcJoin -> pcb_arcop_change_join +SetArcJoin -> pcb_arcop_set_join +ClrArcJoin -> pcb_arcop_clear_join +CopyArc -> pcb_arcop_copy +MoveArc -> pcb_arcop_move +MoveArcToLayerLowLevel -> pcb_arcop_move_to_layer_low +MoveArcToLayer -> pcb_arcop_move_to_layer +DestroyArc -> pcb_arcop_destroy +RemoveArc_op -> pcb_arcop_remve +RemoveArcPoint_op -> pcb_arcop_remove_point +Rotate90Arc -> pcb_arcop_rotate90 +ChgFlagArc -> pcb_arcop_change_flag Index: trunk/src/buffer.c =================================================================== --- trunk/src/buffer.c (revision 9322) +++ trunk/src/buffer.c (revision 9323) @@ -63,7 +63,7 @@ NULL, NULL, NULL, - AddArcToBuffer, + pcb_arcop_add_to_buffer, AddRatToBuffer, NULL, AddSubcToBuffer @@ -80,7 +80,7 @@ NULL, NULL, NULL, - MoveArcToBuffer, + pcb_arcop_move_to_buffer, MoveRatToBuffer, NULL, MoveSubcToBuffer @@ -627,7 +627,7 @@ PCB_END_LOOP; PCB_ARC_LOOP(sourcelayer); { - if (CopyArc(&ctx, destlayer, arc)) + if (pcb_arcop_copy(&ctx, destlayer, arc)) changed = 1; } PCB_END_LOOP; Index: trunk/src/change.c =================================================================== --- trunk/src/change.c (revision 9322) +++ trunk/src/change.c (revision 9323) @@ -55,7 +55,7 @@ ChangePadSize, NULL, NULL, - ChangeArcSize, + pcb_arcop_change_size, NULL, NULL, ChangeSubcSize @@ -72,7 +72,7 @@ ChangePadSize, NULL, NULL, - ChangeArcSize, + pcb_arcop_change_size, NULL, NULL, ChangeSubc1stSize @@ -123,7 +123,7 @@ ChangePadClearSize, NULL, NULL, - ChangeArcClearSize, + pcb_arcop_change_clear_size, NULL, NULL, ChangeSubcClearSize @@ -208,7 +208,7 @@ NULL, NULL, NULL, - ChangeArcJoin, + pcb_arcop_change_join, NULL, NULL, NULL @@ -280,7 +280,7 @@ NULL, NULL, NULL, - SetArcJoin, + pcb_arcop_set_join, NULL, NULL, NULL @@ -331,7 +331,7 @@ NULL, NULL, NULL, - ClrArcJoin, + pcb_arcop_clear_join, NULL, NULL, NULL @@ -365,7 +365,7 @@ NULL, NULL, NULL, - ChangeArcRadius, + pcb_arcop_change_radius, NULL, NULL, NULL @@ -382,7 +382,7 @@ NULL, NULL, NULL, - ChangeArcAngle, + pcb_arcop_change_angle, NULL, NULL, NULL Index: trunk/src/copy.c =================================================================== --- trunk/src/copy.c (revision 9322) +++ trunk/src/copy.c (revision 9323) @@ -53,7 +53,7 @@ NULL, NULL, NULL, - CopyArc, + pcb_arcop_copy, NULL, NULL, CopySubc Index: trunk/src/flag.c =================================================================== --- trunk/src/flag.c (revision 9322) +++ trunk/src/flag.c (revision 9323) @@ -42,7 +42,7 @@ NULL, NULL, NULL, - ChgFlagArc, + pcb_arcop_change_flag, NULL, NULL, ChgFlagSubc Index: trunk/src/move.c =================================================================== --- trunk/src/move.c (revision 9322) +++ trunk/src/move.c (revision 9323) @@ -59,7 +59,7 @@ NULL, MoveLinePoint, MovePolygonPoint, - MoveArc, + pcb_arcop_move, NULL, NULL, MoveSubc @@ -76,7 +76,7 @@ NULL, NULL, NULL, - MoveArcToLayer, + pcb_arcop_move_to_layer, MoveRatToLayer, NULL, NULL Index: trunk/src/obj_arc.c =================================================================== --- trunk/src/obj_arc.c (revision 9322) +++ trunk/src/obj_arc.c (revision 9323) @@ -298,7 +298,7 @@ /***** operations *****/ /* copies an arc to buffer */ -void *AddArcToBuffer(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc) +void *pcb_arcop_add_to_buffer(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc) { pcb_layer_t *layer = &ctx->buffer.dst->Layer[pcb_layer_id(ctx->buffer.src, Layer)]; @@ -308,7 +308,7 @@ } /* moves an arc to buffer */ -void *MoveArcToBuffer(pcb_opctx_t *ctx, pcb_layer_t * layer, pcb_arc_t * arc) +void *pcb_arcop_move_to_buffer(pcb_opctx_t *ctx, pcb_layer_t * layer, pcb_arc_t * arc) { pcb_layer_t *lay = &ctx->buffer.dst->Layer[pcb_layer_id(ctx->buffer.src, layer)]; @@ -331,7 +331,7 @@ } /* changes the size of an arc */ -void *ChangeArcSize(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc) +void *pcb_arcop_change_size(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc) { pcb_coord_t value = (ctx->chgsize.absolute) ? ctx->chgsize.absolute : Arc->Thickness + ctx->chgsize.delta; @@ -353,7 +353,7 @@ } /* changes the clearance size of an arc */ -void *ChangeArcClearSize(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc) +void *pcb_arcop_change_clear_size(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc) { pcb_coord_t value = (ctx->chgsize.absolute) ? ctx->chgsize.absolute : Arc->Clearance + ctx->chgsize.delta; @@ -382,7 +382,7 @@ } /* changes the radius of an arc (is_primary 0=width or 1=height or 2=both) */ -void *ChangeArcRadius(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc) +void *pcb_arcop_change_radius(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc) { pcb_coord_t value, *dst; void *a0, *a1; @@ -394,8 +394,8 @@ case 0: dst = &Arc->Width; break; case 1: dst = &Arc->Height; break; case 2: - ctx->chgsize.is_primary = 0; a0 = ChangeArcRadius(ctx, Layer, Arc); - ctx->chgsize.is_primary = 1; a1 = ChangeArcRadius(ctx, Layer, Arc); + ctx->chgsize.is_primary = 0; a0 = pcb_arcop_change_radius(ctx, Layer, Arc); + ctx->chgsize.is_primary = 1; a1 = pcb_arcop_change_radius(ctx, Layer, Arc); if ((a0 != NULL) || (a1 != NULL)) return Arc; return NULL; @@ -419,7 +419,7 @@ } /* changes the angle of an arc (is_primary 0=start or 1=end) */ -void *ChangeArcAngle(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc) +void *pcb_arcop_change_angle(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc) { pcb_angle_t value, *dst; void *a0, *a1; @@ -431,8 +431,8 @@ case 0: dst = &Arc->StartAngle; break; case 1: dst = &Arc->Delta; break; case 2: - ctx->chgangle.is_primary = 0; a0 = ChangeArcAngle(ctx, Layer, Arc); - ctx->chgangle.is_primary = 1; a1 = ChangeArcAngle(ctx, Layer, Arc); + ctx->chgangle.is_primary = 0; a0 = pcb_arcop_change_angle(ctx, Layer, Arc); + ctx->chgangle.is_primary = 1; a1 = pcb_arcop_change_angle(ctx, Layer, Arc); if ((a0 != NULL) || (a1 != NULL)) return Arc; return NULL; @@ -459,7 +459,7 @@ } /* changes the clearance flag of an arc */ -void *ChangeArcJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc) +void *pcb_arcop_change_join(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc) { if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Arc)) return (NULL); @@ -479,23 +479,23 @@ } /* sets the clearance flag of an arc */ -void *SetArcJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc) +void *pcb_arcop_set_join(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc) { if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Arc) || PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, Arc)) return (NULL); - return ChangeArcJoin(ctx, Layer, Arc); + return pcb_arcop_change_join(ctx, Layer, Arc); } /* clears the clearance flag of an arc */ -void *ClrArcJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc) +void *pcb_arcop_clear_join(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc) { if (PCB_FLAG_TEST(PCB_FLAG_LOCK, Arc) || !PCB_FLAG_TEST(PCB_FLAG_CLEARLINE, Arc)) return (NULL); - return ChangeArcJoin(ctx, Layer, Arc); + return pcb_arcop_change_join(ctx, Layer, Arc); } /* copies an arc */ -void *CopyArc(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc) +void *pcb_arcop_copy(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc) { pcb_arc_t *arc; @@ -510,7 +510,7 @@ } /* moves an arc */ -void *MoveArc(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc) +void *pcb_arcop_move(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc) { pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_ARC, Layer, Arc); pcb_r_delete_entry(Layer->arc_tree, (pcb_box_t *) Arc); @@ -529,7 +529,7 @@ } /* moves an arc between layers; lowlevel routines */ -void *MoveArcToLayerLowLevel(pcb_opctx_t *ctx, pcb_layer_t * Source, pcb_arc_t * arc, pcb_layer_t * Destination) +void *pcb_arcop_move_to_layer_low(pcb_opctx_t *ctx, pcb_layer_t * Source, pcb_arc_t * arc, pcb_layer_t * Destination) { pcb_r_delete_entry(Source->arc_tree, (pcb_box_t *) arc); @@ -547,7 +547,7 @@ /* moves an arc between layers */ -void *MoveArcToLayer(pcb_opctx_t *ctx, pcb_layer_t * Layer, pcb_arc_t * Arc) +void *pcb_arcop_move_to_layer(pcb_opctx_t *ctx, pcb_layer_t * Layer, pcb_arc_t * Arc) { pcb_arc_t *newone; @@ -565,7 +565,7 @@ pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_ARC, Layer, Arc); if (Layer->meta.real.vis) EraseArc(Arc); - newone = (pcb_arc_t *) MoveArcToLayerLowLevel(ctx, Layer, Arc, ctx->move.dst_layer); + newone = (pcb_arc_t *) pcb_arcop_move_to_layer_low(ctx, Layer, Arc, ctx->move.dst_layer); pcb_poly_clear_from_poly(PCB->Data, PCB_TYPE_ARC, ctx->move.dst_layer, Arc); if (ctx->move.dst_layer->meta.real.vis) DrawArc(ctx->move.dst_layer, newone); @@ -574,7 +574,7 @@ } /* destroys an arc from a layer */ -void *DestroyArc(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc) +void *pcb_arcop_destroy(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc) { pcb_r_delete_entry(Layer->arc_tree, (pcb_box_t *) Arc); @@ -585,7 +585,7 @@ } /* removes an arc from a layer */ -void *RemoveArc_op(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc) +void *pcb_arcop_remve(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc) { /* erase from screen */ if (Layer->meta.real.vis) { @@ -598,9 +598,9 @@ return NULL; } -void *RemoveArcPoint_op(pcb_opctx_t *ctx, pcb_layer_t *l, pcb_arc_t *a, int *end_id) +void *pcb_arcop_remove_point(pcb_opctx_t *ctx, pcb_layer_t *l, pcb_arc_t *a, int *end_id) { - return RemoveArc_op(ctx, l, a); + return pcb_arcop_remve(ctx, l, a); } void *pcb_arc_destroy(pcb_layer_t *Layer, pcb_arc_t *Arc) @@ -611,7 +611,7 @@ ctx.remove.bulk = pcb_false; ctx.remove.destroy_target = NULL; - return RemoveArc_op(&ctx, Layer, Arc); + return pcb_arcop_remve(&ctx, Layer, Arc); } /* rotates an arc */ @@ -663,7 +663,7 @@ } /* rotates an arc */ -void *Rotate90Arc(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc) +void *pcb_arcop_rotate90(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc) { EraseArc(Arc); pcb_poly_restore_to_poly(PCB->Data, PCB_TYPE_ARC, Layer, Arc); @@ -704,7 +704,7 @@ } #define PCB_ARC_FLAGS (PCB_FLAG_FOUND | PCB_FLAG_CLEARLINE | PCB_FLAG_SELECTED | PCB_FLAG_AUTO | PCB_FLAG_RUBBEREND | PCB_FLAG_LOCK | PCB_FLAG_VISIT) -void *ChgFlagArc(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc) +void *pcb_arcop_change_flag(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc) { if ((ctx->chgflag.flag & PCB_ARC_FLAGS) != ctx->chgflag.flag) return NULL; Index: trunk/src/obj_arc_op.h =================================================================== --- trunk/src/obj_arc_op.h (revision 9322) +++ trunk/src/obj_arc_op.h (revision 9323) @@ -28,24 +28,24 @@ #include "operation.h" -void *AddArcToBuffer(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc); -void *MoveArcToBuffer(pcb_opctx_t *ctx, pcb_layer_t *layer, pcb_arc_t *arc); -void *ChangeArcSize(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc); -void *ChangeArcClearSize(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc); -void *ChangeArcRadius(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc); -void *ChangeArcAngle(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc); -void *ChangeArcJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc); -void *SetArcJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc); -void *ClrArcJoin(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc); -void *CopyArc(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc); -void *MoveArc(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc); -void *MoveArcToLayerLowLevel(pcb_opctx_t *ctx, pcb_layer_t * Source, pcb_arc_t * arc, pcb_layer_t * Destination); -void *MoveArcToLayer(pcb_opctx_t *ctx, pcb_layer_t * Layer, pcb_arc_t * Arc); -void *DestroyArc(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc); -void *RemoveArc_op(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc); -void *RemoveArcPoint_op(pcb_opctx_t *ctx, pcb_layer_t *l, pcb_arc_t *a, int *end_id); -void *Rotate90Arc(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc); -void *ChgFlagArc(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc); +void *pcb_arcop_add_to_buffer(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc); +void *pcb_arcop_move_to_buffer(pcb_opctx_t *ctx, pcb_layer_t *layer, pcb_arc_t *arc); +void *pcb_arcop_change_size(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc); +void *pcb_arcop_change_clear_size(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc); +void *pcb_arcop_change_radius(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc); +void *pcb_arcop_change_angle(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc); +void *pcb_arcop_change_join(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc); +void *pcb_arcop_set_join(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc); +void *pcb_arcop_clear_join(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc); +void *pcb_arcop_copy(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc); +void *pcb_arcop_move(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc); +void *pcb_arcop_move_to_layer_low(pcb_opctx_t *ctx, pcb_layer_t * Source, pcb_arc_t * arc, pcb_layer_t * Destination); +void *pcb_arcop_move_to_layer(pcb_opctx_t *ctx, pcb_layer_t * Layer, pcb_arc_t * Arc); +void *pcb_arcop_destroy(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc); +void *pcb_arcop_remve(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc); +void *pcb_arcop_remove_point(pcb_opctx_t *ctx, pcb_layer_t *l, pcb_arc_t *a, int *end_id); +void *pcb_arcop_rotate90(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc); +void *pcb_arcop_change_flag(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *Arc); void *pcb_arc_insert_point(pcb_opctx_t *ctx, pcb_layer_t *Layer, pcb_arc_t *arc); Index: trunk/src/remove.c =================================================================== --- trunk/src/remove.c (revision 9322) +++ trunk/src/remove.c (revision 9323) @@ -50,9 +50,9 @@ NULL, RemoveLinePoint, RemovePolygonPoint, - RemoveArc_op, + pcb_arcop_remve, RemoveRat, - RemoveArcPoint_op, + pcb_arcop_remove_point, RemoveSubc_op }; @@ -67,7 +67,7 @@ NULL, NULL, DestroyPolygonPoint, - DestroyArc, + pcb_arcop_destroy, DestroyRat, NULL, DestroySubc Index: trunk/src/rotate.c =================================================================== --- trunk/src/rotate.c (revision 9322) +++ trunk/src/rotate.c (revision 9323) @@ -63,7 +63,7 @@ NULL, Rotate90LinePoint, NULL, - Rotate90Arc, + pcb_arcop_rotate90, NULL, NULL, Rotate90Subc