From 96ff1ceace5facefe3d4452ee9c5cddf2a059c5f Mon Sep 17 00:00:00 2001
From: paulojamorim <paulojamorim@gmail.com>
Date: Mon, 16 May 2011 16:45:47 +0000
Subject: [PATCH] ENH: Load preferences init InVesalius

---
 invesalius/control.py         |  9 +++++++--
 invesalius/gui/frame.py       |  5 ++++-
 invesalius/gui/preferences.py | 24 +++++++++++++++++++++++-
 3 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/invesalius/control.py b/invesalius/control.py
index e3866e5..e1cde04 100755
--- a/invesalius/control.py
+++ b/invesalius/control.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):
diff --git a/invesalius/gui/frame.py b/invesalius/gui/frame.py
index 1ff51f1..5fe7677 100755
--- a/invesalius/gui/frame.py
+++ b/invesalius/gui/frame.py
@@ -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):
         """
diff --git a/invesalius/gui/preferences.py b/invesalius/gui/preferences.py
index 4dc7ac8..c39e32a 100644
--- a/invesalius/gui/preferences.py
+++ b/invesalius/gui/preferences.py
@@ -1,5 +1,7 @@
 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):
--
libgit2 0.21.2