FIX: inv3 file save in temp and unicode chars in path of dicom to be …

…imported
invesalius · Mar 8, 2010 · caee8fc · caee8fc
1 parent ed5fcc9
commit caee8fc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/invesalius/data/measures.py b/invesalius/data/measures.py
@@ -62,9 +62,6 @@ def _load_measurements(self, pubsub_evt):
                 else:
                     ps.Publisher().sendMessage('Update slice viewer')
 
-        session = ses.Session()
-        session.SaveProject()
-
     def _add_point(self, pubsub_evt):
         position = pubsub_evt.data[0]
         type = pubsub_evt.data[1] # Linear or Angular

diff --git a/invesalius/invesalius.py b/invesalius/invesalius.py
@@ -27,9 +27,10 @@
 if sys.platform == 'win32':
     import _winreg
 
-import wxversion
-wxversion.ensureMinimal('2.8-unicode', optionsRequired=True) 
-wxversion.select('2.8-unicode', optionsRequired=True)
+if sys.platform != 'win32':
+    import wxversion
+    wxversion.ensureMinimal('2.8-unicode', optionsRequired=True) 
+    wxversion.select('2.8-unicode', optionsRequired=True)
 
 import wx
 import wx.lib.pubsub as ps

diff --git a/invesalius/session.py b/invesalius/session.py
@@ -1,6 +1,7 @@
 import ConfigParser
 import os
 import shutil
+import sys
 from threading import Thread
 import time
 
@@ -138,7 +139,10 @@ def CreateSessionFile(self):
         config.add_section('paths')
         config.set('paths','homedir',self.homedir)
         config.set('paths','tempdir',self.tempdir)
-        config.set('paths','last_dicom_folder',self.last_dicom_folder.encode('utf-8'))
+        try:
+            config.set('paths','last_dicom_folder',self.last_dicom_folder.encode('utf-8'))
+        except (UnicodeEncodeError, UnicodeDecodeError):
+            config.set('paths','last_dicom_folder',self.last_dicom_folder)
         path = os.path.join(self.homedir ,
                             '.invesalius', 'config.cfg')