Index: trunk/doc-rnd/hacking/renames =================================================================== --- trunk/doc-rnd/hacking/renames (revision 4946) +++ trunk/doc-rnd/hacking/renames (revision 4947) @@ -547,3 +547,6 @@ Freepcb_element_rotate90 -> pcb_element_rotate Freepcb_element_rotate90 -> pcb_element_rotate Freepcb_buffer_rotate -> pcb_buffer_free_rotate +GetArcEnds -> pcb_arc_get_ends +ChangeArcAngles -> pcb_arc_set_angles +ChangeArcRadii -> pcb_arc_set_radii Index: trunk/src/action_helper.c =================================================================== --- trunk/src/action_helper.c (revision 4946) +++ trunk/src/action_helper.c (revision 4947) @@ -96,7 +96,7 @@ { pcb_box_t *box; - box = GetArcEnds((pcb_arc_t *) ptr2); + box = pcb_arc_get_ends((pcb_arc_t *) ptr2); *x = box->X1; *y = box->Y1; break; @@ -663,7 +663,7 @@ pcb_flag_make(conf_core.editor.clear_line ? PCB_FLAG_CLEARLINE : 0)))) { pcb_box_t *bx; - bx = GetArcEnds(arc); + bx = pcb_arc_get_ends(arc); Crosshair.AttachedBox.Point1.X = Crosshair.AttachedBox.Point2.X = bx->X2; Crosshair.AttachedBox.Point1.Y = Crosshair.AttachedBox.Point2.Y = bx->Y2; AddObjectToCreateUndoList(PCB_TYPE_ARC, CURRENT, arc, arc); Index: trunk/src/crosshair.c =================================================================== --- trunk/src/crosshair.c (revision 4946) +++ trunk/src/crosshair.c (revision 4947) @@ -169,7 +169,7 @@ arc.StartAngle = sa; arc.Delta = dir; arc.Width = arc.Height = wy; - bx = GetArcEnds(&arc); + bx = pcb_arc_get_ends(&arc); /* sa = sa - 180; */ gui->draw_arc(Crosshair.GC, arc.X, arc.Y, wy + wid, wy + wid, sa, dir); if (wid > pixel_slop) { Index: trunk/src/find_geo.c =================================================================== --- trunk/src/find_geo.c (revision 4946) +++ trunk/src/find_geo.c (revision 4947) @@ -455,7 +455,7 @@ && IsPointOnArc(Line->Point1.X + r * dx, Line->Point1.Y + r * dy, MAX(0.5 * Line->Thickness + Bloat, 0.0), Arc)) return (pcb_true); /* check arc end points */ - box = GetArcEnds(Arc); + box = pcb_arc_get_ends(Arc); if (IsPointInPad(box->X1, box->Y1, Arc->Thickness * 0.5 + Bloat, (pcb_pad_t *) Line)) return pcb_true; if (IsPointInPad(box->X2, box->Y2, Arc->Thickness * 0.5 + Bloat, (pcb_pad_t *) Line)) Index: trunk/src/obj_arc.c =================================================================== --- trunk/src/obj_arc.c (revision 4946) +++ trunk/src/obj_arc.c (revision 4947) @@ -130,7 +130,7 @@ pcb_close_box(&Arc->BoundingBox); } -pcb_box_t *GetArcEnds(pcb_arc_t *Arc) +pcb_box_t *pcb_arc_get_ends(pcb_arc_t *Arc) { static pcb_box_t box; box.X1 = Arc->X - Arc->Width * cos(Arc->StartAngle * PCB_M180); @@ -141,7 +141,7 @@ } /* doesn't these belong in change.c ?? */ -void ChangeArcAngles(pcb_layer_t *Layer, pcb_arc_t *a, pcb_angle_t new_sa, pcb_angle_t new_da) +void pcb_arc_set_angles(pcb_layer_t *Layer, pcb_arc_t *a, pcb_angle_t new_sa, pcb_angle_t new_da) { if (new_da >= 360) { new_da = 360; @@ -158,7 +158,7 @@ } -void ChangeArcRadii(pcb_layer_t *Layer, pcb_arc_t *a, pcb_coord_t new_width, pcb_coord_t new_height) +void pcb_arc_set_radii(pcb_layer_t *Layer, pcb_arc_t *a, pcb_coord_t new_width, pcb_coord_t new_height) { RestoreToPolygon(PCB->Data, PCB_TYPE_ARC, Layer, a); r_delete_entry(Layer->arc_tree, (pcb_box_t *) a); Index: trunk/src/obj_arc.h =================================================================== --- trunk/src/obj_arc.h (revision 4946) +++ trunk/src/obj_arc.h (revision 4947) @@ -57,9 +57,9 @@ void pcb_arc_bbox(pcb_arc_t *Arc); void pcb_arc_rotate90(pcb_arc_t *Arc, pcb_coord_t X, pcb_coord_t Y, unsigned Number); -pcb_box_t *GetArcEnds(pcb_arc_t *Arc); -void ChangeArcAngles(pcb_layer_t *Layer, pcb_arc_t *a, pcb_angle_t new_sa, pcb_angle_t new_da); -void ChangeArcRadii(pcb_layer_t *Layer, pcb_arc_t *a, pcb_coord_t new_width, pcb_coord_t new_height); +pcb_box_t *pcb_arc_get_ends(pcb_arc_t *Arc); +void pcb_arc_set_angles(pcb_layer_t *Layer, pcb_arc_t *a, pcb_angle_t new_sa, pcb_angle_t new_da); +void pcb_arc_set_radii(pcb_layer_t *Layer, pcb_arc_t *a, pcb_coord_t new_width, pcb_coord_t new_height); #define MOVE_ARC_LOWLEVEL(a,dx,dy) \ { \ Index: trunk/src/polygon.c =================================================================== --- trunk/src/polygon.c (revision 4946) +++ trunk/src/polygon.c (revision 4947) @@ -488,7 +488,7 @@ a->Delta = -a->Delta; } half = (thick + 1) / 2; - ends = GetArcEnds(a); + ends = pcb_arc_get_ends(a); /* start with inner radius */ rx = MAX(a->Width - half, 0); ry = MAX(a->Height - half, 0); Index: trunk/src/undo_act.c =================================================================== --- trunk/src/undo_act.c (revision 4946) +++ trunk/src/undo_act.c (revision 4947) @@ -219,7 +219,7 @@ /* guaranteed to succeed */ SearchObjectByLocation(PCB_TYPE_ARC, &ptr1, &ptr2, &ptr3, Crosshair.AttachedBox.Point1.X, Crosshair.AttachedBox.Point1.Y, 0); - bx = GetArcEnds((pcb_arc_t *) ptr2); + bx = pcb_arc_get_ends((pcb_arc_t *) ptr2); Crosshair.AttachedBox.Point1.X = Crosshair.AttachedBox.Point2.X = bx->X1; Crosshair.AttachedBox.Point1.Y = Crosshair.AttachedBox.Point2.Y = bx->Y1; pcb_adjust_attached_objects(); 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 4946) +++ trunk/src_plugins/gpmi/pcb-gpmi/gpmi_plugin/gpmi_pkg/layout/object.c (revision 4947) @@ -141,6 +141,6 @@ start += obj->obj.a->StartAngle; delta += obj->obj.a->Delta; } - ChangeArcAngles (CURRENT, obj->obj.a, start, delta); + pcb_arc_set_angles(CURRENT, obj->obj.a, start, delta); return 0; } Index: trunk/src_plugins/io_kicad/write.c =================================================================== --- trunk/src_plugins/io_kicad/write.c (revision 4946) +++ trunk/src_plugins/io_kicad/write.c (revision 4947) @@ -638,7 +638,7 @@ radius = arc->Width; localArc.Height = radius; } - boxResult = GetArcEnds(&localArc); + boxResult = pcb_arc_get_ends(&localArc); if (arc->Delta == 360.0 || arc->Delta == -360.0 ) { /* it's a circle */ kicadArcShape = 3; } else { /* it's an arc */ @@ -873,7 +873,7 @@ } arclist_foreach(&element->Arc, &it, arc) { - boxResult = GetArcEnds(arc); + boxResult = pcb_arc_get_ends(arc); arcStartX = boxResult->X1; arcStartY = boxResult->Y1; arcEndX = boxResult->X2; @@ -1131,7 +1131,7 @@ arclist_foreach(&element->Arc, &it, arc) { - pcb_box_t *boxResult = GetArcEnds(arc); + pcb_box_t *boxResult = pcb_arc_get_ends(arc); arcStartX = boxResult->X1; arcStartY = boxResult->Y1; arcEndX = boxResult->X2; Index: trunk/src_plugins/io_kicad_legacy/write.c =================================================================== --- trunk/src_plugins/io_kicad_legacy/write.c (revision 4946) +++ trunk/src_plugins/io_kicad_legacy/write.c (revision 4947) @@ -599,7 +599,7 @@ radius = arc->Width; localArc.Height = radius; } - boxResult = GetArcEnds(&localArc); + boxResult = pcb_arc_get_ends(&localArc); if (arc->Delta == 360.0 || arc->Delta == -360.0 ) { /* it's a circle */ kicadArcShape = 3; } else { /* it's an arc */ @@ -833,7 +833,7 @@ } arclist_foreach(&element->Arc, &it, arc) { - boxResult = GetArcEnds(arc); + boxResult = pcb_arc_get_ends(arc); arcStartX = boxResult->X1; arcStartY = boxResult->Y1; arcEndX = boxResult->X2; @@ -1144,7 +1144,7 @@ arclist_foreach(&element->Arc, &it, arc) { - pcb_box_t *boxResult = GetArcEnds(arc); + pcb_box_t *boxResult = pcb_arc_get_ends(arc); arcStartX = boxResult->X1; arcStartY = boxResult->Y1; arcEndX = boxResult->X2; Index: trunk/src_plugins/puller/puller.c =================================================================== --- trunk/src_plugins/puller/puller.c (revision 4946) +++ trunk/src_plugins/puller/puller.c (revision 4947) @@ -415,7 +415,7 @@ cx = the_arc->X; cy = the_arc->Y; if (arc_endpoint_is(the_arc, the_arc->StartAngle, x, y)) { - ChangeArcAngles(CURRENT, the_arc, the_arc->StartAngle + the_arc->Delta, -the_arc->Delta); + pcb_arc_set_angles(CURRENT, the_arc, the_arc->StartAngle + the_arc->Delta, -the_arc->Delta); } else if (!arc_endpoint_is(the_arc, the_arc->StartAngle + the_arc->Delta, x, y)) { #if TRACE1 @@ -461,7 +461,7 @@ new_delta_angle -= 360; if (new_delta_angle < -180) new_delta_angle += 360; - ChangeArcAngles(CURRENT, the_arc, the_arc->StartAngle, new_delta_angle); + pcb_arc_set_angles(CURRENT, the_arc, the_arc->StartAngle, new_delta_angle); #if TRACE1 printf("arc now start %ld end %ld\n", the_arc->StartAngle, the_arc->StartAngle + new_delta_angle); @@ -1210,7 +1210,7 @@ End etmp; #if 1 - ChangeArcAngles(CURRENT, arc, arc->StartAngle + arc->Delta, -arc->Delta); + pcb_arc_set_angles(CURRENT, arc, arc->StartAngle + arc->Delta, -arc->Delta); #else /* Likewise, see above. */ arc->StartAngle += arc->Delta; @@ -1982,7 +1982,7 @@ mark_arc_for_deletion(end_arc); mark_line_for_deletion(start_line); mark_line_for_deletion(end_line); - ChangeArcAngles(CURRENT, start_arc, start_arc->StartAngle, new_delta); + pcb_arc_set_angles(CURRENT, start_arc, start_arc->StartAngle, new_delta); fix_arc_extra(start_arc, sarc_extra); did_something++; return; @@ -2017,7 +2017,7 @@ if (new_delta * start_arc->Delta <= 0) del_arc = 1; - ChangeArcAngles(CURRENT, start_arc, start_arc->StartAngle, new_delta); + pcb_arc_set_angles(CURRENT, start_arc, start_arc->StartAngle, new_delta); fix_arc_extra(start_arc, sarc_extra); pcb_move_obj(PCB_TYPE_LINE_POINT, CURRENT, start_line, &(start_line->Point1), sarc_extra->end.x - start_line->Point1.X, sarc_extra->end.y - start_line->Point1.Y); @@ -2083,7 +2083,7 @@ if (new_delta * end_arc->Delta <= 0) del_arc = 1; - ChangeArcAngles(CURRENT, end_arc, end_arc->StartAngle, new_delta); + pcb_arc_set_angles(CURRENT, end_arc, end_arc->StartAngle, new_delta); fix_arc_extra(end_arc, earc_extra); pcb_move_obj(PCB_TYPE_LINE_POINT, CURRENT, start_line, &(start_line->Point2), earc_extra->end.x - start_line->Point2.X, earc_extra->end.y - start_line->Point2.Y); Index: trunk/src_plugins/report/report.c =================================================================== --- trunk/src_plugins/report/report.c (revision 4946) +++ trunk/src_plugins/report/report.c (revision 4947) @@ -274,7 +274,7 @@ } #endif Arc = (pcb_arc_t *) ptr2; - box = GetArcEnds(Arc); + box = pcb_arc_get_ends(Arc); report = pcb_strdup_printf("%m+ARC ID# %ld; Flags:%s\n" "CenterPoint(X,Y) = %$mD.\n"