From 2437b3c1b957a959d4756a49228a703c119d772d Mon Sep 17 00:00:00 2001 From: Jean-Samuel Reynaud Date: Wed, 23 Mar 2022 11:24:24 +0100 Subject: [PATCH] Cleanup --- ViaStitching/FillArea.py | 2 +- ViaStitching/FillAreaAction.py | 4 +- ViaStitching/FillAreaDialog.py | 177 ++++++++++++++++----------------- 3 files changed, 89 insertions(+), 94 deletions(-) diff --git a/ViaStitching/FillArea.py b/ViaStitching/FillArea.py index 947fd11..4065e01 100644 --- a/ViaStitching/FillArea.py +++ b/ViaStitching/FillArea.py @@ -39,7 +39,7 @@ def wxPrint(msg): # if sys.version[0] == '2': # maui - xrange + None else: xrange = range diff --git a/ViaStitching/FillAreaAction.py b/ViaStitching/FillAreaAction.py index ea78263..aaabe6b 100644 --- a/ViaStitching/FillAreaAction.py +++ b/ViaStitching/FillAreaAction.py @@ -29,9 +29,9 @@ def PopulateNets(anet, dlg): nets = pcbnew.GetBoard().GetNetsByName() for netname, net in nets.items(): netname = net.GetNetname() - if netname != None and netname != "": + if netname is not None and netname != "": dlg.m_cbNet.Append(netname) - if anet != None: + if anet is not None: index = dlg.m_cbNet.FindString(anet) dlg.m_cbNet.Select(index) # diff --git a/ViaStitching/FillAreaDialog.py b/ViaStitching/FillAreaDialog.py index 037be3d..a8bcade 100644 --- a/ViaStitching/FillAreaDialog.py +++ b/ViaStitching/FillAreaDialog.py @@ -1,152 +1,147 @@ # -*- coding: utf-8 -*- ########################################################################### -## Python code generated with wxFormBuilder (version 3.9.0 Jul 3 2021) -## http://www.wxformbuilder.org/ +# Python code generated with wxFormBuilder (version 3.9.0 Jul 3 2021) +# 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 ): - def __init__( self, parent ): - wx.Dialog.__init__ ( self, parent, id = wx.ID_ANY, title = u"Fill Area parameters", pos = wx.DefaultPosition, size = wx.Size( 402,580 ), style = wx.DEFAULT_DIALOG_STYLE|wx.RESIZE_BORDER ) +class FillAreaDialog (wx.Dialog): - self.SetSizeHints( wx.DefaultSize, wx.DefaultSize ) + def __init__(self, parent): + wx.Dialog.__init__(self, parent, id=wx.ID_ANY, title=u"Fill Area parameters", pos=wx.DefaultPosition, + size=wx.Size(402, 580), style=wx.DEFAULT_DIALOG_STYLE | wx.RESIZE_BORDER) - bSizer3 = wx.BoxSizer( wx.VERTICAL ) + self.SetSizeHints(wx.DefaultSize, wx.DefaultSize) - fgSizer1 = wx.FlexGridSizer( 0, 2, 0, 0 ) - fgSizer1.SetFlexibleDirection( wx.BOTH ) - fgSizer1.SetNonFlexibleGrowMode( wx.FLEX_GROWMODE_SPECIFIED ) + bSizer3 = wx.BoxSizer(wx.VERTICAL) - self.m_staticText3 = wx.StaticText( self, wx.ID_ANY, u"Via copper size (mm)", wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText3.Wrap( -1 ) + fgSizer1 = wx.FlexGridSizer(0, 2, 0, 0) + fgSizer1.SetFlexibleDirection(wx.BOTH) + fgSizer1.SetNonFlexibleGrowMode(wx.FLEX_GROWMODE_SPECIFIED) - fgSizer1.Add( self.m_staticText3, 1, wx.ALL|wx.EXPAND, 5 ) + self.m_staticText3 = wx.StaticText(self, wx.ID_ANY, u"Via copper size (mm)", wx.DefaultPosition, wx.DefaultSize, 0) + self.m_staticText3.Wrap(-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_staticText3, 1, wx.ALL | wx.EXPAND, 5) - fgSizer1.Add( self.m_SizeMM, 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_staticText9 = wx.StaticText( self, wx.ID_ANY, u"Via drill size (mm)", wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText9.Wrap( -1 ) + fgSizer1.Add(self.m_SizeMM, 1, wx.ALL | wx.EXPAND, 5) - fgSizer1.Add( self.m_staticText9, 1, wx.ALL|wx.EXPAND, 5 ) + self.m_staticText9 = wx.StaticText(self, wx.ID_ANY, u"Via drill size (mm)", wx.DefaultPosition, wx.DefaultSize, 0) + self.m_staticText9.Wrap(-1) - 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 ) + fgSizer1.Add(self.m_staticText9, 1, wx.ALL | wx.EXPAND, 5) - self.m_staticText5 = wx.StaticText( self, wx.ID_ANY, u"Via clearance (mm)", wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText5.Wrap( -1 ) + 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) - fgSizer1.Add( self.m_staticText5, 1, wx.ALL|wx.EXPAND, 5 ) + self.m_staticText5 = wx.StaticText(self, wx.ID_ANY, u"Via clearance (mm)", wx.DefaultPosition, wx.DefaultSize, 0) + self.m_staticText5.Wrap(-1) - 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 ) + fgSizer1.Add(self.m_staticText5, 1, wx.ALL | wx.EXPAND, 5) - self.m_staticText2 = wx.StaticText( self, wx.ID_ANY, u"Via grid (mm)", wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText2.Wrap( -1 ) + 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) - fgSizer1.Add( self.m_staticText2, 0, wx.ALL, 5 ) + self.m_staticText2 = wx.StaticText(self, wx.ID_ANY, u"Via grid (mm)", wx.DefaultPosition, wx.DefaultSize, 0) + self.m_staticText2.Wrap(-1) - 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 ) + 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) - fgSizer1.Add( ( 0, 0), 1, wx.EXPAND, 5 ) + fgSizer1.Add((0, 0), 1, wx.EXPAND, 5) - self.m_bitmapStitching = wx.StaticBitmap( self, wx.ID_ANY, wx.NullBitmap, wx.DefaultPosition, wx.DefaultSize, 0 ) - fgSizer1.Add( self.m_bitmapStitching, 0, wx.EXPAND, 5 ) + self.m_bitmapStitching = wx.StaticBitmap(self, wx.ID_ANY, wx.NullBitmap, wx.DefaultPosition, wx.DefaultSize, 0) + fgSizer1.Add(self.m_bitmapStitching, 0, 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 ) + 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 ) + fgSizer1.Add(self.m_staticText6, 1, wx.ALL | wx.EXPAND, 5) - m_cbNetChoices = [] - self.m_cbNet = wx.ComboBox( self, wx.ID_ANY, u"GND", wx.DefaultPosition, wx.DefaultSize, m_cbNetChoices, wx.CB_READONLY ) - fgSizer1.Add( self.m_cbNet, 1, wx.ALL|wx.EXPAND, 5 ) + m_cbNetChoices = [] + self.m_cbNet = wx.ComboBox(self, wx.ID_ANY, u"GND", wx.DefaultPosition, wx.DefaultSize, m_cbNetChoices, wx.CB_READONLY) + fgSizer1.Add(self.m_cbNet, 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 ) + 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 ) + 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 ) + 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 ) + 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_staticText42 = wx.StaticText( self, wx.ID_ANY, u"Star Pattern", wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText42.Wrap( -1 ) + self.m_staticText42 = wx.StaticText(self, wx.ID_ANY, u"Star Pattern", wx.DefaultPosition, wx.DefaultSize, 0) + self.m_staticText42.Wrap(-1) - fgSizer1.Add( self.m_staticText42, 0, wx.ALL, 5 ) + fgSizer1.Add(self.m_staticText42, 0, wx.ALL, 5) - self.m_Star = wx.CheckBox( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 ) - fgSizer1.Add( self.m_Star, 0, wx.ALL, 5 ) + self.m_Star = wx.CheckBox(self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0) + fgSizer1.Add(self.m_Star, 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 ) + 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 ) + 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) + bSizer3.Add(fgSizer1, 1, wx.EXPAND, 5) - bSizer3.Add( fgSizer1, 1, wx.EXPAND, 5 ) + bSizer1 = wx.BoxSizer(wx.HORIZONTAL) - bSizer1 = wx.BoxSizer( wx.HORIZONTAL ) + self.m_staticText101 = wx.StaticText(self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0) + self.m_staticText101.Wrap(-1) - self.m_staticText101 = wx.StaticText( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 ) - self.m_staticText101.Wrap( -1 ) + bSizer1.Add(self.m_staticText101, 1, wx.ALL, 5) - bSizer1.Add( self.m_staticText101, 1, wx.ALL, 5 ) + self.m_button1 = wx.Button(self, wx.ID_OK, u"Run", wx.DefaultPosition, wx.DefaultSize, 0) - 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.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 ) + self.m_button3_delete = wx.Button(self, wx.ID_DELETE, u"Delete Vias", wx.DefaultPosition, wx.DefaultSize, 0) + bSizer1.Add(self.m_button3_delete, 0, wx.ALL, 5) - self.m_button3_delete = wx.Button( self, wx.ID_DELETE, u"Delete Vias", wx.DefaultPosition, wx.DefaultSize, 0 ) - bSizer1.Add( self.m_button3_delete, 0, wx.ALL, 5 ) + bSizer3.Add(bSizer1, 0, wx.EXPAND | wx.ALIGN_RIGHT, 5) + self.SetSizer(bSizer3) + self.Layout() - bSizer3.Add( bSizer1, 0, wx.EXPAND|wx.ALIGN_RIGHT, 5 ) + self.Centre(wx.BOTH) + # Connect Events + #self.m_button3_delete.Bind( wx.EVT_BUTTON, self.onDeleteClick ) - self.SetSizer( bSizer3 ) - self.Layout() - - self.Centre( wx.BOTH ) - - # Connect Events - self.m_button3_delete.Bind( wx.EVT_BUTTON, self.onDeleteClick ) - - def __del__( self ): - pass - - - # Virtual event handlers, override them in your derived class - def onDeleteClick( self, event ): - event.Skip() - + def __del__(self): + pass + # Virtual event handlers, override them in your derived class + def onDeleteClick(self, event): + event.Skip()