From 5c5166c46e0d76922ddb28634a5a94318652c934 Mon Sep 17 00:00:00 2001
From: Cristi Marius Tiutiu <mtiutiu@gmail.com>
Date: Mon, 12 Jun 2017 14:14:13 +0300
Subject: [PATCH] fixed project template and generated code by using
 wxformbuilder

---
 ViaStitching/FillAreaDialog.py | 168 ++++++++++++++------------------
 ViaStitching/FillAreaTpl.fbp   | 170 ++++++++++++++++-----------------
 2 files changed, 158 insertions(+), 180 deletions(-)

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 @@
             <property name="minimum_size"></property>
             <property name="name">FillAreaDialog</property>
             <property name="pos"></property>
-            <property name="size">369,369</property>
+            <property name="size">369,389</property>
             <property name="style">wxDEFAULT_DIALOG_STYLE</property>
             <property name="subclass"></property>
             <property name="title">Fill Area parameters</property>
@@ -1395,89 +1395,6 @@
                         <event name="OnUpdateUI"></event>
                     </object>
                 </object>
-                <object class="sizeritem" expanded="1">
-                    <property name="border">5</property>
-                    <property name="flag">wxALL</property>
-                    <property name="proportion">0</property>
-                    <object class="wxStaticText" expanded="1">
-                        <property name="BottomDockable">1</property>
-                        <property name="LeftDockable">1</property>
-                        <property name="RightDockable">1</property>
-                        <property name="TopDockable">1</property>
-                        <property name="aui_layer"></property>
-                        <property name="aui_name"></property>
-                        <property name="aui_position"></property>
-                        <property name="aui_row"></property>
-                        <property name="best_size"></property>
-                        <property name="bg"></property>
-                        <property name="caption"></property>
-                        <property name="caption_visible">1</property>
-                        <property name="center_pane">0</property>
-                        <property name="close_button">1</property>
-                        <property name="context_help"></property>
-                        <property name="context_menu">1</property>
-                        <property name="default_pane">0</property>
-                        <property name="dock">Dock</property>
-                        <property name="dock_fixed">0</property>
-                        <property name="docking">Left</property>
-                        <property name="enabled">1</property>
-                        <property name="fg"></property>
-                        <property name="floatable">1</property>
-                        <property name="font"></property>
-                        <property name="gripper">0</property>
-                        <property name="hidden">0</property>
-                        <property name="id">wxID_ANY</property>
-                        <property name="label">Only under selected Zone</property>
-                        <property name="max_size"></property>
-                        <property name="maximize_button">0</property>
-                        <property name="maximum_size"></property>
-                        <property name="min_size"></property>
-                        <property name="minimize_button">0</property>
-                        <property name="minimum_size"></property>
-                        <property name="moveable">1</property>
-                        <property name="name">m_staticText82</property>
-                        <property name="pane_border">1</property>
-                        <property name="pane_position"></property>
-                        <property name="pane_size"></property>
-                        <property name="permission">protected</property>
-                        <property name="pin_button">1</property>
-                        <property name="pos"></property>
-                        <property name="resize">Resizable</property>
-                        <property name="show">1</property>
-                        <property name="size"></property>
-                        <property name="style"></property>
-                        <property name="subclass"></property>
-                        <property name="toolbar_pane">0</property>
-                        <property name="tooltip"></property>
-                        <property name="window_extra_style"></property>
-                        <property name="window_name"></property>
-                        <property name="window_style"></property>
-                        <property name="wrap">-1</property>
-                        <event name="OnChar"></event>
-                        <event name="OnEnterWindow"></event>
-                        <event name="OnEraseBackground"></event>
-                        <event name="OnKeyDown"></event>
-                        <event name="OnKeyUp"></event>
-                        <event name="OnKillFocus"></event>
-                        <event name="OnLeaveWindow"></event>
-                        <event name="OnLeftDClick"></event>
-                        <event name="OnLeftDown"></event>
-                        <event name="OnLeftUp"></event>
-                        <event name="OnMiddleDClick"></event>
-                        <event name="OnMiddleDown"></event>
-                        <event name="OnMiddleUp"></event>
-                        <event name="OnMotion"></event>
-                        <event name="OnMouseEvents"></event>
-                        <event name="OnMouseWheel"></event>
-                        <event name="OnPaint"></event>
-                        <event name="OnRightDClick"></event>
-                        <event name="OnRightDown"></event>
-                        <event name="OnRightUp"></event>
-                        <event name="OnSetFocus"></event>
-                        <event name="OnSize"></event>
-                        <event name="OnUpdateUI"></event>
-                    </object>
-                </object>
                 <object class="sizeritem" expanded="1">
                     <property name="border">5</property>
                     <property name="flag">wxALL</property>
