From 0c9d11c20bce7c61cb1f17d4ecd5de5a650147a9 Mon Sep 17 00:00:00 2001
From: eficas <>
Date: Fri, 9 Dec 2005 13:44:04 +0000
Subject: [PATCH] *** empty log message ***

---
 Accas/A_ASSD.py     | 5 +++--
 Accas/__init__.py   | 2 +-
 Aster/alphasdist.py | 1 +
 Aster/sdist.py      | 4 ++--
 Editeur/appli.py    | 2 +-
 Ihm/I_JDC.py        | 2 +-
 6 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Accas/A_ASSD.py b/Accas/A_ASSD.py
index e9a76ccf..06e2566f 100644
--- a/Accas/A_ASSD.py
+++ b/Accas/A_ASSD.py
@@ -23,7 +23,7 @@ from Ihm import I_ASSD
 from Ihm import I_LASSD
 from Ihm import I_FONCTION
 from Noyau import N_ASSD 
-from Noyau import N_LASSD 
+#from Noyau import N_LASSD 
 from Noyau import N_GEOM 
 from Noyau import N_FONCTION 
 from Noyau import N_CO 
@@ -34,7 +34,8 @@ from Noyau import N_CO
 # dérivation
 
 class ASSD(N_ASSD.ASSD,I_ASSD.ASSD):pass
-class LASSD(I_LASSD.LASSD,N_LASSD.LASSD):pass
+#class LASSD(I_LASSD.LASSD,N_LASSD.LASSD):pass
+class LASSD(I_LASSD.LASSD):pass
 
 class assd(N_ASSD.assd,I_ASSD.ASSD,ASSD):pass
 
diff --git a/Accas/__init__.py b/Accas/__init__.py
index c2995f42..28d0e179 100644
--- a/Accas/__init__.py
+++ b/Accas/__init__.py
@@ -61,7 +61,7 @@ from A_ENSEMBLE import ENSEMBLE
 from A_A_CLASSER import A_CLASSER
 
 from A_ASSD import ASSD,assd
-from A_ASSD import LASSD
+#from A_ASSD import LASSD
 from A_ASSD import GEOM,geom
 # Pour le moment on laisse fonction (ceinture et bretelles)
 from A_ASSD import FONCTION, fonction
diff --git a/Aster/alphasdist.py b/Aster/alphasdist.py
index 7139eb57..ea995409 100644
--- a/Aster/alphasdist.py
+++ b/Aster/alphasdist.py
@@ -76,6 +76,7 @@ def main():
    copyfiles('../generator',os.path.join(path_distrib,'generator'),['*.py'])
 
    copyfiles('../Editeur/icons',os.path.join(path_distrib,'Editeur','icons'),['*.gif'])
+   copyfiles('../Editeur/Patrons',os.path.join(path_distrib,'Editeur','Patrons'),['*.com*'])
 
    copyfiles(os.path.join(path_Noyau,'Noyau'),os.path.join(path_distrib,'Noyau'),['*.py'])
    copyfiles(os.path.join(path_Noyau,'Validation'),os.path.join(path_distrib,'Validation'),['*.py'])
diff --git a/Aster/sdist.py b/Aster/sdist.py
index 1ed81cc0..7d1cf347 100644
--- a/Aster/sdist.py
+++ b/Aster/sdist.py
@@ -60,7 +60,6 @@ def main():
    copyfiles('Cata/cataSTA73/Macro',os.path.join(path_distrib,'Aster','Cata','cataSTA73','Macro'),['*.py'])
    copyfiles('Cata/cataSTA74',os.path.join(path_distrib,'Aster','Cata','cataSTA74'),['*.py'])
    copyfiles('Cata/cataSTA74/Macro',os.path.join(path_distrib,'Aster','Cata','cataSTA74','Macro'),['*.py'])
-   copyfiles('Cata/cataSTA8',os.path.join(path_distrib,'Aster','Cata','cataSTA8'),['*.py'])
    copyfiles('Cata/cataSTA81',os.path.join(path_distrib,'Aster','Cata','cataSTA81'),['*.py'])
    copyfiles('../Aster/Cata',os.path.join(path_distrib,'Aster'),['aster.py',])
 
@@ -68,12 +67,13 @@ def main():
    copyfiles('../convert/Parserv5',os.path.join(path_distrib,'convert','Parserv5'),['*.py'])
    copyfiles('../generator',os.path.join(path_distrib,'generator'),['*.py'])
    copyfiles('../Editeur/icons',os.path.join(path_distrib,'Editeur','icons'),['*.gif'])
+   copyfiles('../Editeur/Patrons',os.path.join(path_distrib,'Editeur','Patrons'),['*.com*'])
 
    copyfiles(os.path.join(path_Noyau,'Noyau'),os.path.join(path_distrib,'Noyau'),['*.py'])
    copyfiles(os.path.join(path_Noyau,'Validation'),os.path.join(path_distrib,'Validation'),['*.py'])
    copyfiles(os.path.join(path_Noyau,'Accas'),os.path.join(path_distrib,'Aster'),['properties.py'])
    copyfiles(os.path.join(path_Noyau,'Cata'),os.path.join(path_distrib,'Aster','Cata'),['*.py',])
-   copyfiles(os.path.join(path_Noyau,'Macro'),os.path.join(path_distrib,'Aster','Cata','cataSTA8','Macro'),['*.py'])
+   copyfiles(os.path.join(path_Noyau,'Macro'),os.path.join(path_distrib,'Aster','Cata','cataSTA81','Macro'),['*.py'])
    os.system("mv "+path_distrib+"/Aster/Cata/cata_STA8.py "+path_distrib+"/Aster/Cata/cataSTA8/cata.py")
 
    copyfiles('../Tools',os.path.join(path_distrib,'Tools'),['*.py'])
diff --git a/Editeur/appli.py b/Editeur/appli.py
index 8f12b386..83309694 100644
--- a/Editeur/appli.py
+++ b/Editeur/appli.py
@@ -46,7 +46,7 @@ import session
 import listeFichiers
 import listePatrons
 
-VERSION="EFICAS v1.8.2"
+VERSION="EFICAS v1.9"
 
 class APPLI: 
   def __init__ (self,master,code=prefs.code,fichier=None,test=0) :
diff --git a/Ihm/I_JDC.py b/Ihm/I_JDC.py
index dd814447..9607736f 100644
--- a/Ihm/I_JDC.py
+++ b/Ihm/I_JDC.py
@@ -28,7 +28,7 @@ import string,linecache
 import I_OBJECT
 import Noyau
 from Noyau.N_ASSD import ASSD
-from Noyau.N_LASSD import LASSD
+#from Noyau.N_LASSD import LASSD
 from Noyau.N_ETAPE import ETAPE
 from Noyau.N_Exception import AsException
 from Extensions import commentaire,parametre,parametre_eval
-- 
2.39.2