[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

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



The branch, master has been updated
       via  bf1870a4bc3befb04ae9ac179397a3fc378f3f42 (commit)
      from  cd7298e09a6cb783977dae23fc1d5b6e1fc697b2 (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/rtree.c |   56 --------------------------------------------------------
 1 files changed, 0 insertions(+), 56 deletions(-)


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

commit bf1870a4bc3befb04ae9ac179397a3fc378f3f42
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>

    rtree.c: Remove old X11 based debug drawing code
    
    The core doesn't do drawing any more.. and can't assume that the
    GUI's graphics contexts are actually X11 or GDK graphics context,
    so this code can't work any more - remove it.

:100644 100644 e2ef1ee... 83ec41c... M	src/rtree.c

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

commit bf1870a4bc3befb04ae9ac179397a3fc378f3f42
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>

    rtree.c: Remove old X11 based debug drawing code
    
    The core doesn't do drawing any more.. and can't assume that the
    GUI's graphics contexts are actually X11 or GDK graphics context,
    so this code can't work any more - remove it.

diff --git a/src/rtree.c b/src/rtree.c
index e2ef1ee..83ec41c 100644
--- a/src/rtree.c
+++ b/src/rtree.c
@@ -45,12 +45,6 @@
 #include <assert.h>
 #include <setjmp.h>
 
-/* #define DRAWBOX */
-
-#ifdef DRAWBOX
-#include "clip.h"
-#include "data.h"
-#endif
 #include "mymem.h"
 
 #include "rtree.h"
@@ -243,41 +237,9 @@ __r_dump_tree (struct rtree_node *node, int depth)
     {
       printf ("p=0x%p node X(%d, %d) Y(%d, %d)\n", (void *) node,
               node->box.X1, node->box.X2, node->box.Y1, node->box.Y2);
-#ifdef DRAWBOX
-      gdk_gc_set_line_attributes (Output.fgGC, 4,
-                                  GDK_LINE_SOLID, GDK_CAP_ROUND,
-                                  GDK_JOIN_ROUND);
-
-      if (depth < max_copper_layer + 1)
-        gdk_gc_set_foreground (Output.fgGC, (LAYER_PTR (depth)->Color));
-      else
-        gdk_gc_set_foreground (Output.fgGC, PCB->WarnColor);
-      XDrawCLine (Output.top_window->window, Output.fgGC,
-                  node->box.X1, node->box.Y1, node->box.X2, node->box.Y1);
-      XDrawCLine (Output.top_window->window, Output.fgGC,
-                  node->box.X2, node->box.Y1, node->box.X2, node->box.Y2);
-      XDrawCLine (Output.top_window->window, Output.fgGC,
-                  node->box.X2, node->box.Y2, node->box.X1, node->box.Y2);
-      XDrawCLine (Output.top_window->window, Output.fgGC,
-                  node->box.X1, node->box.Y2, node->box.X1, node->box.Y1);
-#endif
     }
   else
     {
-#ifdef DRAWBOX
-      gdk_gc_set_line_attributes (Output.fgGC, 2,
-                                  GDK_LINE_SOLID, GDK_CAP_ROUND,
-                                  GDK_JOIN_ROUND);
-      gdk_gc_set_foreground (Output.fgGC, PCB->MaskColor);
-      XDrawCLine (Output.top_window->window, Output.fgGC,
-                  node->box.X1, node->box.Y1, node->box.X2, node->box.Y1);
-      XDrawCLine (Output.top_window->window, Output.fgGC,
-                  node->box.X2, node->box.Y1, node->box.X2, node->box.Y2);
-      XDrawCLine (Output.top_window->window, Output.fgGC,
-                  node->box.X2, node->box.Y2, node->box.X1, node->box.Y2);
-      XDrawCLine (Output.top_window->window, Output.fgGC,
-                  node->box.X1, node->box.Y2, node->box.X1, node->box.Y1);
-#endif
       printf ("p=0x%p leaf manage(%02x) X(%d, %d) Y(%d, %d)\n", (void *) node,
               node->flags.manage, node->box.X1, node->box.X2, node->box.Y1,
               node->box.Y2);
@@ -291,24 +253,6 @@ __r_dump_tree (struct rtree_node *node, int depth)
             (double) (node->u.rects[j].bounds.Y2 -
                       node->u.rects[j].bounds.Y1);
           count++;
-#ifdef DRAWBOX
-          gdk_gc_set_line_attributes (Output.fgGC, 1,
-                                      GDK_LINE_SOLID, GDK_CAP_ROUND,
-                                      GDK_JOIN_ROUND);
-          gdk_gc_set_foreground (Output.fgGC, PCB->ViaSelectedColor);
-          XDrawCLine (Output.top_window->window, Output.fgGC,
-                      node->u.rects[j].bounds.X1, node->u.rects[j].bounds.Y1,
-                      node->u.rects[j].bounds.X2, node->u.rects[j].bounds.Y1);
-          XDrawCLine (Output.top_window->window, Output.fgGC,
-                      node->u.rects[j].bounds.X2, node->u.rects[j].bounds.Y1,
-                      node->u.rects[j].bounds.X2, node->u.rects[j].bounds.Y2);
-          XDrawCLine (Output.top_window->window, Output.fgGC,
-                      node->u.rects[j].bounds.X2, node->u.rects[j].bounds.Y2,
-                      node->u.rects[j].bounds.X1, node->u.rects[j].bounds.Y2);
-          XDrawCLine (Output.top_window->window, Output.fgGC,
-                      node->u.rects[j].bounds.X1, node->u.rects[j].bounds.Y2,
-                      node->u.rects[j].bounds.X1, node->u.rects[j].bounds.Y1);
-#endif
           for (i = 0; i < depth + 1; i++)
             printf ("  ");
           printf ("entry 0x%p X(%d, %d) Y(%d, %d)\n",




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