Download as
Browse Code »

Commit 97e11c5db287e0758cf5680885bfab26ddb555ea

Authored by Paulo Henrique Junqueira Amorim
1 parent 174b9f6f
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

ENH: Busy cursor in open DICOM directory

Showing 2 changed files with 8 additions and 7 deletions   Show diff stats
invesalius/gui/dicom_preview_panel.py
  Diff comments   View file @97e11c5
@@ -70,7 +70,7 @@ class DicomInfo(object): @@ -70,7 +70,7 @@ class DicomInfo(object):
70 if size != self._size: 70 if size != self._size:
71 self._size = size 71 self._size = size
72 self.resized = True 72 self.resized = True
73 - 73 +
74 @property 74 @property
75 def preview(self): 75 def preview(self):
76 if self._preview: 76 if self._preview:
@@ -117,7 +117,7 @@ class DicomPaintPanel(wx.Panel): @@ -117,7 +117,7 @@ class DicomPaintPanel(wx.Panel):
117 return image.Scale(*new_size) 117 return image.Scale(*new_size)
118 else: 118 else:
119 return image.Scale(*self.last_size) 119 return image.Scale(*self.last_size)
120 - 120 +
121 121
122 def SetImage(self, image): 122 def SetImage(self, image):
123 self.image = image 123 self.image = image
@@ -156,7 +156,7 @@ class Preview(wx.Panel): @@ -156,7 +156,7 @@ class Preview(wx.Panel):
156 self.title = wx.StaticText(self, -1, _("Image")) 156 self.title = wx.StaticText(self, -1, _("Image"))
157 self.subtitle = wx.StaticText(self, -1, _("Image")) 157 self.subtitle = wx.StaticText(self, -1, _("Image"))
158 self.image_viewer = DicomPaintPanel(self) 158 self.image_viewer = DicomPaintPanel(self)
159 - 159 +
160 self.sizer = wx.BoxSizer(wx.VERTICAL) 160 self.sizer = wx.BoxSizer(wx.VERTICAL)
161 self.sizer.Add(self.title, 0, 161 self.sizer.Add(self.title, 0,
162 wx.ALIGN_CENTER_HORIZONTAL) 162 wx.ALIGN_CENTER_HORIZONTAL)
@@ -773,7 +773,7 @@ class DicomPreview(wx.Panel): @@ -773,7 +773,7 @@ class DicomPreview(wx.Panel):
773 dicom_files = group.GetHandSortedList() 773 dicom_files = group.GetHandSortedList()
774 n = 0 774 n = 0
775 for dicom in dicom_files: 775 for dicom in dicom_files:
776 - info = DicomInfo(n, dicom, 776 + info = DicomInfo(n, dicom,
777 _("Image %d") % (dicom.image.number), 777 _("Image %d") % (dicom.image.number),
778 "%.2f" % (dicom.image.position[2])) 778 "%.2f" % (dicom.image.position[2]))
779 self.files.append(info) 779 self.files.append(info)
@@ -794,7 +794,7 @@ class DicomPreview(wx.Panel): @@ -794,7 +794,7 @@ class DicomPreview(wx.Panel):
794 dicom_files = group.GetHandSortedList() 794 dicom_files = group.GetHandSortedList()
795 n = 0 795 n = 0
796 for dicom in dicom_files: 796 for dicom in dicom_files:
797 - info = DicomInfo(n, dicom, 797 + info = DicomInfo(n, dicom,
798 _("Image %d") % (dicom.image.number), 798 _("Image %d") % (dicom.image.number),
799 "%.2f" % (dicom.image.position[2]), 799 "%.2f" % (dicom.image.position[2]),
800 ) 800 )
invesalius/gui/frame.py
  Diff comments   View file @97e11c5
@@ -112,11 +112,11 @@ class Frame(wx.Frame): @@ -112,11 +112,11 @@ class Frame(wx.Frame):
112 self.Bind(wx.EVT_MENU, self.OnMenuClick) 112 self.Bind(wx.EVT_MENU, self.OnMenuClick)
113 self.Bind(wx.EVT_CLOSE, self.CloseWindow) 113 self.Bind(wx.EVT_CLOSE, self.CloseWindow)
114 #self.Bind(wx.EVT_CLOSE, self.OnExit) 114 #self.Bind(wx.EVT_CLOSE, self.OnExit)
115 - 115 +
116 def CloseWindow(self, evt): 116 def CloseWindow(self, evt):
117 ps.Publisher().sendMessage("Stop Config Recording") 117 ps.Publisher().sendMessage("Stop Config Recording")
118 self.Destroy() 118 self.Destroy()
119 - 119 +
120 def __init_aui(self): 120 def __init_aui(self):
121 121
122 # Tell aui_manager to manage this frame 122 # Tell aui_manager to manage this frame
@@ -211,6 +211,7 @@ class Frame(wx.Frame): @@ -211,6 +211,7 @@ class Frame(wx.Frame):
211 aui_manager.GetPane("Data").Show(1) 211 aui_manager.GetPane("Data").Show(1)
212 aui_manager.GetPane("Tasks").Show(1) 212 aui_manager.GetPane("Tasks").Show(1)
213 aui_manager.Update() 213 aui_manager.Update()
  214 + ps.Publisher().sendMessage('End busy cursor')
214 215
215 def HideContentPanel(self, pubsub_evt): 216 def HideContentPanel(self, pubsub_evt):
216 aui_manager = self.aui_manager 217 aui_manager = self.aui_manager