Merge branch 'Metallicow-Classic-Branch'

Author: PythonCHB

Diff for: .gitignore

@@ -1,3 +1,127 @@
 .DS_Store
 
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+pip-wheel-metadata/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+.hypothesis/
+.pytest_cache/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+.python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don’t work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# celery beat schedule file
+celerybeat-schedule
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
 

Diff for: AboutDialog.py

@@ -37,11 +37,11 @@ def __init__(self, parent, icon1=None,
         self.urls = urls
         self.licence = licence
         self.developers = developers
-        
+
         self.Build()
-        
+
     def Build(self):
-        
+
         # Build the header
         Header = wx.BoxSizer(wx.HORIZONTAL)
         if self.icon1:
@@ -66,9 +66,9 @@ def Build(self):
 
         # Now the rest;
         MainSizer = wx.BoxSizer(wx.VERTICAL)
-        
+
         MainSizer.Add(Header, 0, wx.EXPAND|wx.ALIGN_CENTER|wx.ALL, 5)
-        
+
         if self.long_name:
             Label = wx.StaticText(self, label=self.long_name)
             of = Label.GetFont()
@@ -89,11 +89,11 @@ def Build(self):
             #of = Label.GetFont()
             #Font = wx.Font(int(of.GetPointSize() * 1.5), of.GetFamily(), wx.NORMAL, wx.NORMAL)
             #Label.SetFont(Font)
-            
+
             Label.Wrap(max(250, 0.9*width))
             MainSizer.Add(Label, 0, wx.ALL|wx.ALIGN_CENTER, 5)
 
-            
+
         if self.licence:
             Label = wx.StaticText(self, label="License:")
             of = Label.GetFont()
@@ -110,12 +110,12 @@ def Build(self):
             Font = wx.Font(of.GetPointSize(), of.GetFamily(), wx.NORMAL, wx.BOLD)
             Label.SetFont(Font)
             MainSizer.Add(Label, 0, wx.ALL|wx.ALIGN_LEFT, 5)
-           
+
             for developer in self.developers:
                 Label = wx.StaticText(self, label="          "+developer)
                 MainSizer.Add(Label, 0, wx.ALL|wx.ALIGN_LEFT, 0)
-            
-        if self.urls:            
+
+        if self.urls:
             Label = wx.StaticText(self, label="For more information:")
             of = Label.GetFont()
             Font = wx.Font(of.GetPointSize(), of.GetFamily(), wx.NORMAL, wx.BOLD)
@@ -126,13 +126,13 @@ def Build(self):
                                      label=url,
                                      URL=url)
                 MainSizer.Add(Link, 0, wx.ALL|wx.ALIGN_CENTER, 2)
-        
+
         MainSizer.Add((1,5),1)
         MainSizer.Add(wx.Button(self, id=wx.ID_OK, label="Dismiss"), 0, wx.ALL|wx.ALIGN_RIGHT,5)
         SpaceSizer = wx.BoxSizer(wx.VERTICAL)
         SpaceSizer.Add(MainSizer, 0, wx.ALL, 10)
         self.SetSizerAndFit(SpaceSizer)
-        
+
 if __name__ == "__main__":
 
     a = wx.App(False)
@@ -147,5 +147,5 @@ def Build(self):
                             "mailto:[email protected]"],
                     licence="This is a short description of the license used for the program.",
                     developers = ["A Developer", "Another Developer"])
-    
+
     d.ShowModal()

Diff for: Append_test.py

@@ -12,26 +12,26 @@ def __init__(self):
                          wx.DefaultPosition,
                          size=(800,600),
                          style=wx.DEFAULT_FRAME_STYLE | wx.NO_FULL_REPAINT_ON_RESIZE)
-       
-        self.objects = []        
+
+        self.objects = []
         self.dragImage = None
         self.DragPaper = None
-        self.hiliteObjects = None        
+        self.hiliteObjects = None
         self.lines = []
         self.maxWidth  = 1000
         self.maxHeight = 1000
         self.x = self.y = 0
         self.curLine = []
         self.drawing = False
-        
+
         self.Paper = wx.Bitmap("Paper.BMP", wx.BITMAP_TYPE_BMP)
         if self.Paper.Ok():
             print "bitmap loaded OK"
         else:
             raise Exception("bitmap DID NOT load OK")
 
         self.DrawTextOnPaper()
-                
+
 #--------------------------------------------------------------------------
         if BUFFERED:
             self.buffer = wx.EmptyBitmap(self.maxWidth, self.maxHeight)
