Merge branch 'V9_2_2_BR'

diff --git a/AUTHORS b/AUTHORS
index 7c1a10c10fabca4830c4e21e0463b36b60ace73a..190c0a197086420e325425e8dda94924325086f5 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,27 +1,3 @@
-# Copyright (C) 2007-2016  CEA/DEN, EDF R&D
-#
-# 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, or (at your option) any later version.
-#
-# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
-# ---
-#
-# File   : AUTHORS
-# Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com)
-#
 # ---
 #
 # The format of this file was inspired by the Linux kernel CREDITS file.

diff --git a/CMakeLists.txt b/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)
index 4266575..e64bafa
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2016  CEA/DEN, EDF R&D
+# Copyright (C) 2012-2019  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -35,7 +35,7 @@ SET(${PROJECT_NAME_UC}_MINOR_VERSION 2)
 SET(${PROJECT_NAME_UC}_PATCH_VERSION 2)
 SET(${PROJECT_NAME_UC}_VERSION
   ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
-SET(${PROJECT_NAME_UC}_VERSION_DEV 0)
+SET(${PROJECT_NAME_UC}_VERSION_DEV 1)
 
 # Common CMake macros
 # ===================

diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644 (file)
index 09f361e..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright (C) 2007-2016  CEA/DEN, EDF R&D
-#
-# 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, or (at your option) any later version.
-#
-# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
-# ---
-#
-# File   : ChangeLog
-# Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com)
-#
-# ---
-#
-# Changes are listed by modification time in the descending order,
-# i.e. newer changes are listed at the top of the file.
-#
-# Each record lists the modification date, author and short description of
-# the made changes.
-#
-# ---
-
-2008-08-29 Vadim SANDLER
-
-    * Porting to automake, porting to SALOME series 5x
-
-2007-2008 Edward AGAPOV
-
-    * Debug, improve meshing algorithms
-
-2007 Christian VAN WAMBEKE (CEA)
-
-    * Initial development

diff --git a/HYBRIDPLUGIN_version.h.in b/HYBRIDPLUGIN_version.h.in
index a053e32c5c4882aab805f8a1583b251884470f92..bea7bbac1c976df0feee38e2aa15892d984839a5 100644 (file)
--- a/HYBRIDPLUGIN_version.h.in
+++ b/HYBRIDPLUGIN_version.h.in
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2019  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public

diff --git a/SalomeHYBRIDPLUGINConfig.cmake.in b/SalomeHYBRIDPLUGINConfig.cmake.in
index e5f97149218165be81c768f0726456b35da3eca8..dca18f734937d95b0b0b2268064afb5bc728a2b9 100644 (file)
--- a/SalomeHYBRIDPLUGINConfig.cmake.in
+++ b/SalomeHYBRIDPLUGINConfig.cmake.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2016  CEA/DEN, EDF R&D
+# Copyright (C) 2013-2019  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/adm_local/CMakeLists.txt b/adm_local/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)
index 4df2dc0..9e5fb80
--- a/adm_local/CMakeLists.txt
+++ b/adm_local/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2016  CEA/DEN, EDF R&D
+# Copyright (C) 2007-2019  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/adm_local/unix/CMakeLists.txt b/adm_local/unix/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)
index 90c9fba..b2db40d
--- a/adm_local/unix/CMakeLists.txt
+++ b/adm_local/unix/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2016  CEA/DEN, EDF R&D
+# Copyright (C) 2012-2019  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/adm_local/unix/config_files/CMakeLists.txt b/adm_local/unix/config_files/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)
index 928d40e..85ce28f
--- a/adm_local/unix/config_files/CMakeLists.txt
+++ b/adm_local/unix/config_files/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2016  CEA/DEN, EDF R&D
+# Copyright (C) 2007-2019  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/adm_local/unix/config_files/check_HYBRID.m4 b/adm_local/unix/config_files/check_HYBRID.m4
index 8a63387e6ba7289bd2af4593eda98c9ebaba2395..3b5e1fbd16b88e23b50908c34a7090ac9902703f 100644 (file)
--- a/adm_local/unix/config_files/check_HYBRID.m4
+++ b/adm_local/unix/config_files/check_HYBRID.m4
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2016  CEA/DEN, EDF R&D
+# Copyright (C) 2007-2019  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/adm_local/unix/config_files/check_HYBRIDPLUGIN.m4 b/adm_local/unix/config_files/check_HYBRIDPLUGIN.m4
old mode 100755 (executable)
new mode 100644 (file)
index bf179b7..6cfb213
--- a/adm_local/unix/config_files/check_HYBRIDPLUGIN.m4
+++ b/adm_local/unix/config_files/check_HYBRIDPLUGIN.m4
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2016  CEA/DEN, EDF R&D
+# Copyright (C) 2007-2019  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/adm_local/unix/config_files/check_MESHGEMS_TETRA.m4 b/adm_local/unix/config_files/check_MESHGEMS_TETRA.m4
index 7d64f08004274e107dccf486678da5896852fbb9..b776ed5ad80e401289e6e2f9dbc6eb848da199c8 100644 (file)
--- a/adm_local/unix/config_files/check_MESHGEMS_TETRA.m4
+++ b/adm_local/unix/config_files/check_MESHGEMS_TETRA.m4
@@ -1,4 +1,4 @@
-dnl Copyright (C) 2004-2016  CEA/DEN, EDF R&D
+dnl Copyright (C) 2004-2019  CEA/DEN, EDF R&D
 dnl
 dnl This library is free software; you can redistribute it and/or
 dnl modify it under the terms of the GNU Lesser General Public

diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)
index 705dcd8..021e3e6
--- a/bin/CMakeLists.txt
+++ b/bin/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2016  CEA/DEN, EDF R&D
+# Copyright (C) 2012-2019  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/bin/VERSION.in b/bin/VERSION.in
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/bin/createGroupsOnEntitiesFromGMFFile.py b/bin/createGroupsOnEntitiesFromGMFFile.py
index bbd0a9d814d849240bb4f53c7de321e7ab22db69..ade4e50760932b79fe8f0f23de73b17f6af0c9f1 100644 (file)
--- a/bin/createGroupsOnEntitiesFromGMFFile.py
+++ b/bin/createGroupsOnEntitiesFromGMFFile.py
@@ -1,4 +1,22 @@
 # -*- coding: iso-8859-1 -*-
