yfr : merge 1.2

diff --git a/src/SMESH_SWIG/Makefile.in b/src/SMESH_SWIG/Makefile.in
index 57c4a479d60c9afa0e738529b03a707c92b4a676..f2a1c70252e8d290258bd419d9d7dae2e83a45c4 100644 (file)
--- a/src/SMESH_SWIG/Makefile.in
+++ b/src/SMESH_SWIG/Makefile.in
@@ -1,12 +1,29 @@
-#  File      : Makefile.in
-#  Created   : Tue Mar 26 15:04:48 2002
-#  Author    : Nicolas REJNERI, Paul RASCLE
-#  Project   : SALOME
-#  Module    : GEOM
-#  Copyright : Open CASCADE, EDF 2002
+#  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
+# 
+#  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. 
+# 
+#  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 
+# 
+#  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+#
+#
+#
+#  File   : Makefile.in
+#  Author : Nicolas REJNERI, Paul RASCLE
+#  Module : SMESH

 #  $Header$
 
 #  $Header$
 

-# source path

 top_srcdir=@top_srcdir@
 top_builddir=../..
 srcdir=@srcdir@
 top_srcdir=@top_srcdir@
 top_builddir=../..
 srcdir=@srcdir@

diff --git a/src/SMESH_SWIG/SMESH_fixation.py b/src/SMESH_SWIG/SMESH_fixation.py
index 179edab7e2fbbe79935e41ec2679c8ff20006a08..93accf52e48d03cf4d724e21bacb62107a23fada 100644 (file)
--- a/src/SMESH_SWIG/SMESH_fixation.py
+++ b/src/SMESH_SWIG/SMESH_fixation.py
@@ -1,11 +1,28 @@
-#==============================================================================
-#  File      : SMESH_fixation2.py
-#  Created   : mer sep  4 09:58:49 CEST 2002
-#  Author    : Paul RASCLE, EDF
-#  Project   : SALOME
-#  Copyright : EDF 2002
+#  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
+# 
+#  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. 
+# 
+#  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 
+# 
+#  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+#
+#
+#
+#  File   : SMESH_fix_volute.py
+#  Author : Paul RASCLE, EDF
+#  Module : SMESH

 #  $Header$
 #  $Header$

-#==============================================================================

 
 import salome
 from salome import sg
 
 import salome
 from salome import sg

diff --git a/src/SMESH_SWIG/SMESH_mechanic.py b/src/SMESH_SWIG/SMESH_mechanic.py
index 7d695d7a36f5c0ef6d5cd238fbd01e80806888c4..8a0a3a339e360613d31dd0c7a382fa5490bcb1a7 100644 (file)
--- a/src/SMESH_SWIG/SMESH_mechanic.py
+++ b/src/SMESH_SWIG/SMESH_mechanic.py
@@ -1,11 +1,28 @@
-#==============================================================================
-#  File      : SMESH_withHole.py
-#  Created   : 26 august 2002
-#  Author    : Lucien PIGNOLONI
-#  Project   : SALOME
-#  Copyright : Open CASCADE, 2002
+#  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
+# 
+#  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. 
+# 
+#  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 
+# 
+#  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+#
+#
+#
+#  File   : SMESH_withHole.py
+#  Author : Lucien PIGNOLONI
+#  Module : SMESH

 #  $Header$
 #  $Header$

-#==============================================================================

 
 import SMESH
 import smeshpy
 
 import SMESH
 import smeshpy

diff --git a/src/SMESH_SWIG/SMESH_test0.py b/src/SMESH_SWIG/SMESH_test0.py
index c5de8b950cec59b308e15aeb3580ecf597e393d2..bce99c6e9a3cf37e546fb250ca2ef1524d4e578a 100644 (file)
--- a/src/SMESH_SWIG/SMESH_test0.py
+++ b/src/SMESH_SWIG/SMESH_test0.py
@@ -1,3 +1,27 @@
+#  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
+# 
+#  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. 
+# 
+#  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 
+# 
+#  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+#
+#
+#
+#  File   : SMESH_test0.py
+#  Module : SMESH
+

 import SMESH
 import smeshpy
 import salome
 import SMESH
 import smeshpy
 import salome

diff --git a/src/SMESH_SWIG/SMESH_test1.py b/src/SMESH_SWIG/SMESH_test1.py
index fa05215e90d6102848470534199728e33806731a..35a3ef00b0943a8831080bcd60da5b256579484e 100644 (file)
--- a/src/SMESH_SWIG/SMESH_test1.py
+++ b/src/SMESH_SWIG/SMESH_test1.py
@@ -1,3 +1,27 @@
+#  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
+# 
+#  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. 
+# 
+#  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 
+# 
+#  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+#
+#
+#
+#  File   : SMESH_test1.py
+#  Module : SMESH
+

 import SMESH
 import smeshpy
 import salome
 import SMESH
 import smeshpy
 import salome

