CCAR: posibilite de creer et editer un INCLUDE sans fichier principal

nouvelle entree dans menu principal : Nouvel INCLUDE

diff --git a/Aster/prefs.py b/Aster/prefs.py
index fcd648856687f3474d651d96be718a45aba82bc4..078940dbf5db800f93092e09eb4242bc874294be 100644 (file)
--- a/Aster/prefs.py
+++ b/Aster/prefs.py
@@ -63,6 +63,7 @@ appli_composants=['readercata','bureau',
 menu_defs={ 'bureau': [
               ('Fichier',[
                            ('Nouveau','newJDC','<Control-n>'),
+                           ('Nouvel INCLUDE','newJDC_include'),
                            ('Ouvrir','openJDC','<Control-o>'),
                            ('Enregistrer','saveJDC','<Control-e>'),
                            ('Enregistrer sous','saveasJDC','<Control-s>'),

diff --git a/Editeur/bureau.py b/Editeur/bureau.py
index e214c97598bacdb87bee10748999468bed5ef0ff..19aef955b91e3525dd7c2c144bcecfa4c64bcfd1 100644 (file)
--- a/Editeur/bureau.py
+++ b/Editeur/bureau.py
@@ -148,8 +148,15 @@ class BUREAU:
       self.appli.statusbar.reset_affichage_infos()
 
       CONTEXT.unset_current_step()
+      jaux=self.cata[0].JdC(procedure="",appli=self.appli,
+                         cata=self.cata,cata_ord_dico=self.cata_ordonne_dico,
+                         rep_mat=self.appli.CONFIGURATION.rep_mat,
+                         )
+      jaux.analyse()
+
       J=JdC_aux(procedure="",appli=self.appli,
                          cata=self.cata,cata_ord_dico=self.cata_ordonne_dico,
+                         jdc_pere=jaux,
                          rep_mat=self.appli.CONFIGURATION.rep_mat,
                          )
       J.analyse()

diff --git a/Extensions/jdc_include.py b/Extensions/jdc_include.py
index 1f54927479b41340bf1c1f8490a88a9568a9fae5..94cc0163c94a817eb573e6e2f202f7d8196d1a3f 100644 (file)
--- a/Extensions/jdc_include.py
+++ b/Extensions/jdc_include.py
@@ -131,12 +131,16 @@ class JDC_POURSUITE(JDC):
       """
           Retourne la liste des commandes du catalogue
       """
+      if self.jdc_pere is None:
+         return JDC.get_liste_cmd(self)
       return self.jdc_pere.get_liste_cmd()
 
    def get_groups(self):
       """
           Retourne la liste des commandes du catalogue par groupes
       """
+      if self.jdc_pere is None:
+         return JDC.get_groups(self)
       return self.jdc_pere.get_groups()
 
    def init_modif(self):
@@ -151,7 +155,8 @@ class JDC_POURSUITE(JDC):
       """
       #print "jdc_include.init_modif",self,self.etape_include
       self.state = 'modified'
-      self.etape_include.init_modif()
+      if self.etape_include:
+         self.etape_include.init_modif()
 
    def fin_modif(self):
       """
@@ -160,7 +165,9 @@ class JDC_POURSUITE(JDC):
           ex : INCLUDE et POURSUITE
       """
       #print "jdc_include.fin_modif",self,self.etape_include
-
+      if not self.etape_include:
+         CONNECTOR.Emit(self,"valid")
+         return
       # Mise a jour du contexte en fin d'include
       # On suppose que toutes les modifications sont valides
       # On recupere le contexte final dans j_context
@@ -195,7 +202,8 @@ class JDC_POURSUITE(JDC):
          comme DETRUIRE ou les macros
          Si etape == None, on retourne le contexte en fin de JDC
       """
-      self.context_ini = self.etape_include.parent.get_contexte_avant(self.etape_include).copy()
+      if self.etape_include:
+         self.context_ini = self.etape_include.parent.get_contexte_avant(self.etape_include).copy()
       return JDC.get_contexte_avant(self,etape)
 
    #def get_sd_avant_etape(self,nom_sd,etape):
@@ -217,8 +225,9 @@ class JDC_POURSUITE(JDC):
            définie apres etape
            Si avec vaut 'non' exclut etape de la recherche
       """
-      sd=self.etape_include.parent.get_sd_apres_etape(nom_sd,self.etape_include,'non')
-      if sd:return sd
+      if self.etape_include:
+         sd=self.etape_include.parent.get_sd_apres_etape(nom_sd,self.etape_include,'non')
+         if sd:return sd
       return JDC.get_sd_apres_etape(self,nom_sd,etape,avec)
 
    def get_sd_apres_etape_avec_detruire(self,nom_sd,sd,etape,avec='non'):
@@ -250,7 +259,8 @@ class JDC_POURSUITE(JDC):
       # Nettoyage des etapes de l'include
       JDC.delete_concept(self,sd)
       # Nettoyage des etapes du parent
-      self.etape_include.parent.delete_concept_after_etape(self.etape_include,sd)
+      if self.etape_include:
+         self.etape_include.parent.delete_concept_after_etape(self.etape_include,sd)
 
    def delete_concept_after_etape(self,etape,sd):
       """
@@ -260,7 +270,8 @@ class JDC_POURSUITE(JDC):
       # Nettoyage des etapes de l'include
       JDC.delete_concept_after_etape(self,etape,sd)
       # Nettoyage des etapes du parent
-      self.etape_include.parent.delete_concept_after_etape(self.etape_include,sd)
+      if self.etape_include:
+         self.etape_include.parent.delete_concept_after_etape(self.etape_include,sd)
 
    def replace_concept_after_etape(self,etape,old_sd,sd):
       """
@@ -270,9 +281,18 @@ class JDC_POURSUITE(JDC):
       # Nettoyage des etapes de l'include
       JDC.replace_concept_after_etape(self,etape,old_sd,sd)
       # Nettoyage des etapes du parent
-      self.etape_include.parent.replace_concept_after_etape(self.etape_include,old_sd,sd)
+      if self.etape_include:
+         self.etape_include.parent.replace_concept_after_etape(self.etape_include,old_sd,sd)
 
 class JDC_INCLUDE(JDC_POURSUITE):
+   def get_liste_cmd(self):
+      """
+          Retourne la liste des commandes du catalogue
+      """
+      if self.jdc_pere is None:
+         return JDC.get_liste_cmd(self)
+      return [e for e in self.jdc_pere.get_liste_cmd() if e not in ("DEBUT","POURSUITE","FIN") ]
+
    def active_etapes(self):
       for e in self.etapes:
          e.active()