Index: trunk/doc-rnd/hacking/renames =================================================================== --- trunk/doc-rnd/hacking/renames (revision 4944) +++ trunk/doc-rnd/hacking/renames (revision 4945) @@ -539,3 +539,8 @@ SetElementBoundingBox -> pcb_element_bbox SetLineBoundingBox -> pcb_line_bbox SetTextBoundingBox -> pcb_text_bbox +RotateArcLowLevel -> pcb_arc_rotate90 +RotateElementLowLevel -> pcb_element_rotate90 +RotateLineLowLevel -> pcb_line_rotate90 +RotatePolygonLowLevel -> pcb_poly_rotate90 +RotateTextLowLevel -> pcb_text_rotate90 Index: trunk/src/buffer.c =================================================================== --- trunk/src/buffer.c (revision 4944) +++ trunk/src/buffer.c (revision 4945) @@ -237,7 +237,7 @@ /* elements */ ELEMENT_LOOP(Buffer->Data); { - RotateElementLowLevel(Buffer->Data, element, Buffer->X, Buffer->Y, Number); + pcb_element_rotate90(Buffer->Data, element, Buffer->X, Buffer->Y, Number); } END_LOOP; @@ -245,7 +245,7 @@ ALLLINE_LOOP(Buffer->Data); { r_delete_entry(layer->line_tree, (pcb_box_t *) line); - RotateLineLowLevel(line, Buffer->X, Buffer->Y, Number); + pcb_line_rotate90(line, Buffer->X, Buffer->Y, Number); r_insert_entry(layer->line_tree, (pcb_box_t *) line, 0); } ENDALL_LOOP; @@ -252,7 +252,7 @@ ALLARC_LOOP(Buffer->Data); { r_delete_entry(layer->arc_tree, (pcb_box_t *) arc); - RotateArcLowLevel(arc, Buffer->X, Buffer->Y, Number); + pcb_arc_rotate90(arc, Buffer->X, Buffer->Y, Number); r_insert_entry(layer->arc_tree, (pcb_box_t *) arc, 0); } ENDALL_LOOP; @@ -259,7 +259,7 @@ ALLTEXT_LOOP(Buffer->Data); { r_delete_entry(layer->text_tree, (pcb_box_t *) text); - RotateTextLowLevel(text, Buffer->X, Buffer->Y, Number); + pcb_text_rotate90(text, Buffer->X, Buffer->Y, Number); r_insert_entry(layer->text_tree, (pcb_box_t *) text, 0); } ENDALL_LOOP; @@ -266,7 +266,7 @@ ALLPOLYGON_LOOP(Buffer->Data); { r_delete_entry(layer->polygon_tree, (pcb_box_t *) polygon); - RotatePolygonLowLevel(polygon, Buffer->X, Buffer->Y, Number); + pcb_poly_rotate90(polygon, Buffer->X, Buffer->Y, Number); r_insert_entry(layer->polygon_tree, (pcb_box_t *) polygon, 0); } ENDALL_LOOP; @@ -296,7 +296,7 @@ /* elements */ ELEMENT_LOOP(Buffer->Data); { - FreeRotateElementLowLevel(Buffer->Data, element, Buffer->X, Buffer->Y, cosa, sina, angle); + Freepcb_element_rotate90(Buffer->Data, element, Buffer->X, Buffer->Y, cosa, sina, angle); } END_LOOP; Index: trunk/src/obj_arc.c =================================================================== --- trunk/src/obj_arc.c (revision 4944) +++ trunk/src/obj_arc.c (revision 4945) @@ -523,7 +523,7 @@ } /* rotates an arc */ -void RotateArcLowLevel(pcb_arc_t *Arc, pcb_coord_t X, pcb_coord_t Y, unsigned Number) +void pcb_arc_rotate90(pcb_arc_t *Arc, pcb_coord_t X, pcb_coord_t Y, unsigned Number) { pcb_coord_t save; @@ -545,7 +545,7 @@ { EraseArc(Arc); r_delete_entry(Layer->arc_tree, (pcb_box_t *) Arc); - RotateArcLowLevel(Arc, ctx->rotate.center_x, ctx->rotate.center_y, ctx->rotate.number); + pcb_arc_rotate90(Arc, ctx->rotate.center_x, ctx->rotate.center_y, ctx->rotate.number); r_insert_entry(Layer->arc_tree, (pcb_box_t *) Arc, 0); DrawArc(Layer, Arc); pcb_draw(); Index: trunk/src/obj_arc.h =================================================================== --- trunk/src/obj_arc.h (revision 4944) +++ trunk/src/obj_arc.h (revision 4945) @@ -52,12 +52,14 @@ void pcb_add_arc_on_layer(pcb_layer_t *Layer, pcb_arc_t *Arc); + /*** Utility ***/ 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); -void RotateArcLowLevel(pcb_arc_t *Arc, pcb_coord_t X, pcb_coord_t Y, unsigned Number); #define MOVE_ARC_LOWLEVEL(a,dx,dy) \ { \ Index: trunk/src/obj_elem.c =================================================================== --- trunk/src/obj_elem.c (revision 4944) +++ trunk/src/obj_elem.c (revision 4945) @@ -391,7 +391,7 @@ return (pcb_true); } -void FreeRotateElementLowLevel(pcb_data_t *Data, pcb_element_t *Element, pcb_coord_t X, pcb_coord_t Y, double cosa, double sina, pcb_angle_t angle) +void Freepcb_element_rotate90(pcb_data_t *Data, pcb_element_t *Element, pcb_coord_t X, pcb_coord_t Y, double cosa, double sina, pcb_angle_t angle) { /* solder side objects need a different orientation */ @@ -403,7 +403,7 @@ { if (Data && Data->name_tree[n]) r_delete_entry(Data->name_tree[n], (pcb_box_t *) text); - RotateTextLowLevel(text, X, Y, Number); + pcb_text_rotate90(text, X, Y, Number); } END_LOOP; #endif @@ -1059,7 +1059,7 @@ } /* rotate an element in 90 degree steps */ -void RotateElementLowLevel(pcb_data_t *Data, pcb_element_t *Element, pcb_coord_t X, pcb_coord_t Y, unsigned Number) +void pcb_element_rotate90(pcb_data_t *Data, pcb_element_t *Element, pcb_coord_t X, pcb_coord_t Y, unsigned Number) { /* solder side objects need a different orientation */ @@ -1070,12 +1070,12 @@ { if (Data && Data->name_tree[n]) r_delete_entry(Data->name_tree[n], (pcb_box_t *) text); - RotateTextLowLevel(text, X, Y, Number); + pcb_text_rotate90(text, X, Y, Number); } END_LOOP; ELEMENTLINE_LOOP(Element); { - RotateLineLowLevel(line, X, Y, Number); + pcb_line_rotate90(line, X, Y, Number); } END_LOOP; PIN_LOOP(Element); @@ -1098,7 +1098,7 @@ END_LOOP; ARC_LOOP(Element); { - RotateArcLowLevel(arc, X, Y, Number); + pcb_arc_rotate90(arc, X, Y, Number); } END_LOOP; ROTATE(Element->MarkX, Element->MarkY, X, Y, Number); @@ -1633,7 +1633,7 @@ void *RotateElement(pcb_opctx_t *ctx, pcb_element_t *Element) { EraseElement(Element); - RotateElementLowLevel(PCB->Data, Element, ctx->rotate.center_x, ctx->rotate.center_y, ctx->rotate.number); + pcb_element_rotate90(PCB->Data, Element, ctx->rotate.center_x, ctx->rotate.center_y, ctx->rotate.number); DrawElement(Element); pcb_draw(); return (Element); @@ -1648,7 +1648,7 @@ ELEMENTTEXT_LOOP(Element); { r_delete_entry(PCB->Data->name_tree[n], (pcb_box_t *) text); - RotateTextLowLevel(text, ctx->rotate.center_x, ctx->rotate.center_y, ctx->rotate.number); + pcb_text_rotate90(text, ctx->rotate.center_x, ctx->rotate.center_y, ctx->rotate.number); r_insert_entry(PCB->Data->name_tree[n], (pcb_box_t *) text, 0); } END_LOOP; Index: trunk/src/obj_elem.h =================================================================== --- trunk/src/obj_elem.h (revision 4944) +++ trunk/src/obj_elem.h (revision 4945) @@ -58,12 +58,14 @@ void pcb_element_bbox(pcb_data_t *Data, pcb_element_t *Element, pcb_font_t *Font); +void pcb_element_rotate90(pcb_data_t *Data, pcb_element_t *Element, pcb_coord_t X, pcb_coord_t Y, unsigned Number); +void Freepcb_element_rotate90(pcb_data_t *Data, pcb_element_t *Element, pcb_coord_t X, pcb_coord_t Y, double cosa, double sina, pcb_angle_t angle); + pcb_bool LoadElementToBuffer(pcb_buffer_t *Buffer, const char *Name); int LoadFootprintByName(pcb_buffer_t *Buffer, const char *Footprint); pcb_bool SmashBufferElement(pcb_buffer_t *Buffer); pcb_bool ConvertBufferToElement(pcb_buffer_t *Buffer); -void FreeRotateElementLowLevel(pcb_data_t *Data, pcb_element_t *Element, pcb_coord_t X, pcb_coord_t Y, double cosa, double sina, pcb_angle_t angle); pcb_bool ChangeElementSide(pcb_element_t *Element, pcb_coord_t yoff); pcb_bool ChangeSelectedElementSide(void); pcb_element_t *CopyElementLowLevel(pcb_data_t *Data, pcb_element_t *Dest, pcb_element_t *Src, pcb_bool uniqueName, pcb_coord_t dx, pcb_coord_t dy); @@ -76,7 +78,6 @@ void MoveElementLowLevel(pcb_data_t *Data, pcb_element_t *Element, pcb_coord_t DX, pcb_coord_t DY); void *RemoveElement(pcb_element_t *Element); -void RotateElementLowLevel(pcb_data_t *Data, pcb_element_t *Element, pcb_coord_t X, pcb_coord_t Y, unsigned Number); void MirrorElementCoordinates(pcb_data_t *Data, pcb_element_t *Element, pcb_coord_t yoff); pcb_element_t *CreateNewElement(pcb_data_t *Data, pcb_element_t *Element, Index: trunk/src/obj_line.c =================================================================== --- trunk/src/obj_line.c (revision 4944) +++ trunk/src/obj_line.c (revision 4945) @@ -618,7 +618,7 @@ } /* rotates a line in 90 degree steps */ -void RotateLineLowLevel(pcb_line_t *Line, pcb_coord_t X, pcb_coord_t Y, unsigned Number) +void pcb_line_rotate90(pcb_line_t *Line, pcb_coord_t X, pcb_coord_t Y, unsigned Number) { ROTATE(Line->Point1.X, Line->Point1.Y, X, Y, Number); ROTATE(Line->Point2.X, Line->Point2.Y, X, Y, Number); Index: trunk/src/obj_line.h =================================================================== --- trunk/src/obj_line.h (revision 4944) +++ trunk/src/obj_line.h (revision 4945) @@ -58,7 +58,7 @@ void pcb_add_line_on_layer(pcb_layer_t *Layer, pcb_line_t *Line); void pcb_line_bbox(pcb_line_t *Line); -void RotateLineLowLevel(pcb_line_t *Line, pcb_coord_t X, pcb_coord_t Y, unsigned Number); +void pcb_line_rotate90(pcb_line_t *Line, pcb_coord_t X, pcb_coord_t Y, unsigned Number); /*** DRC enforcement (obj_line_drcenf.c) ***/ void AdjustAttachedLine(void); Index: trunk/src/obj_poly.c =================================================================== --- trunk/src/obj_poly.c (revision 4944) +++ trunk/src/obj_poly.c (revision 4945) @@ -119,7 +119,7 @@ /*** utility ***/ /* rotates a polygon in 90 degree steps */ -void RotatePolygonLowLevel(pcb_polygon_t *Polygon, pcb_coord_t X, pcb_coord_t Y, unsigned Number) +void pcb_poly_rotate90(pcb_polygon_t *Polygon, pcb_coord_t X, pcb_coord_t Y, unsigned Number) { POLYGONPOINT_LOOP(Polygon); { Index: trunk/src/obj_poly.h =================================================================== --- trunk/src/obj_poly.h (revision 4944) +++ trunk/src/obj_poly.h (revision 4945) @@ -61,8 +61,8 @@ pcb_polygon_t *pcb_poly_hole_new(pcb_polygon_t * Polygon); void *pcb_poly_remove(pcb_layer_t *Layer, pcb_polygon_t *Polygon); +void pcb_poly_rotate90(pcb_polygon_t *Polygon, pcb_coord_t X, pcb_coord_t Y, unsigned Number); void MovePolygonLowLevel(pcb_polygon_t *Polygon, pcb_coord_t DX, pcb_coord_t DY); -void RotatePolygonLowLevel(pcb_polygon_t *Polygon, pcb_coord_t X, pcb_coord_t Y, unsigned Number); pcb_polygon_t *CopyPolygonLowLevel(pcb_polygon_t *Dest, pcb_polygon_t *Src); /* Add objects without creating them or making any "sanity modifications" to them */ Index: trunk/src/obj_text.c =================================================================== --- trunk/src/obj_text.c (revision 4944) +++ trunk/src/obj_text.c (revision 4945) @@ -434,7 +434,7 @@ /* rotates a text in 90 degree steps; only the bounding box is rotated, text rotation itself is done by the drawing routines */ -void RotateTextLowLevel(pcb_text_t *Text, pcb_coord_t X, pcb_coord_t Y, unsigned Number) +void pcb_text_rotate90(pcb_text_t *Text, pcb_coord_t X, pcb_coord_t Y, unsigned Number) { pcb_uint8_t number; @@ -455,7 +455,7 @@ EraseText(Layer, Text); RestoreToPolygon(PCB->Data, PCB_TYPE_TEXT, Layer, Text); r_delete_entry(Layer->text_tree, (pcb_box_t *) Text); - RotateTextLowLevel(Text, ctx->rotate.center_x, ctx->rotate.center_y, ctx->rotate.number); + pcb_text_rotate90(Text, ctx->rotate.center_x, ctx->rotate.center_y, ctx->rotate.number); r_insert_entry(Layer->text_tree, (pcb_box_t *) Text, 0); ClearFromPolygon(PCB->Data, PCB_TYPE_TEXT, Layer, Text); DrawText(Layer, Text); @@ -492,7 +492,7 @@ if (newline.Thickness < min_line_width) newline.Thickness = min_line_width; - RotateLineLowLevel(&newline, 0, 0, Text->Direction); + pcb_line_rotate90(&newline, 0, 0, Text->Direction); /* the labels of SMD objects on the bottom * side haven't been swapped yet, only their offset Index: trunk/src/obj_text.h =================================================================== --- trunk/src/obj_text.h (revision 4944) +++ trunk/src/obj_text.h (revision 4945) @@ -52,7 +52,7 @@ void pcb_add_text_on_layer(pcb_layer_t *Layer, pcb_text_t *text, pcb_font_t *PCBFont); void pcb_text_bbox(pcb_font_t *FontPtr, pcb_text_t *Text); -void RotateTextLowLevel(pcb_text_t *Text, pcb_coord_t X, pcb_coord_t Y, unsigned Number); +void pcb_text_rotate90(pcb_text_t *Text, pcb_coord_t X, pcb_coord_t Y, unsigned Number); #define MOVE_TEXT_LOWLEVEL(t,dx,dy) \ { \ Index: trunk/src/object_act.c =================================================================== --- trunk/src/object_act.c (revision 4944) +++ trunk/src/object_act.c (revision 4945) @@ -606,7 +606,7 @@ my = e->MarkY; if (er != pr) - RotateElementLowLevel(PCB_PASTEBUFFER->Data, pe, pe->MarkX, pe->MarkY, (er - pr + 4) % 4); + pcb_element_rotate90(PCB_PASTEBUFFER->Data, pe, pe->MarkX, pe->MarkY, (er - pr + 4) % 4); for (i = 0; i < MAX_ELEMENTNAMES; i++) { pe->Name[i].X = e->Name[i].X - mx + pe->MarkX; Index: trunk/src/rotate.h =================================================================== --- trunk/src/rotate.h (revision 4944) +++ trunk/src/rotate.h (revision 4945) @@ -87,13 +87,13 @@ } while(0) #define ROTATE_PAD_LOWLEVEL(p,x0,y0,n) \ - RotateLineLowLevel(((pcb_line_t *) (p)),(x0),(y0),(n)) + pcb_line_rotate90(((pcb_line_t *) (p)),(x0),(y0),(n)) #define ROTATE_TYPES (PCB_TYPE_ELEMENT | PCB_TYPE_TEXT | PCB_TYPE_ELEMENT_NAME | PCB_TYPE_ARC) void RotateBoxLowLevel(pcb_box_t *, pcb_coord_t, pcb_coord_t, unsigned); -void RotatePolygonLowLevel(pcb_polygon_t *, pcb_coord_t, pcb_coord_t, unsigned); +void pcb_poly_rotate90(pcb_polygon_t *, pcb_coord_t, pcb_coord_t, unsigned); void *RotateObject(int, void *, void *, void *, pcb_coord_t, pcb_coord_t, unsigned); void RotateScreenObject(pcb_coord_t, pcb_coord_t, unsigned); Index: trunk/src_plugins/autoplace/autoplace.c =================================================================== --- trunk/src_plugins/autoplace/autoplace.c (revision 4944) +++ trunk/src_plugins/autoplace/autoplace.c (revision 4945) @@ -631,7 +631,7 @@ b = (4 - b) & 3; /* 0 - flip; 1-3, rotate. */ if (b) - RotateElementLowLevel(PCB->Data, pt->element, bbcx, bbcy, b); + pcb_element_rotate90(PCB->Data, pt->element, bbcx, bbcy, b); else { pcb_coord_t y = pt->element->VBox.Y1; MirrorElementCoordinates(PCB->Data, pt->element, 0);