From b583bccc8a1cf6b4560f2b9740ebb1293df9b39e Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 5 Jun 2012 12:35:35 +0000 Subject: [PATCH] Merge from V6_5_BR 05/06/2012 --- GHS3DPLUGIN_version.h.in | 2 +- Makefile.am | 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_GHS3D.m4 | 2 +- .../unix/config_files/check_GHS3DPLUGIN.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 | 21 +---- configure.ac | 4 +- doc/Makefile.am | 2 +- doc/salome/Makefile.am | 2 +- doc/salome/gui/GHS3DPLUGIN/Makefile.am | 2 +- doc/salome/gui/GHS3DPLUGIN/doxyfile.in | 5 +- doc/salome/gui/GHS3DPLUGIN/doxyfile_py.in | 5 +- .../gui/GHS3DPLUGIN/input/ghs3d_hypo.doc | 26 +++---- doc/salome/gui/GHS3DPLUGIN/static/footer.html | 2 +- doc/salome/gui/Makefile.am | 2 +- idl/GHS3DPlugin_Algorithm.idl | 2 +- idl/Makefile.am | 14 +++- resources/GHS3DPlugin.xml | 2 +- resources/Makefile.am | 2 +- resources/SalomeApp.xml | 2 +- src/GHS3DPlugin/GHS3DPluginDC.py | 3 +- src/GHS3DPlugin/GHS3DPlugin_Defs.hxx | 2 +- src/GHS3DPlugin/GHS3DPlugin_GHS3D.cxx | 78 ++++++++++++++----- src/GHS3DPlugin/GHS3DPlugin_GHS3D.hxx | 2 +- src/GHS3DPlugin/GHS3DPlugin_GHS3D_i.cxx | 2 +- src/GHS3DPlugin/GHS3DPlugin_GHS3D_i.hxx | 2 +- src/GHS3DPlugin/GHS3DPlugin_Hypothesis.cxx | 2 +- src/GHS3DPlugin/GHS3DPlugin_Hypothesis.hxx | 2 +- src/GHS3DPlugin/GHS3DPlugin_Hypothesis_i.cxx | 2 +- src/GHS3DPlugin/GHS3DPlugin_Hypothesis_i.hxx | 2 +- src/GHS3DPlugin/GHS3DPlugin_i.cxx | 2 +- src/GHS3DPlugin/Makefile.am | 2 +- src/GUI/GHS3DPluginGUI.cxx | 2 +- src/GUI/GHS3DPluginGUI_Enums.h | 2 +- src/GUI/GHS3DPluginGUI_HypothesisCreator.cxx | 2 +- src/GUI/GHS3DPluginGUI_HypothesisCreator.h | 2 +- src/GUI/Makefile.am | 2 +- src/Makefile.am | 2 +- 45 files changed, 125 insertions(+), 105 deletions(-) diff --git a/GHS3DPLUGIN_version.h.in b/GHS3DPLUGIN_version.h.in index b016299..7d4806c 100644 --- a/GHS3DPLUGIN_version.h.in +++ b/GHS3DPLUGIN_version.h.in @@ -1,4 +1,4 @@ -// Copyright (C) 2004-2011 CEA/DEN, EDF R&D +// Copyright (C) 2004-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 b60c7a1..afc6dd9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2004-2011 CEA/DEN, EDF R&D +# Copyright (C) 2004-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 6705970..249f903 100644 --- a/adm_local/Makefile.am +++ b/adm_local/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2004-2011 CEA/DEN, EDF R&D +# Copyright (C) 2004-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 6c83087..cd2cfe6 100644 --- a/adm_local/unix/Makefile.am +++ b/adm_local/unix/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2004-2011 CEA/DEN, EDF R&D +# Copyright (C) 2004-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 e173ea6..6d25f43 100644 --- a/adm_local/unix/config_files/Makefile.am +++ b/adm_local/unix/config_files/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2004-2011 CEA/DEN, EDF R&D +# Copyright (C) 2004-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_GHS3D.m4 b/adm_local/unix/config_files/check_GHS3D.m4 index 3ecabf0..cec27b7 100644 --- a/adm_local/unix/config_files/check_GHS3D.m4 +++ b/adm_local/unix/config_files/check_GHS3D.m4 @@ -1,4 +1,4 @@ -dnl Copyright (C) 2004-2011 CEA/DEN, EDF R&D +dnl Copyright (C) 2004-2012 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/adm_local/unix/config_files/check_GHS3DPLUGIN.m4 b/adm_local/unix/config_files/check_GHS3DPLUGIN.m4 index 1722d1e..25f56bd 100755 --- a/adm_local/unix/config_files/check_GHS3DPLUGIN.m4 +++ b/adm_local/unix/config_files/check_GHS3DPLUGIN.m4 @@ -1,4 +1,4 @@ -dnl Copyright (C) 2004-2011 CEA/DEN, EDF R&D +dnl Copyright (C) 2004-2012 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/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am index e4e7b6d..694041f 100644 --- a/adm_local/unix/make_common_starter.am +++ b/adm_local/unix/make_common_starter.am @@ -1,4 +1,4 @@ -# Copyright (C) 2004-2011 CEA/DEN, EDF R&D +# Copyright (C) 2004-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 7496702..75e88d0 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2004-2011 CEA/DEN, EDF R&D +# Copyright (C) 2004-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 6d2d944..47bd15c 100755 --- a/build_cmake +++ b/build_cmake @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2004-2011 CEA/DEN, EDF R&D +# Copyright (C) 2004-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 2ab2388..5008649 100644 --- a/build_cmake.bat +++ b/build_cmake.bat @@ -1,4 +1,4 @@ -@REM Copyright (C) 2004-2011 CEA/DEN, EDF R&D +@REM Copyright (C) 2004-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 e476f5d..33e1049 100755 --- a/build_configure +++ b/build_configure @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (C) 2004-2011 CEA/DEN, EDF R&D +# Copyright (C) 2004-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 cd4e202..891edb9 100755 --- a/clean_configure +++ b/clean_configure @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2004-2011 CEA/DEN, EDF R&D +# Copyright (C) 2004-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 @@ -21,20 +21,5 @@ rm -rf autom4te.cache aclocal.m4 configure make_config find . -name "*~" -print -exec rm {} \; find . -name "*.pyc" -print -exec rm {} \; - -find bin -name Makefile.in | xargs rm -f -find idl -name Makefile.in | xargs rm -f -find resources -name Makefile.in | xargs rm -f -find adm_local -name Makefile.in | xargs rm -f -find src -name Makefile.in | xargs rm -f -rm -f adm_local/unix/config_files/config* -rm -f adm_local/unix/config_files/depcomp -rm -f adm_local/unix/config_files/install-sh -rm -f adm_local/unix/config_files/libtool.m4 -rm -f adm_local/unix/config_files/ltmain.sh -rm -f adm_local/unix/config_files/ltoptions.m4 -rm -f adm_local/unix/config_files/ltsugar.m4 -rm -f adm_local/unix/config_files/ltversion.m4 -rm -f adm_local/unix/config_files/lt~obsolete.m4 -rm -f adm_local/unix/config_files/missing -rm -f Makefile.in +find . -name Makefile.in | xargs rm -f +( cd adm_local/unix/config_files && rm -f config.* depcomp install-sh l*.m4 ltmain.sh missing py-compile ) diff --git a/configure.ac b/configure.ac index 19f9b47..d39b98b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# Copyright (C) 2004-2011 CEA/DEN, EDF R&D +# Copyright (C) 2004-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 @@ -27,7 +27,7 @@ # Modified by : Marc Tajchman (CEA) # Created from configure.in.base # -AC_INIT([Salome2 Project GHS3DPLUGIN module],[6.4.0], [webmaster.salome@opencascade.com], [SalomeGHS3DPLUGIN]) +AC_INIT([Salome2 Project GHS3DPLUGIN module],[6.5.0], [webmaster.salome@opencascade.com], [SalomeGHS3DPLUGIN]) 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 40951f3..2599845 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/GHS3DPLUGIN/Makefile.am b/doc/salome/gui/GHS3DPLUGIN/Makefile.am index 079d39e..dfe458e 100755 --- a/doc/salome/gui/GHS3DPLUGIN/Makefile.am +++ b/doc/salome/gui/GHS3DPLUGIN/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/GHS3DPLUGIN/doxyfile.in b/doc/salome/gui/GHS3DPLUGIN/doxyfile.in index 90cd848..7af64c9 100755 --- a/doc/salome/gui/GHS3DPLUGIN/doxyfile.in +++ b/doc/salome/gui/GHS3DPLUGIN/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/GHS3DPLUGIN/doxyfile_py.in b/doc/salome/gui/GHS3DPLUGIN/doxyfile_py.in index dc9e37d..47082b5 100755 --- a/doc/salome/gui/GHS3DPLUGIN/doxyfile_py.in +++ b/doc/salome/gui/GHS3DPLUGIN/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/GHS3DPLUGIN/input/ghs3d_hypo.doc b/doc/salome/gui/GHS3DPLUGIN/input/ghs3d_hypo.doc index dfd0041..fb49c74 100644 --- a/doc/salome/gui/GHS3DPLUGIN/input/ghs3d_hypo.doc +++ b/doc/salome/gui/GHS3DPLUGIN/input/ghs3d_hypo.doc @@ -7,15 +7,12 @@ algorithm. This algorithm is a commercial software. \n To get a licence, visit http://www.distene.com/corp/eval-distene.html -
    -
  1. \ref ghs3d_general_parameters "General parameters"
    2. -
  2. \ref ghs3d_advanced_parameters "Advanced parameters"
    3. -
  3. \ref ghs3d_enforced_vertices "Enforced vertices"
    4. -
  4. \ref ghs3d_enforced_meshes "Enforced meshes"
    5. -
