From: pascale.noyret <pascale.noyret@edf.fr>
Date: Wed, 30 Sep 2020 10:24:42 +0000 (+0200)
Subject: chgt mineur patchs CEA
X-Git-Tag: V9_6_0a1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=95f169f6124bf2d97fefeba50f357f79be8b5215;p=tools%2Feficas.git

chgt mineur patchs CEA
---

diff --git a/InterfaceQT4/configuration.py b/InterfaceQT4/configuration.py
index 9043b0e3..8b1f5c6f 100644
--- a/InterfaceQT4/configuration.py
+++ b/InterfaceQT4/configuration.py
@@ -62,11 +62,11 @@ class configBase(object):
       self.repIni  = repIni
      
       if self.code == None : self.code=''
-      if sys.platform[0:5]=="linux" :
+      self.rep_user   = os.path.join(os.path.expanduser("~"),'.config/Eficas',self.code)
+      #if sys.platform[0:5]=="linux" :
               #self.rep_user   = os.path.join(os.environ['HOME'],'.config/Eficas',self.code)
-              self.rep_user   = os.path.join(os.path.expanduser("~"),'.config/Eficas',self.code)
-      else :
-              self.rep_user   = os.path.join('C:/','.config/Eficas',self.code)
+      #else :
+      #        self.rep_user   = os.path.join('C:/','.config/Eficas',self.code)
 
 
       self.setValeursParDefaut()
@@ -87,11 +87,11 @@ class configBase(object):
       #else: 	     self.parent=None
 
       if not os.path.isdir(self.savedir) :
-        if sys.platform[0:5]=="linux" :
+        self.savedir=os.path.expanduser("~")
+        #if sys.platform[0:5]=="linux" :
           #self.savedir=os.environ['HOME']
-          self.savedir=os.path.expanduser("~")
-        else:
-          self.savedir='C:/'
+        #else:
+        #  self.savedir='C:/'
       
 
 
@@ -103,12 +103,11 @@ class configBase(object):
       self.path_doc     = os.path.abspath(os.path.join(self.repIni,'..','Doc'))
       self.exec_acrobat = 'acroread'
       nomDir="Eficas_"+self.code
-      if sys.platform[0:5]=="linux" :
+      self.savedir   = os.path.abspath(os.path.join(os.path.expanduser("~"),nomDir))
+      #if sys.platform[0:5]=="linux" :
         #self.savedir   = os.path.abspath(os.path.join(os.environ['HOME'],nomDir))
-        self.savedir   = os.path.abspath(os.path.join(os.path.expanduser("~"),nomDir))
-
-      else:
-        self.savedir = os.path.abspath('C:/')
+      #else:
+      #  self.savedir = os.path.abspath('C:/')
       self.modeNouvCommande='initial'
       self.affiche="alpha"
       self.closeAutreCommande = False
diff --git a/InterfaceQT4/qtEficas.py b/InterfaceQT4/qtEficas.py
index 555c353e..b1650497 100755
--- a/InterfaceQT4/qtEficas.py
+++ b/InterfaceQT4/qtEficas.py
@@ -672,12 +672,11 @@ class Appli(AppliSsIhm,Ui_Eficas,QMainWindow):
     def initRecents(self):
        self.recent =  []
        try :
-           if sys.platform[0:5]=="linux" :
+           rep=os.path.join(os.path.expanduser("~"),'.config/Eficas',self.code)
+           #if sys.platform[0:5]=="linux" :
               #rep=os.path.join(os.environ['HOME'],'.config/Eficas',self.code)
-              rep=os.path.join(os.path.expanduser("~"),'.config/Eficas',self.code)
-              rep=os.path.join(os.environ['HOME'],'.config/Eficas',self.code)
-           else :
-              rep=os.path.join('C:/','.config/Eficas',self.code)
+           #else :
+           #   rep=os.path.join('C:/','.config/Eficas',self.code)
            monFichier=rep+"/listefichiers_"+self.code
            index=0
            f=open(monFichier)