Index: trunk/doc-rnd/hacking/renames =================================================================== --- trunk/doc-rnd/hacking/renames (revision 4943) +++ trunk/doc-rnd/hacking/renames (revision 4944) @@ -535,3 +535,7 @@ pcb_pin_new_in_element -> pcb_element_pin_new pcb_rats_delete -> pcb_rats_destroy RemoveText -> pcb_text_destroy +SetArcBoundingBox -> pcb_arc_bbox +SetElementBoundingBox -> pcb_element_bbox +SetLineBoundingBox -> pcb_line_bbox +SetTextBoundingBox -> pcb_text_bbox Index: trunk/src/action_helper.c =================================================================== --- trunk/src/action_helper.c (revision 4943) +++ trunk/src/action_helper.c (revision 4944) @@ -1091,7 +1091,7 @@ r_delete_entry(PCB->Data->name_tree[i], (pcb_box_t *) & (e->Name[i])); memcpy(&(e->Name[i]), &(estr[i]), sizeof(pcb_text_t)); e->Name[i].Element = e; - SetTextBoundingBox(&PCB->Font, &(e->Name[i])); + pcb_text_bbox(&PCB->Font, &(e->Name[i])); r_insert_entry(PCB->Data->name_tree[i], (pcb_box_t *) & (e->Name[i]), 0); if (i == save_n) DrawElementName(e); Index: trunk/src/buffer.c =================================================================== --- trunk/src/buffer.c (revision 4943) +++ trunk/src/buffer.c (revision 4944) @@ -306,7 +306,7 @@ r_delete_entry(layer->line_tree, (pcb_box_t *) line); free_rotate(&line->Point1.X, &line->Point1.Y, Buffer->X, Buffer->Y, cosa, sina); free_rotate(&line->Point2.X, &line->Point2.Y, Buffer->X, Buffer->Y, cosa, sina); - SetLineBoundingBox(line); + pcb_line_bbox(line); r_insert_entry(layer->line_tree, (pcb_box_t *) line, 0); } ENDALL_LOOP; @@ -437,7 +437,7 @@ arc->Y = PCB_SWAP_Y(arc->Y); arc->StartAngle = SWAP_ANGLE(arc->StartAngle); arc->Delta = SWAP_DELTA(arc->Delta); - SetArcBoundingBox(arc); + pcb_arc_bbox(arc); } ENDALL_LOOP; ALLPOLYGON_LOOP(Buffer->Data); @@ -489,7 +489,7 @@ line->Point1.Y = PCB_SWAP_Y(line->Point1.Y); line->Point2.X = PCB_SWAP_X(line->Point2.X); line->Point2.Y = PCB_SWAP_Y(line->Point2.Y); - SetLineBoundingBox(line); + pcb_line_bbox(line); r_insert_entry(layer->line_tree, (pcb_box_t *) line, 0); } ENDALL_LOOP; @@ -500,7 +500,7 @@ arc->Y = PCB_SWAP_Y(arc->Y); arc->StartAngle = SWAP_ANGLE(arc->StartAngle); arc->Delta = SWAP_DELTA(arc->Delta); - SetArcBoundingBox(arc); + pcb_arc_bbox(arc); r_insert_entry(layer->arc_tree, (pcb_box_t *) arc, 0); } ENDALL_LOOP; @@ -524,7 +524,7 @@ text->X = PCB_SWAP_X(text->X); text->Y = PCB_SWAP_Y(text->Y); PCB_FLAG_TOGGLE(PCB_FLAG_ONSOLDER, text); - SetTextBoundingBox(&PCB->Font, text); + pcb_text_bbox(&PCB->Font, text); r_insert_entry(layer->text_tree, (pcb_box_t *) text, 0); } ENDALL_LOOP; Index: trunk/src/find_geo.c =================================================================== --- trunk/src/find_geo.c (revision 4943) +++ trunk/src/find_geo.c (revision 4944) @@ -582,7 +582,7 @@ for (v = v->next; v != &c->head; v = v->next) { line.Point2.X = v->point[0]; line.Point2.Y = v->point[1]; - SetLineBoundingBox(&line); + pcb_line_bbox(&line); if (pcb_is_line_in_poly(&line, P2)) return (pcb_true); line.Point1.X = line.Point2.X; Index: trunk/src/obj_arc.c =================================================================== --- trunk/src/obj_arc.c (revision 4943) +++ trunk/src/obj_arc.c (revision 4944) @@ -66,7 +66,7 @@ /* computes the bounding box of an arc */ -void SetArcBoundingBox(pcb_arc_t *Arc) +void pcb_arc_bbox(pcb_arc_t *Arc) { double ca1, ca2, sa1, sa2; double minx, maxx, miny, maxy; @@ -152,7 +152,7 @@ AddObjectToChangeAnglesUndoList(PCB_TYPE_ARC, a, a, a); a->StartAngle = new_sa; a->Delta = new_da; - SetArcBoundingBox(a); + pcb_arc_bbox(a); r_insert_entry(Layer->arc_tree, (pcb_box_t *) a, 0); ClearFromPolygon(PCB->Data, PCB_TYPE_ARC, Layer, a); } @@ -165,7 +165,7 @@ AddObjectToChangeRadiiUndoList(PCB_TYPE_ARC, a, a, a); a->Width = new_width; a->Height = new_height; - SetArcBoundingBox(a); + pcb_arc_bbox(a); r_insert_entry(Layer->arc_tree, (pcb_box_t *) a, 0); ClearFromPolygon(PCB->Data, PCB_TYPE_ARC, Layer, a); } @@ -203,7 +203,7 @@ void pcb_add_arc_on_layer(pcb_layer_t *Layer, pcb_arc_t *Arc) { - SetArcBoundingBox(Arc); + pcb_arc_bbox(Arc); if (!Layer->arc_tree) Layer->arc_tree = r_create_tree(NULL, 0, 0); r_insert_entry(Layer->arc_tree, (pcb_box_t *) Arc, 0); @@ -263,7 +263,7 @@ r_delete_entry(Layer->arc_tree, (pcb_box_t *) Arc); RestoreToPolygon(PCB->Data, PCB_TYPE_ARC, Layer, Arc); Arc->Thickness = value; - SetArcBoundingBox(Arc); + pcb_arc_bbox(Arc); r_insert_entry(Layer->arc_tree, (pcb_box_t *) Arc, 0); ClearFromPolygon(PCB->Data, PCB_TYPE_ARC, Layer, Arc); DrawArc(Layer, Arc); @@ -290,7 +290,7 @@ PCB_FLAG_CLEAR(PCB_FLAG_CLEARLINE, Arc); Arc->Clearance = PCB_MIL_TO_COORD(10); } - SetArcBoundingBox(Arc); + pcb_arc_bbox(Arc); r_insert_entry(Layer->arc_tree, (pcb_box_t *) Arc, 0); ClearFromPolygon(PCB->Data, PCB_TYPE_ARC, Layer, Arc); DrawArc(Layer, Arc); @@ -327,7 +327,7 @@ r_delete_entry(Layer->arc_tree, (pcb_box_t *) Arc); RestoreToPolygon(PCB->Data, PCB_TYPE_ARC, Layer, Arc); *dst = value; - SetArcBoundingBox(Arc); + pcb_arc_bbox(Arc); r_insert_entry(Layer->arc_tree, (pcb_box_t *) Arc, 0); ClearFromPolygon(PCB->Data, PCB_TYPE_ARC, Layer, Arc); DrawArc(Layer, Arc); @@ -367,7 +367,7 @@ r_delete_entry(Layer->arc_tree, (pcb_box_t *) Arc); RestoreToPolygon(PCB->Data, PCB_TYPE_ARC, Layer, Arc); *dst = value; - SetArcBoundingBox(Arc); + pcb_arc_bbox(Arc); r_insert_entry(Layer->arc_tree, (pcb_box_t *) Arc, 0); ClearFromPolygon(PCB->Data, PCB_TYPE_ARC, Layer, Arc); DrawArc(Layer, Arc); Index: trunk/src/obj_arc.h =================================================================== --- trunk/src/obj_arc.h (revision 4943) +++ trunk/src/obj_arc.h (revision 4944) @@ -53,7 +53,7 @@ /*** Utility ***/ -void SetArcBoundingBox(pcb_arc_t *Arc); +void pcb_arc_bbox(pcb_arc_t *Arc); 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); Index: trunk/src/obj_elem.c =================================================================== --- trunk/src/obj_elem.c (revision 4943) +++ trunk/src/obj_elem.c (revision 4944) @@ -384,7 +384,7 @@ Element->MarkY = Buffer->Y; if (SWAP_IDENT) PCB_FLAG_SET(PCB_FLAG_ONSOLDER, Element); - SetElementBoundingBox(PCB->Data, Element, &PCB->Font); + pcb_element_bbox(PCB->Data, Element, &PCB->Font); pcb_buffer_clear(Buffer); pcb_move_obj_to_buffer(Buffer->Data, PCB->Data, PCB_TYPE_ELEMENT, Element, Element, Element); pcb_set_buffer_bbox(Buffer); @@ -411,7 +411,7 @@ { free_rotate(&line->Point1.X, &line->Point1.Y, X, Y, cosa, sina); free_rotate(&line->Point2.X, &line->Point2.Y, X, Y, cosa, sina); - SetLineBoundingBox(line); + pcb_line_bbox(line); } END_LOOP; PIN_LOOP(Element); @@ -432,7 +432,7 @@ RestoreToPolygon(Data, PCB_TYPE_PAD, Element, pad); free_rotate(&pad->Point1.X, &pad->Point1.Y, X, Y, cosa, sina); free_rotate(&pad->Point2.X, &pad->Point2.Y, X, Y, cosa, sina); - SetLineBoundingBox((pcb_line_t *) pad); + pcb_line_bbox((pcb_line_t *) pad); } END_LOOP; ARC_LOOP(Element); @@ -443,7 +443,7 @@ END_LOOP; free_rotate(&Element->MarkX, &Element->MarkY, X, Y, cosa, sina); - SetElementBoundingBox(Data, Element, &PCB->Font); + pcb_element_bbox(Data, Element, &PCB->Font); ClearFromPolygon(Data, PCB_TYPE_ELEMENT, Element, Element); } @@ -495,7 +495,7 @@ r_delete_entry(data->name_tree[which], &Element->Name[which].BoundingBox); Element->Name[which].TextString = new_name; - SetTextBoundingBox(&PCB->Font, &Element->Name[which]); + pcb_text_bbox(&PCB->Font, &Element->Name[which]); r_insert_entry(data->name_tree[which], &Element->Name[which].BoundingBox, 0); @@ -557,7 +557,7 @@ Dest->MarkX = Src->MarkX + dx; Dest->MarkY = Src->MarkY + dy; - SetElementBoundingBox(Data, Dest, &PCB->Font); + pcb_element_bbox(Data, Dest, &PCB->Font); return (Dest); } @@ -657,7 +657,7 @@ Text->Scale = Scale; /* calculate size of the bounding box */ - SetTextBoundingBox(PCBFont, Text); + pcb_text_bbox(PCBFont, Text); Text->ID = CreateIDGet(); } @@ -711,12 +711,12 @@ /* now toggle the solder-side flag */ PCB_FLAG_TOGGLE(PCB_FLAG_ONSOLDER, Element); /* this inserts all of the rtree data too */ - SetElementBoundingBox(Data, Element, &PCB->Font); + pcb_element_bbox(Data, Element, &PCB->Font); ClearFromPolygon(Data, PCB_TYPE_ELEMENT, Element, Element); } /* sets the bounding box of an elements */ -void SetElementBoundingBox(pcb_data_t *Data, pcb_element_t *Element, pcb_font_t *Font) +void pcb_element_bbox(pcb_data_t *Data, pcb_element_t *Element, pcb_font_t *Font) { pcb_box_t *box, *vbox; @@ -727,7 +727,7 @@ { if (Data && Data->name_tree[n]) r_delete_entry(Data->name_tree[n], (pcb_box_t *) text); - SetTextBoundingBox(Font, text); + pcb_text_bbox(Font, text); if (Data && !Data->name_tree[n]) Data->name_tree[n] = r_create_tree(NULL, 0, 0); if (Data) @@ -744,7 +744,7 @@ box->X2 = box->Y2 = 0; ELEMENTLINE_LOOP(Element); { - SetLineBoundingBox(line); + pcb_line_bbox(line); PCB_MAKE_MIN(box->X1, line->Point1.X - (line->Thickness + 1) / 2); PCB_MAKE_MIN(box->Y1, line->Point1.Y - (line->Thickness + 1) / 2); PCB_MAKE_MIN(box->X1, line->Point2.X - (line->Thickness + 1) / 2); @@ -757,7 +757,7 @@ END_LOOP; ARC_LOOP(Element); { - SetArcBoundingBox(arc); + pcb_arc_bbox(arc); PCB_MAKE_MIN(box->X1, arc->BoundingBox.X1); PCB_MAKE_MIN(box->Y1, arc->BoundingBox.Y1); PCB_MAKE_MAX(box->X2, arc->BoundingBox.X2); @@ -1103,7 +1103,7 @@ END_LOOP; ROTATE(Element->MarkX, Element->MarkY, X, Y, Number); /* SetElementBoundingBox reenters the rtree data */ - SetElementBoundingBox(Data, Element, &PCB->Font); + pcb_element_bbox(Data, Element, &PCB->Font); ClearFromPolygon(Data, PCB_TYPE_ELEMENT, Element, Element); } @@ -1161,7 +1161,7 @@ PCB_FLAG_CLEAR(PCB_FLAG_WARN | PCB_FLAG_FOUND, pad); } END_LOOP; - SetElementBoundingBox(ctx->buffer.dst, element, &PCB->Font); + pcb_element_bbox(ctx->buffer.dst, element, &PCB->Font); /* * Now clear the from the polygons in the destination */ @@ -1290,7 +1290,7 @@ pad->Thickness = value; } /* SetElementBB updates all associated rtrees */ - SetElementBoundingBox(PCB->Data, Element, &PCB->Font); + pcb_element_bbox(PCB->Data, Element, &PCB->Font); ClearFromPolygon(PCB->Data, PCB_TYPE_PAD, Element, pad); DrawPad(pad); @@ -1357,7 +1357,7 @@ AddObjectToSizeUndoList(PCB_TYPE_ELEMENT_NAME, Element, text, text); r_delete_entry(PCB->Data->name_tree[n], (pcb_box_t *) text); text->Scale = value; - SetTextBoundingBox(&PCB->Font, text); + pcb_text_bbox(&PCB->Font, text); 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 4943) +++ trunk/src/obj_elem.h (revision 4944) @@ -57,6 +57,8 @@ pcb_line_t *pcb_element_line_new(pcb_element_t *Element); +void pcb_element_bbox(pcb_data_t *Data, pcb_element_t *Element, pcb_font_t *Font); + 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); @@ -65,7 +67,6 @@ 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); -void SetElementBoundingBox(pcb_data_t *Data, pcb_element_t *Element, pcb_font_t *Font); char *UniqueElementName(pcb_data_t *Data, char *Name); void r_delete_element(pcb_data_t * data, pcb_element_t * element); Index: trunk/src/obj_line.c =================================================================== --- trunk/src/obj_line.c (revision 4943) +++ trunk/src/obj_line.c (revision 4944) @@ -215,7 +215,7 @@ void pcb_add_line_on_layer(pcb_layer_t *Layer, pcb_line_t *Line) { - SetLineBoundingBox(Line); + pcb_line_bbox(Line); if (!Layer->line_tree) Layer->line_tree = r_create_tree(NULL, 0, 0); r_insert_entry(Layer->line_tree, (pcb_box_t *) Line, 0); @@ -222,7 +222,7 @@ } /* sets the bounding box of a line */ -void SetLineBoundingBox(pcb_line_t *Line) +void pcb_line_bbox(pcb_line_t *Line) { pcb_coord_t width = (Line->Thickness + Line->Clearance + 1) / 2; @@ -290,7 +290,7 @@ r_delete_entry(Layer->line_tree, (pcb_box_t *) Line); RestoreToPolygon(PCB->Data, PCB_TYPE_LINE, Layer, Line); Line->Thickness = value; - SetLineBoundingBox(Line); + pcb_line_bbox(Line); r_insert_entry(Layer->line_tree, (pcb_box_t *) Line, 0); ClearFromPolygon(PCB->Data, PCB_TYPE_LINE, Layer, Line); DrawLine(Layer, Line); @@ -317,7 +317,7 @@ PCB_FLAG_CLEAR(PCB_FLAG_CLEARLINE, Line); Line->Clearance = PCB_MIL_TO_COORD(10); } - SetLineBoundingBox(Line); + pcb_line_bbox(Line); r_insert_entry(Layer->line_tree, (pcb_box_t *) Line, 0); ClearFromPolygon(PCB->Data, PCB_TYPE_LINE, Layer, Line); DrawLine(Layer, Line); @@ -416,7 +416,7 @@ RestoreToPolygon(PCB->Data, PCB_TYPE_LINE, Layer, Line); r_delete_entry(Layer->line_tree, &Line->BoundingBox); PCB_MOVE(Point->X, Point->Y, ctx->move.dx, ctx->move.dy); - SetLineBoundingBox(Line); + pcb_line_bbox(Line); r_insert_entry(Layer->line_tree, &Line->BoundingBox, 0); ClearFromPolygon(PCB->Data, PCB_TYPE_LINE, Layer, Line); if (Layer->On) { @@ -431,7 +431,7 @@ EraseRat((pcb_rat_t *) Line); r_delete_entry(PCB->Data->rat_tree, &Line->BoundingBox); PCB_MOVE(Point->X, Point->Y, ctx->move.dx, ctx->move.dy); - SetLineBoundingBox(Line); + pcb_line_bbox(Line); r_insert_entry(PCB->Data->rat_tree, &Line->BoundingBox, 0); if (PCB->RatOn) { DrawRat((pcb_rat_t *) Line); @@ -640,7 +640,7 @@ } } /* instead of rotating the bounding box, the call updates both end points too */ - SetLineBoundingBox(Line); + pcb_line_bbox(Line); } @@ -655,7 +655,7 @@ else r_delete_entry(PCB->Data->rat_tree, (pcb_box_t *) Line); RotatePointLowLevel(Point, ctx->rotate.center_x, ctx->rotate.center_y, ctx->rotate.number); - SetLineBoundingBox(Line); + pcb_line_bbox(Line); if (Layer) { r_insert_entry(Layer->line_tree, (pcb_box_t *) Line, 0); ClearFromPolygon(PCB->Data, PCB_TYPE_LINE, Layer, Line); @@ -686,7 +686,7 @@ RestoreToPolygon(PCB->Data, PCB_TYPE_LINE, Layer, Line); Line->Point2.X = ctx->insert.x; Line->Point2.Y = ctx->insert.y; - SetLineBoundingBox(Line); + pcb_line_bbox(Line); r_insert_entry(Layer->line_tree, (pcb_box_t *) Line, 0); ClearFromPolygon(PCB->Data, PCB_TYPE_LINE, Layer, Line); DrawLine(Layer, Line); Index: trunk/src/obj_line.h =================================================================== --- trunk/src/obj_line.h (revision 4943) +++ trunk/src/obj_line.h (revision 4944) @@ -57,7 +57,7 @@ /* Add objects without creating them or making any "sanity modifications" to them */ void pcb_add_line_on_layer(pcb_layer_t *Layer, pcb_line_t *Line); -void SetLineBoundingBox(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); /*** DRC enforcement (obj_line_drcenf.c) ***/ @@ -73,7 +73,7 @@ { \ PCB_MOVE((l)->Point1.X,(l)->Point1.Y,(dx),(dy)) \ PCB_MOVE((l)->Point2.X,(l)->Point2.Y,(dx),(dy)) \ - SetLineBoundingBox ((l)); \ + pcb_line_bbox((l)); \ } Index: trunk/src/obj_line_drcenf.c =================================================================== --- trunk/src/obj_line_drcenf.c (revision 4943) +++ trunk/src/obj_line_drcenf.c (revision 4944) @@ -344,8 +344,8 @@ line2.Point2.X = line1.Point1.X + dx; line2.Point2.Y = line1.Point1.Y + dy; } - SetLineBoundingBox(&line1); - SetLineBoundingBox(&line2); + pcb_line_bbox(&line1); + pcb_line_bbox(&line2); last2 = length2; if (setjmp(info.env) == 0) { info.line = &line1; @@ -443,7 +443,7 @@ } /* search for intersection */ - SetLineBoundingBox(&line); + pcb_line_bbox(&line); if (setjmp(info.env) == 0) { info.line = &line; r_search(PCB->Data->via_tree, &line.BoundingBox, NULL, drcVia_callback, &info, NULL); Index: trunk/src/obj_pad.c =================================================================== --- trunk/src/obj_pad.c (revision 4943) +++ trunk/src/obj_pad.c (revision 4944) @@ -170,7 +170,7 @@ Pad->Mask += value - Pad->Thickness; Pad->Thickness = value; /* SetElementBB updates all associated rtrees */ - SetElementBoundingBox(PCB->Data, Element, &PCB->Font); + pcb_element_bbox(PCB->Data, Element, &PCB->Font); ClearFromPolygon(PCB->Data, PCB_TYPE_PAD, Element, Pad); DrawPad(Pad); return (Pad); @@ -200,7 +200,7 @@ r_delete_entry(PCB->Data->pad_tree, &Pad->BoundingBox); Pad->Clearance = value; /* SetElementBB updates all associated rtrees */ - SetElementBoundingBox(PCB->Data, Element, &PCB->Font); + pcb_element_bbox(PCB->Data, Element, &PCB->Font); ClearFromPolygon(PCB->Data, PCB_TYPE_PAD, Element, Pad); DrawPad(Pad); return Pad; @@ -288,7 +288,7 @@ ErasePad(Pad); r_delete_entry(PCB->Data->pad_tree, &Pad->BoundingBox); Pad->Mask = value; - SetElementBoundingBox(PCB->Data, Element, &PCB->Font); + pcb_element_bbox(PCB->Data, Element, &PCB->Font); DrawPad(Pad); return (Pad); } Index: trunk/src/obj_pinvia.c =================================================================== --- trunk/src/obj_pinvia.c (revision 4943) +++ trunk/src/obj_pinvia.c (revision 4944) @@ -413,7 +413,7 @@ Pin->Mask += value - Pin->Thickness; Pin->Thickness = value; /* SetElementBB updates all associated rtrees */ - SetElementBoundingBox(PCB->Data, Element, &PCB->Font); + pcb_element_bbox(PCB->Data, Element, &PCB->Font); ClearFromPolygon(PCB->Data, PCB_TYPE_PIN, Element, Pin); DrawPin(Pin); return (Pin); @@ -443,7 +443,7 @@ r_delete_entry(PCB->Data->pin_tree, &Pin->BoundingBox); Pin->Clearance = value; /* SetElementBB updates all associated rtrees */ - SetElementBoundingBox(PCB->Data, Element, &PCB->Font); + pcb_element_bbox(PCB->Data, Element, &PCB->Font); ClearFromPolygon(PCB->Data, PCB_TYPE_PIN, Element, Pin); DrawPin(Pin); return (Pin); @@ -672,7 +672,7 @@ ErasePin(Pin); r_delete_entry(PCB->Data->pin_tree, &Pin->BoundingBox); Pin->Mask = value; - SetElementBoundingBox(PCB->Data, Element, &PCB->Font); + pcb_element_bbox(PCB->Data, Element, &PCB->Font); DrawPin(Pin); return (Pin); } Index: trunk/src/obj_rat.c =================================================================== --- trunk/src/obj_rat.c (revision 4943) +++ trunk/src/obj_rat.c (revision 4944) @@ -88,7 +88,7 @@ Line->Point2.ID = CreateIDGet(); Line->group1 = group1; Line->group2 = group2; - SetLineBoundingBox((pcb_line_t *) Line); + pcb_line_bbox((pcb_line_t *) Line); if (!Data->rat_tree) Data->rat_tree = r_create_tree(NULL, 0, 0); r_insert_entry(Data->rat_tree, &Line->BoundingBox, 0); Index: trunk/src/obj_text.c =================================================================== --- trunk/src/obj_text.c (revision 4943) +++ trunk/src/obj_text.c (revision 4944) @@ -96,7 +96,7 @@ void pcb_add_text_on_layer(pcb_layer_t *Layer, pcb_text_t *text, pcb_font_t *PCBFont) { /* calculate size of the bounding box */ - SetTextBoundingBox(PCBFont, text); + pcb_text_bbox(PCBFont, text); text->ID = CreateIDGet(); if (!Layer->text_tree) Layer->text_tree = r_create_tree(NULL, 0, 0); @@ -104,7 +104,7 @@ } /* creates the bounding box of a text object */ -void SetTextBoundingBox(pcb_font_t *FontPtr, pcb_text_t *Text) +void pcb_text_bbox(pcb_font_t *FontPtr, pcb_text_t *Text) { pcb_symbol_t *symbol = FontPtr->Symbol; unsigned char *s = (unsigned char *) Text->TextString; @@ -256,7 +256,7 @@ r_delete_entry(Layer->text_tree, (pcb_box_t *) Text); RestoreToPolygon(PCB->Data, PCB_TYPE_TEXT, Layer, Text); Text->Scale = value; - SetTextBoundingBox(&PCB->Font, Text); + pcb_text_bbox(&PCB->Font, Text); r_insert_entry(Layer->text_tree, (pcb_box_t *) Text, 0); ClearFromPolygon(PCB->Data, PCB_TYPE_TEXT, Layer, Text); DrawText(Layer, Text); @@ -279,7 +279,7 @@ Text->TextString = ctx->chgname.new_name; /* calculate size of the bounding box */ - SetTextBoundingBox(&PCB->Font, Text); + pcb_text_bbox(&PCB->Font, Text); r_insert_entry(Layer->text_tree, (pcb_box_t *) Text, 0); ClearFromPolygon(PCB->Data, PCB_TYPE_TEXT, Layer, Text); DrawText(Layer, Text); @@ -367,7 +367,7 @@ PCB_FLAG_CLEAR(PCB_FLAG_ONSOLDER, text); /* re-calculate the bounding box (it could be mirrored now) */ - SetTextBoundingBox(&PCB->Font, text); + pcb_text_bbox(&PCB->Font, text); if (!Destination->text_tree) Destination->text_tree = r_create_tree(NULL, 0, 0); r_insert_entry(Destination->text_tree, (pcb_box_t *) text, 0); Index: trunk/src/obj_text.h =================================================================== --- trunk/src/obj_text.h (revision 4943) +++ trunk/src/obj_text.h (revision 4944) @@ -51,7 +51,7 @@ /* Add objects without creating them or making any "sanity modifications" to them */ void pcb_add_text_on_layer(pcb_layer_t *Layer, pcb_text_t *text, pcb_font_t *PCBFont); -void SetTextBoundingBox(pcb_font_t *FontPtr, pcb_text_t *Text); +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); #define MOVE_TEXT_LOWLEVEL(t,dx,dy) \ Index: trunk/src/rotate.c =================================================================== --- trunk/src/rotate.c (revision 4943) +++ trunk/src/rotate.c (revision 4944) @@ -121,7 +121,7 @@ else r_delete_entry(PCB->Data->rat_tree, (pcb_box_t *) ptr->Line); RotatePointLowLevel(ptr->MovedPoint, ctx.rotate.center_x, ctx.rotate.center_y, Steps); - SetLineBoundingBox(ptr->Line); + pcb_line_bbox(ptr->Line); if (ptr->Layer) { r_insert_entry(ptr->Layer->line_tree, (pcb_box_t *) ptr->Line, 0); ClearFromPolygon(PCB->Data, PCB_TYPE_LINE, ptr->Layer, ptr->Line); Index: trunk/src/undo.c =================================================================== --- trunk/src/undo.c (revision 4943) +++ trunk/src/undo.c (revision 4944) @@ -376,7 +376,7 @@ pcb_erase_obj(type, Layer, a); a->StartAngle = Entry->Data.AngleChange.angle[0]; a->Delta = Entry->Data.AngleChange.angle[1]; - SetArcBoundingBox(a); + pcb_arc_bbox(a); r_insert_entry(Layer->arc_tree, (pcb_box_t *) a, 0); Entry->Data.AngleChange.angle[0] = old_sa; Entry->Data.AngleChange.angle[1] = old_da; @@ -407,7 +407,7 @@ pcb_erase_obj(type, Layer, a); a->Width = Entry->Data.Move.DX; a->Height = Entry->Data.Move.DY; - SetArcBoundingBox(a); + pcb_arc_bbox(a); r_insert_entry(Layer->arc_tree, (pcb_box_t *) a, 0); Entry->Data.Move.DX = old_w; Entry->Data.Move.DY = old_h; Index: trunk/src_plugins/io_kicad/read.c =================================================================== --- trunk/src_plugins/io_kicad/read.c (revision 4943) +++ trunk/src_plugins/io_kicad/read.c (revision 4944) @@ -1802,7 +1802,7 @@ } if (newModule != NULL) { - SetElementBoundingBox(PCB->Data, newModule, &PCB->Font); + pcb_element_bbox(PCB->Data, newModule, &PCB->Font); return 0; } else { return -1; Index: trunk/src_plugins/io_lihata/read.c =================================================================== --- trunk/src_plugins/io_lihata/read.c (revision 4943) +++ trunk/src_plugins/io_lihata/read.c (revision 4944) @@ -690,7 +690,7 @@ /* Make sure we use some sort of font */ if (pcb == NULL) pcb = PCB; - SetElementBoundingBox(dt, elem, &pcb->Font); + pcb_element_bbox(dt, elem, &pcb->Font); return 0; } Index: trunk/src_plugins/io_pcb/parse_y.c =================================================================== --- trunk/src_plugins/io_pcb/parse_y.c (revision 4943) +++ trunk/src_plugins/io_pcb/parse_y.c (revision 4944) @@ -2442,7 +2442,7 @@ case 117: #line 1287 "parse_y.y" /* yacc.c:1646 */ { - SetElementBoundingBox(yyData, yyElement, yyFont); + pcb_element_bbox(yyData, yyElement, yyFont); } #line 2448 "parse_y.c" /* yacc.c:1646 */ break; @@ -2462,7 +2462,7 @@ case 119: #line 1305 "parse_y.y" /* yacc.c:1646 */ { - SetElementBoundingBox(yyData, yyElement, yyFont); + pcb_element_bbox(yyData, yyElement, yyFont); } #line 2468 "parse_y.c" /* yacc.c:1646 */ break; @@ -2483,7 +2483,7 @@ case 121: #line 1324 "parse_y.y" /* yacc.c:1646 */ { - SetElementBoundingBox(yyData, yyElement, yyFont); + pcb_element_bbox(yyData, yyElement, yyFont); } #line 2489 "parse_y.c" /* yacc.c:1646 */ break; @@ -2506,7 +2506,7 @@ case 123: #line 1346 "parse_y.y" /* yacc.c:1646 */ { - SetElementBoundingBox(yyData, yyElement, yyFont); + pcb_element_bbox(yyData, yyElement, yyFont); } #line 2512 "parse_y.c" /* yacc.c:1646 */ break; @@ -2529,7 +2529,7 @@ case 125: #line 1368 "parse_y.y" /* yacc.c:1646 */ { - SetElementBoundingBox(yyData, yyElement, yyFont); + pcb_element_bbox(yyData, yyElement, yyFont); } #line 2535 "parse_y.c" /* yacc.c:1646 */ break; Index: trunk/src_plugins/io_pcb/parse_y.y =================================================================== --- trunk/src_plugins/io_pcb/parse_y.y (revision 4943) +++ trunk/src_plugins/io_pcb/parse_y.y (revision 4944) @@ -1285,7 +1285,7 @@ } elementdefinitions ')' { - SetElementBoundingBox(yyData, yyElement, yyFont); + pcb_element_bbox(yyData, yyElement, yyFont); } ; @@ -1303,7 +1303,7 @@ } elementdefinitions ')' { - SetElementBoundingBox(yyData, yyElement, yyFont); + pcb_element_bbox(yyData, yyElement, yyFont); } ; @@ -1322,7 +1322,7 @@ } elementdefinitions ')' { - SetElementBoundingBox(yyData, yyElement, yyFont); + pcb_element_bbox(yyData, yyElement, yyFont); } ; @@ -1344,7 +1344,7 @@ } relementdefs ')' { - SetElementBoundingBox(yyData, yyElement, yyFont); + pcb_element_bbox(yyData, yyElement, yyFont); } ; @@ -1366,7 +1366,7 @@ } relementdefs ')' { - SetElementBoundingBox(yyData, yyElement, yyFont); + pcb_element_bbox(yyData, yyElement, yyFont); } ;