+-# \ref ghs3d_general_parameters +-# \ref ghs3d_advanced_parameters +-# \ref ghs3d_enforced_vertices +-# \ref ghs3d_enforced_meshes -\anchor ghs3d_general_parameters -

General parameters

+\section ghs3d_general_parameters General parameters \image html ghs3d_parameters_basic.png @@ -44,8 +41,7 @@ optimisation provides better mesh, but can be time-consuming. \ref ghs3d_top "Back to top" -\anchor ghs3d_advanced_parameters -

Advanced parameters

+\section ghs3d_advanced_parameters Advanced parameters \image html ghs3d_parameters_advanced.png @@ -119,8 +115,7 @@ for ghs3d, for example, advanced options. \ref ghs3d_top "Back to top" -\anchor ghs3d_enforced_vertices -

Enforced vertices

+\section ghs3d_enforced_vertices Enforced vertices \note This feature is currently available only on meshes with no geometry attached. Such meshes can be obtained by @@ -149,8 +144,7 @@ group. If the group does not exist, it is created. \ref ghs3d_top "Back to top" -\anchor ghs3d_enforced_meshes -

Enforced Meshes

+\section ghs3d_enforced_meshes Enforced Meshes \note This feature is currently only available on meshes with no geometry attached. Such meshes can be obtained by @@ -173,12 +167,12 @@ entirely into the solid mesh.
  • FACE
  • If a size is given, the mesh will be refined around the enforced -elements given the size
    • +elements given the size (not available yet)
  • If a group name is given, the enforced elements will be added to the group. If the group does not exist, it is created.
    • -
    See Also a sample TUI Script of the \ref tui_ghs3d "creation of a Ghs3D hypothesis", including enforced vertices. +
    See Also a sample TUI Script of the \ref tui_ghs3d "creation of a Ghs3D hypothesis", including enforced vertices and meshes. \ref ghs3d_top "Back to top" diff --git a/doc/salome/gui/GHS3DPLUGIN/static/footer.html b/doc/salome/gui/GHS3DPLUGIN/static/footer.html index b344790..4c89a2b 100755 --- a/doc/salome/gui/GHS3DPLUGIN/static/footer.html +++ b/doc/salome/gui/GHS3DPLUGIN/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/Makefile.am b/doc/salome/gui/Makefile.am index e1c9554..ddbdb9e 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/GHS3DPlugin_Algorithm.idl b/idl/GHS3DPlugin_Algorithm.idl index 79ec320..8af4f1e 100644 --- a/idl/GHS3DPlugin_Algorithm.idl +++ b/idl/GHS3DPlugin_Algorithm.idl @@ -1,4 +1,4 @@ -// Copyright (C) 2004-2011 CEA/DEN, EDF R&D +// Copyright (C) 2004-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 605fb96..e675d27 100644 --- a/idl/Makefile.am +++ b/idl/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2004-2011 CEA/DEN, EDF R&D +# Copyright (C) 2004-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 @@ -26,6 +26,8 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am BASEIDL_FILES = GHS3DPlugin_Algorithm.idl +BASEIDL_FILES_PY=$(BASEIDL_FILES:%.idl=%_idl.py) + # This variable defines the files to be installed dist_salomeidl_DATA = $(BASEIDL_FILES) @@ -97,9 +99,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 GHS3DPlugin ; 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/GHS3DPlugin.xml b/resources/GHS3DPlugin.xml index a7ea606..2c1ece4 100644 --- a/resources/GHS3DPlugin.xml +++ b/resources/GHS3DPlugin.xml @@ -1,7 +1,7 @@