ENH: Load preferences init InVesalius

Paulo Henrique Junqueira Amorim
1 parent 4f41c5b0
Showing 3 changed files with 34 additions and 4 deletions Show diff stats
invesalius/control.py
invesalius/gui/frame.py
invesalius/gui/preferences.py
@@ -54,6 +54,8 @@ class Controller():
         session = ses.Session()
         self.measure_manager = data.measures.MeasurementManager()
+        ps.Publisher().sendMessage('Load Preferences')
+
     def __bind_events(self):
         ps.Publisher().subscribe(self.OnImportMedicalImages, 'Import directory')
@@ -343,7 +345,7 @@ class Controller():
     def LoadProject(self):
         proj = prj.Project()
-
+        
         const.THRESHOLD_OUTVALUE = proj.threshold_range[0]
         const.THRESHOLD_INVALUE = proj.threshold_range[1]
@@ -353,7 +355,8 @@ class Controller():
         ps.Publisher().sendMessage('Load slice to viewer',
                         (proj.imagedata,
                         proj.mask_dict))
-        ps.Publisher().sendMessage('Load slice plane')
+
+
         ps.Publisher().sendMessage('Bright and contrast adjustment image',\
                                    (proj.window, proj.level))
         ps.Publisher().sendMessage('Update window level value',\
@@ -365,6 +368,7 @@ class Controller():
         ps.Publisher().sendMessage('Hide surface items',
                                      proj.surface_dict)
         self.LoadImagedataInfo() # TODO: where do we insert this <<<?
+        
         ps.Publisher().sendMessage('Show content panel')
         ps.Publisher().sendMessage('Update AUI')
@@ -376,6 +380,7 @@ class Controller():
                                     proj.measurement_dict)
         proj.presets.thresh_ct[_('Custom')] = proj.threshold_range
+        
         ps.Publisher().sendMessage('End busy cursor')
     def CreateAnalyzeProject(self, imagedata):
@@ -326,8 +326,11 @@ class Frame(wx.Frame):
     def ShowPreferences(self):
         if self.preferences.ShowModal():
-            self.preferences.GetPreferences()
+            values = self.preferences.GetPreferences()
             self.preferences.Close()
+        
+        ses.Session().rendering = values[const.RENDERING]
+        ses.Session().surface_interpolation = values[const.SURFACE_INTERPOLATION]
     def ShowAbout(self):
         """
 import wx
 import constants as const
+import wx.lib.pubsub as ps
+import session as ses
 ID = wx.NewId()
@@ -50,9 +52,22 @@ class Preferences(wx.Dialog):
         self.SetSizer(sizer)
         sizer.Fit(self)
+        self.__bind_events()
+
+    def __bind_events(self):
+        ps.Publisher().subscribe(self.LoadPreferences, 'Load Preferences')
+
+
     def GetPreferences(self):
-        print ">>>>>>>>>", self.pnl_viewer3d.GetSelection()
+        return self.pnl_viewer3d.GetSelection()
+
+    def LoadPreferences(self, pub_evt):
+        
+        values = {const.RENDERING:ses.Session().rendering,
+                const.SURFACE_INTERPOLATION:ses.Session().surface_interpolation}
+
+        self.pnl_viewer3d.LoadSelection(values)
@@ -99,6 +114,13 @@ class Viewer3D(wx.Panel):
         return options
+    def LoadSelection(self, values):
+        rendering = values[const.RENDERING]
+        surface_interpolation = values[const.SURFACE_INTERPOLATION]
+
+        self.rb_rendering.SetSelection(int(rendering))
+        self.rb_inter.SetSelection(int(surface_interpolation))
+
 class Language(wx.Panel):
     def __init__(self, parent):
1	import wx	1	import wx
2	import constants as const	2	import constants as const
		3	+import wx.lib.pubsub as ps
		4	+import session as ses
3		5
4	ID = wx.NewId()	6	ID = wx.NewId()
5		7
	@@ -50,9 +52,22 @@ class Preferences(wx.Dialog):		@@ -50,9 +52,22 @@ class Preferences(wx.Dialog):
50	self.SetSizer(sizer)	52	self.SetSizer(sizer)
51	sizer.Fit(self)	53	sizer.Fit(self)
52		54
		55	+ self.__bind_events()
		56	+
		57	+ def __bind_events(self):
		58	+ ps.Publisher().subscribe(self.LoadPreferences, 'Load Preferences')
		59	+
		60	+
53	def GetPreferences(self):	61	def GetPreferences(self):
54		62
55	- print ">>>>>>>>>", self.pnl_viewer3d.GetSelection()	63	+ return self.pnl_viewer3d.GetSelection()
		64	+
		65	+ def LoadPreferences(self, pub_evt):
		66	+
		67	+ values = {const.RENDERING:ses.Session().rendering,
		68	+ const.SURFACE_INTERPOLATION:ses.Session().surface_interpolation}
		69	+
		70	+ self.pnl_viewer3d.LoadSelection(values)
56		71
57		72
58		73
	@@ -99,6 +114,13 @@ class Viewer3D(wx.Panel):		@@ -99,6 +114,13 @@ class Viewer3D(wx.Panel):
99		114
100	return options	115	return options
101		116
		117	+ def LoadSelection(self, values):
		118	+ rendering = values[const.RENDERING]
		119	+ surface_interpolation = values[const.SURFACE_INTERPOLATION]
		120	+
		121	+ self.rb_rendering.SetSelection(int(rendering))
		122	+ self.rb_inter.SetSelection(int(surface_interpolation))
		123	+
102	class Language(wx.Panel):	124	class Language(wx.Panel):
103		125
104	def __init__(self, parent):	126	def __init__(self, parent):