évolution:

on place les JDC dans l'arbre d'étude sous le répertoire AsterFile ( pour un JDC ASTER ) ou HomardFile ( pour un JDC HOMARD )

diff --git a/src/EFICASGUI/eficasSalome.py b/src/EFICASGUI/eficasSalome.py
index 6f258a71ad813d9378cf794c87cdf36b52f87920..55887294962d1728b2a0b95eceaaad62eec5c0d1 100644 (file)
--- a/src/EFICASGUI/eficasSalome.py
+++ b/src/EFICASGUI/eficasSalome.py
@@ -459,22 +459,31 @@ class MyEficas( Tkinter.Toplevel, eficas.EFICAS ):
                 return ok, msgError
                         
             fileType = { 'ASTER':  studyManager.FICHIER_EFICAS_ASTER,
-                         'HOMARD': studyManager.FICHIER_EFICAS_HOMARD }
+                        'HOMARD': studyManager.FICHIER_EFICAS_HOMARD }
+                        
+            folderName = { 'ASTER':  'AsterFile',
+                        'HOMARD': 'HomardFile' }
+                        
             moduleEntry = studyManager.palStudy.addComponent(self.module)
             itemName    = re.split("/",jdcPath)[-1]
-            #commEntry = self.createItemInStudy( EficasEntry, itemName ) #CS_pbruno attention même nom possible, controle à faire
-            commEntry = studyManager.palStudy.addItem( moduleEntry,
-                                                       itemName = itemName,
-                                                       itemType = fileType[ self.bureau.code ],
-                                                       itemValue = jdcPath,
-                                                       itemComment = str( jdcPath ),
-                                                       itemIcon    = "ICON_COMM_FILE",
-                                                       bDoublonCheck = True )
+            
+            fatherEntry = studyManager.palStudy.addItem(
+                                    moduleEntry,
+                                    itemName = folderName[self.bureau.code],
+                                    itemType = studyManager.ASTER_FILE_FOLDER,
+                                    bDoublonCheck = True  )
+                                                                        
+            commEntry = studyManager.palStudy.addItem( fatherEntry ,
+                                                        itemName = itemName,
+                                                        itemType = fileType[ self.bureau.code ],
+                                                        itemValue = jdcPath,
+                                                        itemComment = str( jdcPath ),
+                                                        itemIcon    = "ICON_COMM_FILE",
+                                                        bDoublonCheck = True )
             studyManager.palStudy.refresh()                                                       
             print 'addJdcInSalome commEntry->', commEntry            
             if commEntry:
-                ok, msgError = True, ''
-            
+                ok, msgError = True, ''        
         except:                    
             logger.debug(50*'=')
         return ok, msgError