util/BitmapLibrary.py
changeset 1784 64beb9e9c749
parent 1782 5b6ad7a7fd9d
child 1881 091005ec69c4
--- a/util/BitmapLibrary.py	Mon Aug 21 20:17:19 2017 +0000
+++ b/util/BitmapLibrary.py	Mon Aug 21 23:22:58 2017 +0300
@@ -26,45 +26,48 @@
 
 import wx
 
-#-------------------------------------------------------------------------------
+# -------------------------------------------------------------------------------
 #                            Library Structures
-#-------------------------------------------------------------------------------
+# -------------------------------------------------------------------------------
 
 BitmapLibrary = {}
 BitmapFolders = []
 
-#-------------------------------------------------------------------------------
+# -------------------------------------------------------------------------------
 #                             Library Helpers
-#-------------------------------------------------------------------------------
+# -------------------------------------------------------------------------------
+
 
 def AddBitmapFolder(path):
     if os.path.exists(path) and os.path.isdir(path) and path not in BitmapFolders:
         BitmapFolders.append(path)
 
+
 def SearchBitmap(bmp_name):
     for folder in BitmapFolders:
         bmp_path = os.path.join(folder, bmp_name + ".png")
         if os.path.isfile(bmp_path):
             return wx.Bitmap(bmp_path)
     return None
-    
+
+
 def GetBitmap(bmp_name1, bmp_name2=None, size=None):
     bmp = BitmapLibrary.get((bmp_name1, bmp_name2, size))
     if bmp is not None:
         return bmp
-    
+
     if bmp_name2 is None:
         bmp = SearchBitmap(bmp_name1)
     else:
         # Bitmap with two icon
         bmp1 = SearchBitmap(bmp_name1)
         bmp2 = SearchBitmap(bmp_name2)
-        
+
         if bmp1 is not None and bmp2 is not None:
             # Calculate bitmap size
             width = bmp1.GetWidth() + bmp2.GetWidth() - 1
             height = max(bmp1.GetHeight(), bmp2.GetHeight())
-            
+
             # Create bitmap with both icons
             bmp = wx.EmptyBitmap(width, height)
             dc = wx.MemoryDC()
@@ -73,13 +76,13 @@
             dc.DrawBitmap(bmp1, 0, 0)
             dc.DrawBitmap(bmp2, bmp1.GetWidth() - 1, 0)
             dc.Destroy()
-        
+
         elif bmp1 is not None:
             bmp = bmp1
         elif bmp2 is not None:
             bmp = bmp2
-    
+
     if bmp is not None:
         BitmapLibrary[(bmp_name1, bmp_name2, size)] = bmp
-        
+
     return bmp