diff --git a/ViaStitching/FillAreaDialog.py b/ViaStitching/FillAreaDialog.py
index 268ee51..f5d9100 100644
--- a/ViaStitching/FillAreaDialog.py
+++ b/ViaStitching/FillAreaDialog.py
@@ -1,138 +1,116 @@
# -*- coding: utf-8 -*-
###########################################################################
-# Python code generated with wxFormBuilder (version Feb 16 2016)
-# http://www.wxformbuilder.org/
+## Python code generated with wxFormBuilder (version Jun 12 2017)
+## http://www.wxformbuilder.org/
##
-# PLEASE DO "NOT" EDIT THIS FILE!
+## PLEASE DO "NOT" EDIT THIS FILE!
###########################################################################
import wx
import wx.xrc
###########################################################################
-# Class FillAreaDialog
+## Class FillAreaDialog
###########################################################################
+class FillAreaDialog ( wx.Dialog ):
-class FillAreaDialog (wx.Dialog):
+ def __init__( self, parent ):
+ wx.Dialog.__init__ ( self, parent, id = wx.ID_ANY, title = u"Fill Area parameters", pos = wx.DefaultPosition, size = wx.Size( 369,389 ), style = wx.DEFAULT_DIALOG_STYLE )
- def __init__(self, parent):
- wx.Dialog.__init__(self, parent, id=wx.ID_ANY, title=u"Fill Area parameters",
- pos=wx.DefaultPosition, size=wx.Size(369, 369), style=wx.DEFAULT_DIALOG_STYLE)
+ self.SetSizeHintsSz( wx.DefaultSize, wx.DefaultSize )
- self.SetSizeHintsSz(wx.DefaultSize, wx.DefaultSize)
+ fgSizer1 = wx.FlexGridSizer( 0, 2, 0, 0 )
+ fgSizer1.SetFlexibleDirection( wx.BOTH )
+ fgSizer1.SetNonFlexibleGrowMode( wx.FLEX_GROWMODE_SPECIFIED )
- fgSizer1 = wx.FlexGridSizer(0, 2, 0, 0)
- fgSizer1.SetFlexibleDirection(wx.BOTH)
- fgSizer1.SetNonFlexibleGrowMode(wx.FLEX_GROWMODE_SPECIFIED)
+ self.m_staticText3 = wx.StaticText( self, wx.ID_ANY, u"Via copper size", wx.DefaultPosition, wx.DefaultSize, 0 )
+ self.m_staticText3.Wrap( -1 )
+ fgSizer1.Add( self.m_staticText3, 1, wx.ALL|wx.EXPAND, 5 )
- self.m_staticText3 = wx.StaticText(
- self, wx.ID_ANY, u"Via copper size", wx.DefaultPosition, wx.DefaultSize, 0)
- self.m_staticText3.Wrap(-1)
- fgSizer1.Add(self.m_staticText3, 1, wx.ALL | wx.EXPAND, 5)
+ self.m_SizeMM = wx.TextCtrl( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 )
+ self.m_SizeMM.SetMinSize( wx.Size( 1000,-1 ) )
- self.m_SizeMM = wx.TextCtrl(
- self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0)
- self.m_SizeMM.SetMinSize(wx.Size(1000, -1))
+ fgSizer1.Add( self.m_SizeMM, 1, wx.ALL|wx.EXPAND, 5 )
- fgSizer1.Add(self.m_SizeMM, 1, wx.ALL | wx.EXPAND, 5)
+ self.m_staticText9 = wx.StaticText( self, wx.ID_ANY, u"Via drill size", wx.DefaultPosition, wx.DefaultSize, 0 )
+ self.m_staticText9.Wrap( -1 )
+ fgSizer1.Add( self.m_staticText9, 1, wx.ALL|wx.EXPAND, 5 )
- self.m_staticText9 = wx.StaticText(
- self, wx.ID_ANY, u"Via drill size", wx.DefaultPosition, wx.DefaultSize, 0)
- self.m_staticText9.Wrap(-1)
- fgSizer1.Add(self.m_staticText9, 1, wx.ALL | wx.EXPAND, 5)
+ self.m_DrillMM = wx.TextCtrl( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 )
+ fgSizer1.Add( self.m_DrillMM, 1, wx.ALL|wx.EXPAND, 5 )
- self.m_DrillMM = wx.TextCtrl(
- self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0)
- fgSizer1.Add(self.m_DrillMM, 1, wx.ALL | wx.EXPAND, 5)
+ self.m_staticText5 = wx.StaticText( self, wx.ID_ANY, u"Via clearance", wx.DefaultPosition, wx.DefaultSize, 0 )
+ self.m_staticText5.Wrap( -1 )
+ fgSizer1.Add( self.m_staticText5, 1, wx.ALL|wx.EXPAND, 5 )
- self.m_staticText5 = wx.StaticText(
- self, wx.ID_ANY, u"Via clearance", wx.DefaultPosition, wx.DefaultSize, 0)
- self.m_staticText5.Wrap(-1)
- fgSizer1.Add(self.m_staticText5, 1, wx.ALL | wx.EXPAND, 5)
+ self.m_ClearanceMM = wx.TextCtrl( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 )
+ fgSizer1.Add( self.m_ClearanceMM, 1, wx.ALL|wx.EXPAND, 5 )
- self.m_ClearanceMM = wx.TextCtrl(
- self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0)
- fgSizer1.Add(self.m_ClearanceMM, 1, wx.ALL | wx.EXPAND, 5)
+ self.m_staticText6 = wx.StaticText( self, wx.ID_ANY, u"Net name", wx.DefaultPosition, wx.DefaultSize, 0 )
+ self.m_staticText6.Wrap( -1 )
+ fgSizer1.Add( self.m_staticText6, 1, wx.ALL|wx.EXPAND, 5 )
- self.m_staticText6 = wx.StaticText(
- self, wx.ID_ANY, u"Net name", wx.DefaultPosition, wx.DefaultSize, 0)
- self.m_staticText6.Wrap(-1)
- fgSizer1.Add(self.m_staticText6, 1, wx.ALL | wx.EXPAND, 5)
+ self.m_Netname = wx.TextCtrl( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 )
+ fgSizer1.Add( self.m_Netname, 1, wx.ALL|wx.EXPAND, 5 )
- self.m_Netname = wx.TextCtrl(
- self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0)
- fgSizer1.Add(self.m_Netname, 1, wx.ALL | wx.EXPAND, 5)
+ self.m_staticText2 = wx.StaticText( self, wx.ID_ANY, u"Step between via", wx.DefaultPosition, wx.DefaultSize, 0 )
+ self.m_staticText2.Wrap( -1 )
+ fgSizer1.Add( self.m_staticText2, 0, wx.ALL, 5 )
- self.m_staticText2 = wx.StaticText(
- self, wx.ID_ANY, u"Step between via", wx.DefaultPosition, wx.DefaultSize, 0)
- self.m_staticText2.Wrap(-1)
- fgSizer1.Add(self.m_staticText2, 0, wx.ALL, 5)
+ self.m_StepMM = wx.TextCtrl( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 )
+ fgSizer1.Add( self.m_StepMM, 1, wx.ALL|wx.EXPAND, 5 )
- self.m_StepMM = wx.TextCtrl(
- self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0)
- fgSizer1.Add(self.m_StepMM, 1, wx.ALL | wx.EXPAND, 5)
+ self.m_staticText7 = wx.StaticText( self, wx.ID_ANY, u"Debug mode", wx.DefaultPosition, wx.DefaultSize, 0 )
+ self.m_staticText7.Wrap( -1 )
+ fgSizer1.Add( self.m_staticText7, 1, wx.ALL|wx.EXPAND, 5 )
- self.m_staticText7 = wx.StaticText(
- self, wx.ID_ANY, u"Debug mode", wx.DefaultPosition, wx.DefaultSize, 0)
- self.m_staticText7.Wrap(-1)
- fgSizer1.Add(self.m_staticText7, 1, wx.ALL | wx.EXPAND, 5)
+ self.m_Debug = wx.CheckBox( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 )
+ fgSizer1.Add( self.m_Debug, 1, wx.ALL|wx.EXPAND, 5 )
- self.m_Debug = wx.CheckBox(
- self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0)
- fgSizer1.Add(self.m_Debug, 1, wx.ALL | wx.EXPAND, 5)
+ self.m_staticText8 = wx.StaticText( self, wx.ID_ANY, u"Random it", wx.DefaultPosition, wx.DefaultSize, 0 )
+ self.m_staticText8.Wrap( -1 )
+ fgSizer1.Add( self.m_staticText8, 0, wx.ALL, 5 )
- self.m_staticText8 = wx.StaticText(
- self, wx.ID_ANY, u"Random it", wx.DefaultPosition, wx.DefaultSize, 0)
- self.m_staticText8.Wrap(-1)
- fgSizer1.Add(self.m_staticText8, 0, wx.ALL, 5)
+ self.m_Random = wx.CheckBox( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 )
+ fgSizer1.Add( self.m_Random, 0, wx.ALL, 5 )
- self.m_Random = wx.CheckBox(
- self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0)
- fgSizer1.Add(self.m_Random, 0, wx.ALL, 5)
+ self.m_staticText81 = wx.StaticText( self, wx.ID_ANY, u"Only under selected Zone", wx.DefaultPosition, wx.DefaultSize, 0 )
+ self.m_staticText81.Wrap( -1 )
+ fgSizer1.Add( self.m_staticText81, 0, wx.ALL, 5 )
- self.m_staticText81 = wx.StaticText(
- self, wx.ID_ANY, u"Only under selected Zone", wx.DefaultPosition, wx.DefaultSize, 0)
- self.m_staticText81.Wrap(-1)
- fgSizer1.Add(self.m_staticText81, 0, wx.ALL, 5)
+ self.m_only_selected = wx.CheckBox( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 )
+ fgSizer1.Add( self.m_only_selected, 0, wx.ALL, 5 )
- self.m_only_selected = wx.CheckBox(
- self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0)
- fgSizer1.Add(self.m_only_selected, 0, wx.ALL, 5)
+ self.m_staticText10 = wx.StaticText( self, wx.ID_ANY, u"Delete vias", wx.DefaultPosition, wx.DefaultSize, 0 )
+ self.m_staticText10.Wrap( -1 )
+ fgSizer1.Add( self.m_staticText10, 0, wx.ALL, 5 )
- self.m_staticText82 = wx.StaticText(
- self, wx.ID_ANY, u"Delete vias", wx.DefaultPosition, wx.DefaultSize, 0)
- self.m_staticText82.Wrap(-1)
- fgSizer1.Add(self.m_staticText82, 0, wx.ALL, 5)
+ self.m_delete_vias = wx.CheckBox( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 )
+ fgSizer1.Add( self.m_delete_vias, 0, wx.ALL, 5 )
- self.m_delete_vias = wx.CheckBox(
- self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0)
- fgSizer1.Add(self.m_delete_vias, 0, wx.ALL, 5)
+ self.m_staticText71 = wx.StaticText( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 )
+ self.m_staticText71.Wrap( -1 )
+ fgSizer1.Add( self.m_staticText71, 0, wx.ALL, 5 )
- self.m_staticText71 = wx.StaticText(
- self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0)
- self.m_staticText71.Wrap(-1)
- fgSizer1.Add(self.m_staticText71, 0, wx.ALL, 5)
+ bSizer1 = wx.BoxSizer( wx.HORIZONTAL )
- bSizer1 = wx.BoxSizer(wx.HORIZONTAL)
+ self.m_button1 = wx.Button( self, wx.ID_OK, u"Run", wx.DefaultPosition, wx.DefaultSize, 0 )
+ self.m_button1.SetDefault()
+ bSizer1.Add( self.m_button1, 0, wx.ALL|wx.ALIGN_CENTER_VERTICAL, 5 )
- self.m_button1 = wx.Button(
- self, wx.ID_OK, u"Run", wx.DefaultPosition, wx.DefaultSize, 0)
- self.m_button1.SetDefault()
- bSizer1.Add(self.m_button1, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL, 5)
+ self.m_button2 = wx.Button( self, wx.ID_CANCEL, u"Cancel", wx.DefaultPosition, wx.DefaultSize, 0 )
+ bSizer1.Add( self.m_button2, 0, wx.ALL, 5 )
- self.m_button2 = wx.Button(
- self, wx.ID_CANCEL, u"Cancel", wx.DefaultPosition, wx.DefaultSize, 0)
- bSizer1.Add(self.m_button2, 0, wx.ALL, 5)
- fgSizer1.Add(bSizer1, 1, wx.ALIGN_CENTER_HORIZONTAL |
- wx.ALIGN_CENTER_VERTICAL, 5)
+ fgSizer1.Add( bSizer1, 1, wx.ALIGN_CENTER_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL, 5 )
- self.SetSizer(fgSizer1)
- self.Layout()
- self.Centre(wx.BOTH)
+ self.SetSizer( fgSizer1 )
+ self.Layout()
- def __del__(self):
- pass
+ self.Centre( wx.BOTH )
+
+ def __del__( self ):
+ pass
diff --git a/ViaStitching/FillAreaTpl.fbp b/ViaStitching/FillAreaTpl.fbp
index 1a21d58..cb1f39c 100644
--- a/ViaStitching/FillAreaTpl.fbp
+++ b/ViaStitching/FillAreaTpl.fbp
@@ -44,7 +44,7 @@
FillAreaDialog
- 369,369
+ 369,389
wxDEFAULT_DIALOG_STYLE
Fill Area parameters
@@ -1395,89 +1395,6 @@
-
5
wxALL
@@ -1566,6 +1483,89 @@
+
+ 5
+ wxALL
+ 0
+
+ 1
+ 1
+ 1
+ 1
+
+
+
+
+
+
+
+ 1
+ 0
+ 1
+
+ 1
+ 0
+ Dock
+ 0
+ Left
+ 1
+
+ 1
+
+ 0
+ 0
+ wxID_ANY
+ Delete vias
+
+ 0
+
+
+ 0
+
+ 1
+ m_staticText10
+ 1
+
+
+ protected
+ 1
+
+ Resizable
+ 1
+
+
+
+ 0
+
+
+
+
+ -1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
5
wxALL
@@ -1653,7 +1653,7 @@
-
5
wxALL