Download as
Browse Code »

Commit 83a118b3022ebcd93cd1822d973713e2f6d6310e

Authored by tfmoraes
1 parent 081d3815
Exists in master and in 68 other branches 3d_inter_style, MIPs, beta3, beta4, brush_pix, canvas_reeng, canvas_text, casmoothing_cython, clean, command-line, cython_threshold, debian_cython, editor_improvements, encoding, ff_mask, ff_mask_improv, ffill_gui, ffill_segmentation, fill_holes_auto, fixes_pre_beta5, floodfill, get_pixel, import_mesh, interactor_style, inv3.0.1, invesalius-libift, mactoolbar, mactoolbar_bkp, manual_v3.1, mask_boolean_op, mask_boolean_op_bkp, mask_copy, mask_greatest_component, measure, measure_canvas, measure_improvements, measure_placement_test, measure_spacing, orientation, phoenix, region_growing_confidence, remote, 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, threshold_history, user_guide_en, usp-navegador, vti, vtk6, watershed, watershed_improvements, watershed_improvements_bkp, watershed_merge, workdir, wwwlgui, wx2.9_mac, wxgtk3, wxgtk3_b5, wxgtk3_bkp, xmartlabs-command-line

FIX: Using device context(dc) instead of static bitmap to show dicom previews

Showing 1 changed file with 24 additions and 3 deletions   Show diff stats
invesalius/gui/dicom_preview_panel.py
  Diff comments   View file @83a118b
@@ -97,6 +97,26 @@ class DicomInfo(object): @@ -97,6 +97,26 @@ class DicomInfo(object):
97 return self._preview 97 return self._preview
98 98
99 99
  100 +class DicomPaintPanel(wx.Panel):
  101 + def __init__(self, parent):
  102 + super(DicomPaintPanel, self).__init__(parent)
  103 + self._bind_events()
  104 + self.image = None
  105 +
  106 + def _bind_events(self):
  107 + self.Bind(wx.EVT_PAINT, self.OnPaint)
  108 +
  109 + def SetImage(self, image):
  110 + self.image = image
  111 +
  112 + def OnPaint(self, evt):
  113 + if self.image:
  114 + dc = wx.AutoBufferedPaintDC(self)
  115 + dc.Clear()
  116 + dc.DrawBitmap(self.image, 0, 0)
  117 +
  118 +
  119 +
100 class Preview(wx.Panel): 120 class Preview(wx.Panel):
101 """ 121 """
102 The little previews. 122 The little previews.
@@ -114,7 +134,7 @@ class Preview(wx.Panel): @@ -114,7 +134,7 @@ class Preview(wx.Panel):
114 134
115 self.title = wx.StaticText(self, -1, _("Image")) 135 self.title = wx.StaticText(self, -1, _("Image"))
116 self.subtitle = wx.StaticText(self, -1, _("Image")) 136 self.subtitle = wx.StaticText(self, -1, _("Image"))
117 - self.image_viewer = wx.StaticBitmap(self, -1) 137 + self.image_viewer = DicomPaintPanel(self)
118 138
119 self.sizer = wx.BoxSizer(wx.VERTICAL) 139 self.sizer = wx.BoxSizer(wx.VERTICAL)
120 self.sizer.Add(self.title, 0, 140 self.sizer.Add(self.title, 0,
@@ -169,7 +189,7 @@ class Preview(wx.Panel): @@ -169,7 +189,7 @@ class Preview(wx.Panel):
169 self.ID = dicom_info.id 189 self.ID = dicom_info.id
170 dicom_info.size = self.image_viewer.GetSize() 190 dicom_info.size = self.image_viewer.GetSize()
171 image = dicom_info.preview 191 image = dicom_info.preview
172 - self.image_viewer.SetBitmap(image) 192 + self.image_viewer.SetImage(image)
173 self.data = dicom_info.id 193 self.data = dicom_info.id
174 self.select_on = dicom_info.selected 194 self.select_on = dicom_info.selected
175 self.Select() 195 self.Select()
@@ -184,7 +204,8 @@ class Preview(wx.Panel): @@ -184,7 +204,8 @@ class Preview(wx.Panel):
184 def OnEnter(self, evt): 204 def OnEnter(self, evt):
185 if not self.select_on: 205 if not self.select_on:
186 #c = wx.SystemSettings_GetColour(wx.SYS_COLOUR_3DHILIGHT) 206 #c = wx.SystemSettings_GetColour(wx.SYS_COLOUR_3DHILIGHT)
187 - c = wx.SystemSettings_GetColour(wx.SYS_COLOUR_HIGHLIGHT) 207 + c = wx.SystemSettings_GetColour(wx.SYS_COLOUR_BTNFACE)
  208 + print c
188 self.SetBackgroundColour(c) 209 self.SetBackgroundColour(c)
189 210
190 def OnLeave(self, evt): 211 def OnLeave(self, evt):