*** empty log message ***

diff --git a/Editeur/import_code.py b/Editeur/import_code.py
index 1a99dda466977adc0aeb03daae8283fa9cbe6201..3d34eaa677d1bca46d63280c557c790d74c6149f 100644 (file)
--- a/Editeur/import_code.py
+++ b/Editeur/import_code.py
@@ -29,7 +29,7 @@ import prefs
 
 INSTALLDIR=prefs.INSTALLDIR
 sys.path.append(INSTALLDIR)
-sys.path.append(INSTALLDIR+"/UiQT")
+sys.path.append(INSTALLDIR+"/Ui")
 sys.path.append(INSTALLDIR+"/InterfaceQT")
 sys.path.append(INSTALLDIR+"/Editeur")
 

diff --git a/InterfaceQT/qtEficas.py b/InterfaceQT/qtEficas.py
index 3c50cd748834524cc16732d96370061d7eb81781..df16582af833674544c8e91302d18b1ba166f406 100644 (file)
--- a/InterfaceQT/qtEficas.py
+++ b/InterfaceQT/qtEficas.py
@@ -3,9 +3,7 @@
 import os, sys
 REPINI=os.path.dirname(os.path.abspath(__file__))
 INSTALLDIR=os.path.join(REPINI,'..')
-sys.path.append(INSTALLDIR)
-sys.path.append(INSTALLDIR+"/Ui")
-sys.path.append(INSTALLDIR+"/InterfaceQT")
+from Editeur import import_code
 
 from qt import *
 from myMain import Eficas

diff --git a/InterfaceQT/readercata.py b/InterfaceQT/readercata.py
index 1f2dac873585a0fb69fef963038dc578a83b20e6..ff930c9f564e2a8b3a40c499144da4da3c863784 100644 (file)
--- a/InterfaceQT/readercata.py
+++ b/InterfaceQT/readercata.py
@@ -42,7 +42,7 @@ from monChoixCata import MonChoixCata
 
 from qt import *
 
-version="14"
+version="15"
 
 class READERCATA:
 

diff --git a/InterfaceQT4/editor.py b/InterfaceQT4/editor.py
index 450b703fb6a9ada2fb523d9e9f94eb64fe0b43a1..7ab8dc62797164419a18aa4d11aa7f948a1af16e 100644 (file)
--- a/InterfaceQT4/editor.py
+++ b/InterfaceQT4/editor.py
@@ -36,7 +36,7 @@ import readercata
 import qtCommun
 
 
-VERSION_EFICAS  = "EFICAS v1.14"
+VERSION_EFICAS  = "EFICAS v1.15"
 
 
 class JDCEditor(QSplitter):

diff --git a/InterfaceQT4/readercata.py b/InterfaceQT4/readercata.py
index 3e24478c16a91997c0e114107e7badef123e58d2..c02464afe06fcd9a8d83382cfb2f11e9bf6b42ca 100644 (file)
--- a/InterfaceQT4/readercata.py
+++ b/InterfaceQT4/readercata.py
@@ -43,7 +43,7 @@ from PyQt4 import *
 from PyQt4.QtGui import *
 from PyQt4.QtCore import *
 
-version="15"
+VERSION_EFICAS="Eficas V1.15"
 
 class READERCATA:
 
@@ -136,7 +136,7 @@ class READERCATA:
       #
       self.traite_clefs_documentaires()
       self.cata=(self.cata,)
-      titre="Eficas V1.15 avec le catalogue " + os.path.basename(self.fic_cata)
+      titre=VERSION_EFICAS + " avec le catalogue " + os.path.basename(self.fic_cata)
       if self.appliEficas.top:
         self.appliEficas.setWindowTitle(titre)
       self.appliEficas.titre=titre

diff --git a/InterfaceTK/appli.py b/InterfaceTK/appli.py
index df932a59d43800558d5e58762be7144565109ac9..f08b160d8fa2ddaab47b3c9c4bc7a1f5ef52c398 100644 (file)
--- a/InterfaceTK/appli.py
+++ b/InterfaceTK/appli.py
@@ -55,7 +55,7 @@ import listePatronsTK
 REPTK=os.path.dirname(os.path.abspath(__file__))
 sys.path[:0]=[REPTK]
 
-VERSION="EFICAS v1.14"
+VERSION="EFICAS v1.15"
 
 class APPLI: 
   def __init__ (self,master,code=prefs.code,fichier=None,test=0,ihm="TK",salome=0) :

diff --git a/Openturns_Study/ops.py b/Openturns_Study/ops.py
new file mode 100644 (file)
index 0000000..e57f2da
--- /dev/null
+++ b/Openturns_Study/ops.py
@@ -0,0 +1,31 @@
+def INCLUDE(self,FICHIER,**args):
+   """ 
+       Fonction sd_prod pour la macro INCLUDE
+   """
+   if hasattr(self,'change_fichier'):
+       delattr(self,'change_fichier')
+       delattr(self,'fichier_ini')
+
+   self.make_include2(fichier=FICHIER)
+
+def INCLUDE_context(self,d):
+   """ 
+       Fonction op_init pour macro INCLUDE
+   """
+   for k,v in self.g_context.items():
+      d[k]=v
+
+def build_include(self,**args):
+   """
+   Fonction ops de la macro INCLUDE appelée lors de la phase de Build
+   """
+   # Pour presque toutes les commandes (sauf FORMULE et POURSUITE)
+   # le numero de la commande n est pas utile en phase de construction
+   # La macro INCLUDE ne sera pas numérotée (incrément=None)
+   ier=0
+   self.set_icmd(None)
+   icmd=0
+   # On n'execute pas l'ops d'include en phase BUILD car il ne sert a rien.
+   #ier=self.codex.opsexe(self,icmd,-1,1)
+   return ier
+