--- /dev/null
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+\f
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+\f
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+\f
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+\f
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+\f
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program 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 General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
-This is the version 4.1.0 of BLSURFPLUGIN
-Compatible with :
- - KERNEL 4.1.0
- - GUI 4.1.0
- - SMESH 4.1.0
+SALOME2 : BLSURFPLUGIN module (SMESH plugin)
--- /dev/null
+# Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+# ---
+#
+# File: Makefile.am
+#
+# ---
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+SUBDIRS = idl adm_local resources src bin
+
+DIST_SUBDIRS = idl adm_local resources src bin
+
+DISTCLEANFILES = a.out aclocal.m4 configure
+
+salomeinclude_DATA = BLSURFPLUGIN_version.h
+
+EXTRA_DIST += \
+ build_configure \
+ clean_configure
+++ /dev/null
-# Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS, L3S, LJLL, MENSI
-#
-# 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)
-# Date : 28/06/2001
-#
-
-# source path
-top_srcdir=@top_srcdir@
-top_builddir=.
-srcdir=@srcdir@
-VPATH=.:@srcdir@:@top_srcdir@/bin:@top_srcdir@/resources:./bin:@top_srcdir@/idl
-
-
-@COMMENCE@
-
-SUBDIRS = idl src adm_local
-
-RESOURCES_FILES = \
- BLSURFPlugin.xml \
- mesh_algo_BLSURF.png \
- mesh_hypo_BLSURF.png \
- mesh_tree_algo_BLSURF.png \
- mesh_tree_hypo_BLSURF.png \
- BLSURF.png
-
-BIN_SCRIPT = VERSION
-
-# copy header files in common directory ------------
-
-ifeq ($(HAVE_SSTREAM),yes)
- include_list=include/salome/SALOMEconfig.h
-else
- include_list=include/salome/SALOMEconfig.h include/salome/sstream
-endif
-
-inc: idl $(include_list)
-
-include/salome/SALOMEconfig.h: salome_adm/unix/SALOMEconfig.ref
- -$(RM) $@
- $(LN_S) ../../$< $@
-
-# test if SALOMEconfig.h has changed (contents)
-salome_adm/unix/SALOMEconfig.ref: salome_adm/unix/SALOMEconfig.h
- @if ! [ -a $@ ]; then \
- cp -p -f $< $@; \
- fi; \
- if ! cmp $< $@; then \
- cp -p -f $< $@; \
- fi; \
-
-include/salome/sstream: salome_adm/unix/sstream
- -$(RM) $@
- $(LN_S) ../../$< $@
-
-# install script in $(bindir) :
-install-bin: $(BIN_SCRIPT)
- $(INSTALL) -d $(bindir)
- if test $(BIN_SCRIPT)X != X; then \
- $(INSTALL_PROGRAM) $^ $(bindir); \
- fi
-
-# CLEAN --------------------
-
-distclean: distclean-other
-
-distclean-other:
- -$(RM) salome_adm/unix/*~ salome_adm/unix/*% salome_adm/unix/*.bak salome_adm/unix/*.new salome_adm/unix/*.old
- -$(RM) salome_adm/unix/make_*
- -$(RM) salome_adm/unix/depend salome_adm/unix/SALOMEconfig.h
- -$(RM) config.cache config.log config.status
-
-@MODULE@
-
-install: install-bin
--- /dev/null
+1) Hypothèses
+ ----------
+
+a) Une version de SALOME est installée dans le répertoire : <salome>
+
+b) Le produit BLSURF est installé dans le répertoire <salome>/BLSurf
+
+c) Le produit "decimesh" doit être dans la variable d'environnement PATH
+
+2) tgz
+ ---
+
+cd <salome>
+tar zxf BLSURFPLUGIN_SRC.tgz
+
+3) Construire le plugin BLSURF
+ ---------------------------
+
+bash
+cd <salome>
+source env_build.sh
+source BLSURFPLUGIN_SRC_3.2.4/env_blsurf.sh
+
+cd BLSURFPLUGIN_SRC_3.2.4
+./build_configure
+
+cd ..
+mkdir BLSURFPLUGIN_BUILD
+mkdir BLSURFPLUGIN_INSTALL
+cd BLSURFPLUGIN_BUILD
+../BLSURFPLUGIN_SRC_3.2.4/configure --prefix=<salome>/BLSURFPLUGIN_INSTALL
+
+# 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.
+
+make
+make install
+
+exit
+
+4) Lancer SALOME avec BLSURF
+ -------------------------
+
+bash
+cd <salome>
+
+cp BLSURFPLUGIN_SRC_3.2.4/SalomeApprc.3.2.4 ~/.SalomeApprc.<version de salome>
+# Cette copie est à faire une fois
+
+source env_products.sh
+source BLSURFPLUGIN_SRC_3.2.4/env_blsurf.sh
+
+runSalome
+
+5) Session interactive
+ -------------------
+
+a) Aller dans le module de géométrie et construire une figure simple
+
+b) Aller dans le module de maillage
+
+c) Aller dans le menu de création d'un maillage
+
+d) Choisir la figure simple comme géométrie à mailler
+
+e) Aller dans l'onglet 2D
+
+f) Choisir BLSURF
+
+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
+
+h) Cliquer OK
+
+i) Aller dans le menu de maillage et lancer l'item "Compute"
+
+j) Résultat: un maillage créer par BLSURF et visualiser dans SALOME
+
+k) Pour paramétrer BLSURF: il faut pour l'instant créer un fichier blsurf.env dans le répertoire de lancement de SALOME
+
+l) fin
+++ /dev/null
-1) Hypothèses
- ----------
-
-a) Une version de SALOME est installée dans le répertoire : <salome>
-
-b) Le produit BLSURF est installé dans le répertoire <salome>/BLSurf
-
-c) Le produit "decimesh" doit être dans la variable d'environnement PATH
-
-2) tgz
- ---
-
-cd <salome>
-tar zxf BLSURFPLUGIN_SRC.tgz
-
-3) Construire le plugin BLSURF
- ---------------------------
-
-bash
-cd <salome>
-source env_build.sh
-source BLSURFPLUGIN_SRC_3.2.4/env_blsurf.sh
-
-cd BLSURFPLUGIN_SRC_3.2.4
-./build_configure
-
-cd ..
-mkdir BLSURFPLUGIN_BUILD
-mkdir BLSURFPLUGIN_INSTALL
-cd BLSURFPLUGIN_BUILD
-../BLSURFPLUGIN_SRC_3.2.4/configure --prefix=<salome>/BLSURFPLUGIN_INSTALL
-
-# 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.
-
-make
-make install
-
-exit
-
-4) Lancer SALOME avec BLSURF
- -------------------------
-
-bash
-cd <salome>
-
-cp BLSURFPLUGIN_SRC_3.2.4/SalomeApprc.3.2.4 ~/.SalomeApprc.<version de salome>
-# Cette copie est à faire une fois
-
-source env_products.sh
-source BLSURFPLUGIN_SRC_3.2.4/env_blsurf.sh
-
-runSalome
-
-5) Session interactive
- -------------------
-
-a) Aller dans le module de géométrie et construire une figure simple
-
-b) Aller dans le module de maillage
-
-c) Aller dans le menu de création d'un maillage
-
-d) Choisir la figure simple comme géométrie à mailler
-
-e) Aller dans l'onglet 2D
-
-f) Choisir BLSURF
-
-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
-
-h) Cliquer OK
-
-i) Aller dans le menu de maillage et lancer l'item "Compute"
-
-j) Résultat: un maillage créer par BLSURF et visualiser dans SALOME
-
-k) Pour paramétrer BLSURF: il faut pour l'instant créer un fichier blsurf.env dans le répertoire de lancement de SALOME
-
-l) fin
--- /dev/null
+# Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+# ---
+#
+# File: Makefile.am
+#
+# ---
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+SUBDIRS = unix
+++ /dev/null
-# Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS, L3S, LJLL, MENSI
-#
-# 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=..
-srcdir=@srcdir@
-VPATH=.:$(srcdir)/adm_local
-
-
-all: resources
-
-install:
- cp -rf @top_srcdir@/adm_local @prefix@
-
-bin:
-
-resources :
- cp -rf @top_srcdir@/adm_local $(top_builddir)
-
-inc:
-
-lib:
-
-depend:
-
-depend_idl:
-
-install-end:
-
-install-include:
-
-install-bin:
-
-uninstall:
-
-uninstall-idl:
-
-distclean:
-
-clean:
-
-distclean-other:
-
--- /dev/null
+# Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+# ---
+#
+# File: Makefile.am
+#
+# ---
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+SUBDIRS = config_files
--- /dev/null
+# Copyright (C) 2006 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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+# ---
+#
+# File: Makefile.am
+# Author: Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
+#
+# ---
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+dist_admlocalm4_DATA = \
+ check_BLSURF.m4 \
+ check_BLSURFPLUGIN.m4
--- /dev/null
+# Copyright (C) 2006 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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+# ---
+#
+# File: check_BLSURF.m4
+# Author: Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
+#
+# ---
+
+AC_DEFUN([CHECK_BLSURF],[
+
+AC_REQUIRE([AC_PROG_CXX])dnl
+AC_REQUIRE([AC_PROG_CXXCPP])dnl
+
+AC_CHECKING(for BLSURF commercial product)
+
+AC_LANG_SAVE
+AC_LANG_CPLUSPLUS
+
+BLSURF_INCLUDES=""
+BLSURF_LIBS=""
+
+AC_ARG_WITH(blsurf,
+ [ --with-blsurf=DIR root directory path of BLSURF installation])
+
+BLSURF_ok=no
+
+if test "$with_blsurf" == "no" ; then
+ AC_MSG_FAILURE(Cannot build without BLSURF)
+elif test "$with_blsurf" == "yes" || test "$with_blsurf" == "auto"; then
+ BLSURF_HOME=""
+else
+ BLSURF_HOME="$with_blsurf"
+fi
+
+if test "$BLSURF_HOME" == "" ; then
+ if test "x$BLSURFHOME" != "x" ; then
+ BLSURF_HOME=$BLSURFHOME
+ else
+ AC_MSG_FAILURE(Cannot build without BLSURF. Use --with-blsurf option to define BLSURF installation.)
+ fi
+fi
+
+if test "x$BLSURF_HOME" != "x"; then
+
+ echo
+ echo -------------------------------------------------
+ echo You are about to choose to use somehow the
+ echo BLSURF commercial product to generate 2D mesh.
+ echo
+
+ BLSURF_INCLUDES="-I$BLSURF_HOME/include"
+ BLSURF_LIBS="-L$BLSURF_HOME/lib -lBLSurf"
+
+ CPPFLAGS_old="$CPPFLAGS"
+ CXXFLAGS_old="$CXXFLAGS"
+ CPPFLAGS="$BLSURF_INCLUDES $CPPFLAGS"
+ CXXFLAGS="$BLSURF_INCLUDES $CXXFLAGS"
+
+ AC_MSG_CHECKING(for BLSURF header file)
+
+ AC_CHECK_HEADER(distene/api.h,BLSURF_ok=yes,BLSURF_ok=no)
+
+ if test "x$BLSURF_ok" == "xyes"; then
+
+ AC_MSG_CHECKING(for BLSURF library)
+
+ LDFLAGS_old="$LDFLAGS"
+ LDFLAGS="-L. -$BLSURF_LIBS $LDFLAGS"
+
+ AC_TRY_LINK(
+ #include "distene/api.h",
+ BLSURF_init();,
+ BLSURF_ok=yes,BLSURF_ok=no
+ )
+
+ LDFLAGS="$LDFLAGS_old"
+
+ AC_MSG_RESULT($BLSURF_ok)
+ fi
+
+ CPPFLAGS="$CPPFLAGS_old"
+ CXXFLAGS="$CXXFLAGS_old"
+
+fi
+
+if test "x$BLSURF_ok" == xno ; then
+ AC_MSG_RESULT(for BLSURF: no)
+ AC_MSG_WARN(BLSURF includes or libraries are not found or are not properly installed)
+ AC_MSG_FAILURE(Cannot build without BLSURF. Use --with-blsurf option to define BLSURF installation.)
+else
+ AC_MSG_RESULT(for BLSURF: yes)
+fi
+
+AC_SUBST(BLSURF_INCLUDES)
+AC_SUBST(BLSURF_LIBS)
+
+AC_LANG_RESTORE
+
+])dnl
-AC_DEFUN([CHECK_BLSURF],[
-
-AC_REQUIRE([AC_PROG_CXX])dnl
-AC_REQUIRE([AC_PROG_CXXCPP])dnl
-
-AC_CHECKING(for BLSURF comercial product)
-
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-
-AC_ARG_WITH(,
- [ --with-BLSURF=DIR root directory path of BLSUF installation],
- BLSURF_HOME=$withval,BLSURF_HOME="")
-
-BLSURF_INCLUDES=""
-BLSURF_LIBS=""
-
-BLSURF_ok=no
-
-if test "x$BLSURF_HOME" == "x" ; then
-
-# no --with-BLSURF option used
- if test "x$BLSURFHOME" != "x" ; then
-
- # BLSURFHOME environment variable defined
- BLSURF_HOME=$BLSURFHOME
-
- fi
-#
-fi
-
-if test "x$BLSURF_HOME" != "x"; then
-
- echo
- echo -------------------------------------------------
- echo You are about to choose to use somehow the
- echo BLSURF commercial product to generate 2D mesh.
- echo
-
-
-
- BLSURF_INCLUDES="-I$BLSURF_HOME/include"
- BLSURF_LIBS="-L$BLSURF_HOME/lib -lBLSurf"
-
- CPPFLAGS_old="$CPPFLAGS"
- CXXFLAGS_old="$CXXFLAGS"
- LDFLAGS_old="$LDFLAGS"
-
- CPPFLAGS="$BLSURF_INCLUDES $CPPFLAGS"
- CXXFLAGS="$BLSURF_INCLUDES $CXXFLAGS"
- LDFLAGS="-L. -$BLSURF_LIBS $LDFLAGS"
-
- AC_MSG_CHECKING(for BLSURF header file)
-
- AC_CHECK_HEADER(distene/api.h,BLSURF_ok=yes,BLSURF_ok=no)
- if test "x$BLSURF_ok" == "xyes"; then
-
- AC_MSG_CHECKING(for BLSURF library)
-
- AC_TRY_COMPILE(#include "distene/api.h",
- BLSURF_init();
- ,BLSURF_ok=yes;
- $CXX -shared -o linopt.o -c
- ,BLSURF_ok=no)
-
- fi
-
- CPPFLAGS="$CPPFLAGS_old"
- CXXFLAGS="$CXXFLAGS_old"
- LDFLAGS="$LDFLAGS_old"
-
- if test "x$BLSURF_ok" == xno ; then
- AC_MSG_RESULT(no)
- AC_MSG_WARN(BLSURF includes or libraries are not found or are not properly installed)
- else
- AC_MSG_RESULT(yes)
- fi
-
+# Copyright (C) 2006 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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+# ---
+#
+# File: check_BLSURFPLUGIN.m4
+# Author: Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
+#
+# ---
+
+AC_DEFUN([CHECK_BLSURFPLUGIN],[
+
+AC_CHECKING(for BLSURF mesh plugin)
+
+BLSURFplugin_ok=no
+
+BLSURFPLUGIN_LDFLAGS=""
+BLSURFPLUGIN_CXXFLAGS=""
+
+AC_ARG_WITH(BLSURFplugin,
+ [ --with-BLSURFplugin=DIR root directory path of BLSURF mesh plugin installation ])
+
+if test "$with_BLSURFplugin" != "no" ; then
+ if test "$with_BLSURFplugin" == "yes" || test "$with_BLSURFplugin" == "auto"; then
+ if test "x$BLSURFPLUGIN_ROOT_DIR" != "x" ; then
+ BLSURFPLUGIN_DIR=$BLSURFPLUGIN_ROOT_DIR
+ fi
+ else
+ BLSURFPLUGIN_DIR="$with_BLSURFplugin"
+ fi
+
+ if test "x$BLSURFPLUGIN_DIR" != "x" ; then
+ if test -f ${BLSURFPLUGIN_DIR}/lib${LIB_LOCATION_SUFFIX}/salome/libBLSURFEngine.so ; then
+ BLSURFplugin_ok=yes
+ AC_MSG_RESULT(Using BLSURF mesh plugin distribution in ${BLSURFPLUGIN_DIR})
+ BLSURFPLUGIN_ROOT_DIR=${BLSURFPLUGIN_DIR}
+ BLSURFPLUGIN_LDFLAGS=-L${BLSURFPLUGIN_DIR}/lib${LIB_LOCATION_SUFFIX}/salome
+ BLSURFPLUGIN_CXXFLAGS=-I${BLSURFPLUGIN_DIR}/include/salome
+ else
+ AC_MSG_WARN("Cannot find compiled BLSURF mesh plugin distribution")
+ fi
+ else
+ AC_MSG_WARN("Cannot find compiled BLSURF mesh plugin distribution")
+ fi
fi
-AC_SUBST(BLSURF_INCLUDES)
-AC_SUBST(BLSURF_LIBS)
-
-AC_LANG_RESTORE
+AC_MSG_RESULT(for BLSURF mesh plugin: $BLSURFplugin_ok)
+AC_SUBST(BLSURFPLUGIN_ROOT_DIR)
+AC_SUBST(BLSURFPLUGIN_LDFLAGS)
+AC_SUBST(BLSURFPLUGIN_CXXFLAGS)
+
])dnl
+++ /dev/null
-# common directories to put headerfiles
-inc_builddir=$(top_builddir)/include/salome
-
-@SET_MAKE@
-SHELL=/bin/sh
-
-# header missing
-
-HAVE_SSTREAM=@HAVE_SSTREAM@
-
-
-LIBS=@LIBS@
-LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib/salome -Xlinker -rpath-link -Xlinker $(top_builddir)/lib/salome
-# add libstdc++ to link c++ library with libtool !
-LDFLAGS+= -lstdc++
-
-CP=@CP@
-
-# CPP
-
-CPP=@CPP@
-CXXCPP=@CXXCPP@
-CPPFLAGS=@CPPFLAGS@ -I$(inc_builddir) -I$(srcdir) -I.
-
-# C
-
-CC = @CC@
-CFLAGS = @CFLAGS@
-C_DEPEND_FLAG = @C_DEPEND_FLAG@
-
-# C++
-
-CXX = @CXX@
-CXXFLAGS = @CXXFLAGS@
-CXX_DEPEND_FLAG = @CXX_DEPEND_FLAG@
-
-# BOOST Library
-
-BOOST_CPPFLAGS = @BOOST_CPPFLAGS@
-
-# JAVA
-
-JAVA_INCLUDES = @JAVA_INCLUDES@
-JAVA_LIBS = @JAVA_LIBS@
-JAVA_LDPATH = @JAVA_LDPATH@
-
-# PYTHON
-
-PYTHON = @PYTHON@
-PYTHONHOME = @PYTHONHOME@
-PYTHON_INCLUDES = @PYTHON_INCLUDES@
-PYTHON_LIBS = @PYTHON_LIBS@
-PYTHON_VERSION = @PYTHON_VERSION@
-PYTHON_SITE = @PYTHON_SITE@
-PYTHON_SITE_INSTALL = @PYTHON_SITE_INSTALL@
-
-# QT
-
-QT_ROOT = @QT_ROOT@
-QT_INCLUDES = @QT_INCLUDES@
-QT_MT_INCLUDES = @QT_INCLUDES@ -DQT_THREAD_SUPPORT
-QT_LIBS = @QT_LIBS@
-QT_MT_LIBS = @QT_MT_LIBS@
-
-MOC = @MOC@
-UIC = @UIC@
-MSG2QM = @MSG2QM@
-
-#QWT
-
-QWT_INCLUDES=@QWT_INCLUDES@
-QWT_LIBS=@QWT_LIBS@
-
-# SIP
-SIP = @SIP@
-SIP_INCLUDES = @SIP_INCLUDES@
-SIP_LIBS = @SIP_LIBS@
-
-# PYQT
-PYQT_SIPS = @PYQT_SIPS@
-PYQT_LIBS = @PYQT_LIBS@
-
-# openGL
-OGL_INCLUDES=@OGL_INCLUDES@
-OGL_LIBS=@OGL_LIBS@
-
-# VTK
-VTK_INCLUDES=@VTK_INCLUDES@
-VTK_LIBS=@VTK_LIBS@
-
-# HDF5
-
-HDF5_INCLUDES=@HDF5_INCLUDES@
-HDF5_LIBS=@HDF5_LIBS@
-HDF5_MT_LIBS=@HDF5_MT_LIBS@
-
-# OpenCasCade
-
-OCC_INCLUDES=@CAS_CPPFLAGS@
-OCC_CXXFLAGS=@CAS_CXXFLAGS@
-
-OCC_KERNEL_LIBS=@CAS_KERNEL@
-OCC_OCAF_LIBS=@CAS_OCAF@
-OCC_VIEWER_LIBS=@CAS_VIEWER@
-OCC_MODELER_LIBS=@CAS_MODELER@
-OCC_DATAEXCHANGE_LIBS=@CAS_DATAEXCHANGE@
-OCC_LIBS=@CAS_LDFLAGS@
-OCC_LDPATH=@CAS_LDPATH@
-
-# MPICH
-
-MPICH_INCLUDES=@MPICH_INCLUDES@
-MPICH_LIBS=@MPICH_LIBS@
-
-# Swig C++ Python
-
-SWIG = @SWIG@
-SWIG_FLAGS = @SWIG_FLAGS@ -I$(inc_builddir) -I$(srcdir) -I.
-
-# OMNIORB
-
-OMNIORB_ROOT = @OMNIORB_ROOT@
-OMNIORB_INCLUDES = @OMNIORB_INCLUDES@
-OMNIORB_LIBS = @OMNIORB_LIBS@
-OMNIORB_CXXFLAGS = @OMNIORB_CXXFLAGS@
-
-OMNIORB_IDL = @OMNIORB_IDL@
-OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@
-OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -I$(srcdir) -I$(KERNEL_ROOT_DIR)/idl/salome \
- -I$(GEOM_ROOT_DIR)/idl/salome -I$(MED_ROOT_DIR)/idl/salome\
- -I$(SMESH_ROOT_DIR)/idl/salome
-
-OMNIORB_IDL_CLN_H = @OMNIORB_IDL_CLN_H@
-OMNIORB_IDL_CLN_CXX = @OMNIORB_IDL_CLN_CXX@
-OMNIORB_IDL_CLN_OBJ = @OMNIORB_IDL_CLN_OBJ@
-
-OMNIORB_IDL_SRV_H = @OMNIORB_IDL_SRV_H@
-OMNIORB_IDL_SRV_CXX = @OMNIORB_IDL_SRV_CXX@
-OMNIORB_IDL_SRV_OBJ = @OMNIORB_IDL_SRV_OBJ@
-
-# Default ORB
-
-CORBA_ROOT = @CORBA_ROOT@
-CORBA_INCLUDES = @CORBA_INCLUDES@
-CORBA_LIBS = @CORBA_LIBS@
-CORBA_CXXFLAGS = @CORBA_CXXFLAGS@
-
-IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(srcdir) -I$(KERNEL_ROOT_DIR)/idl/salome \
- -I$(GEOM_ROOT_DIR)/idl/salome -I$(MED_ROOT_DIR)/idl/salome\
- -I$(SMESH_ROOT_DIR)/idl/salome
-IDLPYFLAGS = @IDLPYFLAGS@
-
-IDL = @IDL@
-
-IDL_CLN_H = @IDL_CLN_H@
-IDL_CLN_CXX = @IDL_CLN_CXX@
-IDL_CLN_OBJ = @IDL_CLN_OBJ@
-
-IDL_SRV_H = @IDL_SRV_H@
-IDL_SRV_CXX = @IDL_SRV_CXX@
-IDL_SRV_OBJ = @IDL_SRV_OBJ@
-
-CPPFLAGS+= $(CORBA_INCLUDES)
-CXXFLAGS+= $(CORBA_CXXFLAGS)
-
-# SALOME
-
-SALOME_INCLUDES = \
- -I$(KERNEL_ROOT_DIR)/include/salome \
- -I$(GEOM_ROOT_DIR)/include/salome \
- -I$(SMESH_ROOT_DIR)/include/salome
-
-CPPFLAGS += -DSOLIDGEOM -DLINUX $(OCC_INCLUDES) $(SALOME_INCLUDES) $(BOOST_CPPFLAGS)
-CXXFLAGS += -DSOLIDGEOM -DLINUX $(OCC_CXXFLAGS) $(SALOME_INCLUDES)
-
-LDFLAGS += -L${KERNEL_ROOT_DIR}/lib@LIB_LOCATION_SUFFIX@/salome -L${SMESH_ROOT_DIR}/lib@LIB_LOCATION_SUFFIX@/salome -L${GEOM_ROOT_DIR}/lib@LIB_LOCATION_SUFFIX@/salome -lSMESHimpl -lSMESHEngine -lStdMeshers -lStdMeshersEngine -lSalomeGenericObj
-
-# add corba libs when link salome application !
-#LDFLAGS+= $(CORBA_LIBS)
-LIBS+=$(CORBA_LIBS)
-
-## Shared libraries
-LT_STATIC_EXEC=@LT_STATIC_EXEC@
-DYNAMIC_DIRS=@DYNAMIC_DIRS@
-LT_LIB=libtool
-LT=$(top_builddir)/libtool
-LT_COMPILE=$(LT) --mode=compile $(CC)
-LT_LINK_LIB=$(LT_LIB) --mode=link $(CC) -rpath $(libdir)
-LT_LINK_EXE=$(LT) --mode=link $(CC) $(LT_STATIC_EXEC) -dlopen self -rpath $(bindir) $(DYNAMIC_DIRS)
-LT_RUN=$(LT) --mode=execute
-LT_INSTALL_PROG=$(LT) --mode=install $(INSTALL_PROGRAM)
-LT_INSTALL_LIB=$(LT) --mode=install $(INSTALL_DATA)
-LT_UNINSTALL=$(LT) --mode=uninstall $(RM)
-
-INSTALL=@INSTALL@
-INSTALL_PROGRAM=@INSTALL_PROGRAM@
-INSTALL_DATA=@INSTALL_DATA@
-
-# create a symbolic link (or a copie ?)
-LN_S=@LN_S@
-
-## Installation points
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-bindir=@bindir@/salome
-libdir=@libdir@@LIB_LOCATION_SUFFIX@/salome
-# warning : if user give this path in configure we could have salome/salome :-(
-includedir=@includedir@/salome
-datadir=@datadir@/salome
-idldir=$(prefix)/idl/salome
-sharedpydir=@libdir@@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages/salome/shared_modules
-
-docdir=${prefix}/doc/salome
-
-#
-# begin of package rules
-#
-
-.PHONY: all lib bin inc resources docs tests install uninstall dep depend depend_idl cleandep mostlyclean clean distclean
-
-.SUFFIXES: .cxx .cc .c .f .o .lo .idl .py .i .ui .po .qm
-
-all:
- $(MAKE) inc
- $(MAKE) depend_idl
- $(MAKE) depend
- $(MAKE) lib
- $(MAKE) bin
- $(MAKE) resources
-
-#
-# add target to build administrative files
-#
-
-Makefile: $(top_builddir)/config.status $(srcdir)/Makefile.in
- cd $(top_builddir) ; ./config.status
-
-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 :-)
-ifneq ($(top_srcdir),$(srcdir))
-configure: $(top_srcdir)/configure
-endif
-
-$(top_srcdir)/configure: $(top_srcdir)/configure.in $(top_srcdir)/aclocal.m4
- cd $(top_srcdir) ; autoconf
-
-$(top_srcdir)/configure.in: $(top_srcdir)/configure.in.base
- cd $(top_srcdir) && ./build_configure
-
-
-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 \
-ac_cxx_namespaces.m4 check_omniorb.m4 pyembed.m4 \
-ac_cxx_partial_specialization.m4 python.m4 \
-ac_cxx_typename.m4 check_pthreads.m4 check_cas.m4 \
-ac_cc_warnings.m4 check_swig.m4 check_boost.m4
-
-ACLOCAL_GEOM = check_GEOM.m4
-
-ACLOCAL_SMESH = check_SMESH.m4
-
-ifeq ($(BLSURFPLUGIN_WITH_GUI),yes)
-ACLOCAL_GUI = \
-check_vtk.m4 check_opengl.m4 check_qt.m4 \
-check_GUI.m4 check_corba_in_GUI.m4
-
-$(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 -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
-endif
-
-ifeq ($(BLSURFPLUGIN_WITH_GUI),no)
-$(top_srcdir)/aclocal.m4: $(ACLOCAL_KERNEL%=@KERNEL_ROOT_DIR@/salome_adm/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 -I adm_local/unix/config_files \
- -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files \
- -I @GEOM_ROOT_DIR@/adm_local/unix/config_files \
- -I @SMESH_ROOT_DIR@/adm_local/unix/config_files
-endif
$(MOC) $< -o $@
# qm-files generation
-%.qm: %.po
- $(MSG2QM) $< $@
+%.qm: %.ts
+ $(LRELEASE) $< -qm $@
-EXTRA_DIST=$(MOC_FILES:%_moc.cxx=%.h) $(nodist_salomeres_DATA:%.qm=%.po)
+EXTRA_DIST=$(MOC_FILES:%_moc.cxx=%.h) $(nodist_salomeres_DATA:%.qm=%.ts)
mostlyclean-local:
rm -f @builddir@/*_moc.cxx
+++ /dev/null
-#=======================================================================
-# Begin specific part to omniorb
-# (include from file adm/unix/make_omniorb generated by
-# adm/unix/make_omniorb.in)
-#=======================================================================
-# -* Makefile *-
-#
-# Author : Patrick GOLDBRONN (CEA)
-# Date : 29/06/2001
-#
-
-# Client and server object are the same with omniorb
-# There are one header file and one source file generate
-
-#IDLOBJ=$(IDLSRC:%.idl=%$(IDL_CLN_OBJ))
-
-# dependancies between idl and it's generated files
-%$(OMNIORB_IDL_CLN_CXX) %$(OMNIORB_IDL_CLN_H): ${KERNEL_ROOT_DIR}/idl/salome/%.idl
- $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $<
-
-%$(OMNIORB_IDL_CLN_CXX) %$(OMNIORB_IDL_CLN_H): ${GEOM_ROOT_DIR}/idl/salome/%.idl
- $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $<
-
-#%$(OMNIORB_IDL_CLN_CXX) %$(OMNIORB_IDL_CLN_H): ${MED_ROOT_DIR}/idl/salome/%.idl
-# $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $<
-
-%$(OMNIORB_IDL_CLN_CXX) %$(OMNIORB_IDL_CLN_H): ${SMESH_ROOT_DIR}/idl/salome/%.idl
- $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $<
-
-%$(OMNIORB_IDL_CLN_CXX) %$(OMNIORB_IDL_CLN_H): ${top_builddir}/idl/salome/%.idl
- $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $<
-
-# dependncies between idl files
-depend_idl: .depidl
-
-# we use cpp to generate dependencies between idl files.
-# we change cpp output to keep only idl file and transform it to get a suitable rule
-.depidl: $(IDL_FILES)
- @touch $@
- @for dep in $? dummy; do \
- if [ $$dep != "dummy" ]; then \
- echo Building dependencies for $$dep; \
- basedep=`basename $$dep .idl`; \
- header="$$basedep"$(IDL_CLN_H); \
- sed '\%^'"$$header"':%,\%[^\\]$$%d' <$@ >$@- && mv $@- $@; \
- $(CPP) $(C_DEPEND_FLAG) -I$(srcdir) $$dep 2>/dev/null | \
- sed `echo "s%$$basedep\\.idl%$$header:%g"` | \
- sed 's% $(srcdir)/% %g' | \
- sed 's% $(top_srcdir)/% %g' | \
- sed 's% $(top_builddir)/% %g' | \
- sed 's%^.*:\.o: *%%' | sed 's%^ *\\ *%%'| sed 's%^ *\(.*\):%\1:%' | \
- sed 's/\.idl/$(IDL_CLN_H)/' >>$@; \
- echo '' >>$@; \
- fi; \
- done ;
-
--include .depidl
-
-#=======================================================================
-# End specific part to omniorb
-#=======================================================================
--- /dev/null
+# Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+# ---
+#
+# File: Makefile.am
+#
+# ---
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+nodist_salomescript_DATA = VERSION
+
+EXTRA_DIST += VERSION.in
+++ /dev/null
-THIS IS SALOME - BLSURFPLUGIN VERSION: 4.1.0
--- /dev/null
+THIS IS SALOME - BLSURFPLUGIN VERSION: @VERSION@
# Test if the GUI_ROOT_DIR is set correctly
if test ${BLSURFPLUGIN_WITH_GUI} = yes; then
- if test ! -d "${GUI_ROOT_DIR}"; then
- echo "failed : GUI_ROOT_DIR variable is not correct !"
- exit
- fi
+ if test ! -d "${GUI_ROOT_DIR}"; then
+ echo "failed : GUI_ROOT_DIR variable is not correct !"
+ exit
+ fi
fi
########################################################################
exit
fi
-########################################################################
-# find_in - utility function
-#
-# usage :
-# find_in directory filename
-#
-# Finds files following the *.in pattern, recursively in the
-# directory (first argument).
-# Results are appended into the file (second argument)
-#
-# Difference from the standard unix find is that files are tested
-# before directories
-#
-
-find_in()
-{
- local i
- local f=$2
-
-# if the first argument is not a directory, returns
-
- if [ ! -d "$1" ] ; then
- return
- fi
-
-# dont look in the CVS directories
-
- case $1 in
- */CVS) return ;;
- */adm_local/*) return ;;
- *) ;;
- esac
-
-# for each regular file contained in the directory
-# test if it's a .in file
-
- for i in "$1"/*
- do
- if [ -f "$i" ] ; then
- case $i in
- *.in) echo " "$i" \\" >> $f;;
- *) ;;
- esac
- fi
- done
-
-# for each subdirectory of the first argument, proceeds recursively
-
- for i in "$1"/*
- do
- if [ -d "$i" ] ; then
- find_in "$i" "$f"
- fi
- done
-}
-
-
-#######################################################################
-# Generate list of .in files (Makefile.in, config.h.in, etc)
-# appending it in file configure.in
-
cd ${CONF_DIR}
ABS_CONF_DIR=`pwd`
-#
-# Common part of the configure.in file
-#
-chmod u+w configure.in.base
-if ! \cp -f configure.in.base configure.in_tmp1
-then
- echo
- echo "error : can't create files in" ${CONF_DIR}
- echo "aborting ..."
- chmod u-w configure.in.base
- exit
-fi
-chmod u-w configure.in.base
-
-if [ -e "${CONF_DIR}/salome_adm" ] ; then
- \rm -f ${CONF_DIR}/salome_adm
-fi
-
-# make a link allowing AC_OUTPUT to find the salome_adm/.../*.in files
-echo "" >> configure.in_tmp1
-echo 'ln -fs ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/.' >> configure.in_tmp1
-
-echo "" >> configure.in_tmp1
-echo "AC_OUTPUT([ \\" >> configure.in_tmp1
-
-#
-# List of .in files in the adm/unix directory
-# These files MUST be on top of AC_OUTPUT list so we
-# put them "manually"
-#
-
-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:${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:${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
-
-\rm -f configure.in_tmp2 configure.in_tmp3
-touch configure.in_tmp2
-find_in . configure.in_tmp2
-sed -e '/^...salome_adm/d' configure.in_tmp2 > configure.in_tmp3
-sed -e '/^...adm_local.unix.make_omniorb/d' configure.in_tmp3 configure.in_tmp2
-sed -e '/^...adm_local.unix.make_commence/d' configure.in_tmp2 > configure.in_tmp3
-sed -e '/configure.in/d' configure.in_tmp3 > configure.in_tmp2
-sed -e 's/.in / /' configure.in_tmp2 >> configure.in_tmp1
-#sed '/^.salome_adm/d' configure.in_tmp2 > configure.in_tmp3
-#sed '/configure.in/d' configure.in_tmp3 > configure.in_tmp2
-#sed 's/.in / /' configure.in_tmp2 >> configure.in_tmp1
-
-echo "])" >> configure.in_tmp1
-
-# delete the link created for AC_OUTPUT
-echo "" >> configure.in_tmp1
-#echo 'rm -f ${ROOT_SRCDIR}/salome_adm' >> configure.in_tmp1
-\mv configure.in_tmp1 configure.in_new
-\rm -f configure.in_tmp2 configure.in_tmp3
-
-
-########################################################################
-# Create new (or replace old) configure.in file
-# Print a message if the file is write protected
-#
-
-echo
-if test ! -f configure.in
-then
- echo -n "Creating new file 'configure.in' ... "
- if \mv configure.in_new configure.in >& /dev/null
- then
- echo "done"
- else
- echo "error, check your file permissions"
- fi
-else
- echo -n "Updating 'configure.in' file ... "
- if ! \cp configure.in configure.in_old >& /dev/null
- then
- echo
- echo
- echo "Can't backup previous configure.in"
- echo -n "Continue (you will not be able to revert) - (Y/N) ? "
- read R
- case "x$R" in
- xn*) exit;;
- xN*) exit;;
- esac
- echo
- echo -n " "
- fi
- if \cp configure.in_new configure.in >& /dev/null
- then
- echo "done"
- else
- echo
- echo "error, can't update previous configure.in"
- fi
-fi
-
-########################################################################
-# Use autoconf to rebuild the configure script
-#
-
-if test -f configure
-then
- echo -n "Updating 'configure' script ... "
-else
- echo -n "Creating 'configure' script ... "
-fi
+#######################################################################
+# Update configure.ac script: to set BLSURFPLUGIN_WITH_GUI variable
+sed -e s/BLSURFPLUGIN_WITH_GUI=[a-z]*/BLSURFPLUGIN_WITH_GUI=${BLSURFPLUGIN_WITH_GUI}/g configure.ac > configure.tmp
+mv -f configure.tmp configure.ac
+
+mkdir -p salome_adm/unix/config_files
+#cp -f ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files/* salome_adm/unix/config_files
+#cp -f ${KERNEL_ROOT_DIR}/salome_adm/unix/pythonbe.py salome_adm/unix
+
+cp -f ${KERNEL_ROOT_DIR}/salome_adm/unix/SALOMEconfig.h.in salome_adm/unix
+
+#cp -f ${GUI_ROOT_DIR}/adm_local/unix/config_files/* salome_adm/unix/config_files
+#cp -f ${MED_ROOT_DIR}/adm_local/unix/config_files/* salome_adm/unix/config_files
+#cp -f ${GEOM_ROOT_DIR}/adm_local/unix/config_files/* salome_adm/unix/config_files
+#cp -f ${SMESH_ROOT_DIR}/adm_local/unix/config_files/* salome_adm/unix/config_files
+
+# remove KERNEL deprecated configure files
+#for deprecated in ac_cc_warnings.m4 ac_cxx_partial_specialization.m4 \
+# check_mico.m4 config.guess ltmain.sh ac_cxx_bool.m4 ltconfig ac_cxx_typename.m4 \
+# check_pthreads.m4 config.sub libtool.m4 ac_cxx_mutable.m4 missing
+# do
+# rm -f salome_adm/unix/config_files/${deprecated}
+# done
+
+
+# ____________________________________________________________________
+# aclocal creates the aclocal.m4 file from the standard macro and the
+# custom macro embedded in the directory salome_adm/unix/config_files
+# and KERNEL config_files directory.
+# output:
+# aclocal.m4
+# autom4te.cache (directory)
+echo "====================================================== aclocal"
if test ${BLSURFPLUGIN_WITH_GUI} = yes; then
aclocal -I adm_local/unix/config_files \
-I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \
- -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files/DEPRECATED \
-I ${GUI_ROOT_DIR}/adm_local/unix/config_files \
-I ${MED_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
+ -I ${SMESH_ROOT_DIR}/adm_local/unix/config_files || exit 1
else
aclocal -I adm_local/unix/config_files \
-I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \
- -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files/DEPRECATED \
-I ${MED_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
-fi
-
-if autoconf
-then
- echo "done"
-else
- echo "failed (check file permissions and/or user quotas ...)"
+ -I ${SMESH_ROOT_DIR}/adm_local/unix/config_files || exit 1
fi
-cd ${ORIG_DIR}
-
-echo
+# ____________________________________________________________________
+# libtoolize creates some configuration files (ltmain.sh,
+# config.guess and config.sub). It only depends on the libtool
+# version. The files are created in the directory specified with the
+# AC_CONFIG_AUX_DIR(<mydir>) tag (see configure.ac).
+# output:
+# salome_adm/unix/config_files/config.guess
+# salome_adm/unix/config_files/config.sub
+# salome_adm/unix/config_files/ltmain.sh
+#echo "====================================================== libtoolize"
+
+libtoolize --force --copy --automake || exit 1
+
+# ____________________________________________________________________
+# autoconf creates the configure script from the file configure.ac (or
+# configure.in if configure.ac doesn't exist)
+# output:
+# configure
+echo "====================================================== autoconf"
+
+autoconf
+
+# ____________________________________________________________________
+# automake creates some scripts used in building process
+# (install-sh, missing, ...). It only depends on the automake
+# version. The files are created in the directory specified with the
+# AC_CONFIG_AUX_DIR(<mydir>) tag (see configure.ac). This step also
+# creates the Makefile.in files from the Makefile.am files.
+# output:
+# salome_adm/unix/config_files/compile
+# salome_adm/unix/config_files/depcomp
+# salome_adm/unix/config_files/install-sh
+# salome_adm/unix/config_files/missing
+# salome_adm/unix/config_files/py-compile
+# Makefile.in (from Makefile.am)
+echo "====================================================== automake"
+
+automake --copy --gnu --add-missing
--- /dev/null
+#!/bin/sh
+
+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
+find idl -name Makefile.in | xargs rm -f
+find resources -name Makefile.in | xargs rm -f
+find salome_adm -name Makefile.in | xargs rm -f
+find src -name Makefile.in | xargs rm -f
+rm -f Makefile.in
--- /dev/null
+#
+# PLEASE DO NOT MODIFY configure.in FILE
+#
+# ALL CHANGES WILL BE DISCARDED BY THE NEXT
+# build_configure COMMAND
+#
+# CHANGES MUST BE MADE IN configure.in.base FILE
+#
+#
+# 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
+#
+
+AC_INIT([Salome2 Project BLSURFPLUGIN module], [5.0.0], [webmaster.salome@opencascade.com], [salome])
+AC_CONFIG_AUX_DIR(salome_adm/unix/config_files)
+AC_CANONICAL_HOST
+AC_CANONICAL_TARGET
+AM_INIT_AUTOMAKE
+
+XVERSION=`echo $VERSION | awk -F. '{printf("0x%02x%02x%02x",$1,$2,$3)}'`
+AC_SUBST(XVERSION)
+
+# set up MODULE_NAME variable for dynamic construction of directories (resources, etc.)
+MODULE_NAME=blsurfplugin
+AC_SUBST(MODULE_NAME)
+
+dnl
+dnl Initialize source and build root directories
+dnl
+
+ROOT_BUILDDIR=`pwd`
+ROOT_SRCDIR=`echo $0 | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"`
+cd $ROOT_SRCDIR
+ROOT_SRCDIR=`pwd`
+cd $ROOT_BUILDDIR
+
+AC_SUBST(ROOT_SRCDIR)
+AC_SUBST(ROOT_BUILDDIR)
+
+echo
+echo Source root directory : $ROOT_SRCDIR
+echo Build root directory : $ROOT_BUILDDIR
+echo
+echo
+
+if test -z "$AR"; then
+ AC_CHECK_PROGS(AR,ar xar,:,$PATH)
+fi
+AC_SUBST(AR)
+
+dnl Export the AR macro so that it will be placed in the libtool file
+dnl correctly.
+export AR
+
+echo
+echo ---------------------------------------------
+echo testing make
+echo ---------------------------------------------
+echo
+
+AC_PROG_MAKE_SET
+AC_PROG_INSTALL
+dnl
+dnl libtool macro check for CC, LD, NM, LN_S, RANLIB, STRIP + pour les librairies dynamiques !
+
+AC_ENABLE_DEBUG(yes)
+AC_DISABLE_PRODUCTION
+
+echo ---------------------------------------------
+echo testing libtool
+echo ---------------------------------------------
+
+dnl first, we set static to no!
+dnl if we want it, use --enable-static
+AC_ENABLE_STATIC(no)
+
+AC_LIBTOOL_DLOPEN
+AC_PROG_LIBTOOL
+
+dnl Fix up the INSTALL macro if it s a relative path. We want the
+dnl full-path to the binary instead.
+case "$INSTALL" in
+ *install-sh*)
+ INSTALL='\${KERNEL_ROOT_DIR}'/salome_adm/unix/config_files/install-sh
+ ;;
+esac
+
+echo
+echo ---------------------------------------------
+echo testing C/C++
+echo ---------------------------------------------
+echo
+
+cc_ok=no
+dnl inutil car libtool
+dnl AC_PROG_CC
+AC_PROG_CXX
+AC_DEPEND_FLAG
+# AC_CC_WARNINGS([ansi])
+cc_ok=yes
+
+echo
+echo ---------------------------------------------
+echo testing Fortran
+echo ---------------------------------------------
+echo
+
+fortran_ok=no
+AC_PROG_F77
+AC_F77_LIBRARY_LDFLAGS
+AC_PROG_FC
+AC_FC_LIBRARY_LDFLAGS
+if test "X$FC" != "X" ; then
+ fortran_ok=yes
+fi
+
+dnl Library libdl :
+AC_CHECK_LIB(dl,dlopen)
+
+dnl add library libm :
+AC_CHECK_LIB(m,ceil)
+
+dnl
+dnl Well we use sstream which is not in gcc pre-2.95.3
+dnl We must test if it exists. If not, add it in include !
+dnl
+
+AC_CXX_HAVE_SSTREAM
+
+echo
+echo ---------------------------------------------
+echo BOOST Library
+echo ---------------------------------------------
+echo
+
+CHECK_BOOST
+
+dnl
+dnl ---------------------------------------------
+dnl testing MPICH
+dnl ---------------------------------------------
+dnl
+
+CHECK_MPICH
+
+echo
+echo ---------------------------------------------
+echo testing LEX \& YACC
+echo ---------------------------------------------
+echo
+
+lex_yacc_ok=no
+AC_PROG_YACC
+AC_PROG_LEX
+lex_yacc_ok=yes
+
+echo
+echo ---------------------------------------------
+echo testing python
+echo ---------------------------------------------
+echo
+
+CHECK_PYTHON
+
+AM_PATH_PYTHON(2.3)
+
+dnl echo
+dnl echo ---------------------------------------------
+dnl echo testing java
+dnl echo ---------------------------------------------
+dnl echo
+
+dnl CHECK_JAVA
+
+echo
+echo ---------------------------------------------
+echo testing swig
+echo ---------------------------------------------
+echo
+
+CHECK_SWIG
+
+echo
+echo ---------------------------------------------
+echo testing threads
+echo ---------------------------------------------
+echo
+
+ENABLE_PTHREADS
+
+echo
+echo ---------------------------------------------
+echo testing omniORB
+echo ---------------------------------------------
+echo
+
+CHECK_OMNIORB
+
+dnl echo
+dnl echo ---------------------------------------------
+dnl echo testing mico
+dnl echo ---------------------------------------------
+dnl echo
+
+dnl CHECK_MICO
+
+echo
+echo ---------------------------------------------
+echo default ORB : omniORB
+echo ---------------------------------------------
+echo
+
+DEFAULT_ORB=omniORB
+CHECK_CORBA
+
+AC_SUBST_FILE(CORBA)
+corba=make_$ORB
+CORBA=adm_local/unix/$corba
+
+BLSURFPLUGIN_WITH_GUI=yes
+
+AM_CONDITIONAL(BLSURFPLUGIN_ENABLE_GUI, [test "${BLSURFPLUGIN_WITH_GUI}" = "yes"])
+
+if test "${BLSURFPLUGIN_WITH_GUI}" = "yes"; then
+ echo
+ echo ---------------------------------------------
+ echo testing openGL
+ echo ---------------------------------------------
+ echo
+
+ CHECK_OPENGL
+
+ echo
+ echo ---------------------------------------------
+ echo testing QT
+ echo ---------------------------------------------
+ echo
+
+ CHECK_QT
+
+ echo
+ echo ---------------------------------------------
+ echo testing VTK
+ echo ---------------------------------------------
+ echo
+
+ CHECK_VTK
+
+ echo
+ echo ---------------------------------------------
+ echo Testing GUI
+ echo ---------------------------------------------
+ echo
+
+ CHECK_SALOME_GUI
+
+ echo
+ echo ---------------------------------------------
+ echo Testing full GUI
+ echo ---------------------------------------------
+ echo
+
+ CHECK_CORBA_IN_GUI
+ if test "x${CORBA_IN_GUI}" != "xyes"; then
+ echo "failed : For configure BLSURFPLUGIN module necessary full GUI !"
+ exit
+ fi
+fi
+
+echo
+echo ---------------------------------------------
+echo testing HDF5
+echo ---------------------------------------------
+echo
+
+CHECK_HDF5
+
+echo
+echo ---------------------------------------------
+echo Testing OpenCascade
+echo ---------------------------------------------
+echo
+
+CHECK_CAS
+
+echo
+echo ---------------------------------------------
+echo Testing html generators
+echo ---------------------------------------------
+echo
+
+CHECK_HTML_GENERATORS
+
+echo
+echo ---------------------------------------------
+echo Testing BLSURF
+echo ---------------------------------------------
+echo
+
+CHECK_BLSURF
+
+echo
+echo ---------------------------------------------
+echo Testing Kernel
+echo ---------------------------------------------
+echo
+
+CHECK_KERNEL
+
+echo
+echo ---------------------------------------------
+echo Testing Geom
+echo ---------------------------------------------
+echo
+
+CHECK_GEOM
+
+echo
+echo ---------------------------------------------
+echo Testing Med
+echo ---------------------------------------------
+echo
+
+CHECK_MED
+
+echo
+echo ---------------------------------------------
+echo Testing SMesh
+echo ---------------------------------------------
+echo
+
+CHECK_SMESH
+
+echo
+echo ---------------------------------------------
+echo Summary
+echo ---------------------------------------------
+echo
+
+#AM_CONDITIONAL( USE_GFORTRAN, [test "$F77" = "gfortran"])
+
+echo Configure
+if test "${BLSURFPLUGIN_WITH_GUI}" = "yes"; then
+variables="cc_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok omniORB_ok occ_ok doxygen_ok graphviz_ok Kernel_ok Geom_ok Med_ok SMesh_ok SalomeGUI_ok BLSURF_ok"
+fi
+if test "${BLSURFPLUGIN_WITH_GUI}" = "no"; then
+variables="cc_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok hdf5_ok omniORB_ok occ_ok doxygen_ok graphviz_ok Kernel_ok Geom_ok Med_ok SMesh_ok BLSURF_ok"
+fi
+
+for var in $variables
+do
+ printf " %10s : " `echo \$var | sed -e "s,_ok,,"`
+ eval echo \$$var
+done
+
+echo
+echo "Default ORB : $DEFAULT_ORB"
+echo
+
+dnl We don t need to say when we re entering directories if we re using
+dnl GNU make becuase make does it for us.
+if test "X$GMAKE" = "Xyes"; then
+ AC_SUBST(SETX) SETX=":"
+else
+ AC_SUBST(SETX) SETX="set -x"
+fi
+
+dnl copy shells and utilities contained in the bin directory
+dnl excluding .in files (treated in AC-OUTPUT below) and CVS
+dnl directory
+
+echo
+echo ---------------------------------------------
+echo generating Makefiles and configure files
+echo ---------------------------------------------
+echo
+
+#AC_OUTPUT_COMMANDS([ \
+# chmod +x ./bin/*; \
+# chmod +x ./bin/salome/*;
+#])
+
+# This list is initiated using autoscan and must be updated manually
+# when adding a new file <filename>.in to manage. When you execute
+# autoscan, the Makefile list is generated in the output file configure.scan.
+# This could be helpfull to update de configuration.
+AC_OUTPUT([ \
+ ./salome_adm/unix/SALOMEconfig.h \
+ ./adm_local/Makefile \
+ ./adm_local/unix/Makefile \
+ ./adm_local/unix/config_files/Makefile \
+ ./bin/VERSION \
+ ./bin/Makefile \
+ ./idl/Makefile \
+ ./resources/Makefile \
+ ./src/Makefile \
+ ./src/BLSURFPlugin/Makefile \
+ ./src/GUI/Makefile \
+ ./BLSURFPLUGIN_version.h \
+ Makefile \
+])
+++ /dev/null
-#
-# PLEASE DO NOT MODIFY configure.in FILE
-#
-# ALL CHANGES WILL BE DISCARDED BY THE NEXT
-# build_configure COMMAND
-#
-# CHANGES MUST BE MADE IN configure.in.base FILE
-#
-#
-# Author : Marc Tajchman (CEA)
-# Date : 28/06/2001
-# Modified by : Patrick GOLDBRONN (CEA)
-# Modified by : Marc Tajchman (CEA)
-#
-# Created from configure.in.base
-#
-
-AC_INIT(src)
-AC_CONFIG_AUX_DIR(${KERNEL_ROOT_DIR}/salome_adm/unix/config_files/DEPRECATED)
-AC_CANONICAL_HOST
-
-PACKAGE=salome
-AC_SUBST(PACKAGE)
-
-VERSION=0.0.1
-AC_SUBST(VERSION)
-
-dnl
-dnl Initialize source and build root directories
-dnl
-
-ROOT_BUILDDIR=`pwd`
-ROOT_SRCDIR=`echo $0 | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"`
-cd $ROOT_SRCDIR
-ROOT_SRCDIR=`pwd`
-cd $ROOT_BUILDDIR
-
-AC_SUBST(ROOT_SRCDIR)
-AC_SUBST(ROOT_BUILDDIR)
-
-echo
-echo Source root directory : $ROOT_SRCDIR
-echo Build root directory : $ROOT_BUILDDIR
-echo
-echo
-
-if test -z "$AR"; then
- AC_CHECK_PROGS(AR,ar xar,:,$PATH)
-fi
-AC_SUBST(AR)
-
-dnl Export the AR macro so that it will be placed in the libtool file
-dnl correctly.
-export AR
-
-echo
-echo ---------------------------------------------
-echo testing make
-echo ---------------------------------------------
-echo
-
-AC_PROG_MAKE_SET
-AC_PROG_INSTALL
-dnl
-dnl libtool macro check for CC, LD, NM, LN_S, RANLIB, STRIP + pour les librairies dynamiques !
-
-AC_ENABLE_DEBUG(yes)
-AC_DISABLE_PRODUCTION
-
-echo ---------------------------------------------
-echo testing libtool
-echo ---------------------------------------------
-
-dnl first, we set static to no!
-dnl if we want it, use --enable-static
-AC_ENABLE_STATIC(no)
-
-AC_LIBTOOL_DLOPEN
-AC_PROG_LIBTOOL
-
-dnl Fix up the INSTALL macro if it s a relative path. We want the
-dnl full-path to the binary instead.
-case "$INSTALL" in
- *install-sh*)
- INSTALL='\${KERNEL_ROOT_DIR}'/salome_adm/unix/config_files/install-sh
- ;;
-esac
-
-echo
-echo ---------------------------------------------
-echo testing C/C++
-echo ---------------------------------------------
-echo
-
-cc_ok=no
-dnl inutil car libtool
-dnl AC_PROG_CC
-AC_PROG_CXX
-AC_DEPEND_FLAG
-# AC_CC_WARNINGS([ansi])
-cc_ok=yes
-
-dnl Library libdl :
-AC_CHECK_LIB(dl,dlopen)
-
-dnl add library libm :
-AC_CHECK_LIB(m,ceil)
-
-dnl
-dnl Well we use sstream which is not in gcc pre-2.95.3
-dnl We must test if it exists. If not, add it in include !
-dnl
-
-AC_CXX_HAVE_SSTREAM
-
-dnl
-dnl ---------------------------------------------
-dnl testing MPICH
-dnl ---------------------------------------------
-dnl
-
-CHECK_MPICH
-
-echo
-echo ---------------------------------------------
-echo testing LEX \& YACC
-echo ---------------------------------------------
-echo
-
-lex_yacc_ok=no
-AC_PROG_YACC
-AC_PROG_LEX
-lex_yacc_ok=yes
-
-echo
-echo ---------------------------------------------
-echo testing python
-echo ---------------------------------------------
-echo
-
-CHECK_PYTHON
-
-dnl echo
-dnl echo ---------------------------------------------
-dnl echo testing java
-dnl echo ---------------------------------------------
-dnl echo
-
-dnl CHECK_JAVA
-
-echo
-echo ---------------------------------------------
-echo testing swig
-echo ---------------------------------------------
-echo
-
-CHECK_SWIG
-
-echo
-echo ---------------------------------------------
-echo testing threads
-echo ---------------------------------------------
-echo
-
-ENABLE_PTHREADS
-
-echo
-echo ---------------------------------------------
-echo testing omniORB
-echo ---------------------------------------------
-echo
-
-CHECK_OMNIORB
-
-dnl echo
-dnl echo ---------------------------------------------
-dnl echo testing mico
-dnl echo ---------------------------------------------
-dnl echo
-
-dnl CHECK_MICO
-
-echo
-echo ---------------------------------------------
-echo default ORB : omniORB
-echo ---------------------------------------------
-echo
-
-DEFAULT_ORB=omniORB
-CHECK_CORBA
-
-AC_SUBST_FILE(CORBA)
-corba=make_$ORB
-CORBA=adm_local/unix/$corba
-
-dnl
-dnl ---------------------------------------------
-dnl testing WITHGUI
-dnl ---------------------------------------------
-dnl
-
-CHECK_WITHGUI
-
-if test "X$WITHGUI" = "Xyes"; then
-
- echo
- echo ---------------------------------------------
- echo testing openGL
- echo ---------------------------------------------
- echo
-
- CHECK_OPENGL
-
- echo
- echo ---------------------------------------------
- echo testing QT
- echo ---------------------------------------------
- echo
-
- CHECK_QT
-
- echo
- echo ---------------------------------------------
- echo testing MSG2QM
- echo ---------------------------------------------
- echo
-
- CHECK_MSG2QM
-
- echo
- echo ---------------------------------------------
- echo testing VTK
- echo ---------------------------------------------
- echo
-
- CHECK_VTK
-
- echo
- echo ---------------------------------------------
- echo Testing GUI
- echo ---------------------------------------------
- echo
-
- CHECK_SALOME_GUI
-
- echo
- echo ---------------------------------------------
- echo Testing full GUI
- echo ---------------------------------------------
- echo
-
- CHECK_CORBA_IN_GUI
- if test "x${CORBA_IN_GUI}" != "xyes"; then
- echo "failed : For configure BLSURFPLUGIN module necessary full GUI !"
- exit
- fi
-fi
-
-echo
-echo ---------------------------------------------
-echo testing HDF5
-echo ---------------------------------------------
-echo
-
-CHECK_HDF5
-
-echo
-echo ---------------------------------------------
-echo BOOST Library
-echo ---------------------------------------------
-echo
-
-CHECK_BOOST
-
-echo
-echo ---------------------------------------------
-echo Testing OpenCascade
-echo ---------------------------------------------
-echo
-
-CHECK_CAS
-
-echo
-echo ---------------------------------------------
-echo Testing html generators
-echo ---------------------------------------------
-echo
-
-CHECK_HTML_GENERATORS
-
-echo
-echo ---------------------------------------------
-echo Testing Kernel
-echo ---------------------------------------------
-echo
-
-CHECK_KERNEL
-
-echo
-echo ---------------------------------------------
-echo Testing Geom
-echo ---------------------------------------------
-echo
-
-CHECK_GEOM
-
-# echo
-# echo ---------------------------------------------
-# echo Testing Med
-# echo ---------------------------------------------
-# echo
-#
-# CHECK_MED
-
-echo
-echo ---------------------------------------------
-echo Testing BLSURF
-echo ---------------------------------------------
-echo
-
-CHECK_BLSURF
-
-echo
-echo ---------------------------------------------
-echo Testing SMesh
-echo ---------------------------------------------
-echo
-
-CHECK_SMESH
-
-echo
-echo ---------------------------------------------
-echo Summary
-echo ---------------------------------------------
-echo
-
-echo Configure
-
-if test "X$WITHGUI" = "Xyes"; then
-variables="cc_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok omniORB_ok occ_ok doxygen_ok graphviz_ok Kernel_ok Geom_ok SMesh_ok BLSURF_ok"
-fi
-
-if test "X$WITHGUI" = "Xno"; then
-variables="cc_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok hdf5_ok omniORB_ok occ_ok doxygen_ok graphviz_ok Kernel_ok Geom_ok SMesh_ok BLSURF_ok"
-fi
-
-for var in $variables
-do
- printf " %10s : " `echo \$var | sed -e "s,_ok,,"`
- eval echo \$$var
-done
-
-echo
-echo "Default ORB : $DEFAULT_ORB"
-echo
-
-dnl generals files which could be included in every makefile
-
-AC_SUBST_FILE(COMMENCE) COMMENCE=adm_local/unix/make_commence
-AC_SUBST_FILE(CONCLUDE) CONCLUDE=salome_adm/unix/make_conclude
-AC_SUBST_FILE(MODULE) MODULE=salome_adm/unix/make_module
-
-dnl les dependences
-AC_SUBST_FILE(DEPEND) DEPEND=salome_adm/unix/depend
-
-dnl We don t need to say when we re entering directories if we re using
-dnl GNU make becuase make does it for us.
-if test "X$GMAKE" = "Xyes"; then
- AC_SUBST(SETX) SETX=":"
-else
- AC_SUBST(SETX) SETX="set -x"
-fi
-
-# make other build directories
-for rep in salome_adm adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources idl
-do
-# if test ! -d $rep ; then
-# eval mkdir $rep
-# fi
- $INSTALL -d $rep
-done
-
-echo
-echo ---------------------------------------------
-echo copying resource files, shell scripts, and
-echo xml files
-echo ---------------------------------------------
-echo
-
-
-dnl copy resources directories
-
-#for i in `find $ROOT_SRCDIR -name 'resources' -print`
-#do
-# local_res=`echo $i | sed -e "s,$ROOT_SRCDIR,.,"`
-# local_res_dir=`echo $local_res | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"`
-# mkdir -p $local_res_dir
-# cd $local_res_dir
-# ln -fs $i
-# echo $local_res
-# cd $ROOT_BUILDDIR
-#done
-
-dnl copy shells and utilities contained in the bin directory
-dnl excluding .in files (treated in AC-OUTPUT below) and CVS
-dnl directory
-
-#mkdir -p bin/salome
-#cd bin/salome
-#for i in $ROOT_SRCDIR/bin/*
-#do
-# local_bin=`echo $i | sed -e "s,$ROOT_SRCDIR,.,"`
-# case "$local_bin" in
-# *.in | *~) ;;
-# ./bin/CVS | ./bin/salome) ;;
-# *) /usr/bin/install -C $i .; echo $local_bin ;;
-# esac
-#done
-#cd $ROOT_BUILDDIR
-
-AC_SUBST_FILE(ENVSCRIPT) ENVSCRIPT=salome_adm/unix/envScript
-
-dnl copy xml files to the build tree (lib directory)
-dnl pourquoi ????
-
-#cd lib
-#for i in `find $ROOT_SRCDIR -name "*.xml" -print`
-#do
-# ln -fs $i
-# echo `echo $i | sed -e "s,$ROOT_SRCDIR,.,"`
-#done
-#cd $ROOT_BUILDDIR
-
-
-echo
-echo ---------------------------------------------
-echo generating Makefiles and configure files
-echo ---------------------------------------------
-echo
-
-#AC_OUTPUT_COMMANDS([ \
-# chmod +x ./bin/* \
-#])
-
-## do not delete this line
--- /dev/null
+# Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+# ---
+#
+# File: Makefile.am
+#
+# ---
+
+#
+# This Makefile is responsible of generating the client and server
+# implementation of IDL interfaces for both C++ and python usage.
+# The building process of the C++ files is in charge of each source
+# package and then is not manage here.
+#
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+BASEIDL_FILES = BLSURFPlugin_Algorithm.idl
+
+EXTRA_DIST+= $(BASEIDL_FILES)
+
+# This variable defines the files to be installed
+salomeidl_DATA = $(BASEIDL_FILES)
+
+# GUI idl common library
+lib_LTLIBRARIES = libSalomeIDLBLSURFPLUGIN.la
+
+# Sources built from idl files
+nodist_libSalomeIDLBLSURFPLUGIN_la_SOURCES= BLSURFPlugin_AlgorithmSK.cc
+
+# header files must be exported: other modules have to use this library
+nodist_salomeinclude_HEADERS= $(BASEIDL_FILES:%.idl=%.hh)
+
+libSalomeIDLBLSURFPLUGIN_la_CPPFLAGS =\
+ $(KERNEL_CXXFLAGS) \
+ $(GEOM_CXXFLAGS) \
+ $(SMESH_CXXFLAGS) \
+ @CORBA_CXXFLAGS@ \
+ @CORBA_INCLUDES@ \
+ -I$(top_builddir)/salome_adm/unix \
+ -I$(top_builddir)/idl
+
+
+libSalomeIDLBLSURFPLUGIN_la_LDFLAGS = -no-undefined -version-info=0:0:0
+libSalomeIDLBLSURFPLUGIN_la_LIBADD = \
+ $(KERNEL_LDFLAGS) -lSalomeIDLKernel \
+ $(SMESH_LDFLAGS) -lSalomeIDLSMESH \
+ $(GEOM_LDFLAGS) -lSalomeIDLGEOM \
+ @CORBA_LIBS@
+
+# These variables defines the building process of CORBA files
+OMNIORB_IDL = @OMNIORB_IDL@
+OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@
+OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ \
+ -I$(top_builddir)/idl/salome \
+ -I$(KERNEL_ROOT_DIR)/idl/salome \
+ -I$(GEOM_ROOT_DIR)/idl/salome \
+ -I$(SMESH_ROOT_DIR)/idl/salome
+
+IDLCXXFLAGS = \
+ -bcxx \
+ @IDLCXXFLAGS@ \
+ -I$(top_builddir)/idl/salome \
+ -I$(KERNEL_ROOT_DIR)/idl/salome \
+ -I$(GEOM_ROOT_DIR)/idl/salome \
+ -I$(SMESH_ROOT_DIR)/idl/salome \
+ -I$(top_builddir)/salome_adm/unix
+IDLPYFLAGS = \
+ @IDLPYFLAGS@ \
+ -I$(KERNEL_ROOT_DIR)/idl/salome \
+ -I$(GEOM_ROOT_DIR)/idl/salome \
+ -I$(SMESH_ROOT_DIR)/idl/salome
+
+# potential problem on parallel make on the following - multiple outputs
+SUFFIXES = .idl .hh SK.cc
+.idlSK.cc:
+ $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $<
+.idl.hh:
+ $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $<
+
+install-exec-local: $(BASEIDL_FILES:%=$(top_srcdir)/idl/%)
+ $(INSTALL) -d $(pkgpythondir)
+ ls $^ | while read file; do \
+ $(OMNIORB_IDL) $(IDLPYFLAGS) -C$(pkgpythondir) $$file ; \
+ done
+
+# uninstall-local removes too much, but it works in distcheck
+uninstall-local:
+ rm -rf $(pkgpythondir)/*
+
+mostlyclean-local:
+ -rm -f *.hh *.cc .depidl
+
+# we use cpp to generate dependencies between idl files.
+# option x c tells the preprocessor to consider idl as a c file.
+# if an idl is modified, all idl dependencies are rebuilt
+
+.depidl: $(BASEIDL_FILES)
+ @echo "" > $@
+ @for dep in $^ dummy; do \
+ if [ $$dep != "dummy" ]; then \
+ echo Building dependencies for $$dep; \
+ $(CPP) $(C_DEPEND_FLAG) -x c -I$(srcdir) -I$(KERNEL_ROOT_DIR)/idl/salome -I$(GEOM_ROOT_DIR)/idl/salome -I$(SMESH_ROOT_DIR)/idl/salome -I$(top_builddir)/salome_adm/unix $$dep 2>/dev/null | \
+ sed 's/\.o/\SK.cc/' >>$@; \
+ fi; \
+ done ;
+
+-include .depidl
+++ /dev/null
-# Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS, L3S, LJLL, MENSI
-#
-# 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 :
-#
-
-# source path
-top_srcdir=@top_srcdir@
-top_builddir=..
-srcdir=@srcdir@
-VPATH=.:${KERNEL_ROOT_DIR}/idl/salome:${GEOM_ROOT_DIR}/idl/salome :${SMESH_ROOT_DIR}/idl/salome
-#:${MED_ROOT_DIR}/idl/salome
-
-@COMMENCE@
-
-IDL_FILES = BLSURFPlugin_Algorithm.idl
-
-
-# copy all idl file in $(top_builddir)/idl
-inc: $(top_builddir)/idl/salome $(IDL_FILES:%=$(top_builddir)/idl/salome/%)
-
-$(top_builddir)/idl/salome:
- $(INSTALL) -d $@
-
-$(IDL_FILES:%=$(top_builddir)/idl/salome/%):$(IDL_FILES:%=$(top_srcdir)/idl/%)
- cp -f $^ $(top_builddir)/idl/salome
-
-
-# python wrap
-lib: pyidl
-
-PYTHON_BUILD_SITE=$(top_builddir)/lib${LIB_LOCATION_SUFFIX}/python$(PYTHON_VERSION)/site-packages/@PACKAGE@
-
-pyidl: $(PYTHON_BUILD_SITE) $(IDL_FILES:%.idl=$(PYTHON_BUILD_SITE)/%_idl.py)
-
-$(PYTHON_BUILD_SITE):
- $(INSTALL) -d $@
-
-$(PYTHON_BUILD_SITE)/%_idl.py: $(top_builddir)/idl/salome/%.idl
- $(OMNIORB_IDL) $(OMNIORB_IDLPYFLAGS) -C$(PYTHON_BUILD_SITE) $<
-
-
-# install python client (generated from idl file)
-install: $(IDL_FILES:%=$(top_builddir)/idl/salome/%)
- $(INSTALL) -d $(idldir) $(PYTHON_SITE_INSTALL)
- $(INSTALL_DATA) $^ $(idldir)
- @for file in $^ dummy; do \
- if [ $$file != "dummy" ]; then \
- $(OMNIORB_IDL) $(OMNIORB_IDLPYFLAGS) -C$(PYTHON_SITE_INSTALL) $$file ; \
- fi ; \
- done ;
-
-uninstall:
- -$(RM) $(IDL_FILES:%=$(idldir)/%)
- -$(RM) $(IDL_FILES:%.idl=$(PYTHON_SITE_INSTALL)/%_idl.py)
-
-# clean
-cleandep:
- -$(RM) .dep*
-
-clean: cleandep
- -$(RM) $(top_builddir)/idl/salome/*.idl
- -$(RM) $(PYTHON_BUILD_SITE)/*.py
-
-distclean: clean
- -$(RM) Makefile
-
--- /dev/null
+# Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+# ---
+#
+# File: Makefile.am
+#
+# ---
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+dist_salomeres_DATA = \
+ BLSURF.png \
+ mesh_algo_BLSURF.png \
+ mesh_hypo_BLSURF.png \
+ mesh_tree_algo_BLSURF.png \
+ mesh_tree_hypo_BLSURF.png \
+ BLSURFPlugin.xml
--- /dev/null
+# Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+# ---
+#
+# File: Makefile.am
+#
+# ---
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+# header files
+salomeinclude_HEADERS =
+
+# Libraries targets
+lib_LTLIBRARIES = libBLSURFEngine.la
+
+dist_libBLSURFEngine_la_SOURCES = \
+ BLSURFPlugin_BLSURF.hxx \
+ BLSURFPlugin_BLSURF.cxx \
+ BLSURFPlugin_BLSURF_i.hxx \
+ BLSURFPlugin_BLSURF_i.cxx \
+ BLSURFPlugin_Hypothesis.hxx \
+ BLSURFPlugin_Hypothesis.cxx \
+ BLSURFPlugin_Hypothesis_i.hxx \
+ BLSURFPlugin_Hypothesis_i.cxx \
+ BLSURFPlugin_i.cxx
+
+libBLSURFEngine_la_CPPFLAGS = \
+ $(KERNEL_CXXFLAGS) \
+ $(GUI_CXXFLAGS) \
+ $(MED_CXXFLAGS) \
+ $(GEOM_CXXFLAGS) \
+ $(CAS_CPPFLAGS) \
+ $(BLSURF_INCLUDES) \
+ $(SMESH_CXXFLAGS) \
+ $(CORBA_CXXFLAGS) \
+ $(CORBA_INCLUDES) \
+ $(BOOST_CPPFLAGS) \
+ -I$(top_builddir)/idl \
+ -I$(top_builddir)/salome_adm/unix
+
+libBLSURFEngine_la_LDFLAGS = \
+ ../../idl/libSalomeIDLBLSURFPLUGIN.la \
+ $(BLSURF_LIBS) \
+ $(SMESH_LDFLAGS) -lSMESHimpl -lSMESHEngine -lStdMeshersEngine \
+ $(KERNEL_LDFLAGS) -lSalomeGenericObj
+++ /dev/null
-# Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS, L3S, LJLL, MENSI
-#
-# 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)
-# Module : BLSURFPLUGIN
-# Date : 10/01/2004
-#
-#
-
-# source path
-top_srcdir=@top_srcdir@
-top_builddir=../..
-srcdir=@srcdir@
-VPATH=.:@srcdir@:@top_srcdir@/idl:$(top_builddir)/idl:${KERNEL_ROOT_DIR}/idl/salome:${GUI_ROOT_DIR}/idl/salome:${GEOM_ROOT_DIR}/idl/salome:${SMESH_ROOT_DIR}/idl/salome:${MED_ROOT_DIR}/idl/salome
-
-@COMMENCE@
-
-LIB_SRC = \
- BLSURFPlugin_BLSURF.cxx \
- BLSURFPlugin_BLSURF_i.cxx \
- BLSURFPlugin_Hypothesis.cxx \
- BLSURFPlugin_Hypothesis_i.cxx \
- BLSURFPlugin_i.cxx
-
-LIB_SERVER_IDL = BLSURFPlugin_Algorithm.idl
-
-LIB_CLIENT_IDL = \
- SALOME_Component.idl \
- SALOME_Comm.idl \
- GEOM_Gen.idl \
- MED.idl
-
-# Libraries targets
-LIB = libBLSURFEngine.la
-
-BLSURF_INCLUDES = @BLSURF_INCLUDES@
-BLSURF_LIBS = "@BLSURF_LIBS@"
-CPPFLAGS += $(BLSURF_INCLUDES)
-CXXFLAGS += $(BLSURF_INCLUDES)
-LDFLAGS += $(BLSURF_LIBS)
-
-@CONCLUDE@
//=============================================================================
extern "C"
{
+ BLSURFPLUGIN_GUI_EXPORT
SMESHGUI_GenericHypothesisCreator* GetHypothesisCreator( const QString& aHypType )
{
SMESHGUI_GenericHypothesisCreator* aCreator = NULL;
-// BLSURFPlugin GUI: GUI for plugged-in mesher BLSURFPlugin
+// BLSURFPlugin GUI: GUI for plugged-in mesher BLSURFPlugin
//
-// 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
+// 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.
//
-// File : BLSURFPluginGUI_HypothesisCreator.cxx
+// 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
+//
+// ---
+//
+// File : BLSURFPluginGUI_HypothesisCreator.cxx
// Authors : Francis KLOSS (OCC) & Patrick LAUG (INRIA) & Lioka RAZAFINDRAZAKA (CEA)
-// Module : BLSURFPlugin
-// $Header:
+//
+// ---
#include "BLSURFPluginGUI_HypothesisCreator.h"
#include <SMESHGUI_HypothesesUtils.h>
#include <SUIT_Session.h>
-
-#include <SalomeApp_Tools.h>
-
-#include <QtxDblSpinBox.h>
-#include <QtxComboBox.h>
-
-#include <qlabel.h>
-#include <qgroupbox.h>
-#include <qframe.h>
-#include <qlayout.h>
-#include <qlineedit.h>
-#include <qcheckbox.h>
-#include <qpixmap.h>
-#include <qfontmetrics.h>
-#include <qtabbar.h>
-#include <qspinbox.h>
-#include <qpushbutton.h>
-#include <qcursor.h>
-#include <qpopupmenu.h>
-#include <qtable.h>
-#include <qapplication.h>
-
-#include <set>
#include <SUIT_MessageBox.h>
+#include <SUIT_ResourceMgr.h>
+#include <SalomeApp_Tools.h>
+#include <QtxDoubleSpinBox.h>
+
+#include <QComboBox>
+#include <QLabel>
+#include <QGroupBox>
+#include <QFrame>
+#include <QVBoxLayout>
+#include <QGridLayout>
+#include <QLineEdit>
+#include <QCheckBox>
+#include <QTabWidget>
+#include <QSpinBox>
+#include <QPushButton>
+#include <QMenu>
+#include <QTableWidget>
+#include <QHeaderView>
+#include <QApplication>
#define WITH_SIZE_BOUNDARIES
Process2
};
-
enum PhysicalMesh
{
DefaultSize = 0,
};
BLSURFPluginGUI_HypothesisCreator::BLSURFPluginGUI_HypothesisCreator( const QString& theHypType )
-: SMESHGUI_GenericHypothesisCreator( theHypType )
+ : SMESHGUI_GenericHypothesisCreator( theHypType )
{
- myPopup = 0;
}
BLSURFPluginGUI_HypothesisCreator::~BLSURFPluginGUI_HypothesisCreator()
{
- if ( myPopup )
- delete myPopup;
}
namespace {
inline bool isDouble( const QString& theText, const bool emptyOK=false ) {
- QString str = theText.stripWhiteSpace();
+ QString str = theText.trimmed();
bool isOk = true;
if ( !str.isEmpty() )
str.toDouble(&isOk);
bool ok = true;
if ( !isDouble( myPhySize->text(), false )) {
if ( myPhySize->text().isEmpty() )
- myPhySize->setText(tr("OBIGATORY_VALUE"));
+ myPhySize->setText(tr("OBLIGATORY_VALUE"));
myPhySize->selectAll();
ok = false;
}
if ( ok )
{
myOptionTable->setFocus();
- qApp->processEvents();
+ QApplication::instance()->processEvents();
BLSURFPlugin::BLSURFPlugin_Hypothesis_var h =
BLSURFPlugin::BLSURFPlugin_Hypothesis::_narrow( initParamsHypothesis() );
- int row = 0, nbRows = myOptionTable->numRows();
+ int row = 0, nbRows = myOptionTable->rowCount();
for ( ; row < nbRows; ++row )
{
- QString name = myOptionTable->text( row, OPTION_NAME_COLUMN );
- QString value = myOptionTable->text( row, OPTION_VALUE_COLUMN ).stripWhiteSpace();
+ QString name = myOptionTable->item( row, OPTION_NAME_COLUMN )->text();
+ QString value = myOptionTable->item( row, OPTION_VALUE_COLUMN )->text().trimmed();
if ( !value.isEmpty() ) {
try {
- h->SetOptionValue( name.latin1(), value.latin1() );
+ h->SetOptionValue( name.toLatin1().constData(), value.toLatin1().constData() );
}
catch ( const SALOME::SALOME_Exception& ex )
{
- SUIT_MessageBox::error1( dlg(),
- tr("SMESH_ERROR"),
- ex.details.text.in(),
- tr("SMESH_BUT_OK"));
+ SUIT_MessageBox::critical( dlg(),
+ tr("SMESH_ERROR"),
+ ex.details.text.in() );
ok = false;
}
}
QFrame* BLSURFPluginGUI_HypothesisCreator::buildFrame()
{
-QFrame* fr = new QFrame( 0, "myframe" );
-QVBoxLayout* lay = new QVBoxLayout( fr, 5, 0 );
+ QFrame* fr = new QFrame( 0 );
+ QVBoxLayout* lay = new QVBoxLayout( fr );
+ lay->setMargin( 5 );
+ lay->setSpacing( 0 );
// tab
- QTabBar* tab = new QTabBar( fr, "QTabBar");
- tab->setShape( QTabBar::RoundedAbove );
- tab->insertTab( new QTab( tr( "SMESH_ARGUMENTS")), STD_TAB);
- tab->insertTab( new QTab( tr( "GHS3D_ADV_ARGS")), ADV_TAB);
+ QTabWidget* tab = new QTabWidget( fr );
+ tab->setTabShape( QTabWidget::Rounded );
+ tab->setTabPosition( QTabWidget::North );
lay->addWidget( tab );
// basic parameters
+ myStdGroup = new QWidget();
+ QGridLayout* aStdLayout = new QGridLayout( myStdGroup );
+ aStdLayout->setSpacing( 6 );
+ aStdLayout->setMargin( 11 );
- myStdGroup = new QGroupBox( 2, Qt::Horizontal, fr, "myStdGroup" );
- myStdGroup->layout()->setSpacing( 6 );
- myStdGroup->layout()->setMargin( 11 );
- lay->addWidget( myStdGroup );
-
+ int row = 0;
myName = 0;
if( isCreation() ) {
- new QLabel( tr( "SMESH_NAME" ), myStdGroup );
+ aStdLayout->addWidget( new QLabel( tr( "SMESH_NAME" ), myStdGroup ), row, 0, 1, 1 );
myName = new QLineEdit( myStdGroup );
+ aStdLayout->addWidget( myName, row++, 1, 1, 1 );
}
- new QLabel( tr( "BLSURF_PHY_MESH" ), myStdGroup );
- myPhysicalMesh = new QtxComboBox( myStdGroup );
+ aStdLayout->addWidget( new QLabel( tr( "BLSURF_PHY_MESH" ), myStdGroup ), row, 0, 1, 1 );
+ myPhysicalMesh = new QComboBox( myStdGroup );
+ aStdLayout->addWidget( myPhysicalMesh, row++, 1, 1, 1 );
QStringList physicalTypes;
- physicalTypes.append( QObject::tr( "BLSURF_DEFAULT_USER" ) );
- physicalTypes.append( QObject::tr( "BLSURF_CUSTOM_USER" ) );
- myPhysicalMesh->insertStringList( physicalTypes );
+ physicalTypes << tr( "BLSURF_DEFAULT_USER" ) << tr( "BLSURF_CUSTOM_USER" );
+ myPhysicalMesh->addItems( physicalTypes );
- new QLabel( tr( "BLSURF_HPHYDEF" ), myStdGroup );
+ aStdLayout->addWidget( new QLabel( tr( "BLSURF_HPHYDEF" ), myStdGroup), row, 0, 1, 1 );
myPhySize = new QLineEdit( myStdGroup );
-// myPhySize = new QtxDblSpinBox( myStdGroup );
-// myPhySize->setMinValue( 1e-02 );
-// myPhySize->setMaxValue( 1e+02 );
-// myPhySize->setLineStep( 1 );
+ aStdLayout->addWidget( myPhySize, row++, 1, 1, 1 );
#ifdef WITH_SIZE_BOUNDARIES
- new QLabel( tr( "BLSURF_HPHYMIN" ), myStdGroup );
+ aStdLayout->addWidget( new QLabel( tr( "BLSURF_HPHYMIN" ), myStdGroup ), row, 0, 1, 1 );
myPhyMin = new QLineEdit( myStdGroup );
-// myPhyMin = new QtxDblSpinBox( myStdGroup );
-// myPhyMin->setMinValue( 1e-06 );
-// myPhyMin->setMaxValue( 1e+04 );
-// myPhyMin->setLineStep( 1 );
+ aStdLayout->addWidget( myPhyMin, row++, 1, 1, 1 );
- new QLabel( tr( "BLSURF_HPHYMAX" ), myStdGroup );
+ aStdLayout->addWidget( new QLabel( tr( "BLSURF_HPHYMAX" ), myStdGroup ), row, 0, 1, 1 );
myPhyMax = new QLineEdit( myStdGroup );
-// myPhyMax = new QtxDblSpinBox( myStdGroup );
-// myPhyMax->setMinValue( 1e-04 );
-// myPhyMax->setMaxValue( 1e+06 );
-// myPhyMax->setLineStep( 1 );
+ aStdLayout->addWidget( myPhyMax, row++, 1, 1, 1 );
#endif
- new QLabel( tr( "BLSURF_GEOM_MESH" ), myStdGroup );
- myGeometricMesh = new QtxComboBox( myStdGroup );
+ aStdLayout->addWidget( new QLabel( tr( "BLSURF_GEOM_MESH" ), myStdGroup ), row, 0, 1, 1 );
+ myGeometricMesh = new QComboBox( myStdGroup );
+ aStdLayout->addWidget( myGeometricMesh, row++, 1, 1, 1 );
QStringList types;
- types.append( QObject::tr( "BLSURF_DEFAULT_GEOM" ) );
- types.append( QObject::tr( "BLSURF_CUSTOM_GEOM" ) );
- myGeometricMesh->insertStringList( types );
-
- new QLabel( tr( "BLSURF_ANGLE_MESH_S" ), myStdGroup );
- myAngleMeshS = new QtxDblSpinBox( myStdGroup );
- myAngleMeshS->setMinValue( 0 );
- myAngleMeshS->setMaxValue( 16 );
- myAngleMeshS->setLineStep( 0.5 );
+ types << tr( "BLSURF_DEFAULT_GEOM" ) << tr( "BLSURF_CUSTOM_GEOM" );
+ myGeometricMesh->addItems( types );
+
+ aStdLayout->addWidget( new QLabel( tr( "BLSURF_ANGLE_MESH_S" ), myStdGroup ), row, 0, 1, 1 );
+ myAngleMeshS = new QtxDoubleSpinBox( myStdGroup );
+ aStdLayout->addWidget( myAngleMeshS, row++, 1, 1, 1 );
+ myAngleMeshS->setMinimum( 0 );
+ myAngleMeshS->setMaximum( 16 );
+ myAngleMeshS->setSingleStep( 0.5 );
- new QLabel( tr( "BLSURF_ANGLE_MESH_C" ), myStdGroup );
- myAngleMeshC = new QtxDblSpinBox( myStdGroup );
- myAngleMeshC->setMinValue( 0 );
- myAngleMeshC->setMaxValue( 16 );
- myAngleMeshC->setLineStep( 0.5 );
+ aStdLayout->addWidget( new QLabel( tr( "BLSURF_ANGLE_MESH_C" ), myStdGroup ), row, 0, 1, 1 );
+ myAngleMeshC = new QtxDoubleSpinBox( myStdGroup );
+ aStdLayout->addWidget( myAngleMeshC, row++, 1, 1, 1 );
+ myAngleMeshC->setMinimum( 0 );
+ myAngleMeshC->setMaximum( 16 );
+ myAngleMeshC->setSingleStep( 0.5 );
- new QLabel( tr( "BLSURF_GRADATION" ), myStdGroup );
- myGradation = new QtxDblSpinBox( myStdGroup );
- myGradation->setMinValue( 1.1 );
- myGradation->setMaxValue( 2.5 );
- myGradation->setLineStep( 0.1 );
+ aStdLayout->addWidget( new QLabel( tr( "BLSURF_GRADATION" ), myStdGroup ), row, 0, 1, 1 );
+ myGradation = new QtxDoubleSpinBox( myStdGroup );
+ aStdLayout->addWidget( myGradation, row++, 1, 1, 1 );
+ myGradation->setMinimum( 1.1 );
+ myGradation->setMaximum( 2.5 );
+ myGradation->setSingleStep( 0.1 );
#ifdef WITH_SIZE_BOUNDARIES
- new QLabel( tr( "BLSURF_HGEOMIN" ), myStdGroup );
+ aStdLayout->addWidget( new QLabel( tr( "BLSURF_HGEOMIN" ), myStdGroup ), row, 0, 1, 1 );
myGeoMin = new QLineEdit( myStdGroup );
-// myGeoMin = new QtxDblSpinBox( myStdGroup );
-// myGeoMin->setMinValue( 1e-06 );
-// myGeoMin->setMaxValue( 1e+04 );
-// myGeoMin->setLineStep( 1 );
+ aStdLayout->addWidget( myGeoMin, row++, 1, 1, 1 );
- new QLabel( tr( "BLSURF_HGEOMAX" ), myStdGroup );
+ aStdLayout->addWidget( new QLabel( tr( "BLSURF_HGEOMAX" ), myStdGroup ), row, 0, 1, 1 );
myGeoMax = new QLineEdit( myStdGroup );
-// myGeoMax = new QtxDblSpinBox( myStdGroup );
-// myGeoMax->setMinValue( 1e-04 );
-// myGeoMax->setMaxValue( 1e+06 );
-// myGeoMax->setLineStep( 1 );
+ aStdLayout->addWidget( myGeoMax, row++, 1, 1, 1 );
#endif
myAllowQuadrangles = new QCheckBox( tr( "BLSURF_ALLOW_QUADRANGLES" ), myStdGroup );
- myStdGroup->addSpace(0);
+ aStdLayout->addWidget( myAllowQuadrangles, row++, 0, 1, 2 );
myDecimesh = new QCheckBox( tr( "BLSURF_DECIMESH" ), myStdGroup );
- myStdGroup->addSpace(0);
-
-
-
- // advanced parameters
-
- myAdvGroup = new QGroupBox( 3, Qt::Horizontal, fr, "myAdvGroup" );
- lay->addWidget( myAdvGroup );
- QFrame* anAdvFrame = new QFrame(myAdvGroup, "anAdvFrame");
- QGridLayout* anAdvLayout = new QGridLayout(anAdvFrame, 5, 3);
- anAdvLayout->setSpacing(6);
- anAdvLayout->setAutoAdd(false);
+ aStdLayout->addWidget( myDecimesh, row++, 0, 1, 2 );
- QLabel* aTopologyLabel = new QLabel( tr( "BLSURF_TOPOLOGY" ), anAdvFrame );
- myTopology = new QtxComboBox( anAdvFrame );
+ // advanced parameters
+ myAdvGroup = new QWidget();
+ QGridLayout* anAdvLayout = new QGridLayout( myAdvGroup );
+ anAdvLayout->setSpacing( 6 );
+ anAdvLayout->setMargin( 11 );
+
+ anAdvLayout->addWidget( new QLabel( tr( "BLSURF_TOPOLOGY" ), myAdvGroup ), 0, 0, 1, 1 );
+ myTopology = new QComboBox( myAdvGroup );
+ anAdvLayout->addWidget( myTopology, 0, 1, 1, 1 );
QStringList topologyTypes;
- topologyTypes.append( QObject::tr( "BLSURF_TOPOLOGY_CAD" ) );
- topologyTypes.append( QObject::tr( "BLSURF_TOPOLOGY_PROCESS" ) );
- topologyTypes.append( QObject::tr( "BLSURF_TOPOLOGY_PROCESS2" ) );
- myTopology->insertStringList( topologyTypes );
-
- QLabel* aVarbosityLabel = new QLabel( tr( "BLSURF_VERBOSITY" ), anAdvFrame );
- myVerbosity = new QSpinBox( anAdvFrame );
- myVerbosity->setMinValue( 0 );
- myVerbosity->setMaxValue( 100 );
- myVerbosity->setLineStep( 5 );
-
- QButton* addBtn = new QPushButton(tr("ADD_OPTION"), anAdvFrame, "addBtn");
- QButton* rmBtn = new QPushButton(tr("REMOVE_OPTION"), anAdvFrame, "rmBtn");
-
- myOptionTable = new QTable( 0, NB_COLUMNS, anAdvFrame, "myOptionTable");
- myOptionTable->hideColumn( OPTION_ID_COLUMN );
- myOptionTable->horizontalHeader()->setLabel( OPTION_NAME_COLUMN, tr("OPTION_NAME_COLUMN"));
- myOptionTable->horizontalHeader()->setLabel( OPTION_VALUE_COLUMN, tr("OPTION_VALUE_COLUMN"));
- myOptionTable->setColumnReadOnly( OPTION_NAME_COLUMN, TRUE );
- myOptionTable->setColumnReadOnly( OPTION_VALUE_COLUMN, FALSE );
- myOptionTable->setLeftMargin( 0 );
-
- anAdvLayout->addWidget(aTopologyLabel, 0, 0);
- anAdvLayout->addWidget(myTopology, 0, 1);
-
- anAdvLayout->addWidget(aVarbosityLabel, 1, 0);
- anAdvLayout->addWidget(myVerbosity, 1, 1);
-
- anAdvLayout->addMultiCellWidget( myOptionTable, 2,4, 0,1 );
- anAdvLayout->addWidget( addBtn, 2, 2);
- anAdvLayout->addWidget( rmBtn, 3, 2);
-
- anAdvLayout->setRowStretch( 4, 1 );
- anAdvLayout->setColStretch( 9, 1 );
-
- onTabSelected( STD_TAB );
-
- connect( tab, SIGNAL( selected ( int ) ), this, SLOT( onTabSelected(int) ));
- connect( myGeometricMesh, SIGNAL( activated( int ) ), this, SLOT( onGeometricMeshChanged() ));
- connect( myPhysicalMesh, SIGNAL( activated( int ) ), this, SLOT( onPhysicalMeshChanged() ));
- connect( addBtn, SIGNAL( clicked()), this, SLOT( onAddOption() ));
- connect( rmBtn, SIGNAL( clicked()), this, SLOT( onDeleteOption() ));
+ topologyTypes << tr( "BLSURF_TOPOLOGY_CAD" ) << tr( "BLSURF_TOPOLOGY_PROCESS" ) << tr( "BLSURF_TOPOLOGY_PROCESS2" );
+ myTopology->addItems( topologyTypes );
+
+ anAdvLayout->addWidget( new QLabel( tr( "BLSURF_VERBOSITY" ), myAdvGroup ), 1, 0, 1, 1 );
+ myVerbosity = new QSpinBox( myAdvGroup );
+ anAdvLayout->addWidget( myVerbosity, 1, 1, 1, 1 );
+ myVerbosity->setMinimum( 0 );
+ myVerbosity->setMaximum( 100 );
+ myVerbosity->setSingleStep( 5 );
+
+ myOptionTable = new QTableWidget( 0, NB_COLUMNS, myAdvGroup );
+ anAdvLayout->addWidget( myOptionTable, 2, 0, 3, 2 );
+ QStringList headers;
+ headers << tr( "OPTION_ID_COLUMN" ) << tr( "OPTION_NAME_COLUMN" ) << tr( "OPTION_VALUE_COLUMN" );
+ myOptionTable->setHorizontalHeaderLabels( headers );
+ myOptionTable->horizontalHeader()->hideSection( OPTION_ID_COLUMN );
+ //myOptionTable->setColumnReadOnly( OPTION_NAME_COLUMN, TRUE );//////
+ //myOptionTable->setColumnReadOnly( OPTION_VALUE_COLUMN, FALSE );/////
+ myOptionTable->verticalHeader()->hide();
+ //myOptionTable->setSelectionBehavior( QAbstractItemView::SelectRows );
+
+ QPushButton* addBtn = new QPushButton( tr( "ADD_OPTION"), myAdvGroup );
+ anAdvLayout->addWidget( addBtn, 2, 2, 1, 1 );
+ addBtn->setMenu( new QMenu() );
+
+ QPushButton* rmBtn = new QPushButton( tr( "REMOVE_OPTION"), myAdvGroup );
+ anAdvLayout->addWidget( rmBtn, 3, 2, 1, 1 );
+
+ anAdvLayout->setRowStretch( 4, 5 );
+ anAdvLayout->setColumnStretch( 1, 5 );
+
+ // ---
+ tab->insertTab( STD_TAB, myStdGroup, tr( "SMESH_ARGUMENTS" ) );
+ tab->insertTab( ADV_TAB, myAdvGroup, tr( "GHS3D_ADV_ARGS" ) );
+ tab->setCurrentIndex( STD_TAB );
+
+ // ---
+ connect( myGeometricMesh, SIGNAL( activated( int ) ), this, SLOT( onGeometricMeshChanged() ) );
+ connect( myPhysicalMesh, SIGNAL( activated( int ) ), this, SLOT( onPhysicalMeshChanged() ) );
+ connect( addBtn->menu(), SIGNAL( aboutToShow() ), this, SLOT( onAddOption() ) );
+ connect( addBtn->menu(), SIGNAL( triggered( QAction* ) ), this, SLOT( onOptionChosenInPopup( QAction* ) ) );
+ connect( rmBtn, SIGNAL( clicked()), this, SLOT( onDeleteOption() ) );
return fr;
}
BlsurfHypothesisData data;
that->readParamsFromHypo( data );
- if( myName ) {
+ if ( myName ) {
myName->setText( data.myName );
QFontMetrics metrics( myName->font() );
myName->setMinimumWidth( metrics.width( data.myName )+5 );
}
- myTopology ->setCurrentItem( data.myTopology );
- myPhysicalMesh ->setCurrentItem( data.myPhysicalMesh );
- //myPhySize ->setValue ( data.myPhySize );
- myPhySize ->setText ( data.myPhySize );
+ myTopology->setCurrentIndex( data.myTopology );
+ myPhysicalMesh->setCurrentIndex( data.myPhysicalMesh );
+ myPhySize->setText( data.myPhySize );
#ifdef WITH_SIZE_BOUNDARIES
- myPhyMin ->setText ( data.myPhyMin );
- myPhyMax ->setText ( data.myPhyMax );
- myGeoMin ->setText ( data.myGeoMin );
- myGeoMax ->setText ( data.myGeoMax );
-// myPhyMin ->setValue ( data.myPhyMin );
-// myPhyMax ->setValue ( data.myPhyMax );
-// myGeoMin ->setValue ( data.myGeoMin );
-// myGeoMax ->setValue ( data.myGeoMax );
+ myPhyMin->setText( data.myPhyMin );
+ myPhyMax->setText( data.myPhyMax );
+ myGeoMin->setText( data.myGeoMin );
+ myGeoMax->setText( data.myGeoMax );
#endif
- myGeometricMesh ->setCurrentItem( data.myGeometricMesh );
- myAngleMeshS ->setValue ( data.myAngleMeshS);
- myAngleMeshC ->setValue ( data.myAngleMeshC);
- myGradation ->setValue ( data.myGradation);
- myAllowQuadrangles->setChecked ( data.myAllowQuadrangles );
- myDecimesh ->setChecked ( data.myDecimesh );
- myVerbosity ->setValue ( data.myVerbosity);
+ myGeometricMesh->setCurrentIndex( data.myGeometricMesh );
+ myAngleMeshS->setValue( data.myAngleMeshS );
+ myAngleMeshC->setValue( data.myAngleMeshC );
+ myGradation->setValue( data.myGradation );
+ myAllowQuadrangles->setChecked( data.myAllowQuadrangles );
+ myDecimesh->setChecked( data.myDecimesh );
+ myVerbosity->setValue( data.myVerbosity );
if ( myOptions.operator->() ) {
+ printf("retrieveParams():myOptions->length()=%d\n",myOptions->length());
for ( int i = 0, nb = myOptions->length(); i < nb; ++i ) {
QString option = that->myOptions[i].in();
- QStringList name_value = QStringList::split( ":", option );
- if ( name_value.size() > 1 ) {
+ QStringList name_value = option.split( ":", QString::KeepEmptyParts );
+ if ( name_value.count() > 1 ) {
QString idStr = QString("%1").arg( i );
- int row = myOptionTable->numRows();
- myOptionTable->insertRows( row );
- myOptionTable->setText( row, OPTION_ID_COLUMN, idStr);
- myOptionTable->setText( row, OPTION_NAME_COLUMN, name_value[0]);
- myOptionTable->setText( row, OPTION_VALUE_COLUMN, name_value[1] );
+ int row = myOptionTable->rowCount();
+ myOptionTable->setRowCount( row+1 );
+ myOptionTable->setItem( row, OPTION_ID_COLUMN, new QTableWidgetItem( idStr ) );
+ myOptionTable->item( row, OPTION_ID_COLUMN )->setFlags( 0 );
+ myOptionTable->setItem( row, OPTION_NAME_COLUMN, new QTableWidgetItem( name_value[0] ) );
+ myOptionTable->item( row, OPTION_NAME_COLUMN )->setFlags( 0 );
+ myOptionTable->setItem( row, OPTION_VALUE_COLUMN, new QTableWidgetItem( name_value[1] ) );
+ myOptionTable->item( row, OPTION_VALUE_COLUMN )->setFlags( Qt::ItemIsSelectable |
+ Qt::ItemIsEditable |
+ Qt::ItemIsEnabled );
}
}
}
- myOptionTable->adjustColumn( OPTION_NAME_COLUMN );
+ myOptionTable->resizeColumnToContents( OPTION_NAME_COLUMN );
// update widgets
that->onPhysicalMeshChanged();
h_data.myTopology = (int) h->GetTopology();
h_data.myPhysicalMesh = (int) h->GetPhysicalMesh();
h_data.myPhySize = QString::number( h->GetPhySize() );
-// h_data.myPhySize = h->GetPhySize();
h_data.myGeometricMesh = (int) h->GetGeometricMesh();
h_data.myAngleMeshS = h->GetAngleMeshS();
h_data.myAngleMeshC = h->GetAngleMeshC();
h_data.myPhyMax = PhyMax > 0 ? QString::number( h->GetPhyMax() ) : QString("");
h_data.myGeoMin = GeoMin > 0 ? QString::number( h->GetGeoMin() ) : QString("");
h_data.myGeoMax = GeoMax > 0 ? QString::number( h->GetGeoMax() ) : QString("");
-// h_data.myPhyMin = h->GetPhyMin();
-// h_data.myPhyMax = h->GetPhyMax();
-// h_data.myGeoMin = h->GetGeoMin();
-// h_data.myGeoMax = h->GetGeoMax();
#endif
BLSURFPluginGUI_HypothesisCreator* that = (BLSURFPluginGUI_HypothesisCreator*)this;
try
{
if( isCreation() )
- SMESH::SetName( SMESH::FindSObject( h ), h_data.myName.latin1() );
+ SMESH::SetName( SMESH::FindSObject( h ), h_data.myName.toLatin1().constData() );
if ( h->GetTopology() != h_data.myTopology ) // avoid duplication of DumpPython commands
h->SetTopology( (int) h_data.myTopology );
h->SetGeoMax( -1 );
else if ( h->GetGeoMax() != h_data.myGeoMax.toDouble() )
h->SetGeoMax( h_data.myGeoMax.toDouble() );
-// if ( h->GetPhyMin() != h_data.myPhyMin )
-// h->SetPhyMin( h_data.myPhyMin );
-// if ( h->GetPhyMax() != h_data.myPhyMax )
-// h->SetPhyMax( h_data.myPhyMax );
-// if ( h->GetGeoMin() != h_data.myGeoMin )
-// h->SetGeoMin( h_data.myGeoMin );
-// if ( h->GetGeoMax() != h_data.myGeoMax )
-// h->SetGeoMax( h_data.myGeoMax );
#endif
+ printf("storeParamsToHypo():myOptions->length()=%d\n",myOptions->length());
h->SetOptionValues( myOptions ); // is set in checkParams()
}
catch(const SALOME::SALOME_Exception& ex)
QString BLSURFPluginGUI_HypothesisCreator::readParamsFromWidgets( BlsurfHypothesisData& h_data ) const
{
h_data.myName = myName ? myName->text() : "";
- h_data.myTopology = myTopology->currentItem();
- h_data.myPhysicalMesh = myPhysicalMesh->currentItem();
+ h_data.myTopology = myTopology->currentIndex();
+ h_data.myPhysicalMesh = myPhysicalMesh->currentIndex();
h_data.myPhySize = myPhySize->text();
-// h_data.myPhySize = myPhySize->value();
#ifdef WITH_SIZE_BOUNDARIES
h_data.myPhyMin = myPhyMin->text();
h_data.myPhyMax = myPhyMax->text();
h_data.myGeoMin = myGeoMin->text();
h_data.myGeoMax = myGeoMax->text();
-// h_data.myPhyMin = myPhyMin->value();
-// h_data.myPhyMax = myPhyMax->value();
-// h_data.myGeoMin = myGeoMin->value();
-// h_data.myGeoMax = myGeoMax->value();
#endif
- h_data.myGeometricMesh = myGeometricMesh->currentItem();
+ h_data.myGeometricMesh = myGeometricMesh->currentIndex();
h_data.myAngleMeshS = myAngleMeshS->value();
h_data.myAngleMeshC = myAngleMeshC->value();
h_data.myGradation = myGradation->value();
#endif
BLSURFPluginGUI_HypothesisCreator* that = (BLSURFPluginGUI_HypothesisCreator*)this;
- int row = 0, nbRows = myOptionTable->numRows();
+ int row = 0, nbRows = myOptionTable->rowCount();
for ( ; row < nbRows; ++row )
{
- int id = myOptionTable->text( row, OPTION_ID_COLUMN ).toInt();
+ int id = myOptionTable->item( row, OPTION_ID_COLUMN )->text().toInt();
if ( id >= 0 && id < myOptions->length() )
{
- QString name = myOptionTable->text( row, OPTION_NAME_COLUMN );
- QString value = myOptionTable->text( row, OPTION_VALUE_COLUMN ).stripWhiteSpace();
- if ( !value )
+ QString name = myOptionTable->item( row, OPTION_NAME_COLUMN )->text();
+ QString value = myOptionTable->item( row, OPTION_VALUE_COLUMN )->text().trimmed();
+ if ( value.isNull() )
value = "";
- that->myOptions[ id ] = ( name + ":" + value).latin1();
+ that->myOptions[ id ] = ( name + ":" + value).toLatin1().constData();
if ( value != "" )
guiHyp += name + " = " + value + "; ";
}
}
- cout << "guiHyp : " << guiHyp << endl;
+ cout << "guiHyp : " << guiHyp.toLatin1().data() << endl;
return guiHyp;
}
void BLSURFPluginGUI_HypothesisCreator::onPhysicalMeshChanged() {
- bool isCustom = (myPhysicalMesh->currentItem() == PhysicalUserDefined);
+ bool isCustom = (myPhysicalMesh->currentIndex() == PhysicalUserDefined);
myPhySize->setEnabled(isCustom);
myPhyMax->setEnabled(isCustom);
myPhyMin->setEnabled(isCustom);
- if ( ! isCustom ) {
+ if ( !isCustom ) {
QString aPhySize = "";
-// double aPhySize;
- switch( myPhysicalMesh->currentItem() ) {
+ switch( myPhysicalMesh->currentIndex() ) {
case DefaultSize:
default:
aPhySize = "10";
-// aPhySize = 10;
break;
}
myPhySize->setText( aPhySize );
-// myPhySize->setValue( aPhySize );
if ( !isDouble( myPhyMin->text(), true ))
myPhyMin->setText("");
if ( !isDouble( myPhyMax->text(), true ))
myPhyMax->setText("");
- // hphy_flag = 0 and hgeo_flag = 0 is not allowed (spec)
- if ( myGeometricMesh->currentItem() == DefaultGeom ) {
- myGeometricMesh->setCurrentItem( UserDefined );
+ if ( myGeometricMesh->currentIndex() == DefaultGeom ) {
+ myGeometricMesh->setCurrentIndex( UserDefined );
onGeometricMeshChanged();
}
}
}
void BLSURFPluginGUI_HypothesisCreator::onGeometricMeshChanged() {
- bool isCustom = (myGeometricMesh->currentItem() == UserDefined);
+ bool isCustom = (myGeometricMesh->currentIndex() == UserDefined);
myAngleMeshS->setEnabled(isCustom);
myAngleMeshC->setEnabled(isCustom);
myGradation->setEnabled(isCustom);
if ( ! isCustom ) {
double aAngleMeshS, aGradation;
- switch( myGeometricMesh->currentItem() ) {
+ switch( myGeometricMesh->currentIndex() ) {
case DefaultGeom:
default:
aAngleMeshS = 8;
if ( !isDouble( myGeoMax->text(), true ))
myGeoMax->setText("");
// hphy_flag = 0 and hgeo_flag = 0 is not allowed (spec)
- if ( myPhysicalMesh->currentItem() == DefaultSize ) {
- myPhysicalMesh->setCurrentItem( PhysicalUserDefined );
+ if ( myPhysicalMesh->currentIndex() == DefaultSize ) {
+ myPhysicalMesh->setCurrentIndex( PhysicalUserDefined );
onPhysicalMeshChanged();
}
}
}
-void BLSURFPluginGUI_HypothesisCreator::onTabSelected(int tab)
-{
- if ( tab == STD_TAB ) {
- myAdvGroup->hide();
- myStdGroup->show();
- }
- else {
- myStdGroup->hide();
- myAdvGroup->show();
- }
- qApp->processEvents();
- dlg()->adjustSize();
-}
-
void BLSURFPluginGUI_HypothesisCreator::onAddOption()
{
- if (!myPopup) {
- // fill popup with option names
- myPopup = new QPopupMenu();
- if ( myOptions.operator->() ) {
- for ( int i = 0, nb = myOptions->length(); i < nb; ++i ) {
- QString name_value = myOptions[i].in();
- QString name = QStringList::split( ":", name_value )[0];
- myPopup->insertItem( name, i );
- }
+ QMenu* menu = (QMenu*)sender();
+ // fill popup with option names
+ menu->clear();
+ if ( myOptions.operator->() ) {
+ for ( int i = 0, nb = myOptions->length(); i < nb; ++i ) {
+ QString name_value = myOptions[i].in();
+ QString name = name_value.split( ":", QString::KeepEmptyParts )[0];
+ menu->addAction( name );
}
- connect( myPopup, SIGNAL( activated( int ) ), SLOT( onOptionChosenInPopup( int ) ) );
}
- if ( myPopup && myPopup->text(0) )
- myPopup->exec( QCursor::pos() );
}
-void BLSURFPluginGUI_HypothesisCreator::onOptionChosenInPopup(int i)
+void BLSURFPluginGUI_HypothesisCreator::onOptionChosenInPopup( QAction* a )
{
myOptionTable->setFocus();
- qApp->processEvents();
+ QMenu* menu = (QMenu*)( a->parent() );
- QString idStr = QString("%1").arg( i );
- QString option = myOptions[i].in();
- QString optionName = QStringList::split( ":", option )[0];
+ int idx = menu->actions().indexOf( a );
+ QString idStr = QString("%1").arg( idx );
+ QString option = myOptions[idx].in();
+ QString optionName = option.split( ":", QString::KeepEmptyParts )[0];
// look for a row with optionName
- int row = 0, nbRows = myOptionTable->numRows();
+ int row = 0, nbRows = myOptionTable->rowCount();
for ( ; row < nbRows; ++row )
- if ( myOptionTable->text( row, OPTION_ID_COLUMN ) == idStr )
+ if ( myOptionTable->item( row, OPTION_ID_COLUMN )->text() == idStr )
break;
// add a row if not found
- if ( row == nbRows )
- myOptionTable->insertRows( nbRows );
-
- myOptionTable->setText( row, OPTION_ID_COLUMN, idStr);
- myOptionTable->setText( row, OPTION_NAME_COLUMN, optionName);
- myOptionTable->editCell( row, OPTION_VALUE_COLUMN );
- myOptionTable->adjustColumn( OPTION_NAME_COLUMN );
+ if ( row == nbRows ) {
+ myOptionTable->setRowCount( row+1 );
+ myOptionTable->setItem( row, OPTION_ID_COLUMN, new QTableWidgetItem( idStr ) );
+ myOptionTable->item( row, OPTION_ID_COLUMN )->setFlags( 0 );
+ myOptionTable->setItem( row, OPTION_NAME_COLUMN, new QTableWidgetItem( optionName ) );
+ myOptionTable->item( row, OPTION_NAME_COLUMN )->setFlags( 0 );
+ myOptionTable->setItem( row, OPTION_VALUE_COLUMN, new QTableWidgetItem( "" ) );
+ myOptionTable->item( row, OPTION_VALUE_COLUMN )->setFlags( Qt::ItemIsSelectable |
+ Qt::ItemIsEditable |
+ Qt::ItemIsEnabled );
+ myOptionTable->resizeColumnToContents( OPTION_NAME_COLUMN );
+ }
+ myOptionTable->clearSelection();
+ myOptionTable->scrollToItem( myOptionTable->item( row, OPTION_VALUE_COLUMN ) );
+ //myOptionTable->item( row, OPTION_VALUE_COLUMN )->setSelected( true );
+ myOptionTable->setCurrentCell( row, OPTION_VALUE_COLUMN );
+ //myOptionTable->openPersistentEditor( myOptionTable->item( row, OPTION_VALUE_COLUMN ) );
}
void BLSURFPluginGUI_HypothesisCreator::onDeleteOption()
{
// clear option values and remember selected row
- std::set<int> selectedRows;
- int row = 0, nbRows = myOptionTable->numRows();
- for ( ; row < nbRows; ++row ) {
- if ( myOptionTable->isRowSelected( row )) {
- selectedRows.insert( row );
- int id = myOptionTable->text( row, OPTION_ID_COLUMN ).toInt();
+ QList<int> selectedRows;
+ QList<QTableWidgetItem*> selected = myOptionTable->selectedItems();
+ QTableWidgetItem* item;
+ foreach( item, selected ) {
+ int row = item->row();
+ if ( !selectedRows.contains( row ) ) {
+ selectedRows.append( row );
+ int id = myOptionTable->item( row, OPTION_ID_COLUMN )->text().toInt();
if ( id >= 0 && id < myOptions->length() )
- myOptions[ id ] = myOptionTable->text( row, OPTION_NAME_COLUMN );
+ myOptions[ id ] = myOptionTable->item( row, OPTION_NAME_COLUMN )->text().toLatin1().constData();
}
}
- // remove selected rows
- std::set<int>::reverse_iterator r = selectedRows.rbegin();
- for ( ; r != selectedRows.rend(); ++r )
- myOptionTable->removeRow ( *r );
+ qSort( selectedRows );
+ QListIterator<int> it( selectedRows );
+ it.toBack();
+ while ( it.hasPrevious() )
+ myOptionTable->removeRow( it.previous() );
}
QPixmap BLSURFPluginGUI_HypothesisCreator::icon() const
{
- QString hypIconName = tr( "ICON_DLG_BLSURF_PARAMETERS");
- return SUIT_Session::session()->resourceMgr()->loadPixmap( "BLSURFPlugin", hypIconName );
+ return SUIT_Session::session()->resourceMgr()->loadPixmap( "BLSURFPlugin", tr( "ICON_DLG_BLSURF_PARAMETERS") );
}
QString BLSURFPluginGUI_HypothesisCreator::type() const
-// BLSURFPlugin GUI: GUI for plugged-in mesher BLSURFPlugin
+// BLSURFPlugin GUI: GUI for plugged-in mesher BLSURFPlugin
//
-// 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.
+// 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.
+// 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.org
//
+// ---
//
-// File : BLSURFPluginGUI_HypothesisCreator.h
+// File : BLSURFPluginGUI_HypothesisCreator.h
// Authors : Francis KLOSS (OCC) & Patrick LAUG (INRIA) & Lioka RAZAFINDRAZAKA (CEA)
// & Aurelien ALLEAUME (DISTENE)
-// Module : BLSURFPlugin
-// $Header:
-
-#ifndef BLSURFPLUGINGUI_HypothesisCreator_HeaderFile
-#define BLSURFPLUGINGUI_HypothesisCreator_HeaderFile
+// ---
+
+#ifndef BLSURFPLUGINGUI_HypothesisCreator_H
+#define BLSURFPLUGINGUI_HypothesisCreator_H
+
+#ifdef WIN32
+ #ifdef BLSURFPLUGIN_GUI_EXPORTS
+ #define BLSURFPLUGIN_GUI_EXPORT __declspec( dllexport )
+ #else
+ #define BLSURFPLUGIN_GUI_EXPORT __declspec( dllimport )
+ #endif
+#else
+ #define BLSURFPLUGIN_GUI_EXPORT
+#endif
#include <SMESHGUI_Hypotheses.h>
+#include <SALOMEconfig.h>
#include CORBA_SERVER_HEADER(BLSURFPlugin_Algorithm)
-class QtxDblSpinBox;
-class QtxComboBox;
+class QGroupBox;
+class QtxDoubleSpinBox;
+class QComboBox;
class QCheckBox;
class QLineEdit;
-class QTable;
+class QTableWidget;
class QSpinBox;
-class QPopupMenu;
+class QMenu;
+class QAction;
typedef struct
{
int myTopology, myVerbosity;
int myPhysicalMesh, myGeometricMesh;
- double /*myPhySize, */myAngleMeshS, myAngleMeshC, myGradation;
+ double myAngleMeshS, myAngleMeshC, myGradation;
QString myPhySize, myGeoMin, myGeoMax, myPhyMin, myPhyMax;
-// double myGeoMin, myGeoMax, myPhyMin, myPhyMax;
bool myAllowQuadrangles, myDecimesh;
QString myName;
/*!
* \brief Class for creation of BLSURF hypotheses
*/
-
-class BLSURFPlugin_Hypothesis;
-
-class BLSURFPluginGUI_HypothesisCreator : public SMESHGUI_GenericHypothesisCreator
+class BLSURFPLUGIN_GUI_EXPORT BLSURFPluginGUI_HypothesisCreator : public SMESHGUI_GenericHypothesisCreator
{
Q_OBJECT
virtual QString type() const;
protected slots:
- void onPhysicalMeshChanged();
- void onGeometricMeshChanged();
- void onTabSelected(int);
- void onAddOption();
- void onDeleteOption();
- void onOptionChosenInPopup(int);
+ void onPhysicalMeshChanged();
+ void onGeometricMeshChanged();
+ void onAddOption();
+ void onDeleteOption();
+ void onOptionChosenInPopup( QAction* );
private:
- bool readParamsFromHypo( BlsurfHypothesisData& ) const;
- QString readParamsFromWidgets( BlsurfHypothesisData& ) const;
- bool storeParamsToHypo( const BlsurfHypothesisData& ) const;
+ bool readParamsFromHypo( BlsurfHypothesisData& ) const;
+ QString readParamsFromWidgets( BlsurfHypothesisData& ) const;
+ bool storeParamsToHypo( const BlsurfHypothesisData& ) const;
private:
-
- QGroupBox* myStdGroup;
- QLineEdit* myName;
- QtxComboBox* myPhysicalMesh;
-// QtxDblSpinBox* myPhySize;
-// QtxDblSpinBox* myPhyMin;
-// QtxDblSpinBox* myPhyMax;
- QLineEdit* myPhySize;
- QLineEdit* myPhyMin;
- QLineEdit* myPhyMax;
- QtxComboBox* myGeometricMesh;
- QtxDblSpinBox* myAngleMeshS;
- QtxDblSpinBox* myAngleMeshC;
- QLineEdit* myGeoMin;
- QLineEdit* myGeoMax;
-// QtxDblSpinBox* myGeoMin;
-// QtxDblSpinBox* myGeoMax;
- QtxDblSpinBox* myGradation;
- QCheckBox* myAllowQuadrangles;
- QCheckBox* myDecimesh;
-
- QGroupBox* myAdvGroup;
- QtxComboBox* myTopology;
- QSpinBox* myVerbosity;
- QTable* myOptionTable;
- QPopupMenu* myPopup;
+ QWidget* myStdGroup;
+ QLineEdit* myName;
+ QComboBox* myPhysicalMesh;
+ QLineEdit* myPhySize;
+ QLineEdit* myPhyMin;
+ QLineEdit* myPhyMax;
+ QComboBox* myGeometricMesh;
+ QtxDoubleSpinBox* myAngleMeshS;
+ QtxDoubleSpinBox* myAngleMeshC;
+ QLineEdit* myGeoMin;
+ QLineEdit* myGeoMax;
+ QtxDoubleSpinBox* myGradation;
+ QCheckBox* myAllowQuadrangles;
+ QCheckBox* myDecimesh;
+
+ QWidget* myAdvGroup;
+ QComboBox* myTopology;
+ QSpinBox* myVerbosity;
+ QTableWidget* myOptionTable;
BLSURFPlugin::string_array_var myOptions;
};
-#endif
+#endif // BLSURFPLUGINGUI_HypothesisCreator_H
+++ /dev/null
-# Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS, L3S, LJLL, MENSI
-#
-# 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".
-msgid ""
-msgstr ""
-"Project-Id-Version: PROJECT VERSION\n"
-"POT-Creation-Date: 2002-05-28 10:57:43 AM CEST\n"
-"PO-Revision-Date: 2008-04-08 15:34+0400\n"
-"Last-Translator: FULLNAME <EMAIL@ADDRESS>\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-
-
-#-----------------------------------------------------------
-# Hypothesis
-#-----------------------------------------------------------
-
-msgid "ICON_DLG_BLSURF_PARAMETERS"
-msgstr "mesh_hypo_BLSURF.png"
-
-#-----------------------------------------------------------
-# ObjectBrowser
-#-----------------------------------------------------------
-
-msgid "ICON_SMESH_TREE_ALGO_BLSURF"
-msgstr "mesh_tree_algo_BLSURF.png"
-
-msgid "ICON_SMESH_TREE_HYPO_BLSURF_Parameters"
-msgstr "mesh_tree_hypo_BLSURF.png"
-
--- /dev/null
+<!DOCTYPE TS>
+<TS version="1.1" >
+ <context>
+ <name>@default</name>
+ <message>
+ <source>ICON_DLG_BLSURF_PARAMETERS</source>
+ <translation>mesh_hypo_BLSURF.png</translation>
+ </message>
+ <message>
+ <source>ICON_SMESH_TREE_ALGO_BLSURF</source>
+ <translation>mesh_tree_algo_BLSURF.png</translation>
+ </message>
+ <message>
+ <source>ICON_SMESH_TREE_HYPO_BLSURF_Parameters</source>
+ <translation>mesh_tree_hypo_BLSURF.png</translation>
+ </message>
+ </context>
+</TS>
+++ /dev/null
-# Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS, L3S, LJLL, MENSI
-#
-# 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".
-//
-// File : BLSURFPlugin_msg_en.po
-// Authors : Francis KLOSS (OCC) & Patrick LAUG (INRIA) & Lioka RAZAFINDRAZAKA (CEA)
-// & Aurelien ALLEAUME (DISTENE)
-// Date : 28/03/2006
-// Project : SALOME
-//=============================================================================
-
-msgid ""
-msgstr ""
-"Project-Id-Version: PROJECT VERSION\n"
-"POT-Creation-Date: 2002-05-28 10:46:48 AM CEST\n"
-"PO-Revision-Date: YYYY-MM-DD\n"
-"Last-Translator: FULLNAME <EMAIL@ADDRESS>\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-
-msgid "BLSURF_HYPOTHESIS"
-msgstr "BLSURF 2D"
-
-msgid "BLSURF_TOPOLOGY"
-msgstr "Topology"
-
-msgid "BLSURF_TOPOLOGY_CAD"
-msgstr "From CAD"
-
-msgid "BLSURF_TOPOLOGY_PROCESS"
-msgstr "Pre-process"
-
-msgid "BLSURF_TOPOLOGY_PROCESS2"
-msgstr "Pre-process++"
-
-msgid "BLSURF_PHY_MESH"
-msgstr "Physical Mesh"
-
-msgid "BLSURF_DEFAULT_USER"
-msgstr "None"
-#msgstr "Default" #PAL19680
-
-msgid "BLSURF_CUSTOM_USER"
-msgstr "Custom"
-
-msgid "BLSURF_HPHYDEF"
-msgstr "User Size"
-
-msgid "BLSURF_HPHYMIN"
-msgstr "Min Physical Size"
-
-msgid "BLSURF_HPHYMAX"
-msgstr "Max Physical Size"
-
-msgid "BLSURF_HGEOMIN"
-msgstr "Min Geometrical Size"
-
-msgid "BLSURF_HGEOMAX"
-msgstr "Max Geometrical Size"
-
-msgid "BLSURF_GEOM_MESH"
-msgstr "Geometrical Mesh"
-
-msgid "BLSURF_DEFAULT_GEOM"
-msgstr "None"
-#msgstr "Default" #PAL19680
-
-msgid "BLSURF_CUSTOM_GEOM"
-msgstr "Custom"
-
-msgid "BLSURF_ANGLE_MESH_S"
-msgstr "Angle Mesh S"
-
-msgid "BLSURF_ANGLE_MESH_C"
-msgstr "Angle Mesh C"
-
-msgid "BLSURF_GRADATION"
-msgstr "Gradation"
-
-msgid "BLSURF_DECIMESH"
-msgstr "Patch independent"
-
-msgid "BLSURF_VERBOSITY"
-msgstr "Verbosity level"
-
-msgid "BLSURF_ALLOW_QUADRANGLES"
-msgstr "Allow Quadrangles (Test)"
-
-msgid "BLSURF_TITLE"
-msgstr "Hypothesis Construction"
-
-msgid "ADD_OPTION"
-msgstr "Add option"
-
-msgid "REMOVE_OPTION"
-msgstr "Clear option"
-
-msgid "OPTION_NAME_COLUMN"
-msgstr "Option"
-
-msgid "OPTION_VALUE_COLUMN"
-msgstr "Value"
-
-msgid "OBIGATORY_VALUE"
-msgstr "(Obigatory value)"
--- /dev/null
+<!DOCTYPE TS>
+<TS version="1.1" >
+ <context>
+ <name>@default</name>
+ <message>
+ <source>ADD_OPTION</source>
+ <translation>Add option</translation>
+ </message>
+ <message>
+ <source>BLSURF_ALLOW_QUADRANGLES</source>
+ <translation>Allow Quadrangles (Test)</translation>
+ </message>
+ <message>
+ <source>BLSURF_ANGLE_MESH_C</source>
+ <translation>Angle Mesh C</translation>
+ </message>
+ <message>
+ <source>BLSURF_ANGLE_MESH_S</source>
+ <translation>Angle Mesh S</translation>
+ </message>
+ <message>
+ <source>BLSURF_CUSTOM_GEOM</source>
+ <translation>Custom</translation>
+ </message>
+ <message>
+ <source>BLSURF_CUSTOM_USER</source>
+ <translation>Custom</translation>
+ </message>
+ <message>
+ <source>BLSURF_DECIMESH</source>
+ <translation>Patch independent</translation>
+ </message>
+ <message>
+ <source>BLSURF_DEFAULT_GEOM</source>
+ <translation>None</translation>
+ </message>
+ <message>
+ <source>BLSURF_DEFAULT_USER</source>
+ <translation>None</translation>
+ </message>
+ <message>
+ <source>BLSURF_GEOM_MESH</source>
+ <translation>Geometrical Mesh</translation>
+ </message>
+ <message>
+ <source>BLSURF_GRADATION</source>
+ <translation>Gradation</translation>
+ </message>
+ <message>
+ <source>BLSURF_HGEOMAX</source>
+ <translation>Max Geometrical Size</translation>
+ </message>
+ <message>
+ <source>BLSURF_HGEOMIN</source>
+ <translation>Min Geometrical Size</translation>
+ </message>
+ <message>
+ <source>BLSURF_HPHYDEF</source>
+ <translation>User Size</translation>
+ </message>
+ <message>
+ <source>BLSURF_HPHYMAX</source>
+ <translation>Max Physical Size</translation>
+ </message>
+ <message>
+ <source>BLSURF_HPHYMIN</source>
+ <translation>Min Physical Size</translation>
+ </message>
+ <message>
+ <source>BLSURF_HYPOTHESIS</source>
+ <translation>BLSURF 2D</translation>
+ </message>
+ <message>
+ <source>BLSURF_PHY_MESH</source>
+ <translation>Physical Mesh</translation>
+ </message>
+ <message>
+ <source>BLSURF_TITLE</source>
+ <translation>Hypothesis Construction</translation>
+ </message>
+ <message>
+ <source>BLSURF_TOPOLOGY</source>
+ <translation>Topology</translation>
+ </message>
+ <message>
+ <source>BLSURF_TOPOLOGY_CAD</source>
+ <translation>From CAD</translation>
+ </message>
+ <message>
+ <source>BLSURF_TOPOLOGY_PROCESS</source>
+ <translation>Pre-process</translation>
+ </message>
+ <message>
+ <source>BLSURF_TOPOLOGY_PROCESS2</source>
+ <translation>Pre-process++</translation>
+ </message>
+ <message>
+ <source>BLSURF_VERBOSITY</source>
+ <translation>Verbosity level</translation>
+ </message>
+ <message>
+ <source>OBLIGATORY_VALUE</source>
+ <translation>(Obligatory value)</translation>
+ </message>
+ <message>
+ <source>OPTION_NAME_COLUMN</source>
+ <translation>Option</translation>
+ </message>
+ <message>
+ <source>OPTION_VALUE_COLUMN</source>
+ <translation>Value</translation>
+ </message>
+ <message>
+ <source>REMOVE_OPTION</source>
+ <translation>Clear option</translation>
+ </message>
+ </context>
+</TS>
--- /dev/null
+# Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+# ---
+#
+# File: Makefile.am
+#
+# ---
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+# header files
+salomeinclude_HEADERS =
+
+# Libraries targets
+lib_LTLIBRARIES = libBLSURFPluginGUI.la
+
+dist_libBLSURFPluginGUI_la_SOURCES = \
+ BLSURFPluginGUI.cxx \
+ BLSURFPluginGUI_HypothesisCreator.h \
+ BLSURFPluginGUI_HypothesisCreator.cxx
+
+MOC_FILES = \
+ BLSURFPluginGUI_HypothesisCreator_moc.cxx
+
+nodist_libBLSURFPluginGUI_la_SOURCES = \
+ $(MOC_FILES)
+
+# additionnal information to compil and link file
+
+libBLSURFPluginGUI_la_CPPFLAGS = \
+ $(QT_INCLUDES) \
+ $(CAS_CPPFLAGS) \
+ $(PYTHON_INCLUDES) \
+ $(KERNEL_CXXFLAGS) \
+ $(GUI_CXXFLAGS) \
+ $(GEOM_CXXFLAGS) \
+ $(MED_CXXFLAGS) \
+ $(SMESH_CXXFLAGS) \
+ $(BOOST_CPPFLAGS) \
+ $(CORBA_CXXFLAGS) \
+ $(CORBA_INCLUDES) \
+ $(BLSURF_INCLUDES) \
+ -I$(srcdir)/../BLSURFPlugin \
+ -I$(top_builddir)/idl \
+ -I$(top_builddir)/salome_adm/unix
+
+libBLSURFPluginGUI_la_LDFLAGS = \
+ ../BLSURFPlugin/libBLSURFEngine.la \
+ ${SMESH_LDFLAGS} -lSMESH \
+ $(CAS_KERNEL) $(BLSURF_LIBS)
+
+# resources files
+nodist_salomeres_DATA = \
+ BLSURFPlugin_images.qm \
+ BLSURFPlugin_msg_en.qm
+++ /dev/null
-# Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS, L3S, LJLL, MENSI
-#
-# 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 : Makefile.in
-# Authors : Francis KLOSS (OCC) & Patrick LAUG (INRIA)
-# Module : BLSURFPLUGIN
-
-top_srcdir=@top_srcdir@
-top_builddir=../..
-srcdir=@srcdir@
-VPATH=.:@srcdir@:@top_srcdir@/idl:$(top_builddir)/idl:${KERNEL_ROOT_DIR}/idl/salome:${GUI_ROOT_DIR}/idl/salome:${GEOM_ROOT_DIR}/idl/salome:${SMESH_ROOT_DIR}/idl/salome:${MED_ROOT_DIR}/idl/salome
-
-@COMMENCE@
-
-# .po files to transform in .qm
-PO_FILES = \
- BLSURFPlugin_images.po \
- BLSURFPlugin_msg_en.po
-
-# Libraries targets
-LIB = libBLSURFPluginGUI.la
-
-LIB_SRC = \
- BLSURFPluginGUI.cxx \
- BLSURFPluginGUI_HypothesisCreator.cxx
-
-LIB_MOC = \
- BLSURFPluginGUI_HypothesisCreator.h
-
-LIB_CLIENT_IDL = \
- SALOME_Exception.idl \
- SALOME_GenericObj.idl \
- SALOME_Component.idl \
- SALOME_Comm.idl \
- GEOM_Gen.idl \
- MED.idl \
- SMESH_Gen.idl \
- SMESH_Mesh.idl \
- SMESH_Group.idl \
- BLSURFPlugin_Algorithm.idl
-
-LIB_SERVER_IDL =
-
-# additionnal information to compil and link file
-
-CPPFLAGS += $(QT_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) \
- -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome \
- -I${GEOM_ROOT_DIR}/include/salome -I${SMESH_ROOT_DIR}/include/salome \
- $(BOOST_CPPFLAGS)
-CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome \
- -I${GEOM_ROOT_DIR}/include/salome -I${SMESH_ROOT_DIR}/include/salome
-
-LDFLAGS += -lSMESH $(OCC_KERNEL_LIBS) -L${KERNEL_ROOT_DIR}/lib${LIB_LOCATION_SUFFIX}/salome \
- -L${GUI_ROOT_DIR}/lib${LIB_LOCATION_SUFFIX}/salome -L${GEOM_ROOT_DIR}/lib${LIB_LOCATION_SUFFIX}/salome \
- -L${SMESH_ROOT_DIR}/lib${LIB_LOCATION_SUFFIX}/salome
-
-@CONCLUDE@
--- /dev/null
+# Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+# ---
+#
+# File: Makefile.am
+#
+# ---
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+SUBDIRS = BLSURFPlugin
+
+if BLSURFPLUGIN_ENABLE_GUI
+ SUBDIRS += GUI
+endif
+++ /dev/null
-# 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
-#
-#
-#
-# File : Makefile.in
-# Author : Patrick GOLDBRONN (CEA)
-# Module : SMESH
-
-top_srcdir=@top_srcdir@
-top_builddir=..
-srcdir=@srcdir@
-VPATH=.:@srcdir@
-
-@COMMENCE@
-
-SUBDIRS = BLSURFPlugin
-
-ifeq (@WITHGUI@,yes)
- SUBDIRS += GUI
-endif
-
-@MODULE@