+# Copyright (C) 2014-2019  CEA/DEN, EDF R&D
+#
+# 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, or (at your option) any later version.
+#
+# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
 
 """
 to create Groups On Entities From GMFFile /tmp/tmp.mesh

diff --git a/bin/mg-hybrid.bash b/bin/mg-hybrid.bash
index a511bdb37e29e13f9a2f40185e0de14ad2810aef..1aee322baac92d15fc7c1d5bbb3dae5e0e3f3d13 100755 (executable)
--- a/bin/mg-hybrid.bash
+++ b/bin/mg-hybrid.bash
@@ -1,4 +1,22 @@
 #!/bin/bash
+# Copyright (C) 2014-2019  CEA/DEN, EDF R&D
+#
+# 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, or (at your option) any later version.
+#
+# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
 
 #bash script mg-hybrid.bash
 #we have renamed binary executable mg-hybrid.exe V1.3.0 as mg-hybrid.exe_Linux_64_juillet2014

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)
index b39cf0a..c8906a7
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2019  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/doc/salome/CMakeLists.txt b/doc/salome/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)
index f09de24..b4ae563
--- a/doc/salome/CMakeLists.txt
+++ b/doc/salome/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2019  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/doc/salome/examples/CMakeLists.txt b/doc/salome/examples/CMakeLists.txt
index c663f0841a6b35bf406b36cfdc96c2ee1641f509..652c799e55b685f690107d769ccd001bbf76385b 100644 (file)
--- a/doc/salome/examples/CMakeLists.txt
+++ b/doc/salome/examples/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2013-2019  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/doc/salome/examples/examples.set b/doc/salome/examples/examples.set
index 233e5457cb2505194642d082a4bef67635e58fda..da19ac29065f062eeb424d5baac076a0e94fab1c 100644 (file)
--- a/doc/salome/examples/examples.set
+++ b/doc/salome/examples/examples.set
@@ -1,4 +1,4 @@
-# Copyright (C) 2016  CEA/DEN, EDF R&D
+# Copyright (C) 2016-2019  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/doc/salome/examples/hybriddemo.py b/doc/salome/examples/hybriddemo.py
index ab7f5c1bfc2df9e550e5f5cd072e8e5bba020c64..a83fc7971dae648dab697424af7e2bdc3d227f28 100644 (file)
--- a/doc/salome/examples/hybriddemo.py
+++ b/doc/salome/examples/hybriddemo.py
@@ -1,4 +1,3 @@
-
 import salome
 salome.salome_init()
 import GEOM

diff --git a/doc/salome/examples/testme.py b/doc/salome/examples/testme.py
old mode 100755 (executable)
new mode 100644 (file)
index fe76817..c7aa995
--- a/doc/salome/examples/testme.py
+++ b/doc/salome/examples/testme.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2019  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/doc/salome/gui/CMakeLists.txt b/doc/salome/gui/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)
index d1be8bc..064426f
--- a/doc/salome/gui/CMakeLists.txt
+++ b/doc/salome/gui/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2019  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/doc/salome/gui/HYBRIDPLUGIN/CMakeLists.txt b/doc/salome/gui/HYBRIDPLUGIN/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)
index e148db7..26e5c4a
--- a/doc/salome/gui/HYBRIDPLUGIN/CMakeLists.txt
+++ b/doc/salome/gui/HYBRIDPLUGIN/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2019  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/doc/salome/gui/HYBRIDPLUGIN/doxyfile.in b/doc/salome/gui/HYBRIDPLUGIN/doxyfile.in
old mode 100755 (executable)
new mode 100644 (file)
index b8905d2..10838af
--- a/doc/salome/gui/HYBRIDPLUGIN/doxyfile.in
+++ b/doc/salome/gui/HYBRIDPLUGIN/doxyfile.in
@@ -1,22 +1,3 @@
-# Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
-#
-# 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, or (at your option) any later version.
-#
-# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------

diff --git a/doc/salome/gui/HYBRIDPLUGIN/doxyfile_py.in b/doc/salome/gui/HYBRIDPLUGIN/doxyfile_py.in
old mode 100755 (executable)
new mode 100644 (file)
index 7988f89..12c1298
--- a/doc/salome/gui/HYBRIDPLUGIN/doxyfile_py.in
+++ b/doc/salome/gui/HYBRIDPLUGIN/doxyfile_py.in
@@ -1,22 +1,3 @@
-# Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
-#
-# 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, or (at your option) any later version.
-#
-# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------

diff --git a/doc/salome/gui/HYBRIDPLUGIN/images/head.png b/doc/salome/gui/HYBRIDPLUGIN/images/head.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/doc/salome/gui/HYBRIDPLUGIN/static/footer.html b/doc/salome/gui/HYBRIDPLUGIN/static/footer.html
old mode 100755 (executable)
new mode 100644 (file)
index b52879b..cca6c20
--- a/doc/salome/gui/HYBRIDPLUGIN/static/footer.html
+++ b/doc/salome/gui/HYBRIDPLUGIN/static/footer.html
@@ -4,7 +4,7 @@
   <ul>
     $navpath
     <li class="footer">
-      Copyright &copy; 2007-2017  CEA/DEN, EDF R&amp;D<br>
+      Copyright &copy; 2007-2019  CEA/DEN, EDF R&amp;D<br>
     </li>
   </ul>
 </div>

diff --git a/doc/salome/gui/HYBRIDPLUGIN/static/header.html.in b/doc/salome/gui/HYBRIDPLUGIN/static/header.html.in
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)
index 7c9a9d5..4cdafb5
--- a/idl/CMakeLists.txt
+++ b/idl/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2016  CEA/DEN, EDF R&D
+# Copyright (C) 2012-2019  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/idl/HYBRIDPlugin_Algorithm.idl b/idl/HYBRIDPlugin_Algorithm.idl
index 04f0a386e7ec855b01c07dbb33adf546e04052b7..1147a95467d65304b64c2a572d1b402612ec12bf 100644 (file)
--- a/idl/HYBRIDPlugin_Algorithm.idl
+++ b/idl/HYBRIDPlugin_Algorithm.idl
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2019  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public

diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)
index 333973c..69bdfdc
--- a/resources/CMakeLists.txt
+++ b/resources/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2016  CEA/DEN, EDF R&D
+# Copyright (C) 2007-2019  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/resources/HYBRIDPlugin.xml b/resources/HYBRIDPlugin.xml
index 2da42e36fbd9f95dcdb72390423af9e7260ad47a..e986929daceb7443d19e6bc4ab9658e35a3f368b 100644 (file)
--- a/resources/HYBRIDPlugin.xml
+++ b/resources/HYBRIDPlugin.xml
@@ -1,27 +1,5 @@
 <?xml version='1.0' encoding='us-ascii'?>
 <!DOCTYPE meshers PUBLIC "" "desktop.dtd">
-<!--
-  Copyright (C) 2004-2016  CEA/DEN, EDF R&D
-
-  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, or (at your option) any later version.
-
-  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
--->
-
-<!--  GUI customization for HYBRID Plugin  -->
 
 <meshers>
 

diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml
index cd3a992a44cc6b49234fdc33b20a8cc52fdc7e5e..3d74d8a706189c371a73ff6987a69d44f74410c3 100644 (file)
--- a/resources/SalomeApp.xml
+++ b/resources/SalomeApp.xml
@@ -1,31 +1,7 @@
-<!--
-  Copyright (C) 2004-2016  CEA/DEN, EDF R&D
-
-  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, or (at your option) any later version.
-
-  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.salome-platform.org/ or email : webmaster.salome@opencascade.com
-
--->
 <document>
   <section name="resources">
     <parameter name="HYBRIDPlugin" value="${HYBRIDPLUGIN_ROOT_DIR}/share/salome/resources/hybridplugin"/>
   </section>
-  <section name="SMESH">
-    <!-- Default SMESH module plugins -->
-    <parameter name="plugins" value="NETGENPlugin,HYBRIDPlugin"/>
-  </section>
   <section name="smesh_help" >
     <parameter name="User's Guide/Mesh module/Plug-ins/HYBRID plugin" value="${HYBRIDPLUGIN_ROOT_DIR}/share/doc/salome/gui/HYBRIDPLUGIN/index.html;;http://docs.salome-platform.org/latest/gui/HYBRIDPLUGIN/index.html"/>
   </section>

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)
index 419d500..fc834f6
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2016  CEA/DEN, EDF R&D
+# Copyright (C) 2012-2019  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/src/GUI/CMakeLists.txt b/src/GUI/CMakeLists.txt
index 3947ad076a47886e2b9f188460b1fe8746a12c29..7b9233d6bdf07f4412bb812a62a4ffad91f640ee 100644 (file)
--- a/src/GUI/CMakeLists.txt
+++ b/src/GUI/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2016  CEA/DEN, EDF R&D
+# Copyright (C) 2012-2019  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/src/GUI/HYBRIDPluginGUI.cxx b/src/GUI/HYBRIDPluginGUI.cxx
index c9a30afd24bd4e6a967231da49d879373e7c8bc8..89fefeb41640409f1fe6b41f74eff404a6c7c4a9 100644 (file)
--- a/src/GUI/HYBRIDPluginGUI.cxx
+++ b/src/GUI/HYBRIDPluginGUI.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2019  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public

diff --git a/src/GUI/HYBRIDPluginGUI_AdvWidget.cxx b/src/GUI/HYBRIDPluginGUI_AdvWidget.cxx
index f9fda8a3a23c5452120183e37eb067cb30b44b74..e6b967c709b01e1ed42a26aac572e3674e2fb78f 100644 (file)
--- a/src/GUI/HYBRIDPluginGUI_AdvWidget.cxx
+++ b/src/GUI/HYBRIDPluginGUI_AdvWidget.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2019  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public

diff --git a/src/GUI/HYBRIDPluginGUI_Dlg.h b/src/GUI/HYBRIDPluginGUI_Dlg.h
index 9a6e3b2437acb48f30b2d2b908c02907eb381343..d6805d6fdf885db6d8929d4c28ae3e83b8d36334 100644 (file)
--- a/src/GUI/HYBRIDPluginGUI_Dlg.h
+++ b/src/GUI/HYBRIDPluginGUI_Dlg.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2019  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public

diff --git a/src/GUI/HYBRIDPluginGUI_Enums.h b/src/GUI/HYBRIDPluginGUI_Enums.h
index 4612ee922f7f17a141ade070da2f516b50429e2a..c7a073930c1abd5ab8a3793730bbdc7bdbf960b7 100644 (file)
--- a/src/GUI/HYBRIDPluginGUI_Enums.h
+++ b/src/GUI/HYBRIDPluginGUI_Enums.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2019  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public

diff --git a/src/GUI/HYBRIDPluginGUI_HypothesisCreator.cxx b/src/GUI/HYBRIDPluginGUI_HypothesisCreator.cxx
index a89b1432d8e8ce525c2e8f510bb4b35a356a109b..c9ebefbe866330ad04fad65b3ab13436a713feda 100644 (file)
--- a/src/GUI/HYBRIDPluginGUI_HypothesisCreator.cxx
+++ b/src/GUI/HYBRIDPluginGUI_HypothesisCreator.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2019  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public

diff --git a/src/GUI/HYBRIDPluginGUI_HypothesisCreator.h b/src/GUI/HYBRIDPluginGUI_HypothesisCreator.h
index 4dd913033e62b47e9acea6bd8dde9aeefaee1445..028aa80b1524abf58db02fb5bfac271963e34d7e 100644 (file)
--- a/src/GUI/HYBRIDPluginGUI_HypothesisCreator.h
+++ b/src/GUI/HYBRIDPluginGUI_HypothesisCreator.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2019  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public

diff --git a/src/GUI/HYBRIDPlugin_msg_fr.ts b/src/GUI/HYBRIDPlugin_msg_fr.ts
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/HYBRIDPlugin/CMakeLists.txt b/src/HYBRIDPlugin/CMakeLists.txt
index 95915dc0f08a13e6bd6b191602c762691da6fdaa..e551a26ece83d0fbba2d460fc22df7eac9f70880 100644 (file)
--- a/src/HYBRIDPlugin/CMakeLists.txt
+++ b/src/HYBRIDPlugin/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2016  CEA/DEN, EDF R&D
+# Copyright (C) 2012-2019  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/src/HYBRIDPlugin/HYBRIDPluginBuilder.py b/src/HYBRIDPlugin/HYBRIDPluginBuilder.py
index c6cf6a15517decb2656a9e0d227a5349104e1e76..2ac5ec4644272b1cf2d48db1e459472020be7036 100644 (file)
--- a/src/HYBRIDPlugin/HYBRIDPluginBuilder.py
+++ b/src/HYBRIDPlugin/HYBRIDPluginBuilder.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2007-2016  CEA/DEN, EDF R&D
+# Copyright (C) 2007-2019  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/src/HYBRIDPlugin/HYBRIDPlugin_Defs.hxx b/src/HYBRIDPlugin/HYBRIDPlugin_Defs.hxx
index 0fa4914b65f91de3a50c48bc881b50f9b302ab49..44b86f38679b450324cf82a78ccf0710f03c3f1c 100644 (file)
--- a/src/HYBRIDPlugin/HYBRIDPlugin_Defs.hxx
+++ b/src/HYBRIDPlugin/HYBRIDPlugin_Defs.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2004-2016  CEA/DEN, EDF R&D
+// Copyright (C) 2004-2019  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public

diff --git a/src/HYBRIDPlugin/HYBRIDPlugin_HYBRID.cxx b/src/HYBRIDPlugin/HYBRIDPlugin_HYBRID.cxx
index 9f91f0b714697b18962f2a9b54a1c06afb895535..6cc4efbbf6636ffc41ab79d528ffb157ddc7cae7 100644 (file)
--- a/src/HYBRIDPlugin/HYBRIDPlugin_HYBRID.cxx
+++ b/src/HYBRIDPlugin/HYBRIDPlugin_HYBRID.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2019  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -211,8 +211,7 @@ static void addElemInMeshGroup(SMESH_Mesh*             theMesh,
   
   if (!groupDone)
   {
-    int groupId;
-    SMESH_Group* aGroup = theMesh->AddGroup(anElem->GetType(), groupName.c_str(), groupId);
+    SMESH_Group* aGroup = theMesh->AddGroup(anElem->GetType(), groupName.c_str());
     aGroup->SetName( groupName.c_str() );
     SMESHDS_Group* aGroupDS = static_cast<SMESHDS_Group*>( aGroup->GetGroupDS() );
     aGroupDS->SMDSGroup().Add(anElem);
@@ -303,13 +302,12 @@ static void makeDomainGroups( std::vector< std::vector< const SMDS_MeshElement*
     }
     // create and fill the groups
     size_t iElem = 0;
-    int groupID;
     do
     {
       SMESH_Group* group = groupOfType[ elems[ iElem ]->GetType() ];
       if ( !group )
         group = theHelper->GetMesh()->AddGroup( elems[ iElem ]->GetType(),
-                                                domainName.c_str(), groupID );
+                                                domainName.c_str() );
       SMDS_MeshGroup& groupDS =
         static_cast< SMESHDS_Group* >( group->GetGroupDS() )->SMDSGroup();
 
@@ -346,38 +344,54 @@ static bool readGMFFile(MG_HYBRID_API*                          MGOutput,
   // if imprinting, the original mesh faces are modified
   // => we clear all the faces to retrieve them from Hybrid output mesh.
   std::vector<int> facesWithImprinting;
-  if (theAlgo->getHyp()) 
+  if (theAlgo->getHyp())
     facesWithImprinting = theAlgo->getHyp()->GetFacesWithImprinting();
 
   if ( ! facesWithImprinting.empty() ) {
 #ifdef _DEBUG_
-      std::cout << "Imprinting => Clear original mesh" << std::endl;
+    std::cout << "Imprinting => Clear original mesh" << std::endl;
 #endif
-      SMDS_ElemIteratorPtr eIt = theMeshDS->elementsIterator();
-      while( eIt->more() )
-        theMeshDS->RemoveFreeElement( eIt->next(), /*sm=*/0 );
-      SMDS_NodeIteratorPtr nIt = theMeshDS->nodesIterator();
-      while ( nIt->more() )
-        theMeshDS->RemoveFreeNode( nIt->next(), /*sm=*/0 );
-
-      theNodeByHybridId.clear();
-      theFaceByHybridId.clear();
+    SMESH_subMesh* smOfSolid =
+      theHelper->GetMesh()->GetSubMesh( theHelper->GetSubShape() );
+    SMESH_subMeshIteratorPtr smIt =
+      smOfSolid->getDependsOnIterator(/*includeSelf=*/false, /*complexShapeFirst=*/true);
+    while ( smIt->more() )
+    {
+      SMESH_subMesh* sm = smIt->next();
+      if ( SMESHDS_SubMesh * smDS = sm->GetSubMeshDS() )
+      {
+        SMDS_ElemIteratorPtr eIt = smDS->GetElements();
+        while( eIt->more() )
+        {
+          theMeshDS->RemoveFreeElement( eIt->next(), smDS );
+        }
+        SMDS_NodeIteratorPtr nIt = smDS->GetNodes();
+        while ( nIt->more() )
+        {
+          const SMDS_MeshNode* n = nIt->next();
+          if ( n->NbInverseElements() == 0 )
+            theMeshDS->RemoveFreeNode( n, smDS );
+        }
+      }
+    }
+    theNodeByHybridId.clear();
+    theFaceByHybridId.clear();
   }
 
   int nbMeshNodes = theMeshDS->NbNodes();
   int nbInitialNodes = theNodeByHybridId.size();
 
-  const bool isQuadMesh = 
+  const bool isQuadMesh =
     theHelper->GetMesh()->NbEdges( ORDER_QUADRATIC ) ||
     theHelper->GetMesh()->NbFaces( ORDER_QUADRATIC ) ||
     theHelper->GetMesh()->NbVolumes( ORDER_QUADRATIC );
-    
+
 #ifdef _DEBUG_
   std::cout << "theNodeByHybridId.size(): " << nbInitialNodes << std::endl;
   std::cout << "theHelper->GetMesh()->NbNodes(): " << nbMeshNodes << std::endl;
   std::cout << "isQuadMesh: " << isQuadMesh << std::endl;
 #endif
-  
+
   // ---------------------------------
   // Read generated elements and nodes
   // ---------------------------------

diff --git a/src/HYBRIDPlugin/HYBRIDPlugin_HYBRID.hxx b/src/HYBRIDPlugin/HYBRIDPlugin_HYBRID.hxx
index 3e10264d6b5138b44ec2eece9e6320a9d051905c..3215fb897097f4b9a0d2207b96726bf3687dd4ef 100644 (file)
--- a/src/HYBRIDPlugin/HYBRIDPlugin_HYBRID.hxx
+++ b/src/HYBRIDPlugin/HYBRIDPlugin_HYBRID.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2019  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public

diff --git a/src/HYBRIDPlugin/HYBRIDPlugin_HYBRID_i.cxx b/src/HYBRIDPlugin/HYBRIDPlugin_HYBRID_i.cxx
index 3a745e1ae46ae767532e32f7db57454aacc980db..f7253900c91c97b9275ec5b1b4bbd1ae81e3fc04 100644 (file)
--- a/src/HYBRIDPlugin/HYBRIDPlugin_HYBRID_i.cxx
+++ b/src/HYBRIDPlugin/HYBRIDPlugin_HYBRID_i.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2019  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public

diff --git a/src/HYBRIDPlugin/HYBRIDPlugin_HYBRID_i.hxx b/src/HYBRIDPlugin/HYBRIDPlugin_HYBRID_i.hxx
index 3caaa69a83dd2fd38d66b18cfcd9527900819c20..3bbe151ae16f929670aa7f9ed93ab28daaccb311 100644 (file)
--- a/src/HYBRIDPlugin/HYBRIDPlugin_HYBRID_i.hxx
+++ b/src/HYBRIDPlugin/HYBRIDPlugin_HYBRID_i.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2019  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public

diff --git a/src/HYBRIDPlugin/HYBRIDPlugin_Hypothesis.cxx b/src/HYBRIDPlugin/HYBRIDPlugin_Hypothesis.cxx
index 95ce0eaa9e4076657456d479c57220301b5bfecb..fb18c5958dd3c3e15b98ce24448c8a6f99a3f5b5 100644 (file)
--- a/src/HYBRIDPlugin/HYBRIDPlugin_Hypothesis.cxx
+++ b/src/HYBRIDPlugin/HYBRIDPlugin_Hypothesis.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2019  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public

diff --git a/src/HYBRIDPlugin/HYBRIDPlugin_Hypothesis.hxx b/src/HYBRIDPlugin/HYBRIDPlugin_Hypothesis.hxx
index 3334e44ac4842a9d7525f2564a2fa60dbb42b356..e365af80747134a596160ce6641f101f5cb8bd92 100644 (file)
--- a/src/HYBRIDPlugin/HYBRIDPlugin_Hypothesis.hxx
+++ b/src/HYBRIDPlugin/HYBRIDPlugin_Hypothesis.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2019  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public

diff --git a/src/HYBRIDPlugin/HYBRIDPlugin_Hypothesis_i.cxx b/src/HYBRIDPlugin/HYBRIDPlugin_Hypothesis_i.cxx
index 662312f3824866549a1aad6c153b44758f9015be..3643e221f94f15525377152ce2bc16f537b6ee29 100644 (file)
--- a/src/HYBRIDPlugin/HYBRIDPlugin_Hypothesis_i.cxx
+++ b/src/HYBRIDPlugin/HYBRIDPlugin_Hypothesis_i.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2019  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public

diff --git a/src/HYBRIDPlugin/HYBRIDPlugin_Hypothesis_i.hxx b/src/HYBRIDPlugin/HYBRIDPlugin_Hypothesis_i.hxx
index 32eec1e9515d9fd99d7193f3735979b6cfe4b308..9fb85a650c1a42e1448355b83d4ecc40ec4b1d2a 100644 (file)
--- a/src/HYBRIDPlugin/HYBRIDPlugin_Hypothesis_i.hxx
+++ b/src/HYBRIDPlugin/HYBRIDPlugin_Hypothesis_i.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2019  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public

diff --git a/src/HYBRIDPlugin/HYBRIDPlugin_i.cxx b/src/HYBRIDPlugin/HYBRIDPlugin_i.cxx
index 5fdea9cedf1bb5e380b3a2ab4f649fe9ea0959e0..7337fb938435ac141040456ddf9a5a22dcdcf863 100644 (file)
--- a/src/HYBRIDPlugin/HYBRIDPlugin_i.cxx
+++ b/src/HYBRIDPlugin/HYBRIDPlugin_i.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2019  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public

diff --git a/src/HYBRIDPlugin/MG_HYBRID_API.cxx b/src/HYBRIDPlugin/MG_HYBRID_API.cxx
index 767d5ce5d9b7020b054a69f003599b3f693fc885..18dcfc19029e78d10ecbd546a2a6f8ad51d2cc16 100644 (file)
--- a/src/HYBRIDPlugin/MG_HYBRID_API.cxx
+++ b/src/HYBRIDPlugin/MG_HYBRID_API.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2004-2016  CEA/DEN, EDF R&D
+// Copyright (C) 2004-2019  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public

diff --git a/src/HYBRIDPlugin/MG_HYBRID_API.hxx b/src/HYBRIDPlugin/MG_HYBRID_API.hxx
index 64cfe6a2bad730c78ba973ffbd4a0a48c8232a42..a25e57143eaf997f3ed73488e4f80e380ed1d495 100644 (file)
--- a/src/HYBRIDPlugin/MG_HYBRID_API.hxx
+++ b/src/HYBRIDPlugin/MG_HYBRID_API.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2004-2016  CEA/DEN, EDF R&D
+// Copyright (C) 2004-2019  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public

diff --git a/src/HYBRIDPlugin/__init__.py b/src/HYBRIDPlugin/__init__.py
index 8dbde937b73760d15ec3211de6e9671e6c8fc397..bc2746472d56a67cab1976c57a3d4b79fcd877bc 100644 (file)
--- a/src/HYBRIDPlugin/__init__.py
+++ b/src/HYBRIDPlugin/__init__.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2016  CEA/DEN, EDF R&D
+# Copyright (C) 2007-2019  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)
index fd9f05f..c5d5cbf
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2016  CEA/DEN, EDF R&D
+# Copyright (C) 2013-2019  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/tests/CTestTestfileInstall.cmake b/tests/CTestTestfileInstall.cmake
index 48e5d6c5f678c5b0ad683209927f9d55dbc0d0c8..417daf70609a7e167cca6eb2ad5cc62a42e2b03c 100644 (file)
--- a/tests/CTestTestfileInstall.cmake
+++ b/tests/CTestTestfileInstall.cmake
@@ -1,4 +1,4 @@
-# Copyright (C) 2016  CEA/DEN, EDF R&D
+# Copyright (C) 2016-2019  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public

diff --git a/tests/advanced_text_option.py b/tests/advanced_text_option.py
index 8d1db4b7594574855f3823b86ce59ccce1fb12c9..2fa715914753c09c3add3c712da06b765cb3c5bc 100644 (file)
--- a/tests/advanced_text_option.py
+++ b/tests/advanced_text_option.py
@@ -1,4 +1,22 @@
 # -*- coding: utf-8 -*-
+# Copyright (C) 2018-2019  CEA/DEN, EDF R&D
+#
+# 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, or (at your option) any later version.
+#
+# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
 
 import sys
 import salome

diff --git a/tests/cartesian_core_size.py b/tests/cartesian_core_size.py
index 8ff9900af1ee205e1c57c1a53c2161c8fb540bb7..7b1515610984c6e3f9938bd5e45e96118e4a41a5 100644 (file)
--- a/tests/cartesian_core_size.py
+++ b/tests/cartesian_core_size.py
@@ -1,4 +1,22 @@
 # -*- coding: utf-8 -*-
+# Copyright (C) 2017-2019  CEA/DEN, EDF R&D
+#
+# 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, or (at your option) any later version.
+#
+# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
 
 
 import sys

diff --git a/tests/enforced_mesh.py b/tests/enforced_mesh.py
index 6937631604b4edc0720a6fdd408f9f211b159b03..abe84db2a0b75f239e2751ebfa730eae22e27ac9 100644 (file)
--- a/tests/enforced_mesh.py
+++ b/tests/enforced_mesh.py
@@ -1,4 +1,22 @@
 # -*- coding: utf-8 -*-
+# Copyright (C) 2017-2019  CEA/DEN, EDF R&D
+#
+# 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, or (at your option) any later version.
+#
+# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
 
 import sys
 import salome

diff --git a/tests/layers_imprinting.py b/tests/layers_imprinting.py
index dfde509f8ae541d41c87dba213e5db9cb5113a40..8187bf396deffa6b469f34822617fbfff125db66 100644 (file)
--- a/tests/layers_imprinting.py
+++ b/tests/layers_imprinting.py
@@ -1,4 +1,22 @@
 # -*- coding: utf-8 -*-
+# Copyright (C) 2017-2019  CEA/DEN, EDF R&D
+#
+# 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, or (at your option) any later version.
+#
+# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
 
 import sys
 import salome

diff --git a/tests/layers_imprinting_hexa_core.py b/tests/layers_imprinting_hexa_core.py
index 6bddd934c3d08f0d516815c24451b1c10dfb9279..a7d44eca7b2fc2988589f2bfe31167cb660411d3 100644 (file)
--- a/tests/layers_imprinting_hexa_core.py
+++ b/tests/layers_imprinting_hexa_core.py
@@ -1,4 +1,22 @@
 # -*- coding: utf-8 -*-
+# Copyright (C) 2017-2019  CEA/DEN, EDF R&D
+#
+# 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, or (at your option) any later version.
+#
+# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
 
 # This test is a known failure for MeshGems <= 2.4-5 (but must not crash Salome)
 

diff --git a/tests/layers_with_snapping.py b/tests/layers_with_snapping.py
index 5aa8131961ad4d7218d05f097f0a3667f7681be3..86634cdc95e7d307165d9609c73f35988edded7d 100644 (file)
--- a/tests/layers_with_snapping.py
+++ b/tests/layers_with_snapping.py
@@ -1,4 +1,22 @@
 # -*- coding: utf-8 -*-
+# Copyright (C) 2018-2019  CEA/DEN, EDF R&D
+#
+# 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, or (at your option) any later version.
+#
+# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
 
 import sys
 import salome

diff --git a/tests/mg_hybrid_pyramids.py b/tests/mg_hybrid_pyramids.py
index 7aab00873f262ac92a07e0493ad35e4596c8cf29..fefba7ed2faa0d8c4025271d3299d2debb1e751b 100644 (file)
--- a/tests/mg_hybrid_pyramids.py
+++ b/tests/mg_hybrid_pyramids.py
@@ -1,4 +1,22 @@
 # -*- coding: utf-8 -*-
+# Copyright (C) 2017-2019  CEA/DEN, EDF R&D
+#
+# 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, or (at your option) any later version.
+#
+# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
 
 
 import sys

diff --git a/tests/tests.set b/tests/tests.set
index 6b6be114a98ac1d733a5cf559b764b946c1637e0..4411f3a8eb2f3277d3237438801dc3695bb2c285 100644 (file)
--- a/tests/tests.set
+++ b/tests/tests.set
@@ -1,4 +1,4 @@
-# Copyright (C) 2016  CEA/DEN, EDF R&D
+# Copyright (C) 2016-2019  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public