Index: trunk/src/plugins/rt_topo/crbs.c =================================================================== --- trunk/src/plugins/rt_topo/crbs.c (revision 1372) +++ trunk/src/plugins/rt_topo/crbs.c (revision 1373) @@ -51,74 +51,7 @@ coll_ctn->coll = 1; } -static grbs_2net_t *crbs_coll_check_arc_cb(grbs_t *grbs, grbs_2net_t *tn, grbs_arc_t *arc, int new) -{ - crbs_point_t *pt = arc->parent_pt->user_data; - EDGELIST_FOREACH(edge, (pt->cpt->adj_edges)) { - crbs_edge_t *e = edge->data; - if (e->nets > 0) { - double ang; - if (edge->endp[0] == pt->cpt) - ang = e->ang[0]; - else if (edge->endp[1] == pt->cpt) - ang = e->ang[1]; - else - abort(); -/*printf(" (ACHK ang=%f arc=%f->%f) ", ang, arc->new_sa, arc->new_da);*/ - if (new) { - if (grbs_angle_in_arc(arc->new_sa, arc->new_da, ang, 1)) - return &tn_unknown; - } - else { - if (grbs_angle_in_arc(arc->sa, arc->da, ang, 1)) - return &tn_unknown; - } - } - } - EDGELIST_FOREACH_END(); - return NULL; -} - -static grbs_2net_t *crbs_coll_check_line_(grbs_t *grbs, grbs_2net_t *tn, grbs_point_t *gpt, const g2d_cline_t *cl) -{ - crbs_point_t *pt = gpt->user_data; - - EDGELIST_FOREACH(edge, (pt->cpt->adj_edges)) { - crbs_edge_t *e = edge->data; - if (e->nets > 0) { - g2d_cline_t ecl; - - ecl.p1.x = edge->endp[0]->pos.x; ecl.p1.y = edge->endp[0]->pos.y; - ecl.p2.x = edge->endp[1]->pos.x; ecl.p2.y = edge->endp[1]->pos.y; - -/*printf(" (LCHK) ");*/ - if (g2d_isc_cline_cline(cl, &ecl)) - return &tn_unknown; - } - } - EDGELIST_FOREACH_END(); - return NULL; -} - -static grbs_2net_t *crbs_coll_check_line_cb(grbs_t *grbs, grbs_2net_t *tn, grbs_point_t *pt1, double x1, double y1, grbs_point_t *pt2, double x2, double y2) -{ - grbs_2net_t *res; - g2d_cline_t cl; - -#warning TODO: remove this callback - return NULL; - - cl.p1.x = x1; cl.p1.y = y1; - cl.p2.x = x2; cl.p2.y = y2; - - res = crbs_coll_check_line_(grbs, tn, pt1, &cl); - if (res == NULL) - res = crbs_coll_check_line_(grbs, tn, pt2, &cl); - - return res; -} - static int crbs_coll_ingore_tn_line_cb(grbs_t *grbs, grbs_2net_t *tn, grbs_line_t *l) { crbs_2net_t *lctn = l->user_data; @@ -179,8 +112,6 @@ grbs_init(&crbs->grbs); crbs->ctx = ctx; crbs->grbs.coll_report_cb = crbs_coll_report_cb; - crbs->grbs.coll_check_arc = crbs_coll_check_arc_cb; - crbs->grbs.coll_check_line = crbs_coll_check_line_cb; crbs->grbs.coll_ingore_tn_line= crbs_coll_ingore_tn_line_cb; crbs->grbs.user_data = crbs;