gEDA-cvs: pcb.git: branch: master updated (607c3056963b68654bac3fae70ac3d02eee60eaf)

[git@xxxxxxxxxx]

The branch, master has been updated
       via  607c3056963b68654bac3fae70ac3d02eee60eaf (commit)
      from  5672c37af126b75f687e693602c393f16aca46c7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


=========
 Summary
=========

 src/toporouter.c |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)


=================
 Commit Messages
=================

commit 607c3056963b68654bac3fae70ac3d02eee60eaf
Author: anthonix <anthonix@anthonix-desktop.(none)>
Commit: anthonix <anthonix@anthonix-desktop.(none)>

    Toporouter: Speccut bug fix

:100644 100644 7a40005... f749d22... M	src/toporouter.c

=========
 Changes
=========

commit 607c3056963b68654bac3fae70ac3d02eee60eaf
Author: anthonix <anthonix@anthonix-desktop.(none)>
Commit: anthonix <anthonix@anthonix-desktop.(none)>

    Toporouter: Speccut bug fix

diff --git a/src/toporouter.c b/src/toporouter.c
index 7a40005..f749d22 100644
--- a/src/toporouter.c
+++ b/src/toporouter.c
@@ -6463,6 +6463,7 @@ opposite_triangle(GtsTriangle *t, toporouter_edge_t *e)
 void
 speccut_edge_routing_from_edge(GList *i, toporouter_edge_t *e)
 {
+  g_assert(TOPOROUTER_IS_EDGE(e));
   while(i) {
     toporouter_vertex_t *curv = TOPOROUTER_VERTEX(i->data);
     
@@ -6545,6 +6546,7 @@ void
 speccut_edge_patch_links(toporouter_edge_t *e)
 {
   GList *i = e->routing;
+  g_assert(TOPOROUTER_IS_EDGE(e));
   while(i) {
     toporouter_vertex_t *v = TOPOROUTER_VERTEX(i->data);
     v->parent->child = v;
@@ -6563,14 +6565,13 @@ check_speccut(toporouter_oproute_t *oproute, toporouter_vertex_t *v1, toporouter
  
   if(TOPOROUTER_IS_CONSTRAINT(e)) return 0;
 
-
   if(!(t = gts_triangle_use_edges(GTS_EDGE(e), GTS_EDGE(e1), GTS_EDGE(e2)))) {
     printf("check_speccut: NULL t\n");
     return 0;
   }
    
   if(!(opt = opposite_triangle(t, e))) {
-    printf("check_speccut: NULL opt\n");
+//    printf("check_speccut: NULL opt\n");
     return 0;
   }
 
@@ -6598,6 +6599,10 @@ check_speccut(toporouter_oproute_t *oproute, toporouter_vertex_t *v1, toporouter
   ope1 = tedge(opv2, tedge_v1(e));
   ope2 = tedge(opv2, tedge_v2(e));
 
+ //this fixes the weird pad exits in r8c board
+//  if(TOPOROUTER_IS_CONSTRAINT(ope1)) return 0;
+  if(TOPOROUTER_IS_CONSTRAINT(ope2)) return 0;
+
   if(!tvertex_wind(opv2, tedge_v1(e), opv)) return 0;
   if(!tvertex_wind(opv2, tedge_v2(e), opv)) return 0;
   
@@ -7883,9 +7888,9 @@ toporouter (int argc, char **argv, int x, int y)
 
   hybrid_router(r);
 /*
-//  for(gint i=0;i<groupcount();i++) {
-//   gts_surface_foreach_edge(r->layers[i].surface, space_edge, NULL);
-//  }
+  for(gint i=0;i<groupcount();i++) {
+   gts_surface_foreach_edge(r->layers[i].surface, space_edge, NULL);
+  }
   {
     int i;
     for(i=0;i<groupcount();i++) {




_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs