Merge pull request #6 from sparkfun/release_candidate

v1.1.1 : add options to save the PCB and build the zone fills

Author: PaulZC

SparkFunKiCadCAMmer/cammer/cammer.py

@@ -5,6 +5,7 @@
 from datetime import datetime
 import wx
 import zipfile
+import pcbnew
 
 from pcbnew import *
 
@@ -97,12 +98,35 @@ def startCAMmer(self, args, board=None, logger=None):
                 outputPath = os.path.split(sourceBoardFile)[0] # Get the file path head
                 zipFilename = os.path.split(sourceBoardFile)[1] # Get the file path tail
                 zipFilename = os.path.join(outputPath, os.path.splitext(zipFilename)[0] + ".zip")
+
         else: # Running in a plugin
             sourceBoardFile = board.GetFileName()
             outputPath = os.path.split(sourceBoardFile)[0] # Get the file path head
             zipFilename = os.path.split(sourceBoardFile)[1] # Get the file path tail
             zipFilename = os.path.join(outputPath, os.path.splitext(zipFilename)[0] + ".zip")
 
+            # Check if PCB needs to be saved first
+            if wx.GetApp() is not None:
+                resp = wx.MessageBox("Do you want to save the PCB first?",
+                            'Save PCB?', wx.YES_NO | wx.ICON_INFORMATION)
+                if resp == wx.YES:
+                    report += "Board saved by user.\n"
+                    board.Save(board.GetFileName())
+            else:
+                board.Save(board.GetFileName())
+
+            # Check if user wants to build zone fills
+            if wx.GetApp() is not None:
+                resp = wx.MessageBox("Do you want to build the zone fills?",
+                            'Fill zones?', wx.YES_NO | wx.ICON_INFORMATION)
+                if resp == wx.YES:
+                    report += "Zones filled by user.\n"
+                    fillerTool = pcbnew.ZONE_FILLER(board)
+                    fillerTool.Fill(board.Zones())
+            else:
+                fillerTool = pcbnew.ZONE_FILLER(board)
+                fillerTool.Fill(board.Zones())
+
         if board is None:
             report += "Could not load board. Quitting.\n"
             sysExit = 2

SparkFunKiCadCAMmer/resource/_version.py

@@ -1 +1 @@
-__version__ = "1.1.0"
+__version__ = "1.1.1"