Fix icons for Eficas in Salome

diff --git a/InterfaceQT4/qtEficas.py b/InterfaceQT4/qtEficas.py
index 740b3eaecf3f34ac170dfb4f5df08c5abe01c8a0..ba237f06569ab8a1173af1f62ac8a2820035900f 100644 (file)
--- a/InterfaceQT4/qtEficas.py
+++ b/InterfaceQT4/qtEficas.py
@@ -26,14 +26,15 @@ class Appli(Ui_Eficas,QMainWindow):
         self.VERSION_EFICAS="Eficas QT4 V6.3.1"
         self.salome=salome
         self.ihm="QT"
-       self.top = self    #(pour CONFIGURATION)
+        self.top = self    #(pour CONFIGURATION)
         self.QWParent=None #(Pour lancement sans IHM)
         self.indice=0
         self.dict_reels={}
 
         self.multi=multi
         if self.multi == False :self.definitCode(code,ssCode)
-        self.RepIcon=os.path.abspath(os.path.join(os.getcwd(),'../Editeur/icons'))
+        eficas_root_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+        self.RepIcon = os.path.join(eficas_root_dir, "Editeur", "icons")
         self.ajoutIcones()
 
 

diff --git a/Openturns_Study/prefs_OPENTURNS_STUDY.py b/Openturns_Study/prefs_OPENTURNS_STUDY.py
index ad8d23110e091948d4e8cb4739d40e07e51d0000..7f544647043e934929a3c67c4fadc1da27846609 100644 (file)
--- a/Openturns_Study/prefs_OPENTURNS_STUDY.py
+++ b/Openturns_Study/prefs_OPENTURNS_STUDY.py
@@ -21,6 +21,7 @@
 
 import os, sys
 # Les variables pouvant positionnees sont :
+print "import des prefs de OPENTURNS"
 
 # repIni sert à localiser le fichier 
 # initialdir sert comme directory initial des QFileDialog
@@ -45,7 +46,6 @@ savedir         = os.environ['HOME']
 
 
 # OpenTURNS Python module
-#OpenTURNS_path="/opt/Openturns/Install_0_13_2/lib/python2.5/site-packages"
 OpenTURNS_path=""
 # Choix des catalogues
 if len(OpenTURNS_path) > 0: