*** empty log message ***

diff --git a/Accas/A_ASSD.py b/Accas/A_ASSD.py
index e9a76ccf53e45c7ec53865244263c24be5ea4cbe..06e2566f992f654c5864077828cda927edfee95c 100644 (file)
--- 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 c2995f429014625faf3699397098da29eff06e44..28d0e17905d17ea0bfc5196ac78ced2770d32c0c 100644 (file)
--- 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 7139eb57394d75dd6445fa1ff75d5fca4f0d4e35..ea995409f09f45e308f13ad8d70ac76f4f9f163a 100644 (file)
--- 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 1ed81cc032150ddbf38f41ab7e70e652a476e4a4..7d1cf347a4bc5d2a3d8092479790294ca041a5de 100644 (file)
--- 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 8f12b386bad53904c8707f9bb3dd8d472b9166f9..83309694a9c4f17705258f000d052ce12e899562 100644 (file)
--- 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 dd814447c2b0d805cf337051c09c85aeea5f8581..9607736f0606fbd5e4f0a7a4fd3331957158a813 100644 (file)
--- 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