modif mathieu courtois

diff --git a/Aster/Cata/cataSTA7/cata.py b/Aster/Cata/cataSTA7/cata.py
index 58fd5be79882aefc7d8b6857586dc4ff5ec3d220..4c9d22db150238fcec3fd4e73ede2f4a87e330b0 100644 (file)
--- a/Aster/Cata/cataSTA7/cata.py
+++ b/Aster/Cata/cataSTA7/cata.py
@@ -34,31 +34,19 @@ except:
   pass
 
 #
-__version__="$Name: BR_V1_12a1 $"
-__Id__="$Id: cata.py,v 1.3.8.3 2007-06-04 17:03:51 cchris Exp $"
+__version__="$Name:  $"
+__Id__="$Id: cata_aster_v6.py,v 1.12 2001/01/16 15:55:05 iliade Exp $"
 #
 JdC = JDC_CATA(code='ASTER',
                execmodul=None,
                regles = (AU_MOINS_UN('DEBUT','POURSUITE'),
                          AU_MOINS_UN('FIN'),
                          A_CLASSER(('DEBUT','POURSUITE'),'FIN')))
-
 # Type le plus general
 class entier   (ASSD):
    def __init__(self,valeur=None,**args):
       ASSD.__init__(self,**args)
       self.valeur=valeur
-#   def __adapt__(self,validator):
-#      if validator.name == "list":
-#          #validateur liste,cardinalité
-#          return (self,)
-#      elif validator.name == "type":
-#          #validateur type
-#          return validator.adapt(self.valeur or 0)
-#      else:
-#          #validateur into et valid
-#          return self
-
 
 # Type geometriques
 class no  (GEOM):pass

diff --git a/Aster/Cata/cataSTA8/cata.py b/Aster/Cata/cataSTA8/cata.py
index 81faabe10b03da29f11424da3ba369839550a7ec..be6fb96e6011d337929ae1ed2b2269ae9cb602d2 100755 (executable)
--- a/Aster/Cata/cataSTA8/cata.py
+++ b/Aster/Cata/cataSTA8/cata.py
@@ -33,8 +33,8 @@ try:
 except:
   pass
 
-__version__="$Name: BR_V1_12a1 $"
-__Id__="$Id: cata.py,v 1.3.8.4 2007-06-05 09:55:42 pnoyret Exp $"
+__version__="$Name:  $"
+__Id__="$Id: cata_aster_v6.py,v 1.12 2001/01/16 15:55:05 iliade Exp $"
 
 EnumTypes = (ListType, TupleType)
 

diff --git a/Aster/Cata/cataSTA9/cata.py b/Aster/Cata/cataSTA9/cata.py
index 2efa8d8be43b877b5faf588befb5ab7d533a5840..ec814200e9c361eeee2908261a53498f9b065972 100644 (file)
--- a/Aster/Cata/cataSTA9/cata.py
+++ b/Aster/Cata/cataSTA9/cata.py
@@ -18,8 +18,8 @@
 #    1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE.
 # ======================================================================
 
-__version__ = "$Name:  $"
-__Id__ = "$Id: cata_aster_v6.py,v 1.12 2001/01/16 15:55:05 iliade Exp $"
+__version__ = "$Name: V1_12 $"
+__Id__ = "$Id: cata.py,v 1.1.2.3 2007-06-11 14:20:59 pnoyret Exp $"
 
 import Accas
 from Accas import *

diff --git a/Aster/Cata/cataSTA9/ops.py b/Aster/Cata/cataSTA9/ops.py
index b947f0bbbd3875512c61173bfa4c4b98fdbfcc3e..16a3f8c6632a910c40873ea97094f9dc374c51f3 100644 (file)
--- a/Aster/Cata/cataSTA9/ops.py
+++ b/Aster/Cata/cataSTA9/ops.py
@@ -28,18 +28,20 @@ import pickle
 import Accas
 from Accas import ASSD
 from Noyau.ascheckers     import CheckLog
-from Utilitai.as_timer import ASTER_TIMER
-from Utilitai.Sensibilite import MEMORISATION_SENSIBILITE
 
 try:
-   from Utilitai.Utmess   import UTMESS
    import aster
+   aster_exists = True
    # Si le module aster est présent, on le connecte
    # au JDC
    import Build.B_CODE
    Build.B_CODE.CODE.codex=aster
+   
+   from Utilitai.Utmess   import UTMESS
+   from Utilitai.as_timer import ASTER_TIMER
+   from Macro.Sensibilite import MEMORISATION_SENSIBILITE
 except:
-   pass
+   aster_exists = False
 
 
 def commun_DEBUT_POURSUITE(jdc, PAR_LOT, IMPR_MACRO, CODE, DEBUG):
@@ -54,10 +56,11 @@ def commun_DEBUT_POURSUITE(jdc, PAR_LOT, IMPR_MACRO, CODE, DEBUG):
    jdc.sd_checker = CheckLog()
    if CODE != None:
       jdc.fico = CODE['NOM']
-   jdc.timer = ASTER_TIMER(format='aster')
-   # en POURSUITE, ne pas écraser la mémorisation existante.
-   if not hasattr(jdc, 'memo_sensi'):
-      jdc.memo_sensi = MEMORISATION_SENSIBILITE()
+   if aster_exists:
+      jdc.timer = ASTER_TIMER(format='aster')
+      # en POURSUITE, ne pas écraser la mémorisation existante.
+      if not hasattr(jdc, 'memo_sensi'):
+         jdc.memo_sensi = MEMORISATION_SENSIBILITE()
 
 
 def DEBUT(self,PAR_LOT,IMPR_MACRO,CODE,DEBUG,**args):

diff --git a/Editeur/appli.py b/Editeur/appli.py
index 30be3fae732a07330f499e78090cb8c892161f81..ea1e555cfac8fff6e35811c5c51fb748aa8298df 100644 (file)
--- a/Editeur/appli.py
+++ b/Editeur/appli.py
@@ -59,12 +59,12 @@ class APPLI:
       self.top=master
       self.top.protocol("WM_DELETE_WINDOW",self.exitEFICAS)
       fac= self.top.winfo_screenwidth()/1024.
-      minx=int(900*fac)
-      miny=int(500*fac)
+      minx=int(256*fac)
+      miny=int(128*fac)
       self.top.minsize(minx,miny)
       self.top.geometry('%dx%d' % (minx,miny))
       #self.top.minsize(900,500)
-      #self.top.geometry("900x500")
+      self.top.geometry("900x500")
       self.top.title(VERSION + ' pour '+self.code)
       self.titre=VERSION + ' pour '+self.code
       self.top.withdraw()