Download as
Browse Code »

Commit 87049fe9751bc5179fab769cbff7733cb84ac46d

Authored by Thiago Franco de Moraes
1 parent 7a757524
Exists in master and in 26 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, manual_v3.1, measure_canvas, measure_placement_test, phoenix, region_growing_confidence, remove_local_wxpython, rmatsuda-fix_ref_MTC, rmatsuda-fix_remove_marker_bug, rmatsuda-trigger_bug_fix, segmentation_menu, select_part, smoothing_bin_pll, user_guide_en, xmartlabs-command-line

Cleaning pil usage

Showing 1 changed file with 0 additions and 19 deletions   Show diff stats
invesalius/data/viewer_slice.py
  Diff comments   View file @87049fe
@@ -33,8 +33,6 @@ import styles @@ -33,8 +33,6 @@ import styles
33 import wx 33 import wx
34 from wx.lib.pubsub import pub as Publisher 34 from wx.lib.pubsub import pub as Publisher
35 35
36 -import Image, ImageDraw  
37 -  
38 try: 36 try:
39 from agw import floatspin as FS 37 from agw import floatspin as FS
40 except ImportError: # if it's not there locally, try the wxPython lib. 38 except ImportError: # if it's not there locally, try the wxPython lib.
@@ -180,8 +178,6 @@ class CanvasRendererCTX: @@ -180,8 +178,6 @@ class CanvasRendererCTX:
180 self.bitmap = wx.EmptyBitmapRGBA(w, h) 178 self.bitmap = wx.EmptyBitmapRGBA(w, h)
181 self.image = wx.ImageFromBuffer(w, h, self.rgb, self.alpha) 179 self.image = wx.ImageFromBuffer(w, h, self.rgb, self.alpha)
182 180
183 - self._im = Image.frombuffer('RGBA', (h, w), self._array, "raw", "RGBA", 0, 1)  
184 -  
185 def _resize_canvas(self, w, h): 181 def _resize_canvas(self, w, h):
186 self._array = np.zeros((h, w, 4), dtype=np.uint8) 182 self._array = np.zeros((h, w, 4), dtype=np.uint8)
187 self._cv_image = converters.np_rgba_to_vtk(self._array) 183 self._cv_image = converters.np_rgba_to_vtk(self._array)
@@ -194,21 +190,6 @@ class CanvasRendererCTX: @@ -194,21 +190,6 @@ class CanvasRendererCTX:
194 self.bitmap = wx.EmptyBitmapRGBA(w, h) 190 self.bitmap = wx.EmptyBitmapRGBA(w, h)
195 self.image = wx.ImageFromBuffer(w, h, self.rgb, self.alpha) 191 self.image = wx.ImageFromBuffer(w, h, self.rgb, self.alpha)
196 192
197 - self._im = Image.frombuffer('RGBA', (h, w), self._array, "raw", "RGBA", 0, 1)  
198 -  
199 - def OnPaint2(self, evt, obj):  
200 - size = self.canvas_renderer.GetSize()  
201 - w, h = size  
202 - if self._size != size:  
203 - self._size = size  
204 - self._resize_canvas(w, h)  
205 -  
206 - draw = ImageDraw.Draw(self._im)  
207 - draw.rectangle((30, 30, 500, 500), fill=(0, 255, 0, 255))  
208 -  
209 - print ">>", self._array.max()  
210 - self._cv_image.Modified()  
211 -  
212 def OnPaint(self, evt, obj): 193 def OnPaint(self, evt, obj):
213 size = self.canvas_renderer.GetSize() 194 size = self.canvas_renderer.GetSize()
214 w, h = size 195 w, h = size