Download as
Browse Code »

Commit 980767425dd371672a6a57d04249364b0014a957

Authored by tatiana
1 parent f31dd963
Exists in master and in 6 other branches beta3, beta4, inv3.0.1, invesalius-libift, usp-navegador, wxgtk3_b5

FIX: Bug caused by commits 1261 and 1262

Showing 1 changed file with 8 additions and 5 deletions   Show diff stats
invesalius/invesalius.py
  Diff comments   View file @9807674
... ... @@ -21,6 +21,8 @@ import multiprocessing
21 21 from optparse import OptionParser
22 22 import os
23 23 import sys
  24 +from session import Session
  25 +
24 26  
25 27 # TODO: This should be called during installation
26 28 # ----------------------------------------------------------------------
... ... @@ -40,22 +42,21 @@ import wx.lib.pubsub as ps
40 42 class SplashScreen(wx.SplashScreen):
41 43 def __init__(self):
42 44 bmp = wx.Image("../icons/splash_en.png").ConvertToBitmap()
43   - wx.SplashScreen.__init__(self, bmp,
44   - wx.SPLASH_CENTRE_ON_SCREEN | wx.SPLASH_TIMEOUT,
45   - 1500, None, -1)
  45 + wx.SplashScreen.__init__(self, bitmap=bmp,
  46 + splashStyle=wx.SPLASH_CENTRE_ON_SCREEN | wx.SPLASH_TIMEOUT,
  47 + milliseconds=1, id=-1, parent=None)
46 48 self.Bind(wx.EVT_CLOSE, self.OnClose)
47 49  
48 50  
49 51 from gui.frame import Frame
50 52 from control import Controller
51 53 from project import Project
52   - from session import Session
53 54  
54 55  
55 56 self.main = Frame(None)
56 57 self.control = Controller(self.main)
57 58  
58   - self.fc = wx.FutureCall(1000, self.ShowMain)
  59 + self.fc = wx.FutureCall(1, self.ShowMain)
59 60  
60 61 def OnClose(self, evt):
61 62 # Make sure the default handler runs too so this window gets
... ... @@ -82,6 +83,8 @@ class InVesalius(wx.App):
82 83 #self.control = Controller(self.main)
83 84 self.SetAppName("InVesalius 3")
84 85 splash = SplashScreen()
  86 + self.control = splash.control
  87 + self.frame = splash.main
85 88 splash.Show()
86 89  
87 90 return True
... ...