From: Pascale Noyret <pascale.noyret@edf.fr>
Date: Fri, 19 Mar 2010 14:37:23 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: V5_1_3~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=7d22040ca23501af3044493776285b07cd87b93d;p=modules%2Feficas.git

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

diff --git a/build_configure b/build_configure
index ad372268..f7c496ad 100755
--- a/build_configure
+++ b/build_configure
@@ -213,7 +213,7 @@ aclocal -I adm_local/unix/config_files \
         -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files/DEPRECATED \
         -I ${GUI_ROOT_DIR}/adm_local/unix/config_files
 
-if autoconf
+if autoconf --force
 then
 	echo "done"
 else
diff --git a/resources/EFICAS_en.xml b/resources/EFICAS_en.xml
index be718156..1c6db189 100644
--- a/resources/EFICAS_en.xml
+++ b/resources/EFICAS_en.xml
@@ -17,8 +17,9 @@
       <menu-item label-id="EFICAS" item-id="90" pos-id="3">
         <popup-item item-id="941" label-id="Eficas pour Code_Aster" icon-id="eficaster.png" tooltip-id="Editer un jeu de commande ASTER avec Eficas" accel-id="" toggle-id="" execute-action=""/>
         <popup-item item-id="942" label-id="Eficas pour Outils Metier" icon-id="eficasOM.png" tooltip-id="Editer un jeu de commande ASTER avec Eficas" accel-id="" toggle-id="" execute-action=""/>
-        <popup-item item-id="947" label-id="Eficas pour Openturns Study" icon-id="eficaster.png" tooltip-id="Editer un jeu de commande Openturns Study avec Eficas" accel-id="" toggle-id="" execute-action=""/>
-        <popup-item item-id="948" label-id="Eficas pour Openturns Wrapper" icon-id="eficaster.png" tooltip-id="Editer un jeu de commande Openturns Study avec Eficas" accel-id="" toggle-id="" execute-action=""/>
+        <popup-item item-id="945" label-id="Eficas pour Map" icon-id="plus.png" tooltip-id="Editer un jeu de commande Openturns Study avec Eficas" accel-id="" toggle-id="" execute-action=""/>
+        <popup-item item-id="947" label-id="Eficas pour Openturns Study" icon-id="eficasotstd.png" tooltip-id="Editer un jeu de commande Openturns Study avec Eficas" accel-id="" toggle-id="" execute-action=""/>
+        <popup-item item-id="948" label-id="Eficas pour Openturns Wrapper" icon-id="eficasotwrp.png" tooltip-id="Editer un jeu de commande Openturns Study avec Eficas" accel-id="" toggle-id="" execute-action=""/>
       </menu-item>
     </menubar>
 
@@ -29,6 +30,7 @@
        <toolbutton-item item-id="4042" label-id="Eficas pour Openturns Outils Metier" icon-id="eficaster.png" tooltip-id="Editer un jeu de commande Outils Metier avec Eficas" accel-id="" toggle-id="" execute-action=""/> 
        <toolbutton-item item-id="4047" label-id="Eficas pour Openturns Study" icon-id="eficasotstd.png" tooltip-id="Editer un jeu de commande Openturns Study avec Eficas" accel-id="" toggle-id="" execute-action=""/> 
        <toolbutton-item item-id="4048" label-id="Eficas pour Openturns Wrapper" icon-id="eficasotwrp.png" tooltip-id="Editer un jeu de commande Openturns Wrapper avec Eficas" accel-id="" toggle-id="" execute-action=""/> 
+       <toolbutton-item item-id="4049" label-id="Eficas pour Map" icon-id="plus.png" tooltip-id="Editer un jeu de commande Map avec Eficas" accel-id="" toggle-id="" execute-action=""/> 
     </toolbar>
 
   <!-- ### POPUP MENU ###  -->
diff --git a/src/EFICASGUI/EFICASGUI.py b/src/EFICASGUI/EFICASGUI.py
index 53fbeb54..c4411511 100644
--- a/src/EFICASGUI/EFICASGUI.py
+++ b/src/EFICASGUI/EFICASGUI.py
@@ -132,6 +132,11 @@ def runEficaspourOM():
    desktop=sgPyQt.getDesktop()
    eficasSalome.runEficas( "SEP" )
    
+def runEficaspourMap():
+   print "runEficas Pour Map "
+   desktop=sgPyQt.getDesktop()
+   eficasSalome.runEficas( "MAP" )
+   
    
 
 def runEficasFichier(version=None):
@@ -172,11 +177,13 @@ dict_command={
                 942:runEficaspourOM,# runEficas,
                 947:runEficaspourOpenturnsStudy,
                 948:runEficaspourOpenturnsWrapper,
+                949:runEficaspourMap,
 
                 4041:runEficas, #runEficas,
                 4042:runEficaspourOM,# runEficas,
                 4047:runEficaspourOpenturnsStudy,
                 4048:runEficaspourOpenturnsWrapper,
+                4049:runEficaspourMap,
 
                 9041:runEficasFichier,
              }
diff --git a/src/EFICASGUI/eficasSalome.py b/src/EFICASGUI/eficasSalome.py
index 0638ddcc..ae6afa46 100644
--- a/src/EFICASGUI/eficasSalome.py
+++ b/src/EFICASGUI/eficasSalome.py
@@ -408,6 +408,7 @@ class MyEficas( qtEficas.Appli ):
                         
             fileType = { 'ASTER'    : "FICHIER_EFICAS_ASTER",
                          'SEP'      : "FICHIER_EFICAS_SEP",
+                         'MAP'      : "FICHIER_EFICAS_MAP",
                          'OPENTURNS': "FICHIER_EFICAS_OPENTURNS",
                          'OPENTURNS_STUDY': "FICHIER_EFICAS_OPENTURNS_STUDY",
                          'OPENTURNS_WRAPPER': "FICHIER_EFICAS_OPENTURNS_WRAPPER",
@@ -415,11 +416,13 @@ class MyEficas( qtEficas.Appli ):
                         
             folderName = {  'ASTER'    :  'AsterFiles',
                             'SEP'       : 'OMFiles' ,
+                            'MAP'       : 'MapFiles' ,
                             'OPENTURNS_STUDY': 'OpenturnsFiles',                                    
                             'OPENTURNS_WRAPPER': 'OpenturnsFiles'}                                    
 
             folderType = { 'ASTER':    "ASTER_FILE_FOLDER",
                            'SEP':      "SEP_FILE_FOLDER",
+                           'MAP':      "MAP_FILE_FOLDER",
                            'OPENTURNS_STUDY':"OPENTURNS_FILE_FOLDER",
                            'OPENTURNS_WRAPPER': "OPENTURNS_FILE_FOLDER"}