Join modifications from branch OCC_debug_for_3_2_0b1

diff --git a/INSTALL b/INSTALL
index 7c18f886db6d234392fd81d81c1e65e5c16c3bf1..50ad9ae14955d0f0c5a47bc7b56d136e5732737d 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
-This is the version 3.2.0a2 of GHS3DPLUGIN
+This is the version 3.2.0b1 of GHS3DPLUGIN
 Compatible with :
-       - KERNEL 3.2.0a2
-        - SALOMEGUI 3.2.0a2
-       - SMESH 3.2.0a2
+       - KERNEL 3.2.0b1
+        - SALOMEGUI 3.2.0b1
+       - SMESH 3.2.0b1

diff --git a/Makefile.in b/Makefile.in
index 9071576f378409c0fa6c7eab9bae22c9bee5e927..39be8ca8482962b3b651a00fb1daef95294fcf7c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,3 +1,21 @@
+#  Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA 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.
+#
+#  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/
+#
 # -* Makefile *- 
 #
 # Author : Patrick GOLDBRONN (CEA)

diff --git a/adm_local/Makefile.in b/adm_local/Makefile.in
index 9b5e810db5609f348cfc90502d69bd7da12b084f..82d3a12b3df7c2bee031ae1e4282ea64ae3e5304 100644 (file)
--- a/adm_local/Makefile.in
+++ b/adm_local/Makefile.in
@@ -1,3 +1,21 @@
+#  Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA 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.
+#
+#  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/
+#
 # source path
 top_srcdir=@top_srcdir@
 top_builddir=..

diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index 57049e09546dd8ad76ad99cca20f32425f553c30..1f111d0a4b1a52bd2ce697f51ef9d2ce4e439ec7 100644 (file)
--- a/adm_local/unix/make_commence.in
+++ b/adm_local/unix/make_commence.in
@@ -234,7 +234,13 @@ all:
 Makefile: $(top_builddir)/config.status $(srcdir)/Makefile.in
        cd $(top_builddir) ; ./config.status
 
-$(top_builddir)/config.status: $(top_srcdir)/configure
+LOCAL_MAKE = make_commence make_omniorb
+
+KERNEL_MAKE = make_module make_conclude depend SALOMEconfig.h F77config.h sstream envScript
+
+$(top_builddir)/config.status: $(top_srcdir)/configure \
+                              $(LOCAL_MAKE:%=$(top_srcdir)/adm_local/unix/%.in) \
+                              $(KERNEL_MAKE:%=$(KERNEL_ROOT_DIR)/salome_adm/unix/%.in)
        cd $(top_builddir) ; ./config.status --recheck
 
 # VPATH contain $(srcdir), so make configure is good in top_srcdir and we must add target configure otherwise :-)
@@ -249,7 +255,7 @@ $(top_srcdir)/configure.in: $(top_srcdir)/configure.in.base
        cd $(top_srcdir) && ./build_configure
 
 
-ACLOCAL_SRC = \
+ACLOCAL_KERNEL = \
 ac_cxx_bool.m4                    check_corba.m4                       \
 ac_cxx_depend_flag.m4             check_hdf5.m4      enable_pthreads.m4        \
 ac_cxx_mutable.m4                 check_mico.m4      libtool.m4                \
@@ -270,11 +276,11 @@ ACLOCAL_SMESH =                   check_SMESH.m4
 #  ACLOCAL_SRC += check_Netgen.m4
 #endif
 
-$(top_srcdir)/aclocal.m4: $(ACLOCAL_SRC:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%) \
+$(top_srcdir)/aclocal.m4: $(ACLOCAL_KERNEL:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%) \
                        $(ACLOCAL_GUI:%=@GUI_ROOT_DIR@/adm_local/unix/config_files/%) \
                        $(ACLOCAL_GEOM:%=@GEOM_ROOT_DIR@/adm_local/unix/config_files/%) \
                        $(ACLOCAL_SMESH:%=@SMESH_ROOT_DIR@/adm_local/unix/config_files/%)
-       cd $(top_srcdir) ; aclocal --acdir=adm_local/unix/config_files -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files \
+       cd $(top_srcdir) ; aclocal -I adm_local/unix/config_files -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files \
                                                                        -I @GUI_ROOT_DIR@/adm_local/unix/config_files \
                                                                        -I @GEOM_ROOT_DIR@/adm_local/unix/config_files \
                                                                        -I @SMESH_ROOT_DIR@/adm_local/unix/config_files

diff --git a/bin/VERSION b/bin/VERSION
index 34eb0d4aeb534742b7b9ca5bf6ceeb96c435fe5c..88153655095340604618d7ad6ce5eed4ca049669 100755 (executable)
--- a/bin/VERSION
+++ b/bin/VERSION
@@ -1 +1 @@
-THIS IS SALOME - GHS3DPLUGIN VERSION: 3.2.0a2
+THIS IS SALOME - GHS3DPLUGIN VERSION: 3.2.0b1

diff --git a/build_configure b/build_configure
index e473a34c20e176f042e63189340726f51189d30c..7fc5f6e0187d2bd0af38c63f6ab97bc171fefc81 100755 (executable)
--- a/build_configure
+++ b/build_configure
@@ -150,9 +150,9 @@ echo "      ./salome_adm/unix/SALOMEconfig.h \\" >> configure.in_tmp1
 echo " ./salome_adm/unix/F77config.h \\" >> configure.in_tmp1
 echo " ./salome_adm/unix/sstream \\" >> configure.in_tmp1
 echo " ./salome_adm/unix/depend \\" >> configure.in_tmp1
