Download as
Browse Code »

Commit c06ff6da71d81a8848bc9a436d1ecd46c22e2841

Authored by Thiago Franco de Moraes
1 parent 76b791fa
Exists in master and in 33 other branches canvas_reeng, canvas_text, casmoothing_cython, command-line, debian_cython, ff_mask, ff_mask_improv, ffill_gui, ffill_segmentation, fill_holes_auto, get_pixel, import_mesh, inv3.0.1, manual_v3.1, measure_canvas, measure_improvements, measure_placement_test, phoenix, region_growing_confidence, remove_local_wxpython, rmatsuda-fix_ref_MTC, rmatsuda-fix_remove_marker_bug, rmatsuda-trigger_bug_fix, rotvol, segmentation_menu, select_part, smoothing_bin, smoothing_bin_pll, surface_area, user_guide_en, vti, vtk6, xmartlabs-command-line

tostring is deprecated in the new PIL version

Showing 1 changed file with 13 additions and 3 deletions   Show diff stats
invesalius/gui/data_notebook.py
  Diff comments   View file @c06ff6d
@@ -496,7 +496,10 @@ class MasksListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin): @@ -496,7 +496,10 @@ class MasksListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin):
496 496
497 wx_image = wx.EmptyImage(new_image.size[0], 497 wx_image = wx.EmptyImage(new_image.size[0],
498 new_image.size[1]) 498 new_image.size[1])
499 - wx_image.SetData(new_image.tostring()) 499 + try:
  500 + wx_image.SetData(new_image.tostring())
  501 + except Exception:
  502 + wx_image.SetData(new_image.tobytes())
500 return wx.BitmapFromImage(wx_image.Scale(16, 16)) 503 return wx.BitmapFromImage(wx_image.Scale(16, 16))
501 504
502 def InsertNewItem(self, index=0, label=_("Mask"), threshold="(1000, 4500)", 505 def InsertNewItem(self, index=0, label=_("Mask"), threshold="(1000, 4500)",
@@ -873,7 +876,11 @@ class SurfacesListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin): @@ -873,7 +876,11 @@ class SurfacesListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin):
873 876
874 wx_image = wx.EmptyImage(new_image.size[0], 877 wx_image = wx.EmptyImage(new_image.size[0],
875 new_image.size[1]) 878 new_image.size[1])
876 - wx_image.SetData(new_image.tostring()) 879 + try:
  880 + wx_image.SetData(new_image.tostring())
  881 + except Exception:
  882 + wx_image.SetData(new_image.tobytes())
  883 +
877 return wx.BitmapFromImage(wx_image.Scale(16, 16)) 884 return wx.BitmapFromImage(wx_image.Scale(16, 16))
878 885
879 def EditSurfaceTransparency(self, pubsub_evt): 886 def EditSurfaceTransparency(self, pubsub_evt):
@@ -1148,7 +1155,10 @@ class MeasuresListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin): @@ -1148,7 +1155,10 @@ class MeasuresListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin):
1148 1155
1149 wx_image = wx.EmptyImage(new_image.size[0], 1156 wx_image = wx.EmptyImage(new_image.size[0],
1150 new_image.size[1]) 1157 new_image.size[1])
1151 - wx_image.SetData(new_image.tostring()) 1158 + try:
  1159 + wx_image.SetData(new_image.tostring())
  1160 + except:
  1161 + wx_image.SetData(new_image.tobytes())
1152 return wx.BitmapFromImage(wx_image.Scale(16, 16)) 1162 return wx.BitmapFromImage(wx_image.Scale(16, 16))
1153 1163
1154 def EditItemColour(self, pubsub_evt): 1164 def EditItemColour(self, pubsub_evt):