Cleanup, rendering fixes.

fixed rendering of tented vias
fixed rendering of semi-transparent layers
fixed file type detection issues
added some examples

1 files changed, 16 insertions, 7 deletions

diff --git a/gerber/render/theme.py b/gerber/render/theme.py
index 4d325c5..d382a8d 100644
--- a/gerber/render/theme.py
+++ b/gerber/render/theme.py
@@ -25,12 +25,12 @@ COLORS = {
     'green': (0.0, 1.0, 0.0),
     'blue': (0.0, 0.0, 1.0),
     'fr-4': (0.290, 0.345, 0.0),
-    'green soldermask': (0.0, 0.612, 0.396),
+    'green soldermask': (0.0, 0.412, 0.278),
     'blue soldermask': (0.059, 0.478, 0.651),
     'red soldermask': (0.968, 0.169, 0.165),
     'black soldermask': (0.298, 0.275, 0.282),
     'purple soldermask': (0.2, 0.0, 0.334),
-    'enig copper': (0.686, 0.525, 0.510),
+    'enig copper': (0.694, 0.533, 0.514),
     'hasl copper': (0.871, 0.851, 0.839)
 }
 
@@ -39,11 +39,11 @@ class Theme(object):
 
     def __init__(self, name=None, **kwargs):
         self.name = 'Default' if name is None else name
-        self.background = kwargs.get('background', RenderSettings(COLORS['black'], alpha=0.0))
+        self.background = kwargs.get('background', RenderSettings(COLORS['fr-4']))
         self.topsilk = kwargs.get('topsilk', RenderSettings(COLORS['white']))
         self.bottomsilk = kwargs.get('bottomsilk', RenderSettings(COLORS['white'], mirror=True))
-        self.topmask = kwargs.get('topmask', RenderSettings(COLORS['green soldermask'], alpha=0.8, invert=True))
-        self.bottommask = kwargs.get('bottommask', RenderSettings(COLORS['green soldermask'], alpha=0.8, invert=True, mirror=True))
+        self.topmask = kwargs.get('topmask', RenderSettings(COLORS['green soldermask'], alpha=0.85, invert=True))
+        self.bottommask = kwargs.get('bottommask', RenderSettings(COLORS['green soldermask'], alpha=0.85, invert=True, mirror=True))
         self.top = kwargs.get('top', RenderSettings(COLORS['hasl copper']))
         self.bottom = kwargs.get('bottom', RenderSettings(COLORS['hasl copper'], mirror=True))
         self.drill = kwargs.get('drill', RenderSettings(COLORS['black']))
@@ -60,12 +60,21 @@ class Theme(object):
 THEMES = {
     'default': Theme(),
     'OSH Park': Theme(name='OSH Park',
+                      background=RenderSettings(COLORS['purple soldermask']),
                       top=RenderSettings(COLORS['enig copper']),
                       bottom=RenderSettings(COLORS['enig copper'], mirror=True),
-                      topmask=RenderSettings(COLORS['purple soldermask'], alpha=0.8, invert=True),
-                      bottommask=RenderSettings(COLORS['purple soldermask'], alpha=0.8, invert=True, mirror=True)),
+                      topmask=RenderSettings(COLORS['purple soldermask'], alpha=0.85, invert=True),
+                      bottommask=RenderSettings(COLORS['purple soldermask'], alpha=0.85, invert=True, mirror=True),
+                      topsilk=RenderSettings(COLORS['white'], alpha=0.8),
+                      bottomsilk=RenderSettings(COLORS['white'], alpha=0.8, mirror=True)),
 
     'Blue': Theme(name='Blue',
                   topmask=RenderSettings(COLORS['blue soldermask'], alpha=0.8, invert=True),
                   bottommask=RenderSettings(COLORS['blue soldermask'], alpha=0.8, invert=True)),
+
+    'Transparent Copper': Theme(name='Transparent',
+                                background=RenderSettings((0.9, 0.9, 0.9)),
+                                top=RenderSettings(COLORS['red'], alpha=0.5),
+                                bottom=RenderSettings(COLORS['blue'], alpha=0.5),
+                                drill=RenderSettings((0.3, 0.3, 0.3))),
 }