From 0bd3ecc66398db8fbbb3b9c911536b123c7810b7 Mon Sep 17 00:00:00 2001
From: Pascale Noyret <pascale.noyret@edf.fr>
Date: Tue, 8 Jun 2010 15:24:59 +0000
Subject: [PATCH] *** empty log message ***

---
 Aster/aster.py         |  0
 Map/benhur_pygmee.txt  |  4 ++--
 Map/catalogues_Map.ini | 11 +++++++----
 Map/prefs_Map.py       | 12 ++++++------
 Map/qtEficas_map.py    | 20 +++++++++++++++-----
 5 files changed, 30 insertions(+), 17 deletions(-)
 delete mode 100644 Aster/aster.py

diff --git a/Aster/aster.py b/Aster/aster.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/Map/benhur_pygmee.txt b/Map/benhur_pygmee.txt
index 96a95d9c..899e8a0c 100644
--- a/Map/benhur_pygmee.txt
+++ b/Map/benhur_pygmee.txt
@@ -18,9 +18,9 @@ II - Maillage (BENHUR)
 1) fichier entree décrivant le maillage support (entree)
 %_PATH_BENHUR%/regular_mesh_3D_%_BENHUR_FINESSE%.msh
 2) fichier sortie du maillage  (sortie)
-%_PATH_BENHUR%/%_NAME_SCHEME%_benhur_%_BENHUR_FINESSE%.msh
+%_PATH_STUDY%/%_NAME_SCHEME%_benhur_%_BENHUR_FINESSE%.msh
 3) fichier commentaire sur les statistiques décrivant le maillage (sortie)
-%_PATH_BENHUR%/%_NAME_SCHEME%_benhur_%_BENHUR_FINESSE%.log
+%_PATH_STUDY%/%_NAME_SCHEME%_benhur_%_BENHUR_FINESSE%.log
 4) fichier BMP décrivant une coupe binarisée du VER (sortie)
 %_PATH_BENHUR%/%_NAME_SCHEME%_benhur_%_BENHUR_FINESSE%.bmp
 5) fichier TXT donnant la level set du contour aux noeuds (sortie)
diff --git a/Map/catalogues_Map.ini b/Map/catalogues_Map.ini
index f1702082..005eaa09 100644
--- a/Map/catalogues_Map.ini
+++ b/Map/catalogues_Map.ini
@@ -4,9 +4,12 @@ import os
 rep_cata=os.getcwd()
 
 catalogues = (
-# (code,version,catalogue,formatIn)
-#  ('Map','V1',os.path.join(rep_cata,'Map1_Cata_V1.py'),'map'),
-  ('Map2','V0',os.path.join(rep_cata,'Map2_Cata_V0.py'),'map'),
-  ('Map','V0',os.path.join(rep_cata,'Map_Openturns.py'),'map_OT'),
+# (ssCode,version,catalogue,formatIn)
+#  ('Map','V0',os.path.join(rep_cata,'Map2_Cata_V0.py'),'map'),
+  ('Map','V1',os.path.join(rep_cata,'Map1_Cata_V0.py'),'map_OT'),
+  ('Map','V2',os.path.join(rep_cata,'Map_Openturns.py'),'map_OT'),
+  ('Map','s_poly_st_1_V1',os.path.join(rep_cata,'s_poly_st_1_V1.py'),'s_poly_st_1'),
+  ('Map','s_scc_st_2_V1',os.path.join(rep_cata,'s_scc_st_2_V1.py'),'s_scc_st_2'),
+#  ('Map','s_poly_st_1_V2',os.path.join(rep_cata,'s_poly_st_1_V2.py'),'s_poly_st_1'),
 )
 
diff --git a/Map/prefs_Map.py b/Map/prefs_Map.py
index 6c69b8f9..f7483ed4 100644
--- a/Map/prefs_Map.py
+++ b/Map/prefs_Map.py
@@ -31,11 +31,11 @@ initialdir=REPINI
 
 # INSTALLDIR sert à localiser l'installation d'Eficas
 INSTALLDIR=os.path.join(REPINI,'..')
-PATH_PYGMEE="/local00/bin/MAP/components/pygmee_v1"
-PATH_BENHUR="/local00/bin/MAP/components/benhur"
-PATH_ASTER="/local00/aster/bin"
-PATH_MODULE="/local00/bin/MAP/modules/polymers"
-PATH_STUDY="/local00/bin/MAP/studies/demonstrateur_poly_st_1"
+PATH_PYGMEE="/local/noyret/MAP/components/pygmee_v1"
+PATH_BENHUR="/local/noyret/MAP/components/benhur"
+PATH_ASTER="/local/noyret/bin/aster/bin"
+PATH_MODULE="/local/noyret/MAP/modules/polymers"
+PATH_STUDY="/local/noyret/MAP/studies/demonstrateur_poly_st1"
 
 
 # Codage des strings qui accepte les accents (en remplacement de 'ascii')
@@ -45,7 +45,7 @@ encoding='iso-8859-1'
 
 # Acces a la documentation
 rep_cata        = INSTALLDIR
-path_doc        = os.path.join(rep_cata,'Doc')
+path_doc        = os.path.join(REPINI,'Doc')
 exec_acrobat    = "/usr/bin/xpdf"
 savedir         = os.environ['HOME']
 
diff --git a/Map/qtEficas_map.py b/Map/qtEficas_map.py
index e33a9ee5..f835ec33 100755
--- a/Map/qtEficas_map.py
+++ b/Map/qtEficas_map.py
@@ -46,12 +46,22 @@ class ChoixCata:
    self.module=""
    self.nom=""
   
-
+options=session.parse(sys.argv)
+cata=options.cata
 MonChoixCata=ChoixCata()
-app = QApplication(sys.argv)
-ChoixMap = monChoixMap.MonChoixMap(MonChoixCata) 
-ChoixMap.show()
-res=app.exec_()
+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()]
+   #MonChoixCata.nom=cata
 
 #permet de choisir le module
 print MonChoixCata.nom
-- 
2.39.2