diff --git a/invesalius/control.py b/invesalius/control.py index abef7c0..ab21035 100755 --- a/invesalius/control.py +++ b/invesalius/control.py @@ -38,6 +38,7 @@ import reader.dicom_reader as dcm import session as ses import utils +import gui.dialogs as dialogs DEFAULT_THRESH_MODE = 0 @@ -56,6 +57,8 @@ class Controller(): Publisher.sendMessage('Load Preferences') + utils.CheckForUpdate() + def __bind_events(self): Publisher.subscribe(self.OnImportMedicalImages, 'Import directory') @@ -79,12 +82,16 @@ class Controller(): Publisher.subscribe(self.OnOpenProject, 'Open project') Publisher.subscribe(self.OnOpenRecentProject, 'Open recent project') Publisher.subscribe(self.OnShowAnalyzeFile, 'Show analyze dialog') + Publisher.subscribe(self.OnShowUpdateDialog, 'Show update dialog') + def OnCancelImport(self, pubsub_evt): #self.cancel_import = True Publisher.sendMessage('Hide import panel') + + ########################### ########################### @@ -619,3 +626,8 @@ class Controller(): preset_name + '.plist') plistlib.writePlist(preset, preset_dir) + + + def OnShowUpdateDialog(self, pubsub_evt): + dialogs.UpdateDialog(pubsub_evt.data[0], pubsub_evt.data[1]) + diff --git a/invesalius/gui/dialogs.py b/invesalius/gui/dialogs.py index 460f5a7..5bba2a6 100644 --- a/invesalius/gui/dialogs.py +++ b/invesalius/gui/dialogs.py @@ -1278,7 +1278,6 @@ class SurfaceMethodPanel(wx.Panel): -#def _UpdateDialog(self, pubsub_evt): def UpdateDialog(last,url): """ Show update dialog diff --git a/invesalius/gui/frame.py b/invesalius/gui/frame.py index 810fd25..6363156 100755 --- a/invesalius/gui/frame.py +++ b/invesalius/gui/frame.py @@ -88,8 +88,7 @@ class Frame(wx.Frame): # Initialize bind to pubsub events self.__bind_events() self.__bind_events_wx() - - utils.CheckForUpdate() + def __bind_events(self): """ diff --git a/invesalius/utils.py b/invesalius/utils.py index e8ade7e..60be1b4 100755 --- a/invesalius/utils.py +++ b/invesalius/utils.py @@ -379,14 +379,13 @@ def UpdateChecker(): last = response.readline().rstrip() url = response.readline().rstrip() print last, url - if (last!="3.0 beta 32"): + if (last!="3.0 beta 3"): print "New update found!!! -> version:", last, ", url=",url from time import sleep sleep(5) - from gui.dialogs import UpdateDialog - #UpdateDialog(last,url) + from wx.lib.pubsub import pub as Publisher + Publisher.sendMessage("Show update dialog", (last,url)) #except: - # return - + #return -- libgit2 0.21.2