avant merge

diff --git a/Editeur/session.py b/Editeur/session.py
index b21865bed56133a939f135c636be87aeb3526803..e190d2886c5bf90fbafa85a8bb6e5ec0440819c1 100644 (file)
--- a/Editeur/session.py
+++ b/Editeur/session.py
@@ -283,7 +283,8 @@ def parse(args):
          if os.path.isfile(file):
             options.comm.append(file)
             options.studies.append({"comm":file})
-         elif len(args)==1 and re.search('.comm',file):
+            print options.studies
+         elif len(args)==1 and (re.search('.comm',file) or re.search('.map',file)):
             try :
                 f=open(file,'w')
                 f.close()

diff --git a/Ihm/I_FICHIER.py b/Ihm/I_FICHIER.py
new file mode 100644 (file)
index 0000000..94996ff
--- /dev/null
+++ b/Ihm/I_FICHIER.py
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+# Copyright (C) 2007-2013   EDF R&D
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+import types,string
+
+class Fichier:
+
+   def __init__(self,filtre='All Files (*)',existence='NonExistant',repertoire=None):
+       self.filtre=filtre
+       self.existence=existence
+       self.repertoire=repertoire
+
+   def __convert__(self,valeur):
+    # Attention ne verifie pas grand chose
+    # cela vaut-il la peine de refaire ce que Qt fait tres bien 
+    if type(valeur) != types.StringType :
+      return None
+    return valeur
+
+
+   def info(self):
+      return "Fichier de Type %s et %s" % (self.filtre,self.existence)
+
+      __repr__=info
+      __str__=info
+

diff --git a/InterfaceQT4/qtEficas.py b/InterfaceQT4/qtEficas.py
index d0d9e01d2cd9374b5992b53fd7afc2748f4131ea..78fdf408c094a32c358c8ae9691aaae948467dc9 100644 (file)
--- a/InterfaceQT4/qtEficas.py
+++ b/InterfaceQT4/qtEficas.py
@@ -71,6 +71,7 @@ class Appli(Ui_Eficas,QMainWindow):
         if self.multi == False :
              self.definitCode(code,ssCode)
              if code==None: return
+        self.salome=1
 
         eficas_root_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
         self.ajoutIcones()