From 0d112b8c0d49d6189748f763528549375252c7e2 Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 5 Jun 2012 12:35:56 +0000 Subject: [PATCH] Merge from V6_5_BR 05/06/2012 --- AUTHORS | 2 +- ChangeLog | 2 +- GHS3DPRLPLUGIN_version.h.in | 2 +- INSTALL | 2 +- Makefile.am | 2 +- NEWS | 2 +- adm_local/Makefile.am | 2 +- adm_local/unix/Makefile.am | 2 +- adm_local/unix/config_files/Makefile.am | 2 +- adm_local/unix/config_files/check_GHS3DPRL.m4 | 2 +- .../unix/config_files/check_GHS3DPRLPLUGIN.m4 | 2 +- adm_local/unix/make_common_starter.am | 2 +- bin/Makefile.am | 2 +- build_cmake | 2 +- build_cmake.bat | 2 +- build_configure | 2 +- clean_configure | 2 +- configure.ac | 4 +- doc/Makefile.am | 2 +- doc/salome/Makefile.am | 2 +- doc/salome/gui/GHS3DPRLPLUGIN/Makefile.am | 2 +- doc/salome/gui/GHS3DPRLPLUGIN/doxyfile.in | 5 +-- doc/salome/gui/GHS3DPRLPLUGIN/doxyfile_py.in | 5 +-- .../gui/GHS3DPRLPLUGIN/static/doxygen.css | 6 +++ .../gui/GHS3DPRLPLUGIN/static/footer.html | 2 +- .../gui/GHS3DPRLPLUGIN/static/header.html.in | 10 ++--- .../GHS3DPRLPLUGIN/static/header_py.html.in | 10 ++--- doc/salome/gui/Makefile.am | 2 +- idl/GHS3DPRLPlugin_Algorithm.idl | 2 +- idl/Makefile.am | 14 +++++-- resources/GHS3DPRLPlugin.xml | 2 +- resources/Makefile.am | 2 +- resources/SalomeApp.xml | 2 +- src/GHS3DPRLPlugin/GHS3DPRLPluginDC.py | 3 +- src/GHS3DPRLPlugin/GHS3DPRLPlugin_Defs.hxx | 37 +++++++++++++++++++ .../GHS3DPRLPlugin_GHS3DPRL.cxx | 14 +++---- .../GHS3DPRLPlugin_GHS3DPRL.hxx | 6 ++- .../GHS3DPRLPlugin_GHS3DPRL_i.cxx | 2 +- .../GHS3DPRLPlugin_GHS3DPRL_i.hxx | 6 ++- .../GHS3DPRLPlugin_Hypothesis.cxx | 4 +- .../GHS3DPRLPlugin_Hypothesis.hxx | 6 ++- .../GHS3DPRLPlugin_Hypothesis_i.cxx | 2 +- .../GHS3DPRLPlugin_Hypothesis_i.hxx | 6 ++- src/GHS3DPRLPlugin/GHS3DPRLPlugin_i.cxx | 8 +++- src/GHS3DPRLPlugin/Makefile.am | 14 ++++--- src/Makefile.am | 2 +- src/gui/GHS3DPRLPluginGUI.cxx | 4 +- .../GHS3DPRLPluginGUI_HypothesisCreator.cxx | 3 +- src/gui/GHS3DPRLPluginGUI_HypothesisCreator.h | 15 +++++++- src/gui/Makefile.am | 6 ++- src/tepal2med/Makefile.am | 2 +- src/tepal2med/dlg_ghs3dmain.cxx | 2 +- src/tepal2med/dlg_ghs3dmain.h | 2 +- src/tepal2med/ghs3dprl_mesh_wrap.cxx | 26 +++++++++++-- src/tepal2med/ghs3dprl_mesh_wrap.h | 2 +- src/tepal2med/ghs3dprl_msg_parser.cxx | 2 +- src/tepal2med/ghs3dprl_msg_parser.h | 2 +- src/tepal2med/tepal2med.cxx | 19 ++++++++-- src/tools/Makefile.am | 2 +- src/tools/facespoints2mesh.py | 2 +- src/tools/mesh2facespoints.py | 2 +- 61 files changed, 205 insertions(+), 102 deletions(-) create mode 100755 src/GHS3DPRLPlugin/GHS3DPRLPlugin_Defs.hxx diff --git a/AUTHORS b/AUTHORS index ac54fde..c92da15 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D +# Copyright (C) 2007-2012 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/ChangeLog b/ChangeLog index 0ce9370..bc79b5d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D +# Copyright (C) 2007-2012 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/GHS3DPRLPLUGIN_version.h.in b/GHS3DPRLPLUGIN_version.h.in index cb805ab..b9bbf78 100644 --- a/GHS3DPRLPLUGIN_version.h.in +++ b/GHS3DPRLPLUGIN_version.h.in @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2011 CEA/DEN, EDF R&D +// Copyright (C) 2007-2012 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/INSTALL b/INSTALL index 08455a7..0d2e0c5 100644 --- a/INSTALL +++ b/INSTALL @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D +# Copyright (C) 2007-2012 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/Makefile.am b/Makefile.am index f7f11fb..9391fff 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D +# Copyright (C) 2007-2012 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/NEWS b/NEWS index 350f9cd..d22503a 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D +# Copyright (C) 2007-2012 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/Makefile.am b/adm_local/Makefile.am index efd3e3f..4e47880 100644 --- a/adm_local/Makefile.am +++ b/adm_local/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D +# Copyright (C) 2007-2012 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/Makefile.am b/adm_local/unix/Makefile.am index a5eb286..55a47ce 100644 --- a/adm_local/unix/Makefile.am +++ b/adm_local/unix/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D +# Copyright (C) 2007-2012 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/Makefile.am b/adm_local/unix/config_files/Makefile.am index 41335ef..faadda9 100644 --- a/adm_local/unix/config_files/Makefile.am +++ b/adm_local/unix/config_files/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D +# Copyright (C) 2007-2012 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_GHS3DPRL.m4 b/adm_local/unix/config_files/check_GHS3DPRL.m4 index b591eeb..1ccd67a 100755 --- a/adm_local/unix/config_files/check_GHS3DPRL.m4 +++ b/adm_local/unix/config_files/check_GHS3DPRL.m4 @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D +# Copyright (C) 2007-2012 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_GHS3DPRLPLUGIN.m4 b/adm_local/unix/config_files/check_GHS3DPRLPLUGIN.m4 index 93069e1..3105f0e 100755 --- a/adm_local/unix/config_files/check_GHS3DPRLPLUGIN.m4 +++ b/adm_local/unix/config_files/check_GHS3DPRLPLUGIN.m4 @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D +# Copyright (C) 2007-2012 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/make_common_starter.am b/adm_local/unix/make_common_starter.am index 2add6f2..fabd7a0 100644 --- a/adm_local/unix/make_common_starter.am +++ b/adm_local/unix/make_common_starter.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D +# Copyright (C) 2007-2012 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/Makefile.am b/bin/Makefile.am index 7ac401f..24e249a 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D +# Copyright (C) 2007-2012 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/build_cmake b/build_cmake index 379facf..d2f451a 100755 --- a/build_cmake +++ b/build_cmake @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D +# Copyright (C) 2007-2012 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/build_cmake.bat b/build_cmake.bat index 812ae9d..6533456 100644 --- a/build_cmake.bat +++ b/build_cmake.bat @@ -1,4 +1,4 @@ -@REM Copyright (C) 2007-2011 CEA/DEN, EDF R&D +@REM Copyright (C) 2007-2012 CEA/DEN, EDF R&D @REM @REM This library is free software; you can redistribute it and/or @REM modify it under the terms of the GNU Lesser General Public diff --git a/build_configure b/build_configure index 3d0cf73..1b0e6de 100755 --- a/build_configure +++ b/build_configure @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D +# Copyright (C) 2007-2012 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/clean_configure b/clean_configure index 3b0f728..9997669 100755 --- a/clean_configure +++ b/clean_configure @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D +# Copyright (C) 2007-2012 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/configure.ac b/configure.ac index 383a5ca..e5bd0bc 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D +# Copyright (C) 2007-2012 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 @@ -23,7 +23,7 @@ # Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com) # --- # -AC_INIT([Salome2 Project GHS3DPRLPLUGIN module], [6.4.0], [webmaster.salome@opencascade.com], [SalomeGHS3DPRLPLUGIN]) +AC_INIT([Salome2 Project GHS3DPRLPLUGIN module], [6.5.0], [webmaster.salome@opencascade.com], [SalomeGHS3DPRLPLUGIN]) AC_CONFIG_AUX_DIR(adm_local/unix/config_files) AC_CANONICAL_HOST AC_CANONICAL_TARGET diff --git a/doc/Makefile.am b/doc/Makefile.am index 0c7f8ca..395d3aa 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 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/Makefile.am b/doc/salome/Makefile.am index 1f9f5cb..15038d3 100644 --- a/doc/salome/Makefile.am +++ b/doc/salome/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 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/GHS3DPRLPLUGIN/Makefile.am b/doc/salome/gui/GHS3DPRLPLUGIN/Makefile.am index dbff6ee..ef5f90d 100755 --- a/doc/salome/gui/GHS3DPRLPLUGIN/Makefile.am +++ b/doc/salome/gui/GHS3DPRLPLUGIN/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 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/GHS3DPRLPLUGIN/doxyfile.in b/doc/salome/gui/GHS3DPRLPLUGIN/doxyfile.in index 239b1fc..51cfcb8 100755 --- a/doc/salome/gui/GHS3DPRLPLUGIN/doxyfile.in +++ b/doc/salome/gui/GHS3DPRLPLUGIN/doxyfile.in @@ -1,7 +1,4 @@ -# 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 +# Copyright (C) 2007-2012 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/GHS3DPRLPLUGIN/doxyfile_py.in b/doc/salome/gui/GHS3DPRLPLUGIN/doxyfile_py.in index e4d9c64..a085321 100755 --- a/doc/salome/gui/GHS3DPRLPLUGIN/doxyfile_py.in +++ b/doc/salome/gui/GHS3DPRLPLUGIN/doxyfile_py.in @@ -1,7 +1,4 @@ -# 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 +# Copyright (C) 2007-2012 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/GHS3DPRLPLUGIN/static/doxygen.css b/doc/salome/gui/GHS3DPRLPLUGIN/static/doxygen.css index 9d051a4..7a2dcbd 100755 --- a/doc/salome/gui/GHS3DPRLPLUGIN/static/doxygen.css +++ b/doc/salome/gui/GHS3DPRLPLUGIN/static/doxygen.css @@ -732,6 +732,12 @@ div.headertitle padding: 5px 5px 5px 10px; } +.title { + font-size: 150%; + font-weight: bold; + margin: 10px 2px; +} + dl { padding: 0 0 0 10px; diff --git a/doc/salome/gui/GHS3DPRLPLUGIN/static/footer.html b/doc/salome/gui/GHS3DPRLPLUGIN/static/footer.html index b344790..4c89a2b 100755 --- a/doc/salome/gui/GHS3DPRLPLUGIN/static/footer.html +++ b/doc/salome/gui/GHS3DPRLPLUGIN/static/footer.html @@ -3,7 +3,7 @@
- Copyright © 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
+ Copyright © 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
Copyright © 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/doc/salome/gui/GHS3DPRLPLUGIN/static/header.html.in b/doc/salome/gui/GHS3DPRLPLUGIN/static/header.html.in index 9792445..4571b43 100755 --- a/doc/salome/gui/GHS3DPRLPLUGIN/static/header.html.in +++ b/doc/salome/gui/GHS3DPRLPLUGIN/static/header.html.in @@ -2,14 +2,12 @@ + $title - - - - - - +$treeview +$search +$mathjax diff --git a/doc/salome/gui/GHS3DPRLPLUGIN/static/header_py.html.in b/doc/salome/gui/GHS3DPRLPLUGIN/static/header_py.html.in index 36e6a0c..61414bb 100644 --- a/doc/salome/gui/GHS3DPRLPLUGIN/static/header_py.html.in +++ b/doc/salome/gui/GHS3DPRLPLUGIN/static/header_py.html.in @@ -2,14 +2,12 @@ + $title - - - - - - +$treeview +$search +$mathjax diff --git a/doc/salome/gui/Makefile.am b/doc/salome/gui/Makefile.am index 533f129..a8fc025 100644 --- a/doc/salome/gui/Makefile.am +++ b/doc/salome/gui/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 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/idl/GHS3DPRLPlugin_Algorithm.idl b/idl/GHS3DPRLPlugin_Algorithm.idl index b421949..61c77bc 100755 --- a/idl/GHS3DPRLPlugin_Algorithm.idl +++ b/idl/GHS3DPRLPlugin_Algorithm.idl @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2011 CEA/DEN, EDF R&D +// Copyright (C) 2007-2012 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/Makefile.am b/idl/Makefile.am index 6cb093e..b22ef8e 100644 --- a/idl/Makefile.am +++ b/idl/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D +# Copyright (C) 2007-2012 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 @@ -30,6 +30,8 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am BASEIDL_FILES = GHS3DPRLPlugin_Algorithm.idl +BASEIDL_FILES_PY=$(BASEIDL_FILES:%.idl=%_idl.py) + # This variable defines the files to be installed dist_salomeidl_DATA = $(BASEIDL_FILES) @@ -92,9 +94,15 @@ install-exec-local: $(BASEIDL_FILES:%=$(top_srcdir)/idl/%) $(OMNIORB_IDL) $(IDLPYFLAGS) -C$(DESTDIR)$(salomepythondir) $$file ; \ done -# uninstall-local removes too much, but it works in distcheck +# we want to remove only staff generated for IDL files and nothing more uninstall-local: - rm -rf $(DESTDIR)$(salomepythondir)/* + @for modulen in GHS3DPRLPlugin ; do \ + test -d $(DESTDIR)$(salomepythondir)/$${modulen} && echo "Removing $(DESTDIR)$(salomepythondir)/$${modulen}" && rm -rf $(DESTDIR)$(salomepythondir)/$${modulen} ; \ + test -d $(DESTDIR)$(salomepythondir)/$${modulen}__POA && echo "Removing $(DESTDIR)$(salomepythondir)/$${modulen}__POA" && rm -rf $(DESTDIR)$(salomepythondir)/$${modulen}__POA ; \ + done ; \ + for filen in $(BASEIDL_FILES_PY) ; do \ + echo "Removing $(DESTDIR)$(salomepythondir)/$${filen}" && rm -f $(DESTDIR)$(salomepythondir)/$${filen}* ; \ + done mostlyclean-local: -rm -f *.hh *.cc .depidl diff --git a/resources/GHS3DPRLPlugin.xml b/resources/GHS3DPRLPlugin.xml index 7d867c3..cc13596 100755 --- a/resources/GHS3DPRLPlugin.xml +++ b/resources/GHS3DPRLPlugin.xml @@ -1,7 +1,7 @@