diff --git a/src/SMESH_SWIG/SMESH_test2.py b/src/SMESH_SWIG/SMESH_test2.py
index e35b2c46724640e0a2a8d581ef76b86337706f5f..dd58a63aafe210c572323ee84fd63b8d35f0a3bf 100644 (file)
--- a/src/SMESH_SWIG/SMESH_test2.py
+++ b/src/SMESH_SWIG/SMESH_test2.py
@@ -1,3 +1,26 @@
+#  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
+# 
+#  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. 
+# 
+#  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 
+# 
+#  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+#
+#
+#
+#  File   : SMESH_test2.py
+#  Module : SMESH

 
 from SMESH_test1 import *
 
 
 from SMESH_test1 import *
 

diff --git a/src/SMESH_SWIG/SMESH_test3.py b/src/SMESH_SWIG/SMESH_test3.py
index 6d2b10b66615cfb090f5242f71c9833750023084..4154040ce2a8447061e91527163555ccaecde628 100644 (file)
--- a/src/SMESH_SWIG/SMESH_test3.py
+++ b/src/SMESH_SWIG/SMESH_test3.py
@@ -1,4 +1,27 @@
-#import SMESH
+#  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
+# 
+#  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. 
+# 
+#  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 
+# 
+#  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+#
+#
+#
+#  File   : SMESH_test3.py
+#  Module : SMESH
+

 import smeshpy
 import salome
 from salome import sg
 import smeshpy
 import salome
 from salome import sg

diff --git a/src/SMESH_SWIG/batchmode_smesh.py b/src/SMESH_SWIG/batchmode_smesh.py
index 6ee609495ce65a818ecd42c3740c83d37822e05d..eef9e1d502f01c11be0cc697a9f3e78003d0d2d3 100644 (file)
--- a/src/SMESH_SWIG/batchmode_smesh.py
+++ b/src/SMESH_SWIG/batchmode_smesh.py
@@ -1,13 +1,11 @@
-#==============================================================================
-#  File      : batchmode_smesh.py
-#  Created   : Fri Nov 15 13:51:00 2002
-#  Author    : Oksana TCHEBANOVA
-#  Project   : SALOME
-#  Copyright : OPEN CASCADE 2002
+#  Copyright (C) 2003  CEA/DEN, EDF R&D
+#
+#
+#
+#  File   : batchmode_smesh.py
+#  Author : Oksana TCHEBANOVA
+#  Module : SMESH

 #  $Header$
 #  $Header$

-#==============================================================================
-
-#--------------------------------------------------------------------------

 
 from batchmode_salome import *
 import SMESH
 
 from batchmode_salome import *
 import SMESH


@@ -26,11 +24,9 @@ if father is None:
         father = myStudyBuilder.NewComponent("MESH")
         A1 = myStudyBuilder.FindOrCreateAttribute(father, "AttributeName");
         FName = A1._narrow(SALOMEDS.AttributeName)
         father = myStudyBuilder.NewComponent("MESH")
         A1 = myStudyBuilder.FindOrCreateAttribute(father, "AttributeName");
         FName = A1._narrow(SALOMEDS.AttributeName)

-#        FName.SetValue("Mesh")
-
+        #FName.SetValue("Mesh")        

        Comp = modulecatalog.GetComponent( "SMESH" )
        FName.SetValue( Comp._get_componentusername() )
        Comp = modulecatalog.GetComponent( "SMESH" )
        FName.SetValue( Comp._get_componentusername() )

-

        A2 = myStudyBuilder.FindOrCreateAttribute(father, "AttributePixMap");
        aPixmap = A2._narrow(SALOMEDS.AttributePixMap);
        aPixmap.SetPixMap( "ICON_OBJBROWSER_Mesh" );
        A2 = myStudyBuilder.FindOrCreateAttribute(father, "AttributePixMap");
        aPixmap = A2._narrow(SALOMEDS.AttributePixMap);
        aPixmap.SetPixMap( "ICON_OBJBROWSER_Mesh" );

diff --git a/src/SMESH_SWIG/libSMESH_Swig.i b/src/SMESH_SWIG/libSMESH_Swig.i
index ff2e47467c0f57c2b7e22f2ae8aac86f272bd3bd..7caf23381346749d3896657ac9948a2dd021d40e 100644 (file)
--- a/src/SMESH_SWIG/libSMESH_Swig.i
+++ b/src/SMESH_SWIG/libSMESH_Swig.i
@@ -1,9 +1,27 @@
-//  File      : libGeometry_Swig.i
-//  Created   : Tue Mar 26 15:04:48 2002
-//  Author    : Nicolas REJNERI, Paul RASCLE
-//  Project   : SALOME
-//  Module    : GEOM
-//  Copyright : Open CASCADE, EDF 2002
+//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
+// 
+//  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. 
+// 
+//  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 
+// 
+//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+//
+//
+//
+//  File   : libGeometry_Swig.i
+//  Author : Nicolas REJNERI, Paul RASCLE
+//  Module : SMESH

 //  $Header$
 
 %module libSMESH_Swig
 //  $Header$
 
 %module libSMESH_Swig