-echo " ./adm_local/unix/make_omniorb \\" >> configure.in_tmp1
+echo " ./adm_local/unix/make_omniorb:${ABS_CONF_DIR}/adm_local/unix/make_omniorb.in \\" >> configure.in_tmp1
 echo " ./salome_adm/unix/envScript \\" >> configure.in_tmp1
-echo " ./adm_local/unix/make_commence \\" >> configure.in_tmp1
+echo " ./adm_local/unix/make_commence:${ABS_CONF_DIR}/adm_local/unix/make_commence.in \\" >> configure.in_tmp1
 echo " ./salome_adm/unix/make_conclude \\" >> configure.in_tmp1
 echo " ./salome_adm/unix/make_module \\" >> configure.in_tmp1
 

diff --git a/idl/Makefile.in b/idl/Makefile.in
index 726579764fdc5c085017f6f483be573956c2281b..0325f6d89130bcb92ebaf6cfd86891c3a9031fb2 100644 (file)
--- a/idl/Makefile.in
+++ b/idl/Makefile.in
@@ -1,3 +1,21 @@
+#  Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA 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.
+#
+#  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/
+#
 #
 # generate dependencies for idl file :
 #

diff --git a/resources/GHS3DPlugin.xml b/resources/GHS3DPlugin.xml
index 7c5960231dce4c64f3fc99b0260c9c2586a96ae5..6c335787aadb93c04a1c70a761ad43ea34afbaf7 100644 (file)
--- a/resources/GHS3DPlugin.xml
+++ b/resources/GHS3DPlugin.xml
@@ -13,6 +13,7 @@
     <algorithm type="GHS3D_3D"
                label-id="Tetrahedron (GHS3D)"
                icon-id="mesh_algo_tetra.png"
+               input="TRIA,QUAD"
                dim="3"/>
   </algorithms>
 </meshers-group>

diff --git a/src/GHS3DPlugin_GHS3D.cxx b/src/GHS3DPlugin_GHS3D.cxx
index 47eed5f1564622276627ccb06947252eeca72713..19a9afe490d4071e1a1c73542516e430d3495e31 100644 (file)
--- a/src/GHS3DPlugin_GHS3D.cxx
+++ b/src/GHS3DPlugin_GHS3D.cxx
@@ -1,3 +1,21 @@
+// Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA 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.
+//
+// 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/
+//
 //=============================================================================
 // File      : GHS3DPlugin_GHS3D.cxx
 // Created   : 

diff --git a/src/GHS3DPlugin_GHS3D.hxx b/src/GHS3DPlugin_GHS3D.hxx
index ff4538892444b23265235abe4d0b67e4e1f9fb98..b71554b01ccab98da060c59ae44af31a759be840 100644 (file)
--- a/src/GHS3DPlugin_GHS3D.hxx
+++ b/src/GHS3DPlugin_GHS3D.hxx
@@ -1,3 +1,21 @@
+// Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA 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.
+//
+// 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/
+//
 //=============================================================================
 // File      : GHS3DPlugin_GHS3D.hxx
 // Project   : SALOME

diff --git a/src/GHS3DPlugin_i.cxx b/src/GHS3DPlugin_i.cxx
index 6c47d5e12b918fa82092ed7d0c619a942ab0ccdc..4e2c9e67a7b9e41f818d975d1a0a81efb93fffc1 100644 (file)
--- a/src/GHS3DPlugin_i.cxx
+++ b/src/GHS3DPlugin_i.cxx
@@ -33,6 +33,12 @@ using namespace std;
 
 #include "GHS3DPlugin_GHS3D_i.hxx"
 
+template <class T> class GHS3DPlugin_Creator_i:public HypothesisCreator_i<T>
+{
+  // as we have 'module GHS3DPlugin' in GHS3DPlugin_Algorithm.idl
+  virtual std::string GetModuleName() { return "GHS3DPlugin"; }
+};
+
 //=============================================================================
 /*!
  *
@@ -51,7 +57,7 @@ extern "C"
 
     // Algorithms
     if (strcmp(aHypName, "GHS3D_3D") == 0)
-      aCreator = new HypothesisCreator_i<GHS3DPlugin_GHS3D_i>;
+      aCreator = new GHS3DPlugin_Creator_i<GHS3DPlugin_GHS3D_i>;
     else ;
 
     return aCreator;

diff --git a/src/GHS3DPlugin_icons.po b/src/GHS3DPlugin_icons.po
index 7dc071ad3d96a36cadd4d741fc1f93f157f6e6f4..df67c55aa3dd0d57a0d741332d2901759690a6dc 100644 (file)
--- a/src/GHS3DPlugin_icons.po
+++ b/src/GHS3DPlugin_icons.po
@@ -1,3 +1,21 @@
+#  Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA 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.
+#
+#  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/
+#
 # This is a Qt message file in .po format.  Each msgid starts with
 # a scope.  This scope should *NOT* be translated - eg. "Foo::Bar"
 # would be translated to "Pub", not "Foo::Pub".

diff --git a/src/Makefile.in b/src/Makefile.in
index 62cea893d2c131de97622ac7219bb39a003a4f32..b43192f8ba5c36e7dbacfe18d6b2f6a8aa50d5b2 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,3 +1,21 @@
+#  Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA 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.
+#
+#  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/
+#
 # -* Makefile *- 
 #
 # Author : Edward AGAPOV (OCC)