Merge from V6_main_20120808 08Aug12

diff --git a/ATOMICGUI.cxx b/ATOMICGUI.cxx
index 1afb1ee8de72afae4db5498adaba59b9c45a83e3..6156513da00a1b528dcb045a4fc87bdd8bf15e41 100644 (file)
--- a/ATOMICGUI.cxx
+++ b/ATOMICGUI.cxx
@@ -1,23 +1,21 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003-2007  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 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.
 //
-//  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
 //
-//  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
 //
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
 
 using namespace std;
 

diff --git a/ATOMICGUI.h b/ATOMICGUI.h
index e59c63dbda8612ebd3c0fe0690c80ff2f01ecb86..568823f6cb32315e6cf4a5394b382c734d97c69c 100644 (file)
--- a/ATOMICGUI.h
+++ b/ATOMICGUI.h
@@ -1,23 +1,21 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003-2007  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 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.
 //
-//  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
 //
-//  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
 //
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
 
 #if !defined(ATOMICGUI_H)
 #define ATOMICGUI_H

diff --git a/Makefile.am b/Makefile.am
index bca8159a1b93b517cad9a737f7ab2b0a1201338f..34e1575faa07797a71187d04b2b0fda697959f19 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,23 +1,21 @@
-#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
-#  Copyright (C) 2003-2007  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 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.
 #
-#  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
 #
-#  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
 #
-#  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
 
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 

diff --git a/SALOME_Tutorial.doc b/SALOME_Tutorial.doc
index 404c3004e968ec7cc2b195d4deed222c4955489b..adaa6eed412ec7f20532987c42fbad9a3e2c3213 100644 (file)
Binary files a/SALOME_Tutorial.doc and b/SALOME_Tutorial.doc differ

diff --git a/atomic_env_build.sh b/atomic_env_build.sh
index f11816bc5c3f89abb720c42b4478c4afbea24565..4bad895c17d6748b087584250420ba57ceb23d6d 100644 (file)
--- a/atomic_env_build.sh
+++ b/atomic_env_build.sh
@@ -1,23 +1,21 @@
-#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
-#  Copyright (C) 2003-2007  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 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.
 #
-#  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
 #
-#  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
 #
-#  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
 
 export ATOMIC_TUTORIAL_DIR=<where the atomic is located>
 export ATOMIC_SRC_DIR=${ATOMIC_TUTORIAL_DIR}/ATOMIC_SRC

diff --git a/build_configure b/build_configure
index 345d8ca30cb194f5e3b166ec5df25b3fec014488..4d5f16d6ac4c05b8ab8e5648613992b1b7741e4c 100644 (file)
--- a/build_configure
+++ b/build_configure
@@ -1,25 +1,23 @@
 #!/bin/bash
 
-#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
-#  Copyright (C) 2003-2007  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 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.
 #
-#  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
 #
-#  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
 #
-#  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
 
 ORIG_DIR=`pwd`
 CONF_DIR=`echo $0 | sed -e "s,[^/]*$,,;s,/$,,;s,^$,.,"`

diff --git a/c-01.tar.gz b/c-01.tar.gz
index d5c0a2da15207294171ec135b9622b9bff5195e1..b6fca33452323b12311d8dca487068da0bc558a4 100644 (file)
Binary files a/c-01.tar.gz and b/c-01.tar.gz differ

diff --git a/c-02.tar.gz b/c-02.tar.gz
index 8a22f58c644aa3593e6a7ffbfaec58b5ec3fb310..a39461c910d3039fb2adaca114cd0a8a49326b05 100644 (file)
Binary files a/c-02.tar.gz and b/c-02.tar.gz differ

diff --git a/c-03.tar.gz b/c-03.tar.gz
index 6b5d0cfa22a4312486d168dd8e17d7e8c56183e2..cc2d547ba84e15053ad47de320b761db1129812a 100644 (file)
Binary files a/c-03.tar.gz and b/c-03.tar.gz differ

diff --git a/c-04.tar.gz b/c-04.tar.gz
index 63a3653a8bd203a921db1786e36f3ed2f8195231..52fb385caf2175f9259cf277a78ddd3f14749999 100644 (file)
Binary files a/c-04.tar.gz and b/c-04.tar.gz differ

