cisstInteractive: fixed bitmaps

Author: pkazanzides

cisstInteractive/code/irepy/ireImages.py

@@ -34,15 +34,14 @@
 import wx
 import zlib
 if sys.version_info.major == 2:
-    from cStringIO import StringIO
-    BytesIO = StringIO
+    from cStringIO import StringIO as BytesIO
 else:
-    from io import StringIO, BytesIO
+    from io import BytesIO
 
 #----------------------------------------------------------------------
 def getSmallUpArrowData():
     return \
-"\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x10\x00\x00\x00\x10\x08\x06\
+b"\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x10\x00\x00\x00\x10\x08\x06\
 \x00\x00\x00\x1f\xf3\xffa\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\
 \x00\x00<IDAT8\x8dcddbf\xa0\x040Q\xa4{h\x18\xf0\xff\xdf\xdf\xffd\x1b\x00\xd3\
 \x8c\xcf\x10\x9c\x06\xa0k\xc2e\x08m\xc2\x00\x97m\xd8\xc41\x0c \x14h\xe8\xf2\
@@ -54,15 +53,15 @@ def getSmallUpArrowBitmap():
 
 def getSmallUpArrowImage():
     try:
-        stream = StringIO(getSmallUpArrowData())
+        stream = BytesIO(getSmallUpArrowData())
     except TypeError as e:
         print('getSmallUpArrowImage: ', e)
     return wx.Image(stream)
 
 #----------------------------------------------------------------------
 def getSmallDnArrowData():
     return \
-"\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x10\x00\x00\x00\x10\x08\x06\
+b"\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x10\x00\x00\x00\x10\x08\x06\
 \x00\x00\x00\x1f\xf3\xffa\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\
 \x00\x00HIDAT8\x8dcddbf\xa0\x040Q\xa4{\xd4\x00\x06\x06\x06\x06\x06\x16t\x81\
 \xff\xff\xfe\xfe'\xa4\x89\x91\x89\x99\x11\xa7\x0b\x90%\ti\xc6j\x00>C\xb0\x89\
@@ -74,7 +73,7 @@ def getSmallDnArrowBitmap():
 
 def getSmallDnArrowImage():
     try:
-        stream = StringIO(getSmallDnArrowData())
+        stream = BytesIO(getSmallDnArrowData())
     except TypeError as e:
         print('getSmallDnArrowImage: ', e)
     return wx.Image(stream)

cisstInteractive/code/irepy/ireListCtrlPanel.py

@@ -88,14 +88,10 @@ def __init__(self, parent, Label, ColumnTitles=[], Data=[]):
         # otherwise, every line in the list starts with a small up arrow
         # (this seems to be a wxWidgets bug on Windows).
         self.il = wx.ImageList(16, 16)
-        if sys.version_info.major == 2:
-            if sys.platform == 'win32':
-                self.blank = self.il.Add(wx.Bitmap(16,16), wx.Bitmap(16,16))
-            up_bitmap = ireImages.getSmallUpArrowBitmap()
-            down_bitmap = ireImages.getSmallDnArrowBitmap()
-        else:
-            up_bitmap = wx.ArtProvider.GetBitmap(wx.ART_GO_UP, wx.ART_OTHER, (16,16))
-            down_bitmap = wx.ArtProvider.GetBitmap(wx.ART_GO_DOWN, wx.ART_OTHER, (16,16))
+        if sys.platform == 'win32':
+            self.blank = self.il.Add(wx.Bitmap(16,16,1), wx.Bitmap(16,16,1))
+        up_bitmap = ireImages.getSmallUpArrowBitmap()
+        down_bitmap = ireImages.getSmallDnArrowBitmap()
         self.sm_up = self.il.Add(up_bitmap)
         self.sm_dn = self.il.Add(down_bitmap)
 

cisstInteractive/code/irepy/ireMain.py

@@ -298,16 +298,15 @@ def __init__(self, parent, id, title):
         #------------------------------------------------------
 
         ToolBar = self.CreateToolBar( wx.TB_HORIZONTAL | wx.NO_BORDER | wx.TB_FLAT | wx.TB_TEXT )
-        # Set up the toolbar, using bitmaps from ireImages.py or wx.ArtProvider.
-        if sys.version_info.major == 2:
-            new_bitmap  = ireImages.getNewItemBitmap()
-            open_bitmap = ireImages.getOpenItemBitmap()
-            save_bitmap = ireImages.getSaveItemBitmap()
-        else:
-            tsize = (16,16)
-            new_bitmap  = wx.ArtProvider.GetBitmap(wx.ART_NEW, wx.ART_TOOLBAR, tsize)
-            open_bitmap = wx.ArtProvider.GetBitmap(wx.ART_FILE_OPEN, wx.ART_TOOLBAR, tsize)
-            save_bitmap = wx.ArtProvider.GetBitmap(wx.ART_FILE_SAVE, wx.ART_TOOLBAR, tsize)
+        # Set up the toolbar, using bitmaps from ireImages.py
+        # Alternatively, could use wx.ArtProvider as follows:
+        #    tsize = (16,16)
+        #    new_bitmap  = wx.ArtProvider.GetBitmap(wx.ART_NEW, wx.ART_TOOLBAR, tsize)
+        #    open_bitmap = wx.ArtProvider.GetBitmap(wx.ART_FILE_OPEN, wx.ART_TOOLBAR, tsize)
+        #    save_bitmap = wx.ArtProvider.GetBitmap(wx.ART_FILE_SAVE, wx.ART_TOOLBAR, tsize)
+        new_bitmap  = ireImages.getNewItemBitmap()
+        open_bitmap = ireImages.getOpenItemBitmap()
+        save_bitmap = ireImages.getSaveItemBitmap()
         ToolBar.AddTool(wx.ID_NEW, "", new_bitmap, "New")
         ToolBar.SetToolLongHelp(wx.ID_NEW, "New file")
         ToolBar.AddTool(wx.ID_OPEN, "", open_bitmap, "Open")
@@ -600,9 +599,11 @@ def GetTypeString(self, obj):
     #-------------------------------------------------
 
     def SaveHistoryToFile(self):
-        cmdlist = self.CommandHistoryListCtrl.GetAllItems()
-        f = open(self.HISTORY_FILENAME, 'w')
-        pickle.dump(cmdlist, f)
+        # PK TODO: pickle not yet working in Python3
+        if sys.version_info.major == 2:
+            cmdlist = self.CommandHistoryListCtrl.GetAllItems()
+            f = open(self.HISTORY_FILENAME, 'w')
+            pickle.dump(cmdlist, f)
 
     def LoadHistoryFromFile(self, fn=HISTORY_FILENAME):
         Data = []