Annular Checker & Snap2Grid update

This commit is contained in:
easyw
2020-02-24 11:50:36 +01:00
parent dad24a7948
commit 68fc268b70
9 changed files with 272 additions and 161 deletions

View File

@ -45,7 +45,7 @@
<property name="minimum_size"></property>
<property name="name">AnnularDlg</property>
<property name="pos"></property>
<property name="size">380,317</property>
<property name="size">533,529</property>
<property name="style">wxCAPTION|wxCLOSE_BOX|wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
<property name="subclass"></property>
<property name="title">Annular Ring Checker</property>

View File

@ -17,7 +17,7 @@ import wx.xrc
class AnnularDlg ( wx.Dialog ):
def __init__( self, parent ):
wx.Dialog.__init__ ( self, parent, id = wx.ID_ANY, title = u"Annular Ring Checker", pos = wx.DefaultPosition, size = wx.Size( 380,317 ), style = wx.CAPTION|wx.CLOSE_BOX|wx.DEFAULT_DIALOG_STYLE|wx.RESIZE_BORDER )
wx.Dialog.__init__ ( self, parent, id = wx.ID_ANY, title = u"Annular Ring Checker", pos = wx.DefaultPosition, size = wx.Size( 533,529 ), style = wx.CAPTION|wx.CLOSE_BOX|wx.DEFAULT_DIALOG_STYLE|wx.RESIZE_BORDER )
self.SetSizeHints( wx.DefaultSize, wx.DefaultSize )

View File

@ -45,8 +45,8 @@
<property name="minimum_size"></property>
<property name="name">AnnularResultDlg</property>
<property name="pos"></property>
<property name="size">383,521</property>
<property name="style">wxDEFAULT_DIALOG_STYLE</property>
<property name="size">539,659</property>
<property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
<property name="subclass">; forward_declare</property>
<property name="title">Annular Checker</property>
<property name="tooltip"></property>
@ -69,7 +69,7 @@
<property name="permission">none</property>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="flag">wxALL|wxEXPAND</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="1">
<property name="BottomDockable">1</property>
@ -163,14 +163,14 @@
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="min_size">-1,-1</property>
<property name="minimize_button">0</property>
<property name="minimum_size">-1,400</property>
<property name="moveable">1</property>
<property name="name">m_richTextResult</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="pane_size">-1,-1</property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
@ -192,7 +192,7 @@
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="flag">wxALIGN_TOP|wxEXPAND</property>
<property name="proportion">1</property>
<object class="wxGridSizer" expanded="1">
<property name="cols">2</property>

View File

@ -18,7 +18,7 @@ import wx.richtext
class AnnularResultDlg ( wx.Dialog ):
def __init__( self, parent ):
wx.Dialog.__init__ ( self, parent, id = wx.ID_ANY, title = u"Annular Checker", pos = wx.DefaultPosition, size = wx.Size( 383,521 ), style = wx.DEFAULT_DIALOG_STYLE )
wx.Dialog.__init__ ( self, parent, id = wx.ID_ANY, title = u"Annular Checker", pos = wx.DefaultPosition, size = wx.Size( 539,659 ), style = wx.DEFAULT_DIALOG_STYLE|wx.RESIZE_BORDER )
self.SetSizeHints( wx.DefaultSize, wx.DefaultSize )
@ -29,7 +29,7 @@ class AnnularResultDlg ( wx.Dialog ):
self.m_staticTitle = wx.StaticText( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, 0 )
self.m_staticTitle.Wrap( -1 )
bSizer2.Add( self.m_staticTitle, 0, wx.ALL, 5 )
bSizer2.Add( self.m_staticTitle, 0, wx.ALL|wx.EXPAND, 5 )
self.m_richTextResult = wx.richtext.RichTextCtrl( self, wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, wx.TE_READONLY|wx.VSCROLL|wx.HSCROLL|wx.NO_BORDER|wx.WANTS_CHARS )
self.m_richTextResult.SetMinSize( wx.Size( -1,400 ) )
@ -45,7 +45,7 @@ class AnnularResultDlg ( wx.Dialog ):
gSizer3.Add( self.copy_btn, 0, wx.ALL, 5 )
bSizer2.Add( gSizer3, 1, wx.EXPAND, 5 )
bSizer2.Add( gSizer3, 1, wx.ALIGN_TOP|wx.EXPAND, 5 )
bSizer1.Add( bSizer2, 1, wx.EXPAND, 5 )

View File

@ -15,7 +15,7 @@
global mm_ius, DRL_EXTRA, AR_SET, AR_SET_V, DRL_EXTRA_ius, MIN_AR_SIZE, MIN_AR_SIZE_V, found_violations, LogMsg, ___version___
___version___="1.6.3"
___version___="1.6.4"
#wx.LogMessage("My message")
mm_ius = 1000000.0