From 973cafe604056b262ab2c8f2d6c2c24700530804 Mon Sep 17 00:00:00 2001
From: tatiana <tatiana.alchueyr@gmail.com>
Date: Tue, 12 Jan 2010 11:18:25 +0000
Subject: [PATCH] ENH: Advances on translation to pt

---
 invesalius/constants.py    | 64 ++++++++++++++++++++++++++++++++++------------------------------
 invesalius/control.py      | 15 +++++++++------
 invesalius/data/surface.py | 17 +++++++++--------
 3 files changed, 52 insertions(+), 44 deletions(-)

diff --git a/invesalius/constants.py b/invesalius/constants.py
index 0f59bc0..70b9f5c 100644
--- a/invesalius/constants.py
+++ b/invesalius/constants.py
@@ -246,36 +246,40 @@ TYPE_RAYCASTING_MAPPER = 1
 folder=RAYCASTING_PRESETS_DIRECTORY= os.path.abspath(os.path.join("..",
                                                                   "presets",
                                                                   "raycasting"))
-_("Airways")
-_("Airways II")
-_("Black & White")
-_("Bone + Skin")
-_("Bone + Skin II")
-_("Dark Bone")
-_("Glossy")
-_("Glossy II")
-_("Gold Bone")
-_("High Contrast")
-_("Low Contrast")
-_("Soft on White")
-_("Mid Contrast")
-_("No Shading")
-_("Pencil")
-_("Red on White")
-_("Skin On Blue")
-_("Skin On Blue II")
-_("Soft on White")
-_("Soft + Skin")
-_("Soft + Skin II")
-_("Soft + Skin III")
-_("Soft On Blue")
-_("Soft")
-_("Standard")
-_("Vascular")
-_("Vascular II")
-_("Vascular III")
-_("Vascular IV")
-_("Yellow Bone")
+
+
+RAYCASTING_FILES = {_("Airways"): "Airways.plist",
+                   _("Airways II"): "Airways II.plist",
+                   _("Black & White"): "Black & White.plist",
+                   _("Bone + Skin"): "Bone + Skin.plist",
+                   _("Bone + Skin II"): "Bone + Skin II.plist",
+                   _("Dark Bone"): "Dark Bone.plist",
+                   _("Glossy"): "Glossy.plist", 
+                   _("Glossy II"): "Glossy II.plist",
+                   _("Gold Bone"): "Gold Bone.plist",
+                   _("High Contrast"): "High Contrast.plist",
+                   _("Low Contrast"): "Low Contrast.plist",
+                   _("Soft on White"): "Soft on White.plist",
+                   _("Mid Contrast"): "Mid Contrast.plist",
+                   _("No Shading"): "No Shading.plist",
+                   _("Pencil"): "Pencil.plist",
+                   _("Red on White"): "Red on White.plist",
+                   _("Skin On Blue"): "Skin On Blue.plist",
+                   _("Skin On Blue II"): "Skin On Blue II.plist",
+                   _("Soft on White"): "Soft on White.plist",
+                   _("Soft + Skin"): "Soft + Skin.plist",
+                   _("Soft + Skin II"): "Soft + Skin II.plist",
+                   _("Soft + Skin III"): "Soft + Skin III.plist",
+                   _("Soft On Blue"): "Soft On Blue.plist",
+                   _("Soft"): "Soft.plist",
+                   _("Standard"): "Standard.plist",
+                   _("Vascular"): "Vascular.plist",
+                   _("Vascular II"): "Vascular II.plist",
+                   _("Vascular III"): "Vascular III.plist",
+                   _("Vascular IV"): "Vascular IV.plist",
+                   _("Yellow Bone"): "Yellow Bone.plist"}
+
+
 
 RAYCASTING_TYPES = [_(filename.split(".")[0]) for filename in
                     os.listdir(folder) if
diff --git a/invesalius/control.py b/invesalius/control.py
index 6277301..22118f6 100755
--- a/invesalius/control.py
+++ b/invesalius/control.py
@@ -402,14 +402,17 @@ class Controller():
     def LoadRaycastingPreset(self, pubsub_evt):
         label = pubsub_evt.data
         if label != const.RAYCASTING_OFF_LABEL:
-            try:
+            if label in const.RAYCASTING_FILES.keys():
                 path = os.path.join(const.RAYCASTING_PRESETS_DIRECTORY,
+                                    const.RAYCASTING_FILES[label])
+            else: 
+                try:
+                    path = os.path.join(const.RAYCASTING_PRESETS_DIRECTORY,
+                                        label+".plist")
+                except IOError:
+                    path = os.path.join(const.USER_RAYCASTING_PRESETS_DIRECTORY,
                                     label+".plist")
-                preset = plistlib.readPlist(path)
-            except IOError:
-                path = os.path.join(const.USER_RAYCASTING_PRESETS_DIRECTORY,
-                                    label+".plist")
-                preset = plistlib.readPlist(path)
+            preset = plistlib.readPlist(path)
             prj.Project().raycasting_preset = preset
             # Notify volume
             # TODO: Chamar grafico tb!
diff --git a/invesalius/data/surface.py b/invesalius/data/surface.py
index 26fa099..8174ff9 100644
--- a/invesalius/data/surface.py
+++ b/invesalius/data/surface.py
@@ -17,20 +17,21 @@
 #    detalhes.
 #--------------------------------------------------------------------------
 
-from imagedata_utils import BuildEditedImage
-import constants as const
-import imagedata_utils as iu
 import multiprocessing
 import os
 import plistlib
-import polydata_utils as pu
-import project as prj
-import session as ses
+import sys
 import tempfile
+
 import vtk
-import vtk_utils as vu
 import wx.lib.pubsub as ps
 
+import constants as const
+import imagedata_utils as iu
+import polydata_utils as pu
+import project as prj
+import session as ses
+import vtk_utils as vu
 
 #------------------------------------------------------------------
 class SurfaceProcess(multiprocessing.Process):
@@ -280,7 +281,7 @@ class SurfaceManager():
             imagedata_tmp = vtk.vtkImageData()
             imagedata_tmp.DeepCopy(imagedata)
             imagedata_tmp.Update()
-            imagedata = BuildEditedImage(imagedata_tmp, edited_points)
+            imagedata = iu.BuildEditedImage(imagedata_tmp, edited_points)
 
         if quality in const.SURFACE_QUALITY.keys():
             imagedata_resolution = const.SURFACE_QUALITY[quality][0]
--
libgit2 0.21.2