From: Pascale Noyret <pascale.noyret@edf.fr>
Date: Fri, 27 Jan 2012 13:07:25 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: LOGILAB~229
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e9452d53311d5c3bfcda78c530a03f2d31080ae9;p=tools%2Feficas.git

*** empty log message ***
---

diff --git a/MAP/catalogues_MAP.ini b/MAP/catalogues_MAP.ini
index ed54cec3..f9a681dc 100644
--- a/MAP/catalogues_MAP.ini
+++ b/MAP/catalogues_MAP.ini
@@ -6,13 +6,14 @@ MAP_DIRECTORY=os.getenv("MAP_DIRECTORY")
 
 catalogues = (
 # (code, ssCode, catalogue, formatOut, formatIN)
+  ('MAP','s_Perfect_V1',os.path.join(rep_cata,'s_Perfect_V1.py'),'s_Perfect','MAP'),
   ('MAP','s_polymers_st_1_V1',os.path.join(rep_cata,'s_polymers_st_1_V1.py'),'s_polymers_st_1','MAP'),
   ('MAP','s_scc_st_2_V1',os.path.join(rep_cata,'s_scc_st_2_V1.py'),'s_scc_st_2','MAP'),
   ('MAP','s_scc_st_2_V1',os.path.join(rep_cata,'s_scc_st_2_V1.py'),'s_scc_pn','MAP'),
   ('MAP','s_rpv2_V0',os.path.join(rep_cata,'s_rpv2_V0.py'),'s_rpv2','MAP'),
-  ('MAP','s_DIC_V1',os.path.join(rep_cata,'s_DIC_V1.py'),'s_DIC','MAP'),
-  ('MAP','s_scc_3d',os.path.join(rep_cata,'s_scc_3d_analysis.py'),'s_DIC','MAP'),
+  ('MAP','V0',os.path.join(rep_cata,'s_DIC_V1.py'),'s_DIC','MAP'),
+  ('MAP','V1',os.path.join(rep_cata,'s_DIC_V1.py'),'s_DIC','MAP'),
+  ('MAP','s_scc_3d',os.path.join(rep_cata,'s_scc_3d_analysis_V1.py'),'s_DIC','MAP'),
   ('MAP','c_transverse_empty_python_V1',os.path.join(MAP_DIRECTORY,'components/transverse/c_transverse_empty_python/deploy/c_transverse_empty_python_eficas.py'),'c_transverse_empty_python','MAP'),
-  ('MAP','c_transverse_empty_c_V1',os.path.join(MAP_DIRECTORY,'components/transverse/c_transverse_empty_c/deploy/c_transverse_empty_c_eficas.py'),'c_transverse_empty_c','MAP'),
 )
 
diff --git a/MAP/qtEficas_map.py b/MAP/qtEficas_map.py
index 7f3513f0..1482bd6b 100755
--- a/MAP/qtEficas_map.py
+++ b/MAP/qtEficas_map.py
@@ -21,47 +21,18 @@
 # ======================================================================
 
 """
-   Ce module sert à lancer EFICAS configuré pour Perfect
+   Ce module sert a lancer EFICAS configure pour Code_Aster
 """
 # Modules Python
-import sys,os
-sys.path.append(os.path.join(os.path.abspath(os.path.dirname(__file__)),'..'))
-
-from PyQt4.QtGui import *
-
 # Modules Eficas
 import prefs
 name='prefs_'+prefs.code
 __import__(name)
 
 
-from InterfaceQT4 import eficas_go
-from InterfaceQT4 import monChoixMap
-from Editeur  import import_code
-from Editeur  import session
-
+import sys,os
+sys.path.append(os.path.join(os.path.abspath(os.path.dirname(__file__)),'..'))
 
-class ChoixCata:
- def __init__(self):
-   self.schema=""
-   self.module=""
-   self.nom=""
-  
-options=session.parse(sys.argv)
-cata=options.cata
-MonChoixCata=ChoixCata()
-if cata == None :
-   app = QApplication(sys.argv)
-   ChoixMap = monChoixMap.MonChoixMap(MonChoixCata) 
-   ChoixMap.show()
-   res=app.exec_()
-else :
-   import re
-   p=re.compile('_V\d+')
-   if p.search(cata) == None :
-      print "Ce Catalogue ne convient pas"
-      exit(1)
-   MonChoixCata.nom=cata[0: p.search(cata).start()]
-print prefs.code
-print MonChoixCata.nom
-eficas_go.lance_eficas(code=prefs.code,ssCode=MonChoixCata.nom)
+import prefs
+from InterfaceQT4 import eficas_go
+eficas_go.lance_eficas(code=prefs.code)