Download as
Browse Code »

Commit 57107bf8e29a594a3c601f644d302d42ae711397

Authored by tatiana
1 parent 249ee5c3
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: Splash error under darwin and win32 - SetShape

Showing 2 changed files with 10 additions and 8 deletions   Show diff stats
invesalius/invesalius.py
  Diff comments   View file @57107bf
@@ -34,7 +34,7 @@ if sys.platform != 'win32': @@ -34,7 +34,7 @@ if sys.platform != 'win32':
34 34
35 import wx 35 import wx
36 import wx.lib.pubsub as ps 36 import wx.lib.pubsub as ps
37 -import wx.lib.agw.advancedsplash as AS 37 +import wx.lib.agw.advancedsplash as agw
38 38
39 import gui.language_dialog as lang_dlg 39 import gui.language_dialog as lang_dlg
40 import i18n 40 import i18n
@@ -67,7 +67,7 @@ class InVesalius(wx.App): @@ -67,7 +67,7 @@ class InVesalius(wx.App):
67 67
68 # ------------------------------------------------------------------ 68 # ------------------------------------------------------------------
69 69
70 -class SplashScreen(AS.AdvancedSplash): 70 +class SplashScreen(agw.AdvancedSplash):
71 """ 71 """
72 Splash screen to be shown in InVesalius initialization. 72 Splash screen to be shown in InVesalius initialization.
73 """ 73 """
@@ -127,13 +127,15 @@ class SplashScreen(AS.AdvancedSplash): @@ -127,13 +127,15 @@ class SplashScreen(AS.AdvancedSplash):
127 127
128 bmp = wx.Image(path).ConvertToBitmap() 128 bmp = wx.Image(path).ConvertToBitmap()
129 129
130 - style = wx.SPLASH_TIMEOUT | wx.SPLASH_CENTRE_ON_SCREEN  
131 - AS.AdvancedSplash.__init__(self, 130 + style = wx.SPLASH_TIMEOUT | wx.SPLASH_CENTRE_ON_SCREEN |\
  131 + wx.FRAME_SHAPED
  132 + agw.AdvancedSplash.__init__(self,
132 bitmap=bmp, 133 bitmap=bmp,
133 style=style, 134 style=style,
134 timeout=5000, 135 timeout=5000,
135 id=-1, 136 id=-1,
136 parent=None) 137 parent=None)
  138 +
137 self.Bind(wx.EVT_CLOSE, self.OnClose) 139 self.Bind(wx.EVT_CLOSE, self.OnClose)
138 140
139 # Importing takes sometime, therefore it will be done 141 # Importing takes sometime, therefore it will be done
invesalius/session.py
  Diff comments   View file @57107bf
@@ -231,10 +231,10 @@ class WriteSession(Thread): @@ -231,10 +231,10 @@ class WriteSession(Thread):
231 def run(self): 231 def run(self):
232 while self.runing: 232 while self.runing:
233 time.sleep(10) 233 time.sleep(10)
234 - #try:  
235 - self.Write()  
236 - #except AttributeError:  
237 - # pass 234 + try:
  235 + self.Write()
  236 + except AttributeError:
  237 + debug("Session: trying to write into inexistent file")
238 238
239 def Stop(self): 239 def Stop(self):
240 self.runing = 0 240 self.runing = 0