@@ -60,27 +60,27 @@ def DrawTextOnPaper(self):
         dc.SetFont(wx.Font(36, wx.MODERN, wx.NORMAL, wx.NORMAL, 0, "Arial"))
         dc.SetTextForeground(wx.BLACK)
         dc.DrawText(text, 155, 25)
-        
+
     def DoDrawing(self, dc, printing=False):
-        dc.BeginDrawing()    
-        
+        dc.BeginDrawing()
+
 ##        l1 = ['a','b','c','d']
 ##        text = " "+"".join(l1)
 ##        bg_colour = wx.Colour(57, 115, 57)  # matches the bg image
 ##        dc.SetFont(wx.Font(36, wx.MODERN, wx.NORMAL, wx.NORMAL, 0, "Arial"))
 ##        dc.SetTextForeground(wx.BLACK)
 ##        te = dc.GetTextExtent(text)
-        
-        
+
+
         dc.DrawBitmap(self.Paper, 200, 20, True)
-        
-                
+
+
         #dc = wx.MemoryDC()
         #dc.SelectObject(self.manuscript)
         #self.DoDrawing(dc)
-        
+
 ##        dc.DrawText(text, 225, 25)
-        
+
         dc.EndDrawing()
 #--------------------------------------------------------------------------
 class MyApp(wx.App):
@@ -95,4 +95,3 @@ def OnInit(self):
 if __name__ == "__main__":
     app = MyApp(0)
     app.MainLoop()
-

Diff for: BitmapFromBufferTest.py

@@ -12,10 +12,10 @@
 class BitmapWindow(wx.Window):
     def __init__(self, parent, bytearray, *args, **kwargs):
         wx.Window.__init__(self, parent, *args, **kwargs)
-        
+
         self.bytearray = bytearray
         self.Bind(wx.EVT_PAINT, self.OnPaint)
-        
+
     def OnPaint(self, evt):
         dc = wx.PaintDC(self)
         bmp = wx.BitmapFromBufferRGBA(200,200, self.bytearray)

Diff for: BitmapFromPILTest.py

@@ -21,7 +21,7 @@ def __init__(self, title = "Bitmap Demo"):
         self.bitmap = wx.BitmapFromBuffer(w, h, image.tostring() )
 
         self.Bind(wx.EVT_PAINT, self.OnPaint)
-        
+
     def OnPaint(self, evt):
         dc = wx.PaintDC(self)
         dc.DrawBitmap(self.bitmap, 10, 10 )

Diff for: BufferedWithControls.py

@@ -63,7 +63,7 @@ def UpdateDrawing(self):
         dc.SelectObject(self._Buffer)
         self.Draw(dc)
         self.Refresh() # This forces a Paint event, so the screen gets updated.
-        #self.Update() # If it's not getting updated fast enough, this should force it. 
+        #self.Update() # If it's not getting updated fast enough, this should force it.
 
 class DrawWindow(wxBufferedWindow):
     def __init__(self, parent, id = -1):
@@ -119,7 +119,7 @@ def OnBitmapButton(self,event=None):
     def CheckB(self):
         self.ID_SOSO = wx.NewId()
         self.checkB = wx.CheckBox(self, self.ID_SOSO, "test", pos = (50, 50))
-        
+
 class TestFrame(wx.Frame):
     def __init__(self):
         wx.Frame.__init__(self, None, -1, "Double Buffered Test",

Diff for: ButtonArray.py

@@ -6,20 +6,20 @@ class ButtonArrayPanel(wx.Panel):
     def __init__(self, *args, **kwargs):
         wx.Panel.__init__(self, *args, **kwargs)
         Sizer =  wx.GridSizer(16, 2, 0, 0)
-        
+
         for i in range(32):
             B = wx.Button(self, label = "button %i"%i)
             B.Bind(wx.EVT_BUTTON,
                    lambda evt, but_num = i: self.OnButton(evt, but_num) )
             Sizer.Add(B, 0, wx.GROW|wx.ALL, 4)
-        
+
         self.SetSizerAndFit(Sizer)
-                   
+
     def OnButton(self, evt, but_num):
         print "Button number: %i clicked"%but_num
-        
-            
-    
+
+
+
 
 class DemoFrame(wx.Frame):
 
@@ -39,10 +39,10 @@ def __init__(self, title = "Button Array Demo"):
 
         self.Bind(wx.EVT_CLOSE, self.OnQuit)
 
-        
+
     def OnQuit(self,Event):
         self.Destroy()
-        
+
 
 app = wx.App(False)
 frame = DemoFrame()