From: vsr Date: Thu, 9 Aug 2012 13:50:39 +0000 (+0000) Subject: Merge from V6_main_20120808 08Aug12 X-Git-Tag: V7_0_0~1 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=e81dba72c0abb42644f5a59240f4629051520f71;p=tools%2Ftutorial.git Merge from V6_main_20120808 08Aug12 --- diff --git a/ATOMICGUI.cxx b/ATOMICGUI.cxx index 1afb1ee..6156513 100644 --- 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 e59c63d..568823f 100644 --- 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 bca8159..34e1575 100644 --- 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 404c300..adaa6ee 100644 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 f11816b..4bad895 100644 --- 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= export ATOMIC_SRC_DIR=${ATOMIC_TUTORIAL_DIR}/ATOMIC_SRC diff --git a/build_configure b/build_configure index 345d8ca..4d5f16d 100644 --- 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 d5c0a2d..b6fca33 100644 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 8a22f58..a39461c 100644 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 6b5d0cf..cc2d547 100644 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 63a3653..52fb385 100644 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 1a434e4..2a4eeef 100644 --- 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 400431c..1257fcd 100644 --- 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 29c7f44..0bea1b9 100644 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 070677b..63df091 100644 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 d85745a..b43b5a7 100644 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 8f1d7b7..ee2b526 100644 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 c066680..cb3672d 100644 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 9c6811d..706b02f 100644 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 0cfc88e..60b537b 100644 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 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 187ac4a..fb43af8 100644 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 17eed4c..07553f8 100644 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 8397ce4..367948d 100644 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 index 0000000..ecae2b0 Binary files /dev/null and b/py-05.tar.gz differ