@@ -1566,6 +1483,89 @@
                         <event name="OnUpdateUI"></event>
                     </object>
                 </object>
+                <object class="sizeritem" expanded="1">
+                    <property name="border">5</property>
+                    <property name="flag">wxALL</property>
+                    <property name="proportion">0</property>
+                    <object class="wxStaticText" expanded="1">
+                        <property name="BottomDockable">1</property>
+                        <property name="LeftDockable">1</property>
+                        <property name="RightDockable">1</property>
+                        <property name="TopDockable">1</property>
+                        <property name="aui_layer"></property>
+                        <property name="aui_name"></property>
+                        <property name="aui_position"></property>
+                        <property name="aui_row"></property>
+                        <property name="best_size"></property>
+                        <property name="bg"></property>
+                        <property name="caption"></property>
+                        <property name="caption_visible">1</property>
+                        <property name="center_pane">0</property>
+                        <property name="close_button">1</property>
+                        <property name="context_help"></property>
+                        <property name="context_menu">1</property>
+                        <property name="default_pane">0</property>
+                        <property name="dock">Dock</property>
+                        <property name="dock_fixed">0</property>
+                        <property name="docking">Left</property>
+                        <property name="enabled">1</property>
+                        <property name="fg"></property>
+                        <property name="floatable">1</property>
+                        <property name="font"></property>
+                        <property name="gripper">0</property>
+                        <property name="hidden">0</property>
+                        <property name="id">wxID_ANY</property>
+                        <property name="label">Delete vias</property>
+                        <property name="max_size"></property>
+                        <property name="maximize_button">0</property>
+                        <property name="maximum_size"></property>
+                        <property name="min_size"></property>
+                        <property name="minimize_button">0</property>
+                        <property name="minimum_size"></property>
+                        <property name="moveable">1</property>
+                        <property name="name">m_staticText10</property>
+                        <property name="pane_border">1</property>
+                        <property name="pane_position"></property>
+                        <property name="pane_size"></property>
+                        <property name="permission">protected</property>
+                        <property name="pin_button">1</property>
+                        <property name="pos"></property>
+                        <property name="resize">Resizable</property>
+                        <property name="show">1</property>
+                        <property name="size"></property>
+                        <property name="style"></property>
+                        <property name="subclass"></property>
+                        <property name="toolbar_pane">0</property>
+                        <property name="tooltip"></property>
+                        <property name="window_extra_style"></property>
+                        <property name="window_name"></property>
+                        <property name="window_style"></property>
+                        <property name="wrap">-1</property>
+                        <event name="OnChar"></event>
+                        <event name="OnEnterWindow"></event>
+                        <event name="OnEraseBackground"></event>
+                        <event name="OnKeyDown"></event>
+                        <event name="OnKeyUp"></event>
+                        <event name="OnKillFocus"></event>
+                        <event name="OnLeaveWindow"></event>
+                        <event name="OnLeftDClick"></event>
+                        <event name="OnLeftDown"></event>
+                        <event name="OnLeftUp"></event>
+                        <event name="OnMiddleDClick"></event>
+                        <event name="OnMiddleDown"></event>
+                        <event name="OnMiddleUp"></event>
+                        <event name="OnMotion"></event>
+                        <event name="OnMouseEvents"></event>
+                        <event name="OnMouseWheel"></event>
+                        <event name="OnPaint"></event>
+                        <event name="OnRightDClick"></event>
+                        <event name="OnRightDown"></event>
+                        <event name="OnRightUp"></event>
+                        <event name="OnSetFocus"></event>
+                        <event name="OnSize"></event>
+                        <event name="OnUpdateUI"></event>
+                    </object>
+                </object>
                 <object class="sizeritem" expanded="1">
                     <property name="border">5</property>
                     <property name="flag">wxALL</property>
@@ -1653,7 +1653,7 @@
                         <event name="OnSize"></event>
                         <event name="OnUpdateUI"></event>
                     </object>
-                </object
+                </object>
                 <object class="sizeritem" expanded="1">
                     <property name="border">5</property>
                     <property name="flag">wxALL</property>