From e52f0db0739b83a1ac7c5a2a28ccf88282e4d997 Mon Sep 17 00:00:00 2001
From: Werner Almesberger <werner@openmoko.org>
Date: Thu, 24 Mar 2011 20:02:23 -0300
Subject: [PATCH] prettygerbv: new option  -d file  to show holes from a
 coverted drill file

- prettygerbv: new option  -d gerber-file  to show holes
- prettygerbv: set background color to #202020 to better visualize holes
---
 fab/prettygerbv | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/fab/prettygerbv b/fab/prettygerbv
index d611711..8aed9ce 100755
--- a/fab/prettygerbv
+++ b/fab/prettygerbv
@@ -16,7 +16,8 @@ COPPER="(cons 'color #(65535 50401 10000))"
 PASTE="(cons 'color #(39083 39083 50000))"
 MASK="(cons 'inverted #t) (cons 'color #(8839 53994 8178))"
 SILK="(cons 'color #(65535 65535 65535))"
-EDGE="(cons 'color #(0 0 0))"
+EDGE="(cons 'color #(65535 65535 0))"
+DRILL="(cons 'color #(0 0 0))"
 
 FRONT="(cons 'color #(65535 10000 10000))"
 BACK="(cons 'color #(30000 65535 30000))"
@@ -26,9 +27,11 @@ EDGE2="(cons 'color #(30000 40000 65535))"
 usage()
 {
 	cat <<EOF 1>&2
-usage: $0 project-name view png-file
+usage: $0 [-d file] project-name view png-file
 
   view  "front", "back", "conn", "all"
+
+  -d file   also use drill file (converted to Gerber)
 EOF
 	exit 1
 }
@@ -61,14 +64,15 @@ layers_end()
 
 run_gerbv()
 {
-	gerbv -p _gvp --dpi=600 -x png -o "$1"
+	gerbv -p _gvp --dpi=600 -b '#202020' -x png -o "$1"
 }
 
 
 front()
 {
-	layers_begin 4
+	layers_begin 5
 	layer $NAME-Front.gtl $COPPER
+	[ "$drill" ] && layer $drill $DRILL
 	layer $NAME-SoldP_Front.gtp $PASTE
 	layer $NAME-Mask_Front.gts $INV $MASK
 	layer $NAME-SilkS_Front.gto $SILK
@@ -81,8 +85,9 @@ front()
 
 back()
 {
-	layers_begin 4
+	layers_begin 5
 	layer $NAME-Back.gbl $COPPER
+	[ "$drill" ] && layer $drill $DRILL
 	layer $NAME-SoldP_Back.gbp $PASTE
 	layer $NAME-Mask_Back.gbs $INV $MASK
 	layer $NAME-SilkS_Back.gbo $SILK
@@ -97,7 +102,7 @@ back()
 
 conn()
 {
-	layers_begin 2
+	layers_begin 3
 	layer $NAME-Back.gbl $BACK
 	layer $NAME-Front.gtl $FRONT
 	layer $NAME-PCB_Edges.gbr $EDGE2
@@ -116,6 +121,12 @@ all()
 	rm -f _front.png _back.png _conn.png
 }
 
+drill=
+if [ "$1" = -d ]; then
+	drill=$2
+	shift 2
+fi
+
 [ "$4" ] && usage
 [ ! "$3" ] && usage