diff --git a/check_gd.m4 b/check_gd.m4
index 1a434e405ca294a268245876ddc534d999c53f40..2a4eeef264c894a4c8858190efc5ac14b4bc42a2 100644 (file)
--- a/check_gd.m4
+++ b/check_gd.m4
@@ -1,23 +1,21 @@
-#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
 #
-#  Copyright (C) 2003-2007  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 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.
 #
-#  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
 #
-#  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
 #
-#  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
 
 AC_DEFUN([CHECK_GDLIB],[
 AC_REQUIRE([AC_PROG_CC])

diff --git a/configure.ac b/configure.ac
index 400431c9e2b7af4ce84b7b8697d2989ad577f79e..1257fcdcdfbb24f0009b7d05382c17db1abed64f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,23 +1,21 @@
-#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
-#  Copyright (C) 2003-2007  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 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.
 #
-#  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
 #
-#  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
 #
-#  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
 
 AC_INIT([Salome2 Project ATOMIC module], [0.3.0], [webmaster.salome@opencascade.com], [SalomeATOMIC])
 AC_CONFIG_AUX_DIR(adm_local/unix/config_files)

diff --git a/light-03.tar.gz b/light-03.tar.gz
index 29c7f44af540720279af0c00682ff58c4d8d7c95..0bea1b9bc53842ba3f0fbcd307f62df0682e31b6 100644 (file)
Binary files a/light-03.tar.gz and b/light-03.tar.gz differ

diff --git a/light-04.tar.gz b/light-04.tar.gz
index 070677bd14a8c23aea97a58d02b937a22c7f0bf7..63df091802d445f0a3d5d761776ff6c18ac729e5 100644 (file)
Binary files a/light-04.tar.gz and b/light-04.tar.gz differ

diff --git a/light-05.tar.gz b/light-05.tar.gz
index d85745ab26940471aea7591878d9ed729601db38..b43b5a72d509dba83471ce8b0c51d638b3244329 100644 (file)
Binary files a/light-05.tar.gz and b/light-05.tar.gz differ

diff --git a/light-06.tar.gz b/light-06.tar.gz
index 8f1d7b728fa89cd8b7d8fc94a486d4e50603c536..ee2b5265750d32ce77fc020260ac1365ff2b192f 100644 (file)
Binary files a/light-06.tar.gz and b/light-06.tar.gz differ

diff --git a/light-07.tar.gz b/light-07.tar.gz
index c066680e9c5ebce4a57256bd00c188975f9aa7f5..cb3672db683f6d9f536eb13bc91bb68082df5f42 100644 (file)
Binary files a/light-07.tar.gz and b/light-07.tar.gz differ

diff --git a/light-08.tar.gz b/light-08.tar.gz
index 9c6811dbe334588f6d045a0fdb98491fd27dbe4d..706b02f0d2422d723500a39705ff4df9600cc80a 100644 (file)
Binary files a/light-08.tar.gz and b/light-08.tar.gz differ

diff --git a/light-09.tar.gz b/light-09.tar.gz
index 0cfc88e7ec1cd57bc0d227ba3db0fc86c897571d..60b537be3b972335ff08b2f557e302affe969b5a 100644 (file)
Binary files a/light-09.tar.gz and b/light-09.tar.gz differ

diff --git a/light-10.tar.gz b/light-10.tar.gz
new file mode 100644 (file)
index 0000000..0351846
Binary files /dev/null and b/light-10.tar.gz differ

diff --git a/py-02.tar.gz b/py-02.tar.gz
index 187ac4afb166bd2debd06c10dd94a6b6932eea5a..fb43af80ab604d1536999df73aa86b06933f6398 100644 (file)
Binary files a/py-02.tar.gz and b/py-02.tar.gz differ

diff --git a/py-03.tar.gz b/py-03.tar.gz
index 17eed4c4e780fad71a17d76b05cbd5f16c9d51d1..07553f884bc0ddf011ccf285765cb471a452b916 100644 (file)
Binary files a/py-03.tar.gz and b/py-03.tar.gz differ

diff --git a/py-04.tar.gz b/py-04.tar.gz
index 8397ce4ef5afd5e341b98b1cb92ae081c012d14a..367948d07ee100b9d532692eac0fb9fe41c72bd0 100644 (file)
Binary files a/py-04.tar.gz and b/py-04.tar.gz differ

diff --git a/py-05.tar.gz b/py-05.tar.gz
new file mode 100644 (file)
index 0000000..ecae2b0
Binary files /dev/null and b/py-05.tar.gz differ