Index: trunk/doc-rnd/hacking/renames =================================================================== --- trunk/doc-rnd/hacking/renames (revision 4902) +++ trunk/doc-rnd/hacking/renames (revision 4903) @@ -431,3 +431,7 @@ hid_remove_hid -> pcb_hid_remove_hid common_nogui_init -> pcb_hid_nogui_init hid_nogui_get_hid -> pcb_hid_nogui_get_hid +InsertPointIntoObject -> pcb_insert_point_in_object +AdjustInsertPoint -> pcb_adjust_insert_point +ComputeIntersectionArea -> pcb_intersect_box_box +ComputeUnionArea -> pcb_union_box_box Index: trunk/src/action_helper.c =================================================================== --- trunk/src/action_helper.c (revision 4902) +++ trunk/src/action_helper.c (revision 4903) @@ -475,7 +475,7 @@ break; /* point insertion mode */ case PCB_MODE_INSERT_POINT: - pnt = AdjustInsertPoint(); + pnt = pcb_adjust_insert_point(); if (pnt) InsertedPoint = *pnt; break; @@ -1210,7 +1210,7 @@ } Crosshair.AttachedObject.State = STATE_SECOND; - InsertedPoint = *AdjustInsertPoint(); + InsertedPoint = *pcb_adjust_insert_point(); } } break; @@ -1218,11 +1218,11 @@ /* second notify, insert new point into object */ case STATE_SECOND: if (Crosshair.AttachedObject.Type == PCB_TYPE_POLYGON) - InsertPointIntoObject(PCB_TYPE_POLYGON, + pcb_insert_point_in_object(PCB_TYPE_POLYGON, Crosshair.AttachedObject.Ptr1, fake.poly, &polyIndex, InsertedPoint.X, InsertedPoint.Y, pcb_false, pcb_false); else - InsertPointIntoObject(Crosshair.AttachedObject.Type, + pcb_insert_point_in_object(Crosshair.AttachedObject.Type, Crosshair.AttachedObject.Ptr1, Crosshair.AttachedObject.Ptr2, &polyIndex, InsertedPoint.X, InsertedPoint.Y, pcb_false, pcb_false); SetChangedFlag(pcb_true); Index: trunk/src/insert.c =================================================================== --- trunk/src/insert.c (revision 4902) +++ trunk/src/insert.c (revision 4903) @@ -61,7 +61,7 @@ /* --------------------------------------------------------------------------- * inserts point into objects */ -void *InsertPointIntoObject(int Type, void *Ptr1, void *Ptr2, pcb_cardinal_t * Ptr3, pcb_coord_t DX, pcb_coord_t DY, pcb_bool Force, pcb_bool insert_last) +void *pcb_insert_point_in_object(int Type, void *Ptr1, void *Ptr2, pcb_cardinal_t * Ptr3, pcb_coord_t DX, pcb_coord_t DY, pcb_bool Force, pcb_bool insert_last) { void *ptr; pcb_opctx_t ctx; @@ -83,7 +83,7 @@ /* --------------------------------------------------------------------------- * adjusts the insert point to make 45 degree lines as necessary */ -pcb_point_t *AdjustInsertPoint(void) +pcb_point_t *pcb_adjust_insert_point(void) { static pcb_point_t InsertedPoint; double m; Index: trunk/src/insert.h =================================================================== --- trunk/src/insert.h (revision 4902) +++ trunk/src/insert.h (revision 4903) @@ -36,7 +36,7 @@ /* --------------------------------------------------------------------------- * prototypes */ -void *InsertPointIntoObject(int, void *, void *, pcb_cardinal_t *, pcb_coord_t, pcb_coord_t, pcb_bool, pcb_bool); -pcb_point_t *AdjustInsertPoint(void); +void *pcb_insert_point_in_object(int, void *, void *, pcb_cardinal_t *, pcb_coord_t, pcb_coord_t, pcb_bool, pcb_bool); +pcb_point_t *pcb_adjust_insert_point(void); #endif Index: trunk/src/intersect.c =================================================================== --- trunk/src/intersect.c (revision 4902) +++ trunk/src/intersect.c (revision 4903) @@ -162,7 +162,7 @@ * etc.). * Runs in O(N ln N) time. */ -double ComputeIntersectionArea(pcb_box_list_t *boxlist) +double pcb_intersect_box_box(pcb_box_list_t *boxlist) { pcb_cardinal_t i; double area = 0.0; @@ -170,7 +170,7 @@ for (i = 0; i < boxlist->BoxN; i++) area += (double) (boxlist->Box[i].X2 - boxlist->Box[i].X1) * (double) (boxlist->Box[i].Y2 - boxlist->Box[i].Y1); /* intersection area is aggregate - union. */ - return area * 0.0001 - ComputeUnionArea(boxlist); + return area * 0.0001 - pcb_union_box_box(boxlist); } /* --------------------------------------------------------------------------- @@ -177,7 +177,7 @@ * Compute the area of the union of the given rectangles. * O(N ln N) time. */ -double ComputeUnionArea(pcb_box_list_t *boxlist) +double pcb_union_box_box(pcb_box_list_t *boxlist) { pcb_box_t **rectLeft, **rectRight; pcb_cardinal_t i, j; Index: trunk/src/intersect.h =================================================================== --- trunk/src/intersect.h (revision 4902) +++ trunk/src/intersect.h (revision 4903) @@ -37,7 +37,7 @@ #include "global_typedefs.h" -double ComputeIntersectionArea(pcb_box_list_t *boxlist); /* will sort boxlist */ -double ComputeUnionArea(pcb_box_list_t *boxlist); +double pcb_intersect_box_box(pcb_box_list_t *boxlist); /* will sort boxlist */ +double pcb_union_box_box(pcb_box_list_t *boxlist); #endif Index: trunk/src/undo.c =================================================================== --- trunk/src/undo.c (revision 4902) +++ trunk/src/undo.c (revision 4903) @@ -679,7 +679,7 @@ /* recover the point */ if (andDraw && layer->On) ErasePolygon(polygon); - InsertPointIntoObject(PCB_TYPE_POLYGON, layer, polygon, + pcb_insert_point_in_object(PCB_TYPE_POLYGON, layer, polygon, &Entry->Data.RemovedPoint.Index, Entry->Data.RemovedPoint.X, Entry->Data.RemovedPoint.Y, pcb_true, Entry->Data.RemovedPoint.last_in_contour); Index: trunk/src_plugins/autoplace/autoplace.c =================================================================== --- trunk/src_plugins/autoplace/autoplace.c (revision 4902) +++ trunk/src_plugins/autoplace/autoplace.c (revision 4903) @@ -347,9 +347,9 @@ /* now compute penalty function Wc which is proportional to * amount of overlap and congestion. */ /* delta1 is congestion penalty function */ - delta1 = CostParameter.congestion_penalty * sqrt(fabs(ComputeIntersectionArea(&bounds))); + delta1 = CostParameter.congestion_penalty * sqrt(fabs(pcb_intersect_box_box(&bounds))); #if 0 - printf("Wire Congestion Area: %f\n", ComputeIntersectionArea(&bounds)); + printf("Wire Congestion Area: %f\n", pcb_intersect_box_box(&bounds)); #endif /* free bounding rectangles */ pcb_box_free(&bounds); @@ -440,12 +440,12 @@ } END_LOOP; /* compute intersection area of module areas box list */ - delta2 = sqrt(fabs(ComputeIntersectionArea(&solderside) + - ComputeIntersectionArea(&componentside))) * + delta2 = sqrt(fabs(pcb_intersect_box_box(&solderside) + + pcb_intersect_box_box(&componentside))) * (CostParameter.overlap_penalty_min + (1 - (T / T0)) * CostParameter.overlap_penalty_max); #if 0 - printf("Module Overlap Area (solder): %f\n", ComputeIntersectionArea(&solderside)); - printf("Module Overlap Area (component): %f\n", ComputeIntersectionArea(&componentside)); + printf("Module Overlap Area (solder): %f\n", pcb_intersect_box_box(&solderside)); + printf("Module Overlap Area (component): %f\n", pcb_intersect_box_box(&componentside)); #endif pcb_box_free(&solderside); pcb_box_free(&componentside);