From 5ecefaf34e0786633d415fd20b0c5ea143190d34 Mon Sep 17 00:00:00 2001 From: vsr Date: Thu, 28 Aug 2008 11:54:43 +0000 Subject: [PATCH] Migrate to SALOME 5.x and automake --- AUTHORS | 55 ++ BLSURFPLUGIN_version.h.in | 30 +- ChangeLog | 44 ++ INSTALL | 28 + Makefile.am | 6 +- NEWS | 29 + README | 125 ++-- SalomeApprc.3.2.4 | 115 ---- adm_local/Makefile.am | 6 +- adm_local/unix/Makefile.am | 6 +- adm_local/unix/config_files/Makefile.am | 7 +- adm_local/unix/config_files/check_BLSURF.m4 | 7 +- .../unix/config_files/check_BLSURFPLUGIN.m4 | 7 +- adm_local/unix/make_common_starter.am | 24 + bin/Makefile.am | 6 +- build_configure | 25 +- clean_configure | 31 +- configure.ac | 30 +- env_BLSURFplugin-Src.sh | 3 - env_blsurf.sh | 18 - idl/BLSURFPlugin_Algorithm.idl | 41 +- idl/Makefile.am | 6 +- resources/Makefile.am | 9 +- resources/SalomeApp.xml | 9 + src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx | 41 +- src/BLSURFPlugin/BLSURFPlugin_BLSURF.hxx | 56 +- src/BLSURFPlugin/BLSURFPlugin_BLSURF_i.cxx | 43 +- src/BLSURFPlugin/BLSURFPlugin_BLSURF_i.hxx | 42 +- src/BLSURFPlugin/BLSURFPlugin_Hypothesis.cxx | 103 ++- src/BLSURFPlugin/BLSURFPlugin_Hypothesis.hxx | 58 +- .../BLSURFPlugin_Hypothesis_i.cxx | 45 +- .../BLSURFPlugin_Hypothesis_i.hxx | 44 +- src/BLSURFPlugin/BLSURFPlugin_i.cxx | 43 +- src/BLSURFPlugin/Makefile.am | 6 +- src/BLSURFPlugin/cad_occ.cxx | 588 ------------------ src/BLSURFPlugin/cad_occ.h | 188 ------ src/GUI/BLSURFPluginGUI.cxx | 39 +- src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx | 29 +- src/GUI/BLSURFPluginGUI_HypothesisCreator.h | 33 +- src/GUI/Makefile.am | 6 +- src/Makefile.am | 6 +- 41 files changed, 688 insertions(+), 1349 deletions(-) delete mode 100644 SalomeApprc.3.2.4 delete mode 100644 env_BLSURFplugin-Src.sh delete mode 100644 env_blsurf.sh create mode 100644 resources/SalomeApp.xml delete mode 100644 src/BLSURFPlugin/cad_occ.cxx delete mode 100644 src/BLSURFPlugin/cad_occ.h diff --git a/AUTHORS b/AUTHORS index e69de29..8173fb7 100644 --- a/AUTHORS +++ b/AUTHORS @@ -0,0 +1,55 @@ +# Copyright (C) 2006-2008 OPEN CASCADE, 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 +# 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/ or email : webmaster.salome@opencascade.com +# +# --- +# +# File : AUTHORS +# Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com) +# +# --- +# +# The format of this file was inspired by the Linux kernel CREDITS file. +# +# Authors and contributors are listed alphabetically. +# +# The fields are: name (N), email (E), web-address (W), CVS account login (C), +# PGP key ID and fingerprint (P), description (D), and snail-mail address (S). +# +# --- + +N: Francis KLOSS, Open CASCADE S.A.S +E: francis.kloss@opencascade.com +D: Initial development + +N: Lioka RAZAFINDRAZAKA, CEA +E: lioka.razafindrazaka@cea.fr +D: Initial development + +N: Patrick LAUG, INRIA +D: Initial development + +N: Aurelien ALLEAUME, DISTENE +D: Initial development + +N: Edward AGAPOV, Open CASCADE S.A.S +E: edward.agapov@opencascade.com +D: Debug, improve meshing algorithms + +N: Vadim SANDLER, Open CASCADE S.A.S +E: vadim.sandler@opencascade.com +D: Porting to automake, porting to SALOME series 5x diff --git a/BLSURFPLUGIN_version.h.in b/BLSURFPLUGIN_version.h.in index ee5d1d4..8a4d18b 100644 --- a/BLSURFPLUGIN_version.h.in +++ b/BLSURFPLUGIN_version.h.in @@ -1,25 +1,27 @@ -// Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// +// Copyright (C) 2006-2008 OPEN CASCADE, 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 -// License as published by the Free Software Foundation; either +// 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 +// +// 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 +// 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/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// +// --- +// +// File : BLSURFPLUGIN_version.h +// Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com) // -// File : BLSURFPLUGIN_version.h -// Author : Vadim SANDLER -// Module : SALOME +// --- #if !defined(__BLSURFPLUGIN_VERSION_H__) #define __BLSURFPLUGIN_VERSION_H__ diff --git a/ChangeLog b/ChangeLog index e69de29..ca38f41 100644 --- a/ChangeLog +++ b/ChangeLog @@ -0,0 +1,44 @@ +# Copyright (C) 2006-2008 OPEN CASCADE, 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 +# 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/ or email : webmaster.salome@opencascade.com +# +# --- +# +# File : ChangeLog +# Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com) +# +# --- +# +# Changes are listed by modification time in the descending order, +# i.e. newer changes are listed at the top of the file. +# +# Each record lists the modification date, author and short description of +# the made changes. +# +# --- + +2008-08-26 Vadim SANDLER + + * Porting to automake, porting to SALOME series 5x + +2007-2008 Edward AGAPOV + + * Debug, improve meshing algorithms + +2006 Francis KLOSS, Lioka RAZAFINDRAZAKA, Patrick LAUG, Aurelien ALLEAUME + + * Initial development diff --git a/INSTALL b/INSTALL index f893bb6..9c9abf9 100644 --- a/INSTALL +++ b/INSTALL @@ -1 +1,29 @@ +# Copyright (C) 2006-2008 OPEN CASCADE, 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 +# 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/ or email : webmaster.salome@opencascade.com +# +# --- +# +# File : INSTALL +# Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com) +# +# --- + SALOME2 : BLSURFPLUGIN module (SMESH plugin) + +For installation instructions and other information, please refer to +the README file. diff --git a/Makefile.am b/Makefile.am index 1bb0efc..3e45b52 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,4 @@ -# Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2006-2008 OPEN CASCADE, 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 @@ -19,7 +18,8 @@ # # --- # -# File: Makefile.am +# File : Makefile.am +# Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com) # # --- diff --git a/NEWS b/NEWS index e69de29..6a0b1eb 100644 --- a/NEWS +++ b/NEWS @@ -0,0 +1,29 @@ +# Copyright (C) 2006-2008 OPEN CASCADE, 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 +# 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/ or email : webmaster.salome@opencascade.com +# +# --- +# +# File : NEWS +# Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com) +# +# --- +# +# Changes are listed by modification time in the descending order, +# i.e. newer changes are listed at the top of the file. +# +# --- diff --git a/README b/README index 702784f..dd2c657 100644 --- a/README +++ b/README @@ -1,84 +1,127 @@ -1) Hypothèses - ---------- +SALOME platform +BLSURF meshing plugin +------------------------------ -a) Une version de SALOME est installée dans le répertoire : +Contents: -b) Le produit BLSURF est installé dans le répertoire /BLSurf +1. Pre-requisites +2. Installation +3. Launch SALOME with BLSURFPLUGIN +4. BLSURFPLUGIN plugin usage -c) Le produit "decimesh" doit être dans la variable d'environnement PATH +----------------- +1. Pre-requisites +----------------- -2) tgz - --- +The information in this file assumes that: + +* The SALOME platform is installed to the directory +* The blsurf product is installed to the directory /blsurf +* The decimesh binary is vaiable via environment variable PATH + +--------------- +2. Installation +--------------- + +2.1. Unpack BLSURFPLUGIN module sources cd tar zxf BLSURFPLUGIN_SRC.tgz -3) Construire le plugin BLSURF - --------------------------- +2.2. Build BLSURFPLUGIN module + +* set environment bash cd source env_build.sh -source BLSURFPLUGIN_SRC_3.2.4/env_blsurf.sh +export BLSURFHOME=/blsurf -cd BLSURFPLUGIN_SRC_3.2.4 +Note: you can avoid setting BLSURFHOME environment variable but use +--with-blsurf key of configure script instead. + +* configure build system + +cd BLSURFPLUGIN_SRC ./build_configure cd .. mkdir BLSURFPLUGIN_BUILD -mkdir BLSURFPLUGIN_INSTALL cd BLSURFPLUGIN_BUILD -../BLSURFPLUGIN_SRC_3.2.4/configure --prefix=/BLSURFPLUGIN_INSTALL +../BLSURFPLUGIN_SRC/configure --prefix=/BLSURFPLUGIN_INSTALL + +Note: you can use --with-blsurf option to pass the root directory of +blsurf product to the confogure script. In this case you can avoid +setting BLSURFHOME environment variable. Try 'configure --help' +command to learn more about available configure script options. + +Check "Summary" area in the log output of the configure script to +verify that all pre-requisites required for the successful compilation +of BLSURFPLUFIN module have been found. All pre-requisite products +should have status "yes". If any product has status "no", the +compilation procedure will fail. -# Dans les traces chercher la rubrique "Summary", -# et vérifier que toutes les réponses sont à yes. -# S'il y a au moins 1 "no", il faut résoudre cela avant de poursuivre. +* compile and install plugin module make make install exit -4) Lancer SALOME avec BLSURF - ------------------------- +If the compilation is finished successfully (make and make install +steps are finished without errors) the BLSURFPLUGIN meshing module +should be installed in the directory /BLSURFPLUGIN_INSTALL. -bash -cd +---------------------------------- +3. Launch SALOME with BLSURFPLUGIN +---------------------------------- -cp BLSURFPLUGIN_SRC_3.2.4/SalomeApprc.3.2.4 ~/.SalomeApprc. -# Cette copie est à faire une fois +* set environment +bash +cd source env_products.sh -source BLSURFPLUGIN_SRC_3.2.4/env_blsurf.sh -runSalome +export BLSURFPLUGIN_ROOT_DIR=/BLSURFPLUGIN_INSTALL +export SalomeAppConfig=${BLSURFPLUGIN_ROOT_DIR}/share/salome/resources/blsurfplugin +export DISTENE_LICENSE_FILE=/dlim8.key + +Note: DISTENE_LICENSE_FILE environment variable should point to the +blsurf product license file. -5) Session interactive - ------------------- +* run SALOME -a) Aller dans le module de géométrie et construire une figure simple +runSalome -b) Aller dans le module de maillage +---------------------------- +4. BLSURFPLUGIN plugin usage +---------------------------- -c) Aller dans le menu de création d'un maillage +* Create new study -d) Choisir la figure simple comme géométrie à mailler +* Activate Geometry module and create simple geometry object -e) Aller dans l'onglet 2D +* Activate Mesh module -f) Choisir BLSURF +* Invoke menu "Mesh/Create Mesh" -g) Cliquer dans le bouton parametre, une boite de dialogue apparait, cette boite n'est pas terminée. - Seul la case à cocher "optimize" est signifiante: - - décochée: uniquement BLSURF - - cochée : BLSURF + decimesh +* Select previously created geometry object by clicking it with the +mouse in the Object Browser -h) Cliquer OK +* In the "Create mesh" dialog box: +- activate "2D" page +- In the "Algorithm" combo box select "BLSURF" +- Click on the button at the right of the "Hypothesis" combo box and +select "BLSURF parameters" item in the drop-down menu -i) Aller dans le menu de maillage et lancer l'item "Compute" +* In the "Hypothesis Construction" dialog box set parameters of BLSURF + meshing algorithm and click "OK" button -j) Résultat: un maillage créer par BLSURF et visualiser dans SALOME +* In the "Create mesh" dialog box Click "Apply & Close" button to + define mesh and close the dialog box -k) Pour paramétrer BLSURF: il faut pour l'instant créer un fichier blsurf.env dans le répertoire de lancement de SALOME +* In the Object Browser select "Mesh_1" object, invoke context popup +menu for it by clicking right mouse button and select "Compute" item -l) fin +The resulting mesh created with BLSURF plugin will be shown in the 3D +viewer. diff --git a/SalomeApprc.3.2.4 b/SalomeApprc.3.2.4 deleted file mode 100644 index d748e5b..0000000 --- a/SalomeApprc.3.2.4 +++ /dev/null @@ -1,115 +0,0 @@ - - -
- - -
-
- -
-
- -
-
- - - - -
-
- - - - - - -
-
- - - - - - - -
-
- - -
-
- -
-
- - - -
-
- - - - -
-
- -
-
- - - -
-
- - - - - -
-
- - -
-
- - - - - - - - - - - - - - -
-
- - - - - - - - - - - - - - - - - - -
-
- - - - -
- diff --git a/adm_local/Makefile.am b/adm_local/Makefile.am index ca6b859..c18e025 100644 --- a/adm_local/Makefile.am +++ b/adm_local/Makefile.am @@ -1,5 +1,4 @@ -# Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2006-2008 OPEN CASCADE, 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 @@ -19,7 +18,8 @@ # # --- # -# File: Makefile.am +# File : Makefile.am +# Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com) # # --- diff --git a/adm_local/unix/Makefile.am b/adm_local/unix/Makefile.am index 1952c50..4886ae2 100644 --- a/adm_local/unix/Makefile.am +++ b/adm_local/unix/Makefile.am @@ -1,5 +1,4 @@ -# Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2006-2008 OPEN CASCADE, 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 @@ -19,7 +18,8 @@ # # --- # -# File: Makefile.am +# File : Makefile.am +# Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com) # # --- diff --git a/adm_local/unix/config_files/Makefile.am b/adm_local/unix/config_files/Makefile.am index e1e7a8f..2c0cc18 100644 --- a/adm_local/unix/config_files/Makefile.am +++ b/adm_local/unix/config_files/Makefile.am @@ -1,5 +1,4 @@ -# Copyright (C) 2006 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2006-2008 OPEN CASCADE, 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 @@ -19,8 +18,8 @@ # # --- # -# File: Makefile.am -# Author: Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com) +# File : Makefile.am +# Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com) # # --- diff --git a/adm_local/unix/config_files/check_BLSURF.m4 b/adm_local/unix/config_files/check_BLSURF.m4 index cc0bdf9..f628677 100644 --- a/adm_local/unix/config_files/check_BLSURF.m4 +++ b/adm_local/unix/config_files/check_BLSURF.m4 @@ -1,5 +1,4 @@ -# Copyright (C) 2006 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2006-2008 OPEN CASCADE, 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 @@ -19,8 +18,8 @@ # # --- # -# File: check_BLSURF.m4 -# Author: Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com) +# File : check_BLSURF.m4 +# Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com) # # --- diff --git a/adm_local/unix/config_files/check_BLSURFPLUGIN.m4 b/adm_local/unix/config_files/check_BLSURFPLUGIN.m4 index efa51f2..2edbf82 100644 --- a/adm_local/unix/config_files/check_BLSURFPLUGIN.m4 +++ b/adm_local/unix/config_files/check_BLSURFPLUGIN.m4 @@ -1,5 +1,4 @@ -# Copyright (C) 2006 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2006-2008 OPEN CASCADE, 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 @@ -19,8 +18,8 @@ # # --- # -# File: check_BLSURFPLUGIN.m4 -# Author: Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com) +# File : check_BLSURFPLUGIN.m4 +# Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com) # # --- diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am index c6e076e..5373119 100644 --- a/adm_local/unix/make_common_starter.am +++ b/adm_local/unix/make_common_starter.am @@ -1,3 +1,27 @@ +# Copyright (C) 2006-2008 OPEN CASCADE, 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 +# 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/ or email : webmaster.salome@opencascade.com +# +# --- +# +# File : make_common_starter.am +# Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com) +# +# --- # # ============================================================ # This file defines the common definitions used in several diff --git a/bin/Makefile.am b/bin/Makefile.am index 8b27521..16ef43e 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,5 +1,4 @@ -# Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2006-2008 OPEN CASCADE, 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 @@ -19,7 +18,8 @@ # # --- # -# File: Makefile.am +# File : Makefile.am +# Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com) # # --- diff --git a/build_configure b/build_configure index 38c269b..9872076 100755 --- a/build_configure +++ b/build_configure @@ -1,12 +1,29 @@ #!/bin/bash +# Copyright (C) 2006-2008 OPEN CASCADE, CEA/DEN, EDF R&D # -# Tool for updating list of .in file for the SALOME project -# and regenerating configure script +# 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. # -# Author : Marc Tajchman - CEA -# Date : 10/10/2002 +# 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/ or email : webmaster.salome@opencascade.com +# +# --- +# +# File : build_configure +# Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com) +# +# --- ORIG_DIR=`pwd` CONF_DIR=`echo $0 | sed -e "s,[^/]*$,,;s,/$,,;s,^$,.,"` diff --git a/clean_configure b/clean_configure index be0b542..8aacf22 100755 --- a/clean_configure +++ b/clean_configure @@ -1,10 +1,35 @@ -#!/bin/sh +#!/bin/bash + +# Copyright (C) 2006-2008 OPEN CASCADE, 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 +# 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/ or email : webmaster.salome@opencascade.com +# +# --- +# +# File : clean_configure +# Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com) +# +# --- rm -rf autom4te.cache aclocal.m4 configure make_config find . -name "*~" -print -exec rm {} \; find . -name "*.pyc" -print -exec rm {} \; -#exit -# ==================== ON SORT AVANT + +# ... find bin -name Makefile.in | xargs rm -f find doc -name Makefile.in | xargs rm -f diff --git a/configure.ac b/configure.ac index e56e9d2..aa5efbf 100644 --- a/configure.ac +++ b/configure.ac @@ -1,21 +1,29 @@ +#!/bin/bash + +# Copyright (C) 2006-2008 OPEN CASCADE, CEA/DEN, EDF R&D # -# PLEASE DO NOT MODIFY configure.in FILE +# 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. # -# ALL CHANGES WILL BE DISCARDED BY THE NEXT -# build_configure COMMAND +# 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. # -# CHANGES MUST BE MADE IN configure.in.base FILE +# 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 # -# Author : Marc Tajchman (CEA) -# Date : 28/06/2001 -# Modified by : Patrick GOLDBRONN (CEA) -# Modified by : Marc Tajchman (CEA) -# 13/03/2007: Alexander BORODIN - OCN -# Reorganization for usage of autotools +# --- # -# Created from configure.in.base +# File : configure.ac +# Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com) # +# --- AC_INIT([Salome2 Project BLSURFPLUGIN module], [5.0.0], [webmaster.salome@opencascade.com], [salome]) AC_CONFIG_AUX_DIR(salome_adm/unix/config_files) diff --git a/env_BLSURFplugin-Src.sh b/env_BLSURFplugin-Src.sh deleted file mode 100644 index 27dcce6..0000000 --- a/env_BLSURFplugin-Src.sh +++ /dev/null @@ -1,3 +0,0 @@ -#------ BLSURFplugin-Src ------ -export BLSURFPLUGIN_SRC_DIR=${INSTALL_ROOT}/BLSURFPLUGIN_SRC -## diff --git a/env_blsurf.sh b/env_blsurf.sh deleted file mode 100644 index 8f41511..0000000 --- a/env_blsurf.sh +++ /dev/null @@ -1,18 +0,0 @@ -#------ Licence Distene ------ -export DISTENE_LICENSE_FILE=${INSTALL_ROOT}/dlim8.key -## -#------ BLSURF ------ -export BLSURFHOME=${INSTALL_ROOT/BLSurf -## -#------ BLSURFplugin-Src ------ -export BLSURFPLUGIN_SRC_DIR=${INSTALL_ROOT}/BLSURFPLUGIN_SRC_3.2.4 -## -#------ BLSURFplugin-Bin ------ -export BLSURFPLUGIN_ROOT_DIR=${INSTALL_ROOT}/BLSURFPLUGIN_INSTALL -if [ -n "${ENV_FOR_LAUNCH}" ] ; then - if [ "${ENV_FOR_LAUNCH}" == "1" ] ; then - exportp LD_LIBRARY_PATH ${BLSURFPLUGIN_ROOT_DIR}/lib/salome:${BLSURFHOME}/lib - exportp PYTHONPATH ${BLSURFPLUGIN_ROOT_DIR}/lib64/salome:${BLSURFPLUGIN_ROOT_DIR}/lib64/python${PYTHON_VERSION}/site-packages/salome - fi -fi -## diff --git a/idl/BLSURFPlugin_Algorithm.idl b/idl/BLSURFPlugin_Algorithm.idl index e81d57d..e1c7124 100644 --- a/idl/BLSURFPlugin_Algorithm.idl +++ b/idl/BLSURFPlugin_Algorithm.idl @@ -1,26 +1,27 @@ -// Copyright (C) 2003 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 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// Copyright (C) 2006-2008 OPEN CASCADE, 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 +// 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. // -// File : BLSURFPlugin_Algorithm.idl -// Authors : Francis KLOSS (OCC) & Patrick LAUG (INRIA) & Lioka RAZAFINDRAZAKA (CEA) +// 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 +// +// --- +// +// File : BLSURFPlugin_Algorithm.idl +// Authors : Francis KLOSS (OCC) & Patrick LAUG (INRIA) & Lioka RAZAFINDRAZAKA (CEA) +// +// --- #ifndef _SMESH_BLSURFALGORITHM_IDL_ #define _SMESH_BLSURFALGORITHM_IDL_ diff --git a/idl/Makefile.am b/idl/Makefile.am index 2e912dd..54b7b25 100644 --- a/idl/Makefile.am +++ b/idl/Makefile.am @@ -1,5 +1,4 @@ -# Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2006-2008 OPEN CASCADE, 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 @@ -19,7 +18,8 @@ # # --- # -# File: Makefile.am +# File : Makefile.am +# Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com) # # --- diff --git a/resources/Makefile.am b/resources/Makefile.am index 36ceb8f..2b069c8 100644 --- a/resources/Makefile.am +++ b/resources/Makefile.am @@ -1,5 +1,4 @@ -# Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2006-2008 OPEN CASCADE, 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 @@ -19,7 +18,8 @@ # # --- # -# File: Makefile.am +# File : Makefile.am +# Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com) # # --- @@ -31,4 +31,5 @@ dist_salomeres_DATA = \ mesh_hypo_BLSURF.png \ mesh_tree_algo_BLSURF.png \ mesh_tree_hypo_BLSURF.png \ - BLSURFPlugin.xml + BLSURFPlugin.xml \ + SalomeApp.xml diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml new file mode 100644 index 0000000..57207bb --- /dev/null +++ b/resources/SalomeApp.xml @@ -0,0 +1,9 @@ + +
+ +
+
+ + +
+ diff --git a/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx b/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx index 04b02b0..ad24b16 100644 --- a/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx +++ b/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx @@ -1,31 +1,28 @@ -// BLSURFPlugin : C++ implementation +// Copyright (C) 2006-2008 OPEN CASCADE, CEA/DEN, EDF R&D // -// Copyright (C) 2006 OPEN CASCADE, 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 -// 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// 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/ or email : webmaster.salome@opencascade.com +// +// --- // // File : BLSURFPlugin_BLSURF.cxx // Authors : Francis KLOSS (OCC) & Patrick LAUG (INRIA) & Lioka RAZAFINDRAZAKA (CEA) // & Aurelien ALLEAUME (DISTENE) -// Date : 20/03/2006 -// Project : SALOME -//============================================================================= -using namespace std; +// +// --- #include "BLSURFPlugin_BLSURF.hxx" #include "BLSURFPlugin_Hypothesis.hxx" diff --git a/src/BLSURFPlugin/BLSURFPlugin_BLSURF.hxx b/src/BLSURFPlugin/BLSURFPlugin_BLSURF.hxx index 1c57ba1..4ae8163 100644 --- a/src/BLSURFPlugin/BLSURFPlugin_BLSURF.hxx +++ b/src/BLSURFPlugin/BLSURFPlugin_BLSURF.hxx @@ -1,30 +1,28 @@ -// BLSURFPlugin : C++ implementation +// Copyright (C) 2006-2008 OPEN CASCADE, CEA/DEN, EDF R&D // -// Copyright (C) 2006 OPEN CASCADE, 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 -// 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// 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. // -// File : BLSURFPlugin_BLSURF.hxx -// Authors : Francis KLOSS (OCC) & Patrick LAUG (INRIA) & Lioka RAZAFINDRAZAKA (CEA) -// & Aurelien ALLEAUME (DISTENE) -// Date : 20/03/2006 -// Project : SALOME -//============================================================================= +// 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 +// +// --- +// +// File : BLSURFPlugin_BLSURF.hxx +// Authors : Francis KLOSS (OCC) & Patrick LAUG (INRIA) & Lioka RAZAFINDRAZAKA (CEA) +// & Aurelien ALLEAUME (DISTENE) +// +// --- #ifndef _BLSURFPlugin_BLSURF_HXX_ #define _BLSURFPlugin_BLSURF_HXX_ @@ -59,16 +57,6 @@ class BLSURFPlugin_BLSURF: public SMESH_2D_Algo { protected: const BLSURFPlugin_Hypothesis* _hypothesis; - -// private: -// int _topology; -// int _physicalMesh; -// double _phySize; -// int _geometricMesh; -// double _angleMeshS; -// double _gradation; -// bool _quadAllowed; -// bool _decimesh; }; #endif diff --git a/src/BLSURFPlugin/BLSURFPlugin_BLSURF_i.cxx b/src/BLSURFPlugin/BLSURFPlugin_BLSURF_i.cxx index f8d2cfc..11c15e1 100644 --- a/src/BLSURFPlugin/BLSURFPlugin_BLSURF_i.cxx +++ b/src/BLSURFPlugin/BLSURFPlugin_BLSURF_i.cxx @@ -1,29 +1,28 @@ -// BLSURFPlugin : idl implementation +// Copyright (C) 2006-2008 OPEN CASCADE, CEA/DEN, EDF R&D // -// Copyright (C) 2006 OPEN CASCADE, 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 -// 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// 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. // -// File : BLSURFPlugin_BLSURF_i.cxx -// Authors : Francis KLOSS (OCC) & Patrick LAUG (INRIA) -// Module : BLSURFPlugin +// 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 +// +// --- +// +// File : BLSURFPlugin_BLSURF_i.cxx +// Authors : Francis KLOSS (OCC) & Patrick LAUG (INRIA) +// +// --- -using namespace std; #include "BLSURFPlugin_BLSURF_i.hxx" #include "SMESH_Gen.hxx" diff --git a/src/BLSURFPlugin/BLSURFPlugin_BLSURF_i.hxx b/src/BLSURFPlugin/BLSURFPlugin_BLSURF_i.hxx index d078468..46ba6ce 100644 --- a/src/BLSURFPlugin/BLSURFPlugin_BLSURF_i.hxx +++ b/src/BLSURFPlugin/BLSURFPlugin_BLSURF_i.hxx @@ -1,27 +1,27 @@ -// BLSURFPlugin : idl implementation +// Copyright (C) 2006-2008 OPEN CASCADE, CEA/DEN, EDF R&D // -// Copyright (C) 2006 OPEN CASCADE, 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 -// 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// 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. // -// File : BLSURFPlugin_BLSURF_2D_i.hxx -// Authors : Francis KLOSS (OCC) & Patrick LAUG (INRIA) -// Module : BLSURFPlugin +// 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 +// +// --- +// +// File : BLSURFPlugin_BLSURF_i.hxx +// Authors : Francis KLOSS (OCC) & Patrick LAUG (INRIA) +// +// --- #ifndef _BLSURFPlugin_BLSURF_I_HXX_ #define _BLSURFPlugin_BLSURF_I_HXX_ diff --git a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.cxx b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.cxx index 24b4df8..2fdf3be 100644 --- a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.cxx +++ b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.cxx @@ -1,32 +1,29 @@ -// BLSURFPlugin : C++ implementation +// Copyright (C) 2006-2008 OPEN CASCADE, CEA/DEN, EDF R&D // -// Copyright (C) 2006 OPEN CASCADE, 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 -// 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// 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. // -// File : BLSURFPlugin_Hypothesis.cxx -// Authors : Francis KLOSS (OCC) & Patrick LAUG (INRIA) & Lioka RAZAFINDRAZAKA (CEA) -// & Aurelien ALLEAUME (DISTENE) -// Date : 28/03/2006 -// Project : SALOME -//============================================================================= +// 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 +// +// --- +// +// File : BLSURFPlugin_Hypothesis.cxx +// Authors : Francis KLOSS (OCC) & Patrick LAUG (INRIA) & Lioka RAZAFINDRAZAKA (CEA) +// & Aurelien ALLEAUME (DISTENE) +// +// --- -using namespace std; #include #include @@ -267,13 +264,13 @@ void BLSURFPlugin_Hypothesis::SetVerbosity(int theVal) } } //============================================================================= -void BLSURFPlugin_Hypothesis::SetOptionValue(const string& optionName, - const string& optionValue) +void BLSURFPlugin_Hypothesis::SetOptionValue(const std::string& optionName, + const std::string& optionValue) throw (std::invalid_argument) { TOptionValues::iterator op_val = _option2value.find( optionName ); if ( op_val == _option2value.end() ) { - string msg = "Unknown BLSURF option: '" + optionName + "'"; + std::string msg = "Unknown BLSURF option: '" + optionName + "'"; throw std::invalid_argument(msg); } if ( op_val->second != optionValue ) { @@ -286,7 +283,7 @@ void BLSURFPlugin_Hypothesis::SetOptionValue(const string& optionName, i--; // check value type bool typeOk = true; - string typeName; + std::string typeName; if ( i == 0 ) { // empty string } @@ -308,7 +305,7 @@ void BLSURFPlugin_Hypothesis::SetOptionValue(const string& optionName, typeName = "integer"; } if ( !typeOk ) { - string msg = "Advanced option '" + optionName + "' = '" + optionValue + + std::string msg = "Advanced option '" + optionName + "' = '" + optionValue + "' but must be " + typeName; throw std::invalid_argument(msg); } @@ -318,12 +315,12 @@ void BLSURFPlugin_Hypothesis::SetOptionValue(const string& optionName, } //============================================================================= -string BLSURFPlugin_Hypothesis::GetOptionValue(const string& optionName) +std::string BLSURFPlugin_Hypothesis::GetOptionValue(const std::string& optionName) throw (std::invalid_argument) { TOptionValues::iterator op_val = _option2value.find( optionName ); if ( op_val == _option2value.end() ) { - string msg = "Unknown BLSURF option: <"; + std::string msg = "Unknown BLSURF option: <"; msg += optionName + ">"; throw std::invalid_argument(msg); } @@ -331,7 +328,7 @@ string BLSURFPlugin_Hypothesis::GetOptionValue(const string& optionName) } //============================================================================= -void BLSURFPlugin_Hypothesis::ClearOption(const string& optionName) +void BLSURFPlugin_Hypothesis::ClearOption(const std::string& optionName) { TOptionValues::iterator op_val = _option2value.find( optionName ); if ( op_val != _option2value.end() ) @@ -339,7 +336,7 @@ void BLSURFPlugin_Hypothesis::ClearOption(const string& optionName) } //============================================================================= -ostream & BLSURFPlugin_Hypothesis::SaveTo(ostream & save) +std::ostream & BLSURFPlugin_Hypothesis::SaveTo(std::ostream & save) { save << " " << (int)_topology << " " << (int)_physicalMesh @@ -367,7 +364,7 @@ ostream & BLSURFPlugin_Hypothesis::SaveTo(ostream & save) } //============================================================================= -istream & BLSURFPlugin_Hypothesis::LoadFrom(istream & load) +std::istream & BLSURFPlugin_Hypothesis::LoadFrom(std::istream & load) { bool isOK = true; int i; @@ -377,93 +374,93 @@ istream & BLSURFPlugin_Hypothesis::LoadFrom(istream & load) if (isOK) _topology = (Topology) i; else - load.clear(ios::badbit | load.rdstate()); + load.clear(std::ios::badbit | load.rdstate()); isOK = (load >> i); if (isOK) _physicalMesh = (PhysicalMesh) i; else - load.clear(ios::badbit | load.rdstate()); + load.clear(std::ios::badbit | load.rdstate()); isOK = (load >> i); if (isOK) _geometricMesh = (GeometricMesh) i; else - load.clear(ios::badbit | load.rdstate()); + load.clear(std::ios::badbit | load.rdstate()); isOK = (load >> val); if (isOK) _phySize = val; else - load.clear(ios::badbit | load.rdstate()); + load.clear(std::ios::badbit | load.rdstate()); isOK = (load >> val); if (isOK) _angleMeshS = val; else - load.clear(ios::badbit | load.rdstate()); + load.clear(std::ios::badbit | load.rdstate()); isOK = (load >> val); if (isOK) _gradation = val; else - load.clear(ios::badbit | load.rdstate()); + load.clear(std::ios::badbit | load.rdstate()); isOK = (load >> i); if (isOK) _quadAllowed = (bool) i; else - load.clear(ios::badbit | load.rdstate()); + load.clear(std::ios::badbit | load.rdstate()); isOK = (load >> i); if (isOK) _decimesh = (bool) i; else - load.clear(ios::badbit | load.rdstate()); + load.clear(std::ios::badbit | load.rdstate()); isOK = (load >> val); if (isOK) _phyMin = val; else - load.clear(ios::badbit | load.rdstate()); + load.clear(std::ios::badbit | load.rdstate()); isOK = (load >> val); if (isOK) _phyMax = val; else - load.clear(ios::badbit | load.rdstate()); + load.clear(std::ios::badbit | load.rdstate()); isOK = (load >> val); if (isOK) _angleMeshC = val; else - load.clear(ios::badbit | load.rdstate()); + load.clear(std::ios::badbit | load.rdstate()); isOK = (load >> val); if (isOK) _hgeoMin = val; else - load.clear(ios::badbit | load.rdstate()); + load.clear(std::ios::badbit | load.rdstate()); isOK = (load >> val); if (isOK) _hgeoMax = val; else - load.clear(ios::badbit | load.rdstate()); + load.clear(std::ios::badbit | load.rdstate()); isOK = (load >> i); if (isOK) _verb = i; else - load.clear(ios::badbit | load.rdstate()); + load.clear(std::ios::badbit | load.rdstate()); - string optName, optValue; + std::string optName, optValue; while (isOK) { isOK = (load >> optName); if (isOK) isOK = (load >> optValue); if (isOK) { - string & value = _option2value[ optName ]; + std::string & value = _option2value[ optName ]; value = optValue; int len = value.size(); // continue reading until "%#" encountered @@ -487,13 +484,13 @@ istream & BLSURFPlugin_Hypothesis::LoadFrom(istream & load) } //============================================================================= -ostream & operator <<(ostream & save, BLSURFPlugin_Hypothesis & hyp) +std::ostream & operator <<(std::ostream & save, BLSURFPlugin_Hypothesis & hyp) { return hyp.SaveTo( save ); } //============================================================================= -istream & operator >>(istream & load, BLSURFPlugin_Hypothesis & hyp) +std::istream & operator >>(std::istream & load, BLSURFPlugin_Hypothesis & hyp) { return hyp.LoadFrom( load ); } diff --git a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.hxx b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.hxx index 1384fc9..d933344 100644 --- a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.hxx +++ b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.hxx @@ -1,31 +1,28 @@ -// BLSURFPlugin : C++ implementation +// Copyright (C) 2006-2008 OPEN CASCADE, CEA/DEN, EDF R&D // -// Copyright (C) 2006 OPEN CASCADE, 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 -// 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// 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. // -// File : BLSURFPlugin_Hypothesis.hxx -// Authors : Francis KLOSS (OCC) & Patrick LAUG (INRIA) & Lioka RAZAFINDRAZAKA (CEA) -// & Aurelien ALLEAUME (DISTENE) -// Date : 27/03/2006 -// Project : SALOME -// $Header$ -//============================================================================= +// 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 +// +// --- +// +// File : BLSURFPlugin_Hypothesis.hxx +// Authors : Francis KLOSS (OCC) & Patrick LAUG (INRIA) & Lioka RAZAFINDRAZAKA (CEA) +// & Aurelien ALLEAUME (DISTENE) +// +// --- #ifndef _BLSURFPlugin_Hypothesis_HXX_ #define _BLSURFPlugin_Hypothesis_HXX_ @@ -34,6 +31,7 @@ #include #include #include +#include // Parameters for work of BLSURF @@ -120,15 +118,15 @@ public: void SetOptionValue(const std::string& optionName, const std::string& optionValue) throw (std::invalid_argument); - string GetOptionValue(const std::string& optionName) throw (std::invalid_argument); + std::string GetOptionValue(const std::string& optionName) throw (std::invalid_argument); void ClearOption(const std::string& optionName); const TOptionValues& GetOptionValues() const { return _option2value; } // Persistence - virtual ostream & SaveTo(ostream & save); - virtual istream & LoadFrom(istream & load); - friend ostream & operator <<(ostream & save, BLSURFPlugin_Hypothesis & hyp); - friend istream & operator >>(istream & load, BLSURFPlugin_Hypothesis & hyp); + virtual std::ostream & SaveTo(std::ostream & save); + virtual std::istream & LoadFrom(std::istream & load); + friend std::ostream & operator <<(std::ostream & save, BLSURFPlugin_Hypothesis & hyp); + friend std::istream & operator >>(std::istream & load, BLSURFPlugin_Hypothesis & hyp); /*! * \brief Does nothing diff --git a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis_i.cxx b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis_i.cxx index 254941e..d7700e0 100644 --- a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis_i.cxx +++ b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis_i.cxx @@ -1,30 +1,27 @@ -// BLSURFPlugin : C++ implementation +// Copyright (C) 2006-2008 OPEN CASCADE, CEA/DEN, EDF R&D // -// Copyright (C) 2006 OPEN CASCADE, 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 -// 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// 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. // -// File : BLSURFPlugin_Hypothesis_i.cxx -// Authors : Francis KLOSS (OCC) & Patrick LAUG (INRIA) & Lioka RAZAFINDRAZAKA (CEA) -// Date : 03/04/2006 -// Project : SALOME -//============================================================================= -using namespace std; +// 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 +// +// --- +// +// File : BLSURFPlugin_Hypothesis.cxx +// Authors : Francis KLOSS (OCC) & Patrick LAUG (INRIA) & Lioka RAZAFINDRAZAKA (CEA) +// +// --- #include "BLSURFPlugin_Hypothesis_i.hxx" #include "SMESH_Gen.hxx" diff --git a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis_i.hxx b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis_i.hxx index 01c54cc..f0c8e4b 100644 --- a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis_i.hxx +++ b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis_i.hxx @@ -1,29 +1,27 @@ -// BLSURFPlugin : C++ implementation +// Copyright (C) 2006-2008 OPEN CASCADE, CEA/DEN, EDF R&D // -// Copyright (C) 2006 OPEN CASCADE, 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 -// 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// 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. // -// File : BLSURFPlugin_Hypothesis_i.hxx -// Authors : Francis KLOSS (OCC) & Patrick LAUG (INRIA) & Lioka RAZAFINDRAZAKA (CEA) -// Date : 03/04/2006 -// Project : SALOME -//============================================================================= +// 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 +// +// --- +// +// File : BLSURFPlugin_Hypothesis.hxx +// Authors : Francis KLOSS (OCC) & Patrick LAUG (INRIA) & Lioka RAZAFINDRAZAKA (CEA) +// +// --- #ifndef _BLSURFPlugin_Hypothesis_i_HXX_ #define _BLSURFPlugin_Hypothesis_i_HXX_ diff --git a/src/BLSURFPlugin/BLSURFPlugin_i.cxx b/src/BLSURFPlugin/BLSURFPlugin_i.cxx index 6ffe80c..5cd6194 100644 --- a/src/BLSURFPlugin/BLSURFPlugin_i.cxx +++ b/src/BLSURFPlugin/BLSURFPlugin_i.cxx @@ -1,31 +1,28 @@ -// SMESH BLSURFPlugin : implementaion of SMESH idl descriptions +// Copyright (C) 2006-2008 OPEN CASCADE, CEA/DEN, EDF R&D // -// Copyright (C) 2003 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 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// 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 // -// File : BLSURFPlugin_i.cxx -// Authors : Francis KLOSS (OCC) & Patrick LAUG (INRIA) -// Module : SMESH +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// +// --- +// +// File : BLSURFPlugin_i.cxx +// Authors : Francis KLOSS (OCC) & Patrick LAUG (INRIA) +// +// --- -using namespace std; #include "utilities.h" #include "BLSURFPlugin_BLSURF_i.hxx" diff --git a/src/BLSURFPlugin/Makefile.am b/src/BLSURFPlugin/Makefile.am index b6fd1e9..2d41c0d 100644 --- a/src/BLSURFPlugin/Makefile.am +++ b/src/BLSURFPlugin/Makefile.am @@ -1,5 +1,4 @@ -# Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2006-2008 OPEN CASCADE, 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 @@ -19,7 +18,8 @@ # # --- # -# File: Makefile.am +# File : Makefile.am +# Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com) # # --- diff --git a/src/BLSURFPlugin/cad_occ.cxx b/src/BLSURFPlugin/cad_occ.cxx deleted file mode 100644 index 0a3c04c..0000000 --- a/src/BLSURFPlugin/cad_occ.cxx +++ /dev/null @@ -1,588 +0,0 @@ -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org -// -// -// File : BLSURFlugin_Mesher.cxx -// Authors : Francis KLOSS (OCC) & Patrick LAUG (INRIA) -// Date : 31/03/2006 -// Project : SALOME -//============================================================================= -// using namespace std; - -// #include "BLSURFPlugin_Mesher.hxx" -// #include "BLSURFPlugin_Hypothesis.hxx" - -// #include -// #include -// #include -// #include - -// #include - -// #include -// #include -// #include -// #include -// #include - -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define TSMO blw->bls_glo.tsmo - -bool BL_SURF::init(const TopoDS_Shape& _shape) { - cout << "BLSURF_init: begin" << endl; - - if (_shape.ShapeType() == TopAbs_COMPOUND) { - cout << "BLSURF_init: the shape is a COMPOUND" << endl; - } else { - cout << "BLSURF_init: the shape is UNKNOWN" << endl; - } - - cout << "BLSURF_init: exploring faces and edges " << endl; - int i=0; - for (TopExp_Explorer expf(_shape, TopAbs_FACE); expf.More(); expf.Next()) { - const TopoDS_Shape& face = expf.Current(); - i++; - int j=0; - for (TopExp_Explorer expe(face, TopAbs_EDGE); expe.More(); expe.Next()) { - // const TopoDS_Shape& edge = expe.Current(); -> warning: unused variable 'edge' - j++; - } - // cout << "BLSURF_init: face " << i << " has " << j << " edges" << endl; - } - cout << "BLSURF_init: total number of faces = " << i << endl; - - TopoDS_Shape the_shape; - the_shape = _shape; - - // return(true); - return(run(the_shape)); -} - -// #define TC2D blw.bls_glo.TC2dNew - -void BL_SURF::get_blw(blw_*& blw_param) { - blw_param = &blw; -} - -bool BL_SURF::end() { - bls_free(&blw); - if (blw.error[0]) { - return(false); - } else { - return(true); - } -} - -double norm(vector v) -{ - double res=0.; - for (int i=0;i operator-(vector v1, vector v2) -{ - assert(v1.size()==v2.size()); - vector res(v1.size(),0.); - for (int i=0;ibuild()) { - surfaces.push_back(bl_surface); - } else { - cout<<"Weird surface detected !"<Value(t); - C[0]=P.X(); C[1]=P.Y(); -} - -void BL_EDGE::method_curv1(const double &t, double *C) -{ - gp_Vec2d V1; - - V1=parametric_geometry->DN(t,1); - C[0]=V1.X(); C[1]=V1.Y(); -} - -void BL_EDGE::method_curv2(const double &t, double *C) -{ - gp_Vec2d V2; - - V2=parametric_geometry->DN(t,2); - C[0]=V2.X(); C[1]=V2.Y(); -} - -void BL_SURFACE::method_surf0(const double *UV, double *S) -{ - gp_Pnt P; - - P=geometry->Value(UV[0],UV[1]); // S.D0(U,V,P); - S[0]=P.X(); S[1]=P.Y(); S[2]=P.Z(); -} - -void BL_SURFACE::method_surf1(const double *UV, double *Su, double *Sv) -{ - gp_Pnt P; - gp_Vec D1U,D1V; - - geometry->D1(UV[0],UV[1],P,D1U,D1V); - Su[0]=D1U.X(); Su[1]=D1U.Y(); Su[2]=D1U.Z(); - Sv[0]=D1V.X(); Sv[1]=D1V.Y(); Sv[2]=D1V.Z(); -} - -void BL_SURFACE::method_surf2(const double *UV, double *Suu, double *Suv, double *Svv) -{ - gp_Pnt P; - gp_Vec D1U,D1V; - gp_Vec D2U,D2V,D2UV; - - geometry->D2(UV[0],UV[1],P,D1U,D1V,D2U,D2V,D2UV); - Suu[0]=D2U.X(); Suu[1]=D2U.Y(); Suu[2]=D2U.Z(); - Suv[0]=D2UV.X(); Suv[1]=D2UV.Y(); Suv[2]=D2UV.Z(); - Svv[0]=D2V.X(); Svv[1]=D2V.Y(); Svv[2]=D2V.Z(); -} - -static vector *current_list_of_faces=NULL; -BL_SURF* BL_SURF::active_blsurf=NULL; - -void cad_surf0 (blw_ *blw, int *refs, double *uv, double *S) -{ - BL_SURFACE *surf=(*current_list_of_faces)[*refs-1]; - surf->method_surf0(uv,S); -} - -void cad_surf1 (blw_ *blw, int *refs, double *uv, double *Su, double *Sv) -{ - BL_SURFACE *surf=(*current_list_of_faces)[*refs-1]; - surf->method_surf1(uv,Su,Sv); -} - -// calcul discret -// double du, dv, uvg[2], uvd[2], uvb[2], uvh[2], Sg[3], Sd[3], Sb[3], Sh[3]; -// double Sucont[3], Svcont[3]; -// if (*refs == 33) { -// Sucont[0] = Su[0]; Sucont[1] = Su[1]; Sucont[2] = Su[2]; -// Svcont[0] = Sv[0]; Svcont[1] = Sv[1]; Svcont[2] = Sv[2]; -// BL_SURFACE *surf=(*current_list_of_faces)[*refs-1]; -// du = (TSMO[*refs].uvmax[0] - TSMO[*refs].uvmin[0]) * 0.08; -// dv = (TSMO[*refs].uvmax[1] - TSMO[*refs].uvmin[1]) * 0.08; -// uvg[0] = uv[0]-du; -// uvg[1] = uv[1]; -// uvd[0] = uv[0]+du; -// uvd[1] = uv[1]; -// uvb[0] = uv[0]; -// uvb[1] = uv[1]-dv; -// uvh[0] = uv[0]; -// uvh[1] = uv[1]+dv; -// if (uvg[0] < TSMO[*refs].uvmin[0]) uvg[0] = TSMO[*refs].uvmin[0]; -// if (uvd[0] > TSMO[*refs].uvmax[0]) uvd[0] = TSMO[*refs].uvmax[0]; -// if (uvb[1] < TSMO[*refs].uvmin[1]) uvb[1] = TSMO[*refs].uvmin[1]; -// if (uvh[1] > TSMO[*refs].uvmax[1]) uvh[1] = TSMO[*refs].uvmax[1]; -// surf->method_surf0(uvg,Sg); -// surf->method_surf0(uvd,Sd); -// surf->method_surf0(uvb,Sb); -// surf->method_surf0(uvh,Sh); -// du = uvd[0] - uvg[0]; -// dv = uvh[1] - uvb[1]; -// Su[0] = (Sd[0] - Sg[0]) / du; -// Su[1] = (Sd[1] - Sg[1]) / du; -// Su[2] = (Sd[2] - Sg[2]) / du; -// Sv[0] = (Sh[0] - Sb[0]) / dv; -// Sv[1] = (Sh[1] - Sb[1]) / dv; -// Sv[2] = (Sh[2] - Sb[2]) / dv; -// fprintf(blw->out, "Su cont %g %g %g\n", Sucont[0], Sucont[1], Sucont[2]); -// fprintf(blw->out, "Su disc %g %g %g\n", Su[0], Su[1], Su[2]); -// fprintf(blw->out, "Sv cont %g %g %g\n", Svcont[0], Svcont[1], Svcont[2]); -// fprintf(blw->out, "Sv disc %g %g %g\n", Sv[0], Sv[1], Sv[2]); -// } - -void cad_surf2 (blw_ *blw, int *refs, double uv[2], double Suu[3], double Suv[3], double Svv[3]) -{ - BL_SURFACE *surf=(*current_list_of_faces)[*refs-1]; - surf->method_surf2(uv,Suu,Suv,Svv); - -// // calcul discret -// double du, dv, uvg[2], uvd[2], uvb[2], uvh[2], Sug[3], Sud[3], Sub[3], Suh[3], Svg[3], Svd[3], Svb[3], Svh[3]; -// double Suucont[3], Suvcont[3], Svvcont[3]; -// if (*refs >= 0) { -// Suucont[0] = Suu[0]; Suucont[1] = Suu[1]; Suucont[2] = Suu[2]; -// Suvcont[0] = Suv[0]; Suvcont[1] = Suv[1]; Suvcont[2] = Suv[2]; -// Svvcont[0] = Svv[0]; Svvcont[1] = Svv[1]; Svvcont[2] = Svv[2]; -// du = (TSMO[*refs].uvmax[0] - TSMO[*refs].uvmin[0]) * 0.08; -// dv = (TSMO[*refs].uvmax[1] - TSMO[*refs].uvmin[1]) * 0.08; -// uvg[0] = uv[0]-du; -// uvg[1] = uv[1]; -// uvd[0] = uv[0]+du; -// uvd[1] = uv[1]; -// uvb[0] = uv[0]; -// uvb[1] = uv[1]-dv; -// uvh[0] = uv[0]; -// uvh[1] = uv[1]+dv; -// if (uvg[0] < TSMO[*refs].uvmin[0]) uvg[0] = TSMO[*refs].uvmin[0]; -// if (uvd[0] > TSMO[*refs].uvmax[0]) uvd[0] = TSMO[*refs].uvmax[0]; -// if (uvb[1] < TSMO[*refs].uvmin[1]) uvb[1] = TSMO[*refs].uvmin[1]; -// if (uvh[1] > TSMO[*refs].uvmax[1]) uvh[1] = TSMO[*refs].uvmax[1]; -// surf->method_surf1(uvg,Sug,Svg); -// surf->method_surf1(uvd,Sud,Svd); -// surf->method_surf1(uvb,Sub,Svb); -// surf->method_surf1(uvh,Suh,Svh); -// du = uvd[0] - uvg[0]; -// dv = uvh[1] - uvb[1]; -// Suu[0] = (Sud[0] - Sug[0]) / du; -// Suu[1] = (Sud[1] - Sug[1]) / du; -// Suu[2] = (Sud[2] - Sug[2]) / du; -// Svv[0] = (Svh[0] - Svb[0]) / dv; -// Svv[1] = (Svh[1] - Svb[1]) / dv; -// Svv[2] = (Svh[2] - Svb[2]) / dv; -// Suv[0] = ((Suh[0] - Sub[0]) / dv + (Svd[0] - Svg[0]) / du) * 0.5; -// Suv[1] = ((Suh[1] - Sub[1]) / dv + (Svd[1] - Svg[1]) / du) * 0.5; -// Suv[2] = ((Suh[2] - Sub[2]) / dv + (Svd[2] - Svg[2]) / du) * 0.5; -// // fprintf(blw->out, "disc uv %g %g Suu %g %g %g\n", uv[0], uv[1], Suu[0], Suu[1], Suu[2]); -// // fprintf(blw->out, "Suv disc %g %g %g\n", Suv[0], Suv[1], Suv[2]); -// // fprintf(blw->out, "Svv disc %g %g %g\n", Svv[0], Svv[1], Svv[2]); -// } -} - -void cad_curvint (blw_ *blw, int *refs, int *ic, double *a, double *b) -{ - *a=(*current_list_of_faces)[*refs-1]->edges[*ic-1]->parametric_min; - *b=(*current_list_of_faces)[*refs-1]->edges[*ic-1]->parametric_max; -} - -void cad_curv0 (blw_ *blw, int *refs, int *ic, double *t, double *C) -{ - (*current_list_of_faces)[*refs-1]->edges[*ic-1]->method_curv0(*t,C); -} - -void cad_curv1 (blw_ *blw, int *refs, int *ic, double *t, double *Ct) -{ - (*current_list_of_faces)[*refs-1]->edges[*ic-1]->method_curv1(*t,Ct); -} - -void cad_curv2 (blw_ *blw, int *refs, int *ic, double *t, double *Ctt) -{ - (*current_list_of_faces)[*refs-1]->edges[*ic-1]->method_curv2(*t,Ctt); -} - -void cad_hphys (blw_ *blw, int *refs, double *uv, double *h) {} -void cad_hphyc (blw_ *blw, int *refs, int *ic, double *t, double *h) {} -void cad_hphyp (blw_ *blw, int *refp, double *h) {} - -void cad_rads (blw_ *blw, int *refs, double *uv, double *rhos) { - sprintf(blw->error, "cad_rads should not be called\n"); -} - -void cad_radc (blw_ *blw, int *refs, int *ic, double *t, double *rhoc) { - sprintf(blw->error, "cad_radc should not be called"); -} - -void cad_hageos(blw_ *blw, int *refs, double uv[2], double hageos[6]) { - sprintf(blw->error, "cad_hageos should not be called\n"); -} - -void cad_refphyc(blw_ *blw, int *refc, int *phyc) { - *phyc = *refc; -} - -void cad_refphyp(blw_ *blw, int *refp, int *phyp) { - *phyp = *refp; -} - -void cad_refphys(blw_ *blw, int *refs, int *phys) { - *phys = *refs; -} - -void cad_edgetag(blw_ *blw, int *refc, int *required) { - *required = 1; -} - -void cad_curvparam(blw_ *blw, int *refs, int *ic, int *n, double tab[]) { - *n = 0; -} - -void BL_SURF::init_tsmo(blw_ *blw) { /* cf. bls_read_pardom */ - int is, ns, ic, nc, j, igloP, igloQ, isurf; - TopoDS_Vertex v; - gp_Pnt p; - double a, b, uv[2], xyz[3], xyzP[3], xyzQ[3]; - - ns = surfaces.size(); - if (blw->env.verb >= 10) fprintf(blw->out, "\ninit_tsmo: %d surfaces\n", ns); - if (ns <= 0) { - TSMO = NULL; - blw->bls_glo.number_of_patches = 0; - return; - } - - TopTools_IndexedMapOfShape fmap_edges; - TopTools_IndexedMapOfShape fmap_points; - fmap_edges.Clear(); - fmap_points.Clear(); - for (isurf=0; isurftopology; - for (TopExp_Explorer ex_face(face ,TopAbs_EDGE); ex_face.More(); ex_face.Next()) { - TopoDS_Edge e = TopoDS::Edge(ex_face.Current()); - if (fmap_edges.FindIndex(e) <= 0) { /* not found => FindIndex = 0, found => FindIndex > 0 */ - fmap_edges.Add(e); - j = 0; - for (TopExp_Explorer ex_edge(e ,TopAbs_VERTEX); ex_edge.More(); ex_edge.Next()) { - v = TopoDS::Vertex(ex_edge.Current()); - ++j; - if (fmap_points.FindIndex(v) <= 0) fmap_points.Add(v); - } - if (j != 2) { - sprintf(blw->error, "init_tsmo: surface is=%d: an edge has %d != 2 extremities\n", isurf+1, j); return; - } - } - } - } - - MALLOC(surface_, TSMO, ns+1); if (blw->error[0]) return; - blw->bls_glo.number_of_patches = ns; - for (isurf=0; isurfedges.size(); - if (blw->env.verb >= 70) fprintf(blw->out, "init_tsmo: surface is=%d: %d curves\n", is, nc); - - bls_init_surface(blw, &(TSMO[is]), nc); - TSMO[is].iglos = is; - TSMO[is].pardom_side = 0; - TSMO[is].surforient = +1; - for (int icurv=0;icurvedges[icurv]; - TopoDS_Edge edge = curve->topology; - TSMO[is].TC[ic].igloc = fmap_edges.FindIndex(edge); - - TopExp_Explorer ex_edge(edge, TopAbs_VERTEX); - v = TopoDS::Vertex(ex_edge.Current()); - p = BRep_Tool::Pnt(v); - xyzP[0] = p.X(); xyzP[1] = p.Y(); xyzP[2] = p.Z(); - igloP = fmap_points.FindIndex(v); - - ex_edge.Next(); - v = TopoDS::Vertex(ex_edge.Current()); - p = BRep_Tool::Pnt(v); - xyzQ[0] = p.X(); xyzQ[1] = p.Y(); xyzQ[2] = p.Z(); - igloQ = fmap_points.FindIndex(v); - - cad_curvint (blw, &is, &ic, &a, &b); - cad_curv0 (blw, &is, &ic, &a, uv); - cad_surf0 (blw, &is, uv, xyz); - xyzP[0] -= xyz[0]; xyzP[1] -= xyz[1]; xyzP[2] -= xyz[2]; - xyzQ[0] -= xyz[0]; xyzQ[1] -= xyz[1]; xyzQ[2] -= xyz[2]; - if (NORM3DPOW2(xyzP) <= NORM3DPOW2(xyzQ)) { - TSMO[is].TC[ic].iglope[0] = igloP; - TSMO[is].TC[ic].iglope[1] = igloQ; - } else { - TSMO[is].TC[ic].iglope[0] = igloQ; - TSMO[is].TC[ic].iglope[1] = igloP; - } - } - } -} - -int BL_SURF::bls_main(blw_ *blw) { - FILE *file; - - /* banner */ - blw->out = stdout; - bls_banner(blw, 1); - - /* initialiser l'environnement de BLSURF */ - init_blsenv(blw); - - /* lire l'environnement de BLSURF */ - /* par defaut : strcpy(blw->dirname, ""); */ - /* sinon : strcpy(blw->dirname, "C:\\Documents and Settings\\xxx\\"); */ - sprintf(blw->filename, "%sblsurf.env", blw->dirname); - FOPEN(file, "r"); - if (blw->error[0]) { - fprintf(blw->out, "File blsurf.env not found. Default values will be used.\n"); - blw->error[0] = 0; - } else { - read_blsenv(blw, file); - FCLOSE(file); - if (blw->error[0]) goto error; /* read_blsenv: unknown keyword */ - } - - /* copier les variables communes entre "bl2denv" et blsenv (en particulier verb) */ - copy_common_env(blw); - - /* imprimer l'environnement de BLSURF */ - if (blw->env.verb >= 70) print_blsenv(blw); - - /* initialiser TSMO */ - current_list_of_faces = &surfaces; - BL_SURF::init_tsmo(blw); if (blw->error[0]) goto error; - - /* generer le maillage surfacique */ - bls_init(blw); if (blw->error[0]) goto error; - bls_mesh(blw); if (blw->error[0]) goto error; - bls_surforient(blw); if (blw->error[0]) goto error; - bls_export(blw); if (blw->error[0]) goto error; - /* a voir : les tableaux pointes par current_list_of_faces sont liberes ? handles ? */ - - bls_banner(blw, 2); - return(0); - - error: - fprintf(blw->out, "\nBLSURF ERROR MESSAGE:\n%s\n", blw->error); - bls_banner(blw, 2); - return(1); -} diff --git a/src/BLSURFPlugin/cad_occ.h b/src/BLSURFPlugin/cad_occ.h deleted file mode 100644 index 67766f0..0000000 --- a/src/BLSURFPlugin/cad_occ.h +++ /dev/null @@ -1,188 +0,0 @@ -#ifndef __BL_SURF__ -#define __BL_SURF__ - -#include -#include -#include - -#include -#include -#include -#include -#include -#include - -#include - -class BL_SURFACE; -class BL_CURVE_SIZER; -class BL_SURFACE_SIZER; -class BL_POINT_SIZER; - -class BL_EDGE -{ - public : - Handle(Geom2d_Curve) parametric_geometry; - Handle(Geom_Curve) space_geometry; - TopoDS_Edge topology; - BL_SURFACE *boss; - BL_CURVE_SIZER *sizer; - bool splitted_closed; - int splitted_part; - vector P1,P2,MP; - string name; - int i_P1,i_P2; - int typc,refc; - - double parametric_min,parametric_max; - double space_min,space_max; - - BL_EDGE(TopoDS_Edge&,BL_SURFACE*,Handle(Geom2d_Curve),double,double); - ~BL_EDGE(); - - bool verification(); - - void method_curv0(const double&, double*); - void method_curv1(const double&, double*); - void method_curv2(const double&, double*); -}; - -class BL_POINT { - public : - BL_POINT_SIZER *sizer; - BL_SURFACE *boss; - double u,v; - - BL_POINT() { u=v=0.; boss=NULL; sizer=NULL; } - BL_POINT(BL_SURFACE *b, double du, double dv) { u=du; v=dv; boss=b; sizer=NULL; } - BL_POINT(double du, double dv) { u=du; v=dv; boss=NULL; sizer=NULL; } - ~BL_POINT() { } - - BL_POINT& operator=(BL_POINT p) { u=p.u; v=p.v; return(*this); } - bool operator==(BL_POINT p) { return((u==p.u)&&(v==p.v)); } -}; - -class BL_SURFACE { - public : - Handle(Geom_Surface) geometry; - TopoDS_Face topology; - bool to_delete; - - BL_SURFACE_SIZER *sizer; - vector edges; - vector points; - - BL_SURFACE(TopoDS_Face&); - ~BL_SURFACE(); - - bool build(); - bool verification(); - - void method_surf0(double const*, double*); - void method_surf1(double const*, double*, double*); - void method_surf2(double const*, double*, double*, double*); - - bool add(TopoDS_Edge&); - void add(double u, double v); -}; - -class BL_SURF -{ - protected: - - // void build_blsurf_data_file(); - void init_tsmo(blw_ *blw); - int bls_main(blw_ *blw); - - // void set_reference_points(); - void build_surfaces(TopoDS_Shape&); - // void build_from_occ_references(TopoDS_Shape&); - - void analyse_identical_faces(); - - public: - static BL_SURF *active_blsurf; - TopoDS_Shape the_object; - - vector all_edges; - vector surfaces; - - vector internal_points; - vector internal_face_points; - - vector internal_edges; - vector internal_faces; - - vector conforming_source_face; - vector conforming_dest_face; - - vector< vector* > faces_to_merge; - vector< vector* > vertices_tags; - vector< vector* > edges_tags; - - // string blsurf_fname; - // bool mesh_2D, auto_merge, use_occ_refs; - - // enum WHAT_MESH { SURFACE_MESH=0, VOLUME_MESH=1 }; - // enum MESH_ORDER { LINEAR=0, QUADRATIC=1 }; - - blw_ blw; - // int auto_connectivity; - // int Verbosity; - // int hphy_flag; - // int hinterpol_flag,hmean_flag; - // int eps_glue_flag,eps_ends_flag,eps_collapse_flag; - // double eps_glue,eps_ends,eps_collapse,shockmax; - // double angle_mesh,angle_smo; - // WHAT_MESH WhatMesh; - // MESH_ORDER MeshOrder; - // int ComponentToMesh; - - // double Pmin,Pmax; - // double Gmin,Gmax; - // vector Poptions; // Goptions - - // vector remaining_faces; - - BL_SURF() { - // Verbosity=25; - // hphy_flag=0; - // hinterpol_flag=0; - // hmean_flag=0; - // auto_connectivity=1; // PL valait 0 - // use_occ_refs=false; - // Poptions.resize(1); Poptions[0]=0; - // WhatMesh=SURFACE_MESH; - // MeshOrder=LINEAR; - // mesh_2D=false; - // eps_glue=eps_ends=eps_collapse=1e-8; - // eps_glue_flag=eps_ends_flag=eps_collapse_flag=0; - // shockmax=1.e100; - // blsurf_fname=""; - // auto_merge=false; - // ComponentToMesh=0; - // angle_mesh=8.; angle_smo=1.; - } - ~BL_SURF() { } - - bool init(const TopoDS_Shape&); - // int vertices(double*&); - void get_blw(blw_*&); - // int number_of_patches(); - // bool all_triangles(); - // void face_mesh(int is, int*& F, int*& FRef, int*& iglops, int& nF, int& ndom, int& surforient); - bool end(); - - bool run(TopoDS_Shape&); - bool run(); - void reset(); -}; - -#endif - -// PL Gmin, Gmax, hgeo_flag, Goptions ont deja ete elimines -// PL hphy_flag, Poptions, ... sont a eliminer aussi -// bls.Gmin=0.01; -// bls.Gmax=1000; -// bls.hgeo_flag=1; -// bls.Goptions[0]=1; diff --git a/src/GUI/BLSURFPluginGUI.cxx b/src/GUI/BLSURFPluginGUI.cxx index 7bfd65d..b5dd0eb 100755 --- a/src/GUI/BLSURFPluginGUI.cxx +++ b/src/GUI/BLSURFPluginGUI.cxx @@ -1,28 +1,27 @@ -// BLSURFPlugin GUI: GUI for plugged-in mesher BLSURFPlugin +// Copyright (C) 2006-2008 OPEN CASCADE, CEA/DEN, EDF R&D // -// Copyright (C) 2003 CEA -// -// 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 or email : webmaster.salome@opencascade.org +// 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 // -// File : BLSURFPluginGUI.cxx +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// +// --- +// +// File : BLSURFPluginGUI.cxx // Authors : Francis KLOSS (OCC) & Patrick LAUG (INRIA) -// Module : BLSURFPlugin +// +// --- #include "BLSURFPluginGUI_HypothesisCreator.h" diff --git a/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx b/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx index bd4f0d6..50273e5 100644 --- a/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx +++ b/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx @@ -1,27 +1,26 @@ -// BLSURFPlugin GUI: GUI for plugged-in mesher BLSURFPlugin +// Copyright (C) 2006-2008 OPEN CASCADE, CEA/DEN, EDF R&D // -// Copyright (C) 2003 CEA +// 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.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // --- // // File : BLSURFPluginGUI_HypothesisCreator.cxx // Authors : Francis KLOSS (OCC) & Patrick LAUG (INRIA) & Lioka RAZAFINDRAZAKA (CEA) +// & Aurelien ALLEAUME (DISTENE) // // --- diff --git a/src/GUI/BLSURFPluginGUI_HypothesisCreator.h b/src/GUI/BLSURFPluginGUI_HypothesisCreator.h index f5d1c11..5907b60 100644 --- a/src/GUI/BLSURFPluginGUI_HypothesisCreator.h +++ b/src/GUI/BLSURFPluginGUI_HypothesisCreator.h @@ -1,28 +1,27 @@ -// BLSURFPlugin GUI: GUI for plugged-in mesher BLSURFPlugin +// Copyright (C) 2006-2008 OPEN CASCADE, CEA/DEN, EDF R&D // -// Copyright (C) 2003 CEA +// 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. -// -// 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.org +// 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/ or email : webmaster.salome@opencascade.com // // --- // // File : BLSURFPluginGUI_HypothesisCreator.h // Authors : Francis KLOSS (OCC) & Patrick LAUG (INRIA) & Lioka RAZAFINDRAZAKA (CEA) // & Aurelien ALLEAUME (DISTENE) +// // --- #ifndef BLSURFPLUGINGUI_HypothesisCreator_H diff --git a/src/GUI/Makefile.am b/src/GUI/Makefile.am index 503f4da..b18b6ce 100644 --- a/src/GUI/Makefile.am +++ b/src/GUI/Makefile.am @@ -1,5 +1,4 @@ -# Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2006-2008 OPEN CASCADE, 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 @@ -19,7 +18,8 @@ # # --- # -# File: Makefile.am +# File : Makefile.am +# Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com) # # --- diff --git a/src/Makefile.am b/src/Makefile.am index 7c2532b..065949f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,4 @@ -# Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2006-2008 OPEN CASCADE, 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 @@ -19,7 +18,8 @@ # # --- # -# File: Makefile.am +# File : Makefile.am +# Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com) # # --- -- 2.39.2