X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=convert%2Fconvert_openturns_study.py;h=6a6953f7b4b1f33002a9e38ef13b71d64cfd93dd;hb=5ecef0dc64055f54a1f864b979e58cc05f1c9f4a;hp=ba62b9f9da1c4d0d0de5714d4724f680a17327e8;hpb=d41b1c52d0c35b655f6feabfe816a3c541f3a92a;p=tools%2Feficas.git

diff --git a/convert/convert_openturns_study.py b/convert/convert_openturns_study.py
index ba62b9f9..6a6953f7 100644
--- a/convert/convert_openturns_study.py
+++ b/convert/convert_openturns_study.py
@@ -1,39 +1,47 @@
-# -*- coding: utf-8 -*-
-#            CONFIGURATION MANAGEMENT OF EDF VERSION
-# ======================================================================
-# COPYRIGHT (C) 1991 - 2002  EDF R&D                  WWW.CODE-ASTER.ORG
-# THIS PROGRAM IS FREE SOFTWARE; YOU CAN REDISTRIBUTE IT AND/OR MODIFY
-# IT UNDER THE TERMS OF THE GNU GENERAL PUBLIC LICENSE AS PUBLISHED BY
-# THE FREE SOFTWARE FOUNDATION; EITHER VERSION 2 OF THE LICENSE, OR
-# (AT YOUR OPTION) ANY LATER VERSION.
+# Copyright (C) 2007-2013   EDF R&D
 #
-# THIS PROGRAM IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL, BUT
-# WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF
-# MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. SEE THE GNU
-# GENERAL PUBLIC LICENSE FOR MORE DETAILS.
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License.
 #
-# YOU SHOULD HAVE RECEIVED A COPY OF THE GNU GENERAL PUBLIC LICENSE
-# ALONG WITH THIS PROGRAM; IF NOT, WRITE TO EDF R&D CODE_ASTER,
-#    1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE.
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
 #
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
-# ======================================================================
-"""
-"""
-
-import parseur_python
-from convert_python import *
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+import re
+from convert_python import PythonParser
 
 def entryPoint():
    """
-       Retourne les informations nécessaires pour le chargeur de plugins
-       Ces informations sont retournées dans un dictionnaire
+   Return a dictionary containing the description needed to load the plugin
    """
    return {
-        # Le nom du plugin
           'name' : 'openturns_study',
-        # La factory pour créer une instance du plugin
-          'factory' : PythonParser,
+          'factory' : OTStudyParser
           }
 
+class OTStudyParser(PythonParser):
+   """
+   This converter works like PythonParser, except that it also initializes all
+   model variables to None in order to avoid Python syntax errors when loading
+   a file with a different or inexistent definition of variables.
+   """
+   # We look for pattern "ModelVariable=NOMVAR,"
+   pattern_model_variable = re.compile(r'ModelVariable\s*=\s*(\w+)\s*,')
 
+   def convert(self, outformat, appli=None):
+      text = PythonParser.convert(self, outformat, appli)
+      varnames = self.pattern_model_variable.findall(text)
+      newtext = ""
+      for var in varnames:
+         newtext += "%s = None\n" % var
+      newtext += text
+      return newtext