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

[git@xxxxxxxxxx]

The branch, master has been updated
       via  45c00744ccb2e7640d506529f80555ec08bdf053 (commit)
      from  c52891447c554ffebbddf30e10ebd66b4488dc6e (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/draw.c |   46 ++++++++++++++++------------------------------
 1 files changed, 16 insertions(+), 30 deletions(-)


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

commit 45c00744ccb2e7640d506529f80555ec08bdf053
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>

    draw.c: Draw all vias, pins and pads under the mask layer
    
    This fixes an issue where the rendering of a partially masked via is
    inaccurate. The down-side is that partially, or completely masked vias
    become obscured by the mask drawn above them.
    
    If the user is previewing the mask rendering, it is probably best that
    they see an accurate representation - even if this means hiding vias.

:100644 100644 3180723... 946668f... M	src/draw.c

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

commit 45c00744ccb2e7640d506529f80555ec08bdf053
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>

    draw.c: Draw all vias, pins and pads under the mask layer
    
    This fixes an issue where the rendering of a partially masked via is
    inaccurate. The down-side is that partially, or completely masked vias
    become obscured by the mask drawn above them.
    
    If the user is previewing the mask rendering, it is probably best that
    they see an accurate representation - even if this means hiding vias.

diff --git a/src/draw.c b/src/draw.c
index 3180723..946668f 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -350,15 +350,6 @@ rat_callback (const BoxType * b, void *cl)
   return 1;
 }
 
-static int
-lowvia_callback (const BoxType * b, void *cl)
-{
-  PinTypePtr via = (PinTypePtr) b;
-  if (!via->Mask)
-    DrawPlainVia (via, False);
-  return 1;
-}
-
 /* ---------------------------------------------------------------------------
  * prints assembly drawing.
  */
@@ -371,7 +362,6 @@ PrintAssembly (const BoxType * drawn_area, int side_group, int swap_ident)
   gui->set_draw_faded (Output.fgGC, 1);
   SWAP_IDENT = swap_ident;
   DrawLayerGroup (side_group, drawn_area);
-  r_search (PCB->Data->via_tree, drawn_area, NULL, lowvia_callback, NULL);
   DrawTop (drawn_area);
   gui->set_draw_faded (Output.fgGC, 0);
 
@@ -473,24 +463,6 @@ DrawEverything (BoxTypePtr drawn_area)
   if (TEST_FLAG (CHECKPLANESFLAG, PCB) && gui->gui)
     return;
 
-  /* draw vias below silk */
-  if (PCB->ViaOn && gui->gui)
-    r_search (PCB->Data->via_tree, drawn_area, NULL, lowvia_callback, NULL);
-  /* Draw the solder mask if turned on */
-  if (gui->set_layer ("componentmask", SL (MASK, TOP), 0))
-    {
-      int save_swap = SWAP_IDENT;
-      SWAP_IDENT = 0;
-      DrawMask (drawn_area);
-      SWAP_IDENT = save_swap;
-    }
-  if (gui->set_layer ("soldermask", SL (MASK, BOTTOM), 0))
-    {
-      int save_swap = SWAP_IDENT;
-      SWAP_IDENT = 1;
-      DrawMask (drawn_area);
-      SWAP_IDENT = save_swap;
-    }
   /* Draw pins, pads, vias below silk */
   if (gui->gui)
     DrawTop (drawn_area);
@@ -519,6 +491,21 @@ DrawEverything (BoxTypePtr drawn_area)
 		    &plated);
 	}
     }
+  /* Draw the solder mask if turned on */
+  if (gui->set_layer ("componentmask", SL (MASK, TOP), 0))
+    {
+      int save_swap = SWAP_IDENT;
+      SWAP_IDENT = 0;
+      DrawMask (drawn_area);
+      SWAP_IDENT = save_swap;
+    }
+  if (gui->set_layer ("soldermask", SL (MASK, BOTTOM), 0))
+    {
+      int save_swap = SWAP_IDENT;
+      SWAP_IDENT = 1;
+      DrawMask (drawn_area);
+      SWAP_IDENT = save_swap;
+    }
   /* Draw top silkscreen */
   if (gui->set_layer ("topsilk", SL (SILK, TOP), 0))
     DrawSilk (0, COMPONENT_LAYER, drawn_area);
@@ -620,8 +607,7 @@ static int
 via_callback (const BoxType * b, void *cl)
 {
   PinTypePtr via = (PinTypePtr) b;
-  if (via->Mask)
-    DrawPlainVia (via, False);
+  DrawPlainVia (via, False);
   return 1;
 }
 




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