From: apo Date: Thu, 26 Apr 2007 14:27:32 +0000 (+0000) Subject: The first working version X-Git-Tag: mergeto_BR_Dev_For_4_0_21May07~36 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=099c76886d50d2b50be4f31582f08dfa9fc3e42a;p=modules%2Fvisu.git The first working version --- diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/AUTHORS @@ -0,0 +1 @@ + diff --git a/COPYING b/COPYING new file mode 100644 index 00000000..b1e3f5a2 --- /dev/null +++ b/COPYING @@ -0,0 +1,504 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 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. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +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 and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, 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 library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete 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 distribute a copy of this License along with the +Library. + + 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 Library or any portion +of it, thus forming a work based on the Library, 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) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +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 Library, 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 Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you 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. + + If distribution of 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 satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be 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. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library 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. + + 9. 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 Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +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 with +this License. + + 11. 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 Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library 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 Library. + +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. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library 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. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser 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 Library +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 Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +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 + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "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 +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. 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 LIBRARY 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 +LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. 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. + + + Copyright (C) + + 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, or (at your option) any later version. + + 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 + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/ChangeLog @@ -0,0 +1 @@ + diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 00000000..d0f22977 --- /dev/null +++ b/Makefile.am @@ -0,0 +1,48 @@ +# Copyright (C) 2005 CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# -* Makefile *- +# +# Author : Patrick GOLDBRONN (CEA) +# Date : 28/06/2001 +# $Header$ +# + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +SUBDIRS = adm_local idl resources src doc bin + +DISTCLEANFILES = a.out aclocal.m4 configure + +salomeinclude_DATA=VISU_version.h + +EXTRA_DIST+= \ + build_configure \ + clean_configure \ + LICENCE + +dist-hook: + rm -rf `find $(distdir) -name CVS` + +usr_docs: + (cd doc && $(MAKE) $(AM_MAKEFLAGS) usr_docs) + +docs:usr_docs + +dev_docs: + (cd doc && $(MAKE) $(AM_MAKEFLAGS) dev_docs) diff --git a/Makefile.in b/Makefile.in deleted file mode 100644 index ac80cb95..00000000 --- a/Makefile.in +++ /dev/null @@ -1,133 +0,0 @@ -# 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 -# -# -* Makefile *- -# -# Author : Patrick GOLDBRONN (CEA) -# Date : 28/06/2001 -# $Header$ -# - -# source path -top_srcdir=@top_srcdir@ -top_builddir=. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/bin:./bin/salome:./resources:@top_srcdir@/resources:./bin:@top_srcdir@/idl - - -@COMMENCE@ - -SUBDIRS = idl src doc adm_local - -BIN_SCRIPT= \ -VERSION - -# copy header files in common directory - -include_list = include/salome/SALOMEconfig.h \ - include/salome/VISU_version.h - -ifneq ($(HAVE_SSTREAM),yes) - include_list += include/salome/sstream -endif - -inc: idl $(include_list) - -bin: bin/salome/VERSION - -bin/salome/VERSION : bin/VERSION - -$(RM) $@ - $(LN_S) ../../$< $@ - -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) ../../$< $@ - -include/salome/VISU_version.h: VISU_version.h - -$(RM) $@ - $(LN_S) ../../$< $@ - -depend: depend_idl - -depend_idl: - (cd idl ; $(MAKE) $@) || exit 1 - -resources: share/salome/resources/visu/VISUCatalog.xml - -share/salome/resources/visu/VISUCatalog.xml: VISUCatalog.xml - cp $< $@ - -# doc is already build : if you want to had documents, go manually to doc and run 'make doc' -#doc: -# (cd doc && $(MAKE) $@) || exit 1 - -install-end: -# finish libtool install -# @$(LT) --mode=finish $(libdir) - -install-include: $(include_list) - $(INSTALL) -d $(includedir) - @for f in X $(include_list); do \ - if test $$f != X; then \ - ($(INSTALL_DATA) -p $$f $(includedir)/. || exit 1); \ - fi; \ - done - -# install script in $(bindir) : -install-bin: $(BIN_SCRIPT) - $(INSTALL) -d $(bindir) - if test $(BIN_SCRIPT)X != X; then \ - $(INSTALL_PROGRAM) $^ $(bindir); \ - fi - -uninstall: uninstall-idl - -uninstall-idl: - $(RM) $(idldir)/*.idl - -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 install-include install-end - -install-resources: install-catalog - -install-catalog: share/salome/resources/visu/VISUCatalog.xml - $(INSTALL) -d $(datadir)/resources/visu - $(INSTALL_DATA) $< $(datadir)/resources/visu/. diff --git a/NEWS b/NEWS new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/NEWS @@ -0,0 +1 @@ + diff --git a/README b/README new file mode 100644 index 00000000..975c6639 --- /dev/null +++ b/README @@ -0,0 +1,106 @@ +This is the Med Memory package V3.2.0 + +I : Major evolution of the Med Memory package between V2.2.x and V3.2.x : +========================================================================= + +The Med Memory may be used as a stand alone package with only the C++ and the +python layers (adding --without-kernel at the configure step). In this case +there are no links with the SALOME KERNEL. + +In this version, + +- mesh defined with polygones/polyhedra mixed with usual types of cells; + +- the Med File drivers of the Med Memory support the V2.1 as well as the + V2.2 versions of the Med File layer. The requirement of the Salome platform + is only Med File V2.2, the V2.1 version is emberked in the Med Memory. + +- Using the Med file (V2.1 and V2.2) and GIBI drivers; fields laying on a + partial support; + +- Fields defined on cells mesh with multiple gauss points, + +may be mounted in memory and treated. + +With all those new functionalities, most of the Med Memory client codes +based on previous releases of the Med Memory should work; but minor changes +should be done for the get/set field classes methods: + +- the getValue() and the setValue(T *) methods take no MED_EN::medModeSwitch + parameter; +- the getValueI (resp. setValueI) should be replaced by getRow(int ) + (resp. setRow(int ,T*) if the field is in full interlacing mode (using the + method getInterlacingType() of the classe FIELD_). If the field is stored in + no interlacing mode getValueIJ (resp. setValueIJ) should be replaced by + getColumn(int ) (resp. setColumn(int ,T*)). + +Intensive debugging was carried throughout the entire Med Memory C++ Layer: + + - especially on the major user's C++ classes (such as MED, MESH, + SUPPORT and FIELD); + + - the C++ drivers classes on those major classes. Especially the + Med File and the GIBI drivers are read/write ones. The VTK drivers + are only for the writing; and finally the PORFLOW drivers may only + be used for the MESH class in the reading mode. + +The Med Client layer of the Med Memory has been tested in a full +Server/Client configuration. + +II : MedMemory building and installation : +========================================= + +It's very simple : + +./configure --prefix=path_to_your_installation_directory +make +make install + +eventually if the user or the installer needs to build an installation of Med +Memory as a stand alone package, he may use the configure option +--without-kernel. By default the full debug options are set: + - compilation using -g option + - Med Memory debugging information history using -D_DEBUG_ option. + +The user may get all configure option with : + ./configure --help + +The user may set optimization option : + ./configure --enable-production --disable-debug (use compiler flags -O) + +In order to avoid most of the problem the user or the installer should first +check the HDF5HOME and the MED2HOME environment variables. This version of +Med Memory with Med File V2.2.2, V2.2.3, as well as V2.3.0 but with the +version of HDF5 V1.6.3. In the installation of Med File you should take care +of the $HDF5HOME environement variable. This warning is especially intended +to the user of The Med Memory in stand alone (without the SALOME KERNEL +component). + +III : MedMemory testing : +========================= + +After installation of the Med Memory; the user may find a large set of test +files in Med File V2.1, V2.2, GIBI format. + +To check the Med Memory installation, in the directory +path_to_your_installation_directory/bin/salome you may find a set of python +scripts and test executable. To ckeck the deep layers (C++, Python) of the Med +Memory, the installer may run: + +- testMedMemGeneral.py, +- medMeshing_test.py +- test_profil_MedFieldDriver.py +- testGaussLocalization.py +- med_field_anal.py +- test_MEDMEM_MeshingFlica +- test_MEDMEM_Meshing_poly +- test_MEDMEM_MeshingPoly + +To check the upper layer (CORBA, Client), the installer may run in the SALOME +Python consol: + + - Med_Gen_test.py + - medClient_test.py + - testMedAlliances1.py + - testMedAlliances.py + - testMeshAlliances.py diff --git a/adm_local/Makefile.am b/adm_local/Makefile.am new file mode 100644 index 00000000..76fe0fa5 --- /dev/null +++ b/adm_local/Makefile.am @@ -0,0 +1,22 @@ +# Copyright (C) 2005 OPEN CASCADE, CEA, EDF R&D, LEG +# PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT +# 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 +# + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +SUBDIRS= unix \ No newline at end of file diff --git a/adm_local/Makefile.in b/adm_local/Makefile.in deleted file mode 100644 index e2133b49..00000000 --- a/adm_local/Makefile.in +++ /dev/null @@ -1,60 +0,0 @@ -# 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 -# -# 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: - diff --git a/adm_local/unix/Makefile.am b/adm_local/unix/Makefile.am new file mode 100644 index 00000000..facd4e6f --- /dev/null +++ b/adm_local/unix/Makefile.am @@ -0,0 +1,22 @@ +# Copyright (C) 2005 OPEN CASCADE, CEA, EDF R&D, LEG +# PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT +# 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 +# + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +SUBDIRS = config_files diff --git a/adm_local/unix/config_files/Makefile.am b/adm_local/unix/config_files/Makefile.am new file mode 100644 index 00000000..f4266455 --- /dev/null +++ b/adm_local/unix/config_files/Makefile.am @@ -0,0 +1,22 @@ +# Copyright (C) 2005 OPEN CASCADE, CEA, EDF R&D, LEG +# PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT +# 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 +# +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +dist_admlocalm4_DATA= \ + check_VISU.m4 diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in deleted file mode 100644 index bba7766f..00000000 --- a/adm_local/unix/make_commence.in +++ /dev/null @@ -1,290 +0,0 @@ -# common directories to put headerfiles -inc_builddir=$(top_builddir)/include/salome - -MODULE_NAME=@MODULE_NAME@ - -@SET_MAKE@ -SHELL=/bin/sh - -LIB_LOCATION_SUFFIX=@LIB_LOCATION_SUFFIX@ -# header missing - -HAVE_SSTREAM=@HAVE_SSTREAM@ - - -LIBS=@LIBS@ -LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome -Xlinker -rpath-link -Xlinker -# 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@ -BOOST_LIBSUFFIX = @BOOST_LIBSUFFIX@ -BOOST_LIBS = @BOOST_LIBS@ - -# 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 = $(prefix)/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages -PYTHON_SITE_INSTALL = $(prefix)/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages/salome -# 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 = @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@ - -CAS_KERNEL=@CAS_KERNEL@ -CAS_OCAF=@CAS_OCAF@ -CAS_VIEWER=@CAS_VIEWER@ -CAS_MODELER=@CAS_MODELER@ -CAS_DATAEXCHANGE=@CAS_DATAEXCHANGE@ -CAS_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$(top_srcdir)/idl -I$(top_builddir)/salome/idl \ - -I$(KERNEL_ROOT_DIR)/idl/salome -I$(MED_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$(top_srcdir)/idl -I$(top_builddir)/idl/salome \ - -I$(KERNEL_ROOT_DIR)/idl/salome -I$(MED_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) - -# add corba libs when link salome application ! -#LDFLAGS+= $(CORBA_LIBS) -LIBS+=$(CORBA_LIBS) - -DOXYGEN = @DOXYGEN@ -DOXYGEN_WITH_PYTHON = @DOXYGEN_WITH_PYTHON@ -DOXYGEN_WITH_STL = @DOXYGEN_WITH_STL@ - -## 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@ - -KERNEL_ROOT_DIR=@KERNEL_ROOT_DIR@ -KERNEL_SITE_DIR=@KERNEL_SITE_DIR@ - -KERNEL_LDFLAGS=@KERNEL_LDFLAGS@ -KERNEL_CXXFLAGS=@KERNEL_CXXFLAGS@ - -GUI_ROOT_DIR=@GUI_ROOT_DIR@ -GUI_LDFLAGS=@GUI_LDFLAGS@ -GUI_CXXFLAGS=@GUI_CXXFLAGS@ - -MED_ROOT_DIR=@MED_ROOT_DIR@ -MED_LDFLAGS=@MED_LDFLAGS@ -MED_CXXFLAGS=@MED_CXXFLAGS@ - -## Installation points -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@exec_prefix@/bin/salome -libdir=@exec_prefix@/lib@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=@exec_prefix@/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages/salome/shared_modules -incmakedir=${prefix}/salome_adm/unix - -docdir=${prefix}/doc/salome - -# -# begin of package rules -# - -.PHONY: all lib bin inc resources data 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 - $(MAKE) data - -# -# 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 - -ACLOCAL_GUI = \ -check_vtk.m4 check_opengl.m4 check_qt.m4 \ -check_GUI.m4 check_corba_in_GUI.m4 - -ACLOCAL_MED = check_Med.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_MED:%=@MED_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 @MED_ROOT_DIR@/adm_local/unix/config_files diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am new file mode 100644 index 00000000..6a4c36d2 --- /dev/null +++ b/adm_local/unix/make_common_starter.am @@ -0,0 +1,59 @@ +# +# ============================================================ +# This file defines the common definitions used in several +# Makefile. This file must be included, if needed, by the file +# Makefile.am. +# ============================================================ +# + +# Standard directory for installation +salomeincludedir = $(includedir)/@PACKAGE@ +libdir = $(prefix)/lib@LIB_LOCATION_SUFFIX@/@PACKAGE@ +bindir = $(prefix)/bin/@PACKAGE@ +purebindir = $(prefix)/bin +salomescriptdir = $(bindir) + +# Tests environment folders +testsenvirondir = $(prefix)/Tests/environ +testsenvironcshdir = $(prefix)/Tests/environ/csh + +# Directory for installing idl files +salomeidldir = $(prefix)/idl/@PACKAGE@ + +# Directory for installing resource files +salomeresdir = $(prefix)/share/@PACKAGE@/resources/@MODULE_NAME@ + +# Directories for installing admin files +admlocaldir = $(prefix)/adm_local +admlocalunixdir = $(admlocaldir)/unix +admlocalm4dir = $(admlocaldir)/unix/config_files + +# Shared modules installation directory +sharedpkgpythondir =$(pkgpythondir)/shared_modules + +# Documentation directory +docdir = $(datadir)/doc/@PACKAGE@ + +# common rules + +# moc-files generation +%_moc.cxx: %.h + $(MOC) $< -o $@ + +# qm-files generation +%.qm: %.po + $(MSG2QM) $< $@ + +EXTRA_DIST=$(MOC_FILES:%_moc.cxx=%.h) $(nodist_salomeres_DATA:%.qm=%.po) + +mostlyclean-local: + rm -f @builddir@/*_moc.cxx + rm -f @builddir@/*.qm + +# tests +tests: unittest + +unittest: $(UNIT_TEST_PROG) + @if test "x$(UNIT_TEST_PROG)" != "x"; then \ + $(UNIT_TEST_PROG); \ + fi; diff --git a/adm_local/unix/make_omniorb.in b/adm_local/unix/make_omniorb.in deleted file mode 100644 index 7caf4b7c..00000000 --- a/adm_local/unix/make_omniorb.in +++ /dev/null @@ -1,59 +0,0 @@ -#======================================================================= -# 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 -# $Header$ -# - -# 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): ${GUI_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): ${top_srcdir}/idl/%.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 -#======================================================================= diff --git a/bin/Makefile.am b/bin/Makefile.am new file mode 100644 index 00000000..e81b2089 --- /dev/null +++ b/bin/Makefile.am @@ -0,0 +1,22 @@ +# Copyright (C) 2005 OPEN CASCADE, CEA, EDF R&D, LEG +# PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT +# 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 + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +nodist_salomescript_DATA= VERSION +EXTRA_DIST+= VERSION.in diff --git a/build_configure b/build_configure index 212e7d8b..acc12c6c 100755 --- a/build_configure +++ b/build_configure @@ -1,235 +1,103 @@ #!/bin/bash # -# Tool for updating list of .in file for the SALOME project +# Tool for updating list of .in file for the SALOME project # and regenerating configure script # # Author : Marc Tajchman - CEA # Date : 10/10/2002 # $Header$ # +# 29/03/2007: Mikhail PONIKAROV - OCN +# Reorganization for uage of autotools ORIG_DIR=`pwd` CONF_DIR=`echo $0 | sed -e "s,[^/]*$,,;s,/$,,;s,^$,.,"` -######################################################################## +# ____________________________________________________________________ # Test if the KERNEL_ROOT_DIR is set correctly - if test ! -d "${KERNEL_ROOT_DIR}"; then echo "failed : KERNEL_ROOT_DIR variable is not correct !" exit fi - -# Test if the KERNEL_SRC is set correctly - -#if test ! -d "${KERNEL_SRC}"; then -# echo "failed : KERNEL_SRC variable is not correct !" -# exit -#fi -######################################################################## # Test if the GUI_ROOT_DIR is set correctly - if test ! -d "${GUI_ROOT_DIR}"; then echo "failed : GUI_ROOT_DIR variable is not correct !" exit fi - -######################################################################## # Test if the MED_ROOT_DIR is set correctly - if test ! -d "${MED_ROOT_DIR}"; then echo "failed : MED_ROOT_DIR variable is not correct !" 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 - -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 ${MED_ROOT_DIR}/adm_local/unix/config_files -if autoconf -then - echo "done" -else - echo "failed (check file permissions and/or user quotas ...)" -fi - -cd ${ORIG_DIR} - -echo +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 + +# 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 +do + rm salome_adm/unix/config_files/${deprecated} +done + +cp -f ${KERNEL_ROOT_DIR}/salome_adm/unix/SALOMEconfig.h.in salome_adm/unix + +# ____________________________________________________________________ +# 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" + +aclocal -I adm_local/unix/config_files -I salome_adm/unix/config_files -I ${GUI_ROOT_DIR}/adm_local/unix/config_files -I ${MED_ROOT_DIR}/adm_local/unix/config_files || exit 1 + +# ____________________________________________________________________ +# 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() 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 + +# ____________________________________________________________________ +# make link to KERNEL configuration files to +#ln -sf ${KERNEL_ROOT_DIR}/salome_adm . + +# ____________________________________________________________________ +# 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() 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 diff --git a/clean_configure b/clean_configure new file mode 100755 index 00000000..be0b5427 --- /dev/null +++ b/clean_configure @@ -0,0 +1,15 @@ +#!/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 diff --git a/configure.ac b/configure.ac new file mode 100644 index 00000000..971d0d61 --- /dev/null +++ b/configure.ac @@ -0,0 +1,376 @@ +# Author : Marc Tajchman (CEA) +# Date : 28/06/2001 +# Modified by : Patrick GOLDBRONN (CEA) +# Modified by : Marc Tajchman (CEA) +# Modified by : Mikhail Ponikarov (OCN) +# + + +AC_INIT([Salome2 Project VISU module], [4.0.0], [gboulant@CS], [salome]) +AC_CONFIG_AUX_DIR(salome_adm/unix/config_files) +AC_CANONICAL_HOST +AC_CANONICAL_TARGET +AM_INIT_AUTOMAKE + +PACKAGE=salome +AC_SUBST(PACKAGE) + +VERSION=4.0.0 +XVERSION=0x040000 +AC_SUBST(VERSION) +AC_SUBST(XVERSION) + +# set up MODULE_NAME variable for dynamic construction of directories (resources, etc.) +MODULE_NAME=visu +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 + +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_USE_STD_IOSTREAM +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 + +AM_PATH_PYTHON(2.3) +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 + +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 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 qwt +echo --------------------------------------------- +echo + +CHECK_QWT + +echo +echo --------------------------------------------- +echo Testing html generators +echo --------------------------------------------- +echo + +CHECK_HTML_GENERATORS + +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 VISU module necessary full GUI !" + exit +fi + +echo +echo --------------------------------------------- +echo Testing Kernel +echo --------------------------------------------- +echo + +CHECK_KERNEL + +echo +echo --------------------------------------------- +echo Testing Med +echo --------------------------------------------- +echo + +CHECK_MED + +echo +echo --------------------------------------------- +echo Summary +echo --------------------------------------------- +echo + +echo Configure +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 qwt_ok doxygen_ok graphviz_ok Kernel_ok Med_ok" + +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 + +echo +echo --------------------------------------------- +echo generating Makefiles and configure files +echo --------------------------------------------- +echo + +AC_OUTPUT_COMMANDS([ \ + chmod +x ./bin/*; \ +]) + +# This list is initiated using autoscan and must be updated manually +# when adding a new file .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 \ + Makefile \ + ./VISU_version.h \ + ./adm_local/Makefile \ + ./adm_local/unix/Makefile \ + ./adm_local/unix/config_files/Makefile \ + ./bin/Makefile \ + ./bin/VERSION \ + ./doc/Makefile \ + ./doc/salome/Makefile \ + ./doc/salome/gui/Makefile \ + ./doc/salome/tui/Makefile \ + ./doc/salome/tui/VISU/doxyfile \ + ./doc/salome/tui/VISU/sources/static/tree.js \ + ./idl/Makefile \ + ./resources/VISUCatalog.xml \ + ./resources/Makefile \ + ./src/Makefile \ + ./src/CONVERTOR/Makefile \ + ./src/PIPELINE/Makefile \ + ./src/OBJECT/Makefile \ + ./src/VVTK/Makefile \ + ./src/GUITOOLS/Makefile \ + ./src/VISU_I/Makefile \ + ./src/VISUGUI/Makefile \ + ./src/VISU_SWIG/Makefile \ + ./src/ENGINE/Makefile +]) diff --git a/configure.in.base b/configure.in.base deleted file mode 100644 index b96d47bb..00000000 --- a/configure.in.base +++ /dev/null @@ -1,420 +0,0 @@ -# -# 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) -AC_CANONICAL_HOST - -PACKAGE=salome -AC_SUBST(PACKAGE) - -VERSION=3.2.2 -XVERSION=0x030202 -AC_SUBST(VERSION) -AC_SUBST(XVERSION) - -# set up MODULE_NAME variable for dynamic construction of directories (resources, etc.) -MODULE_NAME=visu -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 - -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_USE_STD_IOSTREAM -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 - -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 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 qwt -echo --------------------------------------------- -echo - -CHECK_QWT - -echo -echo --------------------------------------------- -echo Testing html generators -echo --------------------------------------------- -echo - -CHECK_HTML_GENERATORS - -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 VISU module necessary full GUI !" - exit -fi - -echo -echo --------------------------------------------- -echo Testing Kernel -echo --------------------------------------------- -echo - -CHECK_KERNEL - -echo -echo --------------------------------------------- -echo Testing Med -echo --------------------------------------------- -echo - -CHECK_MED - -echo -echo --------------------------------------------- -echo Summary -echo --------------------------------------------- -echo - -echo Configure -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 qwt_ok doxygen_ok graphviz_ok Kernel_ok Med_ok" - -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/${MODULE_NAME} 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 $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 diff --git a/doc/Makefile.am b/doc/Makefile.am new file mode 100644 index 00000000..68f247f8 --- /dev/null +++ b/doc/Makefile.am @@ -0,0 +1,22 @@ +# Copyright (C) 2005 OPEN CASCADE, CEA, EDF R&D, LEG +# PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT +# 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 +# + +SUBDIRS= salome + +EXTRA_DIST= html \ No newline at end of file diff --git a/doc/Makefile.in b/doc/Makefile.in deleted file mode 100644 index 2d5fa1d9..00000000 --- a/doc/Makefile.in +++ /dev/null @@ -1,70 +0,0 @@ -# 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 -# - -# -* Makefile *- -# -# Author : Patrick GOLDBRONN (CEA) -# Date : 30/11/2001 -# $Header$ -# -# source path -top_srcdir=@top_srcdir@ -top_builddir=.. -srcdir=@srcdir@ -VPATH=.:@srcdir@ - -SUBDIRS= salome - -@COMMENCE@ - -docs: - @@SETX@; for d in $(SUBDIRS); do \ - (cd $$d && $(MAKE) $@) || exit 1; \ - done - -usr_docs: - @@SETX@; for d in $(SUBDIRS); do \ - (cd $$d && $(MAKE) $@) || exit 1; \ - done - -dev_docs: - @@SETX@; for d in $(SUBDIRS); do \ - (cd $$d && $(MAKE) $@) || exit 1; \ - done - -clean: - @@SETX@; for d in $(SUBDIRS); do \ - (cd $$d && $(MAKE) $@) || exit 1; \ - done - -distclean: clean - @@SETX@; for d in $(SUBDIRS); do \ - (cd $$d && $(MAKE) $@) || exit 1; \ - done - -install: - @@SETX@; for d in $(SUBDIRS); do \ - (cd $$d && $(MAKE) $@) || exit 1; \ - done - -uninstall: - @@SETX@; for d in $(SUBDIRS); do \ - (cd $$d && $(MAKE) $@) || exit 1; \ - done diff --git a/doc/salome/Makefile.am b/doc/salome/Makefile.am new file mode 100644 index 00000000..35fbf228 --- /dev/null +++ b/doc/salome/Makefile.am @@ -0,0 +1,35 @@ +# Copyright (C) 2005 CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# $Header$ + +SUBDIRS= tui gui +SUBDIRSTUI= tui +SUBDIRSGUI= gui + +usr_docs: + @@SETX@; for d in $(SUBDIRSGUI); do \ + (cd $$d && $(MAKE) $@) || exit 1; \ + done; + +docs: usr_docs + +dev_docs: + @@SETX@; for d in $(SUBDIRSTUI); do \ + (cd $$d && $(MAKE) $@) || exit 1; \ + done; diff --git a/doc/salome/Makefile.in b/doc/salome/Makefile.in deleted file mode 100644 index d1f8eafa..00000000 --- a/doc/salome/Makefile.in +++ /dev/null @@ -1,77 +0,0 @@ -# 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 -# -# -* Makefile *- -# -# Author : Patrick GOLDBRONN (CEA) -# Date : 30/11/2001 -# $Header$ -# -# source path -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@ - -SUBDIRS= tui gui -SUBDIRSTUI= tui -SUBDIRSGUI= gui - -@COMMENCE@ - -usr_docs: - @@SETX@; for d in $(SUBDIRSGUI); do \ - (cd $$d && $(MAKE) $@) || exit 1; \ - done; \ - -docs: usr_docs - -dev_docs: - @@SETX@; for d in $(SUBDIRSTUI); do \ - (cd $$d && $(MAKE) $@) || exit 1; \ - done; \ - -clean: - @@SETX@; for d in $(SUBDIRS); do \ - if test -d $$d/VISU; then \ - (cd $$d && $(MAKE) $@) || exit 1; \ - fi; \ - done - -distclean: clean - @@SETX@; for d in $(SUBDIRS); do \ - if test -d $$d/VISU; then \ - (cd $$d && $(MAKE) $@) || exit 1; \ - fi; \ - done - -install: - $(MAKE) docs - @@SETX@; for d in $(SUBDIRS); do \ - if test -d $$d/VISU; then \ - (cd $$d && $(MAKE) $@); \ - fi; \ - done - -uninstall: - @@SETX@; for d in $(SUBDIRS); do \ - if test -d $$d/VISU; then \ - (cd $$d && $(MAKE) $@) || exit 1; \ - fi; \ - done; \ diff --git a/doc/salome/gui/Makefile.am b/doc/salome/gui/Makefile.am new file mode 100644 index 00000000..a3bc3e40 --- /dev/null +++ b/doc/salome/gui/Makefile.am @@ -0,0 +1,43 @@ +# Copyright (C) 2005 CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# File : Makefile.am +# Author : Vasily Rusyaev (Open Cascade NN) +# Module : doc + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +EXTRA_DIST+=VISU + +usr_docs: + cp -fr $(srcdir)/VISU ./ + -find $(PWD) -name CVS -prune -exec rm -rf {} \; + +docs: usr_docs + +clean-local: + rm -fr `ls | grep -v "Makefile"` + rm -fr VISU + +install-data-local: usr_docs + mkdir -p $(docdir)/gui + cp -rf VISU $(docdir)/gui + -find $(PWD) -name CVS -prune -exec rm -rf {} \; + +uninstall-local: + rm -rf $(docdir)/gui/VISU diff --git a/doc/salome/gui/Makefile.in b/doc/salome/gui/Makefile.in deleted file mode 100644 index b40c0333..00000000 --- a/doc/salome/gui/Makefile.in +++ /dev/null @@ -1,50 +0,0 @@ -# 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.in -# Author : Vasily Rusyaev (Open Cascade NN) -# Module : doc -# $Header: - -top_srcdir=@top_srcdir@ -top_builddir=../../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@ - -@COMMENCE@ - -usr_docs: - cp -fr $(srcdir)/VISU ./ - -find $(PWD) -name CVS -prune -exec rm -rf {} \; - -docs: usr_docs - -clean: - rm -fr `ls | grep -v "Makefile"` - -distclean: clean - rm -fr VISU - -install: - mkdir -p $(docdir)/gui - cp -rf VISU $(docdir)/gui - -find $(PWD) -name CVS -prune -exec rm -rf {} \; - -uninstall: - rm -rf $(docdir)/gui/VISU diff --git a/doc/salome/gui/VISU/animation_in_gauss_viewer.htm b/doc/salome/gui/VISU/animation_in_gauss_viewer.htm index ee412bbf..ce0201dd 100755 --- a/doc/salome/gui/VISU/animation_in_gauss_viewer.htm +++ b/doc/salome/gui/VISU/animation_in_gauss_viewer.htm @@ -1,183 +1,218 @@ - - - - - -Animation in Gauss Viewer - - - - - - - - - - - - -

Recording in Gauss Viewer

- -

In the addition - to the Animation at Time stamps available - for all Post-Pro presentations, Gauss - Viewer gives the possibility to record AVI clips of user actions. - This functionality is available at any time for all contents of the 3D - Viewer, including Animation or Segmentation.

- -

 

- -

To start the video recording session click Start -  button. - After it you will see a standard dialog box allowing input the file name - for AVI clip and browse for the location.

- -

 

- -

- -

 

- -

Then you'll be asked to define Recording - Properties:

- -

 

- -

- -

 

- -
    - -
  • Settings

  • -
- -
    - -
  • Save to file - you can change the name of the file you've - chosen for saving.

  • - -
  • Mode - allows - to choose from two recording - regimes:

  • - -
  • Recording all displayed - frames - records exactly at the FPS - rate specified by the user.  

  • - -
  • Recording at a given - FPS - records only when the contents - of the viewer change (some activity is performed).  In - the AVI file non-recorded images are substituted with the copies of the - latest recorded image, which produces files with lower quality but requires - less system resources.  

  • - -
  • FPS - allows - to define the FPS (frames per second) rate for the clip. Set greater value - for better quality.  

  • - -
  • Quality - allows - to set the quality of the clip in the interval between 0 and 100. -

  • - -
  • Progressive - allows to record a progressive API file. -

  • -
- -

 

- -

After you click OK, the recording will start and all your actions in - the viewer will be recorded.

- -

Note that if you change the size of the 3D viewer window, the avi file - would be corrupt.

- -

 

- -

Press Stop button - to finish video recording or Pause - button to suspend it. If the recording is just paused, - you can always continue it by clicking Play - button.

- -

 

- - - - + + + + + +Animation in Gauss Viewer + + + + + + + + + + + + + +

Recording in Gauss Viewer

+ +

In the addition + to the Animation at Time stamps available + for all Post-Pro presentations, Gauss + Viewer gives the possibility to record AVI clips of user actions. + This functionality is available at any time for all contents of the 3D + Viewer, including Animation or Segmentation.

+ +

 

+ +

To start the video recording session click Start +  button. + After it you will see a standard dialog box allowing input the file name + for AVI clip and browse for the location.

+ +

 

+ +

+ +

 

+ +

Then you'll be asked to define Recording + Properties:

+ +

 

+ +

+ +

 

+ +
    + +
  • Settings

  • +
+ +
    + +
  • Save to file - you can change the name of the file you've + chosen for saving.

  • + +
  • Mode - allows + to choose from two recording + regimes:

  • + +
  • Recording all displayed + frames - records exactly at the FPS + rate specified by the user.  

  • + +
  • Recording at a given + FPS - records only when the contents + of the viewer change (some activity is performed).  In + the AVI file non-recorded images are substituted with the copies of the + latest recorded image, which produces files with lower quality but requires + less system resources.  

  • + +
  • FPS - allows + to define the FPS (frames per second) rate for the clip. Set greater value + for better quality.  

  • + +
  • Quality - allows + to set the quality of the clip in the interval between 0 and 100. +

  • + +
  • Progressive - allows to record a progressive API file. +

  • +
+ +

 

+ +

After you click OK, the recording + will start and all your actions in the viewer will be recorded.

+ +

Note that if you change the size of the 3D viewer window, the avi file + would be corrupt.

+ +

 

+ +

Press Stop button + to finish video recording or Pause + button to suspend it. If the recording is just paused, + you can always continue it by clicking Play + button.

+ +

 

+ +

This functionality  works + only if there is jpeg2yuv utility + installed on your computer. If this third-party product is missing, the + Recording buttons will be disabled. + This utility is a part of  mjpegtool + package, which can be downloaded from http://mjpeg.sourceforge.net/. +  Run "which jpeg2yuv" + to check whether this tool has been installed and the path to it was properly + added to your PATH variable. If not, you need to activate mjpegtools + indicating its location in the variable PATH. The syntax of the + command should be as follows:  

+ +

export PATH=${INSTALL_ROOT}/mjpegtools-1.8.0/bin:${PATH}.

+ +

 

+ + + + diff --git a/doc/salome/gui/VISU/clipping.htm b/doc/salome/gui/VISU/clipping.htm index c2e3a4d0..dd1375ce 100755 --- a/doc/salome/gui/VISU/clipping.htm +++ b/doc/salome/gui/VISU/clipping.htm @@ -1,168 +1,168 @@ - - - - - -Clipping - - - - - - - - - - - - -

Clipping

- -

Using this menu you can create cross-section views (clipping planes) - of your presentation.

- -

 

- -

To start, click on the New button. - A new clipping plane will be immediately displayed in 3D Viewer. You can - create as many clipping planes as you need. To delete an unwanted plane, - select in the list of planes and click Delete - button.   

- -

 

- -

- -

 

- -

Now you can define the parameters of your cross-section. You can define - them either in Non Structured - or in IJK (Structured) way.  

- -

 

- -

Non Structured mode allows to - select the clipping plane by adjusting the following parameters:

- -

 

- -
    - -
  • Orientation - - allows to choose horizontal (X-Y) or vertical (Y-Z and Z-X) orientation - of the clipping plane;

  • - -
  • Distance is - defined between the opposite extremities - of the object (if it is set to 0.5 the object is split in two halves); -

  • - -
  • Rotation - (in angle degrees) allows to rotate the clipping plane about the axes - defining the orientation plane.

  • - -
  • Show preview - - displays the clipping plane in the 3D Viewer. -

  • - -
  • Auto Apply - - automatically hides from view - the part of object truncated by the plane.

  • -
- -

 

- -

- -

 

- -

In the IJK (Structured) mode - the clipping plane will be oriented completely perpendicular to one of - the selectable Axes.

- -
    - -
  • Index - gives the choice of several possible positions of the plane.

  • - -
  • Reverse normal - - allows to select which part of the object should be truncated.  

  • - -
  • Show preview - - displays the clipping plane in the 3D Viewer. -

  • - -
  • Auto Apply - - automatically hides from view - the part of object truncated by the plane.

  • -
- - - - + + + + + +Clipping + + + + + + + + + + + + +

Clipping

+ +

Using this menu you can create cross-section views (clipping planes) + of your presentation.

+ +

 

+ +

To start, click on the New button. + A new clipping plane will be immediately displayed in 3D Viewer. You can + create as many clipping planes as you need. To delete an unwanted plane, + select in the list of planes and click Delete + button.   

+ +

 

+ +

+ +

 

+ +

Now you can define the parameters of your cross-section. You can define + them either in Non Structured + or in IJK (Structured) way.  

+ +

 

+ +

Non Structured mode allows to + select the clipping plane by adjusting the following parameters:

+ +

 

+ +
    + +
  • Orientation + - allows to choose horizontal (X-Y) or vertical (Y-Z and Z-X) orientation + of the clipping plane;

  • + +
  • Distance is + defined between the opposite extremities + of the object (if it is set to 0.5 the object is split in two halves); +

  • + +
  • Rotation + (in angle degrees) allows to rotate the clipping plane about the axes + defining the orientation plane.

  • + +
  • Show preview + - displays the clipping plane in the 3D Viewer. +

  • + +
  • Auto Apply - + automatically hides from view + the part of object truncated by the plane.

  • +
+ +

 

+ +

+ +

 

+ +

In the IJK (Structured) mode + the clipping plane will be oriented completely perpendicular to one of + the selectable Axes.

+ +
    + +
  • Index + gives the choice of several possible positions of the plane.

  • + +
  • Reverse normal + - allows to select which part of the object should be truncated.  

  • + +
  • Show preview + - displays the clipping plane in the 3D Viewer. +

  • + +
  • Auto Apply - + automatically hides from view + the part of object truncated by the plane.

  • +
+ + + + diff --git a/doc/salome/gui/VISU/creating_tables.htm b/doc/salome/gui/VISU/creating_tables.htm index 108dc20c..1d240226 100755 --- a/doc/salome/gui/VISU/creating_tables.htm +++ b/doc/salome/gui/VISU/creating_tables.htm @@ -1,145 +1,145 @@ - - - - - -Creating tables - - - - - - - - - - - - - -

Creating - tables from Cut Lines presentations

- -

In Post Pro you can create a table, which - will be composed of the scalar values applied to the cells forming a Cut Lines presentation.

- -

 

- -

To create a table from Cut Lines presentation:

- -

 

- -

1.  Create - a Cut Lines presentation.

- -

 

- -

2.  In - the Object Browser or in the viewer right-click on your presentation and - from the pop-up menu select Create Table

- -

 

- -

Your new table will be created and displayed - in the Object Browser.

- -

 

- -

-Related Topics - - -

- -

 

- - - - + + + + + +Creating tables + + + + + + + + + + + + + +

Creating + tables from Cut Lines presentations

+ +

In Post Pro you can create a table, which + will be composed of the scalar values applied to the cells forming a Cut Lines presentation.

+ +

 

+ +

To create a table from Cut Lines presentation:

+ +

 

+ +

1.  Create + a Cut Lines presentation.

+ +

 

+ +

2.  In + the Object Browser or in the viewer right-click on your presentation and + from the pop-up menu select Create Table

+ +

 

+ +

Your new table will be created and displayed + in the Object Browser.

+ +

 

+ +

+Related Topics + + +

+ +

 

+ + + + diff --git a/doc/salome/gui/VISU/cshdat_robohelp.htm b/doc/salome/gui/VISU/cshdat_robohelp.htm index 86188b19..ad0cf486 100755 --- a/doc/salome/gui/VISU/cshdat_robohelp.htm +++ b/doc/salome/gui/VISU/cshdat_robohelp.htm @@ -1,258 +1,258 @@ - - -Post-Pro Module Reference Manual - - - - - - - - - - - - - - - - - + + +Post-Pro Module Reference Manual + + + + + + + + + + + + + + + + + diff --git a/doc/salome/gui/VISU/cshdat_webhelp.htm b/doc/salome/gui/VISU/cshdat_webhelp.htm index 28ae1d23..78a4777a 100755 --- a/doc/salome/gui/VISU/cshdat_webhelp.htm +++ b/doc/salome/gui/VISU/cshdat_webhelp.htm @@ -1,251 +1,251 @@ - - -Post-Pro Module Reference Manual - - - - - - - - - - - - - - - - - + + +Post-Pro Module Reference Manual + + + + + + + + + + + + + + + + + diff --git a/doc/salome/gui/VISU/default.css b/doc/salome/gui/VISU/default.css index de2e5d95..1f8d6d77 100755 --- a/doc/salome/gui/VISU/default.css +++ b/doc/salome/gui/VISU/default.css @@ -1,101 +1,101 @@ -BODY { - background-color:#ffffff; - font-family:"Times New Roman" , serif; } -H1 { - font-weight:bold; - font-size:24.0pt; } -LI.kadov-H1 { - font-weight:bold; - font-size:24.0pt; } -H2 { - font-weight:bold; - font-size:18.0pt; } -LI.kadov-H2 { - font-weight:bold; - font-size:18.0pt; } -H3 { - font-weight:bold; - font-size:14.0pt; } -LI.kadov-H3 { - font-weight:bold; - font-size:14.0pt; } -H4 { - font-weight:bold; - font-size:12.0pt; } -LI.kadov-H4 { - font-weight:bold; - font-size:12.0pt; } -H5 { - font-weight:bold; - font-size:10.0pt; } -LI.kadov-H5 { - font-weight:bold; - font-size:10.0pt; } -H6 { - font-weight:bold; - font-size:8.0pt; } -LI.kadov-H6 { - font-weight:bold; - font-size:8.0pt; } -P { - font-size:12.0pt; - margin-top:0pt; - margin-bottom:0pt; } -LI.kadov-P { - font-size:12.0pt; } -A.expandspot { - color:#008000; - cursor:hand; - font-style:italic; - x-text-underline:off; - x-text-overline:off; - x-text-line-through:off; - text-decoration:none none none; } -SPAN.expandtext { - font-style:italic; - font-weight:normal; - color:#ff0000; } -A.dropspot { - cursor:hand; - color:#008000; - font-style:italic; - x-text-underline:off; - x-text-overline:off; - x-text-line-through:off; - text-decoration:none none none; } -A.glossterm { - color:#800000; - cursor:hand; - font-style:italic; - x-text-underline:off; - x-text-overline:off; - x-text-line-through:off; - text-decoration:none none none; } -SPAN.glosstext { - font-style:italic; - font-weight:normal; - color:#0000ff; } -OL { - margin-top:0px; - margin-bottom:0px; } -UL { - margin-top:0px; - margin-bottom:0px; } -A:active { } -A:hover { - x-text-underline:Off; - text-decoration:none; } -A:link { - x-text-underline:Off; - text-decoration:none; } -A:visited { - x-text-underline:Off; - text-decoration:none; } -P.TODO { - font-weight:normal; - font-style:italic; - font-family:"Arial Black" , sans-serif; } -LI.kadov-P-CTODO { - font-weight:normal; - font-style:italic; - font-family:"Arial Black" , sans-serif; } +BODY { + background-color:#ffffff; + font-family:"Times New Roman" , serif; } +H1 { + font-weight:bold; + font-size:24.0pt; } +LI.kadov-H1 { + font-weight:bold; + font-size:24.0pt; } +H2 { + font-weight:bold; + font-size:18.0pt; } +LI.kadov-H2 { + font-weight:bold; + font-size:18.0pt; } +H3 { + font-weight:bold; + font-size:14.0pt; } +LI.kadov-H3 { + font-weight:bold; + font-size:14.0pt; } +H4 { + font-weight:bold; + font-size:12.0pt; } +LI.kadov-H4 { + font-weight:bold; + font-size:12.0pt; } +H5 { + font-weight:bold; + font-size:10.0pt; } +LI.kadov-H5 { + font-weight:bold; + font-size:10.0pt; } +H6 { + font-weight:bold; + font-size:8.0pt; } +LI.kadov-H6 { + font-weight:bold; + font-size:8.0pt; } +P { + font-size:12.0pt; + margin-top:0pt; + margin-bottom:0pt; } +LI.kadov-P { + font-size:12.0pt; } +A.expandspot { + color:#008000; + cursor:hand; + font-style:italic; + x-text-underline:off; + x-text-overline:off; + x-text-line-through:off; + text-decoration:none none none; } +SPAN.expandtext { + font-style:italic; + font-weight:normal; + color:#ff0000; } +A.dropspot { + cursor:hand; + color:#008000; + font-style:italic; + x-text-underline:off; + x-text-overline:off; + x-text-line-through:off; + text-decoration:none none none; } +A.glossterm { + color:#800000; + cursor:hand; + font-style:italic; + x-text-underline:off; + x-text-overline:off; + x-text-line-through:off; + text-decoration:none none none; } +SPAN.glosstext { + font-style:italic; + font-weight:normal; + color:#0000ff; } +OL { + margin-top:0px; + margin-bottom:0px; } +UL { + margin-top:0px; + margin-bottom:0px; } +A:active { } +A:hover { + x-text-underline:Off; + text-decoration:none; } +A:link { + x-text-underline:Off; + text-decoration:none; } +A:visited { + x-text-underline:Off; + text-decoration:none; } +P.TODO { + font-weight:normal; + font-style:italic; + font-family:"Arial Black" , sans-serif; } +LI.kadov-P-CTODO { + font-weight:normal; + font-style:italic; + font-family:"Arial Black" , sans-serif; } diff --git a/doc/salome/gui/VISU/default_ns.css b/doc/salome/gui/VISU/default_ns.css index 3eeb3c49..46e8b001 100755 --- a/doc/salome/gui/VISU/default_ns.css +++ b/doc/salome/gui/VISU/default_ns.css @@ -1,118 +1,118 @@ -BODY { - background-color:#ffffff; - font-family:"Times New Roman" , serif; } -H1 { - font-weight:bold; - font-size:24.0pt; - font-family:"Times New Roman" , serif; } -LI.kadov-H1 { - font-weight:bold; - font-size:24.0pt; } -H2 { - font-weight:bold; - font-size:18.0pt; - font-family:"Times New Roman" , serif; } -LI.kadov-H2 { - font-weight:bold; - font-size:18.0pt; } -H3 { - font-weight:bold; - font-size:14.0pt; - font-family:"Times New Roman" , serif; } -LI.kadov-H3 { - font-weight:bold; - font-size:14.0pt; } -H4 { - font-weight:bold; - font-size:12.0pt; - font-family:"Times New Roman" , serif; } -LI.kadov-H4 { - font-weight:bold; - font-size:12.0pt; } -H5 { - font-weight:bold; - font-size:10.0pt; - font-family:"Times New Roman" , serif; } -LI.kadov-H5 { - font-weight:bold; - font-size:10.0pt; } -H6 { - font-weight:bold; - font-size:8.0pt; - font-family:"Times New Roman" , serif; } -LI.kadov-H6 { - font-weight:bold; - font-size:8.0pt; } -P { - font-size:12.0pt; - margin-top:1pt; - margin-bottom:1pt; - font-family:"Times New Roman" , serif; } -LI.kadov-P { - font-size:12.0pt; } -A.expandspot { - color:#008000; - cursor:hand; - font-style:italic; - x-text-underline:off; - x-text-overline:off; - x-text-line-through:off; - text-decoration:none none none; } -SPAN.expandtext { - font-style:italic; - font-weight:normal; - color:#ff0000; } -A.dropspot { - cursor:hand; - color:#008000; - font-style:italic; - x-text-underline:off; - x-text-overline:off; - x-text-line-through:off; - text-decoration:none none none; } -A.glossterm { - color:#800000; - cursor:hand; - font-style:italic; - x-text-underline:off; - x-text-overline:off; - x-text-line-through:off; - text-decoration:none none none; } -SPAN.glosstext { - font-style:italic; - font-weight:normal; - color:#0000ff; } -OL { - margin-top:0px; - margin-bottom:0px; - font-family:"Times New Roman" , serif; } -UL { - margin-top:0px; - margin-bottom:0px; - font-family:"Times New Roman" , serif; } -A:active { } -A:hover { - x-text-underline:Off; - text-decoration:none; } -A:link { - x-text-underline:Off; - text-decoration:none; } -A:visited { - x-text-underline:Off; - text-decoration:none; } -P.TODO { - font-weight:normal; - font-style:italic; - font-family:"Arial Black" , sans-serif; } -LI.kadov-P-CTODO { - font-weight:normal; - font-style:italic; - font-family:"Arial Black" , sans-serif; } -ol ol { - margin-top:1px; } -ol ul { - margin-top:1px; } -ul ul { - margin-top:1px; } -ul ol { - margin-top:1px; } +BODY { + background-color:#ffffff; + font-family:"Times New Roman" , serif; } +H1 { + font-weight:bold; + font-size:24.0pt; + font-family:"Times New Roman" , serif; } +LI.kadov-H1 { + font-weight:bold; + font-size:24.0pt; } +H2 { + font-weight:bold; + font-size:18.0pt; + font-family:"Times New Roman" , serif; } +LI.kadov-H2 { + font-weight:bold; + font-size:18.0pt; } +H3 { + font-weight:bold; + font-size:14.0pt; + font-family:"Times New Roman" , serif; } +LI.kadov-H3 { + font-weight:bold; + font-size:14.0pt; } +H4 { + font-weight:bold; + font-size:12.0pt; + font-family:"Times New Roman" , serif; } +LI.kadov-H4 { + font-weight:bold; + font-size:12.0pt; } +H5 { + font-weight:bold; + font-size:10.0pt; + font-family:"Times New Roman" , serif; } +LI.kadov-H5 { + font-weight:bold; + font-size:10.0pt; } +H6 { + font-weight:bold; + font-size:8.0pt; + font-family:"Times New Roman" , serif; } +LI.kadov-H6 { + font-weight:bold; + font-size:8.0pt; } +P { + font-size:12.0pt; + margin-top:1pt; + margin-bottom:1pt; + font-family:"Times New Roman" , serif; } +LI.kadov-P { + font-size:12.0pt; } +A.expandspot { + color:#008000; + cursor:hand; + font-style:italic; + x-text-underline:off; + x-text-overline:off; + x-text-line-through:off; + text-decoration:none none none; } +SPAN.expandtext { + font-style:italic; + font-weight:normal; + color:#ff0000; } +A.dropspot { + cursor:hand; + color:#008000; + font-style:italic; + x-text-underline:off; + x-text-overline:off; + x-text-line-through:off; + text-decoration:none none none; } +A.glossterm { + color:#800000; + cursor:hand; + font-style:italic; + x-text-underline:off; + x-text-overline:off; + x-text-line-through:off; + text-decoration:none none none; } +SPAN.glosstext { + font-style:italic; + font-weight:normal; + color:#0000ff; } +OL { + margin-top:0px; + margin-bottom:0px; + font-family:"Times New Roman" , serif; } +UL { + margin-top:0px; + margin-bottom:0px; + font-family:"Times New Roman" , serif; } +A:active { } +A:hover { + x-text-underline:Off; + text-decoration:none; } +A:link { + x-text-underline:Off; + text-decoration:none; } +A:visited { + x-text-underline:Off; + text-decoration:none; } +P.TODO { + font-weight:normal; + font-style:italic; + font-family:"Arial Black" , sans-serif; } +LI.kadov-P-CTODO { + font-weight:normal; + font-style:italic; + font-family:"Arial Black" , sans-serif; } +ol ol { + margin-top:1px; } +ol ul { + margin-top:1px; } +ul ul { + margin-top:1px; } +ul ol { + margin-top:1px; } diff --git a/doc/salome/gui/VISU/ehelp.xml b/doc/salome/gui/VISU/ehelp.xml index dbe4e806..73f4ecda 100755 --- a/doc/salome/gui/VISU/ehelp.xml +++ b/doc/salome/gui/VISU/ehelp.xml @@ -1,10 +1,10 @@ - - - - - - - - WebSearch - + + + + + + + + WebSearch + \ No newline at end of file diff --git a/doc/salome/gui/VISU/ehlpdhtm.js b/doc/salome/gui/VISU/ehlpdhtm.js index 6cfd2e46..7bcb2499 100755 --- a/doc/salome/gui/VISU/ehlpdhtm.js +++ b/doc/salome/gui/VISU/ehlpdhtm.js @@ -1,4239 +1,4239 @@ -// eHelp® Corporation Dynamic HTML JavaScript -// Copyright© 1998-2003 eHelp® Corporation.All rights reserved. -// Version=4.82 - -// Warning:Do not modify this file.It is generated by RoboHELP® and changes will be overwritten. - -//// Segment Begin -- (JavaScript 1.0) - -/// Section Begin - General and relative topics(JavaScript 1.0) - -//{{HH_SYMBOL_SECTION -var HH_ChmFilename = ""; -var HH_WindowName = ""; -var HH_GlossaryFont = ""; -var HH_Glossary = ""; -var HH_Avenue = ""; -var HH_ActiveX = false; -//}}HH_SYMBOL_SECTION - -//Begin to support previous generic parameters -//Get the information about the browser. -var gstrBsAgent = navigator.userAgent.toLowerCase(); -var gnBsVer = parseInt(navigator.appVersion); - -var gbBsOpera = (gstrBsAgent.indexOf('opera') != -1); -var gbBsKonqueror = (gstrBsAgent.indexOf('konqueror') != -1); -var gbBsSafari = (gstrBsAgent.indexOf('safari') != -1); -var gbBsIE = (gstrBsAgent.indexOf('msie') != -1) && !gbBsOpera && !gbBsKonqueror && !gbBsSafari; -var gbBsNS = (gstrBsAgent.indexOf('mozilla') != -1) && ((gstrBsAgent.indexOf('spoofer') == -1) && (gstrBsAgent.indexOf('compatible') == -1)) && !gbBsOpera && !gbBsKonqueror && !gbBsSafari; - -var gbBsMac = (gstrBsAgent.indexOf('mac') != -1); -var gbBsWindows = ((gstrBsAgent.indexOf('win') != -1) || (gstrBsAgent.indexOf('16bit') != -1)); -var gbBsSunOS = (gstrBsAgent.indexOf("sunos") != -1); - -var gbBsIE3Before = ((gbBsIE) && (gnBsVer <= 2)); -var gbBsNS3Before = ((gbBsNS) && (gnBsVer <= 3)); - -var gbBsNS2 = ((gbBsNS) && (gnBsVer <= 2)); -var gbBsNS3 = ((gbBsNS) && (gnBsVer == 3)); -var gbBsIE300301 = ((gbBsIE) && (gnBsVer == 2) && ((gstrBsAgent.indexOf("3.00") != -1)||(gstrBsAgent.indexOf("3.0a") != -1)||(gstrBsAgent.indexOf("3.0b")!=-1)||(gstrBsAgent.indexOf("3.01")!=-1))); -var gbBsIE302 = ((gbBsIE) && (gnBsVer == 2) && (gstrBsAgent.indexOf("3.02") != -1)); - -var gbBsNS4 = ((gbBsNS) && (gnBsVer >= 4)); -var gbBsNS6 = ((gbBsNS) && (gnBsVer >= 5)); -var gbBsNS7 = false; - -var gbBsIE4 = ((gbBsIE) && (gnBsVer >= 4)); -var gbBsIE5 = false; -var gbBsIE55 = false; - -var gbBsOpera6 = false; -var gbBsOpera7 = false; - -var gbBsKonqueror3 = false; - - - -gbBsIE = (navigator.appName.indexOf("Microsoft") != -1) && !gbBsOpera && !gbBsKonqueror && !gbBsSafari;; -if (gbBsIE) -{ - if (parseInt(navigator.appVersion) >= 4) { - gbBsIE4 = true; - if (gbBsIE4) { - var nPos = gstrBsAgent.indexOf("msie"); - var strIEversion = gstrBsAgent.substring(nPos + 5); - var nVersion = parseFloat(strIEversion); - if (nVersion >= 5) - gbBsIE5 = true; - if (nVersion >= 5.5) - gbBsIE55 = true; - } - } -} -if (gbBsNS6) -{ - var nPos=gstrBsAgent.indexOf("gecko"); - if(nPos!=-1) - { - var nPos2=gstrBsAgent.indexOf("/", nPos); - if(nPos2!=-1) - { - var nVersion=parseFloat(gstrBsAgent.substring(nPos2+1)); - if (nVersion>=20020823) - gbBsNS7=true; - } - } -} -if (gbBsOpera) -{ - var nPos = gstrBsAgent.indexOf("opera"); - if(nPos!=-1) - { - var nVersion = parseFloat(gstrBsAgent.substring(nPos+6)); - if (nVersion >= 6) - { - gbBsOpera6=true; - if (nVersion >=7) - gbBsOpera7=true; - } - } -} -if (gbBsKonqueror) -{ - var nPos = gstrBsAgent.indexOf("konqueror"); - if(nPos!=-1) - { - var nVersion = parseFloat(gstrBsAgent.substring(nPos+10)); - if (nVersion >= 3) - { - gbBsKonqueror3=true; - } - } -} - -function insertAdjacentHTML(obj, where, htmlStr) -{ - if (gbBsIE || gbBsOpera7) - { - obj.insertAdjacentHTML(where, htmlStr); - } - else if (gbBsNS6 || gbBsSafari) - { - var r = obj.ownerDocument.createRange(); - r.setStartBefore(obj); - var parsedHTML = r.createContextualFragment(htmlStr); - - switch (where){ - case 'beforeBegin': - obj.parentNode.insertBefore(parsedHTML,obj); - break; - case 'afterBegin': - obj.insertBefore(parsedHTML,obj.firstChild); - break; - case 'beforeEnd': - obj.appendChild(parsedHTML); - break; - case 'afterEnd': - if (obj.nextSibling){ - obj.parentNode.insertBefore(parsedHTML,obj.nextSibling); - } else { - obj.parentNode.appendChild(parsedHTML); - } - break; - } - } -} - -// Utilities functions. -function BsscHasExtJs() -{ - if( gbBsIE3Before || gbBsNS3Before) - return false; - return true; -} - -// Register event handler -var gBsOnLoads = new Array(); // An array holds all the onload event handler. -var gBsOnClicks = new Array(); // An array holds all the onClick event handler. -var gBsOnUnLoads = new Array(); // An array holds all the OnUnLoad event handler. -var gBsOnMouseOvers = new Array(); // An array holds all the OnMouseOver event handler. -var gBsOnMouseOuts = new Array(); // An array holds all the OnMouseOut event handler. - -var gbOrignalOnMouseDown = null; - -function BsscRegisterOnLoad(funcHandler) -{ - var nLength = gBsOnLoads.length; - gBsOnLoads[nLength] = funcHandler; -} - -function BsscRegisterOnClick(funcHandler) -{ - var nLength = gBsOnClicks.length; - gBsOnClicks[nLength] = funcHandler; -} - -function BsscRegisterOnUnLoad(funcHandler) -{ - var nLength = gBsOnUnLoads.length; - gBsOnUnLoads[nLength] = funcHandler; -} - -function BsscRegisterOnMouseOver(funcHandler) -{ - var nLength = gBsOnMouseOvers.length; - gBsOnMouseOvers[nLength] = funcHandler; -} - -function BsscRegisterOnMouseOut(funcHandler) -{ - var nLength = gBsOnMouseOuts.length; - gBsOnMouseOuts[nLength] = funcHandler; -} - -function BsGeneralOnLoad() -{ - if (!gbBsIE4 && !gbBsNS4) - return; - - // Make everything visible in navigator - if (gbBsNS4 && !gbBsNS6) { - // Make some special effects items visible - for (var iLayer = 0; iLayer < document.layers.length; iLayer++) { - document.layers[iLayer].visibility = "show"; - document.layers[iLayer].left = 0; - } - } -} - -// If resize the netscape browser, need to reload it. -function BsReDo() -{ - if (innerWidth != origWidth || innerHeight != origHeight) - location.reload(); -} -// End of the local functions. - -// The following functions are used by the html files. -function BSSCOnLoad() -{ - if( !BsscHasExtJs() ) - return; - for (var nElement = gBsOnLoads.length - 1; nElement >= 0; nElement--) - gBsOnLoads[nElement](); -} - -function BSSCOnClick() -{ - if (!BsscHasExtJs()) return; - - for (var nElement = gBsOnClicks.length - 1; nElement >= 0; nElement--) - gBsOnClicks[nElement](); -} - -function BSSCOnUnload() -{ - if (!BsscHasExtJs()) return; - for (var nElement = gBsOnUnLoads.length - 1; nElement >= 0; nElement--) - gBsOnUnLoads[nElement](); -} - -function BSSCOnMouseOver() -{ - if (!BsscHasExtJs()) return; - for (var nElement = gBsOnMouseOvers.length - 1; nElement >= 0; nElement--) - gBsOnMouseOvers[nElement](); -} - -function BSSCOnMouseOut() -{ - if (!BsscHasExtJs()) return; - for (var nElement = gBsOnMouseOuts.length - 1; nElement >= 0; nElement--) - { - gBsOnMouseOuts[nElement](); - } -} -// End of invocation of the event handle functions. - -// Add the GereralOnLoad to the onload array. -if (typeof(BsscRegisterOnLoad) != "undefined") -{ - BsscRegisterOnLoad(BsGeneralOnLoad); -} -if (gbBsNS4&&!gbBsNS6) { - origWidth = innerWidth; - origHeight = innerHeight; - onresize = BsReDo; -} -//End to support previous generic parameters - -//Begin to support previous HHActiveX invoking -function BsHHActivateComponents() -{ - if( HH_ActiveX && (HH_ChmFilename != "") && ((self == top) || (self == top.frames[0]))) - { - var objBody = getElementsByTag(document,"BODY")[0]; - if( typeof(objBody) == "object" ) - { - insertAdjacentHTML(objBody, "beforeEnd", ''); - if (HHComponentActivator.object) - HHComponentActivator.Activate(HH_ChmFilename, HH_WindowName, HH_GlossaryFont, HH_Glossary, HH_Avenue); - } - } -} - -function BsHHActivXOnLoad() -{ - if( gbBsIE4 ) - BsHHActivateComponents(); -} - -if( typeof(BsscRegisterOnLoad) != "undefined" ) -{ - BsscRegisterOnLoad(BsHHActivXOnLoad); -} -//End to support previous HHActiveX invoking - -//Begin to support previous relative topics -//If webHelp needs Related Topics DHTMLcode, it's supposed to add it here -var gbPopupMenuTimeoutExpired = false; -var gbInPopupMenu = false; -var gbPopupMenuTopicList = null; -var gOlddocumentClick = null; - -////////////////////////////////////////////////////////////////////////////////////////// -// -// Popup Menu code -// -////////////////////////////////////////////////////////////////////////////////////////// - -var g_bIsPopupMenuInit = false; -function _WritePopupMenuLayer() -{ - if (!g_bIsPopupMenuInit) - { - if (gbBsNS4&&!gbBsNS6) { -//Do not try to write ininle styles for NS! NS can not handle it and will not stop downloading the html page... - document.write("
"); - } else{ - document.write(""); - if (!(gbBsNS4&&!gbBsNS6)) { - document.write(""); - } - } - g_bIsPopupMenuInit = true; - } -} - -//Seek for the bsscright frame -function _SeekFrameByName( cRoot, strName ) -{ - if( cRoot == null ) return null; - if( cRoot.frames == null ) return null; - if( cRoot.frames[strName] != null ) return cRoot.frames[strName]; - for (var i=0; i'; - } else { - strMenu += '' + gbPopupMenuTopicList[fn_arguments[i]].strTitle + ''; - } - strMenu += ''; - - if (isNaN(fn_arguments[i]) || (gbPopupMenuTopicList == null)) { - i += 2; - } else { - i += 1; - } - } - strMenu += ""; - - if (gbBsMac) { - // totally hack. because ie5 in mac need something. is one of them. mac is mad. - strMenu +="
"; - } - - var layerPopup = null; - var stylePopup = null; - var nEventX = 0; - var nEventY = 0; - var nWindowWidth = 0; - if (gbBsIE4 || gbBsOpera7) { - - layerPopup = getElement("PopupMenu"); - layerPopup.innerHTML = strMenu; - stylePopup = layerPopup.style; - - _BSPSGetClientSize(); - - // Get the position of the item causing the event (relative to its parent) - nEventX = window.event.clientX; - nEventY = window.event.clientY; - - if (nEventY + layerPopup.scrollHeight + 10 < gBsClientHeight) { - nEventY += document.body.scrollTop + 10; - } else { - nEventY = (document.body.scrollTop + gBsClientHeight) - layerPopup.scrollHeight - 20; - } - stylePopup.top = nEventY; - - var nPopupWidth = layerPopup.scrollWidth; - if (gbBsMac) { - nPopupWidth = 80; // we have no idea how to get the dynamic width of the popup. - } - if (nEventX + nPopupWidth + 20 > gBsClientWidth) { - if (gBsClientWidth - nPopupWidth < 5) { - stylePopup.left = 5; - } else { - stylePopup.left = gBsClientWidth - nPopupWidth - 5; - } - } else { - stylePopup.left = nEventX + document.body.scrollLeft + 20; - } - - stylePopup.visibility = "visible"; - if (!gOlddocumentClick && document.onclick) - gOlddocumentClick = document.onclick; - document.onclick = PopupMenu_HandleClick; - - } else if (gbBsNS6 || gbBsKonqueror3||gbBsSafari) { - layerPopup = getElement("PopupMenu"); - layerPopup.style.visibility = "hidden"; - - if (gbBsNS6) - { - var e = fn_arguments[0]; - nEventX = e.pageX; - nEventY = e.pageY; - } - else - { - nEventX = window.event.clientX; - nEventY = window.event.clientY; - } - _BSPSGetClientSize(); - layerPopup.innerHTML = strMenu; - - if (nEventY + layerPopup.offsetHeight + 20 < window.pageYOffset + gBsClientHeight) { - nEventY += 20; - } else { - nEventY = gBsClientHeight + window.pageYOffset - layerPopup.offsetHeight - 20; - } - - if (nEventX + layerPopup.offsetWidth + 20 > gBsClientWidth + window.pageXOffset) { - if (gBsClientWidth + window.pageXOffset - layerPopup.offsetWidth < 20) { - nEventX = 5; - } else { - nEventX = gBsClientWidth + window.pageXOffset - layerPopup.offsetWidth - 20; - } - } else { - nEventX += 20; - } - layerPopup.style.top = nEventY; - layerPopup.style.left = nEventX; - // set again to avoid the stupid frash in netscape 6. - layerPopup.innerHTML = strMenu; - layerPopup.style.visibility = "visible"; - //window.captureEvents(Event.MOUSEDOWN); - if (!gOlddocumentClick && document.onclick) - gOlddocumentClick = document.onclick; - window.onclick = PopupMenu_HandleClick; - } - else if (gbBsNS4) { - layerPopup = document.layers.PopupMenu; - layerPopup.visibility = "hide"; - stylePopup = layerPopup.document; - stylePopup.write(strMenu); - stylePopup.close(); - var e = fn_arguments[0]; - nEventX = e.pageX; - nEventY = e.pageY; - _BSPSGetClientSize(); - if (nEventY + layerPopup.clip.height + 20 < window.pageYOffset + gBsClientHeight) { - nEventY += 20; - } else { - nEventY = gBsClientHeight + window.pageYOffset- layerPopup.clip.height - 20; - } - layerPopup.top = nEventY; - - if (nEventX + layerPopup.clip.width + 20 > gBsClientWidth + window.pageXOffset) { - if (gBsClientWidth + window.pageXOffset - layerPopup.clip.width < 20) { - nEventX = 5; - } else { - nEventX = gBsClientWidth + window.pageXOffset - layerPopup.clip.width - 20; - } - } else { - nEventX += 20; - } - - layerPopup.left = nEventX; - - layerPopup.visibility = "show"; - - window.captureEvents(Event.MOUSEDOWN); - if (!gOlddocumentClick && document.onmousedown) - gOlddocumentClick = document.onmousedown; - window.onmousedown = PopupMenu_HandleClick; - } - - window.gbInPopupMenu = true; - window.gbPopupMenuTimeoutExpired = false; - setTimeout("PopupMenu_Timeout();", 100); - return false; -} - -function PopupMenu_Timeout() -{ - window.gbPopupMenuTimeoutExpired = true; -} - -function PopupMenu_Over(e) -{ - if (gbBsIE4||gbBsOpera7) - e.srcElement.className = "PopupOver"; - else if (gbBsNS6) - e.target.parentNode.className = "PopupOver"; - return; -} - -function PopupMenu_Out(e) -{ - if (gbBsIE4||gbBsOpera7) - e.srcElement.className = "PopupNotOver"; - else if (gbBsNS6) - e.target.parentNode.className = "PopupNotOver"; - return; -} - -function PopupMenu_HandleClick(e) -{ - if (window.gbPopupMenuTimeoutExpired) { - window.gbInPopupMenu = false; - if (gbBsNS4 && !gbBsNS6) { - window.releaseEvents(Event.MOUSEDOWN); - } - - var layerPopup = null; - if (gbBsNS4&&!gbBsNS6) { - layerPopup = document.layers.PopupMenu; - layerPopup.visibility = "hide"; - } else { - layerPopup = getElement("PopupMenu"); - layerPopup.style.visibility = "hidden"; - } - - if (gOlddocumentClick) - { - if (gbBsNS4 && !gbBsNS6) - document.onmousedown = gOlddocumentClick; - else - document.onclick = gOlddocumentClick; - } - } - return; -} - -function BSSCPopup_ClickMac() -{ - if ((!DHTMLPopupSupport()) && (gbBsIE4 || gbBsOpera7)) - { - var bClickOnAnchor = false; - var el; - if ((window.event != null) && - (window.event.srcElement != null)) - { - el = window.event.srcElement; - while (el != null) - { - if ((el.tagName == "A") || (el.tagName == "AREA")) { - bClickOnAnchor = true; - break; - } - if (el.tagName == "BODY") { - break; - } - el = getParentNode(el); - } - } - if (BSSCPopup_IsPopup()) - { - if (!bClickOnAnchor) { - parent.window.gPopupWindow = null; - self.close(); - } - } - else - { - bClosePopupWindow = true; - if ((bClickOnAnchor) && - (el.href) && - ((el.href.indexOf("javascript:BSSCPopup") != -1) || (el.href.indexOf("javascript:null") != -1) || (el.href.indexOf("javascript:void(0)") != -1))) - { - bClosePopupWindow = false; - } - if (bClosePopupWindow) - { - if (window.gPopupWindow != null && !window.gPopupWindow.closed ) - { - window.gPopupWindow.close(); - } - } - } - } -} - -function BsPopupOnClick() -{ - if (!gbBsIE4 && !gbBsOpera7) - return; - - BSSCPopup_ClickMac(); -} - -function _BSSCOnError(message) -{ - if(-1 != message.indexOf("denied") - || -1 != message.indexOf("Object required")) - return true; -} - -//End to support previous relative topics - -/// Section End - General and relative topics (JavaScript 1.0) - -/// Section Begin - Popup (JavaScript 1.0) -//Begin to support previous popup functions - -//variables used to isolate the browser type -var gBsStyVisShow = null; -var gBsStyVisHide = null; -var gBsClientWidth = 640; -var gBsClientHeight = 480; - -// here is the varible for judge popup windows size. these parameter is for IE5.0, it may need adjust for others. -var gBRateH_W = 0.618; // 1.618 Golden cut. -var gBMaxXOfParent = 0.8; -var gBMaxYOfParent = 0.8; -var gBscrollHeight = 16; -var gBscrollWidth = 16; -var gBpermitXDelta = 3; -var gBpermitYDelta = 3; - - -var arrayPopupURL = new Array(); -var arrayAbsPopupURL = new Array(); - -var arrayDirty = new Array(); - -function setAbsPopupURL(nIndex, strURL) -{ - arrayAbsPopupURL[nIndex] = strURL; -} - -function getAbsPopupURL(nIndex) -{ - if (nIndex == -1 || arrayAbsPopupURL.length <= nIndex) return null; - else - return arrayAbsPopupURL[nIndex]; -} - -function getPopupURL(nIndex) -{ - if (nIndex == -1 || arrayPopupURL.length <= nIndex) return null; - else - return arrayPopupURL[nIndex]; -} - -function getPopupID(nIndex) -{ - return gstrPopupID + nIndex; -} - -function getPopupShadowID(nIndex) -{ - return gstrPopupShadowID + nIndex; -} - -function getPopupTopicID(nIndex) -{ - return gstrPopupTopicID + nIndex; -} - -function getPopupIFrameID(nIndex) -{ - return gstrPopupIFrameID + nIndex; -} - -function getPopupIFrameName(nIndex) -{ - return gstrPopupIFrameName + nIndex; -} - - -function getPopupTopicStyle(nIndex) -{ - return getElement(getPopupTopicID(nIndex)).style; -} - -function getPopupShadowStyle(nIndex) -{ - return getElement(getPopupShadowID(nIndex)).style; -} - -function getPopupIFrame(nIndex) -{ - if (gbBsNS6) - return eval("window.frames['" + getPopupIFrameName(nIndex) + "']"); - else - return eval("document.frames['" + getPopupIFrameName(nIndex) + "']"); -} - -function getPopupDivStyle(nIndex) -{ - return getElement(getPopupID(nIndex)).style; -} - -function getPopupIFrameStyle(nIndex) -{ - return getElement(getPopupIFrameID(nIndex)).style; -} - - -function findDiv(strURL) -{ - for (var i = 0; i < arrayPopupURL.length; i ++ ) { - if (arrayPopupURL[i] == strURL) { - return i; - } - } - return -1; -} - -var gnToken = -1; -function takeToken() -{ - gnToken ++; - if (gnToken > 10000) gnToken = 0; - return gnToken; -} - -function IsValidToken(nToken) -{ - return (gnToken == nToken); -} - -function addDiv(strURL) -{ - for (var i = 0; i < arrayPopupURL.length; i ++) { - if (arrayPopupURL[i] == null) { - arrayPopupURL[i] = strURL; - return i; - } - } - arrayPopupURL[i] = strURL; - arrayDirty[i] = true; - return i; -} - -function setDirty() -{ - for (var i = 0; i < arrayPopupURL.length; i ++ ) - arrayDirty[i] = true; -} - -function IsDirty(nIndex) -{ - if (nIndex == -1) - return true; - else - if (arrayDirty.length > nIndex) - return arrayDirty[nIndex]; - else - return true; -} - -function hideAll() -{ - for (var i = 0; i < arrayPopupURL.length; i ++ ) - { - getPopupDivStyle(i).visibility = gBsStyVisHide; - getPopupIFrameStyle(i).visibility = gBsStyVisHide; - } -} - -function getCurrentPopupIFrame() -{ - for (var i = 0; i < arrayPopupURL.length; i ++) - if (getPopupDivStyle(i).visibility == gBsStyVisShow) - return getPopupIFrame(i); - return null; -} - -function setClear(nIndex) -{ - if (nIndex != -1) - arrayDirty[nIndex] = false; -} - -function _BSSCCreatePopupDiv(strURL) -{ - var nIndex = findDiv(strURL); - if (nIndex == -1 ) { - nIndex = addDiv(strURL); - BsPopup_CreateDiv(nIndex); - } - else { - if (IsDirty(nIndex)) { - if("object" == typeof(getPopupIFrame(nIndex).document)) - getPopupIFrame(nIndex).document.location.href = strURL; - } - } - return nIndex; -} - -//Here is the browser type -function _BSPSGetBrowserInfo() -{ - if (gbBsNS4&&!gbBsNS6) - { - gBsStyVisShow = "show"; - gBsStyVisHide = "hide"; - } - else - { - gBsStyVisShow = "visible"; - gBsStyVisHide = "hidden"; - } -} - -_BSPSGetBrowserInfo(); - -//Get client size info -function _BSPSGetClientSize() -{ - if (gbBsNS4||gbBsKonqueror3||gbBsSafari) - { - gBsClientWidth = innerWidth; - gBsClientHeight = innerHeight; - } - else if (gbBsIE4 || gbBsOpera7) - { - gBsClientWidth = document.body.clientWidth; - gBsClientHeight = document.body.clientHeight; - } -} - -var gstrPopupID = 'BSSCPopup'; -var gstrPopupShadowID = 'BSSCPopupShadow'; -var gstrPopupTopicID = 'BSSCPopupTopic'; -var gstrPopupIFrameID = 'BSSCPopupIFrame'; -var gstrPopupIFrameName = 'BSSCPopupIFrameName'; - -var gstrPopupSecondWindowName = 'BSSCPopup'; - -var gPopupWindow = null; -var gnPopupClickX = 0; -var gnPopupClickY = 0; - -var gnPopupScreenClickX = 0; -var gnPopupScreenClickY = 0; - -var gbPopupTimeoutExpired = false; - -function DHTMLPopupSupport() -{ - if (((gbBsIE4) && (!gbBsMac))||gbBsOpera7|| gbBsNS7) { - return true; - } - return false; -} - -function BSSCPopup_IsPopup() -{ - if (DHTMLPopupSupport() && (this.name.indexOf(gstrPopupIFrameName) != -1)) { - return true; - } else if ((gbBsNS4 || gbBsIE4 || gbBsOpera7) && (this.name.indexOf(gstrPopupID) != -1)) { - return true; - } else { - return false; - } -} - -// If there is a hyperlink in a popup window, display the hyperlink in -// the original window. (bsscright) -if (BSSCPopup_IsPopup() && !gbBsIE4 && !gbBsOpera7) { - document.write(""); -} - -// Local functions. -function BsPopup_CreateDiv(nIndex) -{ - if(!DHTMLPopupSupport()) - return; - // DO NOT SET Width and height for the div, otherwize it will make IE4 popup do not work when view the topic alone. - var strPopupDiv = ""; - - var objBody = getElementsByTag(document, "BODY")[0]; - if( typeof(objBody) != "object" ) - return; - - insertAdjacentHTML(objBody, "beforeEnd", strPopupDiv); -} - -function handleLoadNS() -{ - if (this.id) - { - var nIndex = parseInt(this.id.substring(gstrPopupIFrameID.length)); - BSSCPopup_PostWork(nIndex); - } -} - -function BSSCPopup_PostWork(nIndex) -{ - getPopupDivStyle(nIndex).visibility = gBsStyVisShow; - getPopupIFrameStyle(nIndex).visibility =gBsStyVisShow; - - setClear(nIndex); - window.gbPopupTimeoutExpired = true; - - BSSCPopup_ChangeTargettoParent(getPopupIFrame(nIndex).document); - if (gbBsNS6) - getPopupIFrame(nIndex).document.body.addEventListener("click",BSSCPopupClicked,false); - else - getPopupIFrame(nIndex).document.body.onclick = BSSCPopupClicked; - - if (!gbOrignalOnMouseDown && document.onmousedown) - gbOrignalOnMouseDown = document.onmousedown; - - if (gbBsNS6) - document.addEventListener("mousedown", BSSCPopupParentClicked,false); - else - document.onmousedown = BSSCPopupParentClicked; -} - -function BSSCPopup_Timeout(nIndex, nToken) -{ - if (!IsValidToken(nToken)) return; - - if (gbBsNS6||((getPopupIFrame(nIndex).document.readyState == "complete") && - (getPopupIFrame(nIndex).document.body != null))) { - BSSCPopup_PostWork(nIndex); - } else { - setTimeout("BSSCPopup_Timeout(" + nIndex + "," + nToken + ")", 100); - } -} - -// VH 08/10/00 -// do not change target to parent if the href is using javascript -function BSSCPopup_ChangeTargettoParent(tagsObject) -{ - var collA = getElementsByTag(tagsObject, "A"); - BSSCPopup_ChangeTargettoParent2(collA); - - var collIMG = getElementsByTag(tagsObject,"IMG"); - BSSCPopup_ChangeTargettoParent2(collIMG); -} - -function BSSCPopup_ChangeTargettoParent2(colls) -{ - if (colls != null) { - for (var j = 0; j < colls.length; j ++ ) - { - var strtemp = colls[j].href; - if (strtemp) - { - strtemp = strtemp.toLowerCase(); - if (strtemp.indexOf("javascript:") == -1) - if (colls[j].target == "") - colls[j].target = "_parent"; - } - } - } -} - -function BSPSPopupTopicWinHelp(strURL) -{ - _BSSCPopup(strURL); - return; -} - -function _BSSCPopup(strURL, width, height) -{ - var cuswidth = 0; - var cusheight = 0; - if ("undefined" != typeof(width) && "undefined" != typeof(height)) { - cuswidth = width; - cusheight= height; - } - - if (DHTMLPopupSupport()) { - var nToken = takeToken(); // take token first. - var nIndex = _BSSCCreatePopupDiv(strURL); - window.gbPopupTimeoutExpired = false; - var ntWidth = gBsClientWidth; - var ntHeight = gBsClientHeight; - _BSPSGetClientSize(); - if (ntWidth != gBsClientWidth || ntHeight != gBsClientHeight) { - setDirty(); - } - - if (IsDirty(nIndex)) { - if (gbBsMac) { - setTimeout("BSSCPopup_AfterLoad(" + nIndex + "," + nToken + "," + cuswidth + "," + cusheight +")", 400); - } else { - setTimeout("BSSCPopup_AfterLoad(" + nIndex + "," + nToken + "," + cuswidth + "," + cusheight + ")", 100); - } - } - else { - MoveDivAndShow(nIndex ,nToken, cuswidth, cusheight); - } - } else { - _BSSCPopup2(strURL, cuswidth, cusheight); - } - return; -} - -if (gbBsIE55) -{ - var ehlpdhtm_fOldBefureUnload = window.onbeforeunload; - var gnBsUnload=0; - window.onbeforeunload = window_BUnload; -} - -function window_BUnload() -{ - gnBsUnload++; - if (gnBsUnload>1) - return; - for (var i = 0; i < arrayPopupURL.length; i ++) - removeThis(document.all(getPopupID(i))); - arrayPopupURL.length = 0; - if (ehlpdhtm_fOldBefureUnload) - ehlpdhtm_fOldBefureUnload(); -} - -function _BSSCPopup2(strURL, width, height) -{ - if (gbBsOpera6&&gbBsMac) - { - var wmTemp = window.open(document.location.href, gstrPopupSecondWindowName); - wmTemp.close(); - setTimeout("_BSSCPopup3(\""+strURL+"\","+width+","+height+");",100); - } - else - _BSSCPopup3(strURL, width, height); -} - -function _BSSCPopup3(strURL, width, height) -{ - if (window.name == gstrPopupSecondWindowName) { - window.location = strURL; - } else { - if (!gbBsMac || !gbBsNS4) { - BSSCHidePopupWindow(); - } - var nX = 0; - var nY = 0; - var nHeight = 300; - var nWidth = 400; - if (width > 0 && height > 0) { - nHeight = height; - nWidth = width; - } - _BSPSGetClientSize(); - - nX = window.gnPopupScreenClickX; - nY = window.gnPopupScreenClickY; - - if (nY + nHeight + 40 > screen.availHeight) { - nY = screen.availHeight - nHeight - 40; - } - if (nX + nWidth + 40 > screen.availWidth) { - nX = screen.availWidth - nWidth - 40; - } - - // Launch a separate window - var strParam="titlebar=no,toolbar=no,status=no,location=no,menubar=no,resizable=yes,scrollbars=yes"; - if (gbBsNS) { - if (gbBsNS6) { - strParam += ",Height=" + nHeight + ",Width=" + nWidth; - strParam += ",screenX=" + nX + ",screenY=" + nY; - strParam += ",dependent=yes"; - } - else { - strParam += ",OuterHeight=" + nHeight + ",OuterWidth=" + nWidth; - strParam += ",screenX=" + nX + ",screenY=" + nY; - strParam += ",dependent=yes"; - } - } - else { - strParam += ",height=" + nHeight + ",width=" + nWidth; - strParam += ",left=" + nX + ",top=" + nY; - } - if (gbBsSafari) - { - if (window.gPopupWindow) - window.gPopupWindow.close(); - window.gPopupWindow = window.open(strURL, "", strParam); - window.gPopupWindow.name = gstrPopupSecondWindowName; - window.gPopupWindow.moveTo(nX, nY); - widnow.gPopupWindow.document.location.reload(); - } - else - { - var wmTemp=null; - if (gbBsKonqueror3) - { - if (window.gPopupWindow) - window.gPopupWindow.close(); - } - if (gbBsOpera&&gbBsMac) - { - wmTemp= window.open(document.location.href, "Temp", strParam); - } - window.gPopupWindow = window.open(strURL, gstrPopupSecondWindowName, strParam); - if (!gbBsIE) - window.gPopupWindow.focus(); - - if (wmTemp) - wmTemp.close(); - } - - if (gbBsNS4) - setEventHandle(); - else if (gbBsIE4 || gbBsOpera7||gbBsKonqueror3) - setTimeout("setPopupFocus();", 100); - } - return; -} - -function setEventHandle() -{ - window.gPopupWindow.captureEvents(Event.CLICK | Event.BLUR); - window.gPopupWindow.onclick = NonIEPopup_HandleClick; - window.gPopupWindow.onblur = NonIEPopup_HandleBlur; -} - -function setPopupFocus() -{ - window.gPopupWindow.focus(); -} - -function NonIEPopup_HandleBlur(e) -{ - window.gPopupWindow.focus(); -} - -function NonIEPopup_HandleClick(e) -{ - // Because navigator will give the event to the handler before the hyperlink, let's - // first route the event to see if we are clicking on a Popup menu in a popup. - document.routeEvent(e); - - // If a popup menu is active then don't do anything with the click - if (window.gPopupWindow.gbInPopupMenu) { - window.gPopupWindow.captureEvents(Event.CLICK); - window.gPopupWindow.onclick = NonIEPopup_HandleClick; - return false; - } - - // Close the popup window - if(e.target.href) - { - if(e.target.href.indexOf("javascript:")==-1) - { - if (e.target.target=="") - window.location.href = e.target.href; - else - window.open(e.target.href, e.target.target); - this.close(); - } - } - else - this.close(); - return false; -} - -function BSSCPopup_AfterLoad(nIndex, nToken, cuswidth, cusheight) -{ - if (!window.getPopupIFrame(nIndex).document) { - _BSSCPopup2(getPopupURL(nIndex), cuswidth, cusheight); - return; - } - - if (!IsValidToken(nToken)) return; - - if (gbBsNS6) - { - setAbsPopupURL(nIndex, window.getPopupIFrame(nIndex).document.location.href); // change URL to abs url. - BSSCPopup_ResizeAfterLoad(nIndex, nToken, cuswidth, cusheight); - return; - } - - if ((window.getPopupIFrame(nIndex).document.readyState == "complete") && - (window.getPopupIFrame(nIndex).document.body != null)) { - if (window.getPopupIFrame(nIndex).document.location.href.indexOf("about:blank") != -1) { // add this check. IE will use about:blank" as the default vaule for Iframe. - window.getPopupIFrame(nIndex).document.location = getPopupURL(nIndex); - setTimeout("BSSCPopup_AfterLoad(" + nIndex + "," + nToken + "," + cuswidth + "," + cusheight + ")", 200); - } - else - { - setAbsPopupURL(nIndex, window.getPopupIFrame(nIndex).document.location.href); // change URL to abs url. - BSSCPopup_ResizeAfterLoad(nIndex, nToken, cuswidth, cusheight); - } - } else { - setTimeout("BSSCPopup_AfterLoad(" + nIndex + "," + nToken + "," + cuswidth + "," + cusheight + ")", 200); - } -} - -function BSSCPopup_ResizeAfterLoad(nIndex, nToken, cuswidth, cusheight) -{ - if (window.gbPopupTimeoutExpired) return; - - if (!IsValidToken(nToken)) return; - - getPopupDivStyle(nIndex).visibility = gBsStyVisHide; - getPopupIFrameStyle(nIndex).visibility = gBsStyVisHide; - - // Determine the width and height for the window - _BSPSGetClientSize(); - - var size = new BSSCSize(0, 0); - - if (cuswidth <= 0 || cusheight <= 0) - BSSCGetContentSize(window.getPopupIFrame(nIndex), size); - else { - size.x = cuswidth; - size.y = cusheight; - } - - // Determine the width and height for the window - var nWidth = size.x; - var nHeight = size.y; - - // for small popup size, we should allow any size. - // The popup size should be ok if bigger than 0 - if (nWidth < 0 || nHeight < 0) return; // there must be something terribly wrong. - - getPopupDivStyle(nIndex).width = nWidth; - getPopupDivStyle(nIndex).height = nHeight; - - getPopupShadowStyle(nIndex).width = nWidth; - getPopupShadowStyle(nIndex).height = nHeight; - getPopupTopicStyle(nIndex).width = nWidth; - getPopupTopicStyle(nIndex).height = nHeight; - if (gbBsIE55) - { - getPopupShadowStyle(nIndex).width = nWidth + 2; - getPopupShadowStyle(nIndex).height = nHeight + 2; - getPopupTopicStyle(nIndex).width = nWidth + 2; - getPopupTopicStyle(nIndex).height = nHeight + 2; - } - - getPopupIFrameStyle(nIndex).width = nWidth; - getPopupIFrameStyle(nIndex).height = nHeight; - if (gbBsIE55 || gbBsNS6) - { - getPopupIFrameStyle(nIndex).top = 0; - getPopupIFrameStyle(nIndex).left = 0; - } - - var strURL = getPopupURL(nIndex); - if (strURL.indexOf("#") != -1&&gbBsNS6) - getPopupIFrame(nIndex).location.reload(); - else if (strURL.indexOf("#") != -1||gbBsNS6) - getPopupIFrame(nIndex).location.href = strURL; // reload again, this will fix the bookmark misunderstand in IE5. - - MoveDivAndShow(nIndex, nToken, cuswidth, cusheight); -} - -function getScrollLeft() -{ - if (document.body.scrollLeft) - return document.body.scrollLeft; - else if (window.pageXOffset) - return window.pageXOffset; - else - return 0; -} - -function getScrollTop() -{ - if (document.body.scrollTop) - return document.body.scrollTop; - else if (window.pageYOffset) - return window.pageYOffset; - else - return 0; -} - - -function MoveDivAndShow(nIndex, nToken, cuswidth, cusheight) -{ - if (window.getPopupIFrame(nIndex).document.location.href != getAbsPopupURL(nIndex)) { // if redirect, reload again. - window.getPopupIFrame(nIndex).document.location = getPopupURL(nIndex); - setTimeout("BSSCPopup_AfterLoad(" + nIndex + "," + nToken + "," + cuswidth + "," + cusheight + ")", 200); - return; - } - - // Determine the position of the window - var nClickX = window.gnPopupClickX; - var nClickY = window.gnPopupClickY; - var nTop = 0; - var nLeft = 0; - - var nWidth = parseInt(getPopupDivStyle(nIndex).width); - var nHeight = parseInt(getPopupDivStyle(nIndex).height); - - if (nClickY + nHeight + 20 < gBsClientHeight + getScrollTop()) { - nTop = nClickY + 10; - } else { - nTop = (getScrollTop() + gBsClientHeight) - nHeight - 20; - } - if (nClickX + nWidth < gBsClientWidth + getScrollLeft()) { - nLeft = nClickX; - } else { - nLeft = (getScrollLeft() + gBsClientWidth) - nWidth - 8; - } - - if (nTop < getScrollTop()) nTop = getScrollTop() + 1; - if (nLeft< getScrollLeft()) nLeft = getScrollLeft() + 1; - - getPopupDivStyle(nIndex).left = nLeft; - getPopupDivStyle(nIndex).top = nTop; - - // Set the location of the background blocks - getPopupShadowStyle(nIndex).left = 6; - getPopupShadowStyle(nIndex).top = 6; - if (gbBsIE55) - { - getPopupShadowStyle(nIndex).left = 4; - getPopupShadowStyle(nIndex).top = 4; - } - - if (gbBsMac&&gbBsIE4) { - // Total hack on the iMac to get the IFrame to position properly - getPopupIFrameStyle(nIndex).pixelLeft = 100; - getPopupIFrameStyle(nIndex).pixelLeft = 0; - // Explicitly call BSSCOnLoad because the Mac doesn't seem to do it - getPopupIFrame(nIndex).window.BSSCOnLoad(); - } - - if (gbBsNS6&&IsDirty(nIndex)) - getElement(getPopupIFrameID(nIndex)).addEventListener("load", handleLoadNS, false); - else - BSSCPopup_Timeout(nIndex , nToken ); - return; -} - -function BSSCSize(x, y) -{ - this.x = x; - this.y = y; -} - -function BSSCGetContentSize(thisWindow, size) -{ - if (!gbBsIE4 && !gbBsOpera7 && !gbBsNS4) - return; - - if ((gbBsMac&&gbBsIE4)||gbBsNS4||gbBsOpera7) { - size.x = 320; - size.y = 180; - return; - } - - // Resize the width until it is wide enough to handle the content - // The trick is to start wide and determine when the scrollHeight changes - // because then we know a scrollbar is necessary. We can then go back - // to the next widest size (for no scrollbar) - - var ClientRate = gBsClientHeight / gBsClientWidth; - - - var GoldenSize = new BSSCSize(0,0); - GoldenSize.x = gBsClientWidth * gBMaxXOfParent; - GoldenSize.y = gBsClientHeight *gBMaxYOfParent ; - - if (ClientRate > gBRateH_W) { - GoldenSize.y = GoldenSize.x * gBRateH_W; - } - else { - GoldenSize.x = GoldenSize.y / gBRateH_W; - } - - // Try to using parent specified max x. - var x = 0; - var maxgoldx = GoldenSize.x; - var maxx = gBsClientWidth * gBMaxXOfParent; - - // This double resize causes the document to re-render (and we need it to) - if (!gbBsIE5) - thisWindow.moveTo(10000,10000); // this is used to fix the flash on IE4. - - thisWindow.resizeTo(1, 1); - thisWindow.resizeTo(1, 1); - thisWindow.resizeTo(maxgoldx, thisWindow.document.body.scrollHeight + gBscrollHeight); - thisWindow.resizeTo(maxgoldx, thisWindow.document.body.scrollHeight + gBscrollHeight); - - var miny = thisWindow.document.body.scrollHeight + gBscrollHeight; - - if (miny > GoldenSize.y) // the popup does not fix in the parent wanted golden area. so try to expand itself as large as it can - { - thisWindow.resizeTo(maxx , thisWindow.document.body.scrollHeight + gBscrollHeight); - thisWindow.resizeTo(maxx , thisWindow.document.body.scrollHeight + gBscrollHeight); - - miny = thisWindow.document.body.scrollHeight + gBscrollHeight; - maxy = gBsClientHeight * gBMaxYOfParent; - - if (miny > maxy) { // the popup must have a scroll, OK let it be. - miny = maxy; - size.x = maxx; - size.y = maxy; - thisWindow.document.body.scroll = 'yes'; // At this time we do want to show scroll any more. so it will looks better a little. - } - else { // popup still can fit in the parent area by someway. now we choose the same h/w rate as parent. - size.y = miny; - - // downsize from maxx , now I try to using binary divide. - x = maxx; - deltax = -maxx/2; - //j = 0; - while (true) { - x = x + deltax; - thisWindow.resizeTo(x, miny); - thisWindow.resizeTo(x, miny); - diffy = thisWindow.document.body.scrollHeight + gBscrollHeight - x * ClientRate; - if (diffy > gBpermitYDelta ) // it is higher than wanted, so x need to be wide a little bitter - deltax = Math.abs(deltax) /2; - else if (diffy < -gBpermitYDelta) // it is shorter than wanted, so x need to be narrow a little bitter - deltax = -Math.abs(deltax) /2; - else - // the y is close enough to wanted. - break; - if (Math.abs(deltax) < gBpermitXDelta) // the next change is too slight and it can be ignore. - break; - } - size.x = thisWindow.document.body.scrollWidth; //+ gBscrollWidth; - size.y = thisWindow.document.body.scrollHeight;// + gBscrollHeight; - thisWindow.document.body.scroll = 'no'; - } - } - else { - if (thisWindow.document.body.scrollWidth > maxgoldx) { - size.x = maxx; - size.y = miny; - thisWindow.document.body.scroll = 'yes'; - } - else { - // downsize from maxgoldx , now I try to using binary divide. - x = maxgoldx; - deltax = -maxgoldx/2; - while (true) { - x = x + deltax; - thisWindow.resizeTo(x, miny); - thisWindow.resizeTo(x, miny); - diffy = thisWindow.document.body.scrollHeight + gBscrollHeight - x * gBRateH_W; - if (diffy > gBpermitYDelta ) // it is higher than wanted, so x need to be wide a little bitter - deltax = Math.abs(deltax) /2; - else if (diffy < -gBpermitYDelta) // it is shorter than wanted, so x need to be narrow a little bitter - deltax = -Math.abs(deltax) /2; - else - // the y is close enough to wanted. - break; - if (Math.abs(deltax) < gBpermitXDelta) // the next change is too slight and it can be ignore. - break; - } - size.x = thisWindow.document.body.scrollWidth; //+ gBscrollWidth; - size.y = thisWindow.document.body.scrollHeight ; - thisWindow.document.body.scroll = 'no'; // At this time we do not want to show scroll any more. so it will looks better a little. - thisWindow.resizeTo(size.x, size.y); - if (thisWindow.document.body.scrollWidth > size.x) - { - size.x = thisWindow.document.body.scrollWidth; - } - if (thisWindow.document.body.scrollHeight > size.y) - { - size.y = thisWindow.document.body.scrollHeight; - } - } - } - thisWindow.resizeTo(size.x, size.y); - thisWindow.resizeTo(size.x, size.y); - return; -} - -function BSSCPopupParentClicked() -{ - if (!window.gbPopupTimeoutExpired) { - return false; - } - - document.onmousedown = gbOrignalOnMouseDown; - - // Simply hide the popup - hideAll(); - - window.gbPopupTimeoutExpired = false; - - return true; -} - -function isInsideHyperLink(obj) -{ - if (obj&&obj!=getParentNode(obj)) - { - if (obj.tagName=="A"||obj.tagName=="IMG") - return true; - else - return isInsideHyperLink(getParentNode(obj)); - } - else - return false; -} - -function BSSCPopupClicked(e) -{ - if (!window.gbPopupTimeoutExpired) { - return false; - } - - var popupIFrame = getCurrentPopupIFrame(); - if (popupIFrame == null) { - return true; - } - - if (gbBsIE4 && (!((popupIFrame.window.event != null) && - (popupIFrame.window.event.srcElement != null) && - isInsideHyperLink(popupIFrame.window.event.srcElement)))) { - document.onmousedown = gbOrignalOnMouseDown; - - // Simply hide the popup - hideAll(); - window.gbPopupTimeoutExpired = false; - return true; - } - else if (gbBsNS6 && (!((e != null) && - (e.target!= null) && isInsideHyperLink(e.target)))) - { - document.addEventListener("mousedown", gbOrignalOnMouseDown,false); - // Simply hide the popup - hideAll(); - window.gbPopupTimeoutExpired = false; - return true; - } -} - -//trace the mouse over's position for hotspot -function BSPSPopupOnMouseOver(event) -{ - if (gbBsIE4 || gbBsOpera7||gbBsKonqueror3) { - window.gnPopupClickX = event.clientX + getScrollLeft(); - window.gnPopupClickY = event.clientY + getScrollTop(); - window.gnPopupScreenClickX = event.screenX; - window.gnPopupScreenClickY = event.screenY; - } else if (gbBsSafari) { - window.gnPopupClickX = event.clientX + getScrollLeft(); - window.gnPopupClickY = event.clientY + getScrollTop(); - window.gnPopupScreenClickX = event.screenX + window.screenX; - window.gnPopupScreenClickY = event.screenY + window.screenY; - } else if (gbBsNS4) { - window.gnPopupClickX = event.pageX - window.pageXOffset; - window.gnPopupClickY = event.pageY - window.pageYOffset; - window.gnPopupScreenClickX = event.screenX - window.pageXOffset; - window.gnPopupScreenClickY = event.screenY - window.pageYOffset; - } -} - -function BSSCHidePopupWindow() -{ - if (window.gPopupWindow != null) { - if (gbBsNS4) { - if ((typeof window.gPopupWindow != "undefined") && (!window.gPopupWindow.closed)) { - window.gPopupWindow.close(); - window.gPopupWindow = null; - } - } - } - return; -} - -// Add the PopupOnClick to the onclick array. -if (typeof(BsscRegisterOnClick) != "undefined") -{ - BsscRegisterOnClick(BsPopupOnClick); -} -//End to support previous popup functions - -/// Section End - Popup (JavaScript 1.0) - -/// Section Begin - Embedded Stub (JavaScript 1.0) - -function BSSCCreatePopupDiv() -{ - return; -} - -function WritePopupMenuLayer() -{ - if (BsscHasExtJs()) {_WritePopupMenuLayer();} -} - -function BSSCPopup(strURL, width, height) -{ - var re = new RegExp("'", 'g'); - strURL = strURL.replace(re, "%27"); - - if (BsscHasExtJs()) { - _BSSCPopup(strURL, width, height); - }else{ - //Create a temporary window first to ensure the real popup comes up on top - var wndTemp = null; - if (!gbBsNS3) { - wndTemp = window.open("", "temp", "titlebar=no,toolbar=no,status=no,location=no,menubar=no,resizable=yes,scrollbars=yes,height=3,width=4"); - } - // Create the real popup window - var wndPopup = window.open(strURL, "BSSCPopup", "titlebar=no,toolbar=no,status=no,location=no,menubar=no,resizable=yes,scrollbars=yes,height=300,width=400"); - // Close the temporary - if (!gbBsNS3) { - wndTemp.close(); - } else { - wndPopup.focus(); - } - } -} - -var gbWndTemp = null, gbWndPopupLinks = null; -var gbstrParaTotal = ""; - -function PopupMenu_Invoke() -{ - if (typeof(wfRelatedTopic) == 'function' && typeof(IsFlashSupported) == 'function') - { - if (Number(gsSkinVersion) > 2 && IsFlashSupported()) - { - return wfRelatedTopic(PopupMenu_Invoke.arguments); - } - } - if (BsscHasExtJs()) { - return _PopupMenu_Invoke(PopupMenu_Invoke.arguments); - } - if (gbBsNS3Before || gbBsIE3Before ) { - var argLen = PopupMenu_Invoke.arguments.length; - if (argLen < 5) { - window.document.location.href = PopupMenu_Invoke.arguments[3]; - return false; - } - gbWndTemp = null; - gbWndPopupLinks = null; - gbstrParaTotal = ""; - for (var i = 0; i < (argLen - 2) / 2; i++) { - var strParaLine = ""; - if (gbBsNS2){ - strParaLine += "" - strParaLine += PopupMenu_Invoke.arguments[2 * i + 2]; - strParaLine += ""; - } else { - strParaLine += ""); - if (gbBsNS2) { - gbWndPopupLinks.document.write(""); - } else { - //YJ: IE301,302 and NS3.x works fine - gbWndPopupLinks.document.write("<"); - gbWndPopupLinks.document.write("script>"); - gbWndPopupLinks.document.write("function gotoUrl(aUrl) {opener.window.location=aUrl; close();}"); - gbWndPopupLinks.document.write("<"); - gbWndPopupLinks.document.write("/script>"); - } - gbWndPopupLinks.document.write(""); - gbWndPopupLinks.document.write(gbstrParaTotal); - gbWndPopupLinks.document.write(""); - gbWndPopupLinks.document.close(); - - // Close the temporary - if (!gbBsNS3 && gbWndTemp != null) { - gbWndTemp.close(); - }else { - gbWndPopupLinks.focus(); - } - - return true; - } - return false; -} - -/// Section End - Embedded Stub (JavaScript 1.0) - -//// Segment End -- (JavaScript 1.0) - -//// Segment Begin -- (JavaScript 1.2) -/// Section Begin - kadov DHTM (JavaScript 1.2) - -//Begin to support extended and dropdown text effects. -function kadovIsParagraph(el) -{ - return( el.tagName == "P" || el.tagName.indexOf("H") == 0 ) ? true : false; -} - -function kadovInitEachChild(el) -{ - for(var i=0; i "") ) - child.style.setAttribute( "x-on-pageload", "" ); - } - - var href = child.getAttribute("href") - if( href != null && href > "" && href.indexOf( "BSSCPopup" ) >= 0 ) - kadovFilePopupInit(child.id); // Init for Popup - else if( child.className == "dropspot" || child.className == "expandspot" || - child.className == "glossterm" ) - kadovTextPopupInit(child.id);// Init for Expanding/Glossary or DropDown text - else if( child.className == "trigger") - kadovInitTrigger(child.id);// Init for Trigger - else - { - kadovInitEffects(child.id);// Init for DHTML effects - CEngine.SetOneTargetInitialState( child.id ); - } - } - - if( (child.tagName == "IMG") && (child.getAttribute("dynsrc") > "") ) - child.start = "mouseover";// to start a AVI file. fileopen doesn't work - - kadovInitEachChild(child); - } -} - -function kadovRetrieveTextInner(el) -{ - var x = ""; - if( (!el) || (el.tagName == "!") || (el.tagName == "SCRIPT" )) - return x; - - if( kadovIsParagraph(el) ) - { - var strNewID = " "; - if( el.id != "" ) - strNewID += "id=" + el.id + "_NewSpan "; - x = "" + el.innerHTML + ""; - } - else - { - for(var i=0; i 0 ) - if( (nTagClose - nTagOpen) != nDistance ) - return strRawHTML; - - var strCleanOnce = strRawHTML.substring(0, nTagOpen) + strRawHTML.substr(nTagClose + strTagClose.length) ; - return kadovRetrieveCleanHTML( strCleanOnce, strTagOpen, strTagClose ); -} - -function kadovAdjustObjectTag(strRawHTML, nStartPos) -{// adjust object tag for related topics HTML control, because innerHTML misses out the item settings - - //Is there any DTC? - var strDTCTagOpen = ''; - var nDTCTagOpen = strRawHTML.indexOf( strDTCTagOpen, nStartPos ); - if( nDTCTagOpen < 0 ) - return strRawHTML; - var nDTCTagClose = strRawHTML.indexOf( strDTCTagClose, nDTCTagOpen ); - if( nDTCTagClose < nDTCTagOpen) - return strRawHTML; // no Design Time Controls; - - //Is the DTC HTML Help Control? - var strRTObjTagOpen = 'classid=clsid:ADB880A6-D8FF-11CF-9377-00AA003B7A11'; - var strRTObjTagClose = ''; - var nRTObjTagOpen = strRawHTML.indexOf( strRTObjTagOpen, nDTCTagOpen ); - if( nRTObjTagOpen < nDTCTagOpen ) - return strRawHTML; - var nRTObjTagClose = strRawHTML.indexOf( strRTObjTagClose, nRTObjTagOpen ); - if( nRTObjTagClose < nRTObjTagOpen ) - return strRawHTML; // is not a HTML help control - - // Is it a related Topics html help control? - var strRTObjLabel = ''; - } - - // to insert the reconstructed item params into runtime object tag - var strAdjustedHTML = strRawHTML.substring(0,nRTObjTagClose) + strRunTimeItemParam + strRawHTML.substring(nRTObjTagClose, strRawHTML.length); - return kadovAdjustObjectTag(strAdjustedHTML, nDTCTagClose + strDTCTagClose.length); -} - -function kadovTextPopupOnLoad( el ) -{ - if( typeof(el) == "string" ) - el = getElement(el); - - var src = el.getAttribute( "x-use-popup" ); - var bNeedMove=true; - if(!src&&el.id) - { - for (var i=0;i"); - strCleanHTML = kadovRetrieveCleanHTML(strCleanHTML, ""); - - //work around the bug in HH.exe that highlight the phrases when use Search tab - //this approach is just removing the tag inserted by Microsoft in the runtime - strCleanHTML = kadovRetrieveCleanHTML(strCleanHTML, "", 52); - - var strStyle = " style='display:none; position:relative;"; - var newDiv = "
" + strCleanHTML + "
"; - - removeThis(srcDiv); // empty the original DIV tag - var elParentPra = kadovFindParentParagraph(el); - if( elParentPra ) - insertAdjacentHTML(elParentPra, "afterEnd", newDiv ); - } - else if( type == "expanding" ) - { - var inner = kadovRetrieveTextInner(srcDiv); - if( inner == "" ) - inner = srcDiv.innerHTML; - var strAdjust = kadovAdjustObjectTag(inner,0); - var strCleanHTML = kadovRetrieveCleanHTML(strAdjust, ""); - strCleanHTML = kadovRetrieveCleanHTML(strCleanHTML, ""); - var strClassName = (el.className == "glossterm") ? "glosstext" : "expandtext"; - var newSpan = ""; - removeThis(srcDiv); // empty the original DIV tag - insertAdjacentHTML(el, "afterEnd", newSpan ); - } - } - } - else - { - srcDiv.style.display = "none"; - } - return 0; -} - -function getElementsByTag(obj,sTagName) -{ - if(obj.getElementsByTagName) - return obj.getElementsByTagName(sTagName); - else if(obj.all) - return obj.all.tags(sTagName); - return null; -} - -function getElement(sID) -{ - if(document.getElementById) - return document.getElementById(sID); - else if(document.all) - return document.all(sID); - return null; -} - -function getParentNode(obj) -{ - if(obj.parentNode) - return obj.parentNode; - else if(obj.parentElement) - return obj.parentElement; - return null; -} - -function getChildNodes(obj) -{ - if(obj.childNodes) - { - var children = new Array(); - for (var i = 0; i < obj.childNodes.length; i++) - { - if (obj.childNodes[i].nodeType == 1) - children[children.length] = obj.childNodes[i]; - } - return children; - } - else if(obj.children) - return obj.children; - return null; -} - -function removeThis(obj) -{ - if(obj.parentNode) - obj.parentNode.removeChild(obj); - else - obj.outerHTML=""; -} - -function kadovTextPopup( el ) -{ - if (!gbBsIE4 && !gbBsOpera7 && !gbBsSafari && !gbBsNS6 && !gbBsKonqueror3 ) - return; - - var bNeedMove=true; - - if (window.event) - window.event.cancelBubble = true; - - if( typeof(el) == "string" ) - el = getElement(el); - - if (!el||el==window) - return; - - var src = el.getAttribute( "x-use-popup" ); - if(!src&&el.id) - { - for (var i=0;i= 0 && nNext < values.length ) - { - functions[nIdx] = values.substr( nStart, nNext-nStart+1); - nStart = nNext + 1; - nIdx++; - nNext = values.indexOf( "\)", nStart); - } - - for( var i=0; i= 0 ) - { - nPageClick = arrForClickCount[j].indexOf("="); - if( nPageClick > 0 ) - { - nClickTimes = arrForClickCount[j].substring( nPageClick + 1, arrForClickCount[j].length) * 1; - break; - } - } - } - var args = srcargs; - if( j < arrForClickCount.length ) - {// to strip out the "clicks=99" from the arguments string - args = ""; - for( var k = 0; k < arrForClickCount.length; k ++ ) - { - if( k != j ) - { - args += arrForClickCount[k]; - if( k < arrForClickCount.length - 1 ) - args += ","; - } - } - } - bsscFXInit( null, id, translatedProp, fnname, args, nClickTimes ); - } -} - -function kadovTranslateProp( prop ) -{ - switch( prop ) - { - case "x-on-hover" : return "bsschover"; - case "x-on-pageclick" : return "bsscpageclick"; - case "x-on-pageload" : return "bsscpageload"; - case "x-on-trigger-1" : return "bssctrigger1"; - case "x-on-trigger-2" : return "bssctrigger2"; - } - return null; -} -//End to convert iWrite format to RoboEditor Format for DHTML effects - -//Begin the definition of one entry to DHTML effects -function bsscFXInit( trigger_ID, target_ID, event_type, - action_type, action_setting, event_addional ) -{ - if( (!gbBsWindows && !gbBsSunOS && !(gbBsMac&&gbBsIE5)) || typeof(target_ID) != "string" )//MUST have a target_ID - return; // we don't support Navigator yet - - if( typeof(event_type) == "string" ) - event_type = event_type.toLowerCase(); - if( typeof(action_type) == "string" ) - action_type = action_type.toLowerCase(); - if( typeof(action_setting) == "string" ) - action_setting = action_setting.toLowerCase(); - - // to get the target element then add it to the target list - var eleTarget = CCSSP.GetObject( target_ID ); - if( (eleTarget != null) && (event_type != null) && (action_type != null) ) - { - CEngine.AddOneTarget( target_ID, eleTarget ); - CEngine.BuildTargetObject(target_ID, event_type, action_type, action_setting, event_addional); - } - - // to validate the trigger_ID parameter - if( typeof(trigger_ID) == "string" && trigger_ID != "" ) - CEngine.BuildTriggerObject( trigger_ID, target_ID ); -} -//End the definition of one entry to DHTML effects - -/// Section End - kadov DHTM (JavaScript 1.2) - -/// Section Begin - CCSSP DHTM (JavaScript 1.2) - -//Begin JavaScript libary for cross-platform positioning object. -function CCSSP(){} // constructor of CCSSP class - -CCSSP.GetObject = function( obj ) -{//convert object name string or reference into a valid object reference - if( typeof(obj) == "object" ) - return obj; - else if( typeof(obj) == "string" && obj != "") - { - if( gbBsNS4 ) - return eval("document." + obj); - else - return eval("document.all(\"" + obj + "\")"); - } - else - return null; -} - -CCSSP.MoveObjectTo = function(obj, x, y) -{//positioning an object at a specific pixel coordinate - if( gbBsNS4 ) - obj.moveTo(x,y); - else - { - obj.style.pixelLeft = x; - obj.style.pixelTop = y; - } -} - -CCSSP.MoveObjectBy = function(obj, dx, dy) -{//moveing a object by x and/or y pixel - if( gbBsNS4 ) - obj.moveBy(dx,dy); - else - { - obj.style.pixelLeft += dx; - obj.style.pixelTop += dy; - } -} - -CCSSP.SetObjectBGColor = function(obj, color) -{//set the background color of an object - if( gbBsNS4 ) - obj.bgColor = color; - else - obj.style.backgroundColor = color; -} - -CCSSP.ShowObject = function(obj, bShow) -{// set the object to be visible or invisible - if( gbBsNS4 ) - obj.visibility = (bShow == true) ? 'show' : 'hide'; - else - obj.style.visibility = (bShow == true) ? 'visible' : 'hidden';// when hidden, it still occupy some space. -} - -CCSSP.GetObjectLeft = function(obj) -{// retrieve the x coordinate of a posionable object - if( gbBsNS4 ) - return obj.left; - else - return obj.style.pixelLeft; -} - -CCSSP.GetObjectTop = function(obj) -{// retrieve the y coordinate of a posionable object - if( gbBsNS4 ) - return obj.top; - else - return obj.style.pixelTop; -} - -CCSSP.GetObjectContainLeft = function(obj) -{// retrieve the x coordinate of a posionable object relative to it's parent element - if( gbBsNS4 ) - return obj.pageX; - else - { - if( obj == document.body ) - return obj.clientLeft; - else - return obj.offsetLeft; - } -} - -CCSSP.GetObjectWindowLeft = function(obj) -{// retrieve the x coordinate of a posionable object relative to browser window - if( gbBsNS4 ) - return obj.pageX; - else - { - var nOffsetWindowLeft = 0; - for(var element = obj; element; element = element.offsetParent) - nOffsetWindowLeft += CCSSP.GetObjectContainLeft(element); - return nOffsetWindowLeft; - } -} - -CCSSP.GetObjectContainTop = function(obj) -{// retrieve the y coordinate of a posionable object relative to it's parent element - if( gbBsNS4 ) - return obj.pageY; - else - { - if( obj == document.body ) - return obj.clientTop; - else - return obj.offsetTop; - } -} - -CCSSP.GetObjectWindowTop = function(obj) -{// retrieve the y coordinate of a posionable object relative to browser window - if( gbBsNS4 ) - return obj.pageY; - else - { - var nOffsetWindowTop = 0; - for(var element = obj; element; element = element.offsetParent) - nOffsetWindowTop += CCSSP.GetObjectContainTop(element); - return nOffsetWindowTop; - } -} - -CCSSP.GetObjectHeight = function(obj) -{// retrieve the height of a posionable object - if( gbBsNS4 ) - return obj.clip.height; - else - return obj.offsetHeight; -} - -CCSSP.GetObjectWidth = function(obj) -{// retrieve the width of a posionable object - if( gbBsNS4 ) - return obj.clip.width; - else - return obj.offsetWidth; -} - -CCSSP.RegisterEventHandler = function( srcObj, rawEventName, funcHandler ) -{ // to add the "funcHandler" as the "rawEventName" 's handler to the "srcObj" object,the original event handler will be combined - if (gbBsNS4 && !gbBsNS6) - return ; - - var oldHandler = ""; - - if (gbBsMac &&gbBsIE4&&!gbBsIE5) - { - if (typeof(srcObj[rawEventName.toLowerCase()])=="unknown") - { //search for - - - - - - - - - -

Structure of MED objects

- -

 In Post-Pro module - 3d representations are constructed on the base of  submeshes - representing parts of a mesh, which is stored in form of MED objects in - *.med files. Each MED object has its own user-defined structure.

- -

 

- -

In general, the mesh - represents an object including the following types of data:

- -

 

- -

 - - Geometrical information: list - of nodes, edges, faces and cells of the mesh;

- -

 - - Information on the interpolation in - accordance with resulting elements: the mesh should be compatible - with chosen interpolation;

- -

 - - Physical information: initial - and boundary conditions. (Scalar or vector values applied to the cells - of the mesh)

- -

 

- -
- -

 

- -

            

- -

Families

- -

From - general point of view, the whole mesh is divided into families, - submeshes created by the user. Every - family is composed of cells of a definite type  - - it can be Nodes, Edges, Faces or Cells. The presentation created - on the basis of a particular family will - be composed of geometrical elements, corresponding to the type of cells - of this family.  

- -

 

- -
- - --- - - - - - - - - - - - - - - - - - - - - -
-

Type of cells (entities) of the family

-

Geometrical element

-

Nodes

-

Points

-

Edges

-

Segments

-

Faces

-

Triangles, quadrangles

-

Cells

-

Any

-
-

Table of correspondence

- -

 

- -

 In - the folder Families all families - of the mesh are put into the following subfolders, defining the type of - cells of the mesh: onNodes, onEdges, - onFaces, onCells.

- -

These - subfolders also represent submeshes of the mesh, which are composed of - all cells of the mesh of this type.

- -

Groups

- -

Groups - combine different families independently of the type of cells, - they are composed of.

- -

 

- -

Fields

- -

Fields represent the results of calculations - (scalar or vector values), grouped together under one physical concept. -

- -

These - values are applied to the cells of a definite submesh, which is indicated - in the Object Browser in the subfolder of the field. -

- -

Most - often the calculations are performed during some period of time. That's - why fields include Time - Stamps, representing the results of calculations in one definite - moment. In Post-Pro field presentations - are constructed basing on these Time - Stamps. (See: Creating - field presentations)  

- -

 

- -

-Related Topics - - -

- -

 

- -

 

- -

 

- -

 

- - - - + + + + + +About structure of MED object + + + + + + + + + + + + +

Structure of MED objects

+ +

 In Post-Pro module + 3d representations are constructed on the base of  submeshes + representing parts of a mesh, which is stored in form of MED objects in + *.med files. Each MED object has its own user-defined structure.

+ +

 

+ +

In general, the mesh + represents an object including the following types of data:

+ +

 

+ +

 - + Geometrical information: list + of nodes, edges, faces and cells of the mesh;

+ +

 - + Information on the interpolation in + accordance with resulting elements: the mesh should be compatible + with chosen interpolation;

+ +

 - + Physical information: initial + and boundary conditions. (Scalar or vector values applied to the cells + of the mesh)

+ +

 

+ +

The structure of MED + object has a tree-like form. It contains three main folders: Families, Groups, Fields.

+ +

 

+ +

            

+ +

Families

+ +

From + general point of view, the whole mesh is divided into families, + submeshes created by the user. Every + family is composed of cells of a definite type  - + it can be Nodes, Edges, Faces or Cells. The presentation created + on the basis of a particular family will + be composed of geometrical elements, corresponding to the type of cells + of this family.  

+ +

 

+ +
+ + +++ + + + + + + + + + + + + + + + + + + + + +
+

Type of cells (entities) of the family

+

Geometrical element

+

Nodes

+

Points

+

Edges

+

Segments

+

Faces

+

Triangles, quadrangles

+

Cells

+

Any

+
+

Table of correspondence

+ +

 

+ +

 In + the folder Families all families + of the mesh are put into the following subfolders, defining the type of + cells of the mesh: onNodes, onEdges, + onFaces, onCells.

+ +

These + subfolders also represent submeshes of the mesh, which are composed of + all cells of the mesh of this type.

+ +

Groups

+ +

Groups + combine different families independently of the type of cells, + they are composed of.

+ +

 

+ +

Fields

+ +

Fields represent the results of calculations + (scalar or vector values), grouped together under one physical concept. +

+ +

These + values are applied to the cells of a definite submesh, which is indicated + in the Object Browser in the subfolder of the field. +

+ +

Most + often the calculations are performed during some period of time. That's + why fields include Time + Stamps, representing the results of calculations in one definite + moment. In Post-Pro field presentations + are constructed basing on these Time + Stamps. (See: Creating + field presentations)  

+ +

 

+ +

+Related Topics + + +

+ +

 

+ +

 

+ +

 

+ +

 

+ + + + diff --git a/doc/salome/gui/VISU/files/about_tables.htm b/doc/salome/gui/VISU/files/about_tables.htm index c0051dd2..ab5213d8 100755 --- a/doc/salome/gui/VISU/files/about_tables.htm +++ b/doc/salome/gui/VISU/files/about_tables.htm @@ -1,153 +1,153 @@ - - - - - -About tables - - - - - - - - - - - - - -

About tables

- -

Functionality of Post-Pro component allows to import - data tables and display them in a special table viewer. Tables - represent column-ranged data with units - and column and row - titles (see also).

- -

 

- -

Tables can be rarefied - - some of the cells may be empty, without any values.

- -

 

- -

In Post-Pro - there are  three - methods to import tables:

- -

 

- -

1. -  Importing - tables from *.xls, *.txt or *.tab files, which have been previously created.

- -

 

- -

2. -  Creating - tables on the basis of Cut Lines presentations

- -

 

- -

3. -   Importing - tables with the help of a special Python script (not described in this - reference manual)

- -

 

- -

-Related Topics - - -

- -

 

- - - - + + + + + +About tables + + + + + + + + + + + + + +

About tables

+ +

Functionality of Post-Pro component allows to import + data tables and display them in a special table viewer. Tables + represent column-ranged data with units + and column and row + titles (see also).

+ +

 

+ +

Tables can be rarefied + - some of the cells may be empty, without any values.

+ +

 

+ +

In Post-Pro + there are  three + methods to import tables:

+ +

 

+ +

1. +  Importing + tables from *.xls, *.txt or *.tab files, which have been previously created.

+ +

 

+ +

2. +  Creating + tables on the basis of Cut Lines presentations

+ +

 

+ +

3. +   Importing + tables with the help of a special Python script (not described in this + reference manual)

+ +

 

+ +

+Related Topics + + +

+ +

 

+ + + + diff --git a/doc/salome/gui/VISU/files/animating_presentations.htm b/doc/salome/gui/VISU/files/animating_presentations.htm index f807eb49..df79eedc 100755 --- a/doc/salome/gui/VISU/files/animating_presentations.htm +++ b/doc/salome/gui/VISU/files/animating_presentations.htm @@ -1,334 +1,385 @@ - - - - - -Animating presentations - - - - - - - - - - - - - -

Animating presentations

- -

In Post-Pro - module you can generate real-time animation of fields. In comparison - with sweeping, animations are created on the - base of frames, displaying field presentations generated on EVERY - Time Stamp of your field. So, the frame displaying the field presentation - created on the base of the first time stamp will begin your animation - and the frame displaying the field presentation created on the base of - the last time stamp will end it. In sweeping ONLY - ONE Time Stamp is used for its generation.

- -

 

- -

To generate an animation:

- -

 

- -

1. -  Right-click - on the field in the Object Browser.

- -

 

- -

2. -  From the - pop-up menu select Animation.

- -

 

- -

The following dialog - box will appear:

- -

                       

- -

 

- -

 

- -

Animation - dialog box is destined for management of your animation.

- -

 

- -

In Post-Pro you can - generate simultaneous animation - of several fields: you can open - this dialog for several fields one after another and after generating - frames you can launch simultaneous animation of several fields.

- -

 

- -

3. - Click Setup Animation button. - The following dialog box allowing to set the parameters of your animation - will appear.

- -

 

- -

           

- -

 

- -

- - Use range of time stamps check - box allows to select the range of time stamps, which will be used for - generating your animation.

- -

 

- -

- - Fields: list of fields for animation.

- -

 

- -

- Properties: Here you can adjust properties - of each field selected from the list:

- -

 

- -
    - -
  •  Select - the type of field presentations, - which will be used as frames in animation.

  • - -
  •  Set - properties of the Scalar Bar (see also)

  • - -
  •  Adjust - additional properties of the selected - type of field presentation.

  • -
- -

 

- -

4. -  Click OK to validate your parameters. You - will return back to Animation dialog - box

- -

 

- -

5. -  Click Generate frames button to generate the - frames for your animation based on the parameters adjusted in Setup - Animation dialog box.

- -

 

- -

Running animations:

- -

 

- -

In - the main Animation dialog box - there are several button intended for management and running your animation:

- -

 

- -

       Running - your animation.

- -

 

- -

        Previous / Next - frame (time step)

- -

 

- -

        To the beginning - / end of the animation.

- -

 

- -

Additional options of the animation:

- -

 

- -

You - can increase/decrease the speed - of your animation by moving the Speed - wheel Up/Down:

- -

 

- -

       

- -

 

- -

Cycled - animation check box: This option allows to start a cycled animation - of your presentation.

- -

 

- -

Use proportional timing check - box: This option allows render your animation with proportional periods - of time between every frame (not depending on the time stamps).

- -

 

- -

Save - pictures to directory check box: This option allows to save all - the frames composing the animation into a definite directory, which can - be specified in Path field.

- -

 

- -

Publish - to Study - saves your animation in the study and presents it in - the Object Browser

- -

Save - Animation - saves changes made in the published animation. If you - have already published a study and press Publish - to study again you get another animation in the Object Browser. -

- -

 

- -

The - following picture shows an animation of deformation of an object:

- -

 

- -

- -

 

- -

 

- -

-Related Topics - - -

- -

 

- - - - + + + + + +Animating presentations + + + + + + + + + + + + + +

Animating presentations

+ +

In Post-Pro + module you can generate real-time animation of fields. In comparison + with sweeping, animations are created on the + base of frames, displaying field presentations generated on EVERY + Time Stamp of your field. So, the frame displaying the field presentation + created on the base of the first time stamp will begin your animation + and the frame displaying the field presentation created on the base of + the last time stamp will end it. In sweeping ONLY + ONE Time Stamp is used for its generation.

+ +

 

+ +

In the case of animation of several fields + Parallel Animation will display + the animations simultaneously, while Successive Animation will display them + one after another.

+ +

In the case of + Parallel Animation you can set different kinds of presentations + for each of the selected fields. This animation type also requires that + the number of time stamps > 1 and is the same for all animated fields. +

+ +

For Successive + Aimation the kind of presentation + should be the same for all selected fields, which means that it is not + possible to select a field from the list.  It + is also necessary that the number of time stamps > 0 and the number + of components is the same for all animated fields.

+ +

 

+ +

To generate an animation:

+ +

 

+ +

1. +  Right-click + on the field in the Object Browser.

+ +

2. +  From the + pop-up menu select Parallel or Successive Animation.

+ +

 

+ +

The following dialog + box will appear:

+ +

                       

+ +

 

+ +

 

+ +

Animation + dialog box is destined for management of your animation.

+ +

 

+ +

3. + Click Setup Animation button. + The following dialog box allowing to set the parameters of your animation + will appear.

+ +

 

+ +

           

+ +

 

+ +

- + Use range of time stamps check + box allows to select the range of time stamps, which will be used for + generating your animation.

+ +

 

+ +

- + Fields: list of fields for animation.

+ +

 

+ +

- Properties: Here you can adjust properties + of each field selected from the list:

+ +

 

+ +
    + +
  •  Select + the type of field presentations, + which will be used as frames in animation.

  • + +
  •  Set + properties of the Scalar Bar (see also)

  • + +
  •  Adjust + additional properties of the selected + type of field presentation.

  • +
+ +

 

+ +

4. +  Click OK to validate your parameters. You + will return back to Animation dialog + box

+ +

 

+ +

5. +  Click Generate frames button to generate the + frames for your animation based on the parameters adjusted in Setup + Animation dialog box.

+ +

 

+ +

Running animations:

+ +

 

+ +

In + the main Animation dialog box + there are several button intended for management and running your animation:

+ +

 

+ +

       Running + your animation.

+ +

 

+ +

        Previous / Next + frame (time step)

+ +

 

+ +

        To the beginning + / end of the animation.

+ +

 

+ +

Additional options of the animation:

+ +

 

+ +

You + can increase/decrease the speed + of your animation by moving the Speed + wheel Up/Down:

+ +

 

+ +

       

+ +

 

+ +

Cycled + animation check box: This option allows to start a cycled animation + of your presentation.

+ +

 

+ +

Use proportional timing check + box: This option allows to render your animation with proportional periods + of time between every frame (not depending on the time stamps).

+ +

 

+ +

Clean memory at each frame - this + option allows to optimize the performance of the operation.

+ +

 

+ +

Saving Animations:

+ +

 

+ +

Save + pictures to directory check box: This option allows to save all + the frames composing the animation into a definite directory, which can + be specified in Path field.

+ +

 

+ +

Save + Animation to AVI file check box This option allows to save the + animation into a definite .avi file, which can be specified in Path + field.

+ +

 

+ +

Save animation to AVI file + works only if there is jpeg2yuv + utility installed on your computer. If this third-party product is missing, + the check-box will not be selectable. This utility is a part of  mjpegtool + package, which can be downloaded from http://mjpeg.sourceforge.net/. +  Run "which jpeg2yuv" + to check whether this tool has been installed and the path to it was properly + added to your PATH variable. If not, you need to activate mjpegtools + indicating its location in the variable PATH. The syntax of the + command should be as follows:  

+ +

export PATH=${INSTALL_ROOT}/mjpegtools-1.8.0/bin:${PATH}.

+ +

 

+ +

Save + Animation - saves changes made in the published animation. If you + have already published a study and press Publish + to study again you get another animation in the Object Browser. +

+ +

 

+ +

Publish + to Study - saves your animation in the study and presents it in + the Object Browser

+ +

 

+ +

The + following picture shows an animation of deformation of an object:

+ +

 

+ +

+ +

 

+ +

+Related Topics + + +

+ +

 

+ + + + diff --git a/doc/salome/gui/VISU/files/changing_visualization_parameters_of_the_presenetation.htm b/doc/salome/gui/VISU/files/changing_visualization_parameters_of_the_presenetation.htm index 4bb665b6..5df43c6b 100755 --- a/doc/salome/gui/VISU/files/changing_visualization_parameters_of_the_presenetation.htm +++ b/doc/salome/gui/VISU/files/changing_visualization_parameters_of_the_presenetation.htm @@ -1,329 +1,333 @@ - - - - - -Setting presentation view parameters - - - - - - - - - - - - - -

Viewing 3D presentations. -

- -

Each  newly - created presentation is displayed in VTK viewer. To display an existing - presentation, right-click on it in the Object Browser and select Display.  

- -

 

- -

Right mouse-click on the Presentation gives access to the following - options:

- -

 

- -

- -

 

- -

All parameters are context-sensitive: - NOT all types of visualization and NOT all properties can be set for a - certain 3D presentation.                            

- -

 

- -
    - -
  • Erase all - allows - to hide all objects from the viewer.  

  • - -
  • Edit - allows - to return to the menu where the presentation has been created and change - its parameters.

  • - -
  • Rename - - allows to rename the presentation.

  • - -
  • Copy - - allows to create a copy of the presentation in the same subfolder (time - stamp) in the Object Browser.

  • - -
  • Erase - - allows to hide the selected presentation from the viewer.

  • - -
  • Display Only - - allows to display only the selected presentation, hiding all other from - the viewer.

  • - -
  • Representation - allows to switch among the available representation - types.

  • -
- -

 

- - ---- - - - - - - - - - - - - - - - - - - - -
-

Points

-

Surface

-

Wireframe

-

-

-

-

Insideframe (displays the wires - lying within the object)

-

Shrink

-

Shading on

-

-

-

- -

 

- -
    - -
  • Properties

  • - -
  • Opacity - - allows to set the value of opacity - of the presentation between 0 (transparent) and 100 (opaque).

  • -
- -

 

- -

- -

 

- -
    - -
  • Line - Width - allows to set the width of - lines representing edges of the presentation between 1 (thin) and 100 - (thick).

  • -
- -
    - -
  • Translate - Presentation - allows to translate - the presentation along coordinate axes.

  • - -
  • Clipping - Planes - allows to create cross-section - views of presentations.

  • - -
  • Sweep - - allows to display pseudo-animation - of the presentation.

  • - -
  • Selection - Info - provides information about - the attributes of elements displayed in the viewer.

  • - -
  • Dump view - exports - an object from the viewer in bmp, png, jpg or jpeg image format.

  • - -
  • Change - Background - allows to change the properties of the background.

  • -
- -

 

- -

When you create several presentations of the same - object, you may wish to see them simultaneously,  which - might be impossible, because they all are located at the same place. To - solve this problem, right-click in the viewer and select Arrange - Actors in the pop-up menu.    

- -

 

- -

- -

 

- -

In Auto - mode you specify along which Axis - and at which Relative Distance - the presentations should be lined up.

- -

 

- -

- -

 

- -

In Manual - mode you set the coordinates for each presentation separately.

- -

 

- -

 

- -

Displaying several presentations at the same time - may cause superposition of their scalar bars. To avoid this, check Arrange Scalar Bars radio button  in - the Preferences - > Post-Pro - > - Scalar Bar. A separate scalar bar will be displayed for each presentation. -

- -

Alternatively you may wish to merge the - scalar bars to have a common scalar bar for all presentations. To do this, - select several presentations or fields in the object browser, right-click - and from the pop-up menu select  Merge Scalar Range. -

- -

To restore separate bars and scales for - each module select Use Field Range - from the same menu.

- -

 

- -

 

- - - - + + + + + +Setting presentation view parameters + + + + + + + + + + + + + +

Viewing 3D presentations. +

+ +

Each  newly + created presentation is displayed in the VTK + 3D Viewer. VTK 3D Viewer + is detailly described in the documentation on + GUI module.

+ +

To display an existing presentation, right-click on it in the Object + Browser and select Display.  

+ +

 

+ +

Right mouse-click on the Presentation gives access to the following + options:

+ +

 

+ +

+ +

 

+ +

All parameters are context-sensitive: + NOT all types of visualization and NOT all properties can be set for a + certain 3D presentation.                            

+ +

 

+ +
    + +
  • Erase all - allows + to hide all objects from the viewer.  

  • + +
  • Edit - allows + to return to the menu where the presentation has been created and change + its parameters.

  • + +
  • Rename + - allows to rename the presentation.

  • + +
  • Copy - + allows to create a copy of the presentation in the same subfolder (time + stamp) in the Object Browser.

  • + +
  • Erase + - allows to hide the selected presentation from the viewer.

  • + +
  • Display Only + - allows to display only the selected presentation, hiding all other from + the viewer.

  • + +
  • Representation - allows to switch among the available representation + types.

  • +
+ +

 

+ + ++++ + + + + + + + + + + + + + + + + + + + +
+

Points

+

Surface

+

Wireframe

+

+

+

+

Insideframe (displays the wires + lying within the object)

+

Shrink

+

Shading on

+

+

+

+ +

 

+ +
    + +
  • Properties

  • + +
  • Opacity + - allows to set the value of opacity + of the presentation between 0 (transparent) and 100 (opaque).

  • +
+ +

 

+ +

+ +

 

+ +
    + +
  • Line + Width - allows to set the width of + lines representing edges of the presentation between 1 (thin) and 100 + (thick).

  • +
+ +
    + +
  • Translate + Presentation - allows to translate + the presentation along coordinate axes.

  • + +
  • Clipping + Planes - allows to create cross-section + views of presentations.

  • + +
  • Sweep + - allows to display pseudo-animation + of the presentation.

  • + +
  • Selection + Info - provides information about + the attributes of elements displayed in the viewer.

  • + +
  • Dump view - exports + an object from the viewer in bmp, png, jpg or jpeg image format.

  • + +
  • Change + Background - allows to change the properties of the background.

  • +
+ +

 

+ +

When you create several presentations of the same + object, you may wish to see them simultaneously,  which + might be impossible, because they all are located at the same place. To + solve this problem, right-click in the viewer and select Arrange + Actors in the pop-up menu.    

+ +

 

+ +

+ +

 

+ +

In Auto + mode you specify along which Axis + and at which Relative Distance + the presentations should be lined up.

+ +

 

+ +

+ +

 

+ +

In Manual + mode you set the coordinates for each presentation separately.

+ +

 

+ +

 

+ +

Displaying several presentations at the same time + may cause superposition of their scalar bars. To avoid this, check Arrange Scalar Bars radio button  in + the Preferences - > Post-Pro - > + Scalar Bar. A separate scalar bar will be displayed for each presentation. +

+ +

Alternatively you may wish to merge the + scalar bars to have a common scalar bar for all presentations. To do this, + select several presentations or fields in the object browser, right-click + and from the pop-up menu select  Merge Scalar Range. +

+ +

To restore separate bars and scales for + each module select Use Field Range + from the same menu.

+ +

 

+ +

 

+ + + + diff --git a/doc/salome/gui/VISU/files/creating_curves.htm b/doc/salome/gui/VISU/files/creating_curves.htm index 44674d83..b75af456 100755 --- a/doc/salome/gui/VISU/files/creating_curves.htm +++ b/doc/salome/gui/VISU/files/creating_curves.htm @@ -1,231 +1,231 @@ - - - - - -Creating curves - - - - - - - - - - - - - -

Creating curves

- -

Post-Pro functionality allows to create  Curve - lines  on - the basis of the data taken from tables, and to display these curves in - form of 2D plot using Plot2d viewer.

- -

 

- -

To create curves:

- -

 

- -

1. -  Right-click - on the required table in the Object Browser

- -

 

- -

2.  From - the pop-up menu choose Create Curves - option.

- -

 

- -

3.  The - following dialog box will appear:

- -

 

- -

- -

 

- -

This dialog box has the form of a table; - each row of this table represents one column of values of the imported - data table.

- -

To construct curve lines, you should choose - at least two columns of the data table by checking them in the Axis - part of the  dialog - box:

- -
    - -
  • H (horisontal) - the values of this - column will correspond to X-coordinates of the curve.

  • - -
  • V (vertical) - the values of this column - will correspond to Y-coordinates of the curve.

  • -
- -


-The column Assigned allows to represent - the values assigned to the points of the curve (possible for V-rows only). - Any row, even coinciding with the current or empty (no values assigned), - can be represented. All values are indicated with tool tips over the corresponding - curve points in the Plot2d viewer
-
-To define the  Attributes - of your curve remove the checkmark from Auto - assign  (if - it is checked, default attributes are taken) and select:

- -
    - -
  • Line type (None, Solid, Dash, Dot, Dash - - Dot, Dash - Dot - Dot),

  • - -
  • Line - width,

  • - -
  • Marker - type (Circle, - Rectangle, Diamond, Rightward, Leftward, Downward & Upward Triangle, - Cross or Diagonal Cross),

  • - -
  • Color - (using the standard Select Color menu).

  • -
- -

 

- -

From this dialog box you can create several curves for the - columns of your data table with the same units. Post-Pro - allows to display at once up to 200 curves.

- -

 

- -

4. -  Click OK to create your curves with the given - parameters. Post-Pro will automatically - create your curve or curves in the structure of the study under two SALOME - objects:

- -

-  SALOME - table object,

- -

-  Plot2DView object: - SALOME container of curve lines which will be created automatically.

- -

 

- -

 

- -

 

- -

 

- - - - + + + + + +Creating curves + + + + + + + + + + + + + +

Creating curves

+ +

Post-Pro functionality allows to create  Curve + lines  on + the basis of the data taken from tables, and to display these curves in + form of 2D plot using Plot2d viewer.

+ +

 

+ +

To create curves:

+ +

 

+ +

1. +  Right-click + on the required table in the Object Browser

+ +

 

+ +

2.  From + the pop-up menu choose Create Curves + option.

+ +

 

+ +

3.  The + following dialog box will appear:

+ +

 

+ +

+ +

 

+ +

This dialog box has the form of a table; + each row of this table represents one column of values of the imported + data table.

+ +

To construct curve lines, you should choose + at least two columns of the data table by checking them in the Axis + part of the  dialog + box:

+ +
    + +
  • H (horisontal) - the values of this + column will correspond to X-coordinates of the curve.

  • + +
  • V (vertical) - the values of this column + will correspond to Y-coordinates of the curve.

  • +
+ +


+The column Assigned allows to represent + the values assigned to the points of the curve (possible for V-rows only). + Any row, even coinciding with the current or empty (no values assigned), + can be represented. All values are indicated with tool tips over the corresponding + curve points in the Plot2d viewer
+
+To define the  Attributes + of your curve remove the checkmark from Auto + assign  (if + it is checked, default attributes are taken) and select:

+ +
    + +
  • Line type (None, Solid, Dash, Dot, Dash + - Dot, Dash - Dot - Dot),

  • + +
  • Line + width,

  • + +
  • Marker + type (Circle, + Rectangle, Diamond, Rightward, Leftward, Downward & Upward Triangle, + Cross or Diagonal Cross),

  • + +
  • Color + (using the standard Select Color menu).

  • +
+ +

 

+ +

From this dialog box you can create several curves for the + columns of your data table with the same units. Post-Pro + allows to display at once up to 200 curves.

+ +

 

+ +

4. +  Click OK to create your curves with the given + parameters. Post-Pro will automatically + create your curve or curves in the structure of the study under two SALOME + objects:

+ +

-  SALOME + table object,

+ +

-  Plot2DView object: + SALOME container of curve lines which will be created automatically.

+ +

 

+ +

 

+ +

 

+ +

 

+ + + + diff --git a/doc/salome/gui/VISU/files/creating_field_presentations.htm b/doc/salome/gui/VISU/files/creating_field_presentations.htm index 7028152b..bd34dde5 100755 --- a/doc/salome/gui/VISU/files/creating_field_presentations.htm +++ b/doc/salome/gui/VISU/files/creating_field_presentations.htm @@ -1,171 +1,171 @@ - - - - - -Creating field presentations - - - - - - - - - - - - - -

Creating field presentations

- -

To create a field presentation (see - also):

- -

 

- -

Right-click on one of the time stamps of this - field in the Object browser and choose the required type of presentation - from the following pop-up menu:

- -

 

- -

             

- -

 

- -

In Post-Pro fields - may contain both scalar and vector values, applied to the cells of the - submesh, as well as ONLY scalar - values. It is not possible to make a vector presentation for fields containing - only scalar values.

- -

 

- -

For - fields containing only scalar values, you can create the following types - of presentation:

- -

 

- -

                         

- -

 

- -

- - Click on one of the time stamps of this field in the Object browser and - select the required type of presentation from the  Visualization - submenu of the main menu - or from the Visualization Toolbar

- -

 

- -

The new field presentation will be located - in the time stamp subfolder in the Object Browser and displayed

- -

 

- -

 

- -

-Related Topics - - -

- -

 

- - - - + + + + + +Creating field presentations + + + + + + + + + + + + + +

Creating field presentations

+ +

To create a field presentation (see + also):

+ +

 

+ +

Right-click on one of the time stamps of this + field in the Object browser and choose the required type of presentation + from the following pop-up menu:

+ +

 

+ +

             

+ +

 

+ +

In Post-Pro fields + may contain both scalar and vector values, applied to the cells of the + submesh, as well as ONLY scalar + values. It is not possible to make a vector presentation for fields containing + only scalar values.

+ +

 

+ +

For + fields containing only scalar values, you can create the following types + of presentation:

+ +

 

+ +

                         

+ +

 

+ +

- + Click on one of the time stamps of this field in the Object browser and + select the required type of presentation from the  Visualization + submenu of the main menu + or from the Visualization Toolbar

+ +

 

+ +

The new field presentation will be located + in the time stamp subfolder in the Object Browser and displayed

+ +

 

+ +

 

+ +

+Related Topics + + +

+ +

 

+ + + + diff --git a/doc/salome/gui/VISU/files/creating_presentations.htm b/doc/salome/gui/VISU/files/creating_presentations.htm index 16608476..7e5c95e1 100755 --- a/doc/salome/gui/VISU/files/creating_presentations.htm +++ b/doc/salome/gui/VISU/files/creating_presentations.htm @@ -1,138 +1,138 @@ - - - - - -Creating presentations - - - - - - - - - - - - - -

Presentation of a submesh

- -

To create a presentation of a submesh:

- -

 

- -

In the Object Browser right-click on a submesh - of an imported MED object and from the pop-up menu choose Create - Presentation:

- -

 

- -

                       This - presentation will be displayed in the viewer:

- -

 

- -

            

- -

 

- -

 

- -

-Related Topics - - -

- -

 

- -

 

- -

 

- - - - + + + + + +Creating presentations + + + + + + + + + + + + + +

Presentation of a submesh

+ +

To create a presentation of a submesh:

+ +

 

+ +

In the Object Browser right-click on a submesh + of an imported MED object and from the pop-up menu choose Create + Presentation:

+ +

 

+ +

                       This + presentation will be displayed in the viewer:

+ +

 

+ +

            

+ +

 

+ +

 

+ +

+Related Topics + + +

+ +

 

+ +

 

+ +

 

+ + + + diff --git a/doc/salome/gui/VISU/files/creating_xy_plot.htm b/doc/salome/gui/VISU/files/creating_xy_plot.htm index bb68a0cd..ae6f02f5 100755 --- a/doc/salome/gui/VISU/files/creating_xy_plot.htm +++ b/doc/salome/gui/VISU/files/creating_xy_plot.htm @@ -1,207 +1,207 @@ - - - - - -Creating XY plot - - - - - - - - - - - - - -

Creating XY plots

- -

To create a XY plot based on one definite curve:

- -

 

- -

1.  Select - Plot2d viewer: from the main menu choose Window - > New Window > Plot2d View

- -

 

- -

2. In the Object Browser right-click - on this curve line and from the pop-up menu select Display - item.

- -

 

- -

To create a XY plot based on several curves:

- -

 

- -

1.  Select - Plot2d viewer: from the main menu choose Window - > New Window > Plot2d View

- -

 

- -

2. In - the Object Browser right-click on the Post-Pro object - and from the pop-up menu select Create Plot2D View.

- -

 

- -

3. Right-click on the name of this container - in the Object Browser and select Edit - item. The following dialog box will appear:

- -

 

- -

- -

 

- -

 

- -

 This box contains - two windows:

- -

 

- -

- Left window displays a list of curve lines, - which have been created in the study.

- -

 

- -

- Right window displays a list of curve lines - contained in this particular container. These curves will used for creation - of the XY plot.

- -

 

- -

To move a definite curve line from the study - into the container, select it in the left window of this dialog box and - click button.  

- -

      

- -

To - move a definite curve line from the container back into the study, select - it in the right window of this dialog box and click button. -

- -

 

- -

After - having chosen the curve lines, which will compose your XY plot, click - OK button to quit this dialog - box. In the Object Browser the references to the selected curve lines - will be created under your container:

- -

 

- -

4. - Right-click on the name of the container in the Object Browser and select - Display button. A XY plot consisting - of the previously selected curve lines, will be displayed in the viewer:

- -

 

- -

- -

       

- -

     

- - - - + + + + + +Creating XY plot + + + + + + + + + + + + + +

Creating XY plots

+ +

To create a XY plot based on one definite curve:

+ +

 

+ +

1.  Select + Plot2d viewer: from the main menu choose Window + > New Window > Plot2d View

+ +

 

+ +

2. In the Object Browser right-click + on this curve line and from the pop-up menu select Display + item.

+ +

 

+ +

To create a XY plot based on several curves:

+ +

 

+ +

1.  Select + Plot2d viewer: from the main menu choose Window + > New Window > Plot2d View

+ +

 

+ +

2. In + the Object Browser right-click on the Post-Pro object + and from the pop-up menu select Create Plot2D View.

+ +

 

+ +

3. Right-click on the name of this container + in the Object Browser and select Edit + item. The following dialog box will appear:

+ +

 

+ +

+ +

 

+ +

 

+ +

 This box contains + two windows:

+ +

 

+ +

- Left window displays a list of curve lines, + which have been created in the study.

+ +

 

+ +

- Right window displays a list of curve lines + contained in this particular container. These curves will used for creation + of the XY plot.

+ +

 

+ +

To move a definite curve line from the study + into the container, select it in the left window of this dialog box and + click button.  

+ +

      

+ +

To + move a definite curve line from the container back into the study, select + it in the right window of this dialog box and click button. +

+ +

 

+ +

After + having chosen the curve lines, which will compose your XY plot, click + OK button to quit this dialog + box. In the Object Browser the references to the selected curve lines + will be created under your container:

+ +

 

+ +

4. + Right-click on the name of the container in the Object Browser and select + Display button. A XY plot consisting + of the previously selected curve lines, will be displayed in the viewer:

+ +

 

+ +

+ +

       

+ +

     

+ + + + diff --git a/doc/salome/gui/VISU/files/cut_lines_presentation.htm b/doc/salome/gui/VISU/files/cut_lines_presentation.htm index f2bdd25f..73fb3794 100755 --- a/doc/salome/gui/VISU/files/cut_lines_presentation.htm +++ b/doc/salome/gui/VISU/files/cut_lines_presentation.htm @@ -1,272 +1,276 @@ - - - - - -Cut Lines presentation - - - - - - - - - - - - - -

Cut - Lines presentation

- -

Cut Lines is a type of - presentation which displays colored cells with applied scalar values on - the mesh where lines are placed.

- -

The - procedure of construction of Cut Lines - presentation reuses the algorithm of creation Cut - Planes presentation and consists of two steps:

- -
    - -
  1.  From - Cut Planes presentation one plane - is taken and it is used as base plane for construction of cut lines.

  2. - -
  3. This plane is cut by - a regular array of planes. The result of this operation is a regular array - of lines in space,  belonging - to the same plane and having the same orientation. They are located inside - or on the mesh.

  4. -
- -

 

- -

To create a - Cut Lines presentation:

- -

 

- -

- Right-click on one of the time stamps of - the field in the Object browser and from the pop-up menu choose Cut Lines, or

- -

 

- -

- Click on one of the time stamps of the field - in the Object browser and select from the main menu Visualization - > Cut Lines, or click icon - in the Visualization Toolbar.

- -

 

- -

- -

 

- -

Plane of - lines: this tab of the dialog box contains the parameters of the - base plane, on which the cut lines will be located.

- -

 

- -
    - -
  • Orientation - check boxes allow to set the orientation of cut planes in 3D space. - You should select two of three axis (XY, YZ, or ZX) in which your planes - will be located in 3D space

  • - -
  • Rotations - of the planes in 3d space around the axes of the selected orientation. - (The angle of rotation is set in degrees.)

  • - -
  • Base - plane position: position of the base plane. This value can be set - by default or entered manually.  

  • - -
  • Displacement - of the plane. This parameter defines position of the base plane - in 3d space.

  • - -
  • Show - preview check box allows to edit the parameters of the presentation - and simultaneously observe the preview of this presentation in the viewer.

  • - -
  • Invert - all curves check box allows to invert the resulting curves.

  • - -
  • - Generate Data Table: If this check - box is marked, Post Pro will automatically - generate a data table on the basis of your Cut Lines presentation. This - table will be created in the structure of the study.   

  • - -
  • Generate - Curves: If this check box is marked, Post - Pro  will - automatically generate curve lines on the basis of values taken from the - generated data table. These curves will be created in the structure of - the study and can be visualized in a XY plot.  

  • -
- -

See more about table presentations and curve - lines here.

- -

 

- -

Cut - Planes: this tab of the dialog box contains the parameters of cut - planes, which will be used for construction of the cut lines.

- -

 

- -

Scalar Bar - tab allows to define the parameters of the scalar bar displayed - with this presentation (see - also).

- -

 

- -

After - you have finished with setting these parameters, click OK. - Your presentation with scalar bar will be immediately displayed - in the viewer:

- -

    

- -

 

- -

From Cut Lines presentation - you can create a data table. This - table will consist of the field scalar values located on each cut line - of the constructed presentation (see - also: Creating tables from Cut Lines presentations). After that your - data table can be used for construction of a 2d plot of curves based on - the scalar values from the table (see also: Creating - curves and Creating XY plots). -   

- -

 

- -

 

- -

-Related Topics - - -

- -

 

- - - - + + + + + +Cut Lines presentation + + + + + + + + + + + + + +

Cut + Lines presentation

+ +

Cut Lines is a type of + presentation which displays colored cells with applied scalar values on + the mesh where lines are placed.

+ +

The + procedure of construction of Cut Lines + presentation reuses the algorithm of creation Cut + Planes presentation and consists of two steps:

+ +
    + +
  1.  From + Cut Planes presentation one plane + is taken and it is used as base plane for construction of cut lines.

  2. + +
  3. This plane is cut by + a regular array of planes. The result of this operation is a regular array + of lines in space,  belonging + to the same plane and having the same orientation. They are located inside + or on the mesh.

  4. +
+ +

 

+ +

To create a + Cut Lines presentation:

+ +

 

+ +

- Right-click on one of the time stamps of + the field in the Object browser and from the pop-up menu choose Cut Lines, or

+ +

 

+ +

- Click on one of the time stamps of the field + in the Object browser and select from the main menu Visualization + > Cut Lines, or click icon + in the Visualization Toolbar.

+ +

 

+ +

+ +

 

+ +

Plane of + lines: this tab of the dialog box contains the parameters of the + base plane, on which the cut lines will be located.

+ +

 

+ +
    + +
  • Orientation + check boxes allow to set the orientation of cut planes in 3D space. + You should select two of three axis (XY, YZ, or ZX) in which your planes + will be located in 3D space

  • + +
  • Rotations + of the planes in 3d space around the axes of the selected orientation. + (The angle of rotation is set in degrees.)

  • + +
  • Base + plane position: position of the base plane. This value can be set + by default or entered manually.  

  • + +
  • Displacement + of the plane. This parameter defines position of the base plane + in 3d space.

  • + +
  • Show + preview check box allows to edit the parameters of the presentation + and simultaneously observe the preview of this presentation in the viewer.

  • + +
  • Invert + all curves check box allows to invert the resulting curves.

  • + +
  • Use + absolute length check box allows to see the real length of the + line, instead of [0,1] interval.

  • + +
  • + Generate Data Table: If this check + box is marked, Post Pro will automatically + generate a data table on the basis of your Cut Lines presentation. This + table will be created in the structure of the study.   

  • + +
  • Generate + Curves: If this check box is marked, Post + Pro  will + automatically generate curve lines on the basis of values taken from the + generated data table. These curves will be created in the structure of + the study and can be visualized in a XY plot.  

  • +
+ +

See more about table presentations and curve + lines here.

+ +

 

+ +

Cut + Planes: this tab of the dialog box contains the parameters of cut + planes, which will be used for construction of the cut lines.

+ +

 

+ +

Scalar Bar + tab allows to define the parameters of the scalar bar displayed + with this presentation (see + also).

+ +

 

+ +

After + you have finished with setting these parameters, click OK. + Your presentation with scalar bar will be immediately displayed + in the viewer:

+ +

    

+ +

 

+ +

From Cut Lines presentation + you can create a data table. This + table will consist of the field scalar values located on each cut line + of the constructed presentation (see + also: Creating tables from Cut Lines presentations). After that your + data table can be used for construction of a 2d plot of curves based on + the scalar values from the table (see also: Creating + curves and Creating XY plots). +   

+ +

 

+ +

 

+ +

+Related Topics + + +

+ +

 

+ + + + diff --git a/doc/salome/gui/VISU/files/cut_lines_resentation.htm b/doc/salome/gui/VISU/files/cut_lines_resentation.htm index 165a288a..c42da1b6 100755 --- a/doc/salome/gui/VISU/files/cut_lines_resentation.htm +++ b/doc/salome/gui/VISU/files/cut_lines_resentation.htm @@ -1,204 +1,204 @@ - - - - - -Cut Planes presentation - - - - - - - - - - - - - -

Cut Planes presentation

- -

Cut Planes is a - type of field presentation, when the given shape is cut by a definite - number of surfaces. These surfaces are colored according the values applied - to the cells of the mesh.

- -

 

- -

To create a Cut Planes -  presentation:

- -

 

- -

- Right-click on one of the time stamps of - the field in the Object browser and from the pop-up menu choose Cut Planes, or

- -

 

- -

- Click on one of the time stamps of the field - in the Object browser and select from the main menu Visualization - > Cut Planes, or click icon - in the Visualization Toolbar.

- -

 

- -

- -

 

- -
    - -
  • Cut - Planes tab allows to set additional parameters of your Cut - Planes presentation:

  • -
- -

 

- -
    - -
  • Orientation - check boxes allow to set the orientation of cut planes in 3D space. - You should select two of three axis (XY, - YZ, or ZX) - in which your planes will be located in 3D space

  • - -
  • Rotations - of the planes in 3d space around the axes of the selected orientation. - (The angle of rotation is set in degrees.)

  • - -
  • Number - of planes, which will form your presentation.

  • - -
  • Position - of each of the planes relative to other planes, which form your - presentation. This value can be set by default, entered manually.  

  • - -
  • Displacement - of the planes. This parameter defines the displacement of the planes - into one or another side.

  • - -
  • Show - preview check box allows to edit the parameters of the presentation - and simultaneously observe the preview of this presentation in the viewer.

  • -
- -

 

- -

After you have finished with setting - these parameters, click OK. Your - presentation with scalar bar will be immediately displayed in the viewer: -

- -

 

- -

         

- -

 

- -

-Related Topics - - -

- -

 

- - - - + + + + + +Cut Planes presentation + + + + + + + + + + + + + +

Cut Planes presentation

+ +

Cut Planes is a + type of field presentation, when the given shape is cut by a definite + number of surfaces. These surfaces are colored according the values applied + to the cells of the mesh.

+ +

 

+ +

To create a Cut Planes +  presentation:

+ +

 

+ +

- Right-click on one of the time stamps of + the field in the Object browser and from the pop-up menu choose Cut Planes, or

+ +

 

+ +

- Click on one of the time stamps of the field + in the Object browser and select from the main menu Visualization + > Cut Planes, or click icon + in the Visualization Toolbar.

+ +

 

+ +

+ +

 

+ +
    + +
  • Cut + Planes tab allows to set additional parameters of your Cut + Planes presentation:

  • +
+ +

 

+ +
    + +
  • Orientation + check boxes allow to set the orientation of cut planes in 3D space. + You should select two of three axis (XY, + YZ, or ZX) + in which your planes will be located in 3D space

  • + +
  • Rotations + of the planes in 3d space around the axes of the selected orientation. + (The angle of rotation is set in degrees.)

  • + +
  • Number + of planes, which will form your presentation.

  • + +
  • Position + of each of the planes relative to other planes, which form your + presentation. This value can be set by default, entered manually.  

  • + +
  • Displacement + of the planes. This parameter defines the displacement of the planes + into one or another side.

  • + +
  • Show + preview check box allows to edit the parameters of the presentation + and simultaneously observe the preview of this presentation in the viewer.

  • +
+ +

 

+ +

After you have finished with setting + these parameters, click OK. Your + presentation with scalar bar will be immediately displayed in the viewer: +

+ +

 

+ +

         

+ +

 

+ +

+Related Topics + + +

+ +

 

+ + + + diff --git a/doc/salome/gui/VISU/files/deformed_shape_presentation.htm b/doc/salome/gui/VISU/files/deformed_shape_presentation.htm index ee19f113..41a5a9d8 100755 --- a/doc/salome/gui/VISU/files/deformed_shape_presentation.htm +++ b/doc/salome/gui/VISU/files/deformed_shape_presentation.htm @@ -1,193 +1,193 @@ - - - - - -Deformed Shape presentation - - - - - - - - - - - - - -

Deformed Shape presentation

- -

Deformed Shape is - a type of field presentation when vector values corresponding to the cells - of the mesh are visualized by shifting of these cells.

- -

 

- -

To create a Deformed Shape  presentation:

- -

 

- -

- Right-click on one of the time stamps of - the field in the Object browser and from the pop-up menu choose Deformed Shape, or

- -

 

- -

- Click on one of the time stamps of the field - in the Object browser and select from the main menu Visualization - > Deformed Shape, or click icon - in the Visualization Toolbar.

- -

 

- -

- -

 

- -
    - -
  • Deformed - Shape tab allows to set additional parameters of your Deformed - Shape presentation:

  • -
- -
    - -
  • Scale - Factor: visualization scaling of all vector values applied to the - cells of the mesh.

  • - -
  • Magnitude - coloring check box: this option allows to color your presentation - according the scalar - range defined in Scalar Bar properties or to display it using only - one color (this color is taken by default).  

  • -
- -

 

- -
    - -
  • Scalar - Bar tab allows to define the parameters of the scalar bar displayed - with this presentation (see - also).

  • -
- -

 

- -

After you have finished - with setting these parameters, click OK. - Your presentation with scalar bar will be immediately displayed - in the viewer:

- -

 

- -

         

- -

 

- -

-Related Topics - - -

- -

 

- - - - + + + + + +Deformed Shape presentation + + + + + + + + + + + + + +

Deformed Shape presentation

+ +

Deformed Shape is + a type of field presentation when vector values corresponding to the cells + of the mesh are visualized by shifting of these cells.

+ +

 

+ +

To create a Deformed Shape  presentation:

+ +

 

+ +

- Right-click on one of the time stamps of + the field in the Object browser and from the pop-up menu choose Deformed Shape, or

+ +

 

+ +

- Click on one of the time stamps of the field + in the Object browser and select from the main menu Visualization + > Deformed Shape, or click icon + in the Visualization Toolbar.

+ +

 

+ +

+ +

 

+ +
    + +
  • Deformed + Shape tab allows to set additional parameters of your Deformed + Shape presentation:

  • +
+ +
    + +
  • Scale + Factor: visualization scaling of all vector values applied to the + cells of the mesh.

  • + +
  • Magnitude + coloring check box: this option allows to color your presentation + according the scalar + range defined in Scalar Bar properties or to display it using only + one color (this color is taken by default).  

  • +
+ +

 

+ +
    + +
  • Scalar + Bar tab allows to define the parameters of the scalar bar displayed + with this presentation (see + also).

  • +
+ +

 

+ +

After you have finished + with setting these parameters, click OK. + Your presentation with scalar bar will be immediately displayed + in the viewer:

+ +

 

+ +

         

+ +

 

+ +

+Related Topics + + +

+ +

 

+ + + + diff --git a/doc/salome/gui/VISU/files/displaying_hiding_presentations.htm b/doc/salome/gui/VISU/files/displaying_hiding_presentations.htm index c6c5fb8e..959acd8d 100755 --- a/doc/salome/gui/VISU/files/displaying_hiding_presentations.htm +++ b/doc/salome/gui/VISU/files/displaying_hiding_presentations.htm @@ -1,251 +1,251 @@ - - - - - -Displaying/Hiding presentations - - - - - - - - - - - - - -

Operations with presentations

- -

- -

 

- -

To display a presentation:

- -

 

- -

Right-click on it in the Object Browser and - from the pop-up menu choose Display. -

- -

                       

- -

To display several presentations:

- -

 

- -

Hold down Ctrl - button and select in the Object Browser the presentations for displaying. - Right-click with the mouse and from the pop-up menu select Display. -

- -

 

- -

To display only one presentation: -

- -

 

- -

 Choose - Display only option. The other - presentations will be immediately  hidden.

- -

 

- -

To hide this presentation:

- -

 

- -

From the same pop-up menu choose Erase. - (This option will automatically appear in this pop-up menu if this presentation - have been displayed)

- -

 

- -

 

- -

To hide all presentations: -

- -

 

- -

From the main menu choose Representation - > Erase All, click button   in the Representation toolbar - or right-click in the 3D Viewer and select Erase - All in the pop-up menu.   

- -

                                

- -

 

- -

To delete an existing presentation:

- -

 

- -

Right-click on it in the Object Browser and - from the pop-up menu choose Delete. -

- -

 

- -

Operations accessible only for field presentations.

- -

 

- -

To copy a field presentation:

- -

 

- -

1. - Right-click on this presentation in the Object Browser or in the viewer.

- -

 

- -

2. - From the pop-up menu select Same as option.

- -

 

- -

Your - field presentation will duplicated in the same subfolder (time stamp) - in the Object Browser.

- -

 

- -

 

- -

To set additional parameters of field presentations:

- -

 

- -

1. - Right-click on this presentation in the Object Browser or in the viewer.

- -

 

- -

2. - From the pop-up menu select Edit  option.

- -

 

- -

This - option allows to set or modify additional parameters of field presentations - after its creation.

- -

 

- -

To rename a field presentation

- -

 

- -

1. Right-click on this - presentation in the Object Browser or in the viewer.

- -

 

- -

2. From the pop-up menu select Rename - option, the following dialog box will appear:

- -

 

- -

                       

- -

 

- -

In the field Name - enter your personal name of the presentation and click OK - button to confirm your choice. The name of the presentation will - change in the Object Browser.

- - - - + + + + + +Displaying/Hiding presentations + + + + + + + + + + + + + +

Operations with presentations

+ +

+ +

 

+ +

To display a presentation:

+ +

 

+ +

Right-click on it in the Object Browser and + from the pop-up menu choose Display. +

+ +

                       

+ +

To display several presentations:

+ +

 

+ +

Hold down Ctrl + button and select in the Object Browser the presentations for displaying. + Right-click with the mouse and from the pop-up menu select Display. +

+ +

 

+ +

To display only one presentation: +

+ +

 

+ +

 Choose + Display only option. The other + presentations will be immediately  hidden.

+ +

 

+ +

To hide this presentation:

+ +

 

+ +

From the same pop-up menu choose Erase. + (This option will automatically appear in this pop-up menu if this presentation + have been displayed)

+ +

 

+ +

 

+ +

To hide all presentations: +

+ +

 

+ +

From the main menu choose Representation + > Erase All, click button   in the Representation toolbar + or right-click in the 3D Viewer and select Erase + All in the pop-up menu.   

+ +

                                

+ +

 

+ +

To delete an existing presentation:

+ +

 

+ +

Right-click on it in the Object Browser and + from the pop-up menu choose Delete. +

+ +

 

+ +

Operations accessible only for field presentations.

+ +

 

+ +

To copy a field presentation:

+ +

 

+ +

1. + Right-click on this presentation in the Object Browser or in the viewer.

+ +

 

+ +

2. + From the pop-up menu select Same as option.

+ +

 

+ +

Your + field presentation will duplicated in the same subfolder (time stamp) + in the Object Browser.

+ +

 

+ +

 

+ +

To set additional parameters of field presentations:

+ +

 

+ +

1. + Right-click on this presentation in the Object Browser or in the viewer.

+ +

 

+ +

2. + From the pop-up menu select Edit  option.

+ +

 

+ +

This + option allows to set or modify additional parameters of field presentations + after its creation.

+ +

 

+ +

To rename a field presentation

+ +

 

+ +

1. Right-click on this + presentation in the Object Browser or in the viewer.

+ +

 

+ +

2. From the pop-up menu select Rename + option, the following dialog box will appear:

+ +

 

+ +

                       

+ +

 

+ +

In the field Name + enter your personal name of the presentation and click OK + button to confirm your choice. The name of the presentation will + change in the Object Browser.

+ + + + diff --git a/doc/salome/gui/VISU/files/displaying_tables.htm b/doc/salome/gui/VISU/files/displaying_tables.htm index dd4a8189..d47dff40 100755 --- a/doc/salome/gui/VISU/files/displaying_tables.htm +++ b/doc/salome/gui/VISU/files/displaying_tables.htm @@ -1,134 +1,134 @@ - - - - - -Displaying tables - - - - - - - - - - - - - -

Displaying tables

- -

To display a table:

- -

 

- -

1.  Right-click - on the required table in the Object Browser

- -

 

- -

2.  From - the pop-up menu choose Show Table option. - Your table will be displayed in a separate View - Table window:

- -

 

- -

 

- -

 

- -

-Related Topics - - -

- -

 

- - - - + + + + + +Displaying tables + + + + + + + + + + + + + +

Displaying tables

+ +

To display a table:

+ +

 

+ +

1.  Right-click + on the required table in the Object Browser

+ +

 

+ +

2.  From + the pop-up menu choose Show Table option. + Your table will be displayed in a separate View + Table window:

+ +

 

+ +

 

+ +

 

+ +

+Related Topics + + +

+ +

 

+ + + + diff --git a/doc/salome/gui/VISU/files/getting_elements_attributes.htm b/doc/salome/gui/VISU/files/getting_elements_attributes.htm index 6d36bf80..d45edd74 100755 --- a/doc/salome/gui/VISU/files/getting_elements_attributes.htm +++ b/doc/salome/gui/VISU/files/getting_elements_attributes.htm @@ -1,219 +1,224 @@ - - - - - -Getting elements attributes - - - - - - - - - - - - - -

Selection Info

- -

To view the attributes of elements (cells, points, meshes) - displayed in the viewer:

- -

 

- -

- -

 

- -

 

- -

In the main menu choose  Selection > - Selection info...,  choose - the necessary type of elements (Point, - Cell, or Actor) in the - dialog box and click on the element of the required type in the viewer. - The chosen element will be highlighted and its attributes will be displayed - in this dialog box:

- -

- -

You can get the following information - about Points:

- -
    - -
  • Mesh name

  • - -
  • Field name

  • - -
  • ID Number of the point -

  • - -
  • Scalar value applied - to the point (if any)

  • - -
  • Vector value applied - to the point (if any)

  • - -
  • Coordinates of the - point in 3d space

  • -
- -

 

- -

- -

The following information about - Cells is available:

- -
    - -
  • Mesh name

  • - -
  • Field name

  • - -
  • ID Number of the cell

  • - -
  • Scalar value applied - to the cell (if any)

  • - -
  • Vector value applied - to the cell (if any)

  • - -
  • Attributes of the - points forming this cell (in table layout)

  • -
- -

 

- -

- -

 

- -

An - Actor (any 3D object (presentation - of a submesh, field presentation) displayed in the viewer) possesses the following characteristics:

- -
    - -
  • Mesh - name

  • - -
  • Field - name

  • - -
  • Coordinates - of the object in 3d space

  • - -
  • Size - of the object (expressed as the extent along the coordinates)

  • -
- -

 

- -

Using this dialog box, you can examine the attributes of a - definite point or cell, selected by its ID number. For that, you should - only enter an ID number of a definite point or cell in the ID - field, the attributes of this point or cell will be immediately - displayed.

- - - - + + + + + +Getting elements attributes + + + + + + + + + + + + + +

Selection Info

+ +

To view the attributes of elements (cells, points, meshes) + displayed in the viewer:

+ +

 

+ +

+ +

 

+ +

 

+ +

In the main menu choose  Selection > + Selection info...,  choose + the necessary type of elements (Point, + Cell, or Actor) in the + dialog box and click on the element of the required type in the viewer. + The chosen element will be highlighted and its attributes will be displayed + in this dialog box:

+ +

+ +

You can get the following information + about Points:

+ +
    + +
  • Mesh name

  • + +
  • Field name

  • + +
  • ID Number of the point +

  • + +
  • Scalar value applied + to the point (if any)

  • + +
  • Vector value applied + to the point (if any)

  • + +
  • Coordinates of the + point in 3d space

  • + +
  • Indexes (i,j,k) of + the point (for structured meshes only)

  • +
+ +

 

+ +

+ +

The following information about + Cells is available:

+ +
    + +
  • Mesh name

  • + +
  • Field name

  • + +
  • ID Number of the cell

  • + +
  • Scalar value applied + to the cell (if any)

  • + +
  • Vector value applied + to the cell (if any)

  • + +
  • Attributes of the + points forming this cell (in table layout)

  • +
+ +

 

+ +

+ +

 

+ +

An + Actor (any 3D object (presentation + of a submesh, field presentation) displayed in the viewer) possesses the following characteristics:

+ +
    + +
  • Mesh + name

  • + +
  • Field + name

  • + +
  • Coordinates + of the object in 3d space

  • + +
  • Size + of the object (expressed as the extent along the coordinates)

  • +
+ +

 

+ +

Using this dialog box, you can examine the attributes of a + definite point or cell, selected by its ID number. For that, you should + only enter an ID number of a definite point or cell in the ID + field, the attributes of this point or cell will be immediately + displayed.

+ + + + diff --git a/doc/salome/gui/VISU/files/getting_started.htm b/doc/salome/gui/VISU/files/getting_started.htm index aab5c6aa..e462ea6b 100755 --- a/doc/salome/gui/VISU/files/getting_started.htm +++ b/doc/salome/gui/VISU/files/getting_started.htm @@ -1,150 +1,150 @@ - - - - - -Getting started - - - - - - - - - - - - - - - -

Usage overview

- -

HOW TO:

- -

Create a new study and launch - Post-Pro module   -

- -

 

- -

Import a mesh from a MED - file   

- -

 

- -

Create a presentation of - a submesh and set view parameters  

- -

 

- -

Create field presentations - and use sweeping  

- -

 

- -

Animate fields  

- -

 

- -

  Import a table from a file and create a 2d plot based on - the data from this table

- -

 

- - - - + + + + + +Getting started + + + + + + + + + + + + + + + +

Usage overview

+ +

HOW TO:

+ +

Create a new study and launch + Post-Pro module   +

+ +

 

+ +

Import a mesh from a MED + file   

+ +

 

+ +

Create a presentation of + a submesh and set view parameters  

+ +

 

+ +

Create field presentations + and use sweeping  

+ +

 

+ +

Animate fields  

+ +

 

+ +

  Import a table from a file and create a 2d plot based on + the data from this table

+ +

 

+ + + + diff --git a/doc/salome/gui/VISU/files/importing_med_objects.htm b/doc/salome/gui/VISU/files/importing_med_objects.htm index aa7c089b..64156285 100755 --- a/doc/salome/gui/VISU/files/importing_med_objects.htm +++ b/doc/salome/gui/VISU/files/importing_med_objects.htm @@ -1,202 +1,202 @@ - - - - - -Importing MED objects - - - - - - - - - - - - -

Importing MED file

- -

To import a MED file:

- -

 

- -

From - the File menu choose Import -  - > - MED File or right-click on the Post-Pro - object in the Object Browser and select MED - File option. After it you - will see a standard dialog box allowing to search for and choose *.med -  files:

- -

 

- -

                 

- -

 

- -

To - confirm your choice click Open.

- -

 

- -

If - the option Use Build Progress - is checked in Post-Pro Sweep and MED - Import Preferences, you will be able to choose how the object containing - in the file will be built, otherwise the structure of the imported MED - object will be immediately displayed in the Object Browser and it will - be loaded and built as set in the Preferences.

- -

 

- -

- -

 

- -

Settings

- -
    - -
  • Build all - when this option is checked, - the application loads all data necessary for processing of the object.

  • - -
  • Build at once - when this option is - checked, you can't perform any operations until the MED file is fully - loaded and processed.

  • - -
  • Close dialog at finish - when this option - is checked, the dialog box is closed after loading of the selected MED - file. When unchecked, it allows to monitor the build process.

  • -
- -

 

- -

Import progress - - allows to choose what items exactly should be built at loading. By default - everything is checked in.  Note that the - coloured rectangles show the progress of the respective step and become - blue when complete.

- -
    - -
  • Build entities - displays the rate at which the geometrical - data is loaded.

  • - -
  • Build fields - when this option - is checked, the fields are built automatically at loading.

  • - -
  • Build min/max - parses time stamps at loading finding - the highest and the lowest value.

  • - -
  • Build Groups - builds groups and families - at loading.

  • -
- -

 

- -

Time - shows the Elapsed - time spent by the application on processing.

- -

 

- -

-Related Topics - -

- -

 

- -

 

- -

 

- - - - + + + + + +Importing MED objects + + + + + + + + + + + + +

Importing MED file

+ +

To import a MED file:

+ +

 

+ +

From + the File menu choose Import +  - > + MED File or right-click on the Post-Pro + object in the Object Browser and select MED + File option. After it you + will see a standard dialog box allowing to search for and choose *.med +  files:

+ +

 

+ +

                 

+ +

 

+ +

To + confirm your choice click Open.

+ +

 

+ +

If + the option Use Build Progress + is checked in Post-Pro Sweep and MED + Import Preferences, you will be able to choose how the object containing + in the file will be built, otherwise the structure of the imported MED + object will be immediately displayed in the Object Browser and it will + be loaded and built as set in the Preferences.

+ +

 

+ +

+ +

 

+ +

Settings

+ +
    + +
  • Build all - when this option is checked, + the application loads all data necessary for processing of the object.

  • + +
  • Build at once - when this option is + checked, you can't perform any operations until the MED file is fully + loaded and processed.

  • + +
  • Close dialog at finish - when this option + is checked, the dialog box is closed after loading of the selected MED + file. When unchecked, it allows to monitor the build process.

  • +
+ +

 

+ +

Import progress - + allows to choose what items exactly should be built at loading. By default + everything is checked in.  Note that the + coloured rectangles show the progress of the respective step and become + blue when complete.

+ +
    + +
  • Build entities - displays the rate at which the geometrical + data is loaded.

  • + +
  • Build fields - when this option + is checked, the fields are built automatically at loading.

  • + +
  • Build min/max - parses time stamps at loading finding + the highest and the lowest value.

  • + +
  • Build Groups - builds groups and families + at loading.

  • +
+ +

 

+ +

Time - shows the Elapsed + time spent by the application on processing.

+ +

 

+ +

+Related Topics + +

+ +

 

+ +

 

+ +

 

+ + + + diff --git a/doc/salome/gui/VISU/files/importing_tables.htm b/doc/salome/gui/VISU/files/importing_tables.htm index b4594309..cc2046a5 100755 --- a/doc/salome/gui/VISU/files/importing_tables.htm +++ b/doc/salome/gui/VISU/files/importing_tables.htm @@ -1,154 +1,154 @@ - - - - - -Importing tables - - - - - - - - - - - - -

Importing/exporting - tables

- -

To import a table from file:

- -

 

- -

1.  From - the main menu choose File > Import - > Table from File, or in the Object Browser right-click on the - Post-Pro object and select Table from File item. -

- -

 

- -

2.  From - the following standard dialog box:

- -

 

- -

          

- -

 

- -

choose the necessary *.xls, *.txt or - *.tab file containing tables and click Open - button.  

- -

 

- -

3.  In - the Object Browser Post-Pro will - create a new folder having the name of the imported file. All tables from - this file will be located in this folder. One *.xls file can contain several - tables.    

- -

 

- -

To export a table:

- -

 

- -

1. Click on it in the Object Browser and - select Export Table.

- -

 

- -

2. - In the standard dialog box enter the name of the file, which will contain - your exported table, and click OK button. - Your table will be exported.

- -

 

- -

 

- -

 

- - - - + + + + + +Importing tables + + + + + + + + + + + + +

Importing/exporting + tables

+ +

To import a table from file:

+ +

 

+ +

1.  From + the main menu choose File > Import + > Table from File, or in the Object Browser right-click on the + Post-Pro object and select Table from File item. +

+ +

 

+ +

2.  From + the following standard dialog box:

+ +

 

+ +

          

+ +

 

+ +

choose the necessary *.xls, *.txt or + *.tab file containing tables and click Open + button.  

+ +

 

+ +

3.  In + the Object Browser Post-Pro will + create a new folder having the name of the imported file. All tables from + this file will be located in this folder. One *.xls file can contain several + tables.    

+ +

 

+ +

To export a table:

+ +

 

+ +

1. Click on it in the Object Browser and + select Export Table.

+ +

 

+ +

2. + In the standard dialog box enter the name of the file, which will contain + your exported table, and click OK button. + Your table will be exported.

+ +

 

+ +

 

+ +

 

+ + + + diff --git a/doc/salome/gui/VISU/files/insideframe.htm b/doc/salome/gui/VISU/files/insideframe.htm index f7f3644b..0ca8f5f6 100755 --- a/doc/salome/gui/VISU/files/insideframe.htm +++ b/doc/salome/gui/VISU/files/insideframe.htm @@ -1,86 +1,86 @@ - - - - - -Insideframe - - - - - - - - - - - - -

- - - - + + + + + +Insideframe + + + + + + + + + + + + +

+ + + + diff --git a/doc/salome/gui/VISU/files/introduction.htm b/doc/salome/gui/VISU/files/introduction.htm index 9b437861..37998587 100755 --- a/doc/salome/gui/VISU/files/introduction.htm +++ b/doc/salome/gui/VISU/files/introduction.htm @@ -1,156 +1,156 @@ - - - - - -Introduction - - - - - - - - - - - - - -

Introduction to Post-Pro

- -

Post-processing module Post-Pro -  for - SALOME  is - destined for visualization of data produced by the other components of - the platform. Post-Pro provides -  various - forms of data visualization including:

- -

 

- - - -

 

- - - -

 

- - - -

 

- - - -

                

- -

 

- -

-Related Topics - - -

- -

 

- -

 

- -

 

- - - - + + + + + +Introduction + + + + + + + + + + + + + +

Introduction to Post-Pro

+ +

Post-processing module Post-Pro +  for + SALOME  is + destined for visualization of data produced by the other components of + the platform. Post-Pro provides +  various + forms of data visualization including:

+ +

 

+ + + +

 

+ + + +

 

+ + + +

 

+ + + +

                

+ +

 

+ +

+Related Topics + + +

+ +

 

+ +

 

+ +

 

+ + + + diff --git a/doc/salome/gui/VISU/files/iso_surfaces_presentation.htm b/doc/salome/gui/VISU/files/iso_surfaces_presentation.htm index 85d99bb0..c0207a61 100755 --- a/doc/salome/gui/VISU/files/iso_surfaces_presentation.htm +++ b/doc/salome/gui/VISU/files/iso_surfaces_presentation.htm @@ -1,215 +1,215 @@ - - - - - -Iso Surfaces presentation - - - - - - - - - - - - - -

Iso Surfaces presentation

- -

Iso Surfaces presentation - combines all equal scalar values applied to the cells and on the basis - of them constructs  isobaric - surfaces, which form this presentation.

- -

 

- -

To create an Iso Surfaces - presentation:

- -

 

- -

- Right-click on one of the time stamps of - the field in the Object browser and from the pop-up menu choose Iso Surfaces, or

- -

 

- -

- Click on one of the time stamps of the - field in the Object browser and select from the main menu Visualization - > Iso Surfaces, or click icon - in the Visualization Toolbar

- -

 

- -

- -

 

- -
    - -
  • Iso - Surface tab allows to set additional parameters of - the Iso Surfaces presentation:

  • -
- -

 

- -
    - -
  • Number - of surfaces, which will be generated in the framework of this presentation

  • -
- -

 

- -
    - -
  •  Minimum / Maximum - value fields allow to enter the range of scalar or vector values - applied to the cells, on the basis of which this presentation will be - created.

  • -
- -

 

- -
    - -
  • Update - scalar bar range with these values button allows you to update - the range of the values, displayed with by the scalar bar, with the previously - defined range of values.

  • -
- -

 

- -
    - -
  • Scalar - Bar tab allows to define the parameters of the scalar bar displayed - with this presentation (see - also).

  • -
- -

 

- -

After - you have finished with setting these parameters, click OK. - Your presentation with scalar bar will be immediately displayed - in the viewer:

- -

 

- -

- -

 

- -

 

- -

-Related Topics - - -

- -

 

- - - - + + + + + +Iso Surfaces presentation + + + + + + + + + + + + + +

Iso Surfaces presentation

+ +

Iso Surfaces presentation + combines all equal scalar values applied to the cells and on the basis + of them constructs  isobaric + surfaces, which form this presentation.

+ +

 

+ +

To create an Iso Surfaces + presentation:

+ +

 

+ +

- Right-click on one of the time stamps of + the field in the Object browser and from the pop-up menu choose Iso Surfaces, or

+ +

 

+ +

- Click on one of the time stamps of the + field in the Object browser and select from the main menu Visualization + > Iso Surfaces, or click icon + in the Visualization Toolbar

+ +

 

+ +

+ +

 

+ +
    + +
  • Iso + Surface tab allows to set additional parameters of + the Iso Surfaces presentation:

  • +
+ +

 

+ +
    + +
  • Number + of surfaces, which will be generated in the framework of this presentation

  • +
+ +

 

+ +
    + +
  •  Minimum / Maximum + value fields allow to enter the range of scalar or vector values + applied to the cells, on the basis of which this presentation will be + created.

  • +
+ +

 

+ +
    + +
  • Update + scalar bar range with these values button allows you to update + the range of the values, displayed with by the scalar bar, with the previously + defined range of values.

  • +
+ +

 

+ +
    + +
  • Scalar + Bar tab allows to define the parameters of the scalar bar displayed + with this presentation (see + also).

  • +
+ +

 

+ +

After + you have finished with setting these parameters, click OK. + Your presentation with scalar bar will be immediately displayed + in the viewer:

+ +

 

+ +

+ +

 

+ +

 

+ +

+Related Topics + + +

+ +

 

+ + + + diff --git a/doc/salome/gui/VISU/files/points.htm b/doc/salome/gui/VISU/files/points.htm index 8b4820fc..bf1d9a6e 100755 --- a/doc/salome/gui/VISU/files/points.htm +++ b/doc/salome/gui/VISU/files/points.htm @@ -1,86 +1,86 @@ - - - - - -Points - - - - - - - - - - - - -

- - - - + + + + + +Points + + + + + + + + + + + + +

+ + + + diff --git a/doc/salome/gui/VISU/files/running_visu.htm b/doc/salome/gui/VISU/files/running_visu.htm index 88c95c29..9121b1b2 100755 --- a/doc/salome/gui/VISU/files/running_visu.htm +++ b/doc/salome/gui/VISU/files/running_visu.htm @@ -1,130 +1,130 @@ - - - - - -Running VISU - - - - - - - - - - - - -

Running Post-Pro

- -

To start Post-Pro module in the SALOME - application click icon in the toolbar.

- -

          

- -

Before launching Post-Pro module, you should set the VTK - viewer as default viewer for creation of a new study window. In Post-Pro - you can create presentations only in the VTK viewer. (see also: Setting - preferences)

- -

 

- -

The initial desktop of - the SALOME platform will be updated with some additional toolbars and - menus related to Post-Pro component . It will look like as follows:

- -

 

- -

            

- -

 

- -

-Related Topics - - -

- -

 

- -

 

- -

 

- - - - + + + + + +Running VISU + + + + + + + + + + + + +

Running Post-Pro

+ +

To start Post-Pro module in the SALOME + application click icon in the toolbar.

+ +

          

+ +

Before launching Post-Pro module, you should set the VTK + viewer as default viewer for creation of a new study window. In Post-Pro + you can create presentations only in the VTK viewer. (see also: Setting + preferences)

+ +

 

+ +

The initial desktop of + the SALOME platform will be updated with some additional toolbars and + menus related to Post-Pro component . It will look like as follows:

+ +

 

+ +

            

+ +

 

+ +

+Related Topics + + +

+ +

 

+ +

 

+ +

 

+ + + + diff --git a/doc/salome/gui/VISU/files/scalar_map_presentation.htm b/doc/salome/gui/VISU/files/scalar_map_presentation.htm index 49ea4f57..8367a3fc 100755 --- a/doc/salome/gui/VISU/files/scalar_map_presentation.htm +++ b/doc/salome/gui/VISU/files/scalar_map_presentation.htm @@ -1,377 +1,396 @@ - - - - - -Scalar Map presentation - - - - - - - - - - - - - -

Scalar Map presentation

- -

Scalar Map is the basic type of visualization of calculation - data in Post-Pro module. This - presentation consists of the following:

- -

 

- -

- creating of a 3D presentation on the - basis of a field;

- -

- coloring of the cells of this presentation, - according the scalar or vector values applied to this cells;

- -

- creating of a scalar bar: a scale, representing - the correspondence  between - the scalar values of the field and the used colors.

- -

 

- -

All other types of field - presentation are based on the Scalar - Map.

- -

 

- -

To create a Scalar Map - presentation:

- -

 

- -

- Right-click on one of the time stamps - of the field in the Object browser and from the pop-up menu choose Scalar Map, or

- -

 

- -

- Click on one of the time stamps of the - field in the Object browser and select from the main menu Visualization - > Scalar Map, or click icon - in the Visualization Toolbar

- -

 

- -

The following dialog box will appear:

- -

 

- -

This dialog box is equal - for all types of field presentations and it will be present as an additional - tab in all dialog boxes allowing to create the other types of presentations. - It allows to set the parameters of Scalar - range, as well as the parameters of the Scalar - Bar. You can also set these parameters as preferences which will - be used in all SALOME sessions: in the main menu select File - > Preferences > Post Pro - > Scalar Bar.    

- -

 

- -

        

- -

 

- -
    - -
  • Scalar - range parameters:

  • -
- -

 

- -
    - -
      - -
    • Scalar Mode field: This field allows to choose the mode - of transformation of vector values into scalar values for creation of - the presentation. It can be module of the vector or one of three components - of the vector. (Note: This choose box is relevant only for fields containing - vector values, in other cases it will be inactive).  

    • -
    -
- -

 

- -
    - -
      - -
    • Logarithmic scaling - check box: You can apply logarithmic - scaling to the color scale of the presentation.

    • -
    -
- -

 

- -
    - -
      - -
    • Use - field range: if this check box is selected, all cells of the field - presentation will be colored according the values applied to these cells. -  

    • -
    -
- -

 

- -
    - -
      - -
    • Use imposed range: - here you can define your own range - of scalar values of the field, on the basis of which this presentation - will be constructed. The cells of the field presentation with applied - scalar or vector values belonging to this imposed range will be colored - according to these values. The other cells of the field presentation (with - applied scalar or vector values out of this imposed range) will be displayed - using one color. For the cells with applied scalar or vector values, which - are less than the minimal value of the imposed range, the color will be - the same as for the cells with applied minimal values. For the cells with - applied scalar or vector values, which are larger than the maximal value - of the imposed range the color will be the same as for the cells with - applied minimal values.  

    • -
    -
- -

 

- -
    - -
  • Colors and Labels

  • - -
  • Nb. - of colors field: In this field you can enter the number of colors, - which will be used for coloring of cells containing scalar values.

  • - -
  • Nb. - of labels field: In this field you can enter the number of labels, - indicating graduation of the scalar bar.

  • -
- -

 

- -
    - -
  • Orientation: - You can select Vertical or Horizontal orientation of the scalar - bar.  

  • -
- -

 

- -
    - -
  • Origin: - you can enter X & Y - coordinates of the origin of the scalar bar.

  • -
- -

 

- -
    - -
  •  Dimensions: - you can enter Width and Height of the scalar bar.

  • -
- -

 

- -
    - -
  • Save - as default values check box allows to save this parameters for - all presentations, which will be constructed later.

  • -
- -

 

- -
    - -
  • Text properties button allows you to define from the following - dialog box:

  • -
- -

 

- -

- -

 

- -
    - -
  • Title - of the field, on the basis of which this presentation is created,

  • - -
  • Font - properties of the Title, - displayed in the Viewer

  • - -
  • Font - properties of the Labels, - displayed in the Viewer.  

  • -
- -

 

- -

After you have finished with setting these - parameters, click OK. Your presentation - with scalar bar will be immediately displayed in the viewer:

- -

 

- -

                        

- -

 

- -

-Related Topics - - -

- -

 

- -

 

- -

 

- -

 

- - - - + + + + + +Scalar Map presentation + + + + + + + + + + + + + +

Scalar Map presentation

+ +

Scalar Map is the basic type of visualization of calculation + data in Post-Pro module. This + presentation consists of the following:

+ +

 

+ +

- creating a 3D presentation on the basis + of a field:

+ +

    - + on the whole mesh (default)

+ +

    - + on group(s) of the mesh

+ +

- coloring the cells of this presentation, + according the scalar or vector values applied to this cells;

+ +

- creating a scalar bar representing the + correspondence  between + the scalar values of the field and the used colors.

+ +

 

+ +

All other types of field + presentations are based on the Scalar + Map.

+ +

 

+ +

To create a Scalar Map + presentation:

+ +

 

+ +

- Right-click on one of the time stamps + of the field in the Object browser and from the pop-up menu choose Scalar Map, or

+ +

- Click on one of the time stamps of the + field in the Object browser and select from the main menu Visualization + > Scalar Map, or click icon + in the Visualization Toolbar

+ +

 

+ +

The following dialog box will appear:

+ +

 

+ +

This dialog box is equal + for all types of field presentations and it will be present as an additional + tab in all dialog boxes allowing to create the other types of presentations. + It allows to set the parameters of Scalar + range, as well as the parameters of the Scalar + Bar. You can also set these parameters as preferences which will + be used in all SALOME sessions: in the main menu select File + > Preferences > Post Pro + > Scalar Bar.    

+ +

 

+ +

        

+ +

 

+ +
    + +
  • Build + presentation on groups: You can choose the groups on which Scalar Map can be built from the list + to the left and add them in the list to the right.

  • +
+ +

 

+ +
    + +
  • Scalar range parameters:

  • +
+ +

 

+ +
    + +
      + +
    • Scalar Mode field: This field allows to choose the mode + of transformation of vector values into scalar values for creation of + the presentation. It can be module of the vector or one of three components + of the vector. (Note: This choose box is relevant only for fields containing + vector values, in other cases it will be inactive).  

    • +
    +
+ +

 

+ +
    + +
      + +
    • Logarithmic scaling + check box: You can apply logarithmic + scaling to the color scale of the presentation.

    • +
    +
+ +

 

+ +
    + +
      + +
    • Use + field range: if this check box is selected, all cells of the field + presentation will be colored according the values applied to these cells. +  

    • +
    +
+ +

 

+ +
    + +
      + +
    • Use imposed range: + here you can define your own range + of scalar values of the field, on the basis of which this presentation + will be constructed. The cells of the field presentation with applied + scalar or vector values belonging to this imposed range will be colored + according to these values. The other cells of the field presentation (with + applied scalar or vector values out of this imposed range) will be displayed + using one color. For the cells with applied scalar or vector values, which + are less than the minimal value of the imposed range, the color will be + the same as for the cells with applied minimal values. For the cells with + applied scalar or vector values, which are larger than the maximal value + of the imposed range the color will be the same as for the cells with + applied minimal values.  

    • +
    +
+ +

 

+ +
    + +
  • Colors and Labels

  • + +
  • Nb. + of colors field: In this field you can enter the number of colors, + which will be used for coloring of cells containing scalar values.

  • + +
  • Nb. + of labels field: In this field you can enter the number of labels, + indicating graduation of the scalar bar.

  • +
+ +

 

+ +
    + +
  • Orientation: + You can select Vertical or Horizontal orientation of the scalar + bar.  

  • +
+ +

 

+ +
    + +
  • Origin: + you can enter X & Y + coordinates of the origin of the scalar bar.

  • +
+ +

 

+ +
    + +
  •  Dimensions: + you can enter Width and Height of the scalar bar.

  • +
+ +

 

+ +
    + +
  • Save + as default values check box allows to save this parameters for + all presentations, which will be constructed later.

  • +
+ +

 

+ +
    + +
  • Text properties button allows you to define from the following + dialog box:

  • +
+ +

 

+ +

+ +

 

+ +
    + +
  • Title + of the field, on the basis of which this presentation is created,

  • + +
  • Font + properties of the Title, + displayed in the Viewer

  • + +
  • Font + properties of the Labels, + displayed in the Viewer.  

  • +
+ +

 

+ +

After you have finished with setting these + parameters, click OK. Your presentation + with scalar bar will be immediately displayed in the viewer:

+ +

 

+ +

                        

+ +

 

+ +

+Related Topics + + +

+ +

 

+ +

 

+ +

 

+ +

 

+ + + + diff --git a/doc/salome/gui/VISU/files/scaling_presentations.htm b/doc/salome/gui/VISU/files/scaling_presentations.htm index 995a1935..a2139396 100755 --- a/doc/salome/gui/VISU/files/scaling_presentations.htm +++ b/doc/salome/gui/VISU/files/scaling_presentations.htm @@ -1,150 +1,150 @@ - - - - - -Scaling presentations - - - - - - - - - - - - - -

Translate Presentation

- -

In SALOME - there is a feature allowing to translate presentations of submeshes and - field presentations along axes (X, Y, Z).

- -

 

- -

To translate a presentation right-click on it in the Object Browser - or 3D Viewer and select Translate Presentation. -

- -

 

- -

              

- -

 

- -

The presentation will be moved by the specified - distance along axes.

- -

To cancel all changes, click Reset - button.

- -

 

- -

3. Click Apply - button, to apply your scaling on the chosen presentation.

- -

 

- -

4. - To confirm all actions and quit Translate - Presentation dialog - box, click OK. -   

- -

 

- -

 

- - - - + + + + + +Scaling presentations + + + + + + + + + + + + + +

Translate Presentation

+ +

In SALOME + there is a feature allowing to translate presentations of submeshes and + field presentations along axes (X, Y, Z).

+ +

 

+ +

To translate a presentation right-click on it in the Object Browser + or 3D Viewer and select Translate Presentation. +

+ +

 

+ +

              

+ +

 

+ +

The presentation will be moved by the specified + distance along axes.

+ +

To cancel all changes, click Reset + button.

+ +

 

+ +

3. Click Apply + button, to apply your scaling on the chosen presentation.

+ +

 

+ +

4. + To confirm all actions and quit Translate + Presentation dialog + box, click OK. +   

+ +

 

+ +

 

+ + + + diff --git a/doc/salome/gui/VISU/files/setting_properties_of_xy_plots.htm b/doc/salome/gui/VISU/files/setting_properties_of_xy_plots.htm index 9fab1a76..567b6fc0 100755 --- a/doc/salome/gui/VISU/files/setting_properties_of_xy_plots.htm +++ b/doc/salome/gui/VISU/files/setting_properties_of_xy_plots.htm @@ -1,176 +1,176 @@ - - - - - -Setting properties of XY plots - - - - - - - - - - - - - -

Setting properties of XY plots

- -

To define properties of XY plots:

- -

 

- -

Right-click on the background of the Plot - 2d viewer. The following menu will appear:

- -

- -

 

- -

Erase all - - hides all previously displayed curves from the viewer.

- -

Rename - - allows to rename the object currently selected in the Object Browser - (table, curve or XY plot).

- -

 

- -

Scaling - gives you the possibility to select the scale (logarithmic or linear) - for both axes

- -

 

- -

- -

 

- -

via Fit - Range option you can access to the following menu

- -

 

- -

- -

 

- -

Curve Type - gives you the possibility to select the type for your curves.

- -

 

- -

- -

 

- -

Show Legend - triggers all labels on the graph.

- -

 

- -

Settings - menu allows to adjust the representation of the graphs in the Plot - 2d viewer

- -

 

- -

Dump View - - allows to save the current graph represented in the 2D viewer in a graphic - file.

- -

 

- -

- -

 

- -

Change Background - - allows to change the background of the 2D viewer.

- - - - + + + + + +Setting properties of XY plots + + + + + + + + + + + + + +

Setting properties of XY plots

+ +

To define properties of XY plots:

+ +

 

+ +

Right-click on the background of the Plot + 2d viewer. The following menu will appear:

+ +

+ +

 

+ +

Erase all + - hides all previously displayed curves from the viewer.

+ +

Rename + - allows to rename the object currently selected in the Object Browser + (table, curve or XY plot).

+ +

 

+ +

Scaling + gives you the possibility to select the scale (logarithmic or linear) + for both axes

+ +

 

+ +

+ +

 

+ +

via Fit + Range option you can access to the following menu

+ +

 

+ +

+ +

 

+ +

Curve Type + gives you the possibility to select the type for your curves.

+ +

 

+ +

+ +

 

+ +

Show Legend + triggers all labels on the graph.

+ +

 

+ +

Settings + menu allows to adjust the representation of the graphs in the Plot + 2d viewer

+ +

 

+ +

Dump View + - allows to save the current graph represented in the 2D viewer in a graphic + file.

+ +

 

+ +

+ +

 

+ +

Change Background + - allows to change the background of the 2D viewer.

+ + + + diff --git a/doc/salome/gui/VISU/files/shrink.htm b/doc/salome/gui/VISU/files/shrink.htm index 6247e8df..c495f4a8 100755 --- a/doc/salome/gui/VISU/files/shrink.htm +++ b/doc/salome/gui/VISU/files/shrink.htm @@ -1,86 +1,86 @@ - - - - - -Shrink - - - - - - - - - - - - -

- - - - + + + + + +Shrink + + + + + + + + + + + + +

+ + + + diff --git a/doc/salome/gui/VISU/files/stream_lines_presentation.htm b/doc/salome/gui/VISU/files/stream_lines_presentation.htm index 8fb2c1af..42a205e2 100755 --- a/doc/salome/gui/VISU/files/stream_lines_presentation.htm +++ b/doc/salome/gui/VISU/files/stream_lines_presentation.htm @@ -1,253 +1,253 @@ - - - - - -Stream Lines presentation - - - - - - - - - - - - - -

Stream Lines presentation

- -

Stream Lines is a type of presentation transforming - the cells with vectors having most similar direction into lines . A streamline - can be thought of as the path that a massless particle takes in a vector - field. Streamlines are used to convey the structure of a vector field. - Usually streamlines are created to explore the most interesting features - in the field.

- -

Creating streamlines - requires specifying multiple parameters including starting - points of streamlines, direction - and other parameters to control the propagation - of the streamlines.

- -

 In - Post-Pro there is an option allowing - to specify one particular area - of the field on which the Stream Lines - presentation will be created. This option has been created for optimization - purposes: sometimes generation of a Stream Lines presentation based on - all points of a very complicated field is very time-consuming and requires - a lot of hardware resources.

- -

To bound the area on which the Stream - Lines presentation will be created. you can use another field presentation. - The points of the field located on this source presentation will serve - as starting points for generated streamlines.  

- -

 

- -

To - create a Stream Lines presentation:

- -

 

- -

- Right-click on one - of the time stamps of the field in the Object browser and from the pop-up - menu choose Stream Lines, or

- -

- Click on one of the - time stamps of the field in the Object browser and select from the main - menu Visualization > Stream Lines, - or click icon in - the Visualization Toolbar.

- -

 

- -

- -

 

- -

Stream - Lines tab allows you to set additional parameters of your - Stream Lines presentation:

- -

 

- -
    - -
  • Source: This set of fields allows to - define a source presentation on the basis of which your Stream - Lines presentation will be generated. If in the Source - type choose box you have chosen None, - your Stream Lines presentation will be generated on all points of the - field. You can also choose Entity, Family, - Group or Presentation. You - can also specify the source presentation (from the list of already created - field presentations). The points of the field located on this source presentation - will serve as starting points for generated streamlines.

  • - -
  • In - the Used points field you can - set the number of these starting points (from 0 to 100%).

  • - -
  • Step Length: this parameter defines - the size of the output line segments that make up the streamline (which - is represented as a polyline).

  • - -
  • Integration Step field: parameter of - smoothness of the stream lines. This parameter defines the accuracy of - construction of the streamlines. A smaller value of this parameter allows - to construct smoother streamlines (at the cost of more computation time).

  • - -
  • Propagation Time field: this parameter - controls the maximum length of the stream line (measured in units of time)

  • - -
  • Direction choose - box: this option allows to select direction of the stream lines.(Forward, - Backward or Both)

  • - -
  • Magnitude coloring check box: this option - allows to color your presentation according the vector values applied - to the cells of the mesh or to display it using only one color (this color - can be selected if you click Use Color - button).

  • -
- -

 

- -

Scalar Bar tab allows to define - the parameters of the scalar bar displayed with this presentation (see also).

- -

 

- -

After - you have finished with setting these parameters, click OK. - Your presentation with scalar bar will be immediately displayed - in the viewer:

- -

 

- -

     

- -

 

- -

 

- -

-Related Topics - - -

- -

 

- -

 

- - - - + + + + + +Stream Lines presentation + + + + + + + + + + + + + +

Stream Lines presentation

+ +

Stream Lines is a type of presentation transforming + the cells with vectors having most similar direction into lines . A streamline + can be thought of as the path that a massless particle takes in a vector + field. Streamlines are used to convey the structure of a vector field. + Usually streamlines are created to explore the most interesting features + in the field.

+ +

Creating streamlines + requires specifying multiple parameters including starting + points of streamlines, direction + and other parameters to control the propagation + of the streamlines.

+ +

 In + Post-Pro there is an option allowing + to specify one particular area + of the field on which the Stream Lines + presentation will be created. This option has been created for optimization + purposes: sometimes generation of a Stream Lines presentation based on + all points of a very complicated field is very time-consuming and requires + a lot of hardware resources.

+ +

To bound the area on which the Stream + Lines presentation will be created. you can use another field presentation. + The points of the field located on this source presentation will serve + as starting points for generated streamlines.  

+ +

 

+ +

To + create a Stream Lines presentation:

+ +

 

+ +

- Right-click on one + of the time stamps of the field in the Object browser and from the pop-up + menu choose Stream Lines, or

+ +

- Click on one of the + time stamps of the field in the Object browser and select from the main + menu Visualization > Stream Lines, + or click icon in + the Visualization Toolbar.

+ +

 

+ +

+ +

 

+ +

Stream + Lines tab allows you to set additional parameters of your + Stream Lines presentation:

+ +

 

+ +
    + +
  • Source: This set of fields allows to + define a source presentation on the basis of which your Stream + Lines presentation will be generated. If in the Source + type choose box you have chosen None, + your Stream Lines presentation will be generated on all points of the + field. You can also choose Entity, Family, + Group or Presentation. You + can also specify the source presentation (from the list of already created + field presentations). The points of the field located on this source presentation + will serve as starting points for generated streamlines.

  • + +
  • In + the Used points field you can + set the number of these starting points (from 0 to 100%).

  • + +
  • Step Length: this parameter defines + the size of the output line segments that make up the streamline (which + is represented as a polyline).

  • + +
  • Integration Step field: parameter of + smoothness of the stream lines. This parameter defines the accuracy of + construction of the streamlines. A smaller value of this parameter allows + to construct smoother streamlines (at the cost of more computation time).

  • + +
  • Propagation Time field: this parameter + controls the maximum length of the stream line (measured in units of time)

  • + +
  • Direction choose + box: this option allows to select direction of the stream lines.(Forward, + Backward or Both)

  • + +
  • Magnitude coloring check box: this option + allows to color your presentation according the vector values applied + to the cells of the mesh or to display it using only one color (this color + can be selected if you click Use Color + button).

  • +
+ +

 

+ +

Scalar Bar tab allows to define + the parameters of the scalar bar displayed with this presentation (see also).

+ +

 

+ +

After + you have finished with setting these parameters, click OK. + Your presentation with scalar bar will be immediately displayed + in the viewer:

+ +

 

+ +

     

+ +

 

+ +

 

+ +

+Related Topics + + +

+ +

 

+ +

 

+ + + + diff --git a/doc/salome/gui/VISU/files/surface.htm b/doc/salome/gui/VISU/files/surface.htm index 9ccbe874..aa79d4d4 100755 --- a/doc/salome/gui/VISU/files/surface.htm +++ b/doc/salome/gui/VISU/files/surface.htm @@ -1,86 +1,86 @@ - - - - - -Surface - - - - - - - - - - - - -

- - - - + + + + + +Surface + + + + + + + + + + + + +

+ + + + diff --git a/doc/salome/gui/VISU/files/surfaceframe.htm b/doc/salome/gui/VISU/files/surfaceframe.htm index 0649c2c1..bcfbd6d1 100755 --- a/doc/salome/gui/VISU/files/surfaceframe.htm +++ b/doc/salome/gui/VISU/files/surfaceframe.htm @@ -1,86 +1,86 @@ - - - - - -Surfaceframe - - - - - - - - - - - - -

- - - - + + + + + +Surfaceframe + + + + + + + + + + + + +

+ + + + diff --git a/doc/salome/gui/VISU/files/sweeping.htm b/doc/salome/gui/VISU/files/sweeping.htm index 8aadef62..4bde6790 100755 --- a/doc/salome/gui/VISU/files/sweeping.htm +++ b/doc/salome/gui/VISU/files/sweeping.htm @@ -1,162 +1,162 @@ - - - - - -Sweeping - - - - - - - - - - - - - -

Sweeping

- -

In Post-Pro there is an option allowing - to display pseudo-animation of a field presentation. For creation of this - pseudo-animation you should take one field presentation generated on the - base of ONE Time Step (for comparison, - Animation  is - generated on the base of ALL Time - Steps of a field). The frame displaying this field presentation will be - the basic. Post-Pro - automatically generates another frame displaying the initial - field presentation, which is composed of cells with minimum - acceptable values regarding the values applied to the cells of the basic presentation. It also automatically - generates a user-defined number of frames (steps), - which will display the process of transformation of the field presentation - from the initial state in the basic state. -  Sweeping - is a type of animation composed of these frames: the frame displaying - the initial field presentation - will start the animation, the frame displaying the basic - field presentation will end it.

- -

 

- -

To sweep - a field presentation:

- -

 

- -

1. Create - a field presentation.

- -

 

- -

2. Right-click on this - presentation in the Object Browser or in the viewer.

- -

 

- -

3. From the pop-up menu - select Sweep option.

- -

 

- -

-Related Topics - - -

- -

 

- -

 

- - - - + + + + + +Sweeping + + + + + + + + + + + + + +

Sweeping

+ +

In Post-Pro there is an option allowing + to display pseudo-animation of a field presentation. For creation of this + pseudo-animation you should take one field presentation generated on the + base of ONE Time Step (for comparison, + Animation  is + generated on the base of ALL Time + Steps of a field). The frame displaying this field presentation will be + the basic. Post-Pro + automatically generates another frame displaying the initial + field presentation, which is composed of cells with minimum + acceptable values regarding the values applied to the cells of the basic presentation. It also automatically + generates a user-defined number of frames (steps), + which will display the process of transformation of the field presentation + from the initial state in the basic state. +  Sweeping + is a type of animation composed of these frames: the frame displaying + the initial field presentation + will start the animation, the frame displaying the basic + field presentation will end it.

+ +

 

+ +

To sweep + a field presentation:

+ +

 

+ +

1. Create + a field presentation.

+ +

 

+ +

2. Right-click on this + presentation in the Object Browser or in the viewer.

+ +

 

+ +

3. From the pop-up menu + select Sweep option.

+ +

 

+ +

+Related Topics + + +

+ +

 

+ +

 

+ + + + diff --git a/doc/salome/gui/VISU/files/vectors_presentation.htm b/doc/salome/gui/VISU/files/vectors_presentation.htm index 3ab095c9..3862f649 100755 --- a/doc/salome/gui/VISU/files/vectors_presentation.htm +++ b/doc/salome/gui/VISU/files/vectors_presentation.htm @@ -1,216 +1,216 @@ - - - - - -Vectors presentation - - - - - - - - - - - - - -

Vectors Presentation

- -

Vector Field  presentation - visualizes vectors of the corresponding cells of the mesh in graphical - mode.

- -

 

- -

To create a Vector  presentation:

- -

 

- -

- Right-click on one of the time stamps of - the field in the Object browser and from the pop-up menu choose Vectors, or

- -

 

- -

- Click on one of the time stamps of the field - in the Object browser and select from the main menu Visualization - > Vectors, or click icon - in the Visualization Toolbar.

- -

 

- -

- -

 

- -
    - -
  • Vectors tab - allows you to set additional parameters of your Vectors presentation:

  • -
- -

 

- -
    - -
  • Scale - Factor: visualization scaling of all vector values applied to the - cells of the mesh.

  • - -
  • Line - width: width of the lines representing vectors in your presentation.

  • - -
  • Magnitude - coloring check box: this option allows to color your presentation - according the scalar - range defined in Scalar Bar properties or to display it using only - one color (this color can be selected if you click Select - Color button).

  • - -
  • Use - glyphs check box: this option allows you to visualize vectors with - pointers and select their type - and position on the line of the - vectors. You can choose Glyph Type (Arrows, - big or small Cones) and Glyph - Position (at the Tail, at the - Head or in the Center).

  • -
- -

 

- -
    - -
  • Scalar - Bar tab allows to define the parameters of the scalar bar displayed - with this presentation (see - also).

  • -
- -

 

- -

After - you have finished with setting these parameters, click OK. - Your presentation with scalar bar will be immediately displayed - in the viewer:

- -

 

- -

          

- -

 

- -

 

- -

-Related Topics - - -

- -

 

- - - - + + + + + +Vectors presentation + + + + + + + + + + + + + +

Vectors Presentation

+ +

Vector Field  presentation + visualizes vectors of the corresponding cells of the mesh in graphical + mode.

+ +

 

+ +

To create a Vector  presentation:

+ +

 

+ +

- Right-click on one of the time stamps of + the field in the Object browser and from the pop-up menu choose Vectors, or

+ +

 

+ +

- Click on one of the time stamps of the field + in the Object browser and select from the main menu Visualization + > Vectors, or click icon + in the Visualization Toolbar.

+ +

 

+ +

+ +

 

+ +
    + +
  • Vectors tab + allows you to set additional parameters of your Vectors presentation:

  • +
+ +

 

+ +
    + +
  • Scale + Factor: visualization scaling of all vector values applied to the + cells of the mesh.

  • + +
  • Line + width: width of the lines representing vectors in your presentation.

  • + +
  • Magnitude + coloring check box: this option allows to color your presentation + according the scalar + range defined in Scalar Bar properties or to display it using only + one color (this color can be selected if you click Select + Color button).

  • + +
  • Use + glyphs check box: this option allows you to visualize vectors with + pointers and select their type + and position on the line of the + vectors. You can choose Glyph Type (Arrows, + big or small Cones) and Glyph + Position (at the Tail, at the + Head or in the Center).

  • +
+ +

 

+ +
    + +
  • Scalar + Bar tab allows to define the parameters of the scalar bar displayed + with this presentation (see + also).

  • +
+ +

 

+ +

After + you have finished with setting these parameters, click OK. + Your presentation with scalar bar will be immediately displayed + in the viewer:

+ +

 

+ +

          

+ +

 

+ +

 

+ +

+Related Topics + + +

+ +

 

+ + + + diff --git a/doc/salome/gui/VISU/files/wireframe.htm b/doc/salome/gui/VISU/files/wireframe.htm index 9b2f749f..45cf670a 100755 --- a/doc/salome/gui/VISU/files/wireframe.htm +++ b/doc/salome/gui/VISU/files/wireframe.htm @@ -1,86 +1,86 @@ - - - - - -Wireframe - - - - - - - - - - - - -

- - - - + + + + + +Wireframe + + + + + + + + + + + + +

+ + + + diff --git a/doc/salome/gui/VISU/gauss_points_presentation.htm b/doc/salome/gui/VISU/gauss_points_presentation.htm index 9a92e56a..6d7b2960 100755 --- a/doc/salome/gui/VISU/gauss_points_presentation.htm +++ b/doc/salome/gui/VISU/gauss_points_presentation.htm @@ -1,137 +1,137 @@ - - - - - -Gauss Points Presentation - - - - - - - - - - - - - -

Creating a Gauss Points Presentation

- -

To create a Gauss Points  presentation:

- -

 

- -

- Right-click on one of the time stamps of - the field in the Object browser and from the pop-up menu choose Gauss Points, or

- -

- Click on one of the time stamps of the field - in the Object browser and select from the main menu Visualization - > Gauss Points, or click icon - in the Visualization Toolbar.

- -

 

- -

 

- -

- -

 

- -

Now you can choose the Type - of your Gauss Points presentation and Primitives - used for visualisation of the points and set their properties.

- -

You can also change the Scalar - Bar properties

- -

 

- -

To exit the dialog and apply choices press - OK button, or press CANCEL - button to quit.

- - - - + + + + + +Gauss Points Presentation + + + + + + + + + + + + + +

Creating a Gauss Points Presentation

+ +

To create a Gauss Points  presentation:

+ +

 

+ +

- Right-click on one of the time stamps of + the field in the Object browser and from the pop-up menu choose Gauss Points, or

+ +

- Click on one of the time stamps of the field + in the Object browser and select from the main menu Visualization + > Gauss Points, or click icon + in the Visualization Toolbar.

+ +

 

+ +

 

+ +

+ +

 

+ +

Now you can choose the Type + of your Gauss Points presentation and Primitives + used for visualisation of the points and set their properties.

+ +

You can also change the Scalar + Bar properties

+ +

 

+ +

To exit the dialog and apply choices press + OK button, or press CANCEL + button to quit.

+ + + + diff --git a/doc/salome/gui/VISU/gauss_viewer.htm b/doc/salome/gui/VISU/gauss_viewer.htm index bff3ba85..8fcb09ca 100755 --- a/doc/salome/gui/VISU/gauss_viewer.htm +++ b/doc/salome/gui/VISU/gauss_viewer.htm @@ -1,197 +1,201 @@ - - - - - -Gauss Viewer - - - - - - - - - - - - - -

Gauss Viewer

- -

Gauss Points Viewer is the viewer - specially developed to display Gauss - Points Presentations in Post-Pro - Module.

- -

 

- -

The viewer is activated automatically when you choose to create a Gauss - Points Presentation.

- -

Right mouse-click on the Presentation gives access to the following - options:

- -

 

- -

- -

 

- -
    - -
  • Rename - - allows to rename the presentation.

  • - -
  • Edit - - allows to return to Gauss - Points Properties menu and change the parameters of a presentation -

  • - -
  • Copy - - allows to create a copy of the presentation in the same subfolder (time - stamp) in the Object Browser.

  • - -
  • Erase - - allows to hide the selected presentation from the viewer.

  • - -
  • Display Only - - allows to display only the selected presentation, hiding all other from - the viewer.

  • - -
  • Store current configuration - - allows to save the current layout - of the viewer (settings, position of windows, etc).

  • - -
  • Dump view - exports - an object from the viewer in bmp, png, jpg or jpeg image format.

  • - -
  • Change - Background - allows to change the properties of the background.

  • -
- -

 

- -

Most operations available via Viewer Toolbar are common with VTK 3D Viewer.

- -

However, some of them are used only in Gauss Points Viewer.

- -

 

- -
    - -
  •   These buttons are used for Recording.

  • - -
  • Interaction - Style Switch - allows to switch between two the modes of mouse - manipulation.

  • - -
  • Salome Standard Controls - - allows to manipulate objects in the - viewer with the mouse and locked Ctrl button: increase or decrease the - zoom ratio with the left mouse button, translate object in any direction - with the central mouse button or rotate it with the right mouse button. -

  • - -
  • Keyboard Free - allows to manipulate objects in the viewer - with the mouse without locking Ctrl button. In - this case the operations are assigned to the buttons differently: rotation - is made with the left button, translation with the right and zoom with - both pressed in the same time.   

  • - -
  • Selection - Mode Switch - activates Picking. -

  • - -
  • Plane - Segmentation - activates Segmentation.

  • -
- - - - + + + + + +Gauss Viewer + + + + + + + + + + + + + +

Gauss Viewer

+ +

Gauss Points Viewer is the viewer + specially developed to display Gauss + Points Presentations in Post-Pro + Module.

+ +

 

+ +

The viewer is activated automatically when you choose to create a Gauss + Points Presentation.

+ +

Right mouse-click on the Presentation gives access to the following + options:

+ +

 

+ +

+ +

 

+ +
    + +
  • Rename + - allows to rename the presentation.

  • + +
  • Edit - + allows to return to Gauss + Points Properties menu and change the parameters of a presentation +

  • + +
  • Copy - + allows to create a copy of the presentation in the same subfolder (time + stamp) in the Object Browser.

  • + +
  • Erase + - allows to hide the selected presentation from the viewer.

  • + +
  • Display Only + - allows to display only the selected presentation, hiding all other from + the viewer.

  • + +
  • Store current configuration + - allows to save the current layout + of the viewer (settings, position of windows, etc).

  • + +
  • Dump view - exports + an object from the viewer in bmp, png, jpg or jpeg image format.

  • + +
  • Change + Background - allows to change the properties of the background.

  • +
+ +

 

+ +

Most operations available via Viewer Toolbar are common with VTK + 3D Viewer. VTK 3D Viewer + is detailly described in the documentation on + GUI module.

+ +

However, some functionalities are used only in Gauss + Points Viewer.

+ +

 

+ +
    + +
  •   These buttons are used for Recording.

  • + +
  • Interaction + Style Switch - allows to switch between two the modes of mouse + manipulation.

  • + +
  • Salome Standard Controls + - allows to manipulate objects in the + viewer with the mouse and locked Ctrl button: increase or decrease the + zoom ratio with the left mouse button, translate object in any direction + with the central mouse button or rotate it with the right mouse button. +

  • + +
  • Keyboard Free - allows to manipulate objects in the viewer + with the mouse without locking Ctrl button. In + this case the operations are assigned to the buttons differently: rotation + is made with the left button, translation with the right and zoom with + both pressed in the same time.   

  • + +
  • Selection + Mode Switch - activates Picking. +

  • + +
  • Plane + Segmentation - activates Segmentation.

  • +
+ + + + diff --git a/doc/salome/gui/VISU/index.htm b/doc/salome/gui/VISU/index.htm index a401b3a4..abf78302 100755 --- a/doc/salome/gui/VISU/index.htm +++ b/doc/salome/gui/VISU/index.htm @@ -1,180 +1,180 @@ - - -Post-Pro Module Reference Manual - - - - - - - - - - - - - + + +Post-Pro Module Reference Manual + + + + + + + + + + + + + diff --git a/doc/salome/gui/VISU/index_csh.htm b/doc/salome/gui/VISU/index_csh.htm index 57b07d67..6d780631 100755 --- a/doc/salome/gui/VISU/index_csh.htm +++ b/doc/salome/gui/VISU/index_csh.htm @@ -1,106 +1,106 @@ - - -Post-Pro Module Reference Manual - - - - - - - - - - - - + + +Post-Pro Module Reference Manual + + + + + + + + + + + + \ No newline at end of file diff --git a/doc/salome/gui/VISU/index_rhc.htm b/doc/salome/gui/VISU/index_rhc.htm index 8cc03d91..e83d0b9f 100755 --- a/doc/salome/gui/VISU/index_rhc.htm +++ b/doc/salome/gui/VISU/index_rhc.htm @@ -1,106 +1,106 @@ - - -Post-Pro Module Reference Manual - - - - - - - - - - - - + + +Post-Pro Module Reference Manual + + + + + + + + + + + + \ No newline at end of file diff --git a/doc/salome/gui/VISU/navigation_with_keyboard_and_spacemouse.htm b/doc/salome/gui/VISU/navigation_with_keyboard_and_spacemouse.htm index c2d040ee..2a470878 100755 --- a/doc/salome/gui/VISU/navigation_with_keyboard_and_spacemouse.htm +++ b/doc/salome/gui/VISU/navigation_with_keyboard_and_spacemouse.htm @@ -1,457 +1,457 @@ - - - - - -Navigation with keyboard and spacemouse - - - - - - - - - - - - -

Navigation in the Gauss viewer

- -

Gauss viewer provides some navigation options, which are not available - in other Salome viewers.   

- -

Navigation using the mouse

- -

Salome standard

- -

The mouse is supported as a standard manipulator in Salome possessing - the following actions by default:

- -

 

- - - ---- - - - - - - - - - - - - - - - - - - - - -
-

Action

-

Command

-

Movement

-

Dynamic rotation

-

[CTRL] key + Right Mouse Button

-

Rotation about the focal point

-

Dynamic panning

-

[CTRL] key + Central Mouse button

-

Translation in any direction

-

Dynamic zoom

-

[CTRL] key + Left Mouse Button

-

 Increase - or decrease of zoom ratio

- -

 

- -

Gauss Viewer

- -

In Gauss Viewer it is possible to manipulate - objects without locking keyboard keys, switching between the standard - and the advanced operation modes with Interaction - Style Switch button from Gauss Viewer Toolbar:

- -

 

- - - ---- - - - - - - - - - - - - - - - - - - - - -
-

Action

-

Command

-

Movement

-

Dynamic rotation

-

Right Mouse Button

-

Rotation about the focal point

-

Dynamic panning

-

Central Mouse button

-

Translation in any direction

-

Dynamic zoom

-

Left Mouse Button + Central Mouse button

-

 Increase - or decrease of zoom ratio

- -

 

- -

Navigation using the keyboard

- -

Salome does not allow to manipulate objects - using keyboard keys, which is possible in Gauss Viewer only.

- -

 

- - - ---- - - - - - - - - - - - - - - - - - - - - - - - - - -
-

Action

-

Key

-

Movement

-

Dynamic rotation

-

[CTRL] key +

-

[ ], [ ],

-

[ ], [ ]

-

Rotation about the focal point

-

Dynamic panning

-

[ ], [ ],

-

[ ], [ ]

-

Translation in any direction

-

Dynamic zoom

-

[PageUp],

-

[PageDn]

-

  Increase - or decrease of zoom ratio

-

Speed increment

-

[ + ],

-

[ - ]

-

Increase or decrease by 1 of the speed increment for the previously - defined movement.

- -

 

- -

Navigation using the spacemouse

- -

Salome does not allow to manipulate objects using a spacemouse, which - is possible in Gauss Viewer only.  

- -

 

- -

The spacemouse introduces a local coordinate system and 6 degrees of - freedom, which are independent from the 3D view coordinate system.

- -

 

- -

- -

 

- -

The movement of 3D models in the screen depends on the user manipulations - with the controller head.

- -

 

- - ---- - - - - - - - - - - - - - - - - - - - - - - - -
-

Action

-

Move

-

Description

-

Dynamic rotation

-

-

Tilt the controller head forward - and backward to rotate the object about axis X.

-

 

-

 

-

-

Rotate the controller head clockwise - and counterclockwise to rotate the model about axis Y.

-

Dynamic panning

-

-

Pull up and - push down to move the model up and down.

-

Move left and right - to move the model left and right.

-

Dynamic zoom

-

-

Push forward or pull - backward to respectively decrease or increase the zoom ratio.

- -

 

- -

Buttons of the spacemouse are also used to change the magnification - for Gauss points:

- -

 

- -

- -

 

- -

By default, buttons are defined as follows, however the user can change - them in the preferences:

- -

 

- - - --- - - - - - - - - - - - - - - - - - - - - - - - - -
-

Button

-

Description

-

Button 1

-

Decrease by 1 speed increment used for the keyboard (the same as [-] - key)

-

Button 2

-

Increase by 1 speed increment used for the keyboard (the same as [+] - key)

-

Button 10

-

Divide the current magnification by the magnification ratio

-

Button 11

-

Multiply the current magnification by the magnification ratio

-

Button Star

-

Toggle button to switch to dominant or combined movements

- -

 

- -

 

- - - - + + + + + +Navigation with keyboard and spacemouse + + + + + + + + + + + + +

Navigation in the Gauss viewer

+ +

Gauss viewer provides some navigation options, which are not available + in other Salome viewers.   

+ +

Navigation using the mouse

+ +

Salome standard

+ +

The mouse is supported as a standard manipulator in Salome possessing + the following actions by default:

+ +

 

+ + + ++++ + + + + + + + + + + + + + + + + + + + + +
+

Action

+

Command

+

Movement

+

Dynamic rotation

+

[CTRL] key + Right Mouse Button

+

Rotation about the focal point

+

Dynamic panning

+

[CTRL] key + Central Mouse button

+

Translation in any direction

+

Dynamic zoom

+

[CTRL] key + Left Mouse Button

+

 Increase + or decrease of zoom ratio

+ +

 

+ +

Gauss Viewer

+ +

In Gauss Viewer it is possible to manipulate + objects without locking keyboard keys, switching between the standard + and the advanced operation modes with Interaction + Style Switch button from Gauss Viewer Toolbar:

+ +

 

+ + + ++++ + + + + + + + + + + + + + + + + + + + + +
+

Action

+

Command

+

Movement

+

Dynamic rotation

+

Right Mouse Button

+

Rotation about the focal point

+

Dynamic panning

+

Central Mouse button

+

Translation in any direction

+

Dynamic zoom

+

Left Mouse Button + Central Mouse button

+

 Increase + or decrease of zoom ratio

+ +

 

+ +

Navigation using the keyboard

+ +

Salome does not allow to manipulate objects + using keyboard keys, which is possible in Gauss Viewer only.

+ +

 

+ + + ++++ + + + + + + + + + + + + + + + + + + + + + + + + + +
+

Action

+

Key

+

Movement

+

Dynamic rotation

+

[CTRL] key +

+

[ ], [ ],

+

[ ], [ ]

+

Rotation about the focal point

+

Dynamic panning

+

[ ], [ ],

+

[ ], [ ]

+

Translation in any direction

+

Dynamic zoom

+

[PageUp],

+

[PageDn]

+

  Increase + or decrease of zoom ratio

+

Speed increment

+

[ + ],

+

[ - ]

+

Increase or decrease by 1 of the speed increment for the previously + defined movement.

+ +

 

+ +

Navigation using the spacemouse

+ +

Salome does not allow to manipulate objects using a spacemouse, which + is possible in Gauss Viewer only.  

+ +

 

+ +

The spacemouse introduces a local coordinate system and 6 degrees of + freedom, which are independent from the 3D view coordinate system.

+ +

 

+ +

+ +

 

+ +

The movement of 3D models in the screen depends on the user manipulations + with the controller head.

+ +

 

+ + ++++ + + + + + + + + + + + + + + + + + + + + + + + +
+

Action

+

Move

+

Description

+

Dynamic rotation

+

+

Tilt the controller head forward + and backward to rotate the object about axis X.

+

 

+

 

+

+

Rotate the controller head clockwise + and counterclockwise to rotate the model about axis Y.

+

Dynamic panning

+

+

Pull up and + push down to move the model up and down.

+

Move left and right + to move the model left and right.

+

Dynamic zoom

+

+

Push forward or pull + backward to respectively decrease or increase the zoom ratio.

+ +

 

+ +

Buttons of the spacemouse are also used to change the magnification + for Gauss points:

+ +

 

+ +

+ +

 

+ +

By default, buttons are defined as follows, however the user can change + them in the preferences:

+ +

 

+ + + +++ + + + + + + + + + + + + + + + + + + + + + + + + +
+

Button

+

Description

+

Button 1

+

Decrease by 1 speed increment used for the keyboard (the same as [-] + key)

+

Button 2

+

Increase by 1 speed increment used for the keyboard (the same as [+] + key)

+

Button 10

+

Divide the current magnification by the magnification ratio

+

Button 11

+

Multiply the current magnification by the magnification ratio

+

Button Star

+

Toggle button to switch to dominant or combined movements

+ +

 

+ +

 

+ + + + diff --git a/doc/salome/gui/VISU/picking.htm b/doc/salome/gui/VISU/picking.htm index 07625216..2b5c2a96 100755 --- a/doc/salome/gui/VISU/picking.htm +++ b/doc/salome/gui/VISU/picking.htm @@ -1,208 +1,208 @@ - - - - - -Picking - - - - - - - - - - - - - -

Picking

- -

Picking is a special - way of viewing Gauss Points presentations

- -

 

- -

- -

 

- -

Picking mode is activated by selecting   button in the Gauss Viewer toolbar.

- -

Now if the cursor touches a point it is highlighted  with - triangular markers (pyramids). The cursor is dynamically generated so - that apexes of each pyramid touch the point sprite boundary, and the height - of the pyramid is fixed.

- -

- -

To get information about the point click the left mouse button or press - S (or s) key of the keyboard.

- -

Once a point is selected, the presentation is centered around this point - and a semi-transparent window is displayed next to the selected point - and shows the following information:

- -
    - -
  • The ID of the point within its parent mesh element

  • - -
  • Coordinates of the Gauss point

  • - -
  • In the case of a result at Gauss point: Scalar - value being inspected + all components individually

  • - -
  • Name of its parent mesh element

  • -
- -

In addition, the active scalar bar is updated to highlight the corresponding - value of the selected scalar value by a black line.

- -

 

- -

All Picking preferences can be defined using Preferences, however, you - can customize them for the current presentation.

- -

 

- -

- -

 

- -
    - -
  • Cursor - - allows to adjust the Size of - the cursor used for Picking (ranging from 0.1 to 1), the Height - of the pyramids (ranging from 0 to 10) and the Selection - cursor color.

  • - -
  • Tolerance - - defines at which distance of the cursor from the point it becomes selected - (ranges from 0.001 to 10).

  • - -
  • Information window - - allows to define the Transparency - (from 0% = opaque to 100% = transparent) and Position - of the window, which can be:

  • - -
  • Centred - below the point, or

  • - -
  • located at Top-left - corner of the 3D view

  • - -
  • Movement - of the Camera can also be define by - the user.

  • - -
  • Zoom - at first selected point - This value is used to define the focal - distance at the first selected point (at the end of the movement of the - camera). This value is a ratio that will be multiplied by the current - zoom value.

  • - -
  • Number - of steps between two positions - defines - the smoothness of camera movement at selection by the number of iterations. - If set to 1 the camera is zoomed and centered at the point momentarily. - Greater numbers mean very slow camera movement.   

  • - -
  • Display - parent mesh element - allows to visualize - or hide the parent mesh element of the selected gauss point.

  • -
- -

 

- -

 

- - - - + + + + + +Picking + + + + + + + + + + + + + +

Picking

+ +

Picking is a special + way of viewing Gauss Points presentations

+ +

 

+ +

+ +

 

+ +

Picking mode is activated by selecting   button in the Gauss Viewer toolbar.

+ +

Now if the cursor touches a point it is highlighted  with + triangular markers (pyramids). The cursor is dynamically generated so + that apexes of each pyramid touch the point sprite boundary, and the height + of the pyramid is fixed.

+ +

+ +

To get information about the point click the left mouse button or press + S (or s) key of the keyboard.

+ +

Once a point is selected, the presentation is centered around this point + and a semi-transparent window is displayed next to the selected point + and shows the following information:

+ +
    + +
  • The ID of the point within its parent mesh element

  • + +
  • Coordinates of the Gauss point

  • + +
  • In the case of a result at Gauss point: Scalar + value being inspected + all components individually

  • + +
  • Name of its parent mesh element

  • +
+ +

In addition, the active scalar bar is updated to highlight the corresponding + value of the selected scalar value by a black line.

+ +

 

+ +

All Picking preferences can be defined using Preferences, however, you + can customize them for the current presentation.

+ +

 

+ +

+ +

 

+ +
    + +
  • Cursor + - allows to adjust the Size of + the cursor used for Picking (ranging from 0.1 to 1), the Height + of the pyramids (ranging from 0 to 10) and the Selection + cursor color.

  • + +
  • Tolerance + - defines at which distance of the cursor from the point it becomes selected + (ranges from 0.001 to 10).

  • + +
  • Information window + - allows to define the Transparency + (from 0% = opaque to 100% = transparent) and Position + of the window, which can be:

  • + +
  • Centred + below the point, or

  • + +
  • located at Top-left + corner of the 3D view

  • + +
  • Movement + of the Camera can also be define by + the user.

  • + +
  • Zoom + at first selected point - This value is used to define the focal + distance at the first selected point (at the end of the movement of the + camera). This value is a ratio that will be multiplied by the current + zoom value.

  • + +
  • Number + of steps between two positions - defines + the smoothness of camera movement at selection by the number of iterations. + If set to 1 the camera is zoomed and centered at the point momentarily. + Greater numbers mean very slow camera movement.   

  • + +
  • Display + parent mesh element - allows to visualize + or hide the parent mesh element of the selected gauss point.

  • +
+ +

 

+ +

 

+ + + + diff --git a/doc/salome/gui/VISU/pics/animation.png b/doc/salome/gui/VISU/pics/animation.png index 888fbf05..85070152 100755 Binary files a/doc/salome/gui/VISU/pics/animation.png and b/doc/salome/gui/VISU/pics/animation.png differ diff --git a/doc/salome/gui/VISU/pics/cutlines.png b/doc/salome/gui/VISU/pics/cutlines.png index 22c9f964..3db09092 100755 Binary files a/doc/salome/gui/VISU/pics/cutlines.png and b/doc/salome/gui/VISU/pics/cutlines.png differ diff --git a/doc/salome/gui/VISU/pics/dataonelements1.png b/doc/salome/gui/VISU/pics/dataonelements1.png index b3261794..b9cb2c01 100755 Binary files a/doc/salome/gui/VISU/pics/dataonelements1.png and b/doc/salome/gui/VISU/pics/dataonelements1.png differ diff --git a/doc/salome/gui/VISU/pics/dataonelements2.png b/doc/salome/gui/VISU/pics/dataonelements2.png index 836e7a23..e532ef1d 100755 Binary files a/doc/salome/gui/VISU/pics/dataonelements2.png and b/doc/salome/gui/VISU/pics/dataonelements2.png differ diff --git a/doc/salome/gui/VISU/pics/image157.gif b/doc/salome/gui/VISU/pics/image157.gif new file mode 100644 index 00000000..2f66e05e Binary files /dev/null and b/doc/salome/gui/VISU/pics/image157.gif differ diff --git a/doc/salome/gui/VISU/pics/scalarbarproperties.png b/doc/salome/gui/VISU/pics/scalarbarproperties.png index 83311861..db018aec 100755 Binary files a/doc/salome/gui/VISU/pics/scalarbarproperties.png and b/doc/salome/gui/VISU/pics/scalarbarproperties.png differ diff --git a/doc/salome/gui/VISU/pics/set_rotation_point_dialog1.png b/doc/salome/gui/VISU/pics/set_rotation_point_dialog1.png new file mode 100644 index 00000000..bdab73b7 Binary files /dev/null and b/doc/salome/gui/VISU/pics/set_rotation_point_dialog1.png differ diff --git a/doc/salome/gui/VISU/pics/set_rotation_point_dialog2.png b/doc/salome/gui/VISU/pics/set_rotation_point_dialog2.png new file mode 100644 index 00000000..7f3696a5 Binary files /dev/null and b/doc/salome/gui/VISU/pics/set_rotation_point_dialog2.png differ diff --git a/doc/salome/gui/VISU/pics/view_rotation_point.png b/doc/salome/gui/VISU/pics/view_rotation_point.png new file mode 100644 index 00000000..7fe8f838 Binary files /dev/null and b/doc/salome/gui/VISU/pics/view_rotation_point.png differ diff --git a/doc/salome/gui/VISU/plot2d_viewer.htm b/doc/salome/gui/VISU/plot2d_viewer.htm index 423216db..e8e3cab6 100755 --- a/doc/salome/gui/VISU/plot2d_viewer.htm +++ b/doc/salome/gui/VISU/plot2d_viewer.htm @@ -1,248 +1,248 @@ - - - - - -Plot2D Viewer - - - - - - - - - - - - - -

Plot 2D viewer

- -

Plot 2d viewer is destined to - the representation of  2d - plots and graphs in Post-Pro module.

- -

Its viewer toolbar gives you fast access to the following operations:

- -

 

- -
    - -
  • Dump - View - exports an object from the viewer in bmp, png, jpg or jpeg - image format.

  • - -
  •  Fit all - allows - to select a point to be the center of a scene. -

  • - -
  • Fit - area - resizes the view to place in the visible area only the contents - of a frame drawn with pressed left mouse button.

  • - -
  • Zoom - -  allows - to zoom in and out.

  • - -
  • Panning - - if the represented objects are greater that the visible area and you - don't wish to use Fit all functionality, - click on this button and you'll be able to drag the scene to see its remote - parts.

  • - -
  • Global - panning - represents all displayed objects in the visible area. -  

  • - -
  • Draw - Points - represents points on the graph.

  • - -
  • Draw - Lines - represents lines on the graph.

  • - -
  • Draw - Splines - represents splines on the graph.

  • - -
  • & Horizontal - axis logarithmic & Vertical axis logarithmic - changes the - scaling on axes to logarithmic.

  • - -
  • Show - Legend - reveals all verbal and numerical information on the graphs.

  • - -
  • Settings - - calls a menu, in which you can specify advanced settings for your Plot 2d Viewer.  

  • - -
  •  Clone view - - opens a new duplicate scene.

  • -
- -

 

- -

- -

 

- -

The options are as follows:

- -

 

- -
    - -
  • Main - title: the title of the XY plot. By default, it will consist of - the names of the tables, on the basis of which the curve lines have been - constructed.

  • - -
  • Curve - type: you can select from Points, - Lines and Spline.

  • - -
  • Show - legend: Here you can define the position - of the description table on the XY plot (to the Left, - to the Right, on Top or on Bottom). -

  • - -
  • Marker - size - size of the points (markers) forming curve lines.

  • - -
  • Background - color of the XY plot

  • - -
  • Scale - mode: here you can select the type - of scaling (Linear or Logarithmic) along - X (Horizontal) or Y (Vertical) axes.

  • -
- -

 

- -

You can define settings - for each axis separately:

- -

 

- -
    - -
  • Horizontal - or Vertical axis title

  • - -
  • Grid/Axes - marks:  here - you can define the maximum number of major and minor scale divisions for - a specified axis. The real number of intervals fits to {1,2,5}*10N,  where - N is a natural number, and doesn't exceed the maximum.

  • - -
  • Save - settings as default: If this check box is marked, all XY plots - will be displayed with these defined properties.

  • -
- -

 

- -

 

- - - - + + + + + +Plot2D Viewer + + + + + + + + + + + + + +

Plot 2D viewer

+ +

Plot 2d viewer is destined to + the representation of  2d + plots and graphs in Post-Pro module.

+ +

Its viewer toolbar gives you fast access to the following operations:

+ +

 

+ +
    + +
  • Dump + View - exports an object from the viewer in bmp, png, jpg or jpeg + image format.

  • + +
  •  Fit all - allows + to select a point to be the center of a scene. +

  • + +
  • Fit + area - resizes the view to place in the visible area only the contents + of a frame drawn with pressed left mouse button.

  • + +
  • Zoom + -  allows + to zoom in and out.

  • + +
  • Panning + - if the represented objects are greater that the visible area and you + don't wish to use Fit all functionality, + click on this button and you'll be able to drag the scene to see its remote + parts.

  • + +
  • Global + panning - represents all displayed objects in the visible area. +  

  • + +
  • Draw + Points - represents points on the graph.

  • + +
  • Draw + Lines - represents lines on the graph.

  • + +
  • Draw + Splines - represents splines on the graph.

  • + +
  • & Horizontal + axis logarithmic & Vertical axis logarithmic - changes the + scaling on axes to logarithmic.

  • + +
  • Show + Legend - reveals all verbal and numerical information on the graphs.

  • + +
  • Settings + - calls a menu, in which you can specify advanced settings for your Plot 2d Viewer.  

  • + +
  •  Clone view + - opens a new duplicate scene.

  • +
+ +

 

+ +

+ +

 

+ +

The options are as follows:

+ +

 

+ +
    + +
  • Main + title: the title of the XY plot. By default, it will consist of + the names of the tables, on the basis of which the curve lines have been + constructed.

  • + +
  • Curve + type: you can select from Points, + Lines and Spline.

  • + +
  • Show + legend: Here you can define the position + of the description table on the XY plot (to the Left, + to the Right, on Top or on Bottom). +

  • + +
  • Marker + size - size of the points (markers) forming curve lines.

  • + +
  • Background + color of the XY plot

  • + +
  • Scale + mode: here you can select the type + of scaling (Linear or Logarithmic) along + X (Horizontal) or Y (Vertical) axes.

  • +
+ +

 

+ +

You can define settings + for each axis separately:

+ +

 

+ +
    + +
  • Horizontal + or Vertical axis title

  • + +
  • Grid/Axes + marks:  here + you can define the maximum number of major and minor scale divisions for + a specified axis. The real number of intervals fits to {1,2,5}*10N,  where + N is a natural number, and doesn't exceed the maximum.

  • + +
  • Save + settings as default: If this check box is marked, all XY plots + will be displayed with these defined properties.

  • +
+ +

 

+ +

 

+ + + + diff --git a/doc/salome/gui/VISU/plot_3d_presentation.htm b/doc/salome/gui/VISU/plot_3d_presentation.htm index 45e5b2a6..3b22a57c 100755 --- a/doc/salome/gui/VISU/plot_3d_presentation.htm +++ b/doc/salome/gui/VISU/plot_3d_presentation.htm @@ -1,203 +1,203 @@ - - - - - -Plot 3D presentation - - - - - - - - - - - - - -

Plot 3D presentation

- -

Plot 3D is a presentation - of scalar values of meshes lying on a cutting plane. The relief and coloring - of the resulting presentation both correspond to the values applied to - the cells of the mesh.

- -

 

- -

To - create a Plot 3D presentation:

- -

 

- -

- Right-click on one - of the time stamps of the field in the Object browser and from the pop-up - menu choose Plot 3D, or

- -

- Click on one of the - time stamps of the field in the Object browser and select from the main - menu Visualization > Plot 3D, - or click icon in - the Visualization Toolbar.

- -

 

- -

- -

 

- -

Plot - 3D Definition tab allows you to set additional parameters of your - Plot 3D presentation:

- -

 

- -
    - -
  • Orientation - radio buttons allow to set the orientation of cut plane in 3D space. You - should select two of three axis (XY, YZ, or ZX) in which the plane will - be located in 3D space. If the mesh is 2D this functionality is disable, - as there exist only one plane for a Plot 3D.  

  • - -
  • Rotations - of the planes in 3d space around the axes of the selected orientation. - (The angle of rotation is set in degrees.)

  • - -
  • Position - - allows to select the position of the plane in the object (ranging from - 0 to 1). The value 0.5 corresponds to cutting by halves.

  • - -
  • Relative - check box allows to increase / decrease the value by decimal steps.  

  • - -
  • Scale - Factor - visualization - scaling of all vector values applied to the cells of the mesh.

  • - -
  • Presentation - type:

  • - -
  • Surface - - Plot 3D will be represented with a smooth surface.

  • - -
  • Contour - - Plot 3D will be represented with a set of contours

  • - -
  • Number - of contours - allows to define the number of contours (active when - Contour presentation type is selected).

  • - -
  • Preview - cutting plane checkbox allows to see the position of the cutting - plate in the Viewer while defining the presentation.

  • -
- -

 

- -

Scalar Bar - tab allows to define the parameters of the scalar bar displayed - with this presentation (see - also).

- -

 

- -

After you have finished with setting these - parameters, click OK. Your presentation -  will be - immediately displayed in the viewer:

- -

 

- -

- - - - + + + + + +Plot 3D presentation + + + + + + + + + + + + + +

Plot 3D presentation

+ +

Plot 3D is a presentation + of scalar values of meshes lying on a cutting plane. The relief and coloring + of the resulting presentation both correspond to the values applied to + the cells of the mesh.

+ +

 

+ +

To + create a Plot 3D presentation:

+ +

 

+ +

- Right-click on one + of the time stamps of the field in the Object browser and from the pop-up + menu choose Plot 3D, or

+ +

- Click on one of the + time stamps of the field in the Object browser and select from the main + menu Visualization > Plot 3D, + or click icon in + the Visualization Toolbar.

+ +

 

+ +

+ +

 

+ +

Plot + 3D Definition tab allows you to set additional parameters of your + Plot 3D presentation:

+ +

 

+ +
    + +
  • Orientation + radio buttons allow to set the orientation of cut plane in 3D space. You + should select two of three axis (XY, YZ, or ZX) in which the plane will + be located in 3D space. If the mesh is 2D this functionality is disable, + as there exist only one plane for a Plot 3D.  

  • + +
  • Rotations + of the planes in 3d space around the axes of the selected orientation. + (The angle of rotation is set in degrees.)

  • + +
  • Position + - allows to select the position of the plane in the object (ranging from + 0 to 1). The value 0.5 corresponds to cutting by halves.

  • + +
  • Relative + check box allows to increase / decrease the value by decimal steps.  

  • + +
  • Scale + Factor - visualization + scaling of all vector values applied to the cells of the mesh.

  • + +
  • Presentation + type:

  • + +
  • Surface + - Plot 3D will be represented with a smooth surface.

  • + +
  • Contour + - Plot 3D will be represented with a set of contours

  • + +
  • Number + of contours - allows to define the number of contours (active when + Contour presentation type is selected).

  • + +
  • Preview + cutting plane checkbox allows to see the position of the cutting + plate in the Viewer while defining the presentation.

  • +
+ +

 

+ +

Scalar Bar + tab allows to define the parameters of the scalar bar displayed + with this presentation (see + also).

+ +

 

+ +

After you have finished with setting these + parameters, click OK. Your presentation +  will be + immediately displayed in the viewer:

+ +

 

+ +

+ + + + diff --git a/doc/salome/gui/VISU/primitive_types.htm b/doc/salome/gui/VISU/primitive_types.htm index 0542809c..8e96da3a 100755 --- a/doc/salome/gui/VISU/primitive_types.htm +++ b/doc/salome/gui/VISU/primitive_types.htm @@ -1,225 +1,225 @@ - - - - - -Primitive Types - - - - - - - - - - - - - -

Primitive Types

- -

Gauss Point presentations - use primitives to visualize the value of the results obtained during calculations - so that the color and relative size of the points depend on each component - of a vector, tensor or matrix (e.g. scalar and module for vectors). Of - course, the size of primitives in the Viewer also depends on their location - within the 3D scene. At a given computed size, a primitive will be bigger - when it is close to the camera and smaller at a distance.  

- -

- -

There are three Basic primitive types which can be used in Gauss Points - presentations: Point Sprites, Open GL - Points and Geometrical Spheres.

- -

 

- -

Point Sprites

- -

 

- -

- -

 

- -

Each Point Sprite is visualised - in 3D Viewer with two 16*16 textures: Main - texture which defines the shape of the point sprite and Alpha - Channel Texture which defines the transparency of the point sprite. - By default Salome suggests textures defined in the Preferences, however - you can browse for other .bmp, .png or .jpg files to be used as textures. -

- -

Alpha Channel Threshold defines - the level of transparency ranging from 0 to 1.

- -

The default sizes of point sprites are computed by the system, therefore, - these parameters cannot be defined in the preferences, however, the Maximum Size of the point sprite is - limited (Clamp) so that the whole scene would remain visible if the user - applies a high zoom factor. Maximum Size - corresponds to the maximum size of a point sprite during rendering whatever - is the magnification of the point or the zoom of the view. Technically, - it corresponds to setting up a clamp in the vertex shader. The Size is - measured in pixels and belongs to the interval from 1 to 512.

- -

 

- -

OpenGL Points

- -

 

- -

 

- -

 

- -

OpenGL Points don't use any - files as textures, displaying results as simple OpenGL points, so the - only parameter relevant to them is the Maximum - Size.

- -

 

- -

Geometrical Spheres

- -

 

- -

- -

 

- -

Geometrical Spheres display results using a standard sphere with - a number of faces be defined thought a Resolution - parameter. By default the Resolution - is set to 8. This number corresponds to the Latitude and Longitude definitions - of a VTK sphere. The Number of Faces - parameter is equal to the total number of points in the scene when no - segmentation cursor is used or number of points within the cursor when - a segmentation is in progress, multiplied by the number of faces of one - Sphere in the current resolution. This value computed by the system using - the formula: NbrFaces = 2*Resolution x  [Resolution-2] - and displayed to the end-user for information purpose.

- -

in - the pictures you can see the spheres with Resolution - of 8  and - 6

- -

 

- -

Notify - when number of faces exceeds prompts the user by a dialog to continue - or to cancel the display operation if the number of faces is greater than - the number defined in the menu.

- -

 

- -

- -

 

- -

 

- -

 

- -

 

- -

 

- - - - + + + + + +Primitive Types + + + + + + + + + + + + + +

Primitive Types

+ +

Gauss Point presentations + use primitives to visualize the value of the results obtained during calculations + so that the color and relative size of the points depend on each component + of a vector, tensor or matrix (e.g. scalar and module for vectors). Of + course, the size of primitives in the Viewer also depends on their location + within the 3D scene. At a given computed size, a primitive will be bigger + when it is close to the camera and smaller at a distance.  

+ +

+ +

There are three Basic primitive types which can be used in Gauss Points + presentations: Point Sprites, Open GL + Points and Geometrical Spheres.

+ +

 

+ +

Point Sprites

+ +

 

+ +

+ +

 

+ +

Each Point Sprite is visualised + in 3D Viewer with two 16*16 textures: Main + texture which defines the shape of the point sprite and Alpha + Channel Texture which defines the transparency of the point sprite. + By default Salome suggests textures defined in the Preferences, however + you can browse for other .bmp, .png or .jpg files to be used as textures. +

+ +

Alpha Channel Threshold defines + the level of transparency ranging from 0 to 1.

+ +

The default sizes of point sprites are computed by the system, therefore, + these parameters cannot be defined in the preferences, however, the Maximum Size of the point sprite is + limited (Clamp) so that the whole scene would remain visible if the user + applies a high zoom factor. Maximum Size + corresponds to the maximum size of a point sprite during rendering whatever + is the magnification of the point or the zoom of the view. Technically, + it corresponds to setting up a clamp in the vertex shader. The Size is + measured in pixels and belongs to the interval from 1 to 512.

+ +

 

+ +

OpenGL Points

+ +

 

+ +

 

+ +

 

+ +

OpenGL Points don't use any + files as textures, displaying results as simple OpenGL points, so the + only parameter relevant to them is the Maximum + Size.

+ +

 

+ +

Geometrical Spheres

+ +

 

+ +

+ +

 

+ +

Geometrical Spheres display results using a standard sphere with + a number of faces be defined thought a Resolution + parameter. By default the Resolution + is set to 8. This number corresponds to the Latitude and Longitude definitions + of a VTK sphere. The Number of Faces + parameter is equal to the total number of points in the scene when no + segmentation cursor is used or number of points within the cursor when + a segmentation is in progress, multiplied by the number of faces of one + Sphere in the current resolution. This value computed by the system using + the formula: NbrFaces = 2*Resolution x  [Resolution-2] + and displayed to the end-user for information purpose.

+ +

in + the pictures you can see the spheres with Resolution + of 8  and + 6

+ +

 

+ +

Notify + when number of faces exceeds prompts the user by a dialog to continue + or to cancel the display operation if the number of faces is greater than + the number defined in the menu.

+ +

 

+ +

+ +

 

+ +

 

+ +

 

+ +

 

+ +

 

+ + + + diff --git a/doc/salome/gui/VISU/robohhre.lng b/doc/salome/gui/VISU/robohhre.lng index 297538b0..4837df05 100755 --- a/doc/salome/gui/VISU/robohhre.lng +++ b/doc/salome/gui/VISU/robohhre.lng @@ -1,101 +1,101 @@ -[GlossaryTab] -TabCaption=&Glossary -TermCaption=&Term -DefinitionCaption=&Definition For: - -[BrowseSequence] -PreCaption=Previous -PreTooltip=Previous Topic -NextCaption=Next -NextTooltip=Next Topic -BlockTooltip=Select Block - -[Common] -Contents=Contents -Index=Index -Search=Search -Glossary=Glossary -Logo/Author=Powered By -Show=Show -Hide=Hide -SyncToc=SyncToc -Prev=<< -Next=>> -Disabled Prev=<< -Disabled Next=>> -Seperate = | - -[WebHelp] -Cancel=Cancel -CantOpenURLorFile=Can't open URL or file -CompletingContents=Completing Contents... -Display=Display -Term=Term: -Definition=Definition: -Done=Done -Find=Find -IndexInputPrompt=Type in the keyword to find: -RelateTopicListPrompt=Click a topic, then click Display. -LoadingData=Loading data, please wait... -LoadingContents=Loading contents, please wait... -LoadingContentsData=Loading, click here to cancel... -LoadingFTS=Reading Search Data... -LoadingIndex=Loading Index... -LoadingTOCItem=Loading Table of Contents: -Searching=Searching... -FtsInputPrompt=Type in the word(s) to search for: -TopicsFound=Topics Found -BrowserLimitedMessage=Your browser does not support frames. We recommend that you update your browser to a version that supports frames. -SuggestViewNoFrameMessage=To view the Help system without frames click on this -SuggestViewNoFrameMsg2=hyperlink. -TopicsNotFound=No Topics Found. -CantSearch=Cannot search for that phrase. -JS_alert_appletNotLoad = Unable to load applet. If you are using an old version of Netscape, the prefs.js file needs to be edited. -JS_alert_colorlimitation=WebHelp has detected that your display is set to 16 colors. For full WebHelp support, please set your display to use 256 or more colors. -Blank_topic_text=This topic was created by WinHelp Project Conversion Wizard, and is the destination of a missing topic or broken hyperlink. -JS_alert_ProjectLoadingFail=Could not load correctly, please click Refresh. -JS_alert_cantLoadProject=Can't load project: -JS_alert_ErrorInLoading=Error in Loading navigation component. Please regenerate WebHelp. -IndexBtnText=Go -FtsBtnText=Go -ToolBarSearchBtnText=Go -InTopicSearchBtnText=Go -SearchLabel=Search -SearchPrompt=- Search - -PreTooltip=Previous Topic -NextTooltip=Next Topic -WebSearch=WebSearch -SyncTocTooltip=Sync TOC -Book=Book -Page=Page -Remote_Page=Remote Page -Show_Navigation_Component=Show Navigation Component -Hide_Navigation_Component=Hide Navigation Component -nls_edit_label=Type in your question: -nls_button_go_hint=Go Search -nls_button_go_text=Go -nls_body_instruction=Enter your question in the text box above, then click GO. -nls_body_empty=Sorry, we were unable to find a good answer for your question. -IndexSelectTopicTitle=Select a Topic -IndexSelectTopicLabel=Select a topic, then click Display -IndexSelectTopicError=Please select a topic. -IndexAlphabetBookmarks=ABCDEFGHIJKLMNOPQRSTUVWXYZ -MergeError1=The merged Help system -MergeError2=is using a different language from the master Help system, which will cause the index and full-text search functionality to be disabled in the merged Help system. -PoweredBy=Powered by -GeneratedBy=Generated by -Author=Author -About=About -Print=Print - -[PrintedDoc] -TableOfContents=Table Of Contents -TitlePage=Title Page -ChapterFileNamePrefix=Chapter_ -TitlePageFileName=Chapter__Title_Page.doc -CrossReferencePrefix=See -GlossaryHeadingStyleName=Glossary Heading -GlossaryTermStyleName=Glossary Term -GlossaryDefinitionStyleName=Glossary Definition -TitlePageTitleStyleName=Title Page Title -TocPageTitleStyleName=Table of Contents Page Title +[GlossaryTab] +TabCaption=&Glossary +TermCaption=&Term +DefinitionCaption=&Definition For: + +[BrowseSequence] +PreCaption=Previous +PreTooltip=Previous Topic +NextCaption=Next +NextTooltip=Next Topic +BlockTooltip=Select Block + +[Common] +Contents=Contents +Index=Index +Search=Search +Glossary=Glossary +Logo/Author=Powered By +Show=Show +Hide=Hide +SyncToc=SyncToc +Prev=<< +Next=>> +Disabled Prev=<< +Disabled Next=>> +Seperate = | + +[WebHelp] +Cancel=Cancel +CantOpenURLorFile=Can't open URL or file +CompletingContents=Completing Contents... +Display=Display +Term=Term: +Definition=Definition: +Done=Done +Find=Find +IndexInputPrompt=Type in the keyword to find: +RelateTopicListPrompt=Click a topic, then click Display. +LoadingData=Loading data, please wait... +LoadingContents=Loading contents, please wait... +LoadingContentsData=Loading, click here to cancel... +LoadingFTS=Reading Search Data... +LoadingIndex=Loading Index... +LoadingTOCItem=Loading Table of Contents: +Searching=Searching... +FtsInputPrompt=Type in the word(s) to search for: +TopicsFound=Topics Found +BrowserLimitedMessage=Your browser does not support frames. We recommend that you update your browser to a version that supports frames. +SuggestViewNoFrameMessage=To view the Help system without frames click on this +SuggestViewNoFrameMsg2=hyperlink. +TopicsNotFound=No Topics Found. +CantSearch=Cannot search for that phrase. +JS_alert_appletNotLoad = Unable to load applet. If you are using an old version of Netscape, the prefs.js file needs to be edited. +JS_alert_colorlimitation=WebHelp has detected that your display is set to 16 colors. For full WebHelp support, please set your display to use 256 or more colors. +Blank_topic_text=This topic was created by WinHelp Project Conversion Wizard, and is the destination of a missing topic or broken hyperlink. +JS_alert_ProjectLoadingFail=Could not load correctly, please click Refresh. +JS_alert_cantLoadProject=Can't load project: +JS_alert_ErrorInLoading=Error in Loading navigation component. Please regenerate WebHelp. +IndexBtnText=Go +FtsBtnText=Go +ToolBarSearchBtnText=Go +InTopicSearchBtnText=Go +SearchLabel=Search +SearchPrompt=- Search - +PreTooltip=Previous Topic +NextTooltip=Next Topic +WebSearch=WebSearch +SyncTocTooltip=Sync TOC +Book=Book +Page=Page +Remote_Page=Remote Page +Show_Navigation_Component=Show Navigation Component +Hide_Navigation_Component=Hide Navigation Component +nls_edit_label=Type in your question: +nls_button_go_hint=Go Search +nls_button_go_text=Go +nls_body_instruction=Enter your question in the text box above, then click GO. +nls_body_empty=Sorry, we were unable to find a good answer for your question. +IndexSelectTopicTitle=Select a Topic +IndexSelectTopicLabel=Select a topic, then click Display +IndexSelectTopicError=Please select a topic. +IndexAlphabetBookmarks=ABCDEFGHIJKLMNOPQRSTUVWXYZ +MergeError1=The merged Help system +MergeError2=is using a different language from the master Help system, which will cause the index and full-text search functionality to be disabled in the merged Help system. +PoweredBy=Powered by +GeneratedBy=Generated by +Author=Author +About=About +Print=Print + +[PrintedDoc] +TableOfContents=Table Of Contents +TitlePage=Title Page +ChapterFileNamePrefix=Chapter_ +TitlePageFileName=Chapter__Title_Page.doc +CrossReferencePrefix=See +GlossaryHeadingStyleName=Glossary Heading +GlossaryTermStyleName=Glossary Term +GlossaryDefinitionStyleName=Glossary Definition +TitlePageTitleStyleName=Title Page Title +TocPageTitleStyleName=Table of Contents Page Title diff --git a/doc/salome/gui/VISU/scalar_bar.htm b/doc/salome/gui/VISU/scalar_bar.htm index 7565b139..23ba4d48 100755 --- a/doc/salome/gui/VISU/scalar_bar.htm +++ b/doc/salome/gui/VISU/scalar_bar.htm @@ -1,235 +1,235 @@ - - - - - -Scalar Bar - - - - - - - - - - - - - -

Scalar Bar

- -

Gauss Points Presentations - presume that two different scalar bars are displayed simultaneously:

- -

The Global scale corresponds to the minimum and maximum values founded - for the variable at all time stamps (located on the left side). When active, - the second is displayed in grey and disabled. The Local scale defines - the minimum and maximum values at the current time stamp for the variable - (located on the right side). When the Local scale is active, the Global - scale shows its limits 2 black lines.

- -

 

- -

The dialog allows user to define the characteristics of the scalar bars - displayed within the scene.

- -

 

- -

- -

 

- -
    - -
  • Active bar

  • - -
  • Local: - when selected, the Local bar will - be active and colors used for rendering of the results will be taken from - this bar. If displayed, the Global - bar will be displayed in grey and 2 markers will define the limits of - the local min/max range.

  • - -
  • Global: - when selected, the Global bar - will be active and colors used for rendering of the results will be taken - from this bar (i.e.: not all colors may be used to display results at - a given time stamp). Local bar - will be displayed in grey  and - inactive.

  • - -
  • Displayed: - when checked, the Global bar is - displayed, else it is not seen. This control is systematically checked - and disabled when the Global bar - is defined as active.

  • - -
  • Scalar range

  • - -
  • Scalar - Mode: this feature allows refining - the value to be inspected:

  • - -
  • Modulus: value - of a scalar or modulus of a vector.

  • - -
  • Component N: Nth - component of a vector, a tensor or a matrix.

  • - -
  • Colors and labels

  • - -
  • Bicolor: - only 2 colors are used for the active - bar:

  • - -
  • Red - for positive values

  • - -
  • Blue for negative values

  • -
- -

These colors also correspond - to the colors associated to min/max values of the palette option.

- -
    - -
  • Rainbow: - A palette of several colors will be used to render the results. A regular - and linear progression is considered from min to max.

  • - -
  • Nb. - of colors: defines the number of color to design the palette (up - to 256 colors can be used).

  • - -
  • Nb. - of labels: defines the number of labels to be written in the bar - as text markers.

  • - -
  • Orientation - allows to choose between Vertical - and Horizontal - orientation.

  • - -
  • Origin - - allows to define placement and lookout - of Scalar Bars

  • - -
  • X: - abscissa of the point of origin (from - the left side)

  • - -
  • Y: - ordinate of the origin of the bar (from - the bottom)

  • - -
  • Dimensions - - allows to define Width and Height - of each bar.

  • - -
  • Spacing - -  space - between the bars (only if both are displayed).

  • - -
  • Text - properties: allows to define properties - of font and text associated to the active bar.

  • - -
  • Save - as default values - allows to save - the parameters defined by the user as default.

  • -
- -

 

- - - - + + + + + +Scalar Bar + + + + + + + + + + + + + +

Scalar Bar

+ +

Gauss Points Presentations + presume that two different scalar bars are displayed simultaneously:

+ +

The Global scale corresponds to the minimum and maximum values founded + for the variable at all time stamps (located on the left side). When active, + the second is displayed in grey and disabled. The Local scale defines + the minimum and maximum values at the current time stamp for the variable + (located on the right side). When the Local scale is active, the Global + scale shows its limits 2 black lines.

+ +

 

+ +

The dialog allows user to define the characteristics of the scalar bars + displayed within the scene.

+ +

 

+ +

+ +

 

+ +
    + +
  • Active bar

  • + +
  • Local: + when selected, the Local bar will + be active and colors used for rendering of the results will be taken from + this bar. If displayed, the Global + bar will be displayed in grey and 2 markers will define the limits of + the local min/max range.

  • + +
  • Global: + when selected, the Global bar + will be active and colors used for rendering of the results will be taken + from this bar (i.e.: not all colors may be used to display results at + a given time stamp). Local bar + will be displayed in grey  and + inactive.

  • + +
  • Displayed: + when checked, the Global bar is + displayed, else it is not seen. This control is systematically checked + and disabled when the Global bar + is defined as active.

  • + +
  • Scalar range

  • + +
  • Scalar + Mode: this feature allows refining + the value to be inspected:

  • + +
  • Modulus: value + of a scalar or modulus of a vector.

  • + +
  • Component N: Nth + component of a vector, a tensor or a matrix.

  • + +
  • Colors and labels

  • + +
  • Bicolor: + only 2 colors are used for the active + bar:

  • + +
  • Red + for positive values

  • + +
  • Blue for negative values

  • +
+ +

These colors also correspond + to the colors associated to min/max values of the palette option.

+ +
    + +
  • Rainbow: + A palette of several colors will be used to render the results. A regular + and linear progression is considered from min to max.

  • + +
  • Nb. + of colors: defines the number of color to design the palette (up + to 256 colors can be used).

  • + +
  • Nb. + of labels: defines the number of labels to be written in the bar + as text markers.

  • + +
  • Orientation - allows to choose between Vertical + and Horizontal + orientation.

  • + +
  • Origin + - allows to define placement and lookout + of Scalar Bars

  • + +
  • X: + abscissa of the point of origin (from + the left side)

  • + +
  • Y: + ordinate of the origin of the bar (from + the bottom)

  • + +
  • Dimensions + - allows to define Width and Height + of each bar.

  • + +
  • Spacing + -  space + between the bars (only if both are displayed).

  • + +
  • Text + properties: allows to define properties + of font and text associated to the active bar.

  • + +
  • Save + as default values - allows to save + the parameters defined by the user as default.

  • +
+ +

 

+ + + + diff --git a/doc/salome/gui/VISU/scalar_map_on_deformed_shape_presentation.htm b/doc/salome/gui/VISU/scalar_map_on_deformed_shape_presentation.htm index e7e39eaf..45975617 100755 --- a/doc/salome/gui/VISU/scalar_map_on_deformed_shape_presentation.htm +++ b/doc/salome/gui/VISU/scalar_map_on_deformed_shape_presentation.htm @@ -1,191 +1,191 @@ - - - - - -Scalar Map on Deformed Shape presentation - - - - - - - - - - - - - -

Scalar Map on Deformed Shape presentation

- -

Scalar Map on Deformed - Shape presentation is a mix of the two: Scalar Map and Deformed - Shape. In this presentation the Scalar Map is built on a Deformed - Shape.

- -

 

- -

To - create a Scalar Map on Deformed Shape presentation:

- -

 

- -

- Right-click on one - of the time stamps of the field in the Object browser and from the pop-up - menu choose Scalar Map on Deformed Shape, - or

- -

- Click on one of the - time stamps of the field in the Object browser and select from the main - menu Visualization > Scalar Map on - Deformed Shape, or click icon - in the Visualization Toolbar.

- -

 

- -

- -

 

- -

Scalar - Map on Deformed Shape tab allows you to set additional parameters - of your Scalar Map on Deformed Shape presentation:

- -

 

- -
    - -
  • Scale - Factor: visualization scaling of all vector values applied to the - cells of the mesh.

  • - -
  • Fields: - allows to choose type of fields on which the presentation will be built. -

  • - -
  • Time - Stamp:  allows - to choose the time stamp on which the presentation will be built.

  • -
- -

  

- -

Scalar Bar - tab allows to define the parameters of the scalar bar displayed - with this presentation (see - also).

- -

 

- -

After you have finished with setting these - parameters, click OK. Your presentation - will be immediately displayed in the viewer.

- -

 

- -

Compare ordinary Scalar Map presentation

- -

with Scalar Map on Deformed Shape presentation -

- -

 

- -

 

- -

 

- -

 

- -

 

- - - - + + + + + +Scalar Map on Deformed Shape presentation + + + + + + + + + + + + + +

Scalar Map on Deformed Shape presentation

+ +

Scalar Map on Deformed + Shape presentation is a mix of the two: Scalar Map and Deformed + Shape. In this presentation the Scalar Map is built on a Deformed + Shape.

+ +

 

+ +

To + create a Scalar Map on Deformed Shape presentation:

+ +

 

+ +

- Right-click on one + of the time stamps of the field in the Object browser and from the pop-up + menu choose Scalar Map on Deformed Shape, + or

+ +

- Click on one of the + time stamps of the field in the Object browser and select from the main + menu Visualization > Scalar Map on + Deformed Shape, or click icon + in the Visualization Toolbar.

+ +

 

+ +

+ +

 

+ +

Scalar + Map on Deformed Shape tab allows you to set additional parameters + of your Scalar Map on Deformed Shape presentation:

+ +

 

+ +
    + +
  • Scale + Factor: visualization scaling of all vector values applied to the + cells of the mesh.

  • + +
  • Fields: + allows to choose type of fields on which the presentation will be built. +

  • + +
  • Time + Stamp:  allows + to choose the time stamp on which the presentation will be built.

  • +
+ +

  

+ +

Scalar Bar + tab allows to define the parameters of the scalar bar displayed + with this presentation (see + also).

+ +

 

+ +

After you have finished with setting these + parameters, click OK. Your presentation + will be immediately displayed in the viewer.

+ +

 

+ +

Compare ordinary Scalar Map presentation

+ +

with Scalar Map on Deformed Shape presentation +

+ +

 

+ +

 

+ +

 

+ +

 

+ +

 

+ + + + diff --git a/doc/salome/gui/VISU/segmentation.htm b/doc/salome/gui/VISU/segmentation.htm index eeb779cb..71eb21a6 100755 --- a/doc/salome/gui/VISU/segmentation.htm +++ b/doc/salome/gui/VISU/segmentation.htm @@ -1,220 +1,220 @@ - - - - - -Segmentation - - - - - - - - - - - - -

Segmentation

- -

Segmentation is - a functionality similar to Clipping - in Mesh and Geom - modules.

- -

Segmentation can be activated - by clicking (Plane Segmentation) - or (Sphere Segmentation) - button in the Gauss Viewer toolbar.

- -

Once the command is activated, a new window, below the main 3D view - is created to display the content of the segmentation cursor. A dialog - box is also displayed to manually configure the segmentation cursor parameters.

- -

The Main view (top) shows the - results at Gauss points with scalar bars. A semi-transparent Segmentation - Cursor defines the part of the variables to be inspected.  Two - different presentations for Gauss points are used, depending on location - of the points: Inside or Outside the segmentation cursor.

- -

The Secondary view (bottom) - is also called Segmentation Viewer. - It shows, in real time, the results at Gauss points only (no mesh elements) - that are located inside the segmentation cursor. Gauss points are displayed - in the same way as Inside points - in the first view. This view is automatically updated when the cursor - is changed in the first view.

- -

Gauss Points tab of the Segmentation - menu allows to define visualization parameters for Inside and Outside - cursor Gauss Points.  See - Primitives - and Presentations - to learn about parameters definable in this tab.

- -

 

- -

- -

 

- -

Plane segmentation  is - characteristic for its Segmentation Cursor in the form of a box with an - axis to define its orientation and two planes defining its upper and lower - boundaries.

- -

It can be defined in Segmentation Cursor tab, which allows to define - coordinates of origin, direction and depth of the segmentation plane. -

- -

 

- -

- -

 

- -

- -

 

- -

Actually it is also possible to edit these parameters directly with - the mouse in the main 3D view :

- -

• Translation (dragging) of the lower plane along the V axis changes - the Origin of the cursor

- -

• Rotating the V axis around its origin defines a new Direction - for the cursor

- -

• Dragging the upper plane along its axis changes the Depth - of the cursor. It is not possible to move the lower above the upper plane - (minimum depth is 0).

- -

 

- -

- -

 

- -

Sphere segmentation  is - characteristic for its Segmentation Cursor in the form of a sphere with - an axis to define its orientation.

- -

It can be defined in Segmentation Cursor tab, which allows to define - coordinates of origin, and radius of the segmentation plane.

- -

 

- -

- -

 

- -

- -

 

- -

The Origin can also be changed - in the 3D Viewer by dragging the Sphere with the mouse .

- -

 

- -

When the user exits the Segmentation - menu, the function is ended and the second view (segmentation cursor viewer) - is erased.

- -

 

- -

 

- -

 

- -

 

- -

  

- -

 

- -

 

- -

 

- - - - + + + + + +Segmentation + + + + + + + + + + + + +

Segmentation

+ +

Segmentation is + a functionality similar to Clipping + in Mesh and Geom + modules.

+ +

Segmentation can be activated + by clicking (Plane Segmentation) + or (Sphere Segmentation) + button in the Gauss Viewer toolbar.

+ +

Once the command is activated, a new window, below the main 3D view + is created to display the content of the segmentation cursor. A dialog + box is also displayed to manually configure the segmentation cursor parameters.

+ +

The Main view (top) shows the + results at Gauss points with scalar bars. A semi-transparent Segmentation + Cursor defines the part of the variables to be inspected.  Two + different presentations for Gauss points are used, depending on location + of the points: Inside or Outside the segmentation cursor.

+ +

The Secondary view (bottom) + is also called Segmentation Viewer. + It shows, in real time, the results at Gauss points only (no mesh elements) + that are located inside the segmentation cursor. Gauss points are displayed + in the same way as Inside points + in the first view. This view is automatically updated when the cursor + is changed in the first view.

+ +

Gauss Points tab of the Segmentation + menu allows to define visualization parameters for Inside and Outside + cursor Gauss Points.  See + Primitives + and Presentations + to learn about parameters definable in this tab.

+ +

 

+ +

+ +

 

+ +

Plane segmentation  is + characteristic for its Segmentation Cursor in the form of a box with an + axis to define its orientation and two planes defining its upper and lower + boundaries.

+ +

It can be defined in Segmentation Cursor tab, which allows to define + coordinates of origin, direction and depth of the segmentation plane. +

+ +

 

+ +

+ +

 

+ +

+ +

 

+ +

Actually it is also possible to edit these parameters directly with + the mouse in the main 3D view :

+ +

• Translation (dragging) of the lower plane along the V axis changes + the Origin of the cursor

+ +

• Rotating the V axis around its origin defines a new Direction + for the cursor

+ +

• Dragging the upper plane along its axis changes the Depth + of the cursor. It is not possible to move the lower above the upper plane + (minimum depth is 0).

+ +

 

+ +

+ +

 

+ +

Sphere segmentation  is + characteristic for its Segmentation Cursor in the form of a sphere with + an axis to define its orientation.

+ +

It can be defined in Segmentation Cursor tab, which allows to define + coordinates of origin, and radius of the segmentation plane.

+ +

 

+ +

+ +

 

+ +

+ +

 

+ +

The Origin can also be changed + in the 3D Viewer by dragging the Sphere with the mouse .

+ +

 

+ +

When the user exits the Segmentation + menu, the function is ended and the second view (segmentation cursor viewer) + is erased.

+ +

 

+ +

 

+ +

 

+ +

 

+ +

  

+ +

 

+ +

 

+ +

 

+ + + + diff --git a/doc/salome/gui/VISU/types_of_gauss_points_presentations.htm b/doc/salome/gui/VISU/types_of_gauss_points_presentations.htm index 39e439be..43b186f5 100755 --- a/doc/salome/gui/VISU/types_of_gauss_points_presentations.htm +++ b/doc/salome/gui/VISU/types_of_gauss_points_presentations.htm @@ -1,221 +1,221 @@ - - - - - -Types of Gauss Points Presentations - - - - - - - - - - - - - -

Types of Gauss Points Presentations

- -

There exist three - different types of Gauss Points Presentations: Results - at Gauss Points,  Gauss - Points on Geometry and Gauss Points - on Deformed Shape. They all can be accessed from the same menu.

- -

 

- -

Results at Gauss Points

- -

 

- -

- -

 

- -

To create a Results at Gauss Points - presentation, select Results radio - button. This presentation gives most information as the points here vary - in color and size depending on the value.

- -

As for the size, the minimum and maximum Range - values for the rendering can be defined in the configuration dialog. - These values are multiplied by a reference length (representative of the - average size of cells of the mesh) to define the range for minimum and - maximum size of a point during rendering (at magnification = 100%). Default - values are:

- -
    - -
  • For the Rainbow - scale: min = 10%, max = 33%

  • - -
  • Min. size will be associated - to the smallest real value (included negative values) among the results.

  • - -
  • Max size will be associated - to the largest real values among the results.

  • - -
  • For the bicolor scale: - min = 0 (not editable), max = 33%

  • - -
  • Null size will be associated - to the 0 scalar value of a result.

  • - -
  • Max size will be associated - to the largest absolute values of results

  • -
- -

Both values are dynamically updated by the system according to the selected - scalar bar. In the case of a Bicolor - scale, the minimum value is set to 0 in the dialog and the control is - disabled.

- -

Magnification (%) corresponds - to the change of size of results at Gauss point primitives in 2D space. - Acceptable values range from 0 to N; 100% means no magnification, 50% - means half of its size, 200% mean twice its size and so forth. By default - this value is set to 100%.

- -

+/- Ratio corresponds to the - number by which the magnification will be respectively multiplied or divided - at edition, ranging from 0.01 to 10. By default this value is set to 2.

- -

During rendering of the scene, it is possible to modify the magnification - (multiply/divide by the magnification ratio) by using ‘M’ and ‘m’ keys - of the keyboard when the 3D view is active. The effect is applied immediately. - The ratio is only defined through the dialog box.

- -

 

- -

 

- -

Gauss Points on Geometry

- -

 

- -

- -

 

- -

To create a Geometry presentation, - select the respective - radio button. This presentation shows only geometrical position - of Gauss Points as their size and color are fixed (because the results - are not computed).

- -

Size defines a value that will - be multiplied by a reference length (representative of the average size - of cells of the mesh) to define the size of points during rendering (at - magnification = 100%). Default values 10%.

- -

Magnification and Ratio - have the same meaning as for Results at Gauss points presentation.

- -

Color allows to define the unique - color for Gauss Points in a  standard - color configuration dialog.

- -

 

- -

Gauss Points on Deformed Shape

- -

 

- -

- -

 

- -

To create a Deformed Shape presentation, - select the respective - radio button. This presentation is analog to Results - at Gauss Points except that the shape on which the points are located - is deformed using the Scale Factor - and the Gauss Points are processed only after that.

- - - - + + + + + +Types of Gauss Points Presentations + + + + + + + + + + + + + +

Types of Gauss Points Presentations

+ +

There exist three + different types of Gauss Points Presentations: Results + at Gauss Points,  Gauss + Points on Geometry and Gauss Points + on Deformed Shape. They all can be accessed from the same menu.

+ +

 

+ +

Results at Gauss Points

+ +

 

+ +

+ +

 

+ +

To create a Results at Gauss Points + presentation, select Results radio + button. This presentation gives most information as the points here vary + in color and size depending on the value.

+ +

As for the size, the minimum and maximum Range + values for the rendering can be defined in the configuration dialog. + These values are multiplied by a reference length (representative of the + average size of cells of the mesh) to define the range for minimum and + maximum size of a point during rendering (at magnification = 100%). Default + values are:

+ +
    + +
  • For the Rainbow + scale: min = 10%, max = 33%

  • + +
  • Min. size will be associated + to the smallest real value (included negative values) among the results.

  • + +
  • Max size will be associated + to the largest real values among the results.

  • + +
  • For the bicolor scale: + min = 0 (not editable), max = 33%

  • + +
  • Null size will be associated + to the 0 scalar value of a result.

  • + +
  • Max size will be associated + to the largest absolute values of results

  • +
+ +

Both values are dynamically updated by the system according to the selected + scalar bar. In the case of a Bicolor + scale, the minimum value is set to 0 in the dialog and the control is + disabled.

+ +

Magnification (%) corresponds + to the change of size of results at Gauss point primitives in 2D space. + Acceptable values range from 0 to N; 100% means no magnification, 50% + means half of its size, 200% mean twice its size and so forth. By default + this value is set to 100%.

+ +

+/- Ratio corresponds to the + number by which the magnification will be respectively multiplied or divided + at edition, ranging from 0.01 to 10. By default this value is set to 2.

+ +

During rendering of the scene, it is possible to modify the magnification + (multiply/divide by the magnification ratio) by using ‘M’ and ‘m’ keys + of the keyboard when the 3D view is active. The effect is applied immediately. + The ratio is only defined through the dialog box.

+ +

 

+ +

 

+ +

Gauss Points on Geometry

+ +

 

+ +

+ +

 

+ +

To create a Geometry presentation, + select the respective + radio button. This presentation shows only geometrical position + of Gauss Points as their size and color are fixed (because the results + are not computed).

+ +

Size defines a value that will + be multiplied by a reference length (representative of the average size + of cells of the mesh) to define the size of points during rendering (at + magnification = 100%). Default values 10%.

+ +

Magnification and Ratio + have the same meaning as for Results at Gauss points presentation.

+ +

Color allows to define the unique + color for Gauss Points in a  standard + color configuration dialog.

+ +

 

+ +

Gauss Points on Deformed Shape

+ +

 

+ +

+ +

 

+ +

To create a Deformed Shape presentation, + select the respective + radio button. This presentation is analog to Results + at Gauss Points except that the shape on which the points are located + is deformed using the Scale Factor + and the Gauss Points are processed only after that.

+ + + + diff --git a/doc/salome/gui/VISU/visu.log b/doc/salome/gui/VISU/visu.log index 5a257986..6ad71319 100755 --- a/doc/salome/gui/VISU/visu.log +++ b/doc/salome/gui/VISU/visu.log @@ -1,395 +1,400 @@ -|SourceProjectName:VISU.hpr -|DestinationProjectName:index.htm -whhost.js -whmsg.js -whmozemu.js -whproxy.js -whstub.js -whutils.js -whver.js -whform.js -whphost.js -whstart.js -whtopic.js -whframes.js -whlang.js -whskin_info.htm -whskin_blank.htm -whskin_pickup.htm -whskin_homepage.htm -whskin_tw.htm -whnjs.htm -whthost.js -whtdhtml.htm -whihost.js -whibody.htm -whiform.htm -whfhost.js -whfbody.htm -whfform.htm -whghost.js -whgbody.htm -whgdhtml.htm -whgdef.htm -whproj.js -whproj.xml -whproj.htm -whxdata\whtoc.xml -whxdata\whidx.xml -whxdata\whfts.xml -whxdata\whglo.xml -whdata\whtoc.js -whdata\whtoc.htm -whdata\whtdata.js -whdata\whidx.js -whdata\whidx.htm -whdata\whidata.js -whdata\whfts.js -whdata\whfts.htm -whdata\whglo.js -whdata\whglo.htm -whdata\whgdata.js -whdata\whftdata.js -whdata\whfwdata.js -whres.xml -webhelp.jar -webhelp.cab -whgdata\whnvp30.htm -whgdata\whnvp31.htm -whgdata\whnvp32.htm -whgdata\whnvp33.htm -whgdata\whnvt30.htm -whgdata\whnvt31.htm -whgdata\whnvt32.htm -whgdata\whnvt33.htm -whgdata\whnvf30.htm -whgdata\whnvf31.htm -whgdata\whnvf32.htm -whgdata\whnvf33.htm -whgdata\whnvl31.htm -whgdata\whnvl32.htm -whgdata\whnvl33.htm -whgdata\whexpbar.gif -cshdat_webhelp.htm -whcsh_home.htm -whcshdata.htm -cshdat_robohelp.htm -whd_topic.xml -whd_nvp10.htm -whd_nvp20.htm -whd_tabs.htm -whd_dpns.htm -whd_tab0.gif -whd_tab1.gif -whd_tab2.gif -whd_tab3.gif -whd_tab4.gif -whd_tab5.gif -whd_tab6.gif -whd_tab7.gif -whd_tab8.gif -whd_toc1.gif -whd_toc2.gif -whd_toc3.gif -whd_toc4.gif -whd_show0.gif -whd_show1.gif -whd_show2.gif -whd_hide0.gif -whd_hide1.gif -whd_hide2.gif -whd_sync0.gif -whd_sync1.gif -whd_sync2.gif -whd_prev0.gif -whd_prev1.gif -whd_prev2.gif -whd_next0.gif -whd_next1.gif -whd_next2.gif -whd_wbsh0.gif -whd_wbsh1.gif -whd_wbsh2.gif -whidhtml.htm -whfdhtml.htm -index_hha.hhk -index.hhc -index.hhk -animation_in_gauss_viewer.htm -clipping.htm -creating_tables.htm -files\about_structure_of_med_object.htm -files\about_tables.htm -files\animating_presentations.htm -files\changing_visualization_parameters_of_the_presenetation.htm -files\creating_curves.htm -files\creating_field_presentations.htm -files\creating_presentations.htm -files\creating_xy_plot.htm -files\cut_lines_presentation.htm -files\cut_lines_resentation.htm -files\deformed_shape_presentation.htm -files\displaying_hiding_presentations.htm -files\displaying_tables.htm -files\getting_elements_attributes.htm -files\getting_started.htm -files\importing_med_objects.htm -files\importing_tables.htm -files\insideframe.htm -files\introduction.htm -files\iso_surfaces_presentation.htm -files\points.htm -files\running_visu.htm -files\scalar_map_presentation.htm -files\scaling_presentations.htm -files\setting_properties_of_xy_plots.htm -files\shrink.htm -files\stream_lines_presentation.htm -files\surface.htm -files\surfaceframe.htm -files\sweeping.htm -files\vectors_presentation.htm -files\wireframe.htm -gauss_points_presentation.htm -gauss_viewer.htm -navigation_with_keyboard_and_spacemouse.htm -picking.htm -plot2d_viewer.htm -plot_3d_presentation.htm -primitive_types.htm -scalar_bar.htm -scalar_map_on_deformed_shape_presentation.htm -segmentation.htm -types_of_gauss_points_presentations.htm -vtk_3d_viewer.htm -ehelp.xml -robohhre.lng -texture_horiz_ltbluebubbles.jpg -index.glo -default.css -pics\image51.gif -pics\smds-example.png -pics\image84.gif -pics\cutlinesprsnt.png -pics\smds1.png -image31.jpg -pics\isosurfaces.png -image20.jpg -tip1.gif -pics\scalarmapicon.jpg -pics\image74.gif -pics\image52.gif -pics\image30.gif -pics\arrangeactors1.png -pics\image96.gif -pics\cutplpresent.png -image40.gif -note1.gif -pics\wireframe.jpg -pics\visuicon.jpg -pics\image53.gif -pics\image97.gif -image41.gif -pics\plot3d.png -image30.gif -image33.jpg -pics\image54.gif -image20.gif -pics\image98.gif -pics\image87.gif -image34.jpg -image31.gif -pics\streamlines.png -bgbaby.gif -q_blue.jpg -pics\cellsel.jpg -pics\isosurf.jpg -pics\image55.gif -pics\plot3d-example.png -pics\image99.gif -image43.gif -image10.gif -pics\image88.gif -pics\warning.png -pics\importtablefromfile.png -pics\surface.jpg -image11.gif -pics\image89.gif -image44.gif -pics\buildprogress.png -pics\animation.png -pics\fitdatarange.png -image22.gif -pics\begining.jpg -pics\image46.gif -image23.gif -image1.jpg -image12.gif -image37.jpg -image34.gif -pics\cutplanes.png -pics\cutlinesicon.jpg -pics\image69.gif -pics\image47.gif -image2.jpg -pics\smds-example1.png -image13.gif -pics\image100.gif -pics\streamlinesprsnt.png -pics\image20.png -image38.jpg -image35.gif -pics\clipping1.png -pics\scalarrangesn.png -pics\streamlinesicon.jpg -pics\defshapeicon.jpg -pics\image48.gif -image3.jpg -image47.gif -image14.gif -pics\image21.png -pics\recording.png -pics\clipping2.png -more.jpg -pics\speed.jpg -pics\next.jpg -pics\run.jpg -pics\image49.gif -image26.gif -image4.jpg -image1.gif -pics\viewsettings.png -image48.gif -pics\image102.gif -pics\gpp2.png -pics\textproperty.png -image15.gif -pics\previous.jpg -image5.jpg -pics\image39.gif -pics\image103.gif -image38.gif -pics\gpp3.png -pics\dumpviewtofile.png -image27.gif -pics\rename.png -pics\deformedshape.png -image16.gif -image19.jpg -pics\blue_up.jpg -pics\blue_left.jpg -image3.gif -image39.gif -image17.gif -pics\vectorsprsnt.png -pics\image104.gif -pics\vectorfield.png -pics\points.jpg -image18.gif -pics\image90.gif -pics\image105.gif -pics\recordingsaveas.png -image29.gif -pics\dataonelements1.png -pics\snapfgf.png -pics\visufullscreen.png -pics\editplot2dpresentation.png -pics\cutlines.png -pics\importfromfile.png -pics\image117.gif -pics\blue_right.jpg -pics\arrangeactors.png -pics\graduatedaxes1.png -pics\image91.gif -image5.gif -image19.gif -pics\translatepres.png -pics\iso.png -pics\planes.png -pics\gpp6.png -pics\dataonelements2.png -pics\animatdef.jpg -pics\end.jpg -pics\blue_down.jpg -pics\neo-transparency.png -pics\image81.gif -image6.gif -pics\picking.png -pics\dataonelements3.png -pics\scalarbarproperties.png -pics\cutlinesicn.jpg -pics\image82.gif -image7.gif -pics\spheroid.png -pics\viewtable.png -pics\vecticon.jpg -pics\shrink.jpg -i_blue.jpg -pics\createcurves.png -pics\image50.gif -pics\image83.gif -pics\image109.gif -image8.gif -pics\setupanimation.png -pics\exporttable.png -pics\deformedshapesn.png -ehlpdhtm.js -index.ppf -ss_btn_related_topics.gif -default_ns.css -whxdata\whtdata0.xml -whxdata\whftdata0.xml -whxdata\whfwdata0.xml -whxdata\whgdata0.xml -whdata\whtdata0.htm -whdata\whftdata0.htm -whdata\whfwdata0.htm -whdata\whgdata0.htm -whgdata\whlstt0.htm -whgdata\whlstt1.htm -whgdata\whlstt2.htm -whgdata\whlstt3.htm -whgdata\whlstt4.htm -whgdata\whlstt5.htm -whgdata\whlstt6.htm -whgdata\whlstt7.htm -whgdata\whlsti0.htm -whgdata\whlstfl0.htm -whgdata\whlstfl1.htm -whgdata\whlstfl2.htm -whgdata\whlstfl3.htm -whgdata\whlstfl4.htm -whgdata\whlstfl5.htm -whgdata\whlstfl6.htm -whgdata\whlstfl7.htm -whgdata\whlstfl8.htm -whgdata\whlstfl9.htm -whgdata\whlstfl10.htm -whgdata\whlstfl11.htm -whgdata\whlstfl12.htm -whgdata\whlstfl13.htm -whgdata\whlstfl14.htm -whgdata\whlstfl15.htm -whgdata\whlstfl16.htm -whgdata\whlstfl17.htm -whgdata\whlstfl18.htm -whgdata\whlstfl19.htm -whgdata\whlstfl20.htm -whgdata\whlstfl21.htm -whgdata\whlstfl22.htm -whgdata\whlstfl23.htm -whgdata\whlstfl24.htm -whgdata\whlstf0.htm -whgdata\whlstf1.htm -whgdata\whlstf2.htm -whgdata\whlstf3.htm -whgdata\whlstf4.htm -whgdata\whlstf5.htm -whgdata\whlstf6.htm -whgdata\whlstf7.htm -whgdata\whlstf8.htm -whgdata\whlstf9.htm -whgdata\whlstg0.htm -index.htm -index_csh.htm -index_rhc.htm +|SourceProjectName:VISU.hpr +|DestinationProjectName:index.htm +whhost.js +whmsg.js +whmozemu.js +whproxy.js +whstub.js +whutils.js +whver.js +whform.js +whphost.js +whstart.js +whtopic.js +whframes.js +whlang.js +whskin_info.htm +whskin_blank.htm +whskin_pickup.htm +whskin_homepage.htm +whskin_tw.htm +whnjs.htm +whthost.js +whtdhtml.htm +whihost.js +whibody.htm +whiform.htm +whfhost.js +whfbody.htm +whfform.htm +whghost.js +whgbody.htm +whgdhtml.htm +whgdef.htm +whproj.js +whproj.xml +whproj.htm +whxdata\whtoc.xml +whxdata\whidx.xml +whxdata\whfts.xml +whxdata\whglo.xml +whdata\whtoc.js +whdata\whtoc.htm +whdata\whtdata.js +whdata\whidx.js +whdata\whidx.htm +whdata\whidata.js +whdata\whfts.js +whdata\whfts.htm +whdata\whglo.js +whdata\whglo.htm +whdata\whgdata.js +whdata\whftdata.js +whdata\whfwdata.js +whres.xml +webhelp.jar +webhelp.cab +whgdata\whnvp30.htm +whgdata\whnvp31.htm +whgdata\whnvp32.htm +whgdata\whnvp33.htm +whgdata\whnvt30.htm +whgdata\whnvt31.htm +whgdata\whnvt32.htm +whgdata\whnvt33.htm +whgdata\whnvf30.htm +whgdata\whnvf31.htm +whgdata\whnvf32.htm +whgdata\whnvf33.htm +whgdata\whnvl31.htm +whgdata\whnvl32.htm +whgdata\whnvl33.htm +whgdata\whexpbar.gif +cshdat_webhelp.htm +whcsh_home.htm +whcshdata.htm +cshdat_robohelp.htm +whd_topic.xml +whd_nvp10.htm +whd_nvp20.htm +whd_tabs.htm +whd_dpns.htm +whd_tab0.gif +whd_tab1.gif +whd_tab2.gif +whd_tab3.gif +whd_tab4.gif +whd_tab5.gif +whd_tab6.gif +whd_tab7.gif +whd_tab8.gif +whd_toc1.gif +whd_toc2.gif +whd_toc3.gif +whd_toc4.gif +whd_show0.gif +whd_show1.gif +whd_show2.gif +whd_hide0.gif +whd_hide1.gif +whd_hide2.gif +whd_sync0.gif +whd_sync1.gif +whd_sync2.gif +whd_prev0.gif +whd_prev1.gif +whd_prev2.gif +whd_next0.gif +whd_next1.gif +whd_next2.gif +whd_wbsh0.gif +whd_wbsh1.gif +whd_wbsh2.gif +whidhtml.htm +whfdhtml.htm +index_hha.hhk +index.hhc +index.hhk +animation_in_gauss_viewer.htm +clipping.htm +creating_tables.htm +files\about_structure_of_med_object.htm +files\about_tables.htm +files\animating_presentations.htm +files\changing_visualization_parameters_of_the_presenetation.htm +files\creating_curves.htm +files\creating_field_presentations.htm +files\creating_presentations.htm +files\creating_xy_plot.htm +files\cut_lines_presentation.htm +files\cut_lines_resentation.htm +files\deformed_shape_presentation.htm +files\displaying_hiding_presentations.htm +files\displaying_tables.htm +files\getting_elements_attributes.htm +files\getting_started.htm +files\importing_med_objects.htm +files\importing_tables.htm +files\insideframe.htm +files\introduction.htm +files\iso_surfaces_presentation.htm +files\points.htm +files\running_visu.htm +files\scalar_map_presentation.htm +files\scaling_presentations.htm +files\setting_properties_of_xy_plots.htm +files\shrink.htm +files\stream_lines_presentation.htm +files\surface.htm +files\surfaceframe.htm +files\sweeping.htm +files\vectors_presentation.htm +files\wireframe.htm +gauss_points_presentation.htm +gauss_viewer.htm +navigation_with_keyboard_and_spacemouse.htm +picking.htm +plot2d_viewer.htm +plot_3d_presentation.htm +primitive_types.htm +scalar_bar.htm +scalar_map_on_deformed_shape_presentation.htm +segmentation.htm +types_of_gauss_points_presentations.htm +vtk_3d_viewer.htm +ehelp.xml +robohhre.lng +texture_horiz_ltbluebubbles.jpg +index.glo +default.css +pics\image51.gif +pics\smds-example.png +pics\image84.gif +pics\cutlinesprsnt.png +pics\smds1.png +image31.jpg +pics\isosurfaces.png +image20.jpg +tip1.gif +pics\scalarmapicon.jpg +pics\image74.gif +pics\image52.gif +pics\image30.gif +pics\arrangeactors1.png +pics\image96.gif +pics\cutplpresent.png +image40.gif +note1.gif +pics\wireframe.jpg +pics\visuicon.jpg +pics\image53.gif +pics\image97.gif +image41.gif +pics\plot3d.png +image30.gif +image33.jpg +pics\image54.gif +image20.gif +pics\image98.gif +pics\image87.gif +image34.jpg +image31.gif +pics\streamlines.png +bgbaby.gif +q_blue.jpg +pics\cellsel.jpg +pics\isosurf.jpg +pics\image55.gif +pics\plot3d-example.png +pics\image99.gif +image43.gif +image10.gif +pics\image88.gif +pics\warning.png +pics\importtablefromfile.png +pics\surface.jpg +pics\view_rotation_point.png +image11.gif +pics\image89.gif +image44.gif +pics\buildprogress.png +pics\animation.png +pics\fitdatarange.png +image22.gif +pics\begining.jpg +pics\set_rotation_point_dialog1.png +pics\image46.gif +image23.gif +image1.jpg +image12.gif +image37.jpg +image34.gif +pics\cutplanes.png +pics\cutlinesicon.jpg +pics\set_rotation_point_dialog2.png +pics\image69.gif +pics\image47.gif +image2.jpg +pics\smds-example1.png +image13.gif +pics\image100.gif +pics\streamlinesprsnt.png +pics\image20.png +image38.jpg +image35.gif +pics\clipping1.png +pics\scalarrangesn.png +pics\streamlinesicon.jpg +pics\defshapeicon.jpg +pics\image48.gif +image3.jpg +image47.gif +image14.gif +pics\image21.png +pics\recording.png +pics\clipping2.png +more.jpg +pics\speed.jpg +pics\next.jpg +pics\run.jpg +pics\image157.gif +pics\image49.gif +image26.gif +image4.jpg +image1.gif +pics\viewsettings.png +image48.gif +pics\image102.gif +pics\gpp2.png +pics\textproperty.png +image15.gif +pics\previous.jpg +image5.jpg +pics\image39.gif +pics\image103.gif +image38.gif +pics\gpp3.png +pics\dumpviewtofile.png +image27.gif +pics\rename.png +pics\deformedshape.png +image16.gif +image19.jpg +pics\blue_up.jpg +pics\blue_left.jpg +image39.gif +image17.gif +pics\vectorsprsnt.png +pics\image104.gif +pics\vectorfield.png +pics\points.jpg +image18.gif +pics\image90.gif +pics\image105.gif +pics\recordingsaveas.png +image29.gif +pics\dataonelements1.png +pics\snapfgf.png +pics\visufullscreen.png +pics\editplot2dpresentation.png +pics\cutlines.png +pics\importfromfile.png +pics\image117.gif +pics\blue_right.jpg +pics\arrangeactors.png +pics\graduatedaxes1.png +pics\image91.gif +image5.gif +image19.gif +pics\translatepres.png +pics\iso.png +pics\planes.png +pics\gpp6.png +pics\dataonelements2.png +pics\animatdef.jpg +pics\end.jpg +pics\blue_down.jpg +pics\neo-transparency.png +pics\image81.gif +image6.gif +pics\picking.png +pics\dataonelements3.png +pics\scalarbarproperties.png +pics\cutlinesicn.jpg +pics\image82.gif +image7.gif +pics\spheroid.png +pics\viewtable.png +pics\vecticon.jpg +pics\shrink.jpg +i_blue.jpg +pics\createcurves.png +pics\image50.gif +pics\image83.gif +pics\image109.gif +image8.gif +pics\setupanimation.png +pics\exporttable.png +pics\deformedshapesn.png +ehlpdhtm.js +index.ppf +ss_btn_related_topics.gif +default_ns.css +whxdata\whtdata0.xml +whxdata\whftdata0.xml +whxdata\whfwdata0.xml +whxdata\whgdata0.xml +whdata\whtdata0.htm +whdata\whftdata0.htm +whdata\whfwdata0.htm +whdata\whgdata0.htm +whgdata\whlstt0.htm +whgdata\whlstt1.htm +whgdata\whlstt2.htm +whgdata\whlstt3.htm +whgdata\whlstt4.htm +whgdata\whlstt5.htm +whgdata\whlstt6.htm +whgdata\whlstt7.htm +whgdata\whlsti0.htm +whgdata\whlstfl0.htm +whgdata\whlstfl1.htm +whgdata\whlstfl2.htm +whgdata\whlstfl3.htm +whgdata\whlstfl4.htm +whgdata\whlstfl5.htm +whgdata\whlstfl6.htm +whgdata\whlstfl7.htm +whgdata\whlstfl8.htm +whgdata\whlstfl9.htm +whgdata\whlstfl10.htm +whgdata\whlstfl11.htm +whgdata\whlstfl12.htm +whgdata\whlstfl13.htm +whgdata\whlstfl14.htm +whgdata\whlstfl15.htm +whgdata\whlstfl16.htm +whgdata\whlstfl17.htm +whgdata\whlstfl18.htm +whgdata\whlstfl19.htm +whgdata\whlstfl20.htm +whgdata\whlstfl21.htm +whgdata\whlstfl22.htm +whgdata\whlstfl23.htm +whgdata\whlstfl24.htm +whgdata\whlstfl25.htm +whgdata\whlstf0.htm +whgdata\whlstf1.htm +whgdata\whlstf2.htm +whgdata\whlstf3.htm +whgdata\whlstf4.htm +whgdata\whlstf5.htm +whgdata\whlstf6.htm +whgdata\whlstf7.htm +whgdata\whlstf8.htm +whgdata\whlstf9.htm +whgdata\whlstf10.htm +whgdata\whlstg0.htm +index.htm +index_csh.htm +index_rhc.htm diff --git a/doc/salome/gui/VISU/visugenidl_doc/VISU__Gen_8idl-source.html b/doc/salome/gui/VISU/visugenidl_doc/VISU__Gen_8idl-source.html index b4994bed..9dd48fe8 100644 --- a/doc/salome/gui/VISU/visugenidl_doc/VISU__Gen_8idl-source.html +++ b/doc/salome/gui/VISU/visugenidl_doc/VISU__Gen_8idl-source.html @@ -5,841 +5,884 @@ Main Page +   -

idl/VISU_Gen.idl

Go to the documentation of this file.
00001 //  Copyright (C) 2003  CEA/DEN, EDF R&D
-00002 //
-00003 //
-00004 //
-00005 //  File   : VISU_Gen.idl
-00006 //  Author : Alexey Petrov
-00007 
-00014 #ifndef __VISU_GEN__
-00015 #define __VISU_GEN__
-00016 
-00017 #include "SALOME_Exception.idl"
-00018 #include "SALOME_GenericObj.idl"
-00019 #include "SALOME_Component.idl"
-00020 #include "SALOMEDS.idl"
-00021 #include "SALOMEDS_Attributes.idl"
-00022 #include "MED.idl"
-00023 
-00027 module VISU {
-00028   //-------------------------------------------------------
-00029   typedef string IdType;
-00030 
-00035   enum Scaling{ LINEAR, 
-00036           LOGARITHMIC 
-00037            };
+

idl/VISU_Gen.idl

Go to the documentation of this file.
00001 //  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+00002 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
+00003 // 
+00004 //  This library is free software; you can redistribute it and/or 
+00005 //  modify it under the terms of the GNU Lesser General Public 
+00006 //  License as published by the Free Software Foundation; either 
+00007 //  version 2.1 of the License. 
+00008 // 
+00009 //  This library is distributed in the hope that it will be useful, 
+00010 //  but WITHOUT ANY WARRANTY; without even the implied warranty of 
+00011 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+00012 //  Lesser General Public License for more details. 
+00013 // 
+00014 //  You should have received a copy of the GNU Lesser General Public 
+00015 //  License along with this library; if not, write to the Free Software 
+00016 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+00017 // 
+00018 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+00019 //
+00020 //  File   : VISU_Gen.idl
+00021 //  Author : Alexey Petrov
+00022 
+00029 #ifndef __VISU_GEN__
+00030 #define __VISU_GEN__
+00031 
+00032 #include "SALOME_Exception.idl"
+00033 #include "SALOME_GenericObj.idl"
+00034 #include "SALOME_Component.idl"
+00035 #include "SALOMEDS.idl"
+00036 #include "SALOMEDS_Attributes.idl"
+00037 #include "MED.idl"
 00038 
-00043   enum Entity{ NODE, 
-00044                EDGE, 
-00045             FACE, 
-00046             CELL  
-00047             };
-00048 
-00053   enum VISUType {
-00054     TNONE, 
-00055     TCURVE, 
-00056     TTABLE, 
-00057     TCONTAINER, 
-00058     TMESH, 
-00059     TSCALARMAP, 
-00060     TISOSURFACE, 
-00061     TDEFORMEDSHAPE, 
-00062     TSCALARMAPONDEFORMEDSHAPE, 
-00063     TGAUSSPOINTS, 
-00064     TPLOT3D, 
-00065     TCUTPLANES, 
-00066     TCUTLINES, 
-00067     TVECTORS, 
-00068     TSTREAMLINES, 
-00069     TVISUGEN, 
-00070     TVIEWMANAGER, 
-00071     TRESULT, 
-00072     TXYPLOT, 
-00073     TTABLEVIEW, 
-00074     TVIEW3D, 
-00075     TGAUSSVIEW, 
-00076     TENTITY, 
-00077     TFAMILY, 
-00078     TGROUP, 
-00079     TFIELD, 
-00080     TTIMESTAMP, 
-00081     TANIMATION, 
-00082     TALL
-00083   };
-00084 
-00085   interface Base {
-00089     IdType GetID();
-00090 
-00094     VISUType GetType();
-00095   };
-00096 
-00102   interface RemovableObject : Base {
-00106     void RemoveFromStudy();
-00107   };
-00108 
-00113   interface PrsObject : RemovableObject {
-00114   };
-00115 
-00116   //-------------------------------------------------------
-00121   interface Table : PrsObject {
-00126     void SetTitle(in string theTitle);
-00127 
-00132     string GetTitle();
-00133 
-00137     enum Orientation {
-00138       HORIZONTAL, 
-00139       VERTIACAL   
-00140     };
-00141 
-00147     void SetOrientation(in Orientation theOrientation);
+00042 module VISU {
+00043   //-------------------------------------------------------
+00044   typedef string IdType;
+00045 
+00050   enum Scaling{ LINEAR, 
+00051           LOGARITHMIC 
+00052            };
+00053 
+00058   enum Entity{ NODE, 
+00059                EDGE, 
+00060             FACE, 
+00061             CELL  
+00062             };
+00063 
+00068   enum VISUType {
+00069     TNONE, 
+00070     TCURVE, 
+00071     TTABLE, 
+00072     TCONTAINER, 
+00073     TMESH, 
+00074     TSCALARMAP, 
+00075     TISOSURFACE, 
+00076     TDEFORMEDSHAPE, 
+00077     TSCALARMAPONDEFORMEDSHAPE, 
+00078     TGAUSSPOINTS, 
+00079     TPLOT3D, 
+00080     TCUTPLANES, 
+00081     TCUTLINES, 
+00082     TVECTORS, 
+00083     TSTREAMLINES, 
+00084     TVISUGEN, 
+00085     TVIEWMANAGER, 
+00086     TRESULT, 
+00087     TXYPLOT, 
+00088     TTABLEVIEW, 
+00089     TVIEW3D, 
+00090     TGAUSSVIEW, 
+00091     TENTITY, 
+00092     TFAMILY, 
+00093     TGROUP, 
+00094     TFIELD, 
+00095     TTIMESTAMP, 
+00096     TANIMATION, 
+00097     TALL
+00098   };
+00099 
+00100   interface Base {
+00104     IdType GetID();
+00105 
+00109     VISUType GetType();
+00110   };
+00111 
+00117   interface RemovableObject : Base {
+00121     void RemoveFromStudy();
+00122   };
+00123 
+00128   interface PrsObject : RemovableObject {
+00129   };
+00130 
+00131   //-------------------------------------------------------
+00136   interface Table : PrsObject {
+00141     void SetTitle(in string theTitle);
+00142 
+00147     string GetTitle();
 00148 
-00154     Orientation GetOrientation();
-00155 
-00160     long GetNbRows();
-00161 
-00166     long GetNbColumns();
-00167   };
-00168 
-00169   //-------------------------------------------------------
-00175   interface Curve : PrsObject {
-00180     void SetTitle(in string theTitle);
-00181 
-00186     string GetTitle();
-00187 
-00193     void SetColor(in SALOMEDS::Color theColor);
-00194 
-00200     SALOMEDS::Color GetColor();
-00201 
-00207     enum MarkerType { NONE,
-00208                 CIRCLE,
-00209                 RECTANGLE,
-00210                 DIAMOND,
-00211                 DTRIANGLE,
-00212                 UTRIANGLE,
-00213                 LTRIANGLE,
-00214                 RTRIANGLE,
-00215                 CROSS,
-00216                 XCROSS
-00217     };
-00218 
-00226     void SetMarker(in MarkerType theType);
-00227 
-00235     MarkerType GetMarker();
-00236 
-00241     enum LineType{ VOIDLINE, SOLIDLINE, DASHLINE, DOTLINE, DASHDOTLINE, DASHDOTDOTLINE};
+00152     enum Orientation {
+00153       HORIZONTAL, 
+00154       VERTIACAL   
+00155     };
+00156 
+00162     void SetOrientation(in Orientation theOrientation);
+00163 
+00169     Orientation GetOrientation();
+00170 
+00175     long GetNbRows();
+00176 
+00181     long GetNbColumns();
+00182   };
+00183 
+00184   //-------------------------------------------------------
+00190   interface Curve : PrsObject {
+00195     void SetTitle(in string theTitle);
+00196 
+00201     string GetTitle();
+00202 
+00208     void SetColor(in SALOMEDS::Color theColor);
+00209 
+00215     SALOMEDS::Color GetColor();
+00216 
+00222     enum MarkerType { NONE,
+00223                 CIRCLE,
+00224                 RECTANGLE,
+00225                 DIAMOND,
+00226                 DTRIANGLE,
+00227                 UTRIANGLE,
+00228                 LTRIANGLE,
+00229                 RTRIANGLE,
+00230                 CROSS,
+00231                 XCROSS
+00232     };
+00233 
+00241     void SetMarker(in MarkerType theType);
 00242 
-00248     void SetLine(in LineType theType, in long theLineWidth);
-00249 
-00254     LineType GetLine();
-00255 
-00260     long GetLineWidth();
-00261   };
-00262 
-00263   //-------------------------------------------------------
-00269   interface Container : PrsObject {
-00274     void AddCurve(in Curve theCurve);
-00275 
-00280     void RemoveCurve(in Curve theCurve);
-00281 
-00286     long GetNbCurves();
-00287 
-00291     void Clear();
-00292   };
-00293 
-00294   //-------------------------------------------------------
-00299   interface Prs3d : PrsObject, SALOME::GenericObj {
-00300     //interface Prs3d : PrsObject{
-00301     void SetOffset(in float theDx, in float theDy, in float theDz);
-00302     void GetOffset(out float theDx, out float theDy, out float theDz);
-00303   };
-00304 
-00309   enum PresentationType{ POINT,
-00310                 WIREFRAME,
-00311                 SHADED,
-00312                 INSIDEFRAME,
-00313                 SURFACEFRAME,
-00314                 SHRINK
-00315   };
-00316 
-00322   interface Mesh : Prs3d {
-00327     void SetCellColor(in SALOMEDS::Color theColor);
-00328 
-00332     SALOMEDS::Color GetCellColor();
-00333 
-00338     void SetNodeColor(in SALOMEDS::Color theColor);
-00339 
-00343     SALOMEDS::Color GetNodeColor();
-00344 
-00349     void SetLinkColor(in SALOMEDS::Color theColor);
-00350 
-00354     SALOMEDS::Color GetLinkColor();
-00355 
-00361     void SetPresentationType(in PresentationType theType);
-00362 
-00367     PresentationType GetPresentationType();
-00368   };
-00369 
+00250     MarkerType GetMarker();
+00251 
+00256     enum LineType{ VOIDLINE, SOLIDLINE, DASHLINE, DOTLINE, DASHDOTLINE, DASHDOTDOTLINE};
+00257 
+00263     void SetLine(in LineType theType, in long theLineWidth);
+00264 
+00269     LineType GetLine();
+00270 
+00275     long GetLineWidth();
+00276   };
+00277 
+00278   //-------------------------------------------------------
+00284   interface Container : PrsObject {
+00289     void AddCurve(in Curve theCurve);
+00290 
+00295     void RemoveCurve(in Curve theCurve);
+00296 
+00301     long GetNbCurves();
+00302 
+00306     void Clear();
+00307   };
+00308 
+00309   //-------------------------------------------------------
+00314   interface Prs3d : PrsObject, SALOME::GenericObj {
+00315     //interface Prs3d : PrsObject{
+00316     void SetOffset(in float theDx, in float theDy, in float theDz);
+00317     void GetOffset(out float theDx, out float theDy, out float theDz);
+00318   };
+00319 
+00324   enum PresentationType{ POINT,
+00325                 WIREFRAME,
+00326                 SHADED,
+00327                 INSIDEFRAME,
+00328                 SURFACEFRAME,
+00329                 SHRINK
+00330   };
+00331 
+00337   interface Mesh : Prs3d {
+00342     void SetCellColor(in SALOMEDS::Color theColor);
+00343 
+00347     SALOMEDS::Color GetCellColor();
+00348 
+00353     void SetNodeColor(in SALOMEDS::Color theColor);
+00354 
+00358     SALOMEDS::Color GetNodeColor();
+00359 
+00364     void SetLinkColor(in SALOMEDS::Color theColor);
+00365 
+00369     SALOMEDS::Color GetLinkColor();
 00370 
-00371   //-------------------------------------------------------
-00380   interface ColoredPrs3d : Prs3d {
-00383     void SetScalarMode(in long theScalarMode);
+00376     void SetPresentationType(in PresentationType theType);
+00377 
+00382     PresentationType GetPresentationType();
+00383   };
 00384 
-00387     long GetScalarMode();
-00388 
-00392     double GetMin();
-00393 
-00397     double GetMax();
-00398 
-00405     void SetPosition(in double X, in double Y);
-00406 
-00410     double GetPosX();
-00411 
-00415     double GetPosY();
-00416 
-00423     void SetSize(in double theWidth, in double theHeight);
-00424 
-00429     double GetWidth();
-00430 
-00435     double GetHeight();
-00436 
-00441     void SetNbColors(in long theNbColors);
-00442 
-00448     long GetNbColors();
-00449 
-00455     void SetLabels(in long theNbLabels);
-00456 
-00462     long GetLabels();
-00463 
-00468     void SetTitle(in string theName);
-00469 
-00473     string GetTitle();
-00474   };
-00475 
-00476 
-00477   //-------------------------------------------------------
-00486   interface ScalarMap : ColoredPrs3d {
-00491     void SetScaling(in Scaling theScaling);
-00492 
-00496     Scaling GetScaling();
-00497 
-00503     void SetRange(in double theMin, in double theMax);
-00504 
-00506     enum Orientation {
-00507       HORIZONTAL, 
-00508       VERTICAL    
-00509     };
-00510 
-00516     void SetBarOrientation(in Orientation theOrientation);
-00517 
-00521     Orientation GetBarOrientation();
-00522   };
-00523 
-00524   //-------------------------------------------------------
-00529   //-------------------------------------------------------
-00530   interface GaussPoints : ColoredPrs3d {
-00531   };
+00385 
+00386   //-------------------------------------------------------
+00395   interface ColoredPrs3d : Prs3d {
+00398     void SetScalarMode(in long theScalarMode);
+00399 
+00402     long GetScalarMode();
+00403 
+00407     double GetMin();
+00408 
+00412     double GetMax();
+00413 
+00420     void SetPosition(in double X, in double Y);
+00421 
+00425     double GetPosX();
+00426 
+00430     double GetPosY();
+00431 
+00438     void SetSize(in double theWidth, in double theHeight);
+00439 
+00444     double GetWidth();
+00445 
+00450     double GetHeight();
+00451 
+00456     void SetNbColors(in long theNbColors);
+00457 
+00463     long GetNbColors();
+00464 
+00470     void SetLabels(in long theNbLabels);
+00471 
+00477     long GetLabels();
+00478 
+00483     void SetTitle(in string theName);
+00484 
+00488     string GetTitle();
+00489   };
+00490 
+00491 
+00492   //-------------------------------------------------------
+00501   interface ScalarMap : ColoredPrs3d {
+00506     void SetScaling(in Scaling theScaling);
+00507 
+00511     Scaling GetScaling();
+00512 
+00518     void SetRange(in double theMin, in double theMax);
+00519 
+00521     enum Orientation {
+00522       HORIZONTAL, 
+00523       VERTICAL    
+00524     };
+00525 
+00531     void SetBarOrientation(in Orientation theOrientation);
 00532 
-00537   interface DeformedShape : ScalarMap {
-00542     void SetScale(in double theScale);
-00543 
-00547     double GetScale();
-00548 
-00551     boolean IsColored();
-00552 
-00557     void ShowColored(in boolean theColored);
+00536     Orientation GetBarOrientation();
+00537   };
+00538 
+00539   //-------------------------------------------------------
+00544   //-------------------------------------------------------
+00545   interface GaussPoints : ColoredPrs3d {
+00546   };
+00547 
+00552   interface DeformedShape : ScalarMap {
+00557     void SetScale(in double theScale);
 00558 
-00562     SALOMEDS::Color GetColor();
+00562     double GetScale();
 00563 
-00568     void SetColor(in SALOMEDS::Color theColor);
-00569   };
-00570 
-00571   //-------------------------------------------------------
-00576   interface ScalarMapOnDeformedShape : ScalarMap {
-00577     
-00581     void SetSourceRange(in double theMinRange,in double theMaxRange);
-00585     double GetSourceRangeMin();
-00589     double GetSourceRangeMax();
-00590     
-00595     void SetScale(in double theScale);
-00596 
-00600     double GetScale();
-00601 
-00609     void SetScalarField(in string theMeshName,in string theFieldName,
-00610                in long theIteration,in Entity theEntity);
+00566     boolean IsColored();
+00567 
+00572     void ShowColored(in boolean theColored);
+00573 
+00577     SALOMEDS::Color GetColor();
+00578 
+00583     void SetColor(in SALOMEDS::Color theColor);
+00584   };
+00585 
+00586   //-------------------------------------------------------
+00591   interface ScalarMapOnDeformedShape : ScalarMap {
+00592     
+00596     void SetSourceRange(in double theMinRange,in double theMaxRange);
+00600     double GetSourceRangeMin();
+00604     double GetSourceRangeMax();
+00605     
+00610     void SetScale(in double theScale);
 00611 
-00612   };
-00613   //-------------------------------------------------------
-00621   interface Plot3D : ScalarMap {
-00626     enum Orientation { XY,   
-00627                  YZ,   
-00628                  ZX }; 
-00639     void SetOrientation (in Orientation theOrientation, in double theXAngle, in double theYAngle);
-00640 
-00644     Orientation GetOrientationType();
-00645 
-00650     double GetRotateX();
-00651 
-00656     double GetRotateY();
-00657 
-00663     void SetPlanePosition (in double  thePlanePosition,
-00664                   in boolean theIsRelative);
-00665 
-00669     double GetPlanePosition();
-00670 
-00674     boolean IsPositionRelative();
-00675 
-00681     void SetScaleFactor (in double theScaleFactor);
-00682 
-00687     double GetScaleFactor();
-00688 
-00693     void SetContourPrs (in boolean theIsContourPrs );
-00694 
-00698     boolean GetIsContourPrs();
-00699 
-00704     void SetNbOfContours (in long theNb);
-00705 
-00709     long GetNbOfContours();
-00710   };
-00711 
-00712   //-------------------------------------------------------
-00719   interface CutPlanes : ScalarMap {
-00724     enum Orientation {XY, 
-00725                       YZ, 
-00726                 ZX}; 
-00737     void SetOrientation(in Orientation theOrientation, in double theXAngle, in double theYAngle);
-00738 
-00742     Orientation GetOrientationType();
-00743 
-00747     double GetRotateX();
-00748 
-00752     double GetRotateY();
+00615     double GetScale();
+00616 
+00624     void SetScalarField(in string theMeshName,in string theFieldName,
+00625                in long theIteration,in Entity theEntity);
+00626 
+00627   };
+00628   //-------------------------------------------------------
+00636   interface Plot3D : ScalarMap {
+00641     enum Orientation { XY,   
+00642                  YZ,   
+00643                  ZX }; 
+00654     void SetOrientation (in Orientation theOrientation, in double theXAngle, in double theYAngle);
+00655 
+00659     Orientation GetOrientationType();
+00660 
+00665     double GetRotateX();
+00666 
+00671     double GetRotateY();
+00672 
+00678     void SetPlanePosition (in double  thePlanePosition,
+00679                   in boolean theIsRelative);
+00680 
+00684     double GetPlanePosition();
+00685 
+00689     boolean IsPositionRelative();
+00690 
+00696     void SetScaleFactor (in double theScaleFactor);
+00697 
+00702     double GetScaleFactor();
+00703 
+00708     void SetContourPrs (in boolean theIsContourPrs );
+00709 
+00713     boolean GetIsContourPrs();
+00714 
+00719     void SetNbOfContours (in long theNb);
+00720 
+00724     long GetNbOfContours();
+00725   };
+00726 
+00727   //-------------------------------------------------------
+00734   interface CutPlanes : ScalarMap {
+00739     enum Orientation {XY, 
+00740                       YZ, 
+00741                 ZX}; 
+00752     void SetOrientation(in Orientation theOrientation, in double theXAngle, in double theYAngle);
 00753 
-00763     void SetDisplacement(in double theDisp);
-00764 
-00768     double GetDisplacement();
-00769 
-00775      void SetPlanePosition(in long thePlaneNumber, in double thePlanePosition);
-00776 
-00781      void SetDefault(in long thePlaneNumber);
-00782 
-00786     double GetPlanePosition(in long thePlaneNumber);
-00787 
-00792     boolean IsDefault(in long thePlaneNumber);
-00793 
-00798     void SetNbPlanes(in long theNb);
-00799 
-00803     long GetNbPlanes();
-00804   };
-00805 
-00806   //-------------------------------------------------------
-00821   interface CutLines : ScalarMap {
-00830     void SetOrientation(in CutPlanes::Orientation theOrientation, in double theXAngle, in double theYAngle);
-00831 
-00841     void SetOrientation2(in CutPlanes::Orientation theOrientation, in double theXAngle, in double theYAngle);
-00842 
-00846     CutPlanes::Orientation GetOrientationType();
-00847 
-00851     CutPlanes::Orientation GetOrientationType2();
-00852 
-00856     double GetRotateX();
+00757     Orientation GetOrientationType();
+00758 
+00762     double GetRotateX();
+00763 
+00767     double GetRotateY();
+00768 
+00778     void SetDisplacement(in double theDisp);
+00779 
+00783     double GetDisplacement();
+00784 
+00790      void SetPlanePosition(in long thePlaneNumber, in double thePlanePosition);
+00791 
+00796      void SetDefault(in long thePlaneNumber);
+00797 
+00801     double GetPlanePosition(in long thePlaneNumber);
+00802 
+00807     boolean IsDefault(in long thePlaneNumber);
+00808 
+00813     void SetNbPlanes(in long theNb);
+00814 
+00818     long GetNbPlanes();
+00819   };
+00820 
+00821   //-------------------------------------------------------
+00836   interface CutLines : ScalarMap {
+00845     void SetOrientation(in CutPlanes::Orientation theOrientation, in double theXAngle, in double theYAngle);
+00846 
+00856     void SetOrientation2(in CutPlanes::Orientation theOrientation, in double theXAngle, in double theYAngle);
 00857 
-00861     double GetRotateX2();
+00861     CutPlanes::Orientation GetOrientationType();
 00862 
-00866     double GetRotateY();
+00866     CutPlanes::Orientation GetOrientationType2();
 00867 
-00871     double GetRotateY2();
+00871     double GetRotateX();
 00872 
-00879     void SetDisplacement(in double theDisp);
-00880 
-00887     void SetDisplacement2(in double theDisp);
-00888 
-00892     double GetDisplacement();
-00893 
-00897     double GetDisplacement2();
-00898 
-00902     void SetBasePlanePosition(in double thePlanePosition);
+00876     double GetRotateX2();
+00877 
+00881     double GetRotateY();
+00882 
+00886     double GetRotateY2();
+00887 
+00894     void SetDisplacement(in double theDisp);
+00895 
+00902     void SetDisplacement2(in double theDisp);
 00903 
-00906     double GetBasePlanePosition();
-00907 
-00912     void SetLinePosition(in long thePlaneNumber, in double thePlanePosition);
+00907     double GetDisplacement();
+00908 
+00912     double GetDisplacement2();
 00913 
-00917     double GetLinePosition(in long thePlaneNumber);
+00917     void SetBasePlanePosition(in double thePlanePosition);
 00918 
-00921     void SetDefault();
+00921     double GetBasePlanePosition();
 00922 
-00927     boolean IsDefault();
+00927     void SetLinePosition(in long thePlaneNumber, in double thePlanePosition);
 00928 
-00933     void SetDefaultPosition(in long thePlaneNumber);
-00934 
-00940     boolean IsDefaultPosition(in long thePlaneNumber);
-00941 
-00946     void SetNbLines(in long theNb);
-00947 
-00951     long GetNbLines();
-00952   };
-00953 
-00963   interface StreamLines : DeformedShape {
-00967     enum Direction{ FORWARD,
-00968               BACKWARD,
-00969               BOTH
-00970     };
-00971 
-00992     boolean SetParams(in double theIntStep,
-00993                 in double thePropogationTime,
-00994                 in double theStepLength,
-00995                 in Prs3d thePrs3d,
-00996                 in double thePercents,
-00997                 in Direction theDirection);
-00998 
-01001     double GetIntegrationStep();
-01002 
-01005     double GetPropagationTime();
-01006 
-01009     double GetStepLength();
-01010 
-01013     Prs3d GetSource();
-01014 
-01018     double GetUsedPoints();
-01019 
-01022     Direction GetDirection();
-01023   };
-01024 
-01033   interface IsoSurfaces : ScalarMap {
-01039     void SetNbSurfaces(in long theNb);
+00932     double GetLinePosition(in long thePlaneNumber);
+00933 
+00936     void SetDefault();
+00937 
+00942     boolean IsDefault();
+00943 
+00948     void SetDefaultPosition(in long thePlaneNumber);
+00949 
+00955     boolean IsDefaultPosition(in long thePlaneNumber);
+00956 
+00961     void SetNbLines(in long theNb);
+00962 
+00966     long GetNbLines();
+00967 
+00971     void SetAllCurvesInverted(in boolean theInvert);
+00972 
+00976     boolean IsAllCurvesInverted();
+00977 
+00981     void SetUseAbsoluteLength(in boolean theAbsLength);
+00982 
+00985     boolean IsUseAbsoluteLength();
+00986   };
+00987 
+00997   interface StreamLines : DeformedShape {
+01001     enum Direction{ FORWARD,
+01002               BACKWARD,
+01003               BOTH
+01004     };
+01005 
+01026     boolean SetParams(in double theIntStep,
+01027                 in double thePropogationTime,
+01028                 in double theStepLength,
+01029                 in Prs3d thePrs3d,
+01030                 in double thePercents,
+01031                 in Direction theDirection);
+01032 
+01035     double GetIntegrationStep();
+01036 
+01039     double GetPropagationTime();
 01040 
-01044     long GetNbSurfaces();
-01045   };
-01046 
-01047   //-------------------------------------------------------
-01052   interface Vectors : DeformedShape {
-01057     void SetLineWidth(in double theWidth);
+01043     double GetStepLength();
+01044 
+01047     Prs3d GetSource();
+01048 
+01052     double GetUsedPoints();
+01053 
+01056     Direction GetDirection();
+01057   };
 01058 
-01062     double GetLineWidth();
-01063 
-01067     enum GlyphType{ ARROW,
-01068                     CONE2,
-01069                     CONE6,
-01070                     NONE
-01071                   };
-01072 
-01078     void SetGlyphType(in GlyphType theType);
-01079 
-01083     GlyphType GetGlyphType();
-01084 
-01088     enum GlyphPos{ CENTER, 
-01089                    TAIL,   
-01090                    HEAD  
-01091                  };
+01067   interface IsoSurfaces : ScalarMap {
+01073     void SetNbSurfaces(in long theNb);
+01074 
+01078     long GetNbSurfaces();
+01079   };
+01080 
+01081   //-------------------------------------------------------
+01086   interface Vectors : DeformedShape {
+01091     void SetLineWidth(in double theWidth);
 01092 
-01098     void SetGlyphPos(in GlyphPos thePos);
-01099 
-01103     GlyphPos GetGlyphPos();
-01104   };
-01105 
-01106   //-------------------------------------------------------
-01121   interface Animation : Base {
-01125     void addField(in SALOMEDS::SObject theObject);
+01096     double GetLineWidth();
+01097 
+01101     enum GlyphType{ ARROW,
+01102                     CONE2,
+01103                     CONE6,
+01104                     NONE
+01105                   };
+01106 
+01112     void SetGlyphType(in GlyphType theType);
+01113 
+01117     GlyphType GetGlyphType();
+01118 
+01122     enum GlyphPos{ CENTER, 
+01123                    TAIL,   
+01124                    HEAD  
+01125                  };
 01126 
-01131     void generatePresentations(in long theFieldNum);
-01132 
-01138     boolean generateFrames();
+01132     void SetGlyphPos(in GlyphPos thePos);
+01133 
+01137     GlyphPos GetGlyphPos();
+01138   };
 01139 
-01142     void clearView();
-01143 
-01147 
-01150     void startAnimation();
-01151 
-01154     void stopAnimation();
-01155 
-01158     void nextFrame();
-01159 
-01162     void prevFrame();
-01163 
-01166     void firstFrame();
+01140   //-------------------------------------------------------
+01155   interface Animation : Base {
+01159     enum AnimationMode{ PARALLEL, 
+01160                SUCCCESSIVE 
+01161     };
+01162     
+01166     boolean addField(in SALOMEDS::SObject theObject);
 01167 
-01170     void lastFrame();
+01170     void clearFields();
 01171 
-01175     void gotoFrame(in long theFrame);
-01180     long getNbFields();
-01181 
-01184     long getNbFrames();
-01185 
-01188     boolean isRunning();
-01189 
-01192     long getCurrentFrame();
-01193 
-01196     ColoredPrs3d getPresentation(in long theField, in long theFrame);
-01197 
-01201     void setPresentationType(in long theFieldNum, in VISUType theType);
-01202 
-01206     VISUType getPresentationType(in long theFieldNum);
-01207 
-01211     void setSpeed(in long theSpeed);
+01176     void generatePresentations(in long theFieldNum);
+01177 
+01183     boolean generateFrames();
+01184 
+01187     void clearView();
+01188 
+01192 
+01195     void startAnimation();
+01196 
+01199     void stopAnimation();
+01200 
+01203     void nextFrame();
+01204 
+01207     void prevFrame();
+01208 
+01211     void firstFrame();
 01212 
-01215     long getSpeed();
+01215     void lastFrame();
 01216 
-01221     boolean isProportional();
-01222 
-01231     void setAnimationRange(in double theMin, in double theMax);
-01232 
-01235     double getMinRange();
-01236 
-01239     double getMaxRange();
-01240 
-01245     boolean isRangeDefined();
-01246 
-01251     void dumpTo(in string thePath);
+01220     void gotoFrame(in long theFrame);
+01225     long getNbFields();
+01226 
+01229     long getNbFrames();
+01230 
+01233     boolean isRunning();
+01234 
+01237     long getCurrentFrame();
+01238 
+01241     ColoredPrs3d getPresentation(in long theField, in long theFrame);
+01242 
+01246     void setPresentationType(in long theFieldNum, in VISUType theType);
+01247 
+01251     VISUType getPresentationType(in long theFieldNum);
 01252 
-01260     string setDumpFormat(in string theFormat);
+01256     void setSpeed(in long theSpeed);
+01257 
+01260     long getSpeed();
 01261 
-01264     boolean isCycling();
-01265 
-01269     double getMinTime();
-01270 
-01274     double getMaxTime();
-01275 
-01281     void setProportional(in boolean theProp);
-01282 
-01288     void setCycling(in boolean theCycle);
-01289 
-01290     SALOMEDS::SObject publishInStudy();
+01266     boolean isProportional();
+01267 
+01276     void setAnimationRange(in double theMin, in double theMax);
+01277 
+01280     double getMinRange();
+01281 
+01284     double getMaxRange();
+01285 
+01290     boolean isRangeDefined();
 01291 
-01292     void saveAnimation();
-01293 
-01294     void restoreFromStudy(in SALOMEDS::SObject theSObj);
-01295 
-01296     boolean isSavedInStudy();
-01297   };
-01298 
-01305   interface Result : RemovableObject, SALOME::GenericObj {
-01308     boolean BuildAll();
-01309 
-01311     boolean Build(in boolean theIsBuildAll, in boolean theIsAtOnce);
-01312 
-01314     boolean IsDone();
+01296     void dumpTo(in string thePath);
+01297 
+01305     string setDumpFormat(in string theFormat);
+01306 
+01309     boolean isCycling();
+01310 
+01314     double getMinTime();
 01315 
-01317     boolean IsEntitiesDone();
-01318 
-01320     void SetBuildFields(in boolean theIsBuildFields, in boolean theIsCalculateMinMax);
-01321 
-01323     boolean IsFieldsDone();
-01324 
-01326     void SetBuildGroups(in boolean theIsBuildGroups);
+01319     double getMaxTime();
+01320 
+01326     void setProportional(in boolean theProp);
 01327 
-01329     boolean IsGroupsDone();
-01330 
-01332     boolean IsMinMaxDone();
-01333   };
+01333     void setCycling(in boolean theCycle);
 01334 
-01335   //-------------------------------------------------------
-01336   interface ViewManager;
-01337   interface View3D;
-01338 
-01345   interface VISU_Gen : Engines::Component, SALOMEDS::Driver, Base {
-01348     void SetCurrentStudy(in SALOMEDS::Study theStudy);
-01349 
-01352     SALOMEDS::Study GetCurrentStudy();
-01353 
-01358     ViewManager GetViewManager();
-01359 
-01363     SALOMEDS::SObject ImportTables(in string theFileName);
-01364 
-01368     boolean ExportTableToFile(in SALOMEDS::SObject theTable, in string theFileName);
-01369 
-01375     Result ImportFile(in string theFileName);
-01376 
-01382     Result CreateResult(in string theFileName);
-01383 
-01389     Result CopyAndImportFile(in string theFileName);
-01390 
-01394     Result ImportMed(in SALOMEDS::SObject theMedSObject);
-01395 
-01399     Result ImportMedField(in SALOME_MED::FIELD theField);
+01335     boolean isCleaningMemoryAtEachFrame();
+01336     void setCleaningMemoryAtEachFrame(in boolean theCycle);
+01337 
+01338     SALOMEDS::SObject publishInStudy();
+01339 
+01340     void saveAnimation();
+01341 
+01342     void restoreFromStudy(in SALOMEDS::SObject theSObj);
+01343 
+01344     boolean isSavedInStudy();
+01345     
+01350     void setAnimationMode(in AnimationMode theMode);
+01351 
+01355     AnimationMode getAnimationMode();
+01356 
+01366     void ApplyProperties(in long theFieldNum, in ColoredPrs3d thePrs);
+01367   };
+01368 
+01375   interface Result : RemovableObject, SALOME::GenericObj {
+01378     boolean BuildAll();
+01379 
+01381     boolean Build(in boolean theIsBuildAll, in boolean theIsAtOnce);
+01382 
+01384     boolean IsDone();
+01385 
+01387     boolean IsEntitiesDone();
+01388 
+01390     void SetBuildFields(in boolean theIsBuildFields, in boolean theIsCalculateMinMax);
+01391 
+01393     boolean IsFieldsDone();
+01394 
+01396     void SetBuildGroups(in boolean theIsBuildGroups);
+01397 
+01399     boolean IsGroupsDone();
 01400 
-01409     void RenameEntityInStudy(in Result theResult,
-01410                     in string theMeshName,
-01411                     in Entity theEntity,
-01412                     in string theNewName);
-01413     void RenameFamilyInStudy(in Result theResult,
-01414                     in string theMeshName,
-01415                     in Entity theEntity,
-01416                     in string theSubMeshName,
-01417                     in string theNewName);
-01418     void RenameGroupInStudy(in Result theResult,
-01419                    in string theMeshName,
-01420                    in string theSubMeshName,
-01421                    in string theNewName);
-01422 
-01429     Mesh MeshOnEntity(in Result theResult, in string theMeshName, in Entity theEntity);
-01430 
-01438     Mesh FamilyMeshOnEntity(in Result theResult, in string theMeshName,
-01439                    in Entity theEntity, in string theFamilyName);
-01440 
-01447     Mesh GroupMesh(in Result theResult, in string theMeshName, in string theGroupName);
-01448 
-01457     ScalarMap ScalarMapOnField(in Result theResult, in string theMeshName,
-01458                       in Entity theEntity, in string theFieldName,
-01459                       in double theIteration);
+01402     boolean IsMinMaxDone();
+01403   };
+01404 
+01405   //-------------------------------------------------------
+01406   interface ViewManager;
+01407   interface View3D;
+01408 
+01415   interface VISU_Gen : Engines::Component, SALOMEDS::Driver, Base {
+01418     void SetCurrentStudy(in SALOMEDS::Study theStudy);
+01419 
+01422     SALOMEDS::Study GetCurrentStudy();
+01423 
+01428     ViewManager GetViewManager();
+01429 
+01433     SALOMEDS::SObject ImportTables(in string theFileName);
+01434 
+01438     boolean ExportTableToFile(in SALOMEDS::SObject theTable, in string theFileName);
+01439 
+01445     Result ImportFile(in string theFileName);
+01446 
+01452     Result CreateResult(in string theFileName);
+01453 
+01459     Result CopyAndImportFile(in string theFileName);
 01460 
-01469     GaussPoints GaussPointsOnField(in Result theResult, in string theMeshName,
-01470                        in Entity theEntity, in string theFieldName,
-01471                        in double theIteration);
-01472 
-01481     DeformedShape DeformedShapeOnField(in Result theResult, in string theMeshName,
-01482                            in Entity theEntity, in string theFieldName,
-01483                            in double theIteration);
-01484 
-01493     ScalarMapOnDeformedShape ScalarMapOnDeformedShapeOnField(in Result theResult, in string theMeshName,
-01494                                         in Entity theEntity, in string theFieldName,
-01495                                         in double theIteration);
-01496 
-01505     Vectors VectorsOnField(in Result theResult, in string theMeshName,
-01506                   in Entity theEntity, in string theFieldName,
-01507                   in double theIteration);
-01508 
-01517     IsoSurfaces IsoSurfacesOnField(in Result theResult, in string theMeshName,
-01518                        in Entity theEntity, in string theFieldName,
-01519                        in double theIteration);
-01520 
-01529     StreamLines StreamLinesOnField(in Result theResult, in string theMeshName,
-01530                        in Entity theEntity, in string theFieldName,
-01531                        in double theIteration);
-01532 
-01541     CutPlanes CutPlanesOnField(in Result theResult, in string theMeshName,
-01542                       in Entity theEntity, in string theFieldName,
-01543                       in double theIteration);
-01544 
-01553     CutLines CutLinesOnField(in Result theResult, in string theMeshName,
-01554                     in Entity theEntity, in string theFieldName,
-01555                     in double theIteration);
-01556 
-01565     Plot3D Plot3DOnField(in Result theResult, in string theMeshName,
-01566                 in Entity theEntity, in string theFieldName,
-01567                 in double theIteration);
-01568 
-01573     Table CreateTable(in string theTableEntry);
-01574 
-01581     Curve CreateCurve(in Table theTable, in long theHRow, in long theVRow);
-01582 
-01586     Container CreateContainer();
-01587 
-01591     Animation CreateAnimation(in View3D theView3d);
-01592 
-01593     void DeleteResult(in Result theResult);
-01594 
-01595     void DeletePrs3d(in Prs3d thePrs3d);
-01596   };
-01597 
-01604   interface View: Base {
-01605 
-01610     enum ViewRepresentation {
-01611       OBJECTBROWSER,
-01612       VIEWER,
-01613       PYTHON,
-01614       MESSAGES
-01615     };
-01616 
-01617     void ShowPart (in ViewRepresentation ViewRepr, in boolean state );
-01618 
-01619     boolean IsPartShown( in ViewRepresentation ViewRepr );
-01620 
-01630     void SplitRight();
-01631 
-01637     void SplitLeft();
+01464     Result ImportMed(in SALOMEDS::SObject theMedSObject);
+01465 
+01469     Result ImportMedField(in SALOME_MED::FIELD theField);
+01470 
+01479     void RenameEntityInStudy(in Result theResult,
+01480                     in string theMeshName,
+01481                     in Entity theEntity,
+01482                     in string theNewName);
+01483     void RenameFamilyInStudy(in Result theResult,
+01484                     in string theMeshName,
+01485                     in Entity theEntity,
+01486                     in string theSubMeshName,
+01487                     in string theNewName);
+01488     void RenameGroupInStudy(in Result theResult,
+01489                    in string theMeshName,
+01490                    in string theSubMeshName,
+01491                    in string theNewName);
+01492 
+01499     Mesh MeshOnEntity(in Result theResult, in string theMeshName, in Entity theEntity);
+01500 
+01508     Mesh FamilyMeshOnEntity(in Result theResult, in string theMeshName,
+01509                    in Entity theEntity, in string theFamilyName);
+01510 
+01517     Mesh GroupMesh(in Result theResult, in string theMeshName, in string theGroupName);
+01518 
+01527     ScalarMap ScalarMapOnField(in Result theResult, in string theMeshName,
+01528                       in Entity theEntity, in string theFieldName,
+01529                       in double theIteration);
+01530 
+01539     GaussPoints GaussPointsOnField(in Result theResult, in string theMeshName,
+01540                        in Entity theEntity, in string theFieldName,
+01541                        in double theIteration);
+01542 
+01551     DeformedShape DeformedShapeOnField(in Result theResult, in string theMeshName,
+01552                            in Entity theEntity, in string theFieldName,
+01553                            in double theIteration);
+01554 
+01563     ScalarMapOnDeformedShape ScalarMapOnDeformedShapeOnField(in Result theResult, in string theMeshName,
+01564                                         in Entity theEntity, in string theFieldName,
+01565                                         in double theIteration);
+01566 
+01575     Vectors VectorsOnField(in Result theResult, in string theMeshName,
+01576                   in Entity theEntity, in string theFieldName,
+01577                   in double theIteration);
+01578 
+01587     IsoSurfaces IsoSurfacesOnField(in Result theResult, in string theMeshName,
+01588                        in Entity theEntity, in string theFieldName,
+01589                        in double theIteration);
+01590 
+01599     StreamLines StreamLinesOnField(in Result theResult, in string theMeshName,
+01600                        in Entity theEntity, in string theFieldName,
+01601                        in double theIteration);
+01602 
+01611     CutPlanes CutPlanesOnField(in Result theResult, in string theMeshName,
+01612                       in Entity theEntity, in string theFieldName,
+01613                       in double theIteration);
+01614 
+01623     CutLines CutLinesOnField(in Result theResult, in string theMeshName,
+01624                     in Entity theEntity, in string theFieldName,
+01625                     in double theIteration);
+01626 
+01635     Plot3D Plot3DOnField(in Result theResult, in string theMeshName,
+01636                 in Entity theEntity, in string theFieldName,
+01637                 in double theIteration);
 01638 
-01644     void SplitBottom();
-01645 
-01651     void SplitTop();
-01652 
-01656     void OnTop();
-01657 
-01664     void Attract (in View theView);
-01665 
-01672     void AttractAll (in View theView);
-01673 
-01681     void SetRelativePositionInSplitter (in double thePosition);
-01682 
-01690     void SetRelativeSizeInSplitter (in double theSize);
-01691 
-01697     void SetRelativePositionX (in double thePosition);
+01643     Table CreateTable(in string theTableEntry);
+01644 
+01651     Curve CreateCurve(in Table theTable, in long theHRow, in long theVRow);
+01652     
+01661     Curve CreateCurveWithZ( in Table theTable, in long theHRow, in long theVRow, in long theZRow );
+01662 
+01666     Container CreateContainer();
+01667 
+01671     Animation CreateAnimation(in View3D theView3d);
+01672 
+01673     void DeleteResult(in Result theResult);
+01674 
+01675     void DeletePrs3d(in Prs3d thePrs3d);
+01676   };
+01677 
+01684   interface View: Base {
+01685 
+01690     enum ViewRepresentation {
+01691       OBJECTBROWSER,
+01692       VIEWER,
+01693       PYTHON,
+01694       MESSAGES
+01695     };
+01696 
+01697     void ShowPart (in ViewRepresentation ViewRepr, in boolean state );
 01698 
-01704     void SetRelativePositionY (in double thePosition);
-01705 
-01711     void SetRelativeSizeX (in double theSize);
-01712 
-01718     void SetRelativeSizeY (in double theSize);
-01719 
-01723     void SetViewWidth (in long Width); //setting width of view
-01724     void SetViewHeight (in long Height); //setting height of view
-01725     long GetViewWidth(); //getting view width
-01726     long GetViewHeight(); //getting view height
-01727     enum ViewPosition {TOP, CENTER, BOTTOM, RIGHT, LEFT}; //position of the study frame
-01728     void SetViewPositionHorizontal (in ViewPosition ViewPosHor); //setting of the horizontal view position
-01729     void SetViewPositionVertical (in ViewPosition ViewPosVer); //setting of the vertical view position
-01730     void SetRelativePosition( in double x, in double y );
-01731     void SetRelativeSize( in double x, in double y );
-01732     void Minimize(); // Minimizes to the task bar or to the bottom of the Desktop the %View frame.
-01733     void Restore(); // Restores the %View frame.
-01734     void Maximize(); // Maximizes the %View frame.
-01735 
-01740     void SetTitle(in string theTitle);
-01741 
-01745     string GetTitle();
-01746 
-01751     void SetBackground(in SALOMEDS::Color theColor);
-01752 
-01756     SALOMEDS::Color GetBackground();
-01757 
-01761     void EraseAll();
+01699     boolean IsPartShown( in ViewRepresentation ViewRepr );
+01700 
+01710     void SplitRight();
+01711 
+01717     void SplitLeft();
+01718 
+01724     void SplitBottom();
+01725 
+01731     void SplitTop();
+01732 
+01736     void OnTop();
+01737 
+01744     void Attract (in View theView);
+01745 
+01752     void AttractAll (in View theView);
+01753 
+01761     void SetRelativePositionInSplitter (in double thePosition);
 01762 
-01766     void DisplayAll();
-01767 
-01772     void Erase(in PrsObject thePrsObj);
-01773 
-01778     void Display(in PrsObject thePrsObj);
-01779 
-01785     void DisplayOnly(in PrsObject thePrsObj);
-01786 
-01790     void Update();
-01791 
-01797     boolean SavePicture(in string theFileName);
-01798   };
+01770     void SetRelativeSizeInSplitter (in double theSize);
+01771 
+01777     void SetRelativePositionX (in double thePosition);
+01778 
+01784     void SetRelativePositionY (in double thePosition);
+01785 
+01791     void SetRelativeSizeX (in double theSize);
+01792 
+01798     void SetRelativeSizeY (in double theSize);
 01799 
-01800   //-------------------------------------------------------
-01805   interface View3D : View {
-01810     enum ViewType{ FRONT, BACK, LEFT, RIGHT, TOP, BOTTOM};
-01811 
-01815     enum Axis{ XAxis, YAxis, ZAxis};
-01816 
-01820     typedef double XYZ[3];
+01803     void SetViewWidth (in long Width); //setting width of view
+01804     void SetViewHeight (in long Height); //setting height of view
+01805     long GetViewWidth(); //getting view width
+01806     long GetViewHeight(); //getting view height
+01807     enum ViewPosition {TOP, CENTER, BOTTOM, RIGHT, LEFT}; //position of the study frame
+01808     void SetViewPositionHorizontal (in ViewPosition ViewPosHor); //setting of the horizontal view position
+01809     void SetViewPositionVertical (in ViewPosition ViewPosVer); //setting of the vertical view position
+01810     void SetRelativePosition( in double x, in double y );
+01811     void SetRelativeSize( in double x, in double y );
+01812     void Minimize(); // Minimizes to the task bar or to the bottom of the Desktop the %View frame.
+01813     void Restore(); // Restores the %View frame.
+01814     void Maximize(); // Maximizes the %View frame.
+01815 
+01820     void SetTitle(in string theTitle);
 01821 
-01825     void FitAll();
+01825     string GetTitle();
 01826 
-01831     void SetView(in ViewType theType);
+01831     void SetBackground(in SALOMEDS::Color theColor);
 01832 
-01838     void SetPointOfView(in XYZ theCoord);
-01839 
-01845     XYZ GetPointOfView();
-01846 
-01850     void SetViewUp(in XYZ theDir);
-01851 
-01855     XYZ GetViewUp();
-01856 
-01861     void SetFocalPoint(in XYZ theDir);
-01862 
-01867     XYZ GetFocalPoint();
-01868 
-01872     void SetParallelScale(in double theScale);
-01873 
-01877     double GetParallelScale();
-01878 
-01884     void ScaleView(in Axis theAxis, in double theParam);
-01885 
-01889     void RemoveScale();
-01890 
-01896     boolean SaveViewParams(in string theName);
-01897 
-01903     boolean RestoreViewParams(in string theName);
-01904 
-01905 
-01910     PresentationType GetPresentationType(in ScalarMap thePrs);
-01911 
-01917     string SetPresentationType(in ScalarMap thePrs, in PresentationType thePrsType);
-01918 
-01923     boolean IsShrinked(in ScalarMap thePrs);
-01924 
-01930     string SetShrinked(in ScalarMap thePrs, in boolean isShrinked);
+01836     SALOMEDS::Color GetBackground();
+01837 
+01841     void EraseAll();
+01842 
+01846     void DisplayAll();
+01847 
+01852     void Erase(in PrsObject thePrsObj);
+01853 
+01858     void Display(in PrsObject thePrsObj);
+01859 
+01865     void DisplayOnly(in PrsObject thePrsObj);
+01866 
+01870     void Update();
+01871 
+01877     boolean SavePicture(in string theFileName);
+01878   };
+01879 
+01880   //-------------------------------------------------------
+01885   interface View3D : View {
+01890     enum ViewType{ FRONT, BACK, LEFT, RIGHT, TOP, BOTTOM};
+01891 
+01895     enum Axis{ XAxis, YAxis, ZAxis};
+01896 
+01900     typedef double XYZ[3];
+01901 
+01905     void FitAll();
+01906 
+01911     void SetView(in ViewType theType);
+01912 
+01918     void SetPointOfView(in XYZ theCoord);
+01919 
+01925     XYZ GetPointOfView();
+01926 
+01930     void SetViewUp(in XYZ theDir);
 01931 
-01936     boolean IsShaded(in ScalarMap thePrs);
-01937 
-01943     string SetShaded(in ScalarMap thePrs, in boolean isShaded);
-01944 
-01949     double GetOpacity(in ScalarMap thePrs);
-01950 
-01956     string SetOpacity(in ScalarMap thePrs, in double theOpacity);
-01957 
-01962     double GetLineWidth(in ScalarMap thePrs);
-01963 
-01969     string SetLineWidth(in ScalarMap thePrs, in double theLineWidth);
-01970   };
-01971 
-01972   //-------------------------------------------------------
-01977   interface TableView : View {
-01978   };
-01979 
-01980   //-------------------------------------------------------
-01986   interface XYPlot : View {
-01990     void SetSubTitle(in string theTitle);
+01935     XYZ GetViewUp();
+01936 
+01941     void SetFocalPoint(in XYZ theDir);
+01942 
+01947     XYZ GetFocalPoint();
+01948 
+01952     void SetParallelScale(in double theScale);
+01953 
+01957     double GetParallelScale();
+01958 
+01964     void ScaleView(in Axis theAxis, in double theParam);
+01965 
+01969     void RemoveScale();
+01970 
+01976     boolean SaveViewParams(in string theName);
+01977 
+01983     boolean RestoreViewParams(in string theName);
+01984 
+01985 
+01990     PresentationType GetPresentationType(in ScalarMap thePrs);
 01991 
-01994     string GetSubTitle();
-01995 
-02000     enum CurveType { POINTS, MULTYLINE, SPLINE};
-02001 
-02005     void SetCurveType(in CurveType theType);
-02006 
-02009     CurveType GetCurveType();
-02010 
-02015     void SetMarkerSize(in long theSize);
-02016 
-02020     long GetMarkerSize();
-02021 
-02024     void EnableXGrid(in boolean theMajor, in long theNumMajor, in boolean theMinor, in long theNumMinor);
-02025 
-02028     void EnableYGrid(in boolean theMajor, in long theNumMajor, in boolean theMinor, in long theNumMinor);
-02029 
-02033     void SetHorScaling(in Scaling theScaling);
-02034 
-02037     Scaling GetHorScaling();
-02038 
-02042     void SetVerScaling(in Scaling theScaling);
+01997     string SetPresentationType(in ScalarMap thePrs, in PresentationType thePrsType);
+01998 
+02003     boolean IsShrinked(in ScalarMap thePrs);
+02004 
+02010     string SetShrinked(in ScalarMap thePrs, in boolean isShrinked);
+02011 
+02016     boolean IsShaded(in ScalarMap thePrs);
+02017 
+02023     string SetShaded(in ScalarMap thePrs, in boolean isShaded);
+02024 
+02029     double GetOpacity(in ScalarMap thePrs);
+02030 
+02036     string SetOpacity(in ScalarMap thePrs, in double theOpacity);
+02037 
+02042     double GetLineWidth(in ScalarMap thePrs);
 02043 
-02046     Scaling GetVerScaling();
-02047 
-02051     void SetXTitle(in string theTitle);
-02052 
-02055     string GetXTitle();
-02056 
-02060     void SetYTitle(in string theTitle);
-02061 
-02064     string GetYTitle();
-02065 
-02068     void ShowLegend(in boolean theShowing);
-02069 
-02072     void FitAll();
-02073 
-02076     void FitXRange(in double xMin, in double xMax);
-02077 
-02080     void FitYRange(in double yMin, in double yMax);
+02049     string SetLineWidth(in ScalarMap thePrs, in double theLineWidth);
+02050   };
+02051 
+02052   //-------------------------------------------------------
+02057   interface TableView : View {
+02058   };
+02059 
+02060   //-------------------------------------------------------
+02066   interface XYPlot : View {
+02070     void SetSubTitle(in string theTitle);
+02071 
+02074     string GetSubTitle();
+02075 
+02080     enum CurveType { POINTS, MULTYLINE, SPLINE};
 02081 
-02084     void FitRange(in double xMin, in double xMax,
-02085             in double yMin, in double yMax);
+02085     void SetCurveType(in CurveType theType);
 02086 
-02087     void GetFitRanges(out double xMin,out double xMax,
-02088                 out double yMin,out double yMax);
-02089   };
+02089     CurveType GetCurveType();
 02090 
-02091   //-------------------------------------------------------
-02096   interface ViewManager: Base {
-02103     View GetCurrentView();
-02104 
-02109     View3D Create3DView();
-02110 
-02115     TableView CreateTableView(in Table theTable);
-02116 
-02121     XYPlot CreateXYPlot();
-02122 
-02126     void Destroy(in View theView);
-02127   };
-02128 };
-02129 
-02130 #endif
+02095     void SetMarkerSize(in long theSize);
+02096 
+02100     long GetMarkerSize();
+02101 
+02104     void EnableXGrid(in boolean theMajor, in long theNumMajor, in boolean theMinor, in long theNumMinor);
+02105 
+02108     void EnableYGrid(in boolean theMajor, in long theNumMajor, in boolean theMinor, in long theNumMinor);
+02109 
+02113     void SetHorScaling(in Scaling theScaling);
+02114 
+02117     Scaling GetHorScaling();
+02118 
+02122     void SetVerScaling(in Scaling theScaling);
+02123 
+02126     Scaling GetVerScaling();
+02127 
+02131     void SetXTitle(in string theTitle);
+02132 
+02135     string GetXTitle();
+02136 
+02140     void SetYTitle(in string theTitle);
+02141 
+02144     string GetYTitle();
+02145 
+02148     void ShowLegend(in boolean theShowing);
+02149 
+02152     void FitAll();
+02153 
+02156     void FitXRange(in double xMin, in double xMax);
+02157 
+02160     void FitYRange(in double yMin, in double yMax);
+02161 
+02164     void FitRange(in double xMin, in double xMax,
+02165             in double yMin, in double yMax);
+02166 
+02167     void GetFitRanges(out double xMin,out double xMax,
+02168                 out double yMin,out double yMax);
+02169   };
+02170 
+02171   //-------------------------------------------------------
+02176   interface ViewManager: Base {
+02183     View GetCurrentView();
+02184 
+02189     View3D Create3DView();
+02190 
+02195     TableView CreateTableView(in Table theTable);
+02196 
+02201     XYPlot CreateXYPlot();
+02202 
+02206     void Destroy(in View theView);
+02207   };
+02208 };
+02209 
+02210 #endif
 
+ diff --git a/doc/salome/gui/VISU/visugenidl_doc/VISU__Gen_8idl.html b/doc/salome/gui/VISU/visugenidl_doc/VISU__Gen_8idl.html index 062a41b4..14b7a98d 100644 --- a/doc/salome/gui/VISU/visugenidl_doc/VISU__Gen_8idl.html +++ b/doc/salome/gui/VISU/visugenidl_doc/VISU__Gen_8idl.html @@ -5,13 +5,14 @@ Main Page +   -

Interfaces of the VISU module: idl/VISU_Gen.idl File Reference

#include "SALOME_Exception.idl"
+

idl/VISU_Gen.idl File Reference

#include "SALOME_Exception.idl"
#include "SALOME_GenericObj.idl"
#include "SALOME_Component.idl"
#include "SALOMEDS.idl"
@@ -19,13 +20,13 @@ #include "MED.idl"

-Include dependency graph for VISU_Gen.idl:

+Include dependency graph for VISU_Gen.idl:

Go to the source code of this file. - + @@ -68,7 +69,7 @@ Include dependency graph for VISU_Gen.idl:

 
- + @@ -101,7 +102,7 @@ Include dependency graph for VISU_Gen.idl:

 
- + @@ -109,72 +110,74 @@ Include dependency graph for VISU_Gen.idl:

 
- + - - - -

Namespaces

namespace  VISU
namespace  VISU

Data Structures

interface  VISU.Base
Scalar Map on Deformed shape presentation interface. More...
interface  VISU.Plot3D
 Plot3D interface. More...
 Plot3D interface. More...
interface  VISU.CutPlanes
 Cut planes interface. More...
3D view interface More...
interface  VISU.TableView
 Interface of the Table view. More...
 Interface of the Table view. More...
interface  VISU.XYPlot
 Interface of the 2D plot view. More...
Interface of the ViewManager. More...

Typedefs

typedef string VISU.IdType
typedef string VISU.IdType

Enumerations

enum  VISU.Scaling { VISU.LINEAR, -VISU.LOGARITHMIC +
enum  VISU.Scaling { VISU.LINEAR, +VISU.LOGARITHMIC }
enum  VISU.Entity { VISU.NODE, -VISU.EDGE, -VISU.FACE, -VISU.CELL +
enum  VISU.Entity { VISU.NODE, +VISU.EDGE, +VISU.FACE, +VISU.CELL }
enum  VISU.VISUType {
-  VISU.TNONE, -VISU.TCURVE, -VISU.TTABLE, -VISU.TCONTAINER, +
enum  VISU.VISUType {
+  VISU.TNONE, +VISU.TCURVE, +VISU.TTABLE, +VISU.TCONTAINER,
-  VISU.TMESH, -VISU.TSCALARMAP, -VISU.TISOSURFACE, -VISU.TDEFORMEDSHAPE, +  VISU.TMESH, +VISU.TSCALARMAP, +VISU.TISOSURFACE, +VISU.TDEFORMEDSHAPE,
-  VISU.TSCALARMAPONDEFORMEDSHAPE, -VISU.TGAUSSPOINTS, -VISU.TPLOT3D, -VISU.TCUTPLANES, +  VISU.TSCALARMAPONDEFORMEDSHAPE, +VISU.TGAUSSPOINTS, +VISU.TPLOT3D, +VISU.TCUTPLANES,
-  VISU.TCUTLINES, -VISU.TVECTORS, -VISU.TSTREAMLINES, -VISU.TVISUGEN, +  VISU.TCUTLINES, +VISU.TVECTORS, +VISU.TSTREAMLINES, +VISU.TVISUGEN,
-  VISU.TVIEWMANAGER, -VISU.TRESULT, -VISU.TXYPLOT, -VISU.TTABLEVIEW, +  VISU.TVIEWMANAGER, +VISU.TRESULT, +VISU.TXYPLOT, +VISU.TTABLEVIEW,
-  VISU.TVIEW3D, -VISU.TGAUSSVIEW, -VISU.TENTITY, -VISU.TFAMILY, +  VISU.TVIEW3D, +VISU.TGAUSSVIEW, +VISU.TENTITY, +VISU.TFAMILY,
-  VISU.TGROUP, -VISU.TFIELD, -VISU.TTIMESTAMP, -VISU.TANIMATION, +  VISU.TGROUP, +VISU.TFIELD, +VISU.TTIMESTAMP, +VISU.TANIMATION,
-  VISU.TALL +  VISU.TALL
}
enum  VISU.PresentationType {
-  VISU.POINT, -VISU.WIREFRAME, -VISU.SHADED, -VISU.INSIDEFRAME, +
enum  VISU.PresentationType {
+  VISU.POINT, +VISU.WIREFRAME, +VISU.SHADED, +VISU.INSIDEFRAME,
-  VISU.SURFACEFRAME, -VISU.SHRINK +  VISU.SURFACEFRAME, +VISU.SHRINK
}


Detailed Description

This file conatins a set of interfaces of the VISU module. This module provides various forms of data visualization in SALOME application. These forms include data tables, XY plots, 3d representations and combination of these forms. + diff --git a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1Animation.html b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1Animation.html index 1c5bf25f..1f16a54a 100644 --- a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1Animation.html +++ b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1Animation.html @@ -5,22 +5,35 @@ Main Page +   +

VISU.Animation Interface Reference

Animation class More...

import "VISU_Gen.idl";

-Inheritance diagram for VISU.Animation:

Inheritance graph
+Inheritance diagram for VISU.Animation:

Inheritance graph
+ + + + + + - + + + @@ -38,9 +51,9 @@ Inheritance diagram for VISU.Animation:

ColoredPrs3d 
- + - + @@ -56,9 +69,9 @@ Inheritance diagram for VISU.Animation:

boolean 
- + - + @@ -70,6 +83,10 @@ Inheritance diagram for VISU.Animation:

void 
+ + + + @@ -78,9 +95,15 @@ Inheritance diagram for VISU.Animation:

boolean 
- + + + + + - + + + @@ -113,14 +136,46 @@ playing these animations in the VISU module. Time stamp represents a subfield: the results of calculations are taken in one definite moment.

+


Member Enumeration Documentation

+

+


Public Types

enum  AnimationMode { PARALLEL, +SUCCCESSIVE + }

Public Member Functions

void addField (in SALOMEDS::SObject theObject)
boolean addField (in SALOMEDS::SObject theObject)
void clearFields ()
void generatePresentations (in long theFieldNum)
getPresentation (in long theField, in long theFrame)
void setPresentationType (in long theFieldNum, in VISUType theType)
void setPresentationType (in long theFieldNum, in VISUType theType)
VISUType getPresentationType (in long theFieldNum)
VISUType getPresentationType (in long theFieldNum)
void setSpeed (in long theSpeed)
isRangeDefined ()
void dumpTo (in string thePath)
void dumpTo (in string thePath)
string setDumpFormat (in string theFormat)
string setDumpFormat (in string theFormat)
boolean isCycling ()
setCycling (in boolean theCycle)
boolean isCleaningMemoryAtEachFrame ()
void setCleaningMemoryAtEachFrame (in boolean theCycle)
SALOMEDS::SObject publishInStudy ()
void saveAnimation ()
isSavedInStudy ()
IdType GetID ()
void setAnimationMode (in AnimationMode theMode)
AnimationMode getAnimationMode ()
void ApplyProperties (in long theFieldNum, in ColoredPrs3d thePrs)
VISUType GetType ()
IdType GetID ()
VISUType GetType ()
Playback of an animation:
void startAnimation ()
+ + + +
+ + + + +
enum VISU::Animation::AnimationMode
+
+ + + + + +
+   + + +

+This enumeration contains a set of available animation modes.

Enumerator:
+ + + +
PARALLEL  +parallel mode of animation.
SUCCCESSIVE  +succcessive mode of animation.
+
+

Member Function Documentation

-

+

- + @@ -147,6 +202,33 @@ Defines the field which will be used as a base for generation of the animation.
void VISU.Animation.addField boolean VISU.Animation.addField in SALOMEDS::SObject  theObject
+

+ + + + +
+ + + + + + + + +
void VISU.Animation.clearFields  ) 
+
+ + + + + +
+   + + +

+Remove all fields from Animation object.

@@ -589,7 +671,7 @@ Returns the number of the current frame. - + @@ -618,7 +700,7 @@ Sets the type of presentation (vectors, deformed shape etc.) which will be gener
in VISUType in VISUType  theType
- + @@ -859,7 +941,7 @@ Returns True if the range of the animation has been defined by the method se - + @@ -890,9 +972,9 @@ Saves all the frames composing the animation into a definite directory. Pictures
VISUType VISU.Animation.getPresentationType VISUType VISU.Animation.getPresentationType in long  theFieldNum
void VISU.Animation.dumpTo in string in string  thePath  )  - + - + @@ -1067,6 +1149,61 @@ Sets cycling playback of the animation. The number of cycles can be infinite, un
string VISU.Animation.setDumpFormat string VISU.Animation.setDumpFormat in string in string  theFormat  ) 
+

+ + + + +
+ + + + + + + + +
boolean VISU.Animation.isCleaningMemoryAtEachFrame  ) 
+
+ + + + + +
+   + + +

+

+

+ + + + +
+ + + + + + + + + +
void VISU.Animation.setCleaningMemoryAtEachFrame in boolean  theCycle  ) 
+
+ + + + + +
+   + + +

+

@@ -1176,13 +1313,110 @@ Sets cycling playback of the animation. The number of cycles can be infinite, un
+

+ + + + +
+ + + + + + + + + +
void VISU.Animation.setAnimationMode in AnimationMode  theMode  ) 
+
+ + + + + +
+   + + +

+Sets the animation mode.

Parameters:
+ + +
theMode The value of this parameter is taken from the AnimationMode enumeration.
+
+
+

+ + + + +
+ + + + + + + + +
AnimationMode VISU.Animation.getAnimationMode  ) 
+
+ + + + + +
+   + + +

+Gets the animation mode.

+

+ + + + +
+ + + + + + + + + + + + + + + + + + +
void VISU.Animation.ApplyProperties in long  theFieldNum,
in ColoredPrs3d  thePrs
+
+ + + + + +
+   + + +

+Apply the presentation properties to all fields. The exception is raised in the following cases: 1) presentations for the given field is not yet created; 2) invalid dynamic cast of the given presentation to VISU.ColoredPrs3d_i; 3) the MED file is not the same; 4) the mesh name is not the same; 5) the field name is not the same; 6) the entity is not the same.

- + @@ -1209,7 +1443,7 @@ Returns ID of the object.
IdType VISU.Base.GetID IdType VISU.Base.GetID  )  - + @@ -1231,5 +1465,7 @@ Returns the type of the presentable object
VISUType VISU.Base.GetType VISUType VISU.Base.GetType  ) 
+ diff --git a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1Base.html b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1Base.html index 893d6a08..81bd3902 100644 --- a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1Base.html +++ b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1Base.html @@ -5,21 +5,52 @@ Main Page +   +

VISU.Base Interface Reference

import "VISU_Gen.idl";

-Inheritance diagram for VISU.Base:

Inheritance graph
+Inheritance diagram for VISU.Base:

Inheritance graph
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - +

Public Member Functions

IdType GetID ()
IdType GetID ()
VISUType GetType ()
VISUType GetType ()

Member Function Documentation

@@ -29,7 +60,7 @@ Inheritance diagram for VISU.Base:

- + @@ -56,7 +87,7 @@ Returns ID of the object. - + @@ -535,7 +555,7 @@ Sets the title of the scalar bar. By default - the name of the selected result i
IdType VISU.Base.GetID IdType VISU.Base.GetID  )  - + @@ -78,5 +109,7 @@ Returns the type of the presentable object
VISUType VISU.Base.GetType VISUType VISU.Base.GetType  ) 
+ diff --git a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1ColoredPrs3d.html b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1ColoredPrs3d.html index 520511b3..0e7a574f 100644 --- a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1ColoredPrs3d.html +++ b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1ColoredPrs3d.html @@ -5,18 +5,38 @@ Main Page +   +

VISU.ColoredPrs3d Interface Reference

Basic Interface for the Colored 3D Presentations. More...

import "VISU_Gen.idl";

-Inheritance diagram for VISU.ColoredPrs3d:

Inheritance graph
+Inheritance diagram for VISU.ColoredPrs3d:

Inheritance graph
+ + + + + + + + + + + + + + + + + @@ -50,9 +70,9 @@ Inheritance diagram for VISU.ColoredPrs3d:

long 
- + - + @@ -60,9 +80,9 @@ Inheritance diagram for VISU.ColoredPrs3d:

void 
- + - +

Public Member Functions

GetLabels ()
void SetTitle (in string theName)
void SetTitle (in string theName)
string GetTitle ()
string GetTitle ()
void SetOffset (in float theDx, in float theDy, in float theDz)
RemoveFromStudy ()
IdType GetID ()
IdType GetID ()
VISUType GetType ()
VISUType GetType ()

Detailed Description

@@ -504,7 +524,7 @@ Gets the number of labels which will be used for indication of color gradation o
void VISU.ColoredPrs3d.SetTitle in string in string  theName  )  - + @@ -675,7 +695,7 @@ Remove object from study.
string VISU.ColoredPrs3d.GetTitle string VISU.ColoredPrs3d.GetTitle  )  - + @@ -702,7 +722,7 @@ Returns ID of the object.
IdType VISU.Base.GetID IdType VISU.Base.GetID  )  - + @@ -724,5 +744,7 @@ Returns the type of the presentable object
VISUType VISU.Base.GetType VISUType VISU.Base.GetType  ) 
+ diff --git a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1Container.html b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1Container.html index 69f99750..a4e7c307 100644 --- a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1Container.html +++ b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1Container.html @@ -5,18 +5,26 @@ Main Page +   +

VISU.Container Interface Reference

Container presentable object interface More...

import "VISU_Gen.idl";

-Inheritance diagram for VISU.Container:

Inheritance graph
+Inheritance diagram for VISU.Container:

Inheritance graph
+ + + + + @@ -30,9 +38,9 @@ Inheritance diagram for VISU.Container:

void 
- + - +

Public Member Functions

RemoveFromStudy ()
IdType GetID ()
IdType GetID ()
VISUType GetType ()
VISUType GetType ()

Detailed Description

@@ -193,7 +201,7 @@ Remove object from study.
- + @@ -220,7 +228,7 @@ Returns ID of the object. - + @@ -203,7 +211,7 @@ Sets the title of the curve.
Parameters:
IdType VISU.Base.GetID IdType VISU.Base.GetID  )  - + @@ -242,5 +250,7 @@ Returns the type of the presentable object
VISUType VISU.Base.GetType VISUType VISU.Base.GetType  ) 
+ diff --git a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1Curve.html b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1Curve.html index 0a4e76fd..172b84da 100644 --- a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1Curve.html +++ b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1Curve.html @@ -5,18 +5,26 @@ Main Page +   +

VISU.Curve Interface Reference

Interface of curve representation. More...

import "VISU_Gen.idl";

-Inheritance diagram for VISU.Curve:

Inheritance graph
+Inheritance diagram for VISU.Curve:

Inheritance graph
+ + + + + @@ -48,9 +56,9 @@ Inheritance diagram for VISU.Curve:


Public Member Functions

-
+ - + @@ -68,9 +76,9 @@ Inheritance diagram for VISU.Curve:

void 
- + - +

Public Types

void SetTitle (in string theTitle)
void SetTitle (in string theTitle)
string GetTitle ()
string GetTitle ()
void SetColor (in SALOMEDS::Color theColor)
RemoveFromStudy ()
IdType GetID ()
IdType GetID ()
VISUType GetType ()
VISUType GetType ()

Detailed Description

@@ -172,7 +180,7 @@ This enumeration contains a set of elements defining the type of presentation of
void VISU.Curve.SetTitle in string in string  theTitle  )  - + @@ -479,7 +487,7 @@ Remove object from study.
string VISU.Curve.GetTitle string VISU.Curve.GetTitle  )  - + @@ -506,7 +514,7 @@ Returns ID of the object.
IdType VISU.Base.GetID IdType VISU.Base.GetID  )  - + @@ -528,5 +536,7 @@ Returns the type of the presentable object
VISUType VISU.Base.GetType VISUType VISU.Base.GetType  ) 
+ diff --git a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1CutLines.html b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1CutLines.html index 84f6308d..e5e052d4 100644 --- a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1CutLines.html +++ b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1CutLines.html @@ -5,18 +5,30 @@ Main Page +   +

VISU.CutLines Interface Reference

Cut lines presentation. More...

import "VISU_Gen.idl";

-Inheritance diagram for VISU.CutLines:

Inheritance graph
+Inheritance diagram for VISU.CutLines:

Inheritance graph
+ + + + + + + + + @@ -69,9 +81,17 @@ Inheritance diagram for VISU.CutLines:

long 
- + - + + + + + + + + + @@ -109,9 +129,9 @@ Inheritance diagram for VISU.CutLines:

long 
- + - + @@ -119,9 +139,9 @@ Inheritance diagram for VISU.CutLines:

void 
- + - +

Public Types

GetNbLines ()
void SetScaling (in Scaling theScaling)
void SetAllCurvesInverted (in boolean theInvert)
Scaling GetScaling ()
boolean IsAllCurvesInverted ()
void SetUseAbsoluteLength (in boolean theAbsLength)
boolean IsUseAbsoluteLength ()
void SetScaling (in Scaling theScaling)
Scaling GetScaling ()
void SetRange (in double theMin, in double theMax)
GetLabels ()
void SetTitle (in string theName)
void SetTitle (in string theName)
string GetTitle ()
string GetTitle ()
void SetOffset (in float theDx, in float theDy, in float theDz)
RemoveFromStudy ()
IdType GetID ()
IdType GetID ()
VISUType GetType ()
VISUType GetType ()

Detailed Description

@@ -865,6 +885,131 @@ Sets the number of cut lines.
Parameters:
Gets the number of cut lines.
+

+ + + + +
+ + + + + + + + + +
void VISU.CutLines.SetAllCurvesInverted in boolean  theInvert  ) 
+
+ + + + + +
+   + + +

+Invert all curves of corresponding table

Parameters:
+ + +
theInvert - Invert all curves, if value is TRUE, else not.
+
+
+

+ + + + +
+ + + + + + + + +
boolean VISU.CutLines.IsAllCurvesInverted  ) 
+
+ + + + + +
+   + + +

+Checks the orientation of all curves

Return values:
+ + +
TRUE - if all curves are inverted, else FALSE
+
+
+

+ + + + +
+ + + + + + + + + +
void VISU.CutLines.SetUseAbsoluteLength in boolean  theAbsLength  ) 
+
+ + + + + +
+   + + +

+Sets values which cutlines would be shown: aboslute or relative values

Parameters:
+ + +
theAbsLength - boolean value, TRUE or false.
+
+
+

+ + + + +
+ + + + + + + + +
boolean VISU.CutLines.IsUseAbsoluteLength  ) 
+
+ + + + + +
+   + + +

+Checks values of cutlines: using aboslute or relative values

@@ -873,7 +1018,7 @@ Gets the number of cut lines. - + @@ -904,7 +1049,7 @@ Sets the type of scaling of the values reflected by the scalar bar.
void VISU.ScalarMap.SetScaling in Scaling in Scaling  theScaling  )  [inherited] - + @@ -1463,7 +1608,7 @@ Gets the number of labels which will be used for indication of color gradation o - + @@ -1494,7 +1639,7 @@ Sets the title of the scalar bar. By default - the name of the selected result i
Scaling VISU.ScalarMap.GetScaling Scaling VISU.ScalarMap.GetScaling  ) 
void VISU.ColoredPrs3d.SetTitle in string in string  theName  )  [inherited] - + @@ -1634,7 +1779,7 @@ Remove object from study.
string VISU.ColoredPrs3d.GetTitle string VISU.ColoredPrs3d.GetTitle  )  - + @@ -1661,7 +1806,7 @@ Returns ID of the object. - + @@ -573,7 +585,7 @@ Sets the type of scaling of the values reflected by the scalar bar.
IdType VISU.Base.GetID IdType VISU.Base.GetID  )  - + @@ -1683,5 +1828,7 @@ Returns the type of the presentable object
VISUType VISU.Base.GetType VISUType VISU.Base.GetType  ) 
+ diff --git a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1CutPlanes.html b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1CutPlanes.html index 0a984a7d..eabf4827 100644 --- a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1CutPlanes.html +++ b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1CutPlanes.html @@ -5,18 +5,30 @@ Main Page +   +

VISU.CutPlanes Interface Reference

Cut planes interface. More...

import "VISU_Gen.idl";

-Inheritance diagram for VISU.CutPlanes:

Inheritance graph
+Inheritance diagram for VISU.CutPlanes:

Inheritance graph
+ + + + + + + + + @@ -50,9 +62,9 @@ Inheritance diagram for VISU.CutPlanes:

long 
- + - + @@ -90,9 +102,9 @@ Inheritance diagram for VISU.CutPlanes:

long 
- + - + @@ -100,9 +112,9 @@ Inheritance diagram for VISU.CutPlanes:

void 
- + - +

Public Types

GetNbPlanes ()
void SetScaling (in Scaling theScaling)
void SetScaling (in Scaling theScaling)
Scaling GetScaling ()
Scaling GetScaling ()
void SetRange (in double theMin, in double theMax)
GetLabels ()
void SetTitle (in string theName)
void SetTitle (in string theName)
string GetTitle ()
string GetTitle ()
void SetOffset (in float theDx, in float theDy, in float theDz)
RemoveFromStudy ()
IdType GetID ()
IdType GetID ()
VISUType GetType ()
VISUType GetType ()

Detailed Description

@@ -542,7 +554,7 @@ Gets the number of cut planes.
void VISU.ScalarMap.SetScaling in Scaling in Scaling  theScaling  )  [inherited] - + @@ -1132,7 +1144,7 @@ Gets the number of labels which will be used for indication of color gradation o - + @@ -1163,7 +1175,7 @@ Sets the title of the scalar bar. By default - the name of the selected result i
Scaling VISU.ScalarMap.GetScaling Scaling VISU.ScalarMap.GetScaling  ) 
void VISU.ColoredPrs3d.SetTitle in string in string  theName  )  [inherited] - + @@ -1303,7 +1315,7 @@ Remove object from study.
string VISU.ColoredPrs3d.GetTitle string VISU.ColoredPrs3d.GetTitle  )  - + @@ -1330,7 +1342,7 @@ Returns ID of the object. - + @@ -350,7 +364,7 @@ Sets the type of scaling of the values reflected by the scalar bar.
IdType VISU.Base.GetID IdType VISU.Base.GetID  )  - + @@ -1352,5 +1364,7 @@ Returns the type of the presentable object
VISUType VISU.Base.GetType VISUType VISU.Base.GetType  ) 
+ diff --git a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1DeformedShape.html b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1DeformedShape.html index 85f1b42c..20b397cd 100644 --- a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1DeformedShape.html +++ b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1DeformedShape.html @@ -5,18 +5,32 @@ Main Page +   +

VISU.DeformedShape Interface Reference

Deformed shape presentation interface. More...

import "VISU_Gen.idl";

-Inheritance diagram for VISU.DeformedShape:

Inheritance graph
+Inheritance diagram for VISU.DeformedShape:

Inheritance graph
+ + + + + + + + + + + @@ -37,9 +51,9 @@ Inheritance diagram for VISU.DeformedShape:

void 
- + - + @@ -77,9 +91,9 @@ Inheritance diagram for VISU.DeformedShape:

long 
- + - + @@ -87,9 +101,9 @@ Inheritance diagram for VISU.DeformedShape:

void 
- + - +

Public Types

SetColor (in SALOMEDS::Color theColor)
void SetScaling (in Scaling theScaling)
void SetScaling (in Scaling theScaling)
Scaling GetScaling ()
Scaling GetScaling ()
void SetRange (in double theMin, in double theMax)
GetLabels ()
void SetTitle (in string theName)
void SetTitle (in string theName)
string GetTitle ()
string GetTitle ()
void SetOffset (in float theDx, in float theDy, in float theDz)
RemoveFromStudy ()
IdType GetID ()
IdType GetID ()
VISUType GetType ()
VISUType GetType ()

Detailed Description

@@ -319,7 +333,7 @@ Sets the color of this presentation.
Parameters:
void VISU.ScalarMap.SetScaling in Scaling in Scaling  theScaling  )  [inherited] - + @@ -909,7 +923,7 @@ Gets the number of labels which will be used for indication of color gradation o - + @@ -940,7 +954,7 @@ Sets the title of the scalar bar. By default - the name of the selected result i
Scaling VISU.ScalarMap.GetScaling Scaling VISU.ScalarMap.GetScaling  ) 
void VISU.ColoredPrs3d.SetTitle in string in string  theName  )  [inherited] - + @@ -1080,7 +1094,7 @@ Remove object from study.
string VISU.ColoredPrs3d.GetTitle string VISU.ColoredPrs3d.GetTitle  )  - + @@ -1107,7 +1121,7 @@ Returns ID of the object. - + @@ -535,7 +546,7 @@ Sets the title of the scalar bar. By default - the name of the selected result i
IdType VISU.Base.GetID IdType VISU.Base.GetID  )  - + @@ -1129,5 +1143,7 @@ Returns the type of the presentable object
VISUType VISU.Base.GetType VISUType VISU.Base.GetType  ) 
+ diff --git a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1GaussPoints.html b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1GaussPoints.html index 99332f1e..a3b5c4a1 100644 --- a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1GaussPoints.html +++ b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1GaussPoints.html @@ -5,18 +5,29 @@ Main Page +   +

VISU.GaussPoints Interface Reference

Gauss Points presentation interface. More...

import "VISU_Gen.idl";

-Inheritance diagram for VISU.GaussPoints:

Inheritance graph
+Inheritance diagram for VISU.GaussPoints:

Inheritance graph
+ + + + + + + + @@ -50,9 +61,9 @@ Inheritance diagram for VISU.GaussPoints:

long 
- + - + @@ -60,9 +71,9 @@ Inheritance diagram for VISU.GaussPoints:

void 
- + - +

Public Member Functions

GetLabels ()
void SetTitle (in string theName)
void SetTitle (in string theName)
string GetTitle ()
string GetTitle ()
void SetOffset (in float theDx, in float theDy, in float theDz)
RemoveFromStudy ()
IdType GetID ()
IdType GetID ()
VISUType GetType ()
VISUType GetType ()

Detailed Description

@@ -504,7 +515,7 @@ Gets the number of labels which will be used for indication of color gradation o
void VISU.ColoredPrs3d.SetTitle in string in string  theName  )  [inherited] - + @@ -675,7 +686,7 @@ Remove object from study.
string VISU.ColoredPrs3d.GetTitle string VISU.ColoredPrs3d.GetTitle  )  - + @@ -702,7 +713,7 @@ Returns ID of the object. - + @@ -222,7 +234,7 @@ Sets the type of scaling of the values reflected by the scalar bar.
IdType VISU.Base.GetID IdType VISU.Base.GetID  )  - + @@ -724,5 +735,7 @@ Returns the type of the presentable object
VISUType VISU.Base.GetType VISUType VISU.Base.GetType  ) 
+ diff --git a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1IsoSurfaces.html b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1IsoSurfaces.html index 59cfa569..b0ae625c 100644 --- a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1IsoSurfaces.html +++ b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1IsoSurfaces.html @@ -5,18 +5,30 @@ Main Page +   +

VISU.IsoSurfaces Interface Reference

Interface of the isometric surface presentation. More...

import "VISU_Gen.idl";

-Inheritance diagram for VISU.IsoSurfaces:

Inheritance graph
+Inheritance diagram for VISU.IsoSurfaces:

Inheritance graph
+ + + + + + + + + @@ -29,9 +41,9 @@ Inheritance diagram for VISU.IsoSurfaces:

long 
- + - + @@ -69,9 +81,9 @@ Inheritance diagram for VISU.IsoSurfaces:

long 
- + - + @@ -79,9 +91,9 @@ Inheritance diagram for VISU.IsoSurfaces:

void 
- + - +

Public Types

GetNbSurfaces ()
void SetScaling (in Scaling theScaling)
void SetScaling (in Scaling theScaling)
Scaling GetScaling ()
Scaling GetScaling ()
void SetRange (in double theMin, in double theMax)
GetLabels ()
void SetTitle (in string theName)
void SetTitle (in string theName)
string GetTitle ()
string GetTitle ()
void SetOffset (in float theDx, in float theDy, in float theDz)
RemoveFromStudy ()
IdType GetID ()
IdType GetID ()
VISUType GetType ()
VISUType GetType ()

Detailed Description

@@ -191,7 +203,7 @@ Gets the number of isometric surfaces
void VISU.ScalarMap.SetScaling in Scaling in Scaling  theScaling  )  [inherited] - + @@ -781,7 +793,7 @@ Gets the number of labels which will be used for indication of color gradation o - + @@ -812,7 +824,7 @@ Sets the title of the scalar bar. By default - the name of the selected result i
Scaling VISU.ScalarMap.GetScaling Scaling VISU.ScalarMap.GetScaling  ) 
void VISU.ColoredPrs3d.SetTitle in string in string  theName  )  [inherited] - + @@ -952,7 +964,7 @@ Remove object from study.
string VISU.ColoredPrs3d.GetTitle string VISU.ColoredPrs3d.GetTitle  )  - + @@ -979,7 +991,7 @@ Returns ID of the object. - + @@ -270,7 +280,7 @@ Sets the type of representation of a mesh.
Parameters:
IdType VISU.Base.GetID IdType VISU.Base.GetID  )  - + @@ -1001,5 +1013,7 @@ Returns the type of the presentable object
VISUType VISU.Base.GetType VISUType VISU.Base.GetType  ) 
+ diff --git a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1Mesh.html b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1Mesh.html index 4323e7db..aacf8d8f 100644 --- a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1Mesh.html +++ b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1Mesh.html @@ -5,18 +5,28 @@ Main Page +   +

VISU.Mesh Interface Reference

Interface of the mesh. More...

import "VISU_Gen.idl";

-Inheritance diagram for VISU.Mesh:

Inheritance graph
+Inheritance diagram for VISU.Mesh:

Inheritance graph
+ + + + + + + @@ -32,9 +42,9 @@ Inheritance diagram for VISU.Mesh:

SALOMEDS::Color 
- + - + @@ -42,9 +52,9 @@ Inheritance diagram for VISU.Mesh:

void 
- + - +

Public Member Functions

GetLinkColor ()
void SetPresentationType (in PresentationType theType)
void SetPresentationType (in PresentationType theType)
PresentationType GetPresentationType ()
PresentationType GetPresentationType ()
void SetOffset (in float theDx, in float theDy, in float theDz)
RemoveFromStudy ()
IdType GetID ()
IdType GetID ()
VISUType GetType ()
VISUType GetType ()

Detailed Description

@@ -239,7 +249,7 @@ Gets the color of mesh links.
void VISU.Mesh.SetPresentationType in PresentationType in PresentationType  theType  ) 
- + @@ -411,7 +421,7 @@ Remove object from study.
PresentationType VISU.Mesh.GetPresentationType PresentationType VISU.Mesh.GetPresentationType  )  - + @@ -438,7 +448,7 @@ Returns ID of the object. - + @@ -594,7 +606,7 @@ Sets the type of scaling of the values reflected by the scalar bar.
IdType VISU.Base.GetID IdType VISU.Base.GetID  )  - + @@ -460,5 +470,7 @@ Returns the type of the presentable object
VISUType VISU.Base.GetType VISUType VISU.Base.GetType  ) 
+ diff --git a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1Plot3D.html b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1Plot3D.html index 95389d07..bfbd1426 100644 --- a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1Plot3D.html +++ b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1Plot3D.html @@ -5,18 +5,30 @@ Main Page +   -

VISU.Plot3D Interface Reference

Plot3D interface. + +

VISU.Plot3D Interface Reference

Plot3D interface. More...

import "VISU_Gen.idl";

-Inheritance diagram for VISU.Plot3D:

Inheritance graph
+Inheritance diagram for VISU.Plot3D:

Inheritance graph
+ + + + + + + + + @@ -52,9 +64,9 @@ Inheritance diagram for VISU.Plot3D:

long 
- + - + @@ -92,9 +104,9 @@ Inheritance diagram for VISU.Plot3D:

long 
- + - + @@ -102,9 +114,9 @@ Inheritance diagram for VISU.Plot3D:

void 
- + - +

Public Types

GetNbOfContours ()
void SetScaling (in Scaling theScaling)
void SetScaling (in Scaling theScaling)
Scaling GetScaling ()
Scaling GetScaling ()
void SetRange (in double theMin, in double theMax)
GetLabels ()
void SetTitle (in string theName)
void SetTitle (in string theName)
string GetTitle ()
string GetTitle ()
void SetOffset (in float theDx, in float theDy, in float theDz)
RemoveFromStudy ()
IdType GetID ()
IdType GetID ()
VISUType GetType ()
VISUType GetType ()

Detailed Description

@@ -563,7 +575,7 @@ Gets the number of contours.
void VISU.ScalarMap.SetScaling in Scaling in Scaling  theScaling  )  [inherited] - + @@ -1153,7 +1165,7 @@ Gets the number of labels which will be used for indication of color gradation o - + @@ -1184,7 +1196,7 @@ Sets the title of the scalar bar. By default - the name of the selected result i
Scaling VISU.ScalarMap.GetScaling Scaling VISU.ScalarMap.GetScaling  ) 
void VISU.ColoredPrs3d.SetTitle in string in string  theName  )  [inherited] - + @@ -1324,7 +1336,7 @@ Remove object from study.
string VISU.ColoredPrs3d.GetTitle string VISU.ColoredPrs3d.GetTitle  )  - + @@ -1351,7 +1363,7 @@ Returns ID of the object.
IdType VISU.Base.GetID IdType VISU.Base.GetID  )  - + @@ -1373,5 +1385,7 @@ Returns the type of the presentable object
VISUType VISU.Base.GetType VISUType VISU.Base.GetType  ) 
+ diff --git a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1Prs3d.html b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1Prs3d.html index a352a928..1b5ddef5 100644 --- a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1Prs3d.html +++ b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1Prs3d.html @@ -5,18 +5,39 @@ Main Page +   +

VISU.Prs3d Interface Reference

3D presentation interface More...

import "VISU_Gen.idl";

-Inheritance diagram for VISU.Prs3d:

Inheritance graph
+Inheritance diagram for VISU.Prs3d:

Inheritance graph
+ + + + + + + + + + + + + + + + + + @@ -26,9 +47,9 @@ Inheritance diagram for VISU.Prs3d:

void 
- + - +

Public Member Functions

RemoveFromStudy ()
IdType GetID ()
IdType GetID ()
VISUType GetType ()
VISUType GetType ()

Detailed Description

@@ -154,7 +175,7 @@ Remove object from study.
- + @@ -181,7 +202,7 @@ Returns ID of the object.
IdType VISU.Base.GetID IdType VISU.Base.GetID  )  - + @@ -203,5 +224,7 @@ Returns the type of the presentable object
VISUType VISU.Base.GetType VISUType VISU.Base.GetType  ) 
+ diff --git a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1PrsObject.html b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1PrsObject.html index e3e0679b..8c56ee4f 100644 --- a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1PrsObject.html +++ b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1PrsObject.html @@ -5,26 +5,49 @@ Main Page +   +

VISU.PrsObject Interface Reference

Presentable object interface. More...

import "VISU_Gen.idl";

-Inheritance diagram for VISU.PrsObject:

Inheritance graph
+Inheritance diagram for VISU.PrsObject:

Inheritance graph
+ + + + + + + + + + + + + + + + + + + + - + - +

Public Member Functions

void RemoveFromStudy ()
IdType GetID ()
IdType GetID ()
VISUType GetType ()
VISUType GetType ()

Detailed Description

@@ -64,7 +87,7 @@ Remove object from study.
- + @@ -91,7 +114,7 @@ Returns ID of the object.
IdType VISU.Base.GetID IdType VISU.Base.GetID  )  - + @@ -113,5 +136,7 @@ Returns the type of the presentable object
VISUType VISU.Base.GetType VISUType VISU.Base.GetType  ) 
+ diff --git a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1RemovableObject.html b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1RemovableObject.html index 17e06eed..85775287 100644 --- a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1RemovableObject.html +++ b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1RemovableObject.html @@ -5,26 +5,50 @@ Main Page +   +

VISU.RemovableObject Interface Reference

Removable object interface. More...

import "VISU_Gen.idl";

-Inheritance diagram for VISU.RemovableObject:

Inheritance graph
+Inheritance diagram for VISU.RemovableObject:

Inheritance graph
+ + + + + + + + + + + + + + + + + + + + + - + - +

Public Member Functions

void RemoveFromStudy ()
IdType GetID ()
IdType GetID ()
VISUType GetType ()
VISUType GetType ()

Detailed Description

@@ -64,7 +88,7 @@ Remove object from study.
- + @@ -91,7 +115,7 @@ Returns ID of the object.
IdType VISU.Base.GetID IdType VISU.Base.GetID  )  - + @@ -113,5 +137,7 @@ Returns the type of the presentable object
VISUType VISU.Base.GetType VISUType VISU.Base.GetType  ) 
+ diff --git a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1Result.html b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1Result.html index 3485b96e..0991db36 100644 --- a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1Result.html +++ b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1Result.html @@ -5,18 +5,26 @@ Main Page +   +

VISU.Result Interface Reference

Interface Result. More...

import "VISU_Gen.idl";

-Inheritance diagram for VISU.Result:

Inheritance graph
+Inheritance diagram for VISU.Result:

Inheritance graph
+ + + + + @@ -40,9 +48,9 @@ Inheritance diagram for VISU.Result:

void 
- + - +

Public Member Functions

RemoveFromStudy ()
IdType GetID ()
IdType GetID ()
VISUType GetType ()
VISUType GetType ()

Detailed Description

@@ -346,7 +354,7 @@ Remove object from study.
- + @@ -373,7 +381,7 @@ Returns ID of the object. - + @@ -157,7 +176,7 @@ Sets the type of scaling of the values reflected by the scalar bar.
IdType VISU.Base.GetID IdType VISU.Base.GetID  )  - + @@ -395,5 +403,7 @@ Returns the type of the presentable object
VISUType VISU.Base.GetType VISUType VISU.Base.GetType  ) 
+ diff --git a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1ScalarMap.html b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1ScalarMap.html index 277943e2..d39fe6eb 100644 --- a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1ScalarMap.html +++ b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1ScalarMap.html @@ -5,18 +5,37 @@ Main Page +   +

VISU.ScalarMap Interface Reference

Interface of the Scalar Map. More...

import "VISU_Gen.idl";

-Inheritance diagram for VISU.ScalarMap:

Inheritance graph
+Inheritance diagram for VISU.ScalarMap:

Inheritance graph
+ + + + + + + + + + + + + + + + @@ -25,9 +44,9 @@ Inheritance diagram for VISU.ScalarMap:


Public Member Functions

-
+ - + @@ -65,9 +84,9 @@ Inheritance diagram for VISU.ScalarMap:

long 
- + - + @@ -75,9 +94,9 @@ Inheritance diagram for VISU.ScalarMap:

void 
- + - +

Public Types

void SetScaling (in Scaling theScaling)
void SetScaling (in Scaling theScaling)
Scaling GetScaling ()
Scaling GetScaling ()
void SetRange (in double theMin, in double theMax)
GetLabels ()
void SetTitle (in string theName)
void SetTitle (in string theName)
string GetTitle ()
string GetTitle ()
void SetOffset (in float theDx, in float theDy, in float theDz)
RemoveFromStudy ()
IdType GetID ()
IdType GetID ()
VISUType GetType ()
VISUType GetType ()

Detailed Description

@@ -126,7 +145,7 @@ Implemented in void VISU.ScalarMap.SetScaling
in Scaling in Scaling  theScaling  )  - + @@ -716,7 +735,7 @@ Gets the number of labels which will be used for indication of color gradation o - + @@ -747,7 +766,7 @@ Sets the title of the scalar bar. By default - the name of the selected result i
Scaling VISU.ScalarMap.GetScaling Scaling VISU.ScalarMap.GetScaling  ) 
void VISU.ColoredPrs3d.SetTitle in string in string  theName  )  [inherited] - + @@ -887,7 +906,7 @@ Remove object from study.
string VISU.ColoredPrs3d.GetTitle string VISU.ColoredPrs3d.GetTitle  )  - + @@ -914,7 +933,7 @@ Returns ID of the object. - + - + @@ -307,7 +319,7 @@ Gets the scale of the presentatable object. - + @@ -346,7 +358,7 @@ Sets the scalar field
Parameters:
- + @@ -377,7 +389,7 @@ Sets the type of scaling of the values reflected by the scalar bar.
IdType VISU.Base.GetID IdType VISU.Base.GetID  )  - + @@ -936,5 +955,7 @@ Returns the type of the presentable object
VISUType VISU.Base.GetType VISUType VISU.Base.GetType  ) 
+ diff --git a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1ScalarMapOnDeformedShape.html b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1ScalarMapOnDeformedShape.html index fef17552..435b0bda 100644 --- a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1ScalarMapOnDeformedShape.html +++ b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1ScalarMapOnDeformedShape.html @@ -5,18 +5,30 @@ Main Page +   +

VISU.ScalarMapOnDeformedShape Interface Reference

Scalar Map on Deformed shape presentation interface. More...

import "VISU_Gen.idl";

-Inheritance diagram for VISU.ScalarMapOnDeformedShape:

Inheritance graph
+Inheritance diagram for VISU.ScalarMapOnDeformedShape:

Inheritance graph
+ + + + + + + + + @@ -35,11 +47,11 @@ Inheritance diagram for VISU.ScalarMapOnDeformedShape:

double 
- + - + - + @@ -77,9 +89,9 @@ Inheritance diagram for VISU.ScalarMapOnDeformedShape:

long 
- + - + @@ -87,9 +99,9 @@ Inheritance diagram for VISU.ScalarMapOnDeformedShape:

void 
- + - +

Public Types

GetScale ()
void SetScalarField (in string theMeshName, in string theFieldName, in long theIteration, in Entity theEntity)
void SetScalarField (in string theMeshName, in string theFieldName, in long theIteration, in Entity theEntity)
void SetScaling (in Scaling theScaling)
void SetScaling (in Scaling theScaling)
Scaling GetScaling ()
Scaling GetScaling ()
void SetRange (in double theMin, in double theMax)
GetLabels ()
void SetTitle (in string theName)
void SetTitle (in string theName)
string GetTitle ()
string GetTitle ()
void SetOffset (in float theDx, in float theDy, in float theDz)
RemoveFromStudy ()
IdType GetID ()
IdType GetID ()
VISUType GetType ()
VISUType GetType ()

Detailed Description

@@ -289,13 +301,13 @@ Gets the scale of the presentatable object.
void VISU.ScalarMapOnDeformedShape.SetScalarField in string in string  theMeshName,
in string in string  theFieldName,
in Entity in Entity  theEntity
void VISU.ScalarMap.SetScaling in Scaling in Scaling  theScaling  )  [inherited] - + @@ -936,7 +948,7 @@ Gets the number of labels which will be used for indication of color gradation o - + @@ -967,7 +979,7 @@ Sets the title of the scalar bar. By default - the name of the selected result i
Scaling VISU.ScalarMap.GetScaling Scaling VISU.ScalarMap.GetScaling  ) 
void VISU.ColoredPrs3d.SetTitle in string in string  theName  )  [inherited] - + @@ -1107,7 +1119,7 @@ Remove object from study.
string VISU.ColoredPrs3d.GetTitle string VISU.ColoredPrs3d.GetTitle  )  - + @@ -1134,7 +1146,7 @@ Returns ID of the object. - + @@ -642,7 +655,7 @@ Sets the type of scaling of the values reflected by the scalar bar.
IdType VISU.Base.GetID IdType VISU.Base.GetID  )  - + @@ -1156,5 +1168,7 @@ Returns the type of the presentable object
VISUType VISU.Base.GetType VISUType VISU.Base.GetType  ) 
+ diff --git a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1StreamLines.html b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1StreamLines.html index 87dd7eff..f66c65d3 100644 --- a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1StreamLines.html +++ b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1StreamLines.html @@ -5,18 +5,31 @@ Main Page +   +

VISU.StreamLines Interface Reference

Interface of the stream lines representation. More...

import "VISU_Gen.idl";

-Inheritance diagram for VISU.StreamLines:

Inheritance graph
+Inheritance diagram for VISU.StreamLines:

Inheritance graph
+ + + + + + + + + + @@ -56,9 +69,9 @@ Inheritance diagram for VISU.StreamLines:

void 
- + - + @@ -96,9 +109,9 @@ Inheritance diagram for VISU.StreamLines:

long 
- + - + @@ -106,9 +119,9 @@ Inheritance diagram for VISU.StreamLines:

void 
- + - +

Public Types

SetColor (in SALOMEDS::Color theColor)
void SetScaling (in Scaling theScaling)
void SetScaling (in Scaling theScaling)
Scaling GetScaling ()
Scaling GetScaling ()
void SetRange (in double theMin, in double theMax)
GetLabels ()
void SetTitle (in string theName)
void SetTitle (in string theName)
string GetTitle ()
string GetTitle ()
void SetOffset (in float theDx, in float theDy, in float theDz)
RemoveFromStudy ()
IdType GetID ()
IdType GetID ()
VISUType GetType ()
VISUType GetType ()

Detailed Description

@@ -611,7 +624,7 @@ Sets the color of this presentation.
Parameters:
void VISU.ScalarMap.SetScaling in Scaling in Scaling  theScaling  )  [inherited] - + @@ -1201,7 +1214,7 @@ Gets the number of labels which will be used for indication of color gradation o - + @@ -1232,7 +1245,7 @@ Sets the title of the scalar bar. By default - the name of the selected result i
Scaling VISU.ScalarMap.GetScaling Scaling VISU.ScalarMap.GetScaling  ) 
void VISU.ColoredPrs3d.SetTitle in string in string  theName  )  [inherited] - + @@ -1372,7 +1385,7 @@ Remove object from study.
string VISU.ColoredPrs3d.GetTitle string VISU.ColoredPrs3d.GetTitle  )  - + @@ -1399,7 +1412,7 @@ Returns ID of the object. - + @@ -119,7 +127,7 @@ Sets the title of the table.
Parameters:
IdType VISU.Base.GetID IdType VISU.Base.GetID  )  - + @@ -1421,5 +1434,7 @@ Returns the type of the presentable object
VISUType VISU.Base.GetType VISUType VISU.Base.GetType  ) 
+ diff --git a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1Table.html b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1Table.html index c4d4f208..25ebfe38 100644 --- a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1Table.html +++ b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1Table.html @@ -5,18 +5,26 @@ Main Page +   +

VISU.Table Interface Reference

Table representation interface More...

import "VISU_Gen.idl";

-Inheritance diagram for VISU.Table:

Inheritance graph
+Inheritance diagram for VISU.Table:

Inheritance graph
+ + + + + @@ -25,9 +33,9 @@ Inheritance diagram for VISU.Table:


Public Member Functions

-
+ - + @@ -39,9 +47,9 @@ Inheritance diagram for VISU.Table:

void 
- + - +

Public Types

void SetTitle (in string theTitle)
void SetTitle (in string theTitle)
string GetTitle ()
string GetTitle ()
void SetOrientation (in Orientation theOrientation)
RemoveFromStudy ()
IdType GetID ()
IdType GetID ()
VISUType GetType ()
VISUType GetType ()

Detailed Description

@@ -88,7 +96,7 @@ Vertical orientation of the table.
void VISU.Table.SetTitle in string in string  theTitle  )  - + @@ -291,7 +299,7 @@ Remove object from study.
string VISU.Table.GetTitle string VISU.Table.GetTitle  )  - + @@ -318,7 +326,7 @@ Returns ID of the object. - + @@ -1022,7 +1029,7 @@ Sets the title of the View frame.
Parameters:
IdType VISU.Base.GetID IdType VISU.Base.GetID  )  - + @@ -340,5 +348,7 @@ Returns the type of the presentable object
VISUType VISU.Base.GetType VISUType VISU.Base.GetType  ) 
+ diff --git a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1TableView.html b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1TableView.html index 375929f3..da2505fb 100644 --- a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1TableView.html +++ b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1TableView.html @@ -5,18 +5,25 @@ Main Page +   +

VISU.TableView Interface Reference

Interface of the Table view. More...

import "VISU_Gen.idl";

-Inheritance diagram for VISU.TableView:

Inheritance graph
+Inheritance diagram for VISU.TableView:

Inheritance graph
+ + + + @@ -84,9 +91,9 @@ Inheritance diagram for VISU.TableView:

void 
- + - + @@ -94,9 +101,9 @@ Inheritance diagram for VISU.TableView:

void 
- + - + @@ -114,11 +121,11 @@ Inheritance diagram for VISU.TableView:

void 
- + - + - +

Public Types

SetViewPositionVertical (in ViewPosition ViewPosVer)
void SetRelativePosition (in double x, in double y)
void SetRelativePosition (in double x, in double y)
void SetRelativeSize (in double x, in double y)
void SetRelativeSize (in double x, in double y)
void Minimize ()
Maximize ()
void SetTitle (in string theTitle)
void SetTitle (in string theTitle)
string GetTitle ()
string GetTitle ()
void SetBackground (in SALOMEDS::Color theColor)
Update ()
boolean SavePicture (in string theFileName)
boolean SavePicture (in string theFileName)
IdType GetID ()
IdType GetID ()
VISUType GetType ()
VISUType GetType ()

Detailed Description

@@ -991,7 +998,7 @@ Old methods for view parameters management, they don't work now
void VISU.View.SetTitle in string in string  theTitle  )  [inherited] - + @@ -1291,7 +1298,7 @@ Updates the view. - + @@ -1323,7 +1330,7 @@ Saves the view.
Parameters:
string VISU.View.GetTitle string VISU.View.GetTitle  ) 
boolean VISU.View.SavePicture in string in string  theFileName  )  [inherited] - + @@ -1350,7 +1357,7 @@ Returns ID of the object. - + @@ -217,7 +227,7 @@ Imports tables from a file and create TableAttribute in Sudy - + @@ -248,7 +258,7 @@ Export table to a file - + @@ -281,7 +291,7 @@ Imports data from a file. The access to this file will be conserved outside of t - + @@ -314,7 +324,7 @@ Create result and initialize its with the file. The access to this file will be - + @@ -409,19 +419,19 @@ Imports data from a MED field. - + - + - + @@ -467,25 +477,25 @@ Rename a study object, representing a mesh, specified by given values.
- + - + - + - + @@ -522,19 +532,19 @@ Rename a study object, representing a mesh, specified by given values.
- + - + - + @@ -571,13 +581,13 @@ Rename a study object, representing a mesh, specified by given values.
- + - + @@ -621,19 +631,19 @@ Creates a mesh on the basis of the data generated in other sources ( - + - + - + @@ -677,13 +687,13 @@ Creates on the basis of a family a mesh which will be composed of geometrical el - + - + @@ -727,19 +737,19 @@ Creates a mesh on the basis of a group of families.
Parameter
- + - + - + @@ -791,19 +801,19 @@ Creates a scalar map presentation.
Parameters:
- + - + - + @@ -855,19 +865,19 @@ Creates a Gauss Points presentation.
Parameters:
- + - + - + @@ -919,19 +929,19 @@ Creates a deformed shape presentation.
Parameters:
- + - + - + @@ -983,19 +993,19 @@ Creates a deformed shape presentation.
Parameters:
- + - + - + @@ -1047,19 +1057,19 @@ Creates a vector presentation.
Parameters:
- + - + - + @@ -1111,19 +1121,19 @@ Creates an iso surface presentation.
Parameters:
- + - + - + @@ -1175,19 +1185,19 @@ Creates an stream lines presentation.
Parameters:
- + - + - + @@ -1239,19 +1249,19 @@ Creates a presentation of cut planes.
Parameters:
- + - + - + @@ -1303,19 +1313,19 @@ Creates a presentation of cut lines.
Parameters:
- + - + - + @@ -1361,7 +1371,7 @@ Creates a Plot3D presentat - + @@ -1436,6 +1446,63 @@ Creates a curve on the basis of points, whose values are taken from the table. <
IdType VISU.Base.GetID IdType VISU.Base.GetID  )  - + @@ -1372,5 +1379,7 @@ Returns the type of the presentable object
VISUType VISU.Base.GetType VISUType VISU.Base.GetType  ) 
+ diff --git a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1VISU__Gen.html b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1VISU__Gen.html index 2031854b..1040447e 100644 --- a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1VISU__Gen.html +++ b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1VISU__Gen.html @@ -5,18 +5,26 @@ Main Page +   +

VISU.VISU_Gen Interface Reference

VISU_Gen interface More...

import "VISU_Gen.idl";

-Inheritance diagram for VISU.VISU_Gen:

Inheritance graph
+Inheritance diagram for VISU.VISU_Gen:

Inheritance graph
+ + + + + @@ -26,56 +34,58 @@ Inheritance diagram for VISU.VISU_Gen:

ViewManager 
- + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + @@ -84,9 +94,9 @@ Inheritance diagram for VISU.VISU_Gen:

void 
- + - +

Public Member Functions

GetViewManager ()
SALOMEDS::SObject ImportTables (in string theFileName)
SALOMEDS::SObject ImportTables (in string theFileName)
boolean ExportTableToFile (in SALOMEDS::SObject theTable, in string theFileName)
boolean ExportTableToFile (in SALOMEDS::SObject theTable, in string theFileName)
Result ImportFile (in string theFileName)
Result ImportFile (in string theFileName)
Result CreateResult (in string theFileName)
Result CreateResult (in string theFileName)
Result CopyAndImportFile (in string theFileName)
Result CopyAndImportFile (in string theFileName)
Result ImportMed (in SALOMEDS::SObject theMedSObject)
Result ImportMedField (in SALOME_MED::FIELD theField)
void RenameEntityInStudy (in Result theResult, in string theMeshName, in Entity theEntity, in string theNewName)
void RenameEntityInStudy (in Result theResult, in string theMeshName, in Entity theEntity, in string theNewName)
void RenameFamilyInStudy (in Result theResult, in string theMeshName, in Entity theEntity, in string theSubMeshName, in string theNewName)
void RenameFamilyInStudy (in Result theResult, in string theMeshName, in Entity theEntity, in string theSubMeshName, in string theNewName)
void RenameGroupInStudy (in Result theResult, in string theMeshName, in string theSubMeshName, in string theNewName)
void RenameGroupInStudy (in Result theResult, in string theMeshName, in string theSubMeshName, in string theNewName)
Mesh MeshOnEntity (in Result theResult, in string theMeshName, in Entity theEntity)
Mesh MeshOnEntity (in Result theResult, in string theMeshName, in Entity theEntity)
Mesh FamilyMeshOnEntity (in Result theResult, in string theMeshName, in Entity theEntity, in string theFamilyName)
Mesh FamilyMeshOnEntity (in Result theResult, in string theMeshName, in Entity theEntity, in string theFamilyName)
Mesh GroupMesh (in Result theResult, in string theMeshName, in string theGroupName)
Mesh GroupMesh (in Result theResult, in string theMeshName, in string theGroupName)
ScalarMap ScalarMapOnField (in Result theResult, in string theMeshName, in Entity theEntity, in string theFieldName, in double theIteration)
ScalarMap ScalarMapOnField (in Result theResult, in string theMeshName, in Entity theEntity, in string theFieldName, in double theIteration)
GaussPoints GaussPointsOnField (in Result theResult, in string theMeshName, in Entity theEntity, in string theFieldName, in double theIteration)
GaussPoints GaussPointsOnField (in Result theResult, in string theMeshName, in Entity theEntity, in string theFieldName, in double theIteration)
DeformedShape DeformedShapeOnField (in Result theResult, in string theMeshName, in Entity theEntity, in string theFieldName, in double theIteration)
DeformedShape DeformedShapeOnField (in Result theResult, in string theMeshName, in Entity theEntity, in string theFieldName, in double theIteration)
ScalarMapOnDeformedShape ScalarMapOnDeformedShapeOnField (in Result theResult, in string theMeshName, in Entity theEntity, in string theFieldName, in double theIteration)
ScalarMapOnDeformedShape ScalarMapOnDeformedShapeOnField (in Result theResult, in string theMeshName, in Entity theEntity, in string theFieldName, in double theIteration)
Vectors VectorsOnField (in Result theResult, in string theMeshName, in Entity theEntity, in string theFieldName, in double theIteration)
Vectors VectorsOnField (in Result theResult, in string theMeshName, in Entity theEntity, in string theFieldName, in double theIteration)
IsoSurfaces IsoSurfacesOnField (in Result theResult, in string theMeshName, in Entity theEntity, in string theFieldName, in double theIteration)
IsoSurfaces IsoSurfacesOnField (in Result theResult, in string theMeshName, in Entity theEntity, in string theFieldName, in double theIteration)
StreamLines StreamLinesOnField (in Result theResult, in string theMeshName, in Entity theEntity, in string theFieldName, in double theIteration)
StreamLines StreamLinesOnField (in Result theResult, in string theMeshName, in Entity theEntity, in string theFieldName, in double theIteration)
CutPlanes CutPlanesOnField (in Result theResult, in string theMeshName, in Entity theEntity, in string theFieldName, in double theIteration)
CutPlanes CutPlanesOnField (in Result theResult, in string theMeshName, in Entity theEntity, in string theFieldName, in double theIteration)
CutLines CutLinesOnField (in Result theResult, in string theMeshName, in Entity theEntity, in string theFieldName, in double theIteration)
CutLines CutLinesOnField (in Result theResult, in string theMeshName, in Entity theEntity, in string theFieldName, in double theIteration)
Plot3D Plot3DOnField (in Result theResult, in string theMeshName, in Entity theEntity, in string theFieldName, in double theIteration)
Plot3D Plot3DOnField (in Result theResult, in string theMeshName, in Entity theEntity, in string theFieldName, in double theIteration)
Table CreateTable (in string theTableEntry)
Table CreateTable (in string theTableEntry)
Curve CreateCurve (in Table theTable, in long theHRow, in long theVRow)
Curve CreateCurveWithZ (in Table theTable, in long theHRow, in long theVRow, in long theZRow)
Container CreateContainer ()
Animation CreateAnimation (in View3D theView3d)
DeletePrs3d (in Prs3d thePrs3d)
IdType GetID ()
IdType GetID ()
VISUType GetType ()
VISUType GetType ()

Detailed Description

@@ -183,7 +193,7 @@ Gets the View Manager which is used for creation of post-processing presentation
SALOMEDS::SObject VISU.VISU_Gen.ImportTables in string in string  theFileName  ) 
in string in string  theFileName
Result VISU.VISU_Gen.ImportFile in string in string  theFileName  ) 
Result VISU.VISU_Gen.CreateResult in string in string  theFileName  ) 
Result VISU.VISU_Gen.CopyAndImportFile in string in string  theFileName  ) 
in string in string  theMeshName,
in Entity in Entity  theEntity,
in string in string  theNewName
in string in string  theMeshName,
in Entity in Entity  theEntity,
in string in string  theSubMeshName,
in string in string  theNewName
in string in string  theMeshName,
in string in string  theSubMeshName,
in string in string  theNewName
in string in string  theMeshName,
in Entity in Entity  theEntity
in string in string  theMeshName,
in Entity in Entity  theEntity,
in string in string  theFamilyName
in string in string  theMeshName,
in string in string  theGroupName
in string in string  theMeshName,
in Entity in Entity  theEntity,
in string in string  theFieldName,
in string in string  theMeshName,
in Entity in Entity  theEntity,
in string in string  theFieldName,
in string in string  theMeshName,
in Entity in Entity  theEntity,
in string in string  theFieldName,
in string in string  theMeshName,
in Entity in Entity  theEntity,
in string in string  theFieldName,
in string in string  theMeshName,
in Entity in Entity  theEntity,
in string in string  theFieldName,
in string in string  theMeshName,
in Entity in Entity  theEntity,
in string in string  theFieldName,
in string in string  theMeshName,
in Entity in Entity  theEntity,
in string in string  theFieldName,
in string in string  theMeshName,
in Entity in Entity  theEntity,
in string in string  theFieldName,
in string in string  theMeshName,
in Entity in Entity  theEntity,
in string in string  theFieldName,
in string in string  theMeshName,
in Entity in Entity  theEntity,
in string in string  theFieldName,
Table VISU.VISU_Gen.CreateTable in string in string  theTableEntry  ) 
+

+ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Curve VISU.VISU_Gen.CreateCurveWithZ in Table  theTable,
in long  theHRow,
in long  theVRow,
in long  theZRow
+
+ + + + + +
+   + + +

+Creates a curve on the basis of points, whose values are taken from the table. Each point has also assigned value, that will be shown as tooltip in Plot2d

Parameters:
+ + + + + +
theTable Table containing the data for construction of curves.
HRow Index of the row in the table: abscissa of the point.
VRow Index of the row in the table: ordinate of the point.
ZRow Index of the row in the table: assigned value (so-called as Z).
+
+

@@ -1558,7 +1625,7 @@ Creates an animation in the 3D view.
Parameters:
- + @@ -1585,7 +1652,7 @@ Returns ID of the object. - + @@ -621,7 +634,7 @@ Sets the type of scaling of the values reflected by the scalar bar.
IdType VISU.Base.GetID IdType VISU.Base.GetID  )  - + @@ -1607,5 +1674,7 @@ Returns the type of the presentable object
VISUType VISU.Base.GetType VISUType VISU.Base.GetType  ) 
+ diff --git a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1Vectors.html b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1Vectors.html index c035a891..562deb3e 100644 --- a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1Vectors.html +++ b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1Vectors.html @@ -5,18 +5,31 @@ Main Page +   +

VISU.Vectors Interface Reference

Interface of the vector presentation. More...

import "VISU_Gen.idl";

-Inheritance diagram for VISU.Vectors:

Inheritance graph
+Inheritance diagram for VISU.Vectors:

Inheritance graph
+ + + + + + + + + + @@ -60,9 +73,9 @@ Inheritance diagram for VISU.Vectors:

void 
- + - + @@ -100,9 +113,9 @@ Inheritance diagram for VISU.Vectors:

long 
- + - + @@ -110,9 +123,9 @@ Inheritance diagram for VISU.Vectors:

void 
- + - +

Public Types

SetColor (in SALOMEDS::Color theColor)
void SetScaling (in Scaling theScaling)
void SetScaling (in Scaling theScaling)
Scaling GetScaling ()
Scaling GetScaling ()
void SetRange (in double theMin, in double theMax)
GetLabels ()
void SetTitle (in string theName)
void SetTitle (in string theName)
string GetTitle ()
string GetTitle ()
void SetOffset (in float theDx, in float theDy, in float theDz)
RemoveFromStudy ()
IdType GetID ()
IdType GetID ()
VISUType GetType ()
VISUType GetType ()

Detailed Description

@@ -590,7 +603,7 @@ Sets the color of this presentation.
Parameters:
void VISU.ScalarMap.SetScaling in Scaling in Scaling  theScaling  )  [inherited] - + @@ -1180,7 +1193,7 @@ Gets the number of labels which will be used for indication of color gradation o - + @@ -1211,7 +1224,7 @@ Sets the title of the scalar bar. By default - the name of the selected result i
Scaling VISU.ScalarMap.GetScaling Scaling VISU.ScalarMap.GetScaling  ) 
void VISU.ColoredPrs3d.SetTitle in string in string  theName  )  [inherited] - + @@ -1351,7 +1364,7 @@ Remove object from study.
string VISU.ColoredPrs3d.GetTitle string VISU.ColoredPrs3d.GetTitle  )  - + @@ -1378,7 +1391,7 @@ Returns ID of the object. - + @@ -1022,7 +1031,7 @@ Sets the title of the View frame.
Parameters:
IdType VISU.Base.GetID IdType VISU.Base.GetID  )  - + @@ -1400,5 +1413,7 @@ Returns the type of the presentable object
VISUType VISU.Base.GetType VISUType VISU.Base.GetType  ) 
+ diff --git a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1View.html b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1View.html index d2037c8a..49a49f98 100644 --- a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1View.html +++ b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1View.html @@ -5,18 +5,27 @@ Main Page +   +

VISU.View Interface Reference

View interface More...

import "VISU_Gen.idl";

-Inheritance diagram for VISU.View:

Inheritance graph
+Inheritance diagram for VISU.View:

Inheritance graph
+ + + + + + @@ -84,9 +93,9 @@ Inheritance diagram for VISU.View:

void 
- + - + @@ -94,9 +103,9 @@ Inheritance diagram for VISU.View:

void 
- + - + @@ -114,11 +123,11 @@ Inheritance diagram for VISU.View:

void 
- + - + - +

Public Types

SetViewPositionVertical (in ViewPosition ViewPosVer)
void SetRelativePosition (in double x, in double y)
void SetRelativePosition (in double x, in double y)
void SetRelativeSize (in double x, in double y)
void SetRelativeSize (in double x, in double y)
void Minimize ()
Maximize ()
void SetTitle (in string theTitle)
void SetTitle (in string theTitle)
string GetTitle ()
string GetTitle ()
void SetBackground (in SALOMEDS::Color theColor)
Update ()
boolean SavePicture (in string theFileName)
boolean SavePicture (in string theFileName)
IdType GetID ()
IdType GetID ()
VISUType GetType ()
VISUType GetType ()

Detailed Description

@@ -991,7 +1000,7 @@ Old methods for view parameters management, they don't work now
void VISU.View.SetTitle in string in string  theTitle  )  - + @@ -1291,7 +1300,7 @@ Updates the view. - + @@ -1323,7 +1332,7 @@ Saves the view.
Parameters:
string VISU.View.GetTitle string VISU.View.GetTitle  ) 
boolean VISU.View.SavePicture in string in string  theFileName  )  - + @@ -1350,7 +1359,7 @@ Returns ID of the object. - + @@ -747,7 +754,7 @@ Saves view parameters.
Returns:
True if the view
- + @@ -813,7 +820,7 @@ Get representation type of the given presentation in this view.
IdType VISU.Base.GetID IdType VISU.Base.GetID  )  - + @@ -1372,5 +1381,7 @@ Returns the type of the presentable object
VISUType VISU.Base.GetType VISUType VISU.Base.GetType  ) 
+ diff --git a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1View3D.html b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1View3D.html index fa86b4c5..a442397e 100644 --- a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1View3D.html +++ b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1View3D.html @@ -5,18 +5,25 @@ Main Page +   +

VISU.View3D Interface Reference

3D view interface More...

import "VISU_Gen.idl";

-Inheritance diagram for VISU.View3D:

Inheritance graph
+Inheritance diagram for VISU.View3D:

Inheritance graph
+ + + + @@ -80,29 +87,29 @@ Inheritance diagram for VISU.View3D:

void 
- + - + - + - + - + - + - + @@ -160,9 +167,9 @@ Inheritance diagram for VISU.View3D:

void 
- + - + @@ -180,11 +187,11 @@ Inheritance diagram for VISU.View3D:

void 
- + - + - +

Public Types

RemoveScale ()
boolean SaveViewParams (in string theName)
boolean SaveViewParams (in string theName)
boolean RestoreViewParams (in string theName)
boolean RestoreViewParams (in string theName)
PresentationType GetPresentationType (in ScalarMap thePrs)
string SetPresentationType (in ScalarMap thePrs, in PresentationType thePrsType)
string SetPresentationType (in ScalarMap thePrs, in PresentationType thePrsType)
boolean IsShrinked (in ScalarMap thePrs)
string SetShrinked (in ScalarMap thePrs, in boolean isShrinked)
string SetShrinked (in ScalarMap thePrs, in boolean isShrinked)
boolean IsShaded (in ScalarMap thePrs)
string SetShaded (in ScalarMap thePrs, in boolean isShaded)
string SetShaded (in ScalarMap thePrs, in boolean isShaded)
double GetOpacity (in ScalarMap thePrs)
string SetOpacity (in ScalarMap thePrs, in double theOpacity)
string SetOpacity (in ScalarMap thePrs, in double theOpacity)
double GetLineWidth (in ScalarMap thePrs)
string SetLineWidth (in ScalarMap thePrs, in double theLineWidth)
string SetLineWidth (in ScalarMap thePrs, in double theLineWidth)
void ShowPart (in ViewRepresentation ViewRepr, in boolean state)
Maximize ()
void SetTitle (in string theTitle)
void SetTitle (in string theTitle)
string GetTitle ()
string GetTitle ()
void SetBackground (in SALOMEDS::Color theColor)
Update ()
boolean SavePicture (in string theFileName)
boolean SavePicture (in string theFileName)
IdType GetID ()
IdType GetID ()
VISUType GetType ()
VISUType GetType ()

Detailed Description

@@ -713,7 +720,7 @@ Removes the scaling of the view.
boolean VISU.View3D.SaveViewParams in string in string  theName  ) 
boolean VISU.View3D.RestoreViewParams in string in string  theName  )  - + @@ -891,7 +898,7 @@ Get shrink state of the given presentation in this view.
Para
string VISU.View3D.SetPresentationType string VISU.View3D.SetPresentationType in ScalarMap  thePrs, - + @@ -969,7 +976,7 @@ Get shading state of the given presentation in this view.
Par
string VISU.View3D.SetShrinked string VISU.View3D.SetShrinked in ScalarMap  thePrs, - + @@ -1047,7 +1054,7 @@ Get opacity of the given presentation in this view.
Parameter
string VISU.View3D.SetShaded string VISU.View3D.SetShaded in ScalarMap  thePrs, - + @@ -1125,7 +1132,7 @@ Get line width of the given presentation in this view.
Parame
string VISU.View3D.SetOpacity string VISU.View3D.SetOpacity in ScalarMap  thePrs, - + @@ -1956,7 +1963,7 @@ Old methods for view parameters management, they don't work now - + @@ -1987,7 +1994,7 @@ Sets the title of the View frame.
Parameters:
string VISU.View3D.SetLineWidth string VISU.View3D.SetLineWidth in ScalarMap  thePrs,
void VISU.View.SetTitle in string in string  theTitle  )  [inherited] - + @@ -2256,7 +2263,7 @@ Updates the view. - + @@ -2288,7 +2295,7 @@ Saves the view.
Parameters:
string VISU.View.GetTitle string VISU.View.GetTitle  ) 
boolean VISU.View.SavePicture in string in string  theFileName  )  [inherited] - + @@ -2315,7 +2322,7 @@ Returns ID of the object.
IdType VISU.Base.GetID IdType VISU.Base.GetID  )  - + @@ -2337,5 +2344,7 @@ Returns the type of the presentable object
VISUType VISU.Base.GetType VISUType VISU.Base.GetType  ) 
+ diff --git a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1ViewManager.html b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1ViewManager.html index 2b150d41..6ddc8cf4 100644 --- a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1ViewManager.html +++ b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1ViewManager.html @@ -5,18 +5,24 @@ Main Page +   +

VISU.ViewManager Interface Reference

Interface of the ViewManager. More...

import "VISU_Gen.idl";

-Inheritance diagram for VISU.ViewManager:

Inheritance graph
+Inheritance diagram for VISU.ViewManager:

Inheritance graph
+ + + @@ -34,9 +40,9 @@ Inheritance diagram for VISU.ViewManager:

 
- + - +

Public Member Functions

Creation of a 2D plot View.
void Destroy (in View theView)
IdType GetID ()
IdType GetID ()
VISUType GetType ()
VISUType GetType ()

Detailed Description

@@ -193,7 +199,7 @@ Deletes a definite view.
Parameters:
- + @@ -220,7 +226,7 @@ Returns ID of the object. - + @@ -319,7 +326,7 @@ Sets the title of the XY plot
Parameters:
IdType VISU.Base.GetID IdType VISU.Base.GetID  )  - + @@ -242,5 +248,7 @@ Returns the type of the presentable object
VISUType VISU.Base.GetType VISUType VISU.Base.GetType  ) 
+ diff --git a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1XYPlot.html b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1XYPlot.html index 3c109aad..3edaf2b1 100644 --- a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1XYPlot.html +++ b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1XYPlot.html @@ -5,18 +5,25 @@ Main Page +   +

VISU.XYPlot Interface Reference

Interface of the 2D plot view. More...

import "VISU_Gen.idl";

-Inheritance diagram for VISU.XYPlot:

Inheritance graph
+Inheritance diagram for VISU.XYPlot:

Inheritance graph
+ + + + @@ -43,9 +50,9 @@ Inheritance diagram for VISU.XYPlot:


Public Member Functions

-
+ - + @@ -59,21 +66,21 @@ Inheritance diagram for VISU.XYPlot:

void 
- + - + - + - + - + - + - + - + @@ -133,9 +140,9 @@ Inheritance diagram for VISU.XYPlot:

void 
- + - + @@ -143,9 +150,9 @@ Inheritance diagram for VISU.XYPlot:

void 
- + - + @@ -163,11 +170,11 @@ Inheritance diagram for VISU.XYPlot:

void 
- + - + - +

Public Types

void SetSubTitle (in string theTitle)
void SetSubTitle (in string theTitle)
string GetSubTitle ()
string GetSubTitle ()
void SetCurveType (in CurveType theType)
EnableYGrid (in boolean theMajor, in long theNumMajor, in boolean theMinor, in long theNumMinor)
void SetHorScaling (in Scaling theScaling)
void SetHorScaling (in Scaling theScaling)
Scaling GetHorScaling ()
Scaling GetHorScaling ()
void SetVerScaling (in Scaling theScaling)
void SetVerScaling (in Scaling theScaling)
Scaling GetVerScaling ()
Scaling GetVerScaling ()
void SetXTitle (in string theTitle)
void SetXTitle (in string theTitle)
string GetXTitle ()
string GetXTitle ()
void SetYTitle (in string theTitle)
void SetYTitle (in string theTitle)
string GetYTitle ()
string GetYTitle ()
void ShowLegend (in boolean theShowing)
SetViewPositionVertical (in ViewPosition ViewPosVer)
void SetRelativePosition (in double x, in double y)
void SetRelativePosition (in double x, in double y)
void SetRelativeSize (in double x, in double y)
void SetRelativeSize (in double x, in double y)
void Minimize ()
Maximize ()
void SetTitle (in string theTitle)
void SetTitle (in string theTitle)
string GetTitle ()
string GetTitle ()
void SetBackground (in SALOMEDS::Color theColor)
Update ()
boolean SavePicture (in string theFileName)
boolean SavePicture (in string theFileName)
IdType GetID ()
IdType GetID ()
VISUType GetType ()
VISUType GetType ()

Detailed Description

@@ -288,7 +295,7 @@ displaying part ("ALL" isn't setable)
Enumerator:
void VISU.XYPlot.SetSubTitle in string in string  theTitle  )  - + @@ -566,7 +573,7 @@ Enable/disables Y-axis grid of the 2D plot. - + @@ -597,7 +604,7 @@ Sets horizontal scaling of the 2D plot.
Parameters:
<
string VISU.XYPlot.GetSubTitle string VISU.XYPlot.GetSubTitle  ) 
void VISU.XYPlot.SetHorScaling in Scaling in Scaling  theScaling  )  - + @@ -626,7 +633,7 @@ Gets the type horizontal scaling of the 2D plot. - + @@ -657,7 +664,7 @@ Sets vertical scaling of the 2D plot.
Parameters:
Scaling VISU.XYPlot.GetHorScaling Scaling VISU.XYPlot.GetHorScaling  ) 
void VISU.XYPlot.SetVerScaling in Scaling in Scaling  theScaling  ) 
- + @@ -686,7 +693,7 @@ Gets the type vertical scaling of the 2D plot. - + @@ -717,7 +724,7 @@ Sets the title of the X-axis of the plot.
Parameters:
Scaling VISU.XYPlot.GetVerScaling Scaling VISU.XYPlot.GetVerScaling  ) 
void VISU.XYPlot.SetXTitle in string in string  theTitle  ) 
- + @@ -746,7 +753,7 @@ Gets the title of the X-axis of the plot. - + @@ -777,7 +784,7 @@ Sets the title of the Y-axis of the plot.
Parameters:
string VISU.XYPlot.GetXTitle string VISU.XYPlot.GetXTitle  ) 
void VISU.XYPlot.SetYTitle in string in string  theTitle  ) 
- + @@ -1818,7 +1825,7 @@ Old methods for view parameters management, they don't work now - + @@ -1849,7 +1856,7 @@ Sets the title of the View frame.
Parameters:
"; + return sHTML; +} + +function showHidePane(bShow) +{ + var oMsg=null; + if(bShow) + oMsg=new whMessage(WH_MSG_SHOWPANE,this,1,null); + else + oMsg=new whMessage(WH_MSG_HIDEPANE,this,1,null); + SendMessage(oMsg); +} + +function isShowHideEnable() +{ + if(gbIE4) + return true; + else + return false; +} + + +function PickupDialog_Invoke() +{ + if(!gbIE4||gbMac) + { + if(typeof(_PopupMenu_Invoke)=="function") + return _PopupMenu_Invoke(PickupDialog_Invoke.arguments); + } + else + { + if(PickupDialog_Invoke.arguments.length>2) + { + var sPickup="whskin_pickup.htm"; + var sPickupPath=gsPPath+sPickup; + if(gbIE4) + { + var sFrame=PickupDialog_Invoke.arguments[1]; + var aTopics=new Array(); + for(var i=2;i1) + { + var nWidth=300; + var nHeight=180; + var nScreenWidth=screen.width; + var nScreenHeight=screen.height; + var nLeft=(nScreenWidth-nWidth)/2; + var nTop=(nScreenHeight-nHeight)/2; + if(gbIE4) + { + var vRet=window.showModalDialog(sPickupPath,aTopics,"dialogHeight:"+nHeight+"px;dialogWidth:"+nWidth+"px;resizable:yes;status:no;scroll:no;help:no;center:yes;"); + if(vRet) + { + var sURL=vRet.m_url; + if(sFrame) + window.open(sURL,sFrame); + else + window.open(sURL,"_self"); + } + } + } + else if(aTopics.length==1) + { + var sURL=aTopics[0].m_sURL + if(sFrame) + window.open(sURL,sFrame); + else + window.open(sURL,"_self"); + } + } + } + } +} + +if(window.gbWhUtil&&window.gbWhMsg&&window.gbWhVer&&window.gbWhProxy) +{ + RegisterListener("bsscright",WH_MSG_GETAVIAVENUES); + RegisterListener("bsscright",WH_MSG_GETTOCPATHS); + RegisterListener("bsscright",WH_MSG_NEXT); + RegisterListener("bsscright",WH_MSG_PREV); + RegisterListener("bsscright",WH_MSG_WEBSEARCH); + if(gbMac&&gbIE4) + { + if(typeof(window.onunload)!="unknown") + if(window.onunload.toString!=unRegisterListener.toString) + whtopic_foldUnload=window.onunload; + } + else + { + if(window.onunload) + if(window.onunload.toString!=unRegisterListener.toString) + whtopic_foldUnload=window.onunload; + } + window.onunload=unRegisterListener; + setButtonFont("show","","","","","",""); +setButtonFont("hide","","","","","",""); + + gbWhTopic=true; +} +else + document.location.reload(); diff --git a/doc/salome/gui/VISU/whutils.js b/doc/salome/gui/VISU/whutils.js index 85fae7e0..5026b24a 100755 --- a/doc/salome/gui/VISU/whutils.js +++ b/doc/salome/gui/VISU/whutils.js @@ -1,527 +1,527 @@ -// WebHelp 5.10.004 -var gsFileName=""; -var gsDivName=""; -var xmlDoc=null; -var sdocPath=null; -var gsInsertBeforeEndHTML=""; -var sReplaceStringsSrc=new Array(); -var gsDivName="dataDiv"; -var gnLoadDivNum=0; -sReplaceStringsSrc[0]="&"; -sReplaceStringsSrc[1]=">"; -sReplaceStringsSrc[2]="<"; -sReplaceStringsSrc[3]="""; -sReplaceStringsSrc[4]=String.fromCharCode(8364); -sReplaceStringsSrc[5]=" "; - -var sReplaceStringsDst=new Array(); -sReplaceStringsDst[0]="&"; -sReplaceStringsDst[1]=">"; -sReplaceStringsDst[2]="<"; -sReplaceStringsDst[3]="\""; -sReplaceStringsDst[4]=String.fromCharCode(128); -sReplaceStringsDst[5]=" "; -var goHighLighted=null; - -function _getRelativePath(strParentPath,strCurrentPath) -{ - if(_isAbsPath(strCurrentPath)) return _getPath(strCurrentPath); - strParentPath=_replaceSlash(strParentPath); - strParentPath=_getPath(strParentPath); - strCurrentPath=_replaceSlash(strCurrentPath); - strCurrentPath=_getPath(strCurrentPath); - for(var i=0;i0) - { - var nPosx=sPath.indexOf("/",nPos+2); - if(nPosx>0) - return sPath.substring(0,nPosx); - else - return sPath; - } - return sPath; -} - -function _getFullPath(sPath,sRelPath) -{ - if(_isAbsPath(sRelPath)) - return sRelPath; - else if(_isAbsPathToHost(sRelPath)) - return _getHost(sPath)+sRelPath; - else - { - var sFullPath=sPath; - var nPathPos=0; - while(nPathPos!=-1) - { - var nPathPos=sRelPath.indexOf("../"); - if(nPathPos!=-1) - { - sRelPath=sRelPath.substring(nPathPos+3); - sFullPath=sFullPath.substring(0,sFullPath.length-1); - var nPos2=sFullPath.lastIndexOf("/"); - if(nPos2!=-1) - sFullPath=sFullPath.substring(0,nPos2+1); - else - break; - } - } - sFullPath+=sRelPath; - return sFullPath; - } -} - -function _isAbsPath(strPath) -{ - var strUpper=strPath.toUpperCase(); - return (strUpper.indexOf(":")!=-1||strUpper.indexOf("\\\\")==0); -} - -function _replaceSlash(strURL) -{ - var re=new RegExp("\\\\","g"); - var strReplacedURL=strURL.replace(re,"/"); - return strReplacedURL; -} - -function _getPath(strURL) -{ - pathpos=strURL.lastIndexOf("/"); - if(pathpos>0) - return strURL.substring(0,pathpos+1); - else - return ""; -} - -function removeItemFromArray(oArray,i) -{ - if(oArray.length&&i>=0&&i=0&&i<=oArray.length) - { - var len=oArray.length; - for(var s=len;s>i;s--) - oArray[s]=oArray[s-1]; - oArray[i]=obj; - } -} - -function loadData(sFileName) -{ - var i=gnLoadDivNum; - var sName=gsDivName+gnLoadDivNum++; - loadData_2(sFileName,sName); -} - -function loadData_2(sFileName,sDivName) -{ - if(!getElement(sDivName)) - { - if(!insertDataDiv(sDivName)) - { - gsFileName=sFileName; - gsDivName=sDivName; - return; - } - } - var sHTML=""; - if(gbMac) - sHTML+=""; - else - sHTML+=""; - - var oDivCon=getElement(sDivName); - if(oDivCon) - { - if(gbNav6) - { - if(oDivCon.getElementsByTagName&&oDivCon.getElementsByTagName("iFrame").length>0) - { - oDivCon.getElementsByTagName("iFrame")[0].src=sFileName; - } - else - oDivCon.innerHTML=sHTML; - } - else - oDivCon.innerHTML=sHTML; - } -} - -function loadDataXML(sFileName) -{ - var sCurrentDocPath=_getPath(document.location.href); - sdocPath=_getFullPath(sCurrentDocPath,sFileName); - if(gbIE5) - { - xmlDoc=new ActiveXObject("Microsoft.XMLDOM"); - xmlDoc.async=true; - xmlDoc.onreadystatechange=checkState; - if(document.body!=null) - xmlDoc.load(sdocPath); - } - else if(gbNav6) - { - xmlDoc=document.implementation.createDocument("","",null); - xmlDoc.addEventListener("load",initializeData,false); - xmlDoc.load(sdocPath,"text/xml"); - } -} - -function initializeData() -{ - if(xmlDoc!=null) - putDataXML(xmlDoc,sdocPath); -} - -function checkState() -{ - if(xmlDoc!=null) - { - var state=xmlDoc.readyState; - if(state==4) - { - var err=xmlDoc.parseError; - if(err.errorCode==0) - putDataXML(xmlDoc,sdocPath); - else - onLoadXMLError(); - } - } -} - -function insertDataDiv(sName) -{ - var sHTML=""; - if(gbMac) - sHTML+="
"; - else - sHTML+="
"; - if((gbIE5||gbNav6)&&document.body) - document.body.insertAdjacentHTML("beforeEnd",sHTML); - else - { - gsInsertBeforeEndHTML=sHTML; - setTimeout("insertWhenBodyReady();",100); - return false; - } - return true; -} - -function insertWhenBodyReady() -{ - if(gsInsertBeforeEndHTML=="") return; - if(document.body) - { - document.body.insertAdjacentHTML("beforeEnd",gsInsertBeforeEndHTML); - gsInsertBeforeEndHTML=""; - loadData_2(gsFileName,gsDivName); - } - else - { - setTimeout("insertWhenBodyReady();",100); - } -} - -function window_BUnload() -{ - for(var i=0;i='0'&&sBStr.charAt(i)<='9') - { - sNum+=sBStr.charAt(i++); - } - if(sNum!=""){ - var nNum=parseInt(sNum,16); - sText+=String.fromCharCode(nNum); - sBStr=sBStr.substring(i); - } - nPos=sBStr.indexOf('%'); - } - sText+=sBStr; - return sText; -} - -function excapeSingleQuotandSlash(str) -{ - if(str==null) return null; - var nPos=0; - var sRes=""; - var nPosNew=str.indexOf("\\",nPos); - while(nPosNew!=-1){ - sRes+=str.substring(nPos,nPosNew+1)+"\\"; - nPos=nPosNew+1; - nPosNew=str.indexOf("\\",nPos); - } - if(nPos0) + { + var nPosx=sPath.indexOf("/",nPos+2); + if(nPosx>0) + return sPath.substring(0,nPosx); + else + return sPath; + } + return sPath; +} + +function _getFullPath(sPath,sRelPath) +{ + if(_isAbsPath(sRelPath)) + return sRelPath; + else if(_isAbsPathToHost(sRelPath)) + return _getHost(sPath)+sRelPath; + else + { + var sFullPath=sPath; + var nPathPos=0; + while(nPathPos!=-1) + { + var nPathPos=sRelPath.indexOf("../"); + if(nPathPos!=-1) + { + sRelPath=sRelPath.substring(nPathPos+3); + sFullPath=sFullPath.substring(0,sFullPath.length-1); + var nPos2=sFullPath.lastIndexOf("/"); + if(nPos2!=-1) + sFullPath=sFullPath.substring(0,nPos2+1); + else + break; + } + } + sFullPath+=sRelPath; + return sFullPath; + } +} + +function _isAbsPath(strPath) +{ + var strUpper=strPath.toUpperCase(); + return (strUpper.indexOf(":")!=-1||strUpper.indexOf("\\\\")==0); +} + +function _replaceSlash(strURL) +{ + var re=new RegExp("\\\\","g"); + var strReplacedURL=strURL.replace(re,"/"); + return strReplacedURL; +} + +function _getPath(strURL) +{ + pathpos=strURL.lastIndexOf("/"); + if(pathpos>0) + return strURL.substring(0,pathpos+1); + else + return ""; +} + +function removeItemFromArray(oArray,i) +{ + if(oArray.length&&i>=0&&i=0&&i<=oArray.length) + { + var len=oArray.length; + for(var s=len;s>i;s--) + oArray[s]=oArray[s-1]; + oArray[i]=obj; + } +} + +function loadData(sFileName) +{ + var i=gnLoadDivNum; + var sName=gsDivName+gnLoadDivNum++; + loadData_2(sFileName,sName); +} + +function loadData_2(sFileName,sDivName) +{ + if(!getElement(sDivName)) + { + if(!insertDataDiv(sDivName)) + { + gsFileName=sFileName; + gsDivName=sDivName; + return; + } + } + var sHTML=""; + if(gbMac) + sHTML+=""; + else + sHTML+=""; + + var oDivCon=getElement(sDivName); + if(oDivCon) + { + if(gbNav6) + { + if(oDivCon.getElementsByTagName&&oDivCon.getElementsByTagName("iFrame").length>0) + { + oDivCon.getElementsByTagName("iFrame")[0].src=sFileName; + } + else + oDivCon.innerHTML=sHTML; + } + else + oDivCon.innerHTML=sHTML; + } +} + +function loadDataXML(sFileName) +{ + var sCurrentDocPath=_getPath(document.location.href); + sdocPath=_getFullPath(sCurrentDocPath,sFileName); + if(gbIE5) + { + xmlDoc=new ActiveXObject("Microsoft.XMLDOM"); + xmlDoc.async=true; + xmlDoc.onreadystatechange=checkState; + if(document.body!=null) + xmlDoc.load(sdocPath); + } + else if(gbNav6) + { + xmlDoc=document.implementation.createDocument("","",null); + xmlDoc.addEventListener("load",initializeData,false); + xmlDoc.load(sdocPath,"text/xml"); + } +} + +function initializeData() +{ + if(xmlDoc!=null) + putDataXML(xmlDoc,sdocPath); +} + +function checkState() +{ + if(xmlDoc!=null) + { + var state=xmlDoc.readyState; + if(state==4) + { + var err=xmlDoc.parseError; + if(err.errorCode==0) + putDataXML(xmlDoc,sdocPath); + else + onLoadXMLError(); + } + } +} + +function insertDataDiv(sName) +{ + var sHTML=""; + if(gbMac) + sHTML+="
"; + else + sHTML+="
"; + if((gbIE5||gbNav6)&&document.body) + document.body.insertAdjacentHTML("beforeEnd",sHTML); + else + { + gsInsertBeforeEndHTML=sHTML; + setTimeout("insertWhenBodyReady();",100); + return false; + } + return true; +} + +function insertWhenBodyReady() +{ + if(gsInsertBeforeEndHTML=="") return; + if(document.body) + { + document.body.insertAdjacentHTML("beforeEnd",gsInsertBeforeEndHTML); + gsInsertBeforeEndHTML=""; + loadData_2(gsFileName,gsDivName); + } + else + { + setTimeout("insertWhenBodyReady();",100); + } +} + +function window_BUnload() +{ + for(var i=0;i='0'&&sBStr.charAt(i)<='9') + { + sNum+=sBStr.charAt(i++); + } + if(sNum!=""){ + var nNum=parseInt(sNum,16); + sText+=String.fromCharCode(nNum); + sBStr=sBStr.substring(i); + } + nPos=sBStr.indexOf('%'); + } + sText+=sBStr; + return sText; +} + +function excapeSingleQuotandSlash(str) +{ + if(str==null) return null; + var nPos=0; + var sRes=""; + var nPosNew=str.indexOf("\\",nPos); + while(nPosNew!=-1){ + sRes+=str.substring(nPos,nPosNew+1)+"\\"; + nPos=nPosNew+1; + nPosNew=str.indexOf("\\",nPos); + } + if(nPos=4) - { - if(navigator.appName=="Netscape") - { - gbNav4=true; - if(gnVerMajor>=5) - gbNav6=true; - } - gbIE4=(navigator.appName.indexOf("Microsoft")!=-1); - } - if(gbNav6) - { - var nPos=gAgent.indexOf("gecko"); - if(nPos!=-1) - { - var nPos2=gAgent.indexOf("/", nPos); - if(nPos2!=-1) - { - var nVersion=parseFloat(gAgent.substring(nPos2+1)); - if(nVersion>=20010726) - { - gbNav61=true; - if (nVersion>=20020823) - gbNav7=true; - } - } - } - }else if(gbIE4) - { - var nPos=gAgent.indexOf("msie"); - if(nPos!=-1) - { - var nVersion=parseFloat(gAgent.substring(nPos+5)); - if(nVersion>=5) - { - gbIE5=true; - if(nVersion>=5.5) - gbIE55=true; - } - } - } -} -else if (gbOpera) -{ - var nPos = gAgent.indexOf("opera"); - if(nPos!=-1) - { - var nVersion=parseFloat(gAgent.substring(nPos+6)); - if(nVersion>=6) - { - gbOpera6=true; - if(nVersion>=7) - gbOpera7=true; - } - } -} -else if (gbKonqueror) -{ - var nPos = gAgent.indexOf("konqueror"); - if(nPos!=-1) - { - var nVersion = parseFloat(gAgent.substring(nPos+10)); - if (nVersion >= 3) - { - gbKonqueror3=true; - } - } -} - +// WebHelp 5.10.006 +var gbNav=false; +var gbNav6=false; +var gbNav61=false; +var gbNav7=false; +var gbNav4=false; +var gbIE4=false; +var gbIE=false; +var gbIE5=false; +var gbIE55=false; +var gbOpera6=false; +var gbOpera7=false; +var gbKonqueror3=false; + +var gAgent=navigator.userAgent.toLowerCase(); +var gbMac=(gAgent.indexOf("mac")!=-1); +var gbSunOS=(gAgent.indexOf("sunos")!=-1); +var gbOpera=(gAgent.indexOf("opera")!=-1); +var gbKonqueror=(gAgent.indexOf("konqueror")!= -1); +var gbSafari=(gAgent.indexOf("safari")!= -1); +var gbWindows=((gAgent.indexOf('win')!= -1)||(gAgent.indexOf('16bit')!= -1)); +var gbMozilla=((gAgent.indexOf('gecko')!=-1) && (gAgent.indexOf('netscape')==-1)); + + +var gVersion=navigator.appVersion.toLowerCase(); + +var gnVerMajor=parseInt(gVersion); +var gnVerMinor=parseFloat(gVersion); + +if(!gbOpera&&!gbKonqueror&&!gbSafari) // opera can mimic IE or Netscape by settings. +{ + gbIE=(navigator.appName.indexOf("Microsoft")!=-1); + gbNav=(gAgent.indexOf('mozilla')!=-1) && ((gAgent.indexOf('spoofer')==-1) && (gAgent.indexOf('compatible')==-1)); + if(gnVerMajor>=4) + { + if(navigator.appName=="Netscape") + { + gbNav4=true; + if(gnVerMajor>=5) + gbNav6=true; + } + gbIE4=(navigator.appName.indexOf("Microsoft")!=-1); + } + if(gbNav6) + { + var nPos=gAgent.indexOf("gecko"); + if(nPos!=-1) + { + var nPos2=gAgent.indexOf("/", nPos); + if(nPos2!=-1) + { + var nVersion=parseFloat(gAgent.substring(nPos2+1)); + if(nVersion>=20010726) + { + gbNav61=true; + if (nVersion>=20020823) + gbNav7=true; + } + } + } + }else if(gbIE4) + { + var nPos=gAgent.indexOf("msie"); + if(nPos!=-1) + { + var nVersion=parseFloat(gAgent.substring(nPos+5)); + if(nVersion>=5) + { + gbIE5=true; + if(nVersion>=5.5) + gbIE55=true; + } + } + } +} +else if (gbOpera) +{ + var nPos = gAgent.indexOf("opera"); + if(nPos!=-1) + { + var nVersion=parseFloat(gAgent.substring(nPos+6)); + if(nVersion>=6) + { + gbOpera6=true; + if(nVersion>=7) + gbOpera7=true; + } + } +} +else if (gbKonqueror) +{ + var nPos = gAgent.indexOf("konqueror"); + if(nPos!=-1) + { + var nVersion = parseFloat(gAgent.substring(nPos+10)); + if (nVersion >= 3) + { + gbKonqueror3=true; + } + } +} + var gbWhVer=true; \ No newline at end of file diff --git a/doc/salome/gui/VISU/whxdata/whftdata0.xml b/doc/salome/gui/VISU/whxdata/whftdata0.xml index 4e614a73..18b3f31d 100755 --- a/doc/salome/gui/VISU/whxdata/whftdata0.xml +++ b/doc/salome/gui/VISU/whxdata/whftdata0.xml @@ -1,45 +1,45 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/doc/salome/gui/VISU/whxdata/whfts.xml b/doc/salome/gui/VISU/whxdata/whfts.xml index 4b1f24c4..fd4d35be 100755 --- a/doc/salome/gui/VISU/whxdata/whfts.xml +++ b/doc/salome/gui/VISU/whxdata/whfts.xml @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + diff --git a/doc/salome/gui/VISU/whxdata/whfwdata0.xml b/doc/salome/gui/VISU/whxdata/whfwdata0.xml index 6e9ff3ad..49225222 100755 --- a/doc/salome/gui/VISU/whxdata/whfwdata0.xml +++ b/doc/salome/gui/VISU/whxdata/whfwdata0.xml @@ -1,848 +1,888 @@ - - - 0,1,32,34,35,38,6,26,39, - 32, - 39, - 4,5,7,2,10,15,14,19,31,32,34,33,35,6,27, - 31,32,39, - 0,32,6,26,39, - 33, - 31, - 35, - 4,5,7,2,10,15,14,19,31,33,35,36,27,39, - 7,39, - 36, - 7,11,17,34,33,25,39, - 4,5,7,10,19,24,27, - 39, - 3,0,1,11,12,14,30,16,20,31,32,34,35,23,24,38,6,39,40, - 5,7,10,24, - 5,1,34,33, - 39, - 35, - 31,35, - 35, - 18,33,40, - 38, - 36, - 39, - 27,39, - 30,33,6,25,39,40, - 14, - 12,13,23,26,39,28, - 3, - 26, - 0,31,24, - 32,34,36,39, - 30,32,38, - 0, - 16,6, - 38, - 0,32, - 5,12,13,14,21,34,22,37,23,26,28, - 5,1,32,25, - 31,33, - 5, - 11, - 4,5,0,1,7,11,12,13,14,30,18,21,31,32,34,33,36,37,23,24,38,6,25,26,27,39,28,40, - 16,33,24,38,6, - 35, - 5,26, - 6, - 0, - 39, - 1,11,12,34, - 5,17, - 5,0,6,27, - 5,12,26,27, - 3,4,0,30,16,18,31,35, - 1,29,23,24, - 32, - 0, - 5,7,10,14,23,25, - 3,8,2,11,12,13,16,21,34,35,37,23,26,27,39,28, - 18,22, - 33,26,40, - 11,12,32,34,38, - 6, - 11, - 28, - 0, - 7,30, - 36,39, - 7,16,6, - 1,7,6, - 1,7,11,14,30,18,38,27, - 0,30,16,31,6,40, - 39, - 0, - 6, - 1,11,12,34,33,24,6,25,40, - 7,11,12,31,34,33,38,6,40, - 5,10, - 30,33,6,25, - 31,26, - 5,11,12,13,29,21,32,34,36,37,23,38,6,26,39,28, - 3,5,10,11,17,20,23,26,27, - 3,4,7,11,21,33,23,26, - 35,23,27, - 32, - 18,32, - 22, - 5, - 11,35,23, - 32,38, - 0, - 36,39, - 35,28, - 32,36, - 18,36, - 30,33,35,6,40, - 8,30,34,36,25,26,39, - 33,36,38, - 26, - 38, - 3,32, - 5,0,7,10,11,12,13,14,16,18,19,34,33,23,24,38,26,39,28, - 3,5,0,7,8,9,2,10,11,12,13,15,14,29,30,18,19,21,34,35,37,23,24,6,26,27,28, - 18, - 18,37, - 5,0,1,10,14,29,30,19,21,31,32,34,33,23,24,38,6,26,39,28,40, - 33,38, - 3,35,23, - 32,35, - 29,35,24, - 35, - 30,32,23,39, - 6, - 3,4,8,2,11,12,13,16,21,34,37,23,26,27,39,28, - 16, - 33,28,40, - 32, - 32, - 30,31, - 6, - 5,0,14,29,30,31,33,24,38,6,25,39, - 35, - 16,36,38, - 5,7,11,12,13,18,34,33,36,23,6,26,28,40, - 34, - 7, - 1,14,29,18, - 0,1,7,8,9,10,11,12,13,15,14,29,30,16,18,19,21,34,36,37,23,26,28, - 3,0,10,16,24,26, - 7, - 35, - 5,0,1,7,8,9,2,10,11,12,13,15,14,29,30,16,18,19,21,32,34,33,22,37,23,24,38,6,25,26,27,28,40, - 0,1,38,6, - 31, - 33, - 18,35, - 7,11,12,13,32,34,33,35,36,23,26,39,28,40, - 18, - 4,7, - 3,21,31, - 31,38, - 30,6, - 37, - 5,27, - 3, - 18, - 1, - 26, - 4,20,32,35,22,36,23, - 3,5,2,10,27, - 35,39, - 26, - 28, - 3, - 3, - 38, - 30,39, - 14,18,24, - 36, - 10,11,33,23, - 3,7,11,21,33,23,26, - 11,26, - 26, - 3,7,8,10,11,18,19,23, - 0,33,38,40, - 6, - 0,35, - 34, - 30,31,36,26,39, - 26, - 7,16,31,32,23,38,6,40, - 0, - 14,30,6, - 32, - 3,7,13,32,34,35,36,39,28, - 3,23, - 0, - 26, - 31, - 35, - 3,4,5,1,7,8,9,2,10,11,12,13,29,30,17,19,21,34,22,37,23,38,6,26,27,39,28, - 10,11,14,22,23,27, - 1,7,6, - 14,30,31, - 30,31,32,35,36,25, - 32,35,38, - 7,10,11,33,25, - 32, - 4,2,11,12,34, - 5, - 7, - 3,4,7,11,17,18,20,23, - 34, - 5,30,31,34, - 7,11,12,13,18,31,33,35,22,36,23,39,40, - 3,0,1,7,11,12,13,21,31,32,34,33,35,36,37,23,38,25,26,27,39,28,40, - 38, - 3,5,10,12,16, - 34,35, - 13,37,39, - 5, - 1,11,12,31,34, - 1,14, - 5,31,35,38,39, - 38, - 4, - 31,33, - 36, - 22, - 5,20,33, - 30, - 7, - 5,0,7,10,11,14,29,16,18,19,35,36,23,24,38,39, - 7, - 3,30,36,38,39, - 36,23, - 38, - 30,31,38,26, - 5, - 34,36,39, - 11,12, - 4,5,0,1,7,8,9,2,10,11,12,13,15,14,30,16,18,21,32,34,33,35,36,37,23,38,6,25,26,27,28,40, - 1,32,35,24,6,40, - 3,31,39, - 33, - 31, - 33, - 31, - 33,35,40, - 7, - 5,14,31, - 7,40, - 33,38,40, - 33, - 33,40, - 30,33,6,25,40, - 14,33, - 31, - 32,39, - 35,36, - 3,6, - 10,11,12,14,30,38,6, - 39, - 39, - 39, - 1, - 18, - 3,16,32,38,6, - 36, - 4, - 5,32,35,38,27, - 14,16,19,21,23, - 11,12, - 3,18, - 26, - 21,35,23, - 14,30,38,6,25, - 30, - 3,5, - 18, - 0,18, - 16, - 33, - 35, - 39,40, - 14,34,6,39, - 29,38, - 26, - 30,19,33,6,40, - 16, - 40, - 16, - 1, - 3,35, - 13,34,35,37,39,28, - 3,26, - 3,18, - 33, - 36,24,26, - 3,5,8,11,12,13,14,29,16,17,18,20,21,34,37,23,24,6,26,27,28, - 3,4,0,17,18,19,35,23,25, - 18, - 0,11,12,13,18,21,34,37,23,26,28, - 5,32,38, - 33,25,40, - 32,39, - 31,32, - 3,19, - 3, - 3,5,1,7,8,10,14,30,16,19,31,32,33,22,23,6,25, - 36,23,40, - 2,16,20,33, - 30,33,6,40, - 35, - 39, - 31,26, - 36, - 0, - 5,0,33,27,40, - 21, - 30, - 31, - 18, - 38, - 40, - 4,0,7,34,33,38,40, - 35, - 0,29,30,31,32,35,36,38,39,40, - 3, - 5,11,21,32,26,27, - 5,26, - 38, - 3,18,35,39, - 39, - 5,16,32, - 0,1,30,33,6,25,39, - 0,7,12,35,36, - 35, - 33,36,40, - 28, - 40, - 23, - 33,25, - 25, - 28, - 0,32,33,35,40, - 36, - 33, - 3,18,26, - 7, - 39, - 1,34, - 26, - 10,11,19,26, - 31,28, - 32,36,23, - 4, - 5,11,33,23,39, - 1,14,30,32,6,25,40, - 14, - 35, - 18, - 16,32, - 14, - 1,33,36,23, - 17,18, - 36, - 11,12,13,29,21,34,22,37,23,26,28, - 16,32, - 5,0,1,7,11,14,16,18,32,34,33,35,36,23,26,28,40, - 1, - 0,30,33,6,40, - 1,11,12,13,14,16,18,21,34,37,23,26,39,28, - 4,7,9,17,18,19, - 23, - 6, - 36,23, - 3,0,20,26,39, - 5,30,31,34, - 31, - 3,31, - 1, - 3,23, - 32, - 16,6, - 3,16,32,33,35,6,39, - 3,22,27, - 0, - 11,38, - 6, - 32,36,38, - 26, - 5, - 30,31, - 26, - 3, - 0,33,35, - 31, - 20, - 11, - 21, - 21, - 40, - 10,18,19, - 32, - 30,33,6,40, - 30,33,35,6,40, - 0, - 31,32,39, - 30,31,32,39, - 36,23,25,40, - 23, - 39, - 5, - 0, - 35, - 5,17,22, - 30,16, - 38, - 7, - 10,30,31,32,33,36,40, - 7, - 33,25, - 26,39,40, - 0,23, - 35, - 3,22, - 35,36, - 4,7,2,10,11,32,33,36,6,26,28, - 33,36,25, - 3,5,1,10,26, - 0,33,40, - 18, - 31,36, - 8,11,12,19,32,34,36,38,6,26,39, - 0,35,38, - 30,31,40, - 33,23,25, - 35, - 22, - 36, - 26, - 0,38, - 18, - 34,6, - 39, - 31,35,39, - 13,26,28, - 3,5,8,10,11,12,13,14,29,16,19,21,34,33,35,37,23,38,26,28, - 33, - 8,26, - 5, - 30,31, - 30,31, - 31, - 4,11,12,38,6, - 37,23, - 7,11,33,40, - 32,33,36, - 26, - 35,36, - 18,36,39, - 23, - 21,33,35,36,26,39, - 32,39, - 35,26, - 5,1,7,8,9,2,10,11,12,13,15,14,29,30,16,18,19,21,34,33,35,22,37,23,38,6,25,26,27,39,28, - 6, - 3,11,12,13,16,17,32,34,37,38,26,39,28, - 4, - 6, - 18,36,39, - 23, - 21,36,38,27,39, - 33, - 37, - 0,1,30,31,32,33,36,23,6,28, - 31, - 14,39, - 3,5,30,17,20,33,35,22,23,38,6,40, - 36, - 3, - 32, - 18, - 14,30,31,32,33,38,6,40, - 5,10,31,24,38, - 31,32, - 31,39, - 26, - 32,35,39, - 33,36,39, - 0,10,14,16,19,32,33,40, - 33, - 31, - 36,23, - 35, - 1, - 16,18,19, - 36,39, - 1,8,2,10,17,19,33,22,38,6, - 5,32, - 3, - 7,26, - 1, - 0,18,23, - 35, - 1,29,32, - 36, - 39, - 12,16,21,32,34,33,35,36,23,26,27,39,40, - 32, - 33, - 3,5,1,7,8,9,2,10,11,12,13,15,14,29,30,16,18,19,21,31,34,33,37,23,24,6,26,27,28,40, - 11,12, - 35, - 40, - 3, - 5,0,7,10,11,12,13,14,29,19,21,34,37,23,24,26,28, - 3,5,1,7,8,10,11,12,13,14,29,19,21,34,35,37,23,26,27,28, - 7,18,32,38, - 3, - 3, - 3, - 3, - 6, - 32,6, - 5,18,19,33,35, - 35, - 11,14,30,18,31,33,35, - 1, - 26, - 5,7,13,15,14,30,18,31,33,36,6,25,26,27,28, - 37, - 36, - 1, - 40, - 1,11,12,34,36,23,38, - 36,23,38, - 18, - 33,23,40, - 26, - 38, - 17, - 3,23, - 31, - 31, - 36, - 31,33,40, - 11,12,35,26, - 5,1,7,11,12,13,14,30,17,21,34,35,36,37,23,38,6,26,28,40, - 32, - 18, - 3,1,7,33,38,40, - 26, - 3,10,26, - 5,26, - 0, - 0, - 3,0,18, - 3,5, - 1, - 14, - 3, - 30,32, - 5,35, - 35, - 11,33,6,40, - 36, - 1,11,12,30,34,38,6, - 34, - 20,22, - 0, - 7,10,11,17,20,34,33,25, - 7,10, - 7, - 30,33,35,6,40, - 3,29,30,16,31,32,33,35,36,38,6,26,39,40, - 28, - 26, - 5,7,8,9,2,10,11,12,13,15,14,29,21,34,37,23,6,26,27,28, - 1,11,12,30,32,34,33,39,28,40, - 36, - 16,31, - 0,25, - 1,8,31,38,39, - 3,4,5,0,7,8,2,10,11,30,17,18,19,20,33,22,23,6,26,27,40, - 18,31,32,35,22,23,6, - 5,0,29,30,32,33,40, - 5,23, - 3,4,5,0,1,8,9,2,11,12,13,14,29,30,16,17,20,21,32,34,35,22,36,37,23,24,38,6,26,27,39,28,40, - 36, - 1,11,12,34, - 5, - 4,10,21,31,25, - 29,35,38,39, - 3,4,5,0,7,8,2,10,11,30,17,18,19,20,33,22,23,6,26,27,40, - 6, - 11, - 18,20,27,39, - 0,20, - 18,35, - 36, - 0, - 35, - 26, - 5,0,13,29,30,33,36,23,6,25,28,40, - 5, - 20,31,6, - 6,27, - 5, - 31, - 35,26, - 31, - 3, - 32, - 4, - 3, - 0, - 10,29,24, - 34,6,39, - 38, - 36,39, - 4,5,13,21,32,34,35,36,23,6,25,39,28, - 4, - 0,18, - 30,31,32,39, - 5,33,38,39, - 0,30, - 7,18, - 36, - 40, - 4,10,39, - 36, - 27, - 0, - 11,36, - 22, - 12,34,35,6, - 35,23, - 34, - 35, - 33,40, - 7, - 14,30,6,25, - 5,36, - 35,36,39, - 3,4,7,34,33,23,6,25,26,28,40, - 3,14,33,6,25, - 39, - 0,7,8,15,16,26, - 24,40, - 33,40, - 35, - 0,26, - 18,39, - 31,39, - 6,40, - 3,11,32,34,35,36,38,39, - 5,30,6, - 11, - 33, - 1, - 5,7,8,9,2,10,11,12,13,15,14,29,30,18,19,21,31,34,33,36,37,23,24,6,25,26,27,28, - 7, - 1,30,31,38,40, - 1,11,12,30,31,34,40, - 4,7, - 5,22, - 3,32, - 7,30,20,31,35,22,23,24, - 7,11,14,30,31,23,38,6,39, - 5,0,30,33,36,23,25, - 13,34,33,36,37,23,24,6,25,39,28, - 3,5,8,2,11,12,13,29,16,21,32,34,35,36,37,23,38,6,26,39,28, - 33,35,36,39,40, - 31, - 4, - 3,4,5,0,8,11,13,18,21,34,33,35,22,37,38,6,26,28,40, - 18, - 0,36,38, - 38, - 1,6, - 36, - 3,26, - 0,30,35,38, - 5,1,7,8,2,10,11,12,13,14,29,30,16,18,19,21,32,34,33,36,37,23,24,6,25,26,27,39,28,40, - 1, - 30,16,32,6, - 32,38, - 6, - 15,6, - 33,6, - 26, - 0,23, - 5,0,1,11,12,13,14,29,17,18,21,32,34,35,22,37,23,6,25,26,39,28, - 0,30,18,33,25, - 5, - 35,6, - 12,13,35,37,39, - 13, - 3,1,7,11,12,16,18,34,22,6,27, - 5,1,11,12,15,18,32,33,36,38,25,39,40, - 6, - 12,36, - 38,26, - 35, - 5, - 11,12,36,6, - 0,16,32,33,35,26,39, - 32, - 35,26, - 28,40, - 39, - 34,26, - 32,26, - 5,32,35,39, - 7, - 6, - 26, - 26, - 11,12,16,34,36,39, - 31, - 5,31, - 4,30,32, - 5,0,33,24, - 33,6,26, - 18, - 35,38, - 33, - 1, - 32,35, - 3,5,0,8,11,12,13,14,29,30,18,21,34,36,37,23,6,26,28, - 0,7,30,18,19,31,35,39, - 31, - 5,0,1,22,26,27, - 27, - 5,11,18,32,34,26,27, - 0, - 3,30, - 26, - 26, - 40, - 3,1,7,11,18,26, - 5,7,10,11,17,22, - 30,31, - 3,8,14,30,6, - 3, - 8, - 3,8,9,16,17,20,24, - 0, - 35, - 6, - 31, - 12,21,34,6, - 0, - 5,17,18,6,27, - 30,31,6, - 0,31,35,39, - 36, - 18,33,35,40, - 4,11,12,13,19,21,34,37,23,38,26,28, - 3,4,7,2,11,15,16,17,19,20,33, - 28, - 26,27, - 7,11,13,36, - 35, - 35,36, - 36,23, - 35, - 4,1,7,30,21,31,32,35,6,40, - 35, - 6, - 6, - 35,26, - 3,4,11,12,34,35,23,39, - 35, - 40, - 31, - 3,5,0,8,11,12,13,14,29,30,18,21,34,36,37,23,38,6,26,27,28, - 4,33,23, - 3, - 31, - 32, - 8,11,12,13,14,29,30,21,31,32,34,33,22,37,23,38,26,28,40, - 32,33,38, - 35, - 32, - 26, - 23,27, - 30,24,6, - 30,31,38, - 32,35, - 32,38,6, - 3, - 3,7,40, - 32, - 25, - 40, - 1, - 39, - 0,1,7,10,11,12,30,32,34,35,36,37,38, - 4,19, - 3,5,7,8,11,12,13,29,16,34,33,35,37,23,6,25,26,27,39,28, - 18, - 39, - 4,7,26, - 1, - 5,7,8,9,2,10,11,12,13,15,14,29,21,31,34,35,36,37,23,38,6,26,27,28, - 21,32,22,38,39, - 7, - 3,5,0,1,7,10,11,13,29,30,16,31,32,35,36,23,38,26,27,39,28,40, - 17, - 26, - 7,38, - 5, - 3,4,0,7,8,2,11,12,13,16,18,21,32,34,35,36,37,23,6,26,27,39,28, - 36,38, - 20, - 39, - 0, - 3,8,13,16,21,34,35,36,37,23,26,28, - 33, - 35, - 1,33,36,23, - 32,26, - 30,25,40, - 0, - 3,4,0,1,7,9,2,10,11,12,13,15,14,30,16,17,21,31,32,34,33,35,22,37,23,24,38,6,25,26,27,39,28,40, - 31, - 33,35,40, - 35, - 29, - 11,13,32,35,28, - 8,11,12,13,29,20,21,34,37,23,38,6,26,28,40, - 30,35,22,6,40, - 1,32,38, - 8,23, - 18, - 35, - 5, - 34, - 3,35, - 3, - 7,36,23,6,28, - 3,5,0,1,7,8,9,2,10,11,12,13,15,14,16,18,19,21,32,34,33,35,22,36,37,23,24,6,25,26,27,39,28, - 0,10,15,30,32,22,38, - 6, - 6, - 33,6,40, - 32,35,36,6, - 4,30,31, - 0,35, - 36, - 1,7,31,33,35,36,23,24, - 4,19, - 10,11,12,20,34,33,25, - 1,7,31,33,36,23,24, - 5,0,1,7,2,10,11,12,13,15,14,29,18,19,21,34,33,37,23,24,25,26,28, - 11,12,34, - 1,24, - 30,31,32,33,35,40, - 11,12,34, - - + + + 5,0,1,11,32,34,35,38,6,26,39, + 32, + 39, + 4,5,0,7,2,10,11,15,14,19,31,32,34,33,35,6,27, + 31,32,39, + 0,32,6,26,39, + 33, + 31, + 35, + 4,5,7,2,10,15,14,19,31,33,35,36,27,39, + 7,39, + 36, + 7,11,17,34,33,25,39, + 4,5,7,10,19,24,27, + 39, + 3,0,1,11,12,14,30,16,20,31,32,34,35,23,24,38,6,39,40, + 5,7,10,24, + 5,1,34,33, + 39, + 35, + 31,35, + 5,0,35, + 18,33,40, + 38, + 36, + 11,39, + 27,39, + 30,33,6,25,39,40, + 14, + 12,13,23,26,39,28, + 3, + 26, + 0,31,24, + 32,34,36,39, + 5,0,30,32,38, + 0, + 16,6, + 38, + 5,0, + 23, + 0,32, + 5,12,13,14,21,34,22,37,23,26,28, + 5,1,32,25, + 31,33, + 5, + 5, + 11, + 4,5,0,1,7,11,12,13,14,30,18,21,31,32,34,33,36,37,23,24,38,6,25,26,27,39,28,40, + 16,33,24,38,6, + 35, + 5,26, + 6, + 0, + 39, + 1,11,12,34, + 5,17, + 5,0,6,27, + 5,12,26,27, + 3,4,0,7,30,16,18,31,35, + 1,29,23,24, + 32, + 0, + 5,7,10,14,23,25, + 3,8,2,11,12,13,16,21,34,35,37,23,26,27,39,28, + 18,22, + 33,26,40, + 11,12,32,34,38,40, + 6, + 11, + 28, + 0, + 7,30, + 36,39, + 7,16,6, + 1,7,6, + 1,7,11,14,30,18,38,27, + 0,30,16,31,6,40, + 39, + 5,0, + 6, + 1,11,12,34,33,24,6,25,40, + 7,11,12,31,34,33,38,6,40, + 5,10, + 30,33,6,25, + 31,26, + 5,11,12,13,29,21,32,34,36,37,23,38,6,26,39,28, + 3,5,10,11,17,20,23,26,27, + 3,4,7,11,21,33,23,26, + 35,23,27, + 32, + 18,32, + 22, + 5, + 11,35,23, + 32,38, + 0, + 36,39, + 35,28, + 5,0, + 32,36, + 18,36, + 30,33,35,6,40, + 8,30,34,36,25,26,39, + 33,36,38, + 26,40, + 38, + 3,32, + 5,0,7,10,11,12,13,14,16,18,19,34,33,23,24,38,26,39,28,40, + 3,5,0,7,8,9,2,10,11,12,13,15,14,29,30,18,19,21,34,35,37,23,24,6,25,26,27,28, + 18,23, + 18,37,23, + 5,0,1,10,14,29,30,19,21,31,32,34,33,23,24,38,6,26,39,28,40, + 33,38, + 3,35,23, + 32,35, + 29,35,24, + 35, + 5,30,32,23,39, + 6, + 3,4,8,2,11,12,13,16,21,34,37,23,26,27,39,28, + 16, + 33,28,40, + 32, + 32, + 30,31, + 6, + 5,0,14,29,30,31,33,24,38,6,25,39,40, + 35, + 16,36,38, + 5,0,7,11,12,13,18,34,33,36,23,6,26,28,40, + 34, + 7, + 1,14,29,18, + 0,1,7,8,9,10,11,12,13,15,14,29,30,16,18,19,21,34,36,37,23,26,28,40, + 3,0,10,16,24,26, + 7, + 35, + 5, + 5,0,1,7,8,9,2,10,11,12,13,15,14,29,30,16,18,19,21,32,34,33,22,37,23,24,38,6,25,26,27,28,40, + 0,1,38,6, + 31, + 33, + 18,35, + 7, + 7,11,12,13,32,34,33,35,36,23,26,39,28,40, + 18, + 4,7, + 3,21,31, + 5,0,31,38, + 30,6, + 37, + 5,27, + 3, + 18, + 1, + 26, + 4,5,20,32,35,22,36,23, + 3,5,2,10,27, + 5,0,35,39, + 26, + 28, + 3, + 3, + 38, + 30,39, + 14,18,24, + 36, + 10,11,33,23, + 3,7,11,21,33,23,26, + 11,26, + 26, + 3,7,8,10,11,18,19,23, + 0,33,38,40, + 6, + 0,35, + 34, + 30,31,36,26,39, + 26, + 7,16,31,32,23,38,6,40, + 0, + 14,30,6, + 32, + 3,7,13,32,34,35,36,39,28, + 3,23, + 0, + 26, + 31, + 35, + 3,4,5,1,7,8,9,2,10,11,12,13,29,30,17,19,21,34,22,37,23,38,6,26,27,39,28, + 10,11,14,22,23,27, + 1,7,6, + 14,30,31, + 7,30,31,32,35,36,25, + 32,35,38, + 7,10,11,33,25, + 32, + 4,2,11,12,34, + 5, + 7, + 3,4,7,11,17,18,20,23, + 34, + 5,30,31,34, + 7,11,12,13,18,31,33,35,22,36,23,39,40, + 3,0,1,7,11,12,13,21,31,32,34,33,35,36,37,23,38,25,26,27,39,28,40, + 38, + 3,5,10,12,16, + 34,35, + 13,37,39, + 5, + 1,11,12,31,34, + 1,14, + 5,31,35,38,39, + 38, + 4,30,6, + 31,33, + 36, + 22, + 5,20,33, + 30,6, + 30, + 7, + 5,0,7,10,11,14,29,16,18,19,35,36,23,24,38,39, + 7, + 3,5,30,36,38,39, + 36,23, + 38, + 30,31,38,26, + 5, + 0,34,36,39, + 11,12, + 4,5,0,1,7,8,9,2,10,11,12,13,15,14,30,16,18,21,32,34,33,35,36,37,23,38,6,25,26,27,28,40, + 1,32,35,24,6,40, + 3,31,39, + 33, + 31, + 30,6, + 33, + 31, + 33,35,40, + 7, + 5,14,31, + 5,0, + 7,40, + 33,38,40, + 33, + 33,40, + 30,33,6,25,40, + 14,33, + 31, + 32,39, + 35,36, + 3,6, + 10,11,12,14,30,38,6, + 39, + 39, + 39, + 1, + 18, + 3,16,32,38,6, + 36, + 4,7, + 5,32,35,38,27, + 14,16,19,21,23, + 11,12, + 3,18, + 26, + 21,35,23, + 14,30,38,6,25, + 30, + 7, + 3,5, + 18, + 0,18, + 16, + 33, + 35, + 39,40, + 14,34,6,39, + 29,38, + 26, + 5,0,30,19,33,6,40, + 16, + 40, + 16, + 1, + 3,35, + 13,34,35,37,39,28, + 3,26, + 3,18, + 33, + 36,24,26, + 3,5,8,11,12,13,14,29,16,17,18,20,21,34,37,23,24,6,26,27,28, + 3,4,5,0,17,18,19,35,23,25, + 18, + 0,11,12,13,18,21,34,37,23,26,28, + 5,32,38, + 33,25,40, + 32,39, + 31,32, + 3,19, + 3, + 3,5,0,1,7,8,10,14,30,16,19,31,32,33,22,23,6,25, + 36,23,40, + 2,16,20,33, + 30,33,6,40, + 35, + 39, + 31,26, + 36, + 0, + 5,0,33,27,40, + 21, + 30, + 31, + 18, + 38, + 30,40, + 4,0,7,34,33,38,40, + 35, + 0,29,30,31,32,35,36,38,39,40, + 3, + 5,11,21,32,26,27, + 5,26, + 38, + 3,18,35,39, + 39, + 5,16,32, + 0,1,30,33,6,25,39, + 0,7,12,35,36, + 35, + 33,36,40, + 28, + 40, + 23, + 33,25, + 25, + 28, + 0,32,33,35,40, + 36, + 33, + 3,18,23,26, + 30,6, + 7, + 39, + 1,34, + 26, + 10,11,19,26, + 31,28, + 32,36,23, + 4, + 5,11,33,23,39, + 1,14,30,32,6,25,40, + 14, + 35, + 18, + 16,32, + 14, + 7, + 1,33,36,23, + 17,18, + 5,0, + 16,36, + 11,12,13,29,21,34,22,37,23,26,28, + 16,32, + 5,0,1,7,11,14,16,18,32,34,33,35,36,23,26,28,40, + 1, + 0,30,33,6,40, + 1,11,12,13,14,16,18,21,34,37,23,26,39,28, + 4,7,9,17,18,19, + 23, + 6, + 36,23, + 3,0,20,26,39, + 5,30,31,34, + 31, + 3,31, + 1,16, + 3,5,0,7,23, + 32, + 16,6, + 3,16,32,33,35,6,39, + 3,22,27, + 0, + 11,38, + 6, + 32,36,38, + 5,0, + 5,0, + 11, + 26, + 5, + 30,31, + 26, + 3, + 0,11,33,35, + 31, + 20, + 11, + 21, + 21, + 40, + 10,18,19, + 32, + 16, + 30,33,6,40, + 5,0, + 30,33,35,6,40, + 0, + 16, + 31,32,39, + 30,31,32,39, + 5, + 36,23,25,40, + 23, + 39, + 5, + 0, + 35, + 17,22, + 30,16, + 38, + 7, + 10,30,31,32,33,36,23,40, + 7, + 33,25, + 11,26,39,40, + 0,23, + 35, + 3,22, + 35,36, + 4,7,2,10,11,32,33,36,6,26,28, + 33,36,25, + 3,5,1,10,23,26, + 0,33,40, + 18, + 31,36, + 8,11,12,19,32,34,36,38,6,26,39,40, + 5,0,35,38, + 30,31,40, + 33,23,25, + 35, + 22, + 36, + 26, + 0,38, + 18, + 34,6, + 39, + 31,35,39, + 13,26,28, + 3,5,8,10,11,12,13,14,29,16,19,21,34,33,35,37,23,38,26,28, + 33, + 8,26, + 5, + 30,31, + 30,31, + 31, + 4,11,12,38,6,40, + 37,23, + 7,11,33,40, + 32,33,36, + 26, + 35,36, + 18,36,39, + 23, + 21,33,35,36,26,39, + 5,32,39, + 35,26, + 5, + 5,1,7,8,9,2,10,11,12,13,15,14,29,30,16,18,19,21,34,33,35,22,37,23,38,6,25,26,27,39,28, + 6, + 3,11,12,13,16,17,32,34,37,23,38,26,39,28, + 4, + 6, + 18,36,39, + 23, + 21,36,38,27,39, + 33, + 5,0, + 37, + 5,0, + 5,0, + 0,1,30,31,32,33,36,23,6,28, + 31, + 14,39, + 3,5,30,17,20,33,35,22,23,38,6,40, + 36, + 3, + 32, + 18, + 14,30,31,32,33,38,6,40, + 5,10,31,24,38, + 31,32, + 31,39, + 26, + 32,35,39, + 33,36,39, + 0,10,14,16,19,32,33,40, + 33, + 31, + 36,23, + 35, + 5,0,1, + 5,16,18,19, + 36,39, + 5,0, + 1,8,2,10,17,19,33,22,38,6, + 5,32, + 3, + 7,26, + 1, + 0,18,23, + 35, + 1,29,32, + 36, + 39, + 5,12,16,21,32,34,33,35,36,23,26,27,39,40, + 32, + 33, + 3,5,1,7,8,9,2,10,11,12,13,15,14,29,30,16,18,19,21,31,34,33,37,23,24,6,25,26,27,28,40, + 11,12, + 35, + 40, + 3, + 5,0,7,10,11,12,13,14,29,19,21,34,37,23,24,26,28, + 3,5,1,7,8,10,11,12,13,14,29,19,21,34,35,37,23,26,27,28, + 7,18,32,38, + 3, + 3, + 3, + 3, + 6, + 32,6, + 18,19,33,35, + 35, + 5,11,14,30,18,31,33,35, + 1, + 5, + 26, + 5,7,13,15,14,30,18,31,33,36,6,25,26,27,28, + 37, + 36, + 1, + 40, + 1,11,12,34,36,23,38, + 36,23,38,40, + 18, + 33,23,40, + 26, + 38, + 17, + 3,23, + 5,0, + 31, + 31, + 36, + 31,33,40, + 5, + 11,12,35,26, + 5,1,7,11,12,13,14,30,17,21,34,35,36,37,23,38,6,26,28,40, + 32, + 18, + 3,5,0,1,7,33,38,40, + 26, + 3,10,26, + 5,0, + 5,0,26, + 0, + 0, + 3,0,18,40, + 5, + 3,5, + 1, + 14, + 3, + 30,32, + 5,35, + 35, + 11,33,6,40, + 36, + 1,11,12,30,34,38,6, + 34, + 20,22, + 0, + 7,10,11,17,20,34,33,25, + 7,10, + 7, + 30,33,35,6,40, + 3,7,29,30,16,31,32,33,35,36,38,6,26,39,40, + 28, + 26, + 5,7,8,9,2,10,11,12,13,15,14,29,21,34,37,23,6,26,27,28, + 1,11,12,30,32,34,33,39,28,40, + 36, + 16,31, + 0,25, + 5,1,7,8,31,38,39, + 3,4,5,0,7,8,2,10,11,30,17,18,19,20,33,22,23,6,26,27,40, + 18,31,32,35,22,23,6, + 5,0,29,30,32,33,40, + 5,23, + 3,4,5,0,1,8,9,2,11,12,13,14,29,30,16,17,20,21,32,34,35,22,36,37,23,24,38,6,26,27,39,28,40, + 36, + 1,11,12,34, + 5, + 4,10,21,31,25, + 29,35,38,39, + 3,4,5,0,7,8,2,10,11,30,17,18,19,20,33,22,23,6,26,27,40, + 6, + 11, + 18,20,27,39, + 0,20, + 5,0, + 18,35, + 36, + 0, + 35, + 26, + 5,0, + 5,0,13,29,30,33,36,23,6,25,28,40, + 5, + 20,31,6, + 6,27, + 5, + 31, + 35,26, + 31, + 3, + 32, + 4, + 3, + 0, + 10,29,24, + 34,6,39, + 38, + 36,39, + 4,5,13,21,32,34,35,36,23,6,25,39,28, + 4, + 0,18, + 30,31,32,39, + 5,11,33,38,39, + 0,30, + 7,18, + 36, + 40, + 4,10,39, + 36, + 27, + 0, + 11,36, + 22, + 12,34,35,6, + 35,23, + 34, + 35, + 33,40, + 7, + 14,30,6,25, + 5,36, + 35,36,39, + 3,4,7,34,33,23,6,25,26,28,40, + 3,14,33,6,25, + 39, + 5,0,7,8,15,16,26, + 24,40, + 33,40, + 35, + 0,26, + 18,39, + 31,39, + 6,40, + 3,11,32,34,35,36,38,39, + 5,30,6, + 11, + 33, + 1, + 5,7,8,9,2,10,11,12,13,15,14,29,30,18,19,21,31,34,33,36,37,23,24,6,25,26,27,28, + 7, + 1,30,31,38,40, + 1,11,12,30,31,34,40, + 4,7, + 5,0,22, + 3,32,23, + 7,30,20,31,35,22,23,24, + 5,7,11,14,30,31,23,38,6,39, + 5,0,30,33,36,23,25, + 13,34,33,36,37,23,24,6,25,39,28, + 3,5,8,2,11,12,13,29,16,21,32,34,35,36,37,23,38,6,26,39,28, + 33,35,36,39,40, + 31, + 4, + 3,4,5,0,8,11,13,18,21,34,33,35,22,37,38,6,26,28,40, + 18, + 0,36,38, + 38, + 1,6, + 36, + 3,26, + 0,30,35,38, + 5,1,7,8,2,10,11,12,13,14,29,30,16,18,19,21,32,34,33,36,37,23,24,6,25,26,27,39,28,40, + 5,1, + 30,16,32,6, + 32,38, + 6, + 15,6, + 33,6, + 26, + 0,23, + 5,0,1,11,12,13,14,29,17,18,21,32,34,35,22,37,23,6,25,26,39,28,40, + 0,30,18,33,25, + 5, + 35,6, + 12,13,35,37,39, + 13, + 3,5,0,1,7,11,12,16,18,34,22,6,27, + 5,1,11,12,15,18,32,33,36,38,25,39,40, + 6, + 12,36, + 38,26, + 35, + 5,11,12,36,6, + 0,16,32,33,35,26,39, + 32, + 35,26, + 28,40, + 39, + 34,26, + 32,26, + 5,32,35,39, + 7, + 6, + 26, + 26, + 5,0, + 11,12,16,34,36,39, + 31, + 5,31, + 4,30,32, + 5,0,33,24, + 33,6,26, + 18, + 35,38, + 33, + 1, + 32,35, + 3,5,0,8,11,12,13,14,29,30,18,21,34,36,37,23,6,26,28, + 0,7,30,18,19,31,35,39, + 31, + 5,0,1,22,26,27, + 27, + 5,11,18,32,34,26,27, + 0, + 3,30, + 26, + 26, + 40, + 3,1,7,11,16,18,26, + 5,7,10,11,17,22, + 30,31, + 3,8,14,30,6, + 3, + 8, + 3,8,9,16,17,20,24, + 0, + 5, + 35, + 6, + 31, + 12,21,34,6, + 0, + 5,17,18,6,27, + 30,31,6, + 5,0, + 0,31,35,39, + 36, + 18,33,35,40, + 4,11,12,13,19,21,34,37,23,38,26,28, + 3,4,7,2,11,15,16,17,19,20,33,25, + 28, + 26,27, + 7,11,13,36, + 35, + 35,36, + 36,23, + 35, + 4,5,1,7,21,31,32,35,23,6,40, + 35, + 6, + 6, + 5,0, + 35,26, + 3,4,11,12,34,35,23,39, + 35, + 40, + 31, + 3,5,0,8,11,12,13,14,29,30,18,21,34,36,37,23,38,6,26,27,28, + 7, + 4,33,23, + 3, + 31, + 32, + 5,0,7, + 8,11,12,13,14,29,30,21,31,32,34,33,22,37,23,38,26,28,40, + 32,33,38, + 35, + 32, + 26, + 23,27, + 30,24,6, + 30,31,38, + 32,35, + 32,38,6, + 3, + 3,7,40, + 32, + 25, + 40, + 1, + 39, + 0,1,7,10,11,12,30,32,34,35,36,37,38, + 4,19, + 3,5,7,8,11,12,13,29,16,34,33,35,37,23,6,25,26,27,39,28, + 18,40, + 39, + 4,7,26, + 1, + 5,7,8,9,2,10,11,12,13,15,14,29,21,31,34,35,36,37,23,38,6,26,27,28, + 21,32,22,38,39, + 7, + 3,5,0,1,7,10,11,13,29,30,16,31,32,35,36,23,38,26,27,39,28,40, + 17, + 26, + 5,0, + 7,38, + 5, + 3,4,0,7,8,2,11,12,13,16,18,21,32,34,35,36,37,23,6,26,27,39,28, + 5,0,36,38, + 20, + 39, + 0, + 3,8,13,16,21,34,35,36,37,23,26,28, + 33, + 35, + 1,7,33,36,23, + 32,26, + 30,25,40, + 0, + 3,4,0,1,7,9,2,10,11,12,13,15,14,30,16,17,21,31,32,34,33,35,22,37,23,24,38,6,25,26,27,39,28,40, + 31, + 33,35,40, + 35, + 29, + 11,13,32,35,28, + 8,11,12,13,29,20,21,34,37,23,38,6,26,28,40, + 30,35,22,6,40, + 1,32,38, + 8,23, + 18, + 35, + 5, + 5,0, + 5,34, + 3,35,23, + 3, + 7,36,23,6,28, + 3,5,0,1,7,8,9,2,10,11,12,13,15,14,16,18,19,21,32,34,33,35,22,36,37,23,24,6,25,26,27,39,28, + 0,10,15,30,32,22,38, + 6, + 6, + 33,6,40, + 32,35,36,6, + 4,30,31, + 5,0, + 0,35, + 36, + 1,7,31,33,35,36,23,24, + 4,19, + 10,11,12,20,34,33,25, + 1,7,31,33,36,23,24, + 5,0,1,7,2,10,11,12,13,15,14,29,18,19,21,34,33,37,23,24,25,26,28, + 11,12,34, + 1,24, + 30,31,32,33,35,40, + 11,12,34, + + diff --git a/doc/salome/gui/VISU/whxdata/whgdata0.xml b/doc/salome/gui/VISU/whxdata/whgdata0.xml index 0075ff8d..b0993a04 100755 --- a/doc/salome/gui/VISU/whxdata/whgdata0.xml +++ b/doc/salome/gui/VISU/whxdata/whgdata0.xml @@ -1,22 +1,22 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/doc/salome/gui/VISU/whxdata/whglo.xml b/doc/salome/gui/VISU/whxdata/whglo.xml index 0f1cd68e..ac67056d 100755 --- a/doc/salome/gui/VISU/whxdata/whglo.xml +++ b/doc/salome/gui/VISU/whxdata/whglo.xml @@ -1,5 +1,5 @@ - - - - + + + + \ No newline at end of file diff --git a/doc/salome/gui/VISU/whxdata/whidx.xml b/doc/salome/gui/VISU/whxdata/whidx.xml index ac66bb96..44f05e5b 100755 --- a/doc/salome/gui/VISU/whxdata/whidx.xml +++ b/doc/salome/gui/VISU/whxdata/whidx.xml @@ -1,4 +1,4 @@ - - - - + + + + diff --git a/doc/salome/gui/VISU/whxdata/whtdata0.xml b/doc/salome/gui/VISU/whxdata/whtdata0.xml index bea3a5fd..14a0dff2 100755 --- a/doc/salome/gui/VISU/whxdata/whtdata0.xml +++ b/doc/salome/gui/VISU/whxdata/whtdata0.xml @@ -1,59 +1,57 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/doc/salome/gui/VISU/whxdata/whtoc.xml b/doc/salome/gui/VISU/whxdata/whtoc.xml index a271ba7c..871ec25b 100755 --- a/doc/salome/gui/VISU/whxdata/whtoc.xml +++ b/doc/salome/gui/VISU/whxdata/whtoc.xml @@ -1,4 +1,4 @@ - - - - + + + + diff --git a/doc/salome/tui/Makefile.am b/doc/salome/tui/Makefile.am new file mode 100644 index 00000000..851e45d9 --- /dev/null +++ b/doc/salome/tui/Makefile.am @@ -0,0 +1,57 @@ +# Copyright (C) 2005 CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# File : Makefile.in +# Author : Vasily Rusyaev (Open Cascade NN) +# Module : doc + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +EXTRA_DIST+=VISU + +dev_docs: + cp -fr $(srcdir)/VISU ./INPUT; \ + cp -f ./VISU/doxyfile ./INPUT; \ + cd INPUT; \ + sed 's|../../../share/salome|$(root_srcdir)|' ./doxyfile > ./doxyfile1; \ + sed 's|../../build/salome|$(top_builddir)|' ./doxyfile1 > ./doxyfile2; \ + mv -f doxyfile2 doxyfile1; \ + echo "DOXYGEN SUPPORT PYTHON - @DOXYGEN_WITH_PYTHON@"; \ + if( test "x@DOXYGEN_WITH_PYTHON@" = "xyes"); then \ + sed 's|python_extension_must_be_here|*.py|' ./doxyfile1 > ./doxyfile2; \ + mv -f doxyfile2 doxyfile1; \ + $(doxygen) -u ./doxyfile1; \ + else \ + sed 's|python_extension_must_be_here||' ./doxyfile1 > ./doxyfile2; \ + mv -f doxyfile2 doxyfile1; \ + fi; \ + if( test "x@DOXYGEN_WITH_STL@" = "xyes"); then \ + sed -e 's|BUILTIN_STL_SUPPORT = NO|BUILTIN_STL_SUPPORT = YES|' ./doxyfile1 > ./doxyfile2; \ + mv -f doxyfile2 doxyfile1; \ + fi; \ + mv -f doxyfile1 doxyfile; \ + echo "Running doxygen in directory:"`pwd`; \ + $(doxygen) ./doxyfile; \ + cd ../; \ + cp -fr $(srcdir)/VISU/sources/ VISU ; \ + rm -fr INPUT + +doctuidir=$(docdir)/tui/VISU + +nodist_doctui_DATA= VISU/doxyfile +EXTRA_DIST+= VISU/doxyfile.in diff --git a/doc/salome/tui/Makefile.in b/doc/salome/tui/Makefile.in deleted file mode 100644 index 712af448..00000000 --- a/doc/salome/tui/Makefile.in +++ /dev/null @@ -1,75 +0,0 @@ -# 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.in -# Author : Vasily Rusyaev (Open Cascade NN) -# Module : doc -# $Header: - -top_srcdir=@top_srcdir@ -top_builddir=../../.. -root_srcdir=@ROOT_SRCDIR@ -srcdir=@srcdir@ -VPATH=.:@srcdir@ -doxygen=@DOXYGEN@ - -@COMMENCE@ - -dev_docs: - cp -fr $(srcdir)/VISU ./INPUT; \ - cp -fr ./VISU/doxyfile ./INPUT; \ - cp -fr ./VISU/sources/static/tree.js ./INPUT/sources/static; \ - cd INPUT; \ - sed 's|../../../share/salome|$(root_srcdir)|' ./doxyfile > ./doxyfile1; \ - sed 's|../../build/salome|$(top_builddir)|' ./doxyfile1 > ./doxyfile2; \ - mv -f doxyfile2 doxyfile1; \ - echo "DOXYGEN SUPPORT PYTHON - @DOXYGEN_WITH_PYTHON@"; \ - if( test "x@DOXYGEN_WITH_PYTHON@" = "xyes"); then \ - sed 's|python_extension_must_be_here|*.py|' ./doxyfile1 > ./doxyfile2; \ - mv -f doxyfile2 doxyfile1; \ - $(doxygen) -u ./doxyfile1; \ - else \ - sed 's|python_extension_must_be_here||' ./doxyfile1 > ./doxyfile2; \ - mv -f doxyfile2 doxyfile1; \ - fi; \ - if( test "x@DOXYGEN_WITH_STL@" = "xyes"); then \ - sed -e 's|BUILTIN_STL_SUPPORT = NO|BUILTIN_STL_SUPPORT = YES|' ./doxyfile1 > ./doxyfile2; \ - mv -f doxyfile2 doxyfile1; \ - fi; \ - mv -f doxyfile1 doxyfile; \ - $(doxygen) ./doxyfile; \ - cd ..; \ - cp -fr $(srcdir)/VISU/sources/static/*.* ./VISU/ - cp -fr $(srcdir)/VISU/sources/ VISU/ - cp -fr $(srcdir)/VISU/HTML/ VISU/ - rm -fr INPUT - -clean: - rm -fr VISU - -distclean: clean - rm -fr INPUT - -install: - $(INSTALL) -d $(docdir); \ - mkdir -p $(docdir)/tui - cp -fr VISU $(docdir)/tui - -uninstall: - rm -fr $(docdir)/tui/VISU diff --git a/doc/salome/tui/VISU/sources/static/examples_VISU.html b/doc/salome/tui/VISU/sources/static/examples_VISU.html index 40e26ee9..bd5bca94 100755 --- a/doc/salome/tui/VISU/sources/static/examples_VISU.html +++ b/doc/salome/tui/VISU/sources/static/examples_VISU.html @@ -1,1270 +1,1270 @@ - - - - - - - - Main Page - - - - -   -
-
string VISU.XYPlot.GetYTitle string VISU.XYPlot.GetYTitle  ) 
void VISU.View.SetTitle in string in string  theTitle  )  [inherited] - + @@ -2118,7 +2125,7 @@ Updates the view. - + @@ -2150,7 +2157,7 @@ Saves the view.
Parameters:
"; - return sHTML; -} - -function showHidePane(bShow) -{ - var oMsg=null; - if(bShow) - oMsg=new whMessage(WH_MSG_SHOWPANE,this,1,null); - else - oMsg=new whMessage(WH_MSG_HIDEPANE,this,1,null); - SendMessage(oMsg); -} - -function isShowHideEnable() -{ - if(gbIE4) - return true; - else - return false; -} - - -function PickupDialog_Invoke() -{ - if(!gbIE4||gbMac) - { - if(typeof(_PopupMenu_Invoke)=="function") - return _PopupMenu_Invoke(PickupDialog_Invoke.arguments); - } - else - { - if(PickupDialog_Invoke.arguments.length>2) - { - var sPickup="whskin_pickup.htm"; - var sPickupPath=gsPPath+sPickup; - if(gbIE4) - { - var sFrame=PickupDialog_Invoke.arguments[1]; - var aTopics=new Array(); - for(var i=2;i1) - { - var nWidth=300; - var nHeight=180; - var nScreenWidth=screen.width; - var nScreenHeight=screen.height; - var nLeft=(nScreenWidth-nWidth)/2; - var nTop=(nScreenHeight-nHeight)/2; - if(gbIE4) - { - var vRet=window.showModalDialog(sPickupPath,aTopics,"dialogHeight:"+nHeight+"px;dialogWidth:"+nWidth+"px;resizable:yes;status:no;scroll:no;help:no;center:yes;"); - if(vRet) - { - var sURL=vRet.m_url; - if(sFrame) - window.open(sURL,sFrame); - else - window.open(sURL,"_self"); - } - } - } - else if(aTopics.length==1) - { - var sURL=aTopics[0].m_sURL - if(sFrame) - window.open(sURL,sFrame); - else - window.open(sURL,"_self"); - } - } - } - } -} - -if(window.gbWhUtil&&window.gbWhMsg&&window.gbWhVer&&window.gbWhProxy) -{ - RegisterListener("bsscright",WH_MSG_GETAVIAVENUES); - RegisterListener("bsscright",WH_MSG_GETTOCPATHS); - RegisterListener("bsscright",WH_MSG_NEXT); - RegisterListener("bsscright",WH_MSG_PREV); - RegisterListener("bsscright",WH_MSG_WEBSEARCH); - if(gbMac&&gbIE4) - { - if(typeof(window.onunload)!="unknown") - if(window.onunload.toString!=unRegisterListener.toString) - whtopic_foldUnload=window.onunload; - } - else - { - if(window.onunload) - if(window.onunload.toString!=unRegisterListener.toString) - whtopic_foldUnload=window.onunload; - } - window.onunload=unRegisterListener; - setButtonFont("show","","","","","",""); -setButtonFont("hide","","","","","",""); - - gbWhTopic=true; -} -else - document.location.reload(); \ No newline at end of file +// WebHelp 5.10.005 +var gsPPath=""; +var gaPaths=new Array(); +var gaAvenues=new Array(); + +var goFrame=null; +var gsStartPage=""; +var gsRelCurPagePath=""; +var gsSearchFormHref=""; +var gnTopicOnly=-1; +var gnOutmostTopic=-1; + +var BTN_TEXT=1; +var BTN_IMG=2; + +var goSync=null; + +var goShow=null; +var goHide=null; + +var goPrev=null; +var goNext=null; +var gnForm=0; +var goShowNav=null; +var goHideNav=null; + +var goWebSearch=null; + +var gsBtnStyle=""; +var gaButtons=new Array(); +var gaTypes=new Array(); +var whtopic_foldUnload=null; +var gbWhTopic=false; +var gbCheckSync=false; +var gbSyncEnabled=false; + +function setButtonFont(sType,sFontName,sFontSize,sFontColor,sFontStyle,sFontWeight,sFontDecoration) +{ + var vFont=new whFont(sFontName,sFontSize,sFontColor,sFontStyle,sFontWeight,sFontDecoration); + gsBtnStyle+=".whtbtn"+sType+"{"+getFontStyle(vFont)+"}"; +} + +function writeBtnStyle() +{ + if(gaButtons.length>0) + { + if(gsBtnStyle.length>0) + { + var sStyle=""; + document.write(sStyle); + } + } +} + +function button(sText,nWidth,nHeight) +{ + this.sText=sText; + this.nWidth=nWidth; + this.nHeight=nHeight; + + this.aImgs=new Array(); + var i=0; + while(button.arguments.length>i+3) + { + this.aImgs[i]=button.arguments[3+i]; + i++; + } +} + +//project info +function setRelStartPage(sPath) +{ + if(gsPPath.length==0) + { + gsPPath=_getFullPath(_getPath(document.location.href),_getPath(sPath)); + gsStartPage=_getFullPath(_getPath(document.location.href),sPath); + gsRelCurPagePath=_getRelativeFileName(gsStartPage,document.location.href); + } +} + +function getImage(oImage,sType) +{ + var sImg=""; + if(oImage&&oImage.aImgs&&(oImage.aImgs.length>0)) + { + sImg+="\""+sType+"\"0) + sImg+=" width="+oImage.nWidth; + if(oImage.nHeight>0) + sImg+=" height="+oImage.nHeight; + sImg+=" border=0>"; + } + return sImg; +} + +function addTocInfo(sTocPath) +{ + gaPaths[gaPaths.length]=sTocPath; +} + +function addAvenueInfo(sName,sPrev,sNext) +{ + gaAvenues[gaAvenues.length]=new avenueInfo(sName,sPrev,sNext); +} + +function addButton(sType,nStyle,sText,sHref,sOnClick,sOnMouseOver,sOnLoad,nWidth,nHeight,sImg1,sImg2,sImg3) +{ + var sButton=""; + var nBtn=gaButtons.length; + if(sType=="prev") + { + if(canGo(false)) + { + var sTitle="Previous Topic"; + goPrev=new button(sText,nWidth,nHeight,sImg1,sImg2,sImg3); + sButton=""; + if(nStyle==BTN_TEXT) + sButton+=goPrev.sText; + else + sButton+=getImage(goPrev,sTitle); + sButton+=""; + } + } + else if(sType=="next") + { + if(canGo(true)) + { + var sTitle="Next Topic"; + goNext=new button(sText,nWidth,nHeight,sImg1,sImg2,sImg3); + sButton=""; + if(nStyle==BTN_TEXT) + sButton+=goNext.sText; + else + sButton+=getImage(goNext,sTitle); + sButton+=""; + } + } + else if(sType=="show") + { + if(isTopicOnly()&&(!gbOpera6||gbOpera7)) + { + var sTitle="Show Navigation Component"; + goShow=new button(sText,nWidth,nHeight,sImg1,sImg2,sImg3); + sButton=""; + if(nStyle==BTN_TEXT) + sButton+=goShow.sText; + else + sButton+=getImage(goShow,sTitle); + sButton+=""; + } + } + else if(sType=="hide") + { + if(!isTopicOnly()&&!gbOpera6) + { + var sTitle="Hide Navigation Component"; + goHide=new button(sText,nWidth,nHeight,sImg1,sImg2,sImg3); + sButton=""; + if(nStyle==BTN_TEXT) + sButton+=goHide.sText; + else + sButton+=getImage(goHide,sTitle); + sButton+=""; + } + } + else if(sType=="shownav") + { + if(isShowHideEnable()) + { + var sTitle="Show Navigation Component"; + goShowNav=new button(sText,nWidth,nHeight,sImg1,sImg2,sImg3); + sButton=""; + if(nStyle==BTN_TEXT) + sButton+=goShowNav.sText; + else + sButton+=getImage(goShowNav,sTitle); + sButton+=""; + } + } + else if(sType=="hidenav") + { + if(isShowHideEnable()) + { + var sTitle="Hide Navigation Component"; + goHideNav=new button(sText,nWidth,nHeight,sImg1,sImg2,sImg3); + sButton=""; + if(nStyle==BTN_TEXT) + sButton+=goHideNav.sText; + else + sButton+=getImage(goHideNav,sTitle); + sButton+=""; + } + } + else if(sType=="synctoc") + { + if(gaPaths.length>0) + { + var sTitle="Sync TOC"; + goSync=new button(sText,nWidth,nHeight,sImg1,sImg2,sImg3); + sButton=""; + if(nStyle==BTN_TEXT) + sButton+=goSync.sText; + else + sButton+=getImage(goSync,sTitle); + sButton+=""; + } + } + else if(sType=="websearch") + { + if(gsSearchFormHref.length>0) + { + var sTitle="WebSearch"; + goWebSearch=new button(sText,nWidth,nHeight,sImg1,sImg2,sImg3); + sButton=""; + if(nStyle==BTN_TEXT) + sButton+=goWebSearch.sText; + else + sButton+=getImage(goWebSearch,sTitle); + sButton+=""; + } + } + else if(sType=="searchform") + { + gaButtons[nBtn]="NeedSearchForm"; + gaTypes[nBtn]=sType; + } + if(sButton.length!=0) + { + if(nStyle==BTN_TEXT) + sButton+=" "; + gaButtons[nBtn]=""; + gaTypes[nBtn]=sType; + } +} + +function isSyncEnabled() +{ + if(!gbCheckSync) + { + var oMsg=new whMessage(WH_MSG_ISSYNCSSUPPORT,this,1,null); + if(SendMessage(oMsg)) + { + gbSyncEnabled=oMsg.oParam; + } + gbCheckSync=true; + } + return gbSyncEnabled; +} + +function isInPopup() +{ + return (window.name.indexOf("BSSCPopup")!=-1); +} + +function getIntopicBar(sAlign) +{ + var sHTML=""; + if(gaButtons.length>0) + { + sHTML+="
"; + + sHTML+="
string VISU.View.GetTitle string VISU.View.GetTitle  ) 
boolean VISU.View.SavePicture in string in string  theFileName  )  [inherited] - + @@ -2177,7 +2184,7 @@ Returns ID of the object. "; - gaTypes[nBtn]=sType; - } -} - -function isSyncEnabled() -{ - if(!gbCheckSync) - { - var oMsg=new whMessage(WH_MSG_ISSYNCSSUPPORT,this,1,null); - if(SendMessage(oMsg)) - { - gbSyncEnabled=oMsg.oParam; - } - gbCheckSync=true; - } - return gbSyncEnabled; -} - -function isInPopup() -{ - return (window.name.indexOf("BSSCPopup")!=-1); -} - -function getIntopicBar(sAlign) -{ - var sHTML=""; - if(gaButtons.length>0) - { - sHTML+="
"; - - sHTML+="
IdType VISU.Base.GetID IdType VISU.Base.GetID  )  - + @@ -2199,5 +2206,7 @@ Returns the type of the presentable object
VISUType VISU.Base.GetType VISUType VISU.Base.GetType  ) 
+ diff --git a/doc/salome/gui/VISU/vtk_3d_viewer.htm b/doc/salome/gui/VISU/vtk_3d_viewer.htm deleted file mode 100755 index 28b92248..00000000 --- a/doc/salome/gui/VISU/vtk_3d_viewer.htm +++ /dev/null @@ -1,240 +0,0 @@ - - - - - -VTK 3D Viewer - - - - - - - - - - - - - -

VTK 3D Viewer

- -

VTK - 3D viewer  is - used in Post-Pro module for visualization of all 3D Presentations except - for Gauss Points Presentations.

- -

 

- -

The functionalities of VTK viewer are available via its Viewer Toolbar. - Buttons marked with small downward triangles have extended functionality - which can be accessed by locking on them with left mouse button.  

- -

 

- -

- -

 

- -
    - -
  • Dump - View - exports an object from the viewer in bmp, png, jpg or jpeg - image format.

  • - -
  • Show/Hide - Trihedron - shows or hides coordinate axes. -

  • - -
  • Fit - all - allows to select a point to be the center of a scene representing - all displayed objects in the visible area. -

  • - -
  • Fit - area - resizes the view to place in the visible area only the contents - of a frame drawn with pressed left mouse button.

  • - -
  • Zoom -  allows - to zoom in and out.

  • - -
  • Panning - - if the represented objects are greater that the visible area and you - don't wish to use Fit all functionality, - click on this button and you'll be able to drag the scene to see its remote - parts.

  • - -
  • Global panning - represents all displayed - objects in the visible area.

  • - -
  • Rotation - allows to rotate the selected - object using the mouse.

  • - -
  • These - buttons orientate the scene strictly about coordinate axes.

  • - -
  • Reset - restores the default position - (isometric) of objects in the scene.

  • - -
  • Graduated axes - allows to define parameters - of axes and graduate them.

  • -
- -

 

- -

- -

 

- -
    - -
  • Axis name

  • - -
  • Is - visible - if checked the axis name - is displayed in the viewer.

  • - -
  • Name - allows to redefine the name of the axis.

  • - -
  • Font - allows to define color and properties - of the font of axis name.

  • - -
  • Labels

  • - -
  • Is - visible - if checked the labels are - displayed in the viewer.

  • - -
  • Number - allows to define the number of labels.

  • - -
  • Offset - allows to define the distance between - labels.

  • - -
  • Font - allows to define color and properties - of the font of labels names.

  • - -
  • Tick - marks

  • - -
  • Is - visible - if checked the tick marks - are displayed in the viewer.

  • - -
  • Length - allows to define the length of tick marks

  • - -
  • Is - visible if checked the axis is displayed - in the viewer.

  • -
- -

 

- - - - diff --git a/doc/salome/gui/VISU/webhelp.jar b/doc/salome/gui/VISU/webhelp.jar index 53b26663..1d1697e7 100755 Binary files a/doc/salome/gui/VISU/webhelp.jar and b/doc/salome/gui/VISU/webhelp.jar differ diff --git a/doc/salome/gui/VISU/whcsh_home.htm b/doc/salome/gui/VISU/whcsh_home.htm index 5a486ba2..bc99598c 100755 --- a/doc/salome/gui/VISU/whcsh_home.htm +++ b/doc/salome/gui/VISU/whcsh_home.htm @@ -1,600 +1,600 @@ - - - - - - \ No newline at end of file + + + + + + diff --git a/doc/salome/gui/VISU/whcshdata.htm b/doc/salome/gui/VISU/whcshdata.htm index 0aaebcd9..a2ddbd9a 100755 --- a/doc/salome/gui/VISU/whcshdata.htm +++ b/doc/salome/gui/VISU/whcshdata.htm @@ -1,87 +1,87 @@ - - -Post-Pro Module Reference Manual - - - - - - - - - - + + +Post-Pro Module Reference Manual + + + + + + + + + + diff --git a/doc/salome/gui/VISU/whd_dpns.htm b/doc/salome/gui/VISU/whd_dpns.htm index 1bca2360..3983ccbd 100755 --- a/doc/salome/gui/VISU/whd_dpns.htm +++ b/doc/salome/gui/VISU/whd_dpns.htm @@ -1,43 +1,43 @@ - - -Navigator Pane - - - - - - - - - - - - - + + +Navigator Pane + + + + + + + + + + + + + \ No newline at end of file diff --git a/doc/salome/gui/VISU/whd_nvp10.htm b/doc/salome/gui/VISU/whd_nvp10.htm index a57fe1e4..05b5f908 100755 --- a/doc/salome/gui/VISU/whd_nvp10.htm +++ b/doc/salome/gui/VISU/whd_nvp10.htm @@ -1,15 +1,15 @@ - - -Navigation Pane - - - - - - - - - - - - + + +Navigation Pane + + + + + + + + + + + + diff --git a/doc/salome/gui/VISU/whd_nvp20.htm b/doc/salome/gui/VISU/whd_nvp20.htm index c5754bc4..23c23dc4 100755 --- a/doc/salome/gui/VISU/whd_nvp20.htm +++ b/doc/salome/gui/VISU/whd_nvp20.htm @@ -1,334 +1,334 @@ - - -navigation pane - - - - - - - - - - - - - - - - - + + +navigation pane + + + + + + + + + + + + + + + + + diff --git a/doc/salome/gui/VISU/whd_tabs.htm b/doc/salome/gui/VISU/whd_tabs.htm index 1568f573..e8c498c8 100755 --- a/doc/salome/gui/VISU/whd_tabs.htm +++ b/doc/salome/gui/VISU/whd_tabs.htm @@ -1,533 +1,533 @@ - - -WebHelp Tabs Frame in Navigation Pane - - - - - - - - - - + + +WebHelp Tabs Frame in Navigation Pane + + + + + + + + + + \ No newline at end of file diff --git a/doc/salome/gui/VISU/whd_topic.xml b/doc/salome/gui/VISU/whd_topic.xml index a1b0320f..b1946d75 100755 --- a/doc/salome/gui/VISU/whd_topic.xml +++ b/doc/salome/gui/VISU/whd_topic.xml @@ -1,85 +1,85 @@ - - - - - - - - - - -"]]> - - - - -"]]> - - - - -"; -OutputInTopicNavBarDataWebSearch.form();]]> - - - - - - - - - - -"]]> - - - + + + + + + + + + + +"]]> + + + + +"]]> + + + + +"; +OutputInTopicNavBarDataWebSearch.form();]]> + + + + + + + + + + +"]]> + + + diff --git a/doc/salome/gui/VISU/whdata/whftdata.js b/doc/salome/gui/VISU/whdata/whftdata.js index 071ae6fc..addf2622 100755 --- a/doc/salome/gui/VISU/whdata/whftdata.js +++ b/doc/salome/gui/VISU/whdata/whftdata.js @@ -1,25 +1,25 @@ -// WebHelp 5.10.001 -var gTEA = new Array(); -function aTE(sTopicTitle, sTopicURL) -{ - var len = gTEA.length; - gTEA[len] = new topicEntry(sTopicTitle, sTopicURL); -} - -function topicEntry(sTopicTitle, sTopicURL) -{ - this.sTopicTitle = sTopicTitle; - this.sTopicURL = sTopicURL; -} - -function window_OnLoad() -{ - if (parent && parent != this) { - if (parent.putFtsTData) - { - parent.putFtsTData(gTEA); - } - } -} - +// WebHelp 5.10.001 +var gTEA = new Array(); +function aTE(sTopicTitle, sTopicURL) +{ + var len = gTEA.length; + gTEA[len] = new topicEntry(sTopicTitle, sTopicURL); +} + +function topicEntry(sTopicTitle, sTopicURL) +{ + this.sTopicTitle = sTopicTitle; + this.sTopicURL = sTopicURL; +} + +function window_OnLoad() +{ + if (parent && parent != this) { + if (parent.putFtsTData) + { + parent.putFtsTData(gTEA); + } + } +} + window.onload = window_OnLoad; \ No newline at end of file diff --git a/doc/salome/gui/VISU/whdata/whftdata0.htm b/doc/salome/gui/VISU/whdata/whftdata0.htm index 76853b76..eae6a624 100755 --- a/doc/salome/gui/VISU/whdata/whftdata0.htm +++ b/doc/salome/gui/VISU/whdata/whftdata0.htm @@ -1,59 +1,59 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/doc/salome/gui/VISU/whdata/whfts.htm b/doc/salome/gui/VISU/whdata/whfts.htm index ca3b05e5..15fe687b 100755 --- a/doc/salome/gui/VISU/whdata/whfts.htm +++ b/doc/salome/gui/VISU/whdata/whfts.htm @@ -1,18 +1,18 @@ - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + diff --git a/doc/salome/gui/VISU/whdata/whfts.js b/doc/salome/gui/VISU/whdata/whfts.js index 2b667869..54246f69 100755 --- a/doc/salome/gui/VISU/whdata/whfts.js +++ b/doc/salome/gui/VISU/whdata/whfts.js @@ -1,40 +1,40 @@ -// WebHelp 5.10.001 -var gaFileMapping = new Array(); -var gaFileTopicMapping = new Array(); - -function fileMapping(sStartKey, sEndKey, sFileName) -{ - this.sStartKey = sStartKey; - this.sEndKey = sEndKey; - this.sFileName = sFileName; - this.aFtsKeys = null; -} - -function fileTopicMapping(nIdBegin, nIdEnd, sFileName) -{ - this.nBegin = nIdBegin; - this.nEnd = nIdEnd; - this.sFileName = sFileName; - this.aTopics = null; -} - - -function iWM(sStartKey, sEndKey, sFileName) -{ - gaFileMapping[gaFileMapping.length] = new fileMapping(sStartKey, sEndKey, sFileName); -} - -function window_OnLoad() -{ - if (parent && parent != this && parent.ftsReady) - { - parent.ftsReady(gaFileMapping, gaFileTopicMapping); - } -} - -function iTM(nIdBegin, nIdEnd, sFileName) -{ - gaFileTopicMapping[gaFileTopicMapping.length] = new fileTopicMapping(nIdBegin, nIdEnd, sFileName); -} - -window.onload = window_OnLoad; +// WebHelp 5.10.001 +var gaFileMapping = new Array(); +var gaFileTopicMapping = new Array(); + +function fileMapping(sStartKey, sEndKey, sFileName) +{ + this.sStartKey = sStartKey; + this.sEndKey = sEndKey; + this.sFileName = sFileName; + this.aFtsKeys = null; +} + +function fileTopicMapping(nIdBegin, nIdEnd, sFileName) +{ + this.nBegin = nIdBegin; + this.nEnd = nIdEnd; + this.sFileName = sFileName; + this.aTopics = null; +} + + +function iWM(sStartKey, sEndKey, sFileName) +{ + gaFileMapping[gaFileMapping.length] = new fileMapping(sStartKey, sEndKey, sFileName); +} + +function window_OnLoad() +{ + if (parent && parent != this && parent.ftsReady) + { + parent.ftsReady(gaFileMapping, gaFileTopicMapping); + } +} + +function iTM(nIdBegin, nIdEnd, sFileName) +{ + gaFileTopicMapping[gaFileTopicMapping.length] = new fileTopicMapping(nIdBegin, nIdEnd, sFileName); +} + +window.onload = window_OnLoad; diff --git a/doc/salome/gui/VISU/whdata/whfwdata.js b/doc/salome/gui/VISU/whdata/whfwdata.js index e9e8bc6c..8340b59d 100755 --- a/doc/salome/gui/VISU/whdata/whfwdata.js +++ b/doc/salome/gui/VISU/whdata/whfwdata.js @@ -1,37 +1,37 @@ -// WebHelp 5.10.001 -var gWEA = new Array(); -function aWE() -{ - var len = gWEA.length; - gWEA[len] = new ftsEntry(aWE.arguments); -} - -function ftsEntry(fn_arguments) -{ - if (fn_arguments.length && fn_arguments.length >= 1) - { - this.sItemName = fn_arguments[0]; - this.aTopics = null; - var nLen = fn_arguments.length; - if (nLen > 1) - { - this.aTopics = new Array(); - for (var i = 0; i < nLen - 1; i ++ ) - { - this.aTopics[i] = fn_arguments[i + 1]; - } - } - } -} - -function window_OnLoad() -{ - if (parent && parent != this) { - if (parent.putFtsWData) - { - parent.putFtsWData(gWEA); - } - } -} - +// WebHelp 5.10.001 +var gWEA = new Array(); +function aWE() +{ + var len = gWEA.length; + gWEA[len] = new ftsEntry(aWE.arguments); +} + +function ftsEntry(fn_arguments) +{ + if (fn_arguments.length && fn_arguments.length >= 1) + { + this.sItemName = fn_arguments[0]; + this.aTopics = null; + var nLen = fn_arguments.length; + if (nLen > 1) + { + this.aTopics = new Array(); + for (var i = 0; i < nLen - 1; i ++ ) + { + this.aTopics[i] = fn_arguments[i + 1]; + } + } + } +} + +function window_OnLoad() +{ + if (parent && parent != this) { + if (parent.putFtsWData) + { + parent.putFtsWData(gWEA); + } + } +} + window.onload = window_OnLoad; \ No newline at end of file diff --git a/doc/salome/gui/VISU/whdata/whfwdata0.htm b/doc/salome/gui/VISU/whdata/whfwdata0.htm index 7eb72858..3307ee33 100755 --- a/doc/salome/gui/VISU/whdata/whfwdata0.htm +++ b/doc/salome/gui/VISU/whdata/whfwdata0.htm @@ -1,862 +1,902 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/doc/salome/gui/VISU/whdata/whgdata.js b/doc/salome/gui/VISU/whdata/whgdata.js index 77e0107f..e38a107b 100755 --- a/doc/salome/gui/VISU/whdata/whgdata.js +++ b/doc/salome/gui/VISU/whdata/whgdata.js @@ -1,26 +1,26 @@ -// WebHelp 5.10.001 -var gIEA = new Array(); -function aGE(sName, sDef) -{ - var len = gIEA.length; - gIEA[len] = new gloEntry(sName, sDef); -} - -function gloEntry(sName, sDef) -{ - this.sName = sName; - this.sDef = sDef; - this.nNKOff = 0; -} - -function window_OnLoad() -{ - if (parent && parent != this) { - if (parent.putData) - { - parent.putData(gIEA); - } - } -} - +// WebHelp 5.10.001 +var gIEA = new Array(); +function aGE(sName, sDef) +{ + var len = gIEA.length; + gIEA[len] = new gloEntry(sName, sDef); +} + +function gloEntry(sName, sDef) +{ + this.sName = sName; + this.sDef = sDef; + this.nNKOff = 0; +} + +function window_OnLoad() +{ + if (parent && parent != this) { + if (parent.putData) + { + parent.putData(gIEA); + } + } +} + window.onload = window_OnLoad; \ No newline at end of file diff --git a/doc/salome/gui/VISU/whdata/whgdata0.htm b/doc/salome/gui/VISU/whdata/whgdata0.htm index 9d256b1a..3865725f 100755 --- a/doc/salome/gui/VISU/whdata/whgdata0.htm +++ b/doc/salome/gui/VISU/whdata/whgdata0.htm @@ -1,33 +1,33 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/doc/salome/gui/VISU/whdata/whglo.htm b/doc/salome/gui/VISU/whdata/whglo.htm index dc5a6778..9d7ac79f 100755 --- a/doc/salome/gui/VISU/whdata/whglo.htm +++ b/doc/salome/gui/VISU/whdata/whglo.htm @@ -1,16 +1,16 @@ - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/doc/salome/gui/VISU/whdata/whglo.js b/doc/salome/gui/VISU/whdata/whglo.js index e0519afc..c34fb24b 100755 --- a/doc/salome/gui/VISU/whdata/whglo.js +++ b/doc/salome/gui/VISU/whdata/whglo.js @@ -1,34 +1,34 @@ -// WebHelp 5.10.001 -var gaFileMapping = new Array(); -function fileMapping(sBK, sEK, sFileName, nNum) -{ - this.sBK = sBK; - this.sEK = sEK; - this.sFileName = sFileName; - this.aKs = null; - this.nNum = nNum; - this.oUsedItems = null; -} - - -function iFM(sBK, sEK, sFileName, nNum) -{ - var i = gaFileMapping.length; - gaFileMapping[i] = new fileMapping(sBK, sEK, sFileName, nNum); - if (i == 0) { - gaFileMapping[i].nTotal = nNum; - } - else { - gaFileMapping[i].nTotal = nNum + gaFileMapping[i - 1].nTotal; - } -} - -function window_OnLoad() -{ - if (parent && parent != this && parent.projReady) - { - parent.projReady(gaFileMapping); - } -} - -window.onload = window_OnLoad; +// WebHelp 5.10.001 +var gaFileMapping = new Array(); +function fileMapping(sBK, sEK, sFileName, nNum) +{ + this.sBK = sBK; + this.sEK = sEK; + this.sFileName = sFileName; + this.aKs = null; + this.nNum = nNum; + this.oUsedItems = null; +} + + +function iFM(sBK, sEK, sFileName, nNum) +{ + var i = gaFileMapping.length; + gaFileMapping[i] = new fileMapping(sBK, sEK, sFileName, nNum); + if (i == 0) { + gaFileMapping[i].nTotal = nNum; + } + else { + gaFileMapping[i].nTotal = nNum + gaFileMapping[i - 1].nTotal; + } +} + +function window_OnLoad() +{ + if (parent && parent != this && parent.projReady) + { + parent.projReady(gaFileMapping); + } +} + +window.onload = window_OnLoad; diff --git a/doc/salome/gui/VISU/whdata/whidata.js b/doc/salome/gui/VISU/whdata/whidata.js index 9f0eb15e..a9218473 100755 --- a/doc/salome/gui/VISU/whdata/whidata.js +++ b/doc/salome/gui/VISU/whdata/whidata.js @@ -1,89 +1,89 @@ -// WebHelp 5.10.001 -// const strings -var gIEA = new Array(); -function aIE() -{ - var len = gIEA.length; - gIEA[len] = new indexEntry(aIE.arguments); -} - -function topic(sName, sURL) -{ - this.sName = sName; - this.sURL = sURL; -} - -function indexEntry(fn_arguments) -{ - if (fn_arguments.length && fn_arguments.length >= 3) - { - this.nType = fn_arguments[0]; - this.nPKOff = 0; - this.nNKOff = fn_arguments[1]; - this.sName = fn_arguments[2]; - this.aTopics = null; - var nLen = fn_arguments.length; - if (Math.floor(nLen / 2) * 2 == nLen) - { - this.sTarget = fn_arguments[3]; - if (nLen > 5) - { - this.aTopics = new Array(); - for (var i = 0; i < (nLen - 5)/2; i++) - { - this.aTopics[i] = new topic(fn_arguments[i * 2 + 4], fn_arguments[i * 2 + 5]); - } - } - - } - else - { - if (nLen > 4) - { - this.aTopics = new Array(); - for (var i = 0; i < (nLen - 4)/2; i++) - { - this.aTopics[i] = new topic(fn_arguments[i * 2 + 3], fn_arguments[i * 2 + 4]); - } - } - } - } -} - -function getIndexTopicMappingList(nItemIndex) -{ - var sTopics = ""; - if (gIEA.length > nItemIndex) - { - if (gIEA[nItemIndex].aTopics) - { - var i = 0; - var nLen = gIEA[nItemIndex].aTopics.length; - for (i = 0; i < nLen; i ++) - { - sTopics += "," + gIEA[nItemIndex].aTopics[i]; - } - } - } - return sTopics; -} - -function window_OnLoad() -{ - if (parent && parent != this) { - if (parent.putData) - { - for (var i = 0; i < gIEA.length; i ++ ) - { - if (gIEA[i].nNKOff != 0 && i + gIEA[i].nNKOff + 1 < gIEA.length) - { - - gIEA[i + gIEA[i].nNKOff + 1].nPKOff = gIEA[i].nNKOff; - } - } - parent.putData(gIEA); - } - } -} - +// WebHelp 5.10.001 +// const strings +var gIEA = new Array(); +function aIE() +{ + var len = gIEA.length; + gIEA[len] = new indexEntry(aIE.arguments); +} + +function topic(sName, sURL) +{ + this.sName = sName; + this.sURL = sURL; +} + +function indexEntry(fn_arguments) +{ + if (fn_arguments.length && fn_arguments.length >= 3) + { + this.nType = fn_arguments[0]; + this.nPKOff = 0; + this.nNKOff = fn_arguments[1]; + this.sName = fn_arguments[2]; + this.aTopics = null; + var nLen = fn_arguments.length; + if (Math.floor(nLen / 2) * 2 == nLen) + { + this.sTarget = fn_arguments[3]; + if (nLen > 5) + { + this.aTopics = new Array(); + for (var i = 0; i < (nLen - 5)/2; i++) + { + this.aTopics[i] = new topic(fn_arguments[i * 2 + 4], fn_arguments[i * 2 + 5]); + } + } + + } + else + { + if (nLen > 4) + { + this.aTopics = new Array(); + for (var i = 0; i < (nLen - 4)/2; i++) + { + this.aTopics[i] = new topic(fn_arguments[i * 2 + 3], fn_arguments[i * 2 + 4]); + } + } + } + } +} + +function getIndexTopicMappingList(nItemIndex) +{ + var sTopics = ""; + if (gIEA.length > nItemIndex) + { + if (gIEA[nItemIndex].aTopics) + { + var i = 0; + var nLen = gIEA[nItemIndex].aTopics.length; + for (i = 0; i < nLen; i ++) + { + sTopics += "," + gIEA[nItemIndex].aTopics[i]; + } + } + } + return sTopics; +} + +function window_OnLoad() +{ + if (parent && parent != this) { + if (parent.putData) + { + for (var i = 0; i < gIEA.length; i ++ ) + { + if (gIEA[i].nNKOff != 0 && i + gIEA[i].nNKOff + 1 < gIEA.length) + { + + gIEA[i + gIEA[i].nNKOff + 1].nPKOff = gIEA[i].nNKOff; + } + } + parent.putData(gIEA); + } + } +} + window.onload = window_OnLoad; \ No newline at end of file diff --git a/doc/salome/gui/VISU/whdata/whidx.htm b/doc/salome/gui/VISU/whdata/whidx.htm index 0a0deedd..a049a96f 100755 --- a/doc/salome/gui/VISU/whdata/whidx.htm +++ b/doc/salome/gui/VISU/whdata/whidx.htm @@ -1,15 +1,15 @@ - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/doc/salome/gui/VISU/whdata/whidx.js b/doc/salome/gui/VISU/whdata/whidx.js index e0519afc..c34fb24b 100755 --- a/doc/salome/gui/VISU/whdata/whidx.js +++ b/doc/salome/gui/VISU/whdata/whidx.js @@ -1,34 +1,34 @@ -// WebHelp 5.10.001 -var gaFileMapping = new Array(); -function fileMapping(sBK, sEK, sFileName, nNum) -{ - this.sBK = sBK; - this.sEK = sEK; - this.sFileName = sFileName; - this.aKs = null; - this.nNum = nNum; - this.oUsedItems = null; -} - - -function iFM(sBK, sEK, sFileName, nNum) -{ - var i = gaFileMapping.length; - gaFileMapping[i] = new fileMapping(sBK, sEK, sFileName, nNum); - if (i == 0) { - gaFileMapping[i].nTotal = nNum; - } - else { - gaFileMapping[i].nTotal = nNum + gaFileMapping[i - 1].nTotal; - } -} - -function window_OnLoad() -{ - if (parent && parent != this && parent.projReady) - { - parent.projReady(gaFileMapping); - } -} - -window.onload = window_OnLoad; +// WebHelp 5.10.001 +var gaFileMapping = new Array(); +function fileMapping(sBK, sEK, sFileName, nNum) +{ + this.sBK = sBK; + this.sEK = sEK; + this.sFileName = sFileName; + this.aKs = null; + this.nNum = nNum; + this.oUsedItems = null; +} + + +function iFM(sBK, sEK, sFileName, nNum) +{ + var i = gaFileMapping.length; + gaFileMapping[i] = new fileMapping(sBK, sEK, sFileName, nNum); + if (i == 0) { + gaFileMapping[i].nTotal = nNum; + } + else { + gaFileMapping[i].nTotal = nNum + gaFileMapping[i - 1].nTotal; + } +} + +function window_OnLoad() +{ + if (parent && parent != this && parent.projReady) + { + parent.projReady(gaFileMapping); + } +} + +window.onload = window_OnLoad; diff --git a/doc/salome/gui/VISU/whdata/whtdata.js b/doc/salome/gui/VISU/whdata/whtdata.js index d5428a7d..0558e198 100755 --- a/doc/salome/gui/VISU/whdata/whtdata.js +++ b/doc/salome/gui/VISU/whdata/whtdata.js @@ -1,64 +1,64 @@ -// WebHelp 5.10.001 -var gTEA = new Array(); -function aTE() -{ - gTEA[gTEA.length] = new tocEntry(aTE.arguments); -} - -function tocEntry(fn_arguments) -{ - if (fn_arguments.length < 3) - { - alert ("data format wrong!!!"); - return; - } - - this.nType = fn_arguments[0]; - this.nContents = fn_arguments[1]; - this.sItemName = fn_arguments[2]; - - if (this.nType == 1 || this.nType == 2 || this.nType == 16) - { - if (fn_arguments.length > 3) - { - this.sItemURL = fn_arguments[3]; - if (fn_arguments.length > 4) - { - this.sTarget = fn_arguments[4]; - if (fn_arguments.length > 5) - this.sIconRef = fn_arguments[5]; - } - } - } - if (this.nType == 4 || this.nType == 8) - { - if (fn_arguments.length > 3) - { - this.sRefURL = fn_arguments[3]; - if (this.nType == 4) - { - if(this.sRefURL.lastIndexOf("/")!=this.sRefURL.length-1) - this.sRefURL+="/"; - } - if (fn_arguments.length > 4) - { - this.sItemURL = fn_arguments[4]; - if (fn_arguments.length > 5) - { - this.sTarget = fn_arguments[5]; - if (fn_arguments.length > 6) - this.sIconRef = fn_arguments[6]; - } - } - } - } -} - - -function window_OnLoad() -{ - if (parent && parent != this && parent.putData) { - parent.putData(gTEA); - } -} +// WebHelp 5.10.001 +var gTEA = new Array(); +function aTE() +{ + gTEA[gTEA.length] = new tocEntry(aTE.arguments); +} + +function tocEntry(fn_arguments) +{ + if (fn_arguments.length < 3) + { + alert ("data format wrong!!!"); + return; + } + + this.nType = fn_arguments[0]; + this.nContents = fn_arguments[1]; + this.sItemName = fn_arguments[2]; + + if (this.nType == 1 || this.nType == 2 || this.nType == 16) + { + if (fn_arguments.length > 3) + { + this.sItemURL = fn_arguments[3]; + if (fn_arguments.length > 4) + { + this.sTarget = fn_arguments[4]; + if (fn_arguments.length > 5) + this.sIconRef = fn_arguments[5]; + } + } + } + if (this.nType == 4 || this.nType == 8) + { + if (fn_arguments.length > 3) + { + this.sRefURL = fn_arguments[3]; + if (this.nType == 4) + { + if(this.sRefURL.lastIndexOf("/")!=this.sRefURL.length-1) + this.sRefURL+="/"; + } + if (fn_arguments.length > 4) + { + this.sItemURL = fn_arguments[4]; + if (fn_arguments.length > 5) + { + this.sTarget = fn_arguments[5]; + if (fn_arguments.length > 6) + this.sIconRef = fn_arguments[6]; + } + } + } + } +} + + +function window_OnLoad() +{ + if (parent && parent != this && parent.putData) { + parent.putData(gTEA); + } +} window.onload = window_OnLoad; \ No newline at end of file diff --git a/doc/salome/gui/VISU/whdata/whtdata0.htm b/doc/salome/gui/VISU/whdata/whtdata0.htm index d66408b0..fe3b5c79 100755 --- a/doc/salome/gui/VISU/whdata/whtdata0.htm +++ b/doc/salome/gui/VISU/whdata/whtdata0.htm @@ -1,61 +1,60 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/doc/salome/gui/VISU/whdata/whtoc.htm b/doc/salome/gui/VISU/whdata/whtoc.htm index 54e0cbf2..459c3e31 100755 --- a/doc/salome/gui/VISU/whdata/whtoc.htm +++ b/doc/salome/gui/VISU/whdata/whtoc.htm @@ -1,16 +1,16 @@ - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/doc/salome/gui/VISU/whdata/whtoc.js b/doc/salome/gui/VISU/whdata/whtoc.js index 163d8cc9..62de5a13 100755 --- a/doc/salome/gui/VISU/whdata/whtoc.js +++ b/doc/salome/gui/VISU/whdata/whtoc.js @@ -1,31 +1,31 @@ -// WebHelp 5.10.001 -// const strings -var gaProj = new Array(); -var gsRoot = ""; - -function setRoot(sRoot) -{ - gsRoot = sRoot -} - -function aPE(sProjPath, sRootPath) -{ - gaProj[gaProj.length] = new tocProjEntry(sProjPath, sRootPath); -} - -function tocProjEntry(sProjPath, sRootPath) -{ - if(sProjPath.lastIndexOf("/")!=sProjPath.length-1) - sProjPath+="/"; - this.sPPath = sProjPath; - this.sRPath = sRootPath; -} - - -function window_OnLoad() -{ - if (parent && parent != this && parent.projReady) { - parent.projReady(gsRoot, gaProj); - } -} +// WebHelp 5.10.001 +// const strings +var gaProj = new Array(); +var gsRoot = ""; + +function setRoot(sRoot) +{ + gsRoot = sRoot +} + +function aPE(sProjPath, sRootPath) +{ + gaProj[gaProj.length] = new tocProjEntry(sProjPath, sRootPath); +} + +function tocProjEntry(sProjPath, sRootPath) +{ + if(sProjPath.lastIndexOf("/")!=sProjPath.length-1) + sProjPath+="/"; + this.sPPath = sProjPath; + this.sRPath = sRootPath; +} + + +function window_OnLoad() +{ + if (parent && parent != this && parent.projReady) { + parent.projReady(gsRoot, gaProj); + } +} window.onload = window_OnLoad; \ No newline at end of file diff --git a/doc/salome/gui/VISU/whfbody.htm b/doc/salome/gui/VISU/whfbody.htm index 5666e1b5..ea648e4b 100755 --- a/doc/salome/gui/VISU/whfbody.htm +++ b/doc/salome/gui/VISU/whfbody.htm @@ -1,37 +1,37 @@ - - -Search Result - - - - - - - - - - - - - - - - - + + +Search Result + + + + + + + + + + + + + + + + + diff --git a/doc/salome/gui/VISU/whfdhtml.htm b/doc/salome/gui/VISU/whfdhtml.htm index 37429607..c2e65bea 100755 --- a/doc/salome/gui/VISU/whfdhtml.htm +++ b/doc/salome/gui/VISU/whfdhtml.htm @@ -1,30 +1,30 @@ - - -Search Frame - - - - - - - - - + + +Search Frame + + + + + + + + + diff --git a/doc/salome/gui/VISU/whfform.htm b/doc/salome/gui/VISU/whfform.htm index 87d754ec..0f8f90ab 100755 --- a/doc/salome/gui/VISU/whfform.htm +++ b/doc/salome/gui/VISU/whfform.htm @@ -1,136 +1,136 @@ - - -Search Form - - - - - - - - - - - - - - \ No newline at end of file + + +Search Form + + + + + + + + + + + + + + diff --git a/doc/salome/gui/VISU/whfhost.js b/doc/salome/gui/VISU/whfhost.js index 167acc45..c3c7144f 100755 --- a/doc/salome/gui/VISU/whfhost.js +++ b/doc/salome/gui/VISU/whfhost.js @@ -1,945 +1,945 @@ -// WebHelp 5.10.003 -var gsSK2=null; -var gsSK=null; -var gsFtsBreakChars="\t\r\n\"\\ .,!@#$%^&*()~'`:;<>?/{}[]|+-=\x85\x92\x93\x94\x95\x96\x97\x99\xA9\xAE\xB7"; -var gnCLF=0; -var gsHelpCannotSearch="Cannot search for that phrase."; -var gsNoTopics="No Topics Found."; -var gsLoadingDivID="LoadingDiv"; -var gsLoadingMsg="Loading data, please wait..."; -var gsSearchMsg="Searching..."; -var gsResultDivID="ResultDiv"; -var gaaFCD=new Array(); -var gaaFTCD=new Array(); -var goCF=null; -var goCTF=null; -var gaTI=null; -var gnCurrentOp=0; -var gbNot=false; -var gbReady=false; -var gnLoadFts=1; -var gnCacheLimits=5; -var gaCCD=new Array(); -var gbXML=false; -var gaData=new Array(); -var gsBgColor="#ffffff"; -var gsBgImage=""; -var gsMargin="0pt"; -var gsIndent="0pt"; -var gsCheckKey=null; -var gnIndexNum=0; -var gaFtsContentsCon=null; -var gaTopicCheckInfo=null; -var gnTopicCheck=0; -var goFont=null; -var goErrFont=null; -var goHoverFont=null; -var gsABgColor="#cccccc"; -var gbWhFHost=false; -var gbFirst=false; - -function setBackground(sBgImage) -{ - gsBgImage=sBgImage; -} - -function setBackgroundcolor(sBgColor) -{ - gsBgColor=sBgColor; -} - -function setFont(sType,sFontName,sFontSize,sFontColor,sFontStyle,sFontWeight,sFontDecoration) -{ - var vFont=new whFont(sFontName,sFontSize,sFontColor,sFontStyle,sFontWeight,sFontDecoration); - if(sType=="Normal") - goFont=vFont; - else if(sType=="Error") - goErrFont=vFont; - else if(sType=="Hover") - goHoverFont=vFont; -} - -function setActiveBgColor(sBgColor) -{ - gsABgColor=sBgColor; -} - -function setMargin(sMargin) -{ - gsMargin=sMargin; -} - -function setIndent(sIndent) -{ - gsIndent=sIndent; -} - -function updateCache(oCF) -{ - var len=gaCCD.length; - if(len0&&sURL) - { - var topic=new Object(); - topic.sTopicTitle=name; - topic.sTopicURL=sURL; - aTopics[aTopics.length]=topic; - } - } - oChild=oChild.nextSibling; - } - putFtsTData(aTopics); - } - } - else if(gnLoadFts==2) - { - var node=xmlDoc.lastChild; - if(node) - { - var oChild=node.firstChild; - var aFtsContents=new Array(); - while(oChild) - { - if(oChild.nodeName=="key") - { - var name=oChild.getAttribute("name"); - if(name&&name.length>0) - { - var item=new Object(); - item.sItemName=name; - aFtsContents[aFtsContents.length]=item; - var oChildChild=oChild.firstChild; - while(oChildChild) - { - if(oChildChild.nodeName=="#text") - { - var sIDs=oChildChild.nodeValue; - if(sIDs) - { - var nBPos=0; - do - { - var nPos=sIDs.indexOf(",",nBPos); - var sID=null; - if(nPos!=-1) - sID=sIDs.substring(nBPos,nPos); - else - sID=sIDs.substring(nBPos); - - if(sID) - { - var id=parseInt(sID); - if(!isNaN(id)) - { - if(!item.aTopics) - item.aTopics=new Array(); - item.aTopics[item.aTopics.length]=id; - } - } - nBPos=nPos+1; - }while(nBPos!=0&&nBPos0) - { - document.body.background=gsBgImage; - } - if(gsBgColor&&gsBgColor.length>0) - { - document.body.bgColor=gsBgColor; - } - writeResultDiv(); - loadFts(); - var oMsg=new whMessage(WH_MSG_SHOWFTS,this,1,null) - SendMessage(oMsg); -} - -function writeResultDiv() -{ - var sHTML="
"; - document.body.insertAdjacentHTML("beforeEnd",sHTML); -} - -function loadFts() -{ - if(!gbReady) - { - var oResMsg=new whMessage(WH_MSG_GETPROJINFO,this,1,null); - if(SendMessage(oResMsg)&&oResMsg.oParam) - { - gbReady=true; - var oProj=oResMsg.oParam; - var aProj=oProj.aProj; - gbXML=oProj.bXML; - if(aProj.length>0) - { - var sLangId=aProj[0].sLangId; - for(var i=0;i=0)&&(gsFtsBreakChars.charAt(nSep)=="|"))){ - gnCurrentOp=0; - gbNot=false; - }else if((sCW=="and")||((nSep>=0)&&(gsFtsBreakChars.charAt(nSep)=="&"))){ - gnCurrentOp=1; - gbNot=false; - }else if((sCW=="not")|| - ((nSep>=0)&&(gsFtsBreakChars.charAt(nSep)=="~"))){ - gbNot=!gbNot; - }else if(sCW!=""&&!IsStopWord(sCW,gaFtsStop)){ - var sCurrentStem=GetStem(sCW); - gsCW=sCurrentStem; - ftsFindKeyword(); - return; - } - findOneKey(); - } - else{ - displayTopics(); - checkAgain(); - } -} - -function checkAgain() -{ - gsCheckKey = ""; - gnIndexNum = 0; - gsSK=gsSK2; - gsSK2=null; - if(gsSK!=null) - setTimeout("findFTSKey();",1); -} - -function displayTopics() -{ - var sHTML=""; - var sLine=""; - for(var i=0;i"+_textToHtml(gaTI[i].sTopicTitle)+""; - if(i>>4<<4==i) - { - sHTML+=sLine; - sLine=""; - } - } - if(sLine.length>0) - sHTML+=sLine; - - if(sHTML.length==0) - sHTML="

"+gsNoTopics+"

" - else - sHTML="
"+sHTML+"
"; - - var resultDiv=getElement(gsResultDivID); - if(resultDiv) - resultDiv.innerHTML=sHTML; -} - -function displayMsg(sErrorMsg) -{ - var sHTML="

"+sErrorMsg+"

"; - - var resultDiv=getElement(gsResultDivID); - if(resultDiv) - resultDiv.innerHTML=sHTML; -} - -function ftsFindKeyword() -{ - var sKey=gsCW; - var bNeedLoad=false; - var aFtsContentsCon=null; - var s=0; - if(sKey==null) return; - if(!gsCheckKey||sKey!=gsCheckKey||gnIndexNum==0) - { - aFtsContentsCon=new Array(); - gnCheck=0; - gsCheckKey=sKey; - gnTopicCheck=0; - gaTopicCheckInfo=null; - } - else{ - s=gnIndexNum; - aFtsContentsCon=gaFtsContentsCon; - } - for(var i=gnCheck;i=aTI.length) - { - aLS=gaTI; - aSS=aTI; - } - else - { - aLS=aTI; - aSS=gaTI; - } - var s=0; - for(var i=0;i=0) - { - var nM; - var bFound=false; - do{ - nM=(nB+nE)>>1; - if(compare(aTI[nM].sTopicTitle,oTI.sTopicTitle)>0) - nE=nM-1; - else if(compare(aTI[nM].sTopicTitle,oTI.sTopicTitle)<0) - nB=nM+1; - else - { - bFound=true; - break; - } - }while(nB<=nE); - if(bFound) - insertItemIntoArray(aTI,nM,oTI); - else - { - if(compare(aTI[nM].sTopicTitle,oTI.sTopicTitle)<0) - insertItemIntoArray(aTI,nM+1,oTI); - else - insertItemIntoArray(aTI,nM,oTI); - } - } - else - aTI[0]=oTI; -} - -function mergeTopics(aTI1,aTI2) -{ - var i1=0; - var i2=0; - var len1=aTI1.length; - var len2=aTI2.length; - var aTopicNew=new Array(); - var i=0; - while(i1>1; - if(compare(keys[nM].sItemName,sKey)>0) - nE=nM-1; - else if(compare(keys[nM].sItemName,sKey)<0) - nB=nM+1; - else{ - bFound=true; - break; - } - }while(nB<=nE); - if(bFound) - { - if(keys[nM].aTopics) - { - for(var i=0;i>1; - if(aFTCD[nM].nBegin>nTopicId) - nE=nM-1; - else if(aFTCD[nM].nEnd
"+sButton+"
"; - for(var i=0;i0) - { - var sHTML=""; - if(nAligns!=0) - { - sHTML+="
" - if(nAligns&1) - sHTML+=""; - if(nAligns&2) - sHTML+=""; - if(nAligns&4) - sHTML+=""; - sHTML+="
"+getIntopicBar("left")+""+getIntopicBar("center")+""+getIntopicBar("right")+"
"; - document.write(sHTML); - } - } -} - -function sendAveInfoOut() -{ - if(!isInPopup()) - setTimeout("sendAveInfo();",100); -} - -function sendAveInfo() -{ - var oMsg=new whMessage(WH_MSG_AVENUEINFO,this,1,gaAvenues); - SendMessage(oMsg); -} - - -function onNext() -{ - var oMsg=new whMessage(WH_MSG_NEXT,this,1,null); - SendMessage(oMsg); -} - -function onPrev() -{ - var oMsg=new whMessage(WH_MSG_PREV,this,1,null); - SendMessage(oMsg); -} - -function createSyncInfo() -{ - var oParam=new Object(); - if(gsPPath.length==0) - gsPPath=_getPath(document.location.href); - oParam.sPPath=gsPPath; - oParam.sTPath=document.location.href; - oParam.aPaths=gaPaths; - return oParam; -} - -function syncWithShow() -{ - if(isTopicOnly()) - show(); - else - { - sync(); - showTocPane(); - } -} - -function showTocPane() -{ - var oMsg=new whMessage(WH_MSG_SHOWTOC,this,1,null); - SendMessage(oMsg); -} - -function sendSyncInfo() -{ - if(!isInPopup()) - { - var oParam=null; - if(gaPaths.length>0) - { - oParam=createSyncInfo(); - } - var oMsg=new whMessage(WH_MSG_SYNCINFO,this,1,oParam); - SendMessage(oMsg); - } -} - -function sendInvalidSyncInfo() -{ - if(!isInPopup()) - { - var oMsg=new whMessage(WH_MSG_SYNCINFO,this,1,null); - SendMessage(oMsg); - } -} - -function enableWebSearch(bEnable) -{ - if(!isInPopup()) - { - var oMsg=new whMessage(WH_MSG_ENABLEWEBSEARCH,this,1,bEnable); - SendMessage(oMsg); - } -} - -function autoSync(nSync) -{ - if(nSync==0) return; - if(isInPopup()) return; - if(isOutMostTopic()) - sync(); -} - -function isOutMostTopic() -{ - if(gnOutmostTopic==-1) - { - var oMessage=new whMessage(WH_MSG_ISINFRAMESET,this,1,null); - if(SendMessage(oMessage)) - gnOutmostTopic=0; - else - gnOutmostTopic=1; - } - return (gnOutmostTopic==1); -} - -function sync() -{ - if(gaPaths.length>0) - { - var oParam=createSyncInfo(); - var oMessage=new whMessage(WH_MSG_SYNCTOC,this,1,oParam); - SendMessage(oMessage); - } -} - - -function avenueInfo(sName,sPrev,sNext) -{ - this.sName=sName; - this.sPrev=sPrev; - this.sNext=sNext; -} - -function getCurrentAvenue() -{ - var oParam=new Object(); - oParam.sAvenue=null; - var oMessage=new whMessage(WH_MSG_GETCURRENTAVENUE,this,1,oParam); - SendMessage(oMessage); - return oParam.sAvenue; -} - -function unRegisterListener() -{ - sendInvalidSyncInfo(); - enableWebSearch(false); - if(whtopic_foldUnload) - whtopic_foldUnload(); -} - -function onSendMessage(oMsg) -{ - var nMsgId=oMsg.nMessageId; - if(nMsgId==WH_MSG_GETAVIAVENUES) - { - oMsg.oParam.aAvenues=gaAvenues; - return false; - } - else if(nMsgId==WH_MSG_GETTOCPATHS) - { - if(isOutMostTopic()) - { - oMsg.oParam.oTocInfo=createSyncInfo(); - return false; - } - else - return true; - } - else if(nMsgId==WH_MSG_NEXT) - { - goAvenue(true); - } - else if(nMsgId==WH_MSG_PREV) - { - goAvenue(false); - } - else if(nMsgId==WH_MSG_WEBSEARCH) - { - websearch(); - } - return true; -} - -function goAvenue(bNext) -{ - var sTopic=null; - var sAvenue=getCurrentAvenue(); - var nAvenue=-1; - if(sAvenue!=null&&sAvenue!="") - { - for(var i=0;i0&&bNext) - { - sTopic=gaAvenues[i].sNext; - break; - } - else if(gaAvenues[i].sPrev!=null&&gaAvenues[i].sPrev.length>0&&!bNext) - { - sTopic=gaAvenues[i].sPrev; - break; - } - } - } - - if(sTopic!=null&&sTopic!="") - { - if(gsPPath!=null&&gsPPath!="") - { - sFullTopicPath=_getFullPath(gsPPath,sTopic); - document.location=sFullTopicPath; - } - } -} - -function canGo(bNext) -{ - for(var i=0;i0&&bNext)|| - (gaAvenues[i].sPrev!=null&&gaAvenues[i].sPrev.length>0&&!bNext)) - return true; - } - return false; -} - -function show() -{ - if(gsStartPage!="") - window.location=gsStartPage+"#"+gsRelCurPagePath; -} - -function hide() -{ - if(goFrame!=null) - { - goFrame.location=window.location; - } -} - -function isTopicOnly() -{ - if(gnTopicOnly==-1) - { - var oParam=new Object(); - oParam.oFrame=null; - var oMsg=new whMessage(WH_MSG_GETSTARTFRAME,this,1,oParam); - if(SendMessage(oMsg)) - { - goFrame=oParam.oFrame; - gnTopicOnly=0; - } - else - gnTopicOnly=1; - } - if(gnTopicOnly==1) - return true; - else - return false; -} - -function websearch() -{ - if(gbNav4) - { - if(document.ehelpform) - document.ehelpform.submit(); - } - else - { - if(window.ehelpform) - window.ehelpform.submit(); - } -} - -function addSearchFormHref(sHref) -{ - gsSearchFormHref=sHref; - enableWebSearch(true); -} - -function searchB(nForm) -{ - var sValue=eval("document.searchForm"+nForm+".searchString.value"); - var oMsg=new whMessage(WH_MSG_SEARCHTHIS,this,1,sValue); - SendMessage(oMsg); -} - -function getSearchFormHTML() -{ - var sHTML=""; - gnForm++; - var sFormName="searchForm"+gnForm; - var sButton="" - sButton+=""; - if(""=="text") - { - sButton+=""; - } - else if(""=="image") - { - sButton+="" - sButton+=""; - } - sButton+=""; - sHTML="
"+sButton+""+sButton+"
"; + for(var i=0;i0) + { + var sHTML=""; + if(nAligns!=0) + { + sHTML+="
" + if(nAligns&1) + sHTML+=""; + if(nAligns&2) + sHTML+=""; + if(nAligns&4) + sHTML+=""; + sHTML+="
"+getIntopicBar("left")+""+getIntopicBar("center")+""+getIntopicBar("right")+"
"; + document.write(sHTML); + } + } +} + +function sendAveInfoOut() +{ + if(!isInPopup()) + setTimeout("sendAveInfo();",100); +} + +function sendAveInfo() +{ + var oMsg=new whMessage(WH_MSG_AVENUEINFO,this,1,gaAvenues); + SendMessage(oMsg); +} + + +function onNext() +{ + var oMsg=new whMessage(WH_MSG_NEXT,this,1,null); + SendMessage(oMsg); +} + +function onPrev() +{ + var oMsg=new whMessage(WH_MSG_PREV,this,1,null); + SendMessage(oMsg); +} + +function createSyncInfo() +{ + var oParam=new Object(); + if(gsPPath.length==0) + gsPPath=_getPath(document.location.href); + oParam.sPPath=gsPPath; + oParam.sTPath=document.location.href; + oParam.aPaths=gaPaths; + return oParam; +} + +function syncWithShow() +{ + if(isTopicOnly()) + show(); + else + { + sync(); + showTocPane(); + } +} + +function showTocPane() +{ + var oMsg=new whMessage(WH_MSG_SHOWTOC,this,1,null); + SendMessage(oMsg); +} + +function sendSyncInfo() +{ + if(!isInPopup()) + { + var oParam=null; + if(gaPaths.length>0) + { + oParam=createSyncInfo(); + } + var oMsg=new whMessage(WH_MSG_SYNCINFO,this,1,oParam); + SendMessage(oMsg); + } +} + +function sendInvalidSyncInfo() +{ + if(!isInPopup()) + { + var oMsg=new whMessage(WH_MSG_SYNCINFO,this,1,null); + SendMessage(oMsg); + } +} + +function enableWebSearch(bEnable) +{ + if(!isInPopup()) + { + var oMsg=new whMessage(WH_MSG_ENABLEWEBSEARCH,this,1,bEnable); + SendMessage(oMsg); + } +} + +function autoSync(nSync) +{ + if(nSync==0) return; + if(isInPopup()) return; + if(isOutMostTopic()) + sync(); +} + +function isOutMostTopic() +{ + if(gnOutmostTopic==-1) + { + var oMessage=new whMessage(WH_MSG_ISINFRAMESET,this,1,null); + if(SendMessage(oMessage)) + gnOutmostTopic=0; + else + gnOutmostTopic=1; + } + return (gnOutmostTopic==1); +} + +function sync() +{ + if(gaPaths.length>0) + { + var oParam=createSyncInfo(); + var oMessage=new whMessage(WH_MSG_SYNCTOC,this,1,oParam); + SendMessage(oMessage); + } +} + + +function avenueInfo(sName,sPrev,sNext) +{ + this.sName=sName; + this.sPrev=sPrev; + this.sNext=sNext; +} + +function getCurrentAvenue() +{ + var oParam=new Object(); + oParam.sAvenue=null; + var oMessage=new whMessage(WH_MSG_GETCURRENTAVENUE,this,1,oParam); + SendMessage(oMessage); + return oParam.sAvenue; +} + +function unRegisterListener() +{ + sendInvalidSyncInfo(); + enableWebSearch(false); + if(whtopic_foldUnload) + whtopic_foldUnload(); +} + +function onSendMessage(oMsg) +{ + var nMsgId=oMsg.nMessageId; + if(nMsgId==WH_MSG_GETAVIAVENUES) + { + oMsg.oParam.aAvenues=gaAvenues; + return false; + } + else if(nMsgId==WH_MSG_GETTOCPATHS) + { + if(isOutMostTopic()) + { + oMsg.oParam.oTocInfo=createSyncInfo(); + return false; + } + else + return true; + } + else if(nMsgId==WH_MSG_NEXT) + { + goAvenue(true); + } + else if(nMsgId==WH_MSG_PREV) + { + goAvenue(false); + } + else if(nMsgId==WH_MSG_WEBSEARCH) + { + websearch(); + } + return true; +} + +function goAvenue(bNext) +{ + var sTopic=null; + var sAvenue=getCurrentAvenue(); + var nAvenue=-1; + if(sAvenue!=null&&sAvenue!="") + { + for(var i=0;i0&&bNext) + { + sTopic=gaAvenues[i].sNext; + break; + } + else if(gaAvenues[i].sPrev!=null&&gaAvenues[i].sPrev.length>0&&!bNext) + { + sTopic=gaAvenues[i].sPrev; + break; + } + } + } + + if(sTopic!=null&&sTopic!="") + { + if(gsPPath!=null&&gsPPath!="") + { + sFullTopicPath=_getFullPath(gsPPath,sTopic); + document.location=sFullTopicPath; + } + } +} + +function canGo(bNext) +{ + for(var i=0;i0&&bNext)|| + (gaAvenues[i].sPrev!=null&&gaAvenues[i].sPrev.length>0&&!bNext)) + return true; + } + return false; +} + +function show() +{ + if(gsStartPage!="") + window.location=gsStartPage+"#"+gsRelCurPagePath; +} + +function hide() +{ + if(goFrame!=null) + { + goFrame.location=window.location; + } +} + +function isTopicOnly() +{ + if(gnTopicOnly==-1) + { + var oParam=new Object(); + oParam.oFrame=null; + var oMsg=new whMessage(WH_MSG_GETSTARTFRAME,this,1,oParam); + if(SendMessage(oMsg)) + { + goFrame=oParam.oFrame; + gnTopicOnly=0; + } + else + gnTopicOnly=1; + } + if(gnTopicOnly==1) + return true; + else + return false; +} + +function websearch() +{ + if(gbNav4) + { + if(document.ehelpform) + document.ehelpform.submit(); + } + else + { + if(window.ehelpform) + window.ehelpform.submit(); + } +} + +function addSearchFormHref(sHref) +{ + gsSearchFormHref=sHref; + enableWebSearch(true); +} + +function searchB(nForm) +{ + var sValue=eval("document.searchForm"+nForm+".searchString.value"); + var oMsg=new whMessage(WH_MSG_SEARCHTHIS,this,1,sValue); + SendMessage(oMsg); +} + +function getSearchFormHTML() +{ + var sHTML=""; + gnForm++; + var sFormName="searchForm"+gnForm; + var sButton="
" + sButton+=""; + if(""=="text") + { + sButton+=""; + } + else if(""=="image") + { + sButton+="" + sButton+=""; + } + sButton+="
"; + sHTML="
"+sButton+"
- - - - - - - -
- - -
- - -

Examples

-      Interfaces:
-
- VISU::Base

- VISU::VISU_Gen
- VISU::PrsObject
-

- VISU::Result
-
- VISU::Prs3d

- VISU::Mesh
- VISU::ScalarMap
- VISU::CutPlanes
- VISU::CutLines
- VISU::IsoSurfaces
- VISU::DeformedShape
- VISU::Vectors
- VISU::StreamLines
-
- VISU::Table
- VISU::Curve
- VISU::Container
-
- VISU::ViewManager

- VISU::View
- VISU::View3D
- VISU::TableView
- VISU::XYPlot
- -

Base

- - - - - - - - - - - - -
IdType - VISU::Base::GetID   -
-
- -

#Returns ID of the object. That is IOR of CORBA representation a VISU -object.
-

- -

aSObject = myLocalStudy.FindObjectIOR(theResult.GetID())
-

- - - - - - - - - - - -
VISUType - VISU::Base::GetType   -
- -

#Returns the type of the presentable object. It can be used for quick -class definition of an VISU object
-
- if aVISUObject.GetType() == VISU.TSCALARMAP :
-     #do something ...
-

- -


-

-

VISU_Gen
-

- - - - - - - - - - - - - -
void VISU::VISU_Gen::SetCurrentStudy - in SALOMEDS::Study   theStudy -
-
-
- -

- - - - - - - -
- - - - - - - - - - - -
SALOMEDS::Study -VISU::VISU_Gen::GetCurrentStudy   -
-
-
-
- #It is very important to set SALOMEDS::Study for VISU Engine before you -start any work with them.
- #Every object that you will create will be assigned to the study you set -before.
- #It can be done like this:
-

- -

aStudy = myStudyManager.NewStudy("A foo Study")
- if aStudy is None : raise RuntimeError, "Error"
- else : print "OK"
-     theVisuGen.SetCurrentStudy(aStudy)
-     #to do every things you like
-     ...
-

- -

- - - - - - - -
- - - - - - - - - - - -
ViewManager -VISU::VISU_Gen::GetViewManager   -
-
-
- - - - - - - - - -
  -

Gets the ViewManager which is used for creation of post-processing -presentations.

-
-
- #In order to display any VISU::PrsObject in propriate viewer you must take -VISU::ViewManager interface
-

- -

aViewManager = myVisuGen.GetViewManager()
- #to do something for displaing some presentation
- ...
-

- -

- - - - - - - -
- - - - - - - - - - - - -
SALOMEDS::SObject -VISU::VISU_Gen::ImportTables in string   theFileName -
-
-
- - - - - - - - - -
  -

Imports tables from a file and create TableAttribute in Sudy -

-
-
- #It is possible to import some ASCII files that include text table representation. -One file can consist from more than one table.
-

- -

aSObject = myVisuGen.ImportTables("/MyPresicousFileOfTables.txt")
-

- -

- - - - - - - -
- - - - - - - - - - - - -
Result -VISU::VISU_Gen::ImportFile in string   theFileName -
-
-
- - - - - - - - - -
  -

Imports data from a file.

-
-
- #It is possible import a med files to VISU
-

- -

aResult = myVisuGen.ImportFile("/ItIsDreamOfMyLife.med")
-

- -

- - - - - - - -
- - - - - - - - - - - - -
Result -VISU::VISU_Gen::ImportMed in SALOMEDS::SObject   theMedSObject -
-
-
- - - - - - - - - -
  -

Imports data from a MED object.

-
-
- #
-

- -

- - - - - - - -
- - - - - - - - - - - - -
Result -VISU::VISU_Gen::ImportMedField in SALOME_MED::FIELD   theField -
-
-
- - - - - - - - - -
  -

Imports data from a MED field.

-
-

- -

- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
Mesh -VISU::VISU_Gen::MeshOnEntity in Result   theResult, -

-

-
in string   theMeshName, -

-

-
in Entity   theEntity

-

-
-
- - - - - - - - - -
  -

Creates a Mesh on the basis of the data generated in other sources -(MED object or file).

-
-

- -

- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Mesh -VISU::VISU_Gen::FamilyMeshOnEntity in Result   theResult, -

-

-
in string   theMeshName, -

-

-
in Entity   theEntity, -

-

-
in string   theFamilyName

-

-
-
-

- -

- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
Mesh -VISU::VISU_Gen::GroupMesh in Result   theResult, -

-

-
in string   theMeshName, -

-

-
in string   theGroupName

-

-
-
-

- -

- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
ScalarMap -VISU::VISU_Gen::ScalarMapOnField in Result   theResult, -

-

-
in string   theMeshName, -

-

-
in Entity   theEntity, -

-

-
in string   theFieldName, -

-

-
in double   theIteration

-

-
-
- - - - - - - - - -
  -

Creates a scalar bar presentation.

- -
-
Parameters:
-
- - - - - - - - - - - - - - - - - - - - - - - - -
theResult  Data generated in other sources. (MED object or file) -
theMeshName  One of the meshes presented in MED file
theEntity  Type of entity where the field is defined
theFieldName  Group of data attributed to the MESH. The data can -be scalar or vector.
theIteration  Number of iteration on the field
-
-
-
-

- -

- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
DeformedShape -VISU::VISU_Gen::DeformedShapeOnField in Result   theResult, -

-

-
in string   theMeshName, -

-

-
in Entity   theEntity, -

-

-
in string   theFieldName, -

-

-
in double   theIteration

-

-
-
- - - - - - - - - -
  -

Creates a deformed shape presentation.

- -
-
Parameters:
-
- - - - - - - - - - - - - - - - - - - - - - - - -
theResult  Data generated in other sources. (MED object or file) -
theMeshName  One of the meshes presented in MED file
theEntity  Type of entity where the field is defined
theFieldName  Group of data attributed to the MESH. The data can -be scalar or vector.
theIteration  Number of iteration on the field
-
-
-
-

- -

- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Vectors -VISU::VISU_Gen::VectorsOnField in Result   theResult, -

-

-
in string   theMeshName, -

-

-
in Entity   theEntity, -

-

-
in string   theFieldName, -

-

-
in double   theIteration

-

-
-
- - - - - - - - - -
  -

Creates a vector presentation.

- -
-
Parameters:
-
- - - - - - - - - - - - - - - - - - - - - - - - -
theResult  Data generated in other sources. (MED object or file) -
theMeshName  One of the meshes presented in MED file
theEntity  Type of entity where the field is defined
theFieldName  Group of data attributed to the MESH. The data can -be scalar or vector.
theIteration  Number of iteration on the field
-
-
-
-

- -

- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
IsoSurfaces -VISU::VISU_Gen::IsoSurfacesOnField in Result   theResult, -

-

-
in string   theMeshName, -

-

-
in Entity   theEntity, -

-

-
in string   theFieldName, -

-

-
in double   theIteration

-

-
-
- - - - - - - - - -
  -

Creates an iso surface presentation.

- -
-
Parameters:
-
- - - - - - - - - - - - - - - - - - - - - - - - -
theResult  Data generated in other sources. (MED object or file) -
theMeshName  One of the meshes presented in MED file
theEntity  Type of entity where the field is defined
theFieldName  Group of data attributed to the MESH. The data can -be scalar or vector.
theIteration  Number of iteration on the field
-
-
-
-

- -

- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
StreamLines -VISU::VISU_Gen::StreamLinesOnField in Result   theResult, -

-

-
in string   theMeshName, -

-

-
in Entity   theEntity, -

-

-
in string   theFieldName, -

-

-
in double   theIteration

-

-
-
- - - - - - - - - -
  -

Creates an stream lines presentation.

- -
-
Parameters:
-
- - - - - - - - - - - - - - - - - - - - - - - - -
theResult  Data generated in other sources. (MED object or file) -
theMeshName  One of the meshes presented in MED file
theEntity  Type of entity where the field is defined
theFieldName  Group of data attributed to the MESH. The data can -be scalar or vector.
theIteration  Number of iteration on the field
-
-
-
-

- -

- - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CutPlanes -VISU::VISU_Gen::CutPlanesOnField in Result   theResult, -

-

-
in string   theMeshName, -

-

-
in Entity   theEntity, -

-

-
in string   theFieldName, -

-

-
in double   theIteration

-

-
-
- - - - - -
  -

Creates a presentation of cut planes.

- -
-
Parameters:
-
- - - - - - - - - - - - - - - - + + + + + + + + Main Page + + + + +   +
+
theResult  Data generated in other sources. (MED object or file) -
theMeshName  One of the meshes presented in MED file
theEntity  Type of entity where the field is defined
theFieldName 
+ + + + + + + +
+ + +
+ + +

Examples

+      Interfaces:
+
+ VISU::Base

+ VISU::VISU_Gen
+ VISU::PrsObject
+

+ VISU::Result
+
+ VISU::Prs3d

+ VISU::Mesh
+ VISU::ScalarMap
+ VISU::CutPlanes
+ VISU::CutLines
+ VISU::IsoSurfaces
+ VISU::DeformedShape
+ VISU::Vectors
+ VISU::StreamLines
+
+ VISU::Table
+ VISU::Curve
+ VISU::Container
+
+ VISU::ViewManager

+ VISU::View
+ VISU::View3D
+ VISU::TableView
+ VISU::XYPlot
+ +

Base

+ + + + + + + + + + + + +
IdType + VISU::Base::GetID   +
+
+ +

#Returns ID of the object. That is IOR of CORBA representation a VISU +object.
+

+ +

aSObject = myLocalStudy.FindObjectIOR(theResult.GetID())
+

+ + + + + + + + + + + +
VISUType + VISU::Base::GetType   +
+ +

#Returns the type of the presentable object. It can be used for quick +class definition of an VISU object
+
+ if aVISUObject.GetType() == VISU.TSCALARMAP :
+     #do something ...
+

+ +


+

+

VISU_Gen
+

+ + + + + + + + + + + + + +
void VISU::VISU_Gen::SetCurrentStudy + in SALOMEDS::Study   theStudy +
+
+
+ +

+ + + + + + + +
+ + + + + + + + + + + +
SALOMEDS::Study +VISU::VISU_Gen::GetCurrentStudy   +
+
+
+
+ #It is very important to set SALOMEDS::Study for VISU Engine before you +start any work with them.
+ #Every object that you will create will be assigned to the study you set +before.
+ #It can be done like this:
+

+ +

aStudy = myStudyManager.NewStudy("A foo Study")
+ if aStudy is None : raise RuntimeError, "Error"
+ else : print "OK"
+     theVisuGen.SetCurrentStudy(aStudy)
+     #to do every things you like
+     ...
+

+ +

+ + + + + + + +
+ + + + + + + + + + + +
ViewManager +VISU::VISU_Gen::GetViewManager   +
+
+
+ + + + + + + + + +
  +

Gets the ViewManager which is used for creation of post-processing +presentations.

+
+
+ #In order to display any VISU::PrsObject in propriate viewer you must take +VISU::ViewManager interface
+

+ +

aViewManager = myVisuGen.GetViewManager()
+ #to do something for displaing some presentation
+ ...
+

+ +

+ + + + + + + +
+ + + + + + + + + + + + +
SALOMEDS::SObject +VISU::VISU_Gen::ImportTables in string   theFileName +
+
+
+ + + + + + + + + +
  +

Imports tables from a file and create TableAttribute in Sudy +

+
+
+ #It is possible to import some ASCII files that include text table representation. +One file can consist from more than one table.
+

+ +

aSObject = myVisuGen.ImportTables("/MyPresicousFileOfTables.txt")
+

+ +

+ + + + + + + +
+ + + + + + + + + + + + +
Result +VISU::VISU_Gen::ImportFile in string   theFileName +
+
+
+ + + + + + + + + +
  +

Imports data from a file.

+
+
+ #It is possible import a med files to VISU
+

+ +

aResult = myVisuGen.ImportFile("/ItIsDreamOfMyLife.med")
+

+ +

+ + + + + + + +
+ + + + + + + + + + + + +
Result +VISU::VISU_Gen::ImportMed in SALOMEDS::SObject   theMedSObject +
+
+
+ + + + + + + + + +
  +

Imports data from a MED object.

+
+
+ #
+

+ +

+ + + + + + + +
+ + + + + + + + + + + + +
Result +VISU::VISU_Gen::ImportMedField in SALOME_MED::FIELD   theField +
+
+
+ + + + + + + + + +
  +

Imports data from a MED field.

+
+

+ +

+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
Mesh +VISU::VISU_Gen::MeshOnEntity in Result   theResult, +

+

+
in string   theMeshName, +

+

+
in Entity   theEntity

+

+
+
+ + + + + + + + + +
  +

Creates a Mesh on the basis of the data generated in other sources +(MED object or file).

+
+

+ +

+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Mesh +VISU::VISU_Gen::FamilyMeshOnEntity in Result   theResult, +

+

+
in string   theMeshName, +

+

+
in Entity   theEntity, +

+

+
in string   theFamilyName

+

+
+
+

+ +

+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
Mesh +VISU::VISU_Gen::GroupMesh in Result   theResult, +

+

+
in string   theMeshName, +

+

+
in string   theGroupName

+

+
+
+

+ +

+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ScalarMap +VISU::VISU_Gen::ScalarMapOnField in Result   theResult, +

+

+
in string   theMeshName, +

+

+
in Entity   theEntity, +

+

+
in string   theFieldName, +

+

+
in double   theIteration

+

+
+
+ + + + + + + + + +
  +

Creates a scalar bar presentation.

+ +
+
Parameters:
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
theResult  Data generated in other sources. (MED object or file) +
theMeshName  One of the meshes presented in MED file
theEntity  Type of entity where the field is defined
theFieldName  Group of data attributed to the MESH. The data can +be scalar or vector.
theIteration  Number of iteration on the field
+
+
+
+

+ +

+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
DeformedShape +VISU::VISU_Gen::DeformedShapeOnField in Result   theResult, +

+

+
in string   theMeshName, +

+

+
in Entity   theEntity, +

+

+
in string   theFieldName, +

+

+
in double   theIteration

+

+
+
+ + + + + + + + + +
  +

Creates a deformed shape presentation.

+ +
+
Parameters:
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
theResult  Data generated in other sources. (MED object or file) +
theMeshName  One of the meshes presented in MED file
theEntity  Type of entity where the field is defined
theFieldName  Group of data attributed to the MESH. The data can +be scalar or vector.
theIteration  Number of iteration on the field
+
+
+
+

+ +

+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Vectors +VISU::VISU_Gen::VectorsOnField in Result   theResult, +

+

+
in string   theMeshName, +

+

+
in Entity   theEntity, +

+

+
in string   theFieldName, +

+

+
in double   theIteration

+

+
+
+ + + + + + + + + +
  +

Creates a vector presentation.

+ +
+
Parameters:
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
theResult  Data generated in other sources. (MED object or file) +
theMeshName  One of the meshes presented in MED file
theEntity  Type of entity where the field is defined
theFieldName  Group of data attributed to the MESH. The data can +be scalar or vector.
theIteration  Number of iteration on the field
+
+
+
+

+ +

+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
IsoSurfaces +VISU::VISU_Gen::IsoSurfacesOnField in Result   theResult, +

+

+
in string   theMeshName, +

+

+
in Entity   theEntity, +

+

+
in string   theFieldName, +

+

+
in double   theIteration

+

+
+
+ + + + + + + + + +
  +

Creates an iso surface presentation.

+ +
+
Parameters:
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
theResult  Data generated in other sources. (MED object or file) +
theMeshName  One of the meshes presented in MED file
theEntity  Type of entity where the field is defined
theFieldName  Group of data attributed to the MESH. The data can +be scalar or vector.
theIteration  Number of iteration on the field
+
+
+
+

+ +

+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
StreamLines +VISU::VISU_Gen::StreamLinesOnField in Result   theResult, +

+

+
in string   theMeshName, +

+

+
in Entity   theEntity, +

+

+
in string   theFieldName, +

+

+
in double   theIteration

+

+
+
+ + + + + + + + + +
  +

Creates an stream lines presentation.

+ +
+
Parameters:
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
theResult  Data generated in other sources. (MED object or file) +
theMeshName  One of the meshes presented in MED file
theEntity  Type of entity where the field is defined
theFieldName  Group of data attributed to the MESH. The data can +be scalar or vector.
theIteration  Number of iteration on the field
+
+
+
+

+ +

+ + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
CutPlanes +VISU::VISU_Gen::CutPlanesOnField in Result   theResult, +

+

+
in string   theMeshName, +

+

+
in Entity   theEntity, +

+

+
in string   theFieldName, +

+

+
in double   theIteration

+

+
+
+ + + + + +
  +

Creates a presentation of cut planes.

+ +
+
Parameters:
+
+ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/doc/salome/tui/VISU/sources/static/overview_VISU.html b/doc/salome/tui/VISU/sources/static/overview_VISU.html index 844abd40..f6f54eaa 100755 --- a/doc/salome/tui/VISU/sources/static/overview_VISU.html +++ b/doc/salome/tui/VISU/sources/static/overview_VISU.html @@ -1,252 +1,252 @@ - - - - - - Main Page - - - -  -
theResult  Data generated in other sources. (MED object or file) +
theMeshName  One of the meshes presented in MED file
theEntity  Type of entity where the field is defined
theFieldName 
- - - - - - -
-
-
- - -

General overview -

-

Table of contents

- - -
-

1. Introduction

-

Post-processing module VISU for SALOME is destined for visualization of data - produced by other components. VISU provides various forms of data visualization - including:

- -
    -
  • Data tables,
  • -
  • XY plots based on data from tables,
  • -
  • 3D presentations,
  • -
      -
    • Scalar Map,
    • -
    • Deformed Shape,
    • -
    • Vectors,
    • -
    • Iso Surfaces,
    • -
    • Cut Planes,
    • -
    • Stream Lines,
    • -
    • Cut Lines.
    • -
    -
-Back to the contents -

2. Defintions

-

The following terms are used for presentation of the VISU module:

-
-
Study
-
manages data produced by various component of SALOME platform. More detailed description of the SALOME Study can be found in the document named "Data Structure and Persistence Specifications".
-
Component
-
a SALOME software module that implements predefined interfaces. -The component provides the data for the SALOME study in a form of links (stored in the Study) -to the specific data stored in the component. All components are CORBA servers and it allows them -to be running on different host stations.
-
Geometry
a coherent set of data produced by component GEOM or any other geometry tool -and imported using geometry exchange interface (like BRep, IGES and so on).
-
Mesh
a collection of elements used as a support for numeric simulation.
-
Field
the set of results of the same type allocated to mesh elements. -Fields can be one of next types: scalars, vectors, tensors, matrices, character strings.
-
-Back to the contents -

3. Forms of data visualization

-

3.1 Data tables

-

Table represents data in spreadsheet-like form. For these purposes the QTable - widget will be provided. This widget can be reused in any module for any dialog - box as a control. For post-processing data visualization needs this widget is - used inside of Table window (based on non-modal window frame). Data represented - in Table window of post-processing module is be editable.

-

3.2 XY plots

-

XY plot represents calculation data in form of 2D (XY) plotting. -XY plot view is shown in a separated view window (non-modal dialog box), which can be moved in any position of the screen for convenience. -The QWT extension of QT toolkit is used for XY plotting. -QWT provides unlimited number of displayed curves (data sets) and supports logarithmic scale, zooming, and selection.

- -

3.3 3D presentations

-

A 3D presentation shows geometry, mesh and fields in 3D space. -Provides selection, rotation, zooming, scaling, and panning of 3d scene. -Color bar for scalar data presentation is supplied. -For 3D presentation window of the current implementation of VTK viewer in study window is used.

-Back to the contents -

4. Data structure

-

Source data for post-processing module can be imported from MED file or MED object in study data structure (CORBA object) can be used for this purposes.

-

In case of import MED file the data from this file will be converted in form of VTK Data Source format and stored in VISU data structure. In case of using of MED object from study the label in VISU data structure will be created with reference to the corresponded MED object.

-

Available result data is displayed under corresponded MED data label. For every result the number of presentations can be created dependently on result type.

-

Presentation is represented in data structure in form of list of presentation creation parameters. This could be:

-
    -
  • Presentation type (table, XY plot, 3d view);
  • -
  • Presentation subtype (for example for 3d: scalar map, iso-surfaces, combined view and so on);
  • -
  • Parameters of the presentation dependently on its type (number of colors, type of scale, font parameters, grid parameters and so on).
  • -
-

Parameters of presentation are persistent data, which will be stored in study file.

- - -
-Back to the contents -

5. VISU module features and services

-

The functionality of the VISU module is provided by a set of classes which are combined into -the VISU package. -

The API reference of the VISU component can be found here.

-

5.1 Base class

-

This is a root class for all objects of the VISU module.

-

The API reference for this class can be found here.

- -

5.2 ViewManager class

-

This class is used for management of the view windows (creation and deletion).

-

The API reference for this class can be found here.

- -

5.3 View class

-

View class is a base for all other classes, necessary for creation of different views .

- -
-

The API reference for this class can be found here.

- -

5.3.1 3dView class

-

This class provides a set of methods for creation of a 3d view window.

-

The API reference for this class can be found here.

- -

5.3.2 TableView class

-

This class provides a set of methods for creation of a Table view window.

-

The API reference for this class can be found here.

- -

5.3.3 XYPlotView class

-

This class provides a set of methods for creation of a XYPlot view window.

-

The API reference for this class can be found here.

- -

5.4 Result class

-

This class serves for inner representation of data generated in other sources. -(MED object or file) This data is needed for further construction of graphical presentations.

-

The API reference for this class can be found here.

-

5.5 PrsObject class

-

It is the root class of all presentable objects.

-
-

The API reference for this class can be found here.

- -

5.5.1 Curve class

-

Manages presentation parameters of one curve. -This object can be used for presentation of set of curves using Container class.

-

The API reference for this class can be found here.

- -

5.5.2 Table class

-

Manages presentation parameters of a table.

-

The API reference for this class can be found here.

- -

5.5.3 Container class

-

This class is provided in order to create one presentation using several presentable objects. This can provide combination of a set of curves to display them in XY plot view. -

-

The API reference for this class can be found here.

- -

5.5.4 Prs3d class

-

Root class for all 3D presentations.

-

The API reference for this class can be found here.

- -

5.5.5 Mesh class

-

Manages presentation parameters of a 3D presentattion of a mesh. -This object can be used for presentation of set of curves using Container class.

-

The API reference for this class can be found here.

- -

5.5.6 ScalarMap class

-

Manages presentation parameters of the scalar bar.

-

The API reference for this class can be found here.

- -

5.5.7 CutLines class

-

Manages presentation parameters of the cut lines presentation.

-

The API reference for this class can be found here.

- -

5.5.8 CutPlanes class

-

Manages presentation parameters of the cut planes presentation.

-

The API reference for this class can be found here.

- -

5.5.9 IsoSurfaces class

-

Manages presentation parameters of the iso surfaces presentation.

-

The API reference for this class can be found here.

- -

5.5.10 DeformedShape class

-

Manages presentation parameters of the deformed shape presentation.

-

The API reference for this class can be found here.

- -

5.5.11 Vectors class

-

Manages presentation parameters of the vector presentation.

-

The API reference for this class can be found here.

- -

5.5.12 StreamLines class

-

Manages presentation parameters of the streamlines presentation.

-

The API reference for this class can be found here.

- -

5.6 Animation class

-

This class provides a set of methods used for:

-
    -
  • generating different animations,
  • -
  • setting the parameters of the animations,
  • -
  • playing these animations in the VISU module.
  • -
-

The API reference for this class can be found here.

- -

5.7 VISU_Gen class

-

This is the main clas of the VISU component in SALOME application. It is used for , -using the views provided by ViewManager. This class provides a set of methods used for:

-
    -
  • creation of all types of post-processing presentations from given Result and Table object reference
  • -
  • creation of animations
  • - -
-

The API reference for this class can be found here.

-Back to the contents - - + + + + + + Main Page + + + +  +
+ + + + + + +
+
+
+ + +

General overview +

+

Table of contents

+ + +
+

1. Introduction

+

Post-processing module VISU for SALOME is destined for visualization of data + produced by other components. VISU provides various forms of data visualization + including:

+ +
    +
  • Data tables,
  • +
  • XY plots based on data from tables,
  • +
  • 3D presentations,
  • +
      +
    • Scalar Map,
    • +
    • Deformed Shape,
    • +
    • Vectors,
    • +
    • Iso Surfaces,
    • +
    • Cut Planes,
    • +
    • Stream Lines,
    • +
    • Cut Lines.
    • +
    +
+Back to the contents +

2. Defintions

+

The following terms are used for presentation of the VISU module:

+
+
Study
+
manages data produced by various component of SALOME platform. More detailed description of the SALOME Study can be found in the document named "Data Structure and Persistence Specifications".
+
Component
+
a SALOME software module that implements predefined interfaces. +The component provides the data for the SALOME study in a form of links (stored in the Study) +to the specific data stored in the component. All components are CORBA servers and it allows them +to be running on different host stations.
+
Geometry
a coherent set of data produced by component GEOM or any other geometry tool +and imported using geometry exchange interface (like BRep, IGES and so on).
+
Mesh
a collection of elements used as a support for numeric simulation.
+
Field
the set of results of the same type allocated to mesh elements. +Fields can be one of next types: scalars, vectors, tensors, matrices, character strings.
+
+Back to the contents +

3. Forms of data visualization

+

3.1 Data tables

+

Table represents data in spreadsheet-like form. For these purposes the QTable + widget will be provided. This widget can be reused in any module for any dialog + box as a control. For post-processing data visualization needs this widget is + used inside of Table window (based on non-modal window frame). Data represented + in Table window of post-processing module is be editable.

+

3.2 XY plots

+

XY plot represents calculation data in form of 2D (XY) plotting. +XY plot view is shown in a separated view window (non-modal dialog box), which can be moved in any position of the screen for convenience. +The QWT extension of QT toolkit is used for XY plotting. +QWT provides unlimited number of displayed curves (data sets) and supports logarithmic scale, zooming, and selection.

+ +

3.3 3D presentations

+

A 3D presentation shows geometry, mesh and fields in 3D space. +Provides selection, rotation, zooming, scaling, and panning of 3d scene. +Color bar for scalar data presentation is supplied. +For 3D presentation window of the current implementation of VTK viewer in study window is used.

+Back to the contents +

4. Data structure

+

Source data for post-processing module can be imported from MED file or MED object in study data structure (CORBA object) can be used for this purposes.

+

In case of import MED file the data from this file will be converted in form of VTK Data Source format and stored in VISU data structure. In case of using of MED object from study the label in VISU data structure will be created with reference to the corresponded MED object.

+

Available result data is displayed under corresponded MED data label. For every result the number of presentations can be created dependently on result type.

+

Presentation is represented in data structure in form of list of presentation creation parameters. This could be:

+
    +
  • Presentation type (table, XY plot, 3d view);
  • +
  • Presentation subtype (for example for 3d: scalar map, iso-surfaces, combined view and so on);
  • +
  • Parameters of the presentation dependently on its type (number of colors, type of scale, font parameters, grid parameters and so on).
  • +
+

Parameters of presentation are persistent data, which will be stored in study file.

+ + +
+Back to the contents +

5. VISU module features and services

+

The functionality of the VISU module is provided by a set of classes which are combined into +the VISU package. +

The API reference of the VISU component can be found here.

+

5.1 Base class

+

This is a root class for all objects of the VISU module.

+

The API reference for this class can be found here.

+ +

5.2 ViewManager class

+

This class is used for management of the view windows (creation and deletion).

+

The API reference for this class can be found here.

+ +

5.3 View class

+

View class is a base for all other classes, necessary for creation of different views .

+ +
+

The API reference for this class can be found here.

+ +

5.3.1 3dView class

+

This class provides a set of methods for creation of a 3d view window.

+

The API reference for this class can be found here.

+ +

5.3.2 TableView class

+

This class provides a set of methods for creation of a Table view window.

+

The API reference for this class can be found here.

+ +

5.3.3 XYPlotView class

+

This class provides a set of methods for creation of a XYPlot view window.

+

The API reference for this class can be found here.

+ +

5.4 Result class

+

This class serves for inner representation of data generated in other sources. +(MED object or file) This data is needed for further construction of graphical presentations.

+

The API reference for this class can be found here.

+

5.5 PrsObject class

+

It is the root class of all presentable objects.

+
+

The API reference for this class can be found here.

+ +

5.5.1 Curve class

+

Manages presentation parameters of one curve. +This object can be used for presentation of set of curves using Container class.

+

The API reference for this class can be found here.

+ +

5.5.2 Table class

+

Manages presentation parameters of a table.

+

The API reference for this class can be found here.

+ +

5.5.3 Container class

+

This class is provided in order to create one presentation using several presentable objects. This can provide combination of a set of curves to display them in XY plot view. +

+

The API reference for this class can be found here.

+ +

5.5.4 Prs3d class

+

Root class for all 3D presentations.

+

The API reference for this class can be found here.

+ +

5.5.5 Mesh class

+

Manages presentation parameters of a 3D presentattion of a mesh. +This object can be used for presentation of set of curves using Container class.

+

The API reference for this class can be found here.

+ +

5.5.6 ScalarMap class

+

Manages presentation parameters of the scalar bar.

+

The API reference for this class can be found here.

+ +

5.5.7 CutLines class

+

Manages presentation parameters of the cut lines presentation.

+

The API reference for this class can be found here.

+ +

5.5.8 CutPlanes class

+

Manages presentation parameters of the cut planes presentation.

+

The API reference for this class can be found here.

+ +

5.5.9 IsoSurfaces class

+

Manages presentation parameters of the iso surfaces presentation.

+

The API reference for this class can be found here.

+ +

5.5.10 DeformedShape class

+

Manages presentation parameters of the deformed shape presentation.

+

The API reference for this class can be found here.

+ +

5.5.11 Vectors class

+

Manages presentation parameters of the vector presentation.

+

The API reference for this class can be found here.

+ +

5.5.12 StreamLines class

+

Manages presentation parameters of the streamlines presentation.

+

The API reference for this class can be found here.

+ +

5.6 Animation class

+

This class provides a set of methods used for:

+
    +
  • generating different animations,
  • +
  • setting the parameters of the animations,
  • +
  • playing these animations in the VISU module.
  • +
+

The API reference for this class can be found here.

+ +

5.7 VISU_Gen class

+

This is the main clas of the VISU component in SALOME application. It is used for , +using the views provided by ViewManager. This class provides a set of methods used for:

+
    +
  • creation of all types of post-processing presentations from given Result and Table object reference
  • +
  • creation of animations
  • + +
+

The API reference for this class can be found here.

+Back to the contents + + diff --git a/idl/Makefile.am b/idl/Makefile.am new file mode 100644 index 00000000..538f127b --- /dev/null +++ b/idl/Makefile.am @@ -0,0 +1,95 @@ +# Copyright (C) 2005 OPEN CASCADE, CEA, EDF R&D, LEG +# PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT +# 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 +# + +# +# 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= VISU_Gen.idl + +EXTRA_DIST+= $(BASEIDL_FILES) + +# This variable defines the files to be installed +salomeidl_DATA = $(BASEIDL_FILES) + +# VISU idl common library +lib_LTLIBRARIES = libSalomeIDLVISU.la + +# Sources built from idl files +nodist_libSalomeIDLVISU_la_SOURCES= VISU_GenSK.cc + +# header files must be exported: other modules have to use this library +nodist_salomeinclude_HEADERS= $(BASEIDL_FILES:%.idl=%.hh) + +libSalomeIDLVISU_la_CPPFLAGS =\ + -I$(top_builddir)/salome_adm/unix \ + -I$(top_builddir)/idl \ + @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ @KERNEL_CXXFLAGS@ @MED_CXXFLAGS@ +libSalomeIDLVISU_la_LDFLAGS = -no-undefined -version-info=0:0:0 +libSalomeIDLVISU_la_LIBADD = @CORBA_LIBS@ $(MED_LDFLAGS) -lSalomeIDLMED + +# 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$(MED_ROOT_DIR)/idl/salome +IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_builddir)/idl/salome -I$(KERNEL_ROOT_DIR)/idl/salome -I$(MED_ROOT_DIR)/idl/salome -I$(top_builddir)/salome_adm/unix +IDLPYFLAGS = @IDLPYFLAGS@ -I$(KERNEL_ROOT_DIR)/idl/salome -I$(MED_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: clean-idls + +clean-idls: + -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$(MED_ROOT_DIR)/idl/salome $$dep 2>/dev/null | \ + sed 's/\.o/\SK.cc/' >>$@; \ + fi; \ + done ; + +-include .depidl diff --git a/idl/Makefile.in b/idl/Makefile.in deleted file mode 100644 index 62487bae..00000000 --- a/idl/Makefile.in +++ /dev/null @@ -1,89 +0,0 @@ -# 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 -# -# -# generate dependencies for idl file : -# - -# source path -top_srcdir=@top_srcdir@ -top_builddir=.. -srcdir=@srcdir@ -VPATH=.:${KERNEL_ROOT_DIR}/idl/salome:${MED_ROOT_DIR}/idl/salome - -@COMMENCE@ - -IDL_FILES = \ - VISU_Gen.idl - -PY_CLIENT_IDL = $(IDL_FILES) - -LIB_LOCATION_SUFFIX=@LIB_LOCATION_SUFFIX@ - -# we copy all idl file in $(top_builddir)/idl -inc: $(top_builddir)/idl/salome $(IDL_FILES:%=$(top_builddir)/idl/salome/%) - -$(top_builddir)/idl/salome: - mkdir $@ - -$(IDL_FILES:%=$(top_builddir)/idl/salome/%):$(IDL_FILES:%=$(top_srcdir)/idl/%) -# $(CP) $< $@ - cp -f $^ $(top_builddir)/idl/salome - - -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: install-pyidl install-idl - -# create directory $(idldir) and copy idl files into it -install-idl: $(IDL_FILES:%=$(top_builddir)/idl/salome/%) - $(INSTALL) -d $(idldir) - $(INSTALL_DATA) $^ $(idldir) - - -install-pyidl: $(IDL_FILES:%=$(top_builddir)/idl/salome/%) - $(INSTALL) -d $(PYTHON_SITE_INSTALL) - @for file in $^ dummy; do \ - if [ $$file != "dummy" ]; then \ - $(OMNIORB_IDL) $(OMNIORB_IDLPYFLAGS) -C$(PYTHON_SITE_INSTALL) $$file ; \ - fi ; \ - done ; - -#@ CONCLUDE @ - -cleandep: - -$(RM) .dep* - -distclean: - -$(RM) *.py - -$(RM) $(IDL_FILES:%=$(top_builddir)/idl/salome/%) - -$(RM) Makefile - diff --git a/idl/VISU_Gen.idl b/idl/VISU_Gen.idl index 334eb42c..bb91c074 100644 --- a/idl/VISU_Gen.idl +++ b/idl/VISU_Gen.idl @@ -741,6 +741,21 @@ module VISU { * Gets the type of orientation of the scalar bar (to provide backward compatibility). */ Orientation GetBarOrientation(); + + /*! + * Add group as geometry of presentation. + * \param theMeshName - mesh name + * \param theGroupName - group name + */ + void AddMeshOnGroup(in string theMeshName, + in string theGroupName); + + + /*! + * PrsMerger method: + * Remove all groups.(The scalar map will be placed on all mesh). + */ + void RemoveAllGeom(); }; //------------------------------------------------------- @@ -790,6 +805,7 @@ module VISU { void SetColor(in SALOMEDS::Color theColor); }; + //------------------------------------------------------- /*! \brief Scalar Map on Deformed shape presentation interface * @@ -818,6 +834,27 @@ module VISU { void SetScalarField(in string theMeshName,in string theFieldName, in long theIteration,in Entity theEntity); + + /*! + * Get scalar iteration number + */ + long GetScalarLIteration(); + + /*! + * Get scalar entity + */ + Entity GetScalarEEntity(); + + /*! + * Get scalar field name + */ + string GetScalarCFieldName(); + + /*! + * Get mesh name + */ + string GetScalarCMeshName(); + }; //------------------------------------------------------- /*! @@ -1158,6 +1195,25 @@ module VISU { * Gets the number of cut lines. */ long GetNbLines(); + + /*! Invert all curves of corresponding table + * \param theInvert - Invert all curves, if value is TRUE, else not. + */ + void SetAllCurvesInverted(in boolean theInvert); + + /*! Checks the orientation of all curves + * \retval TRUE - if all curves are inverted, else FALSE + */ + boolean IsAllCurvesInverted(); + + /*! Sets values which cutlines would be shown: aboslute or relative values + * \param theAbsLength - boolean value, TRUE or false. + */ + void SetUseAbsoluteLength(in boolean theAbsLength); + + /*! Checks values of cutlines: using aboslute or relative values + */ + boolean IsUseAbsoluteLength(); }; /*! \brief Interface of the stream lines representation @@ -1328,10 +1384,21 @@ module VISU { * of calculations are taken in one definite moment. */ interface Animation : Base { + /*! + * This enumeration contains a set of available animation modes. + */ + enum AnimationMode{ PARALLEL, /*!< parallel mode of animation. */ + SUCCCESSIVE /*!< succcessive mode of animation. */ + }; + /*! Defines the field which will be used as a base for generation of the animation. * \param theObject The %SObject corresponding to the field. */ - void addField(in SALOMEDS::SObject theObject); + boolean addField(in SALOMEDS::SObject theObject); + + /*! Remove all fields from Animation object. + */ + void clearFields(); /*! Generates presentations on the basis of the field. * \param theFieldNum The number of the field, which will be used @@ -1496,6 +1563,9 @@ module VISU { */ void setCycling(in boolean theCycle); + boolean isCleaningMemoryAtEachFrame(); + void setCleaningMemoryAtEachFrame(in boolean theCycle); + SALOMEDS::SObject publishInStudy(); void saveAnimation(); @@ -1503,6 +1573,28 @@ module VISU { void restoreFromStudy(in SALOMEDS::SObject theSObj); boolean isSavedInStudy(); + + /*! + * Sets the animation mode. + * \param theMode The value of this parameter is taken from the AnimationMode enumeration. + */ + void setAnimationMode(in AnimationMode theMode); + + /*! + * Gets the animation mode. + */ + AnimationMode getAnimationMode(); + + /*! + * Apply the presentation properties to all fields. The exception is raised in the following cases: + * 1) presentations for the given field is not yet created; + * 2) invalid dynamic cast of the given presentation to VISU::ColoredPrs3d_i; + * 3) the MED file is not the same; + * 4) the mesh name is not the same; + * 5) the field name is not the same; + * 6) the entity is not the same. + */ + void ApplyProperties(in long theFieldNum, in ColoredPrs3d thePrs); }; /*! \brief Interface %Result diff --git a/resources/Makefile.am b/resources/Makefile.am new file mode 100644 index 00000000..5cf88e8c --- /dev/null +++ b/resources/Makefile.am @@ -0,0 +1,113 @@ +# Copyright (C) 2005 OPEN CASCADE, CEA, EDF R&D, LEG +# PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT +# 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 +# +# $Header$ +# + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +# +# =============================================================== +# Files to be installed +# =============================================================== +# + +dist_salomeres_DATA= \ +ModuleVisu.png \ +SalomeApp.xml \ +sprite_alpha.bmp \ +sprite_texture.bmp \ +Vertex_Program_ARB.txt \ +Visu_add.png \ +Visu_anim.png \ +VISU.config \ +Visu_cutlines.png \ +Visu_cutplane.png \ +Visu_cutplanes.png \ +Visu_deformed_anim.png \ +Visu_deformed.png \ +VISU_en.xml \ +Visu_eraseall.png \ +VISU_fr.xml \ +Visu_gauss_points.png \ +Visu_graduated_axes.png \ +Visu_import_med.png \ +Visu_isosurfaces.png \ +Visu_load_texture.png \ +Visu_PlaneSegmentation.png \ +Visu_plot2d.png \ +Visu_plot3d.png \ +Visu_points.png \ +Visu_recording_pause.png \ +Visu_recording_play.png \ +Visu_recording_start.png \ +Visu_recording_stop.png \ +Visu_remove.png \ +Visu_sameas.png \ +Visu_scalarmapondeformedshape.png \ +Visu_scalars_anim.png \ +Visu_scalars.png \ +Visu_scaling.png \ +Visu_selectall.png \ +Visu_selectionactor.png \ +Visu_selectioncell.png \ +Visu_selectionedge.png \ +Visu_selectionpoint.png \ +Visu_selectonly.png \ +Visu_SphereSegmentation.png \ +Visu_streamlines.png \ +Visu_surface.png \ +Visu_tree_container.png \ +Visu_tree_curve.png \ +Visu_tree_cutlines_gr.png \ +Visu_tree_cutlines.png \ +Visu_tree_cutplanes_gr.png \ +Visu_tree_cutplanes.png \ +Visu_tree_deformed_gr.png \ +Visu_tree_deformed.png \ +Visu_tree_gauss_points.png \ +Visu_tree_isosurfaces_gr.png \ +Visu_tree_isosurfaces.png \ +Visu_tree_mesh.png \ +Visu_tree_plot3d_gr.png \ +Visu_tree_plot3d.png \ +Visu_tree_result.png \ +Visu_tree_scalarmapondeformedshape_gr.png \ +Visu_tree_scalarmapondeformedshape.png \ +Visu_tree_scalars_gr.png \ +Visu_tree_scalars.png \ +Visu_tree_streamlines_gr.png \ +Visu_tree_streamlines.png \ +Visu_tree_table.png \ +Visu_tree_vectors_gr.png \ +Visu_tree_vectors.png \ +Visu_tree_visu.png \ +Visu_vectors.png \ +Visu_vvtk_switch.png \ +Visu_wireframe.png \ +Visu_slider_more.png \ +Visu_slider_avi.png \ +Visu_slider_first.png \ +Visu_slider_previous.png \ +Visu_slider_play.png \ +Visu_slider_pause.png \ +Visu_slider_next.png \ +Visu_slider_last.png + +EXTRA_DIST+= VISUCatalog.xml.in +nodist_salomeres_DATA=VISUCatalog.xml diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml index a278866a..236affb8 100644 --- a/resources/SalomeApp.xml +++ b/resources/SalomeApp.xml @@ -4,8 +4,14 @@ - - + + + + + + + + @@ -48,6 +54,10 @@ + + + + diff --git a/resources/Visu_add.png b/resources/Visu_add.png new file mode 100644 index 00000000..a7e93b8e Binary files /dev/null and b/resources/Visu_add.png differ diff --git a/resources/Visu_cutplanes.png b/resources/Visu_cutplanes.png new file mode 100644 index 00000000..5e92cf65 Binary files /dev/null and b/resources/Visu_cutplanes.png differ diff --git a/resources/Visu_remove.png b/resources/Visu_remove.png new file mode 100644 index 00000000..e85afb62 Binary files /dev/null and b/resources/Visu_remove.png differ diff --git a/resources/Visu_tree_container.png b/resources/Visu_tree_container.png new file mode 100644 index 00000000..40aa4d33 Binary files /dev/null and b/resources/Visu_tree_container.png differ diff --git a/resources/Visu_tree_curve.png b/resources/Visu_tree_curve.png new file mode 100644 index 00000000..e17c5f4f Binary files /dev/null and b/resources/Visu_tree_curve.png differ diff --git a/resources/Visu_tree_cutlines.png b/resources/Visu_tree_cutlines.png new file mode 100755 index 00000000..f6ffc7cf Binary files /dev/null and b/resources/Visu_tree_cutlines.png differ diff --git a/resources/Visu_tree_cutlines_gr.png b/resources/Visu_tree_cutlines_gr.png new file mode 100644 index 00000000..fc35bc8a Binary files /dev/null and b/resources/Visu_tree_cutlines_gr.png differ diff --git a/resources/Visu_tree_cutplanes.png b/resources/Visu_tree_cutplanes.png new file mode 100755 index 00000000..1d93c8a8 Binary files /dev/null and b/resources/Visu_tree_cutplanes.png differ diff --git a/resources/Visu_tree_cutplanes_gr.png b/resources/Visu_tree_cutplanes_gr.png new file mode 100644 index 00000000..bbc47272 Binary files /dev/null and b/resources/Visu_tree_cutplanes_gr.png differ diff --git a/resources/Visu_tree_deformed.png b/resources/Visu_tree_deformed.png new file mode 100755 index 00000000..68d27823 Binary files /dev/null and b/resources/Visu_tree_deformed.png differ diff --git a/resources/Visu_tree_deformed_gr.png b/resources/Visu_tree_deformed_gr.png new file mode 100644 index 00000000..1d619f4f Binary files /dev/null and b/resources/Visu_tree_deformed_gr.png differ diff --git a/resources/Visu_tree_gauss_points.png b/resources/Visu_tree_gauss_points.png new file mode 100644 index 00000000..7eca580e Binary files /dev/null and b/resources/Visu_tree_gauss_points.png differ diff --git a/resources/Visu_tree_isosurfaces.png b/resources/Visu_tree_isosurfaces.png new file mode 100755 index 00000000..0229c7a7 Binary files /dev/null and b/resources/Visu_tree_isosurfaces.png differ diff --git a/resources/Visu_tree_isosurfaces_gr.png b/resources/Visu_tree_isosurfaces_gr.png new file mode 100644 index 00000000..e5a4d465 Binary files /dev/null and b/resources/Visu_tree_isosurfaces_gr.png differ diff --git a/resources/Visu_tree_mesh.png b/resources/Visu_tree_mesh.png new file mode 100644 index 00000000..0ff21871 Binary files /dev/null and b/resources/Visu_tree_mesh.png differ diff --git a/resources/Visu_tree_plot3d.png b/resources/Visu_tree_plot3d.png new file mode 100755 index 00000000..ac644250 Binary files /dev/null and b/resources/Visu_tree_plot3d.png differ diff --git a/resources/Visu_tree_plot3d_gr.png b/resources/Visu_tree_plot3d_gr.png new file mode 100644 index 00000000..e73180bc Binary files /dev/null and b/resources/Visu_tree_plot3d_gr.png differ diff --git a/resources/Visu_tree_result.png b/resources/Visu_tree_result.png new file mode 100644 index 00000000..a9eccf9e Binary files /dev/null and b/resources/Visu_tree_result.png differ diff --git a/resources/Visu_tree_scalarmapondeformedshape.png b/resources/Visu_tree_scalarmapondeformedshape.png new file mode 100755 index 00000000..77c346c6 Binary files /dev/null and b/resources/Visu_tree_scalarmapondeformedshape.png differ diff --git a/resources/Visu_tree_scalarmapondeformedshape_gr.png b/resources/Visu_tree_scalarmapondeformedshape_gr.png new file mode 100644 index 00000000..d2f73eb0 Binary files /dev/null and b/resources/Visu_tree_scalarmapondeformedshape_gr.png differ diff --git a/resources/Visu_tree_scalars.png b/resources/Visu_tree_scalars.png new file mode 100755 index 00000000..d0c93c58 Binary files /dev/null and b/resources/Visu_tree_scalars.png differ diff --git a/resources/Visu_tree_scalars_gr.png b/resources/Visu_tree_scalars_gr.png new file mode 100644 index 00000000..d9a018a0 Binary files /dev/null and b/resources/Visu_tree_scalars_gr.png differ diff --git a/resources/Visu_tree_streamlines.png b/resources/Visu_tree_streamlines.png new file mode 100755 index 00000000..c0213de3 Binary files /dev/null and b/resources/Visu_tree_streamlines.png differ diff --git a/resources/Visu_tree_streamlines_gr.png b/resources/Visu_tree_streamlines_gr.png new file mode 100644 index 00000000..8f1a62a8 Binary files /dev/null and b/resources/Visu_tree_streamlines_gr.png differ diff --git a/resources/Visu_tree_table.png b/resources/Visu_tree_table.png new file mode 100644 index 00000000..90799f69 Binary files /dev/null and b/resources/Visu_tree_table.png differ diff --git a/resources/Visu_tree_vectors.png b/resources/Visu_tree_vectors.png new file mode 100755 index 00000000..5ff8c7bf Binary files /dev/null and b/resources/Visu_tree_vectors.png differ diff --git a/resources/Visu_tree_vectors_gr.png b/resources/Visu_tree_vectors_gr.png new file mode 100644 index 00000000..3a7e1142 Binary files /dev/null and b/resources/Visu_tree_vectors_gr.png differ diff --git a/src/CONVERTOR/VISU_AppendFilterUtilities.cxx b/src/CONVERTOR/VISU_AppendFilterUtilities.cxx index 3ca1aebe..c7a7d13e 100644 --- a/src/CONVERTOR/VISU_AppendFilterUtilities.cxx +++ b/src/CONVERTOR/VISU_AppendFilterUtilities.cxx @@ -27,6 +27,7 @@ // $Header$ #include "VISU_AppendFilterUtilities.hxx" +#include "VISU_ConvertorUtils.hxx" #include #include @@ -165,27 +166,6 @@ namespace }; - //--------------------------------------------------------------- - vtkDataSet* - GetInput(vtkInformationVector **theInputVector, - vtkIdType theId) - { - if(vtkInformation* anInformation = theInputVector[0]->GetInformationObject(theId)) - return vtkDataSet::SafeDownCast(anInformation->Get(vtkDataObject::DATA_OBJECT())); - return NULL; - } - - - //--------------------------------------------------------------- - vtkDataSet* - GetOutput(vtkInformationVector *theOutputVector) - { - if(vtkInformation* anInformation = theOutputVector->GetInformationObject(0)) - return vtkDataSet::SafeDownCast(anInformation->Get(vtkDataObject::DATA_OBJECT())); - return NULL; - } - - //--------------------------------------------------------------- template void @@ -194,7 +174,7 @@ namespace TFunctor& theFunctor) { for(vtkIdType anInputId = 0; anInputId < theNumberOfInputConnections; anInputId++) - if(vtkDataSet *aDataSet = GetInput(theInputVector, anInputId)) + if(vtkDataSet *aDataSet = VISU::GetInput(theInputVector, anInputId)) if(aDataSet->GetNumberOfPoints() > 0 && aDataSet->GetNumberOfCells() > 0) theFunctor(anInputId, aDataSet); } @@ -215,7 +195,7 @@ namespace if(aPoints->GetNumberOfPoints() < 1) return true; - TDataSet* anOutput = TDataSet::SafeDownCast(GetOutput(theOutputVector)); + TDataSet* anOutput = TDataSet::SafeDownCast(VISU::GetOutput(theOutputVector)); vtkIdType anNbInputs = theNumberOfInputConnections; if(theIsMergingInputs){ TCellIdMerger aFunctor(anNbInputs); @@ -246,7 +226,7 @@ namespace //TObjectId anObjectId = anIter->first; const TInputCellId& anInputCellId = anIter->second; TInputId anInputId = anInputCellId.first; - if(vtkDataSet *aDataSet = GetInput(theInputVector, anInputId)){ + if(vtkDataSet *aDataSet = VISU::GetInput(theInputVector, anInputId)){ TCellId aCellId = anInputCellId.second; aDataSet->GetCellPoints(aCellId, anIdList); @@ -302,7 +282,7 @@ namespace vtkIdList *anIdList = vtkIdList::New(); anIdList->Allocate(VTK_CELL_SIZE); for(vtkIdType anInputId = 0; anInputId < anNbInputs; anInputId++){ - if(vtkDataSet *aDataSet = GetInput(theInputVector, anInputId)){ + if(vtkDataSet *aDataSet = VISU::GetInput(theInputVector, anInputId)){ vtkIdType aNbCells = aDataSet->GetNumberOfCells(); vtkCellData *aCellData = aDataSet->GetCellData(); // copy cell and cell data @@ -326,7 +306,7 @@ namespace vtkIdType aTupleId = 0; for(vtkIdType anInputId = 0; anInputId < anNbInputs; anInputId++){ - if(vtkDataSet *aDataSet = GetInput(theInputVector, anInputId)){ + if(vtkDataSet *aDataSet = VISU::GetInput(theInputVector, anInputId)){ vtkIdType aNbCells = aDataSet->GetNumberOfCells(); for(vtkIdType aCellId = 0; aCellId < aNbCells; aCellId++){ aDataArray->SetValue(aTupleId++, anInputId); diff --git a/src/CONVERTOR/VISU_ConvertorUtils.cxx b/src/CONVERTOR/VISU_ConvertorUtils.cxx index 8af6521e..88a703b1 100644 --- a/src/CONVERTOR/VISU_ConvertorUtils.cxx +++ b/src/CONVERTOR/VISU_ConvertorUtils.cxx @@ -34,6 +34,10 @@ #include #include +#include +#include +#include + #include #include #include @@ -339,6 +343,27 @@ namespace VISU } + //--------------------------------------------------------------- + vtkDataSet* + GetInput(vtkInformationVector **theInputVector, + vtkIdType theInputId) + { + if(vtkInformation* anInformation = theInputVector[0]->GetInformationObject(theInputId)) + return vtkDataSet::SafeDownCast(anInformation->Get(vtkDataObject::DATA_OBJECT())); + return NULL; + } + + + //--------------------------------------------------------------- + vtkDataSet* + GetOutput(vtkInformationVector *theOutputVector) + { + if(vtkInformation* anInformation = theOutputVector->GetInformationObject(0)) + return vtkDataSet::SafeDownCast(anInformation->Get(vtkDataObject::DATA_OBJECT())); + return NULL; + } + + //--------------------------------------------------------------- TTimerLog ::TTimerLog(int theIsDebug, diff --git a/src/CONVERTOR/VISU_ConvertorUtils.hxx b/src/CONVERTOR/VISU_ConvertorUtils.hxx index bcf97735..f2e04fde 100644 --- a/src/CONVERTOR/VISU_ConvertorUtils.hxx +++ b/src/CONVERTOR/VISU_ConvertorUtils.hxx @@ -37,6 +37,7 @@ #include +class vtkInformationVector; class vtkUnstructuredGrid; class vtkPolyData; class vtkTimerLog; @@ -134,6 +135,15 @@ namespace VISU GetInputCellID(vtkDataSet *theDataSet, vtkIdType theObjID); + VISU_CONVERTOR_EXPORT + vtkDataSet* + GetInput(vtkInformationVector **theInputVector, + vtkIdType theInputId = 0); + + VISU_CONVERTOR_EXPORT + vtkDataSet* + GetOutput(vtkInformationVector *theOutputVector); + //--------------------------------------------------------------- //! The utility class that allows to perform perfomance mesurement class VISU_CONVERTOR_EXPORT TTimerLog diff --git a/src/CONVERTOR/VISU_MergeFilter.cxx b/src/CONVERTOR/VISU_MergeFilter.cxx index 5a549c6c..dd12d509 100644 --- a/src/CONVERTOR/VISU_MergeFilter.cxx +++ b/src/CONVERTOR/VISU_MergeFilter.cxx @@ -33,94 +33,139 @@ #include #include +#include +#include +#include +#include + //------------------------------------------------------------------------------ vtkStandardNewMacro(VISU_MergeFilter); //------------------------------------------------------------------------------ - -// Create object with no input or output. -VISU_MergeFilter::VISU_MergeFilter(): +VISU_MergeFilter +::VISU_MergeFilter(): myIsMergingInputs(false) { this->FieldList = new VISU::TFieldList; + this->SetNumberOfInputPorts(6); } +//------------------------------------------------------------------------------ VISU_MergeFilter::~VISU_MergeFilter() { delete this->FieldList; } +//------------------------------------------------------------------------------ +void VISU_MergeFilter::SetGeometry(vtkDataSet *input) +{ + this->Superclass::SetInput(input); +} + +//------------------------------------------------------------------------------ +vtkDataSet *VISU_MergeFilter::GetGeometry() +{ + if (this->GetNumberOfInputConnections(0) < 1) + { + return NULL; + } + return vtkDataSet::SafeDownCast( + this->GetExecutive()->GetInputData(0, 0)); +} + +//------------------------------------------------------------------------------ void VISU_MergeFilter::SetScalars(vtkDataSet *input) { - this->vtkProcessObject::SetNthInput(1, input); + this->SetInput(1, input); } + +//------------------------------------------------------------------------------ vtkDataSet *VISU_MergeFilter::GetScalars() { - if (this->NumberOfInputs < 2) + if (this->GetNumberOfInputConnections(1) < 1) { return NULL; } - return (vtkDataSet *)(this->Inputs[1]); + return vtkDataSet::SafeDownCast( + this->GetExecutive()->GetInputData(1, 0)); } +//------------------------------------------------------------------------------ void VISU_MergeFilter::SetVectors(vtkDataSet *input) { - this->vtkProcessObject::SetNthInput(2, input); + this->SetInput(2, input); } + +//------------------------------------------------------------------------------ vtkDataSet *VISU_MergeFilter::GetVectors() { - if (this->NumberOfInputs < 3) + if (this->GetNumberOfInputConnections(2) < 1) { return NULL; } - return (vtkDataSet *)(this->Inputs[2]); + return vtkDataSet::SafeDownCast( + this->GetExecutive()->GetInputData(2, 0)); } +//------------------------------------------------------------------------------ void VISU_MergeFilter::SetNormals(vtkDataSet *input) { - this->vtkProcessObject::SetNthInput(3, input); + this->SetInput(3, input); } + +//------------------------------------------------------------------------------ vtkDataSet *VISU_MergeFilter::GetNormals() { - if (this->NumberOfInputs < 4) + if (this->GetNumberOfInputConnections(3) < 1) { return NULL; } - return (vtkDataSet *)(this->Inputs[3]); + return vtkDataSet::SafeDownCast( + this->GetExecutive()->GetInputData(3, 0)); } +//------------------------------------------------------------------------------ void VISU_MergeFilter::SetTCoords(vtkDataSet *input) { - this->vtkProcessObject::SetNthInput(4, input); + this->SetInput(4, input); } + +//------------------------------------------------------------------------------ vtkDataSet *VISU_MergeFilter::GetTCoords() { - if (this->NumberOfInputs < 5) + if (this->GetNumberOfInputConnections(4) < 1) { return NULL; } - return (vtkDataSet *)(this->Inputs[4]); + return vtkDataSet::SafeDownCast( + this->GetExecutive()->GetInputData(4, 0)); } +//------------------------------------------------------------------------------ void VISU_MergeFilter::SetTensors(vtkDataSet *input) { - this->vtkProcessObject::SetNthInput(5, input); + this->SetInput(5, input); } + +//------------------------------------------------------------------------------ vtkDataSet *VISU_MergeFilter::GetTensors() { - if (this->NumberOfInputs < 6) + if (this->GetNumberOfInputConnections(5) < 1) { return NULL; } - return (vtkDataSet *)(this->Inputs[5]); + return vtkDataSet::SafeDownCast( + this->GetExecutive()->GetInputData(5, 0)); } +//------------------------------------------------------------------------------ void VISU_MergeFilter::AddField(const char* name, vtkDataSet* input) { this->FieldList->Add(name, input); } +//------------------------------------------------------------------------------ void VISU_MergeFilter::RemoveFields() { delete this->FieldList; @@ -151,33 +196,84 @@ VISU_MergeFilter //--------------------------------------------------------------- -void +int VISU_MergeFilter -::Execute() +::RequestData(vtkInformation *theRequest, + vtkInformationVector **theInputVector, + vtkInformationVector *theOutputVector) { if(vtkUnstructuredGrid *anInput = dynamic_cast(this->GetInput())){ vtkUnstructuredGrid *anOutput = dynamic_cast(this->GetOutput()); - VISU::Execute(anInput, - anOutput, - this->GetScalars(), - this->GetVectors(), - this->GetNormals(), - this->GetTCoords(), - this->GetTensors(), - this->FieldList, - IsMergingInputs()); + return VISU::Execute(anInput, + anOutput, + this->GetScalars(), + this->GetVectors(), + this->GetNormals(), + this->GetTCoords(), + this->GetTensors(), + this->FieldList, + IsMergingInputs()); }else if(vtkPolyData *anInput = dynamic_cast(this->GetInput())){ vtkPolyData *anOutput = dynamic_cast(this->GetOutput()); - VISU::Execute(anInput, - anOutput, - this->GetScalars(), - this->GetVectors(), - this->GetNormals(), - this->GetTCoords(), - this->GetTensors(), - this->FieldList, - IsMergingInputs()); + return VISU::Execute(anInput, + anOutput, + this->GetScalars(), + this->GetVectors(), + this->GetNormals(), + this->GetTCoords(), + this->GetTensors(), + this->FieldList, + IsMergingInputs()); } - Superclass::Execute(); + return Superclass::RequestData(theRequest, + theInputVector, + theOutputVector); +} + +//---------------------------------------------------------------------------- +// Trick: Abstract data types that may or may not be the same type +// (structured/unstructured), but the points/cells match up. +// Output/Geometry may be structured while ScalarInput may be +// unstructured (but really have same triagulation/topology as geometry). +// Just request all the input. Always generate all of the output (todo). +int +VISU_MergeFilter +::RequestUpdateExtent(vtkInformation *vtkNotUsed(request), + vtkInformationVector **inputVector, + vtkInformationVector *vtkNotUsed(outputVector)) +{ + vtkInformation *inputInfo; + int idx; + + for (idx = 0; idx < 6; ++idx) + { + inputInfo = inputVector[idx]->GetInformationObject(0); + if (inputInfo) + { + inputInfo->Set(vtkStreamingDemandDrivenPipeline::UPDATE_PIECE_NUMBER(), + 0); + inputInfo->Set(vtkStreamingDemandDrivenPipeline::UPDATE_NUMBER_OF_PIECES(), + 1); + inputInfo->Set(vtkStreamingDemandDrivenPipeline::UPDATE_NUMBER_OF_GHOST_LEVELS(), + 0); + inputInfo->Set(vtkStreamingDemandDrivenPipeline::EXACT_EXTENT(), 1); + } + } + return 1; +} + + +//---------------------------------------------------------------------------- +int +VISU_MergeFilter +::FillInputPortInformation(int port, vtkInformation *info) +{ + int retval = this->Superclass::FillInputPortInformation(port, info); + if (port > 0) + { + info->Set(vtkAlgorithm::INPUT_IS_OPTIONAL(), 1); + } + return retval; } + diff --git a/src/CONVERTOR/VISU_MergeFilter.hxx b/src/CONVERTOR/VISU_MergeFilter.hxx index 35233f51..26a31a5e 100644 --- a/src/CONVERTOR/VISU_MergeFilter.hxx +++ b/src/CONVERTOR/VISU_MergeFilter.hxx @@ -29,7 +29,9 @@ #ifndef VISU_MergeFilter_H #define VISU_MergeFilter_H -#include +#include "VISU_Convertor.hxx" + +#include namespace VISU { @@ -37,16 +39,17 @@ namespace VISU } -class VISU_MergeFilter : public vtkDataSetToDataSetFilter +//------------------------------------------------------------------------------ +class VISU_CONVERTOR_EXPORT VISU_MergeFilter : public vtkDataSetAlgorithm { public: static VISU_MergeFilter *New(); - vtkTypeMacro(VISU_MergeFilter, vtkDataSetToDataSetFilter); + vtkTypeMacro(VISU_MergeFilter, vtkDataSetAlgorithm); // Description: // Specify object from which to extract geometry information. - void SetGeometry(vtkDataSet *input) {this->SetInput(input);}; - vtkDataSet *GetGeometry() {return this->GetInput();}; + void SetGeometry(vtkDataSet *input); + vtkDataSet *GetGeometry(); // Description: // Specify object from which to extract scalar information. @@ -96,8 +99,15 @@ protected: VISU_MergeFilter(); ~VISU_MergeFilter(); - // Usual data generation method - void Execute(); + virtual + int + RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *); + + int + RequestUpdateExtent(vtkInformation *, vtkInformationVector **, vtkInformationVector *); + + int + FillInputPortInformation(int port, vtkInformation *info); VISU::TFieldList* FieldList; bool myIsMergingInputs; diff --git a/src/CONVERTOR/VISU_MergeFilterUtilities.cxx b/src/CONVERTOR/VISU_MergeFilterUtilities.cxx index e92c388f..585e7e0e 100644 --- a/src/CONVERTOR/VISU_MergeFilterUtilities.cxx +++ b/src/CONVERTOR/VISU_MergeFilterUtilities.cxx @@ -448,6 +448,51 @@ namespace } + //--------------------------------------------------------------- + struct TGetCellData + { + vtkFieldData* + operator()(vtkDataSet* theDataSet) + { + return theDataSet->GetCellData(); + } + }; + + + //--------------------------------------------------------------- + struct TGetPointData + { + vtkFieldData* + operator()(vtkDataSet* theDataSet) + { + return theDataSet->GetPointData(); + } + }; + + + //--------------------------------------------------------------- + typedef vtkFieldData* (vtkDataSet::* TGetFieldData)(); + + template + vtkIntArray* + GetIDMapper(VISU::TFieldList* theFieldList, + TGetFieldData theGetFieldData, + const char* theFieldName) + { + VISU::TFieldListIterator anIter(theFieldList); + for(anIter.Begin(); !anIter.End() ; anIter.Next()){ + const char* aFieldName = anIter.Get()->GetName(); + if(strcmp(aFieldName, theFieldName) == 0){ + vtkDataSet* aDataSet = anIter.Get()->Ptr; + vtkFieldData *aFieldData = theGetFieldData(aDataSet); + vtkDataArray *anIDMapper = aFieldData->GetArray(aFieldName); + return dynamic_cast(anIDMapper); + } + } + return NULL; + } + + //--------------------------------------------------------------- template bool @@ -461,180 +506,180 @@ namespace VISU::TFieldList* theFieldList, bool theIsMergingInputs) { - vtkPointData *aPointData = theInput->GetPointData(); - int nbPointsInScalars = theScalarsDataSet->GetNumberOfPoints(); - int nbPointsInGeometr = theInput->GetNumberOfPoints(); vtkCellData *aCellData = theInput->GetCellData(); - - vtkDataArray *aPointMapper = aPointData->GetArray("VISU_POINTS_MAPPER"); - vtkIntArray *aGeometryPointMapper = dynamic_cast(aPointMapper); - vtkDataArray *aCellMapper = aCellData->GetArray("VISU_CELLS_MAPPER"); - vtkIntArray *aGeometryCellMapper = dynamic_cast(aCellMapper); - if(aGeometryCellMapper && (nbPointsInScalars == nbPointsInGeometr)){ - vtkIntArray* aDataCellMapper = NULL; - VISU::TFieldListIterator anIter(theFieldList); - for(anIter.Begin(); !anIter.End() ; anIter.Next()){ - vtkCellData *aCellData = anIter.Get()->Ptr->GetCellData(); - const char* aFieldName = anIter.Get()->GetName(); - if(strcmp(aFieldName, "VISU_CELLS_MAPPER") == 0){ - vtkDataArray *aCellMapper_tmp = aCellData->GetArray(aFieldName); - aDataCellMapper = dynamic_cast(aCellMapper_tmp); - break; - } - } - - bool anIsDifferent = aDataCellMapper && - aDataCellMapper->GetNumberOfTuples() != aGeometryCellMapper->GetNumberOfTuples(); - if(anIsDifferent || theIsMergingInputs){ - TSortedArray aGeometryCellArray; - GetSortedArray(aGeometryCellMapper, aGeometryCellArray); - - TSortedArray aDataCellArray; - GetSortedArray(aDataCellMapper, aDataCellArray); - - int aMaxLength = std::max(aGeometryCellArray.size(), aDataCellArray.size()); - TSortedArray anIntersectionArray(aMaxLength); - TSortedArray::iterator anArrayIter = anIntersectionArray.begin(); - anArrayIter = std::set_intersection(aGeometryCellArray.begin(), - aGeometryCellArray.end(), - aDataCellArray.begin(), - aDataCellArray.end(), - anArrayIter); - - anIntersectionArray.erase(anArrayIter, anIntersectionArray.end()); - - bool anIsCompletelyCoincide = - anIntersectionArray.size() == aGeometryCellArray.size() && - anIntersectionArray.size() == aDataCellArray.size(); - - if(!anIsCompletelyCoincide || theIsMergingInputs){ - { - TId2IdMap anObj2VTKGeometryMap; - vtkIdType aNbCells = aGeometryCellMapper->GetNumberOfTuples(); - for(int aCellId = 0; aCellId < aNbCells; aCellId++){ - vtkIdType anObjID = aGeometryCellMapper->GetValue(aCellId); - anObj2VTKGeometryMap[anObjID] = aCellId; - } - - vtkIdType aNbTuples = anIntersectionArray.size(); - theOutput->Allocate(aNbTuples); - vtkIdList *aCellIds = vtkIdList::New(); - for(int aTupleId = 0; aTupleId < aNbTuples; aTupleId++){ - vtkIdType anObjID = anIntersectionArray[aTupleId]; - vtkIdType aCellId = anObj2VTKGeometryMap[anObjID]; - vtkCell *aCell = theInput->GetCell(aCellId); - aCellIds->Reset(); - vtkIdType aNbPointIds = aCell->PointIds->GetNumberOfIds(); - for(vtkIdType aPointId = 0; aPointId < aNbPointIds; aPointId++) - aCellIds->InsertNextId(aCell->GetPointIds()->GetId(aPointId)); - theOutput->InsertNextCell(theInput->GetCellType(aCellId), aCellIds); + if(vtkDataArray *aCellMapper = aCellData->GetArray("VISU_CELLS_MAPPER")){ + vtkIntArray *aGeometryCellMapper = dynamic_cast(aCellMapper); + vtkIdType aGeomNbCells = aGeometryCellMapper->GetNumberOfTuples(); + + vtkPointData *aPointData = theInput->GetPointData(); + vtkDataArray *aPointMapper = aPointData->GetArray("VISU_POINTS_MAPPER"); + vtkIntArray *aGeometryPointMapper = dynamic_cast(aPointMapper); + vtkIdType aGeomNbPoints = aGeometryPointMapper->GetNumberOfTuples(); + + + vtkIntArray* aDataPointMapper = GetIDMapper(theFieldList, + TGetPointData(), + "VISU_POINTS_MAPPER"); + vtkIdType aDataNbPoints = aDataPointMapper->GetNumberOfTuples(); + + vtkIntArray* aDataCellMapper = GetIDMapper(theFieldList, + TGetCellData(), + "VISU_CELLS_MAPPER"); + vtkIdType aDataNbCells = aDataCellMapper->GetNumberOfTuples(); + + if(aDataNbPoints == aGeomNbPoints){ + bool anIsDifferent = aDataCellMapper && aDataNbCells != aGeomNbCells; + if(anIsDifferent || theIsMergingInputs){ + TSortedArray aGeometryCellArray; + GetSortedArray(aGeometryCellMapper, aGeometryCellArray); + + TSortedArray aDataCellArray; + GetSortedArray(aDataCellMapper, aDataCellArray); + + int aMaxLength = std::max(aGeometryCellArray.size(), aDataCellArray.size()); + TSortedArray anIntersectionArray(aMaxLength); + TSortedArray::iterator anArrayIter = anIntersectionArray.begin(); + anArrayIter = std::set_intersection(aGeometryCellArray.begin(), + aGeometryCellArray.end(), + aDataCellArray.begin(), + aDataCellArray.end(), + anArrayIter); + + anIntersectionArray.erase(anArrayIter, anIntersectionArray.end()); + + bool anIsCompletelyCoincide = + anIntersectionArray.size() == aGeometryCellArray.size() && + anIntersectionArray.size() == aDataCellArray.size(); + + if(!anIsCompletelyCoincide || theIsMergingInputs){ + { + TId2IdMap anObj2VTKGeometryMap; + vtkIdType aNbCells = aGeometryCellMapper->GetNumberOfTuples(); + for(int aCellId = 0; aCellId < aNbCells; aCellId++){ + vtkIdType anObjID = aGeometryCellMapper->GetValue(aCellId); + anObj2VTKGeometryMap[anObjID] = aCellId; + } + + vtkIdType aNbTuples = anIntersectionArray.size(); + theOutput->Allocate(aNbTuples); + vtkIdList *aCellIds = vtkIdList::New(); + for(int aTupleId = 0; aTupleId < aNbTuples; aTupleId++){ + vtkIdType anObjID = anIntersectionArray[aTupleId]; + vtkIdType aCellId = anObj2VTKGeometryMap[anObjID]; + vtkCell *aCell = theInput->GetCell(aCellId); + aCellIds->Reset(); + vtkIdType aNbPointIds = aCell->PointIds->GetNumberOfIds(); + for(vtkIdType aPointId = 0; aPointId < aNbPointIds; aPointId++) + aCellIds->InsertNextId(aCell->GetPointIds()->GetId(aPointId)); + theOutput->InsertNextCell(theInput->GetCellType(aCellId), aCellIds); + } + aCellIds->Delete(); + theOutput->SetPoints(theInput->GetPoints()); } - aCellIds->Delete(); - theOutput->SetPoints(theInput->GetPoints()); - } - { - TId2IdMap anObj2VTKDataMap; - vtkIdType aNbCells = aDataCellMapper->GetNumberOfTuples(); - for(int aCellId = 0; aCellId < aNbCells; aCellId++){ - vtkIdType anObjID = aDataCellMapper->GetValue(aCellId); - anObj2VTKDataMap[anObjID] = aCellId; + { + TId2IdMap anObj2VTKDataMap; + vtkIdType aNbCells = aDataCellMapper->GetNumberOfTuples(); + for(int aCellId = 0; aCellId < aNbCells; aCellId++){ + vtkIdType anObjID = aDataCellMapper->GetValue(aCellId); + anObj2VTKDataMap[anObjID] = aCellId; + } + + DeepCopyDataSetAttributes(theOutput, + theScalarsDataSet, + theVectorsDataSet, + theNormalsDataSet, + theTCoordsDataSet, + theTensorsDataSet, + theFieldList, + anIntersectionArray, + anObj2VTKDataMap); } - - DeepCopyDataSetAttributes(theOutput, - theScalarsDataSet, - theVectorsDataSet, - theNormalsDataSet, - theTCoordsDataSet, - theTensorsDataSet, - theFieldList, - anIntersectionArray, - anObj2VTKDataMap); + return true; } - return true; } - } - }else if(aGeometryCellMapper && (nbPointsInScalars < nbPointsInGeometr)){ - vtkIntArray* aDataPointMapper = NULL; - vtkPointData* aInputScalarsPointData = theScalarsDataSet->GetPointData(); - VISU::TFieldListIterator anIter(theFieldList); - for(anIter.Begin(); !anIter.End() ; anIter.Next()){ - const char* aFieldName = anIter.Get()->GetName(); - if(strcmp(aFieldName, "VISU_POINTS_MAPPER") == 0){ - vtkDataArray *aPointMapper = aInputScalarsPointData->GetArray(aFieldName); - aDataPointMapper = dynamic_cast(aPointMapper); - break; + }else if(aDataNbPoints < aGeomNbPoints){ + vtkIntArray* aDataPointMapper = NULL; + vtkPointData* aInputScalarsPointData = theScalarsDataSet->GetPointData(); + VISU::TFieldListIterator anIter(theFieldList); + for(anIter.Begin(); !anIter.End() ; anIter.Next()){ + const char* aFieldName = anIter.Get()->GetName(); + if(strcmp(aFieldName, "VISU_POINTS_MAPPER") == 0){ + vtkDataArray *aPointMapper = aInputScalarsPointData->GetArray(aFieldName); + aDataPointMapper = dynamic_cast(aPointMapper); + break; + } } - } - vtkIntArray* aDataCellMapper = NULL; - VISU::TFieldListIterator anIter2(theFieldList); - for(anIter2.Begin(); !anIter2.End() ; anIter2.Next()){ - const char* aFieldName = anIter2.Get()->GetName(); - if(strcmp(aFieldName, "VISU_CELLS_MAPPER") == 0){ - vtkDataArray *aCellMapper_tmp = aInputScalarsPointData->GetArray(aFieldName); - aDataCellMapper = dynamic_cast(aCellMapper_tmp); - break; + vtkIntArray* aDataCellMapper = NULL; + VISU::TFieldListIterator anIter2(theFieldList); + for(anIter2.Begin(); !anIter2.End() ; anIter2.Next()){ + const char* aFieldName = anIter2.Get()->GetName(); + if(strcmp(aFieldName, "VISU_CELLS_MAPPER") == 0){ + vtkDataArray *aCellMapper_tmp = aInputScalarsPointData->GetArray(aFieldName); + aDataCellMapper = dynamic_cast(aCellMapper_tmp); + break; + } } - } - - bool anIsDifferent = aDataPointMapper && - aDataPointMapper->GetNumberOfTuples() != aGeometryPointMapper->GetNumberOfTuples(); - if(anIsDifferent){ - TSortedArray aGeometryPointArray; - GetSortedArray(aGeometryPointMapper, aGeometryPointArray); - TSortedArray aDataPointArray; - GetSortedArray(aDataPointMapper, aDataPointArray); - - int aMaxLength = std::max(aGeometryPointArray.size(), aDataPointArray.size()); - TSortedArray anIntersectionArray(aMaxLength); - TSortedArray::iterator anArrayIter = anIntersectionArray.begin(); - anArrayIter = std::set_intersection(aGeometryPointArray.begin(), - aGeometryPointArray.end(), - aDataPointArray.begin(), - aDataPointArray.end(), - anArrayIter); - - anIntersectionArray.erase(anArrayIter, anIntersectionArray.end()); - - { - TId2IdMap anObj2VTKGeometryMap; - vtkIdType aNbCells = aDataPointMapper/*aGeometryPointMapper*/->GetNumberOfTuples(); - for(int aCellId = 0; aCellId < aNbCells; aCellId++){ - vtkIdType anObjID = aDataPointMapper/*aGeometryPointMapper*/->GetValue(aCellId); - anObj2VTKGeometryMap[anObjID] = aCellId; - } + bool anIsDifferent = aDataPointMapper && + aDataPointMapper->GetNumberOfTuples() != aGeometryPointMapper->GetNumberOfTuples(); + if(anIsDifferent){ + TSortedArray aGeometryPointArray; + GetSortedArray(aGeometryPointMapper, aGeometryPointArray); - vtkIdType aNbTuples = anIntersectionArray.size(); + TSortedArray aDataPointArray; + GetSortedArray(aDataPointMapper, aDataPointArray); - if ( aNbTuples == nbPointsInScalars ){ - vtkPointSet* aScalarsPointSet = vtkPointSet::SafeDownCast(theScalarsDataSet); - theOutput->SetPoints(aScalarsPointSet->GetPoints()); - theOutput->GetPointData()->ShallowCopy(aScalarsPointSet->GetPointData()); - - // Calculate output cells - int nbCells=0; - TSortedArray aCellIdsForCopy; - GetIdsForCopy(theInput, aDataPointMapper, aCellIdsForCopy); - nbCells = aCellIdsForCopy.size(); + int aMaxLength = std::max(aGeometryPointArray.size(), aDataPointArray.size()); + TSortedArray anIntersectionArray(aMaxLength); + TSortedArray::iterator anArrayIter = anIntersectionArray.begin(); + anArrayIter = std::set_intersection(aGeometryPointArray.begin(), + aGeometryPointArray.end(), + aDataPointArray.begin(), + aDataPointArray.end(), + anArrayIter); + + anIntersectionArray.erase(anArrayIter, anIntersectionArray.end()); + + { + TId2IdMap anObj2VTKGeometryMap; + vtkIdType aNbCells = aDataPointMapper/*aGeometryPointMapper*/->GetNumberOfTuples(); + for(int aCellId = 0; aCellId < aNbCells; aCellId++){ + vtkIdType anObjID = aDataPointMapper/*aGeometryPointMapper*/->GetValue(aCellId); + anObj2VTKGeometryMap[anObjID] = aCellId; + } - // copy cells to output - theOutput->Allocate(nbCells); - vtkIntArray* theOuputIDSArray = vtkIntArray::New(); - theOuputIDSArray->SetName("VISU_CELLS_MAPPER"); - theOuputIDSArray->SetNumberOfComponents(1); - theOuputIDSArray->SetNumberOfTuples(nbCells); + vtkIdType aNbTuples = anIntersectionArray.size(); - if(nbCells>0) - CopyElementsToOutput(theInput, - nbCells, - aCellIdsForCopy, - anObj2VTKGeometryMap, - theOuputIDSArray, - theOutput); - theOuputIDSArray->Delete(); - return true; - } else { - // not implemented yet + if(aNbTuples == aDataNbPoints){ + vtkPointSet* aScalarsPointSet = vtkPointSet::SafeDownCast(theScalarsDataSet); + theOutput->SetPoints(aScalarsPointSet->GetPoints()); + theOutput->GetPointData()->ShallowCopy(aScalarsPointSet->GetPointData()); + + // Calculate output cells + int nbCells=0; + TSortedArray aCellIdsForCopy; + GetIdsForCopy(theInput, aDataPointMapper, aCellIdsForCopy); + nbCells = aCellIdsForCopy.size(); + + // copy cells to output + theOutput->Allocate(nbCells); + vtkIntArray* theOuputIDSArray = vtkIntArray::New(); + theOuputIDSArray->SetName("VISU_CELLS_MAPPER"); + theOuputIDSArray->SetNumberOfComponents(1); + theOuputIDSArray->SetNumberOfTuples(nbCells); + + if(nbCells>0) + CopyElementsToOutput(theInput, + nbCells, + aCellIdsForCopy, + anObj2VTKGeometryMap, + theOuputIDSArray, + theOutput); + theOuputIDSArray->Delete(); + return true; + } else { + // not implemented yet + } } } } @@ -695,12 +740,10 @@ namespace aNbPoints, aNbCells); } - - return true; } - } - - + return true; + } + //--------------------------------------------------------------- } diff --git a/src/ENGINE/Makefile.am b/src/ENGINE/Makefile.am new file mode 100644 index 00000000..452ba6fe --- /dev/null +++ b/src/ENGINE/Makefile.am @@ -0,0 +1,34 @@ +# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# File : Makefile.in +# Author : Alexey Petrov +# Module : VISU +# $Header: + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +lib_LTLIBRARIES= libVISUEngine.la +dist_libVISUEngine_la_SOURCES= VISU_Engine_i.cc + +libVISUEngine_la_CPPFLAGS= $(KERNEL_CXXFLAGS) $(MED_CXXFLAGS) $(CORBA_CXXFLAGS) $(CORBA_INCLUDES) \ + -I$(top_builddir)/salome_adm/unix -I$(top_builddir)/idl + +libVISUEngine_la_LDFLAGS= $(KERNEL_LDFLAGS) -lSalomeContainer $(CORBA_LIBS) \ + $(top_builddir)/idl/libSalomeIDLVISU.la diff --git a/src/ENGINE/Makefile.in b/src/ENGINE/Makefile.in deleted file mode 100644 index 1717c36b..00000000 --- a/src/ENGINE/Makefile.in +++ /dev/null @@ -1,65 +0,0 @@ -# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# File : Makefile.in -# Author : Alexey Petrov -# Module : VISU -# $Header: - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - - -@COMMENCE@ - -# Libraries targets -LIB = libVISUEngine.la -LIB_SRC = VISU_Engine_i.cc - -LIB_MOC = - -LIB_SERVER_IDL = VISU_Gen.idl SALOME_Component.idl \ - SALOME_Exception.idl SALOME_GenericObj.idl \ - SALOME_Session.idl MED.idl -LIB_CLIENT_IDL = SALOMEDS.idl SALOMEDS_Attributes.idl SALOME_Comm.idl - -# Executables targets -BIN = -BIN_SRC = - -BIN_CLIENT_IDL = -BIN_SERVER_IDL = - -EXPORT_HEADERS = - -# additionnal information to compil and link file -CPPFLAGS += $(KERNEL_CXXFLAGS) - -LDFLAGS += $(KERNEL_LDFLAGS) -lSalomeContainer - -LIBS+= - -# additional file to be cleaned -MOSTLYCLEAN = -CLEAN = -DISTCLEAN = - -@CONCLUDE@ diff --git a/src/ENGINE/VISU_Engine_i.cc b/src/ENGINE/VISU_Engine_i.cc index a44432db..b82a8d12 100644 --- a/src/ENGINE/VISU_Engine_i.cc +++ b/src/ENGINE/VISU_Engine_i.cc @@ -20,7 +20,6 @@ #include "VISU_Engine_i.hh" #include "utilities.h" -#include CORBA_SERVER_HEADER(SALOME_Session) #include CORBA_SERVER_HEADER(SALOME_ModuleCatalog) #include "SALOME_NamingService.hxx" @@ -34,22 +33,41 @@ static int MYDEBUG = 1; static int MYDEBUG = 0; #endif +#ifdef WNT +#ifdef VISU_ENGINE_EXPORTS +#define VISU_ENGINE_EXPORT __declspec(dllexport) +#else +#define VISU_ENGINE_EXPORT __declspec(dllimport) +#endif +#else +#define VISU_ENGINE_EXPORT +#endif + UNEXPECT_CATCH(SalomeException, SALOME::SALOME_Exception); extern "C" { +VISU_ENGINE_EXPORT PortableServer::ObjectId * VISUEngine_factory(CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, PortableServer::ObjectId * contId, const char *instanceName, const char *interfaceName) { - if(MYDEBUG) MESSAGE("VisuEngine_factory : "<getId() ; } } namespace VISU{ //=========================================================================== - VISU_Gen_i::VISU_Gen_i(CORBA::ORB_ptr orb, + VISU_Gen_i::VISU_Gen_i(SALOME::Session_ptr session, + CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, PortableServer::ObjectId * contId, const char *instanceName, @@ -58,11 +76,11 @@ namespace VISU{ { _thisObj = this ; _id = _poa->activate_object(_thisObj); - SALOME_NamingService aNamingService(orb); - CORBA::Object_ptr anObject = aNamingService.Resolve("/Kernel/Session"); - SALOME::Session_var aSession = SALOME::Session::_narrow(anObject); - //aSession->GetInterface(); - Engines::Component_var aComponent = aSession->GetComponent("libVISUEngineImpl.so"); +#ifndef WIN32 + Engines::Component_var aComponent = session->GetComponent("libVISUEngineImpl.so"); +#else + Engines::Component_var aComponent = session->GetComponent("VISUEngineImpl.dll"); +#endif myVisuGen = VISU::VISU_Gen::_narrow(aComponent); } @@ -347,7 +365,6 @@ namespace VISU{ return myVisuGen->Plot3DOnField(theResult,theMeshName,theEntity,theFieldName,theIteration); } - Table_ptr VISU_Gen_i::CreateTable(const char* theTableEntry){ return myVisuGen->CreateTable(theTableEntry); } diff --git a/src/ENGINE/VISU_Engine_i.hh b/src/ENGINE/VISU_Engine_i.hh index d123bd7d..c6edace0 100644 --- a/src/ENGINE/VISU_Engine_i.hh +++ b/src/ENGINE/VISU_Engine_i.hh @@ -24,6 +24,7 @@ #include "SALOMEconfig.h" #include CORBA_SERVER_HEADER(VISU_Gen) #include CORBA_SERVER_HEADER(MED) +#include CORBA_SERVER_HEADER(SALOME_Session) #include CORBA_SERVER_HEADER(SALOMEDS) #include CORBA_SERVER_HEADER(SALOMEDS_Attributes) @@ -38,7 +39,8 @@ namespace VISU VISU_Gen_i(); VISU_Gen_i(const VISU::VISU_Gen_i &); public: - VISU_Gen_i(CORBA::ORB_ptr orb, + VISU_Gen_i(SALOME::Session_ptr session, + CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, PortableServer::ObjectId * contId, const char *instanceName, diff --git a/src/GUITOOLS/Makefile.am b/src/GUITOOLS/Makefile.am new file mode 100644 index 00000000..136786c1 --- /dev/null +++ b/src/GUITOOLS/Makefile.am @@ -0,0 +1,48 @@ +# VISU VISUGUI : GUI of VISU component +# +# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# +# +# File : Makefile.in +# Author : Marc Tajchman (CEA) +# Module : VISU +# $Header$ + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +lib_LTLIBRARIES= libVISUGUITOOLS.la + +salomeinclude_HEADERS= \ + VisuGUI_TableDlg.h \ + VisuGUITools.h + +dist_libVISUGUITOOLS_la_SOURCES= VisuGUI_TableDlg.cxx + +MOC_FILES= VisuGUI_TableDlg_moc.cxx +nodist_libVISUGUITOOLS_la_SOURCES=$(MOC_FILES) + +# additionnal information to compil and link file +libVISUGUITOOLS_la_CPPFLAGS= -ftemplate-depth-32 \ + $(QT_INCLUDES) $(VTK_INCLUDES) @CAS_CPPFLAGS@ @CAS_CXXFLAGS@ \ + $(PYTHON_INCLUDES) $(HDF5_INCLUDES) $(QWT_INCLUDES) \ + $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) $(BOOST_CPPFLAGS) + +libVISUGUITOOLS_la_LDFLAGS= $(QWT_LIBS) $(KERNEL_LDFLAGS) $(GUI_LDFLAGS) diff --git a/src/GUITOOLS/Makefile.in b/src/GUITOOLS/Makefile.in deleted file mode 100644 index f4e549f4..00000000 --- a/src/GUITOOLS/Makefile.in +++ /dev/null @@ -1,66 +0,0 @@ -# VISU VISUGUI : GUI of VISU component -# -# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# -# -# File : Makefile.in -# Author : Marc Tajchman (CEA) -# Module : VISU -# $Header$ - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@ - -@COMMENCE@ - -# header files -EXPORT_HEADERS= \ - VisuGUI_TableDlg.h - -# .po files to transform in .qm -#PO_FILES = \ -# VISU_msg_en.po VISU_images.po - -# Libraries targets -LIB = libVISUGUITOOLS.la - -LIB_SRC = VisuGUI_TableDlg.cxx - -LIB_MOC = VisuGUI_TableDlg.h - -LIB_CLIENT_IDL = SALOME_Exception.idl - -LIB_SERVER_IDL = - -# additionnal information to compil and link file - -CPPFLAGS += -ftemplate-depth-32 $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) \ - $(PYTHON_INCLUDES) $(HDF5_INCLUDES) $(QWT_INCLUDES) \ - $(KERNEL_CXXFLAGS) $(BOOST_CPPFLAGS) - -CXXFLAGS += -ftemplate-depth-32 $(OCC_CXXFLAGS) \ - $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) - -LDFLAGS += $(QWT_LIBS) $(KERNEL_LDFLAGS) $(GUI_LDFLAGS) - -@CONCLUDE@ diff --git a/src/GUITOOLS/VisuGUITools.h b/src/GUITOOLS/VisuGUITools.h new file mode 100755 index 00000000..d8fbf8a6 --- /dev/null +++ b/src/GUITOOLS/VisuGUITools.h @@ -0,0 +1,47 @@ +// 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 : VisuGUITools.h +// Author : Oleg UVAROV +// Module : VISU + +#ifndef _VisuGUITools_H_ +#define _VisuGUITools_H_ + +#ifdef WNT + #if defined VISU_GUITOOLS_EXPORTS + #if defined WIN32 + #define VISU_GUITOOLS_EXPORT __declspec( dllexport ) + #else + #define VISU_GUITOOLS_EXPORT + #endif + #else + #if defined WIN32 + #define VISU_GUITOOLS_EXPORT __declspec( dllimport ) + #else + #define VISU_GUITOOLS_EXPORT + #endif + #endif +#else + #define VISU_GUITOOLS_EXPORT +#endif + +#endif \ No newline at end of file diff --git a/src/GUITOOLS/VisuGUI_TableDlg.cxx b/src/GUITOOLS/VisuGUI_TableDlg.cxx index e5cc2c85..5dc1a547 100644 --- a/src/GUITOOLS/VisuGUI_TableDlg.cxx +++ b/src/GUITOOLS/VisuGUI_TableDlg.cxx @@ -313,9 +313,15 @@ void VisuGUI_TableDlg::onHelp() if (app) app->onHelpContextModule(app->activeModule() ? app->moduleName(app->activeModule()->moduleName()) : QString(""), aHelpFileName); else { + QString platform; +#ifdef WIN32 + platform = "winapplication"; +#else + platform = "application"; +#endif SUIT_MessageBox::warn1(0, QObject::tr("WRN_WARNING"), QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE"). - arg(app->resourceMgr()->stringValue("ExternalBrowser", "application")).arg(aHelpFileName), + arg(app->resourceMgr()->stringValue("ExternalBrowser", platform)).arg(aHelpFileName), QObject::tr("BUT_OK")); } } diff --git a/src/GUITOOLS/VisuGUI_TableDlg.h b/src/GUITOOLS/VisuGUI_TableDlg.h index 76eaa105..44621d27 100644 --- a/src/GUITOOLS/VisuGUI_TableDlg.h +++ b/src/GUITOOLS/VisuGUI_TableDlg.h @@ -33,7 +33,9 @@ class VisuGUI_TableWidget; #include -class VisuGUI_TableDlg : public QDialog +#include "VisuGUITools.h" + +class VISU_GUITOOLS_EXPORT VisuGUI_TableDlg : public QDialog { Q_OBJECT diff --git a/src/Makefile.am b/src/Makefile.am new file mode 100755 index 00000000..e3ede71d --- /dev/null +++ b/src/Makefile.am @@ -0,0 +1,22 @@ +# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# $Header$ + +SUBDIRS = CONVERTOR PIPELINE OBJECT VVTK GUITOOLS VISU_I VISUGUI VISU_SWIG ENGINE diff --git a/src/Makefile.in b/src/Makefile.in deleted file mode 100644 index 2a0e51dd..00000000 --- a/src/Makefile.in +++ /dev/null @@ -1,37 +0,0 @@ -# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# -# -# File : Makefile.in -# Author : Laurent CORNABE PRINCIPIA -# Module : VISU -# $Header$ - -top_srcdir=@top_srcdir@ -top_builddir=.. -srcdir=@srcdir@ -VPATH=.:@srcdir@ - - -@COMMENCE@ - -SUBDIRS = CONVERTOR PIPELINE OBJECT VVTK GUITOOLS VISU_I VISUGUI VISU_SWIG ENGINE - -@MODULE@ diff --git a/src/OBJECT/Makefile.am b/src/OBJECT/Makefile.am new file mode 100644 index 00000000..47056df0 --- /dev/null +++ b/src/OBJECT/Makefile.am @@ -0,0 +1,74 @@ +# VISU OBJECT : interactive object for VISU entities implementation +# +# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# +# +# File : Makefile.in +# Module : VISU + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +lib_LTLIBRARIES= libVisuObject.la + +salomeinclude_HEADERS = \ + VISU_BoostSignals.h \ + VISU_ActorFactory.h \ + VISU_GaussPtsSettings.h \ + VISU_GaussPtsActorFactory.h \ + VISU_Event.h \ + VISU_Actor.h \ + VISU_DataSetActor.h \ + VISU_MeshAct.h \ + VISU_ScalarMapAct.h \ + VISU_GaussPtsAct.h \ + VISU_VectorsAct.h + +dist_libVisuObject_la_SOURCES = \ + VISU_Actor.cxx \ + VISU_DataSetActor.cxx \ + VISU_MeshAct.cxx \ + VISU_ScalarMapAct.cxx \ + VISU_GaussPtsDeviceActor.cxx \ + VISU_GaussPtsSettings.cxx \ + VISU_GaussPtsAct.cxx \ + VISU_VectorsAct.cxx + +libVisuObject_la_CPPFLAGS= \ + @CAS_CPPFLAGS@ @CAS_CXXFLAGS@ \ + $(VTK_INCLUDES) \ + $(BOOST_CPPFLAGS) \ + $(MED_CXXFLAGS) \ + $(GUI_CXXFLAGS) \ + $(KERNEL_CXXFLAGS) \ + -I$(srcdir)/../PIPELINE \ + -I$(srcdir)/../CONVERTOR + +libVisuObject_la_LDFLAGS= \ + $(VTK_LIBS) \ + $(BOOST_LIBS) \ + $(GUI_LDFLAGS) \ + $(KERNEL_LDFLAGS) + +libVisuObject_la_LIBADD= \ + -lboost_signals@BOOST_LIBSUFFIX@ \ + -lSalomeObject \ + ../PIPELINE/libVisuPipeLine.la \ + -lSVTK diff --git a/src/OBJECT/Makefile.in b/src/OBJECT/Makefile.in deleted file mode 100644 index 60cddef1..00000000 --- a/src/OBJECT/Makefile.in +++ /dev/null @@ -1,87 +0,0 @@ -# VISU OBJECT : interactive object for VISU entities implementation -# -# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# -# -# File : Makefile.in -# Module : VISU - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl -BOOST_LIBSUFFIX=@BOOST_LIBSUFFIX@ - -@COMMENCE@ - -EXPORT_HEADERS = \ - VISU_BoostSignals.h \ - VISU_ActorFactory.h \ - VISU_GaussPtsSettings.h \ - VISU_GaussPtsActorFactory.h \ - VISU_Event.h \ - VISU_Actor.h \ - VISU_DataSetActor.h \ - VISU_MeshAct.h \ - VISU_ScalarMapAct.h \ - VISU_GaussPtsAct.h \ - VISU_VectorsAct.h - -# Libraries targets - -LIB = libVisuObject.la -LIB_SRC = \ - VISU_Actor.cxx \ - VISU_DataSetActor.cxx \ - VISU_MeshAct.cxx \ - VISU_ScalarMapAct.cxx \ - VISU_GaussPtsDeviceActor.cxx \ - VISU_GaussPtsSettings.cxx \ - VISU_GaussPtsAct.cxx \ - VISU_VectorsAct.cxx - -LIB_CLIENT_IDL = - -# Executables targets -BIN = -BIN_SRC = - -CPPFLAGS+= \ - $(OCC_INCLUDES) \ - $(VTK_INCLUDES) \ - $(BOOST_CPPFLAGS) \ - $(MED_CXXFLAGS) \ - $(GUI_CXXFLAGS) \ - $(KERNEL_CXXFLAGS) - -LDFLAGS+= \ - $(VTK_LIBS) \ - $(BOOST_LIBS) \ - $(GUI_LDFLAGS) \ - $(KERNEL_LDFLAGS) - -LIBS+= \ - -lboost_signals${BOOST_LIBSUFFIX} \ - -lSalomeObject \ - -lVisuPipeLine \ - -lSVTK - -@CONCLUDE@ diff --git a/src/OBJECT/VISU_Actor.cxx b/src/OBJECT/VISU_Actor.cxx index 85197aa3..d3632dcb 100644 --- a/src/OBJECT/VISU_Actor.cxx +++ b/src/OBJECT/VISU_Actor.cxx @@ -30,7 +30,6 @@ #include "VISU_PipeLine.hxx" #include "VTKViewer_ShrinkFilter.h" #include "VTKViewer_GeometryFilter.h" -#include "VTKViewer_PassThroughFilter.h" #include #include @@ -50,6 +49,7 @@ #include #include #include +#include #include #include diff --git a/src/OBJECT/VISU_Actor.h b/src/OBJECT/VISU_Actor.h index d26cea31..96289417 100644 --- a/src/OBJECT/VISU_Actor.h +++ b/src/OBJECT/VISU_Actor.h @@ -32,6 +32,7 @@ #include "SALOME_Actor.h" #include "VISU_ActorFactory.h" #include "VISU_BoostSignals.h" +#include "SVTK_DeviceActor.h" #include #include @@ -45,12 +46,20 @@ class vtkInteractorStyle; class VTKViewer_ShrinkFilter; class VISU_PipeLine; -#ifdef _WIN_32 +#ifdef _WIN32 #define VTKOCC_EXPORT __declspec (dllexport) #else #define VTKOCC_EXPORT VTK_EXPORT #endif +namespace SVTK +{ + namespace Representation + { + const Type Surfaceframe = Insideframe + 1; + } +} + namespace VISU { class Prs3d_i; diff --git a/src/OBJECT/VISU_GaussPtsAct.cxx b/src/OBJECT/VISU_GaussPtsAct.cxx index dd2e4ab9..18c8a26c 100644 --- a/src/OBJECT/VISU_GaussPtsAct.cxx +++ b/src/OBJECT/VISU_GaussPtsAct.cxx @@ -281,8 +281,6 @@ VISU_GaussPtsAct { if(MYDEBUG) MESSAGE("VISU_GaussPtsAct::RemoveFromRender - this = "<RemoveFromRender(theRenderer); theRenderer->RemoveActor(myTextActor.GetPointer()); @@ -291,6 +289,8 @@ VISU_GaussPtsAct myCursorPyramid->RemoveFromRender(theRenderer); myCursorPyramidSelected->RemoveFromRender(theRenderer); myScalarBarCtrl->RemoveFromRender(theRenderer); + + Superclass::RemoveFromRender(theRenderer); } void @@ -1187,10 +1187,10 @@ void VISU_GaussPtsAct1 ::RemoveFromRender(vtkRenderer* theRenderer) { - Superclass::RemoveFromRender(theRenderer); - myInsideDeviceActor->RemoveFromRender(theRenderer); myOutsideDeviceActor->RemoveFromRender(theRenderer); + + Superclass::RemoveFromRender(theRenderer); } void diff --git a/src/OBJECT/VISU_GaussPtsDeviceActor.cxx b/src/OBJECT/VISU_GaussPtsDeviceActor.cxx index 5e44009f..9fcd7c6c 100644 --- a/src/OBJECT/VISU_GaussPtsDeviceActor.cxx +++ b/src/OBJECT/VISU_GaussPtsDeviceActor.cxx @@ -34,7 +34,6 @@ #include "VTKViewer_Transform.h" #include "VTKViewer_TransformFilter.h" -#include "VTKViewer_PassThroughFilter.h" #include #include @@ -42,6 +41,7 @@ #include #include #include +#include #include "utilities.h" @@ -69,7 +69,7 @@ VISU_GaussPtsDeviceActor myTransformFilter->Delete(); for(int i = 0; i < 3; i++){ - PPassThroughFilter aFilter(VTKViewer_PassThroughFilter::New()); + PPassThroughFilter aFilter(vtkPassThroughFilter::New()); myPassFilter.push_back(aFilter); aFilter->Delete(); } diff --git a/src/OBJECT/VISU_GaussPtsDeviceActor.h b/src/OBJECT/VISU_GaussPtsDeviceActor.h index ee5bcf66..253822f6 100644 --- a/src/OBJECT/VISU_GaussPtsDeviceActor.h +++ b/src/OBJECT/VISU_GaussPtsDeviceActor.h @@ -36,11 +36,11 @@ class VTKViewer_Transform; class VTKViewer_TransformFilter; -class VTKViewer_PassThroughFilter; class VISU_OpenGLPointSpriteMapper; class VISU_GaussPointsPL; +class vtkPassThroughFilter; //============================================================================ class VISU_GaussPtsDeviceActor: public vtkLODActor @@ -95,7 +95,7 @@ class VISU_GaussPtsDeviceActor: public vtkLODActor vtkSmartPointer myGeomFilter; vtkSmartPointer myTransformFilter; - typedef vtkSmartPointer PPassThroughFilter; + typedef vtkSmartPointer PPassThroughFilter; std::vector myPassFilter; VISU_GaussPtsDeviceActor(); diff --git a/src/OBJECT/VISU_GaussPtsSettings.h b/src/OBJECT/VISU_GaussPtsSettings.h index da3e70d3..473ddd10 100644 --- a/src/OBJECT/VISU_GaussPtsSettings.h +++ b/src/OBJECT/VISU_GaussPtsSettings.h @@ -36,6 +36,7 @@ class vtkImageData; +#include "VISU_Actor.h" //============================================================================ namespace VISU @@ -48,7 +49,7 @@ namespace VISU //! Base class of Gauss Points settings. -class VISU_GaussPtsSettings : public vtkObject +class VTKOCC_EXPORT VISU_GaussPtsSettings : public vtkObject { public: vtkTypeMacro( VISU_GaussPtsSettings, vtkObject ); @@ -103,7 +104,7 @@ class VISU_GaussPtsSettings : public vtkObject * Clamp, Texture, Alpha threshold, Const size and Color. * Used by Gauss Points Actor. */ -class VISU_InsideCursorSettings : public VISU_GaussPtsSettings +class VTKOCC_EXPORT VISU_InsideCursorSettings : public VISU_GaussPtsSettings { public: vtkTypeMacro( VISU_InsideCursorSettings, vtkObject ); @@ -134,7 +135,7 @@ class VISU_InsideCursorSettings : public VISU_GaussPtsSettings * Clamp, Texture, Alpha threshold, Const size and Color. * Used by Gauss Points Actor. */ -class VISU_OutsideCursorSettings : public VISU_GaussPtsSettings +class VTKOCC_EXPORT VISU_OutsideCursorSettings : public VISU_GaussPtsSettings { public: vtkTypeMacro( VISU_OutsideCursorSettings, vtkObject ); @@ -170,7 +171,7 @@ class VISU_OutsideCursorSettings : public VISU_GaussPtsSettings * Camera movement steps number and Display parent mesh. * Used by Gauss Points Actor. */ -class VISU_PickingSettings : public vtkObject +class VTKOCC_EXPORT VISU_PickingSettings : public vtkObject { public: enum { BelowPoint = 0, TopLeftCorner }; diff --git a/src/OBJECT/VISU_MeshAct.cxx b/src/OBJECT/VISU_MeshAct.cxx index e98f3019..cf2e7cfc 100644 --- a/src/OBJECT/VISU_MeshAct.cxx +++ b/src/OBJECT/VISU_MeshAct.cxx @@ -27,7 +27,6 @@ // $Header$ #include "VISU_MeshAct.h" -#include "SVTK_DeviceActor.h" #include #include diff --git a/src/OBJECT/VISU_MeshAct.h b/src/OBJECT/VISU_MeshAct.h index 3ca1e471..5a5778d3 100644 --- a/src/OBJECT/VISU_MeshAct.h +++ b/src/OBJECT/VISU_MeshAct.h @@ -32,13 +32,6 @@ #include "VISU_DataSetActor.h" #include "SVTK_DeviceActor.h" -namespace SVTK -{ - namespace Representation - { - const Type Surfaceframe = Insideframe + 1; - } -} class VTKOCC_EXPORT VISU_MeshAct : public VISU_DataSetActor { diff --git a/src/OBJECT/VISU_ScalarMapAct.cxx b/src/OBJECT/VISU_ScalarMapAct.cxx index b7c76f27..bb904374 100644 --- a/src/OBJECT/VISU_ScalarMapAct.cxx +++ b/src/OBJECT/VISU_ScalarMapAct.cxx @@ -29,13 +29,18 @@ #include "VISU_ScalarMapAct.h" #include "VISU_LookupTable.hxx" #include "VISU_ScalarBarActor.hxx" +#include "VISU_PipeLine.hxx" #include #include #include +#include +#include +#include //---------------------------------------------------------------------------- vtkStandardNewMacro(VISU_ScalarMapAct); +static vtkFloatingPointType EPS = 1.0 / VTK_LARGE_FLOAT; //---------------------------------------------------------------------------- VISU_ScalarMapAct @@ -52,6 +57,21 @@ VISU_ScalarMapAct aProperty->SetSpecular(0.0); myProperty->DeepCopy(aProperty); + + vtkMatrix4x4 *m; + m = vtkMatrix4x4::New(); + + mySurfaceActor= SVTK_DeviceActor::New(); + mySurfaceActor->SetRepresentation(SVTK::Representation::Surface); + mySurfaceActor->SetProperty(aProperty); + mySurfaceActor->SetUserMatrix(m); + + myEdgeActor = SVTK_DeviceActor::New(); + myEdgeActor->SetRepresentation(SVTK::Representation::Wireframe); + myEdgeActor->SetUserMatrix(m); + myEdgeActor->GetProperty()->SetColor(255.,255.,255.); + + m->Delete(); } //---------------------------------------------------------------------------- @@ -59,6 +79,114 @@ VISU_ScalarMapAct ::~VISU_ScalarMapAct() { myScalarBar->Delete(); + mySurfaceActor->Delete(); + myEdgeActor->Delete(); +} + +void +VISU_ScalarMapAct +::ShallowCopyPL(VISU_PipeLine* thePipeLine) +{ + VISU_Actor::ShallowCopyPL(thePipeLine); + + myEdgeActor->GetMapper()->ScalarVisibilityOff(); + + vtkDataSet* aDatsSet = mySurfaceActor->GetDataSetMapper()->GetInput(); + mySurfaceActor->GetMapper()->ShallowCopy(thePipeLine->GetMapper()); + // To restore mapper input from pipeline + mySurfaceActor->GetDataSetMapper()->SetInput(aDatsSet); +} + +//---------------------------------------------------------------------------- +void +VISU_ScalarMapAct +::SetMapperInput(vtkDataSet* theDataSet) +{ + Superclass::SetMapperInput(theDataSet); + + mySurfaceActor->SetInput(theDataSet); + myEdgeActor->SetInput(theDataSet); +} + +//---------------------------------------------------------------------------- +void +VISU_ScalarMapAct +::SetTransform(VTKViewer_Transform* theTransform) +{ + Superclass::SetTransform(theTransform); + + mySurfaceActor->SetTransform(theTransform); + myEdgeActor->SetTransform(theTransform); +} + +//---------------------------------------------------------------------------- +void +VISU_ScalarMapAct +::SetShrinkable(bool theIsShrinkable) +{ + Superclass::SetShrinkable(theIsShrinkable); + + mySurfaceActor->SetShrinkable(theIsShrinkable); +} + +void +VISU_ScalarMapAct +::SetShrinkFactor(vtkFloatingPointType theValue) +{ + Superclass::SetShrinkFactor(theValue); + + mySurfaceActor->SetShrinkFactor(theValue); +} + +//---------------------------------------------------------------------------- +void +VISU_ScalarMapAct +::SetShrink() +{ + if(myRepresentation == VTK_POINTS) + return; + + Superclass::SetShrink(); + + mySurfaceActor->SetShrink(); +} + +void +VISU_ScalarMapAct +::UnShrink() +{ + Superclass::UnShrink(); + + mySurfaceActor->UnShrink(); +} + +//---------------------------------------------------------------------------- +void +VISU_ScalarMapAct +::SetOpacity(vtkFloatingPointType theValue) +{ + mySurfaceActor->GetProperty()->SetOpacity(theValue); +} + +vtkFloatingPointType +VISU_ScalarMapAct +::GetOpacity() +{ + return mySurfaceActor->GetProperty()->GetOpacity(); +} + +//---------------------------------------------------------------------------- +void +VISU_ScalarMapAct +::SetLineWidth(vtkFloatingPointType theLineWidth) +{ + mySurfaceActor->GetProperty()->SetLineWidth(theLineWidth); +} + +vtkFloatingPointType +VISU_ScalarMapAct::GetLineWidth() +{ + return mySurfaceActor->GetProperty()->GetLineWidth(); } //---------------------------------------------------------------------------- @@ -140,7 +268,13 @@ VISU_ScalarMapAct ::SetRepresentation(int theMode) { bool anIsShanding = IsShading(); + Superclass::SetRepresentation(theMode); + if(theMode == SVTK::Representation::Surfaceframe) + mySurfaceActor->SetRepresentation(SVTK::Representation::Surface); + else + mySurfaceActor->SetRepresentation(theMode); + SetShading(anIsShanding); } @@ -150,7 +284,7 @@ void VISU_ScalarMapAct ::SetShading(bool theOn) { - vtkProperty* aProperty = GetProperty(); + vtkProperty* aProperty = mySurfaceActor->GetProperty(); if (theOn) { @@ -161,7 +295,7 @@ VISU_ScalarMapAct { aProperty->SetAmbient(1.0); aProperty->SetDiffuse(0.0); - } + } } //---------------------------------------------------------------------------- @@ -169,9 +303,53 @@ bool VISU_ScalarMapAct ::IsShading() { - vtkProperty* aProperty = GetProperty(); + vtkProperty* aProperty = mySurfaceActor->GetProperty(); - return (aProperty->GetAmbient() == 0 && aProperty->GetDiffuse() == 1); + return (fabs(aProperty->GetAmbient()) < EPS && fabs(aProperty->GetDiffuse() - 1.) < EPS); +} + +int +VISU_ScalarMapAct +::RenderOpaqueGeometry(vtkViewport *ren) +{ + GetMatrix(myEdgeActor->GetUserMatrix()); + GetMatrix(mySurfaceActor->GetUserMatrix()); + + using namespace SVTK::Representation; + if( GetRepresentation() == Surfaceframe ){ + mySurfaceActor->SetAllocatedRenderTime(this->AllocatedRenderTime/2.0,ren); + mySurfaceActor->RenderOpaqueGeometry(ren); + + myEdgeActor->SetAllocatedRenderTime(this->AllocatedRenderTime/2.0,ren); + myEdgeActor->RenderOpaqueGeometry(ren); + } + else{ + mySurfaceActor->SetAllocatedRenderTime(this->AllocatedRenderTime,ren); + mySurfaceActor->RenderOpaqueGeometry(ren); + } + return 1; +} + +int +VISU_ScalarMapAct +::RenderTranslucentGeometry(vtkViewport *ren) +{ + GetMatrix(myEdgeActor->GetUserMatrix()); + GetMatrix(mySurfaceActor->GetUserMatrix()); + + using namespace SVTK::Representation; + if( GetRepresentation() == Surfaceframe ){ + mySurfaceActor->SetAllocatedRenderTime(this->AllocatedRenderTime,ren); + mySurfaceActor->RenderTranslucentGeometry(ren); + + myEdgeActor->SetAllocatedRenderTime(this->AllocatedRenderTime/2.0,ren); + myEdgeActor->RenderTranslucentGeometry(ren); + } + else{ + mySurfaceActor->SetAllocatedRenderTime(this->AllocatedRenderTime,ren); + mySurfaceActor->RenderTranslucentGeometry(ren); + } + return 1; } //---------------------------------------------------------------------------- diff --git a/src/OBJECT/VISU_ScalarMapAct.h b/src/OBJECT/VISU_ScalarMapAct.h index 9145403f..8f898764 100644 --- a/src/OBJECT/VISU_ScalarMapAct.h +++ b/src/OBJECT/VISU_ScalarMapAct.h @@ -49,10 +49,59 @@ class VTKOCC_EXPORT VISU_ScalarMapAct : public VISU_DataSetActor void DeepCopy(VISU_Actor *theActor); + virtual + void + ShallowCopyPL(VISU_PipeLine* thePipeLine); + + //! Apply view transformation + virtual + void + SetTransform(VTKViewer_Transform* theTransform); + + virtual + void + SetShrinkable(bool theIsShrinkable); + + virtual + void + SetShrinkFactor(vtkFloatingPointType theFactor = 0.8); + + virtual + void + SetShrink(); + + virtual + void + UnShrink(); + + virtual + void + SetOpacity(vtkFloatingPointType theValue); + + virtual + vtkFloatingPointType + GetOpacity(); + + virtual + void + SetLineWidth(vtkFloatingPointType theLineWidth); + + virtual + vtkFloatingPointType + GetLineWidth(); + virtual void AddToRender(vtkRenderer* theRenderer); + virtual + int + RenderOpaqueGeometry(vtkViewport *ren); + + virtual + int + RenderTranslucentGeometry(vtkViewport *ren); + virtual void RemoveFromRender(vtkRenderer* theRenderer); @@ -92,8 +141,15 @@ class VTKOCC_EXPORT VISU_ScalarMapAct : public VISU_DataSetActor protected: VISU_ScalarMapAct(); + + virtual + void + SetMapperInput(vtkDataSet* theDataSet); + bool myBarVisibility; VISU_ScalarBarActor* myScalarBar; + SVTK_DeviceActor* mySurfaceActor; + SVTK_DeviceActor* myEdgeActor; }; #endif diff --git a/src/OBJECT/VISU_VectorsAct.cxx b/src/OBJECT/VISU_VectorsAct.cxx index 3fd30ebd..428cbb50 100644 --- a/src/OBJECT/VISU_VectorsAct.cxx +++ b/src/OBJECT/VISU_VectorsAct.cxx @@ -28,14 +28,13 @@ #include "VISU_VectorsAct.h" #include "VISU_VectorsPL.hxx" -#include "VTKViewer_PassThroughFilter.h" // VTK Includes #include #include #include #include - +#include //---------------------------------------------------------------------------- vtkStandardNewMacro(VISU_VectorsAct); diff --git a/src/PIPELINE/VISUPipeLine.cxx b/src/PIPELINE/VISUPipeLine.cxx index 8d58ed3f..ed66b879 100644 --- a/src/PIPELINE/VISUPipeLine.cxx +++ b/src/PIPELINE/VISUPipeLine.cxx @@ -39,7 +39,7 @@ #include "VISU_Convertor.hxx" #include "VISU_ConvertorUtils.hxx" -typedef VISU_StreamLinesPL TPresent; +typedef VISU_ScalarMapPL TPresent; #include #include diff --git a/src/PIPELINE/VISU_ColoredPL.cxx b/src/PIPELINE/VISU_ColoredPL.cxx index c2cabcdf..d58cfb93 100644 --- a/src/PIPELINE/VISU_ColoredPL.cxx +++ b/src/PIPELINE/VISU_ColoredPL.cxx @@ -222,8 +222,8 @@ VISU_ColoredPL { unsigned long int aSize = Superclass::GetMemorySize(); - if(vtkDataSet* aDataSet = myExtractor->GetInput()) - aSize = aDataSet->GetActualMemorySize() * 1024; + if(vtkDataObject* aDataObject = myExtractor->GetInput()) + aSize = aDataObject->GetActualMemorySize() * 1024; if(vtkDataObject* aDataObject = myFieldTransform->GetInput()) aSize += aDataObject->GetActualMemorySize() * 1024; diff --git a/src/PIPELINE/VISU_Extractor.cxx b/src/PIPELINE/VISU_Extractor.cxx index b0b48888..d96e2f71 100644 --- a/src/PIPELINE/VISU_Extractor.cxx +++ b/src/PIPELINE/VISU_Extractor.cxx @@ -44,9 +44,9 @@ vtkStandardNewMacro(VISU_Extractor); //---------------------------------------------------------------------------- VISU_Extractor -::VISU_Extractor() +::VISU_Extractor(): + myScalarMode(1) { - myScalarMode = 1; } @@ -161,13 +161,15 @@ ExecuteScalars(vtkIdType theNbOfTuples, } -//---------------------------------------------------------------------------- -void +//--------------------------------------------------------------- +int VISU_Extractor -::Execute() +::RequestData(vtkInformation *theRequest, + vtkInformationVector **theInputVector, + vtkInformationVector *theOutputVector) { - vtkDataSet *input = this->GetInput(); - vtkDataSet *output = this->GetOutput(); + vtkDataSet *input = VISU::GetInput(theInputVector, 0); + vtkDataSet *output = VISU::GetOutput(theOutputVector); output->CopyStructure(input); if(VISU::IsDataOnPoints(input)){ @@ -201,4 +203,6 @@ VISU_Extractor if(vtkDataArray *aDataArray = input->GetPointData()->GetArray("VISU_POINTS_MAPPER")) output->GetPointData()->AddArray(aDataArray); + + return 1; } diff --git a/src/PIPELINE/VISU_Extractor.hxx b/src/PIPELINE/VISU_Extractor.hxx index 22bcf9e0..944b4866 100644 --- a/src/PIPELINE/VISU_Extractor.hxx +++ b/src/PIPELINE/VISU_Extractor.hxx @@ -27,14 +27,15 @@ #ifndef VISU_Extractor_HeaderFile #define VISU_Extractor_HeaderFile -#include +#include "VISUPipeline.hxx" +#include //---------------------------------------------------------------------------- -class VTK_EXPORT VISU_Extractor : public vtkDataSetToDataSetFilter +class VISU_PIPELINE_EXPORT VISU_Extractor : public vtkDataSetAlgorithm { public: - vtkTypeMacro(VISU_Extractor, vtkDataSetToDataSetFilter); + vtkTypeMacro(VISU_Extractor, vtkDataSetAlgorithm); static VISU_Extractor @@ -55,8 +56,8 @@ protected: ~VISU_Extractor(); virtual - void - Execute(); + int + RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *); int myScalarMode; }; diff --git a/src/PIPELINE/VISU_PrsMergerPL.cxx b/src/PIPELINE/VISU_PrsMergerPL.cxx deleted file mode 100644 index c5c6ccd4..00000000 --- a/src/PIPELINE/VISU_PrsMergerPL.cxx +++ /dev/null @@ -1,357 +0,0 @@ -// VISU OBJECT : interactive object for VISU entities implementation -// -// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com -// -// -// File: VISU_PrsMergerPL.cxx -// Author: Eugeny Nikolaev -// Module : VISU - -#include "VISU_PrsMergerPL.hxx" -#include "VISU_MeshPL.hxx" -#include "VISU_ScalarMapPL.hxx" -#include "VISU_IDMapper.hxx" -#include "VTKViewer_AppendFilter.h" - -#include "VISU_AppendFilter.hxx" -#include "VISU_MergeFilter.hxx" - -#include "VISU_PipeLineUtils.hxx" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#ifdef _DEBUG_ -static int MYDEBUG = 0; -#else -static int MYDEBUG = 0; -#endif - - -using namespace std; - -vtkStandardNewMacro(VISU_PrsMergerPL); - -VISU_PrsMergerPL -::VISU_PrsMergerPL(): - myAppendFilter(VISU_AppendFilter::New()), - myMergeFilter(VISU_MergeFilter::New()), - myScalars(NULL) -{ - myAppendFilter->SetMergingInputs(true); - myAppendFilter->Delete(); - - myMergeFilter->SetMergingInputs(true); - myMergeFilter->Delete(); -} - -VISU_PrsMergerPL -::~VISU_PrsMergerPL() -{} - -void -VISU_PrsMergerPL -::RemoveAllGeom() -{ - myMeshGeometryList.clear(); - this->Execute(); -} - -void -VISU_PrsMergerPL -::ShallowCopy(VISU_PipeLine *thePipeLine) -{ - if (MYDEBUG) MESSAGE("ShallowCopy"); - VISU_PrsMergerPL* aPipeLine = dynamic_cast(thePipeLine); - if(this == aPipeLine){ - TSupperClass::ShallowCopy(thePipeLine); - return; - } - if(aPipeLine){ - int aNbGeoms = aPipeLine->GetNbGeometry(); - if (MYDEBUG) MESSAGE("aNbGeoms="<GetGeometry(i),false); - } - SetScalars(aPipeLine->GetScalars(),true); - } - TSupperClass::ShallowCopy(thePipeLine); -} - -bool -VISU_PrsMergerPL -::SetGeometry(VISU_PipeLine* theGeometry,bool theUpdate) -{ - if(MYDEBUG) MESSAGE("VISU_PrsMergerPL::SetGeometry()"); - myMeshGeometryList.clear(); - - if(this->checkGeometry(theGeometry)){ - myMeshGeometryList.push_back(theGeometry); - if (MYDEBUG) MESSAGE("this->GetGeometry(0)->GetIDMapper()="<GetGeometry(0)->GetIDMapper()); - - if(theUpdate) - this->Execute(); - - return true; - } else - return false; - -} - -int -VISU_PrsMergerPL -::AddBackGeometry(VISU_PipeLine* theGeometry,bool theUpdate) -{ - if(MYDEBUG) MESSAGE("VISU_PrsMergerPL::AddBackGeometry() "<GetGeometryNumber(theGeometry); - if(aGeomNum == -1){ - bool aCheckGeom = this->checkGeometry(theGeometry); - if(aCheckGeom){ - myMeshGeometryList.push_back(theGeometry); - - if(theUpdate) - this->Execute(); - - return (myMeshGeometryList.size()-1); - } else { - return -1; - } - } else { - return aGeomNum; - } -} - -int -VISU_PrsMergerPL -::GetGeometryNumber(VISU_PipeLine* theGeometry) -{ - TPipeLine aPipeLine = theGeometry; - TPipeLines::const_iterator aIter = myMeshGeometryList.begin(); - for(int i=0;aIter != myMeshGeometryList.end();aIter++,i++){ - if( theGeometry == (*aIter).GetPointer() ) - return i; - } - - return -1; -} - -void -VISU_PrsMergerPL -::RemoveGeometryById(int theId) -{ - if(theId >=0 && theId < myMeshGeometryList.size()){ - TPipeLines::iterator aIter = myMeshGeometryList.begin(); - for(;aIter != myMeshGeometryList.end();aIter++){ - if( myMeshGeometryList[theId] == (*aIter)){ - myMeshGeometryList.erase(aIter); - this->Execute(); - break; - } - } - } -} - -VISU_PipeLine* -VISU_PrsMergerPL -::GetGeometry(int theId) -{ - if(theId >=0 && theId < myMeshGeometryList.size()){ - return myMeshGeometryList[theId].GetPointer(); - } - else - return NULL; -} - -VISU_PipeLine* -VISU_PrsMergerPL -::GetScalars() -{ - return myScalars.GetPointer(); -} - -int -VISU_PrsMergerPL -::GetNbGeometry() -{ - return myMeshGeometryList.size(); -} - -bool -VISU_PrsMergerPL -::SetScalars(VISU_PipeLine* theInput,bool theUpdate) -{ - if(MYDEBUG) MESSAGE("VISU_PrsMergerPL::SetScalars()"); - if ( this->checkScalars( theInput ) ){ - myScalars = theInput; - VISU_ScalarMapPL* aScalarMap = dynamic_cast(this->GetScalars()); - myScalarRanges = aScalarMap->GetScalarRange(); - if(theUpdate) - this->Execute(); - return true; - } else - return false; -} - -void -VISU_PrsMergerPL -::Init() -{ - Superclass::Init(); - if(MYDEBUG) MESSAGE("VISU_PrsMergerPL::Init() this="<Execute(); -} - -void -VISU_PrsMergerPL -::Update() -{ - if(MYDEBUG) MESSAGE("VISU_PrsMergerPL::Update()"); - Superclass::Update(); - Execute(); -} - -void -VISU_PrsMergerPL -::Build() -{ - if(MYDEBUG) MESSAGE("VISU_PrsMergerPL::Build()"); - TSupperClass::Build(); // call DoHook method -} - -void -VISU_PrsMergerPL -::SetInitialRange() -{ - myMapper->UseLookupTableScalarRangeOff(); -} - -bool -VISU_PrsMergerPL -::checkGeometry(const VISU_PipeLine* thePipeLine) -{ - const VISU::PIDMapper& aMapper = thePipeLine->GetIDMapper(); - int aNbPoints = aMapper->GetVTKOutput()->GetNumberOfPoints(); -// if (this->GetNbGeometry() > 0){ -// const VISU::PIDMapper& aMapper2 = this->GetGeometry(0)->GetIDMapper(); -// int aNbPoints2 = aMapper2->GetVTKOutput()->GetNumberOfPoints(); -// if(aNbPoints2 != aNbPoints) -// return false; -// } else if (this->GetScalars()) { -// const VISU::PIDMapper& aMapper2 = this->GetScalars()->GetIDMapper(); -// int aNbPoints2 = aMapper2->GetVTKOutput()->GetNumberOfPoints(); -// if(aNbPoints2 != aNbPoints) -// return false; -// } - if(aNbPoints < 1) - return false; - return true; -} - -bool -VISU_PrsMergerPL -::checkScalars(const VISU_PipeLine* thePipeLine) -{ - const VISU::PIDMapper& aMapper = thePipeLine->GetIDMapper(); - int aNbPoints = aMapper->GetVTKOutput()->GetNumberOfPoints(); -// if (this->GetNbGeometry() > 0){ -// const VISU::PIDMapper& aMapper2 = this->GetGeometry(0)->GetIDMapper(); -// int aNbPoints2 = aMapper2->GetVTKOutput()->GetNumberOfPoints(); -// if(aNbPoints2 != aNbPoints) -// return false; -// } - if(aNbPoints < 1) - return false; - return true; -} - -void -VISU_PrsMergerPL -::Execute(){ - /* Where are next situations: - * 1. Timestamp on entity=NODE - * 1.1 Group Cell - OK - * 1.2 Group Cell + Point - ERR (remove points groups) - * 1.3 Group Node - ERR (remove points groups) - * 2. Timesatamp on entity=CELL - * 2.1 Group Cell - OK - * 2.2 Group Point - ERR (remove points groups) - */ - if(MYDEBUG) MESSAGE("VISU_PrsMergerPL::Execute()"); - - myAppendFilter->RemoveAllInputs(); - if(!myMeshGeometryList.empty()){ - const VISU::PIDMapper& aScalarsIDMapper = myScalars->GetIDMapper(); - VISU::TVTKOutput* aScalarsOutput = aScalarsIDMapper->GetVTKOutput(); - - // copy points to output from input first geometry - - VISU::TVTKOutput* aGeomOutput = NULL; - vtkIdType aNbGeoms = this->GetNbGeometry(); - for(vtkIdType aGeomId = 0; aGeomId < aNbGeoms; aGeomId++){ - VISU_PipeLine* aGeomPipeLine = this->GetGeometry(aGeomId); - const VISU::PIDMapper& aGeomIDMapper = aGeomPipeLine->GetIDMapper(); - aGeomOutput = aGeomIDMapper->GetVTKOutput(); - vtkIdType aNbCells = aGeomOutput->GetNumberOfCells(); -// if(aNbCells > 0) -// if(aGeomOutput->GetCell(0)->GetCellType() == VTK_VERTEX ) -// continue; - - myAppendFilter->AddInput(aGeomOutput); - } - - myAppendFilter->SetSharedPointsDataSet(aGeomOutput); - myAppendFilter->Update(); - - vtkUnstructuredGrid* aGeomDataSet = myAppendFilter->GetOutput(); - myMergeFilter->SetGeometry(aGeomDataSet); - - //copy array values - myMergeFilter->SetScalars(aScalarsOutput); - myMergeFilter->SetVectors(aScalarsOutput); - - myMergeFilter->RemoveFields(); - myMergeFilter->AddField("VISU_FIELD", aScalarsOutput); - myMergeFilter->AddField("VISU_CELLS_MAPPER", aScalarsOutput); - myMergeFilter->AddField("VISU_POINTS_MAPPER", aScalarsOutput); - - myMergeFilter->Update(); - SetInput(myMergeFilter->GetOutput()); - }else{ - if(myScalars != NULL){ - if(VISU_ScalarMapPL* aScalarMap = dynamic_cast(this->GetScalars())) - SetInput(aScalarMap->GetInput()); - } - } -} diff --git a/src/PIPELINE/VISU_PrsMergerPL.hxx b/src/PIPELINE/VISU_PrsMergerPL.hxx deleted file mode 100644 index 7dc0dac8..00000000 --- a/src/PIPELINE/VISU_PrsMergerPL.hxx +++ /dev/null @@ -1,194 +0,0 @@ -// VISU OBJECT : interactive object for VISU entities implementation -// -// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com -// -// -// File: VISU_PrsMergerPL.hxx -// Author: Eugeny Nikolaev -// Module : VISU - -#ifndef VISU_PrsMergerPL_HeaderFile -#define VISU_PrsMergerPL_HeaderFile - -#include "VISUPipeline.hxx" - -#include "VISU_ScalarMapPL.hxx" - -class VISU_AppendFilter; -class VISU_MergeFilter; - - -class VISU_PIPELINE_EXPORT VISU_PrsMergerPL : public VISU_ScalarMapPL -{ - typedef VISU_ScalarMapPL TSupperClass; - -protected: - VISU_PrsMergerPL(); - VISU_PrsMergerPL(const VISU_PrsMergerPL&); - - virtual - ~VISU_PrsMergerPL(); - -public: - - typedef TVTKSmartPtr TPipeLine; - typedef std::vector TPipeLines; - - vtkTypeMacro(VISU_PrsMergerPL,TSupperClass); - - static - VISU_PrsMergerPL* - New(); - - virtual - void - ShallowCopy(VISU_PipeLine *thePipeLine); - - /*! - * Add geometry of presentation to myMeshGeometryList. - * \params theGeometry - visu pipeline with geometry. - * \params theUpdate - update pipeline if true. - * \retval TRUE - if geometry and scalars on the common mesh, esle FALSE. - */ - virtual - bool - SetGeometry(VISU_PipeLine* theGeometry,bool theUpdate=true); - - /*! - * Add geometry to back of myMeshGeometryList. - * \params theInput - visu pipeline with geometry. - * \params theUpdate - update pipeline if true. - * \retval index of added geometry. (must be >= 0) - * \retval -1, if geometry not added. - */ - virtual - int - AddBackGeometry(VISU_PipeLine* theGeometry,bool theUpdate=true); - - /*! - * Get geometry id of myMeshGeometryList. - * \retval index of geometry. (must be >= 0) - * \retval -1 - if geometry not exists. - */ - virtual - int - GetGeometryNumber(VISU_PipeLine* theGeometry); - - /*! - * Remove geometry with id = theId from myMeshGeometryList. - * the id in [0,...] - */ - virtual - void - RemoveGeometryById(int theId); - - /*! Removes all geometries. - */ - virtual - void - RemoveAllGeom(); - - /*! - * Gets geometry of presentation by id. - * \retval VISU_MeshPL - pointer - * the id in [0,...] - */ - virtual - VISU_PipeLine* - GetGeometry(int theId=0); - - /*! - * Gets number of geometrys - * \retval int - number - */ - virtual - int - GetNbGeometry(); - - /*! - * Sets scalar values and ids by VISU_ScalarMapPL object. - * \params theInput - visu pipeline with scalar values - * \params theUpdate - update pipeline if true. - * \retval TRUE - if scalars and geometry on the common mesh, esle FALSE. - */ - virtual - bool - SetScalars(VISU_PipeLine* theInput,bool theUpdate=false); - - /*! - * Gets input VISU_ScalarMapPL, which contain scalar values and ids. - */ - virtual - VISU_PipeLine* - GetScalars(); - - virtual - void - Init(); - - virtual - void - Build(); - - /*! - * Calculate presentation, by merging of Geometry and Scalar Values. - */ - virtual - void - Update(); - - /*! - * Set ranges of scalar values by input myScalars ranges. - */ - void SetInitialRange(); - -protected: - TPipeLines myMeshGeometryList; - vtkSmartPointer myAppendFilter; - vtkSmartPointer myMergeFilter; - - vtkFloatingPointType* myScalarRanges; - TPipeLine myScalars; - -private: - - /*! - * Check if thePipeLine and "first element of list myMeshGeometryList" or - * "myScalars", has - * common DataPoints (simple check number of points). - * \retval TRUE - if has common points, esle FALSE. - */ - bool - checkGeometry(const VISU_PipeLine* thePipeLine); - - - /*! - * Check if thePipeLine and first element of list myMeshGeometryList, has - * common DataPoints (simple check number of points). - * \retval TRUE - if has common points, esle FALSE. - */ - bool - checkScalars(const VISU_PipeLine* thePipeLine); - - void - Execute(); -}; - -#endif diff --git a/src/PIPELINE/VISU_ScalarMapPL.cxx b/src/PIPELINE/VISU_ScalarMapPL.cxx index 44c0216d..14068d04 100644 --- a/src/PIPELINE/VISU_ScalarMapPL.cxx +++ b/src/PIPELINE/VISU_ScalarMapPL.cxx @@ -32,8 +32,10 @@ #include "VISU_AppendFilter.hxx" #include "VISU_MergeFilter.hxx" +#include "VISU_ConvertorUtils.hxx" #include +#include #include #include @@ -115,17 +117,18 @@ VISU_ScalarMapPL ::InsertCustomPL() { vtkDataSet* aDataSet = Superclass::InsertCustomPL(); - myMergeFilter->SetGeometry(myAppendFilter->GetOutput()); - myAppendFilter->SetSharedPointSet(GetFieldTransformFilter()->GetUnstructuredGridOutput()); + myAppendFilter->AddInput(aDataSet); + + vtkPointSet* aPointSet = GetDataSetMapperHolder()->GetUnstructuredGridInput(); + myAppendFilter->SetSharedPointSet(aPointSet); + myMergeFilter->SetGeometry(myAppendFilter->GetOutput()); myMergeFilter->SetScalars(aDataSet); myMergeFilter->SetVectors(aDataSet); - - myMergeFilter->RemoveFields(); myMergeFilter->AddField("VISU_FIELD", aDataSet); myMergeFilter->AddField("VISU_CELLS_MAPPER", aDataSet); myMergeFilter->AddField("VISU_POINTS_MAPPER", aDataSet); - + return myMergeFilter->GetOutput(); } diff --git a/src/VISUGUI/Makefile.am b/src/VISUGUI/Makefile.am new file mode 100644 index 00000000..8e193f5a --- /dev/null +++ b/src/VISUGUI/Makefile.am @@ -0,0 +1,122 @@ +# VISU VISUGUI : GUI of VISU component +# +# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# +# +# File : Makefile.am +# Author : Marc Tajchman (CEA) +# Module : VISU +# $Header$ + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +lib_LTLIBRARIES= libVISU.la + +salomeinclude_HEADERS= VisuGUI_Tools.h + +# .po files to transform in .qm +nodist_salomeres_DATA= \ + VISU_msg_en.qm VISU_images.qm + +dist_libVISU_la_SOURCES= \ + VisuGUI.cxx \ + VisuGUI_Factory.cxx \ + VisuGUI_Module.cxx \ + VisuGUI_Selection.cxx \ + VisuGUI_Tools.cxx \ + VisuGUI_ViewTools.cxx \ + VisuGUI_PopupTools.cxx \ + VisuGUI_NameDlg.cxx \ + VisuGUI_FileDlg.cxx \ + VisuGUI_CursorDlg.cxx \ + VisuGUI_TimeAnimation.cxx \ + VisuGUI_EditContainerDlg.cxx \ + VisuGUI_ClippingDlg.cxx \ + VisuGUI_DialogRunner.cxx \ + VisuGUI_OffsetDlg.cxx \ + VisuGUI_Prs3dDlg.cxx \ + VisuGUI_ScalarBarDlg.cxx \ + VisuGUI_Plot3DDlg.cxx \ + VisuGUI_GaussPointsDlg.cxx \ + VisuGUI_DeformedShapeDlg.cxx \ + VisuGUI_IsoSurfacesDlg.cxx \ + VisuGUI_CutLinesDlg.cxx \ + VisuGUI_CutPlanesDlg.cxx \ + VisuGUI_StreamLinesDlg.cxx \ + VisuGUI_VectorsDlg.cxx \ + VisuGUI_Displayer.cxx \ + VisuGUI_ScalarMapOnDeformedShapeDlg.cxx \ + VisuGUI_SetupPlot2dDlg.cxx \ + VisuGUI_BuildProgressDlg.cxx \ + VisuGUI_TransparencyDlg.cxx \ + VisuGUI_Timer.cxx \ + VisuGUI_Slider.cxx \ + VisuGUI_InputPane.cxx \ + VisuGUI_CacheDlg.cxx \ + VisuGUI_FieldFilter.cxx + +MOC_FILES= \ + VisuGUI_moc.cxx \ + VisuGUI_Module_moc.cxx \ + VisuGUI_Selection_moc.cxx \ + VisuGUI_NameDlg_moc.cxx \ + VisuGUI_FileDlg_moc.cxx \ + VisuGUI_CursorDlg_moc.cxx \ + VisuGUI_TimeAnimation_moc.cxx \ + VisuGUI_EditContainerDlg_moc.cxx \ + VisuGUI_ClippingDlg_moc.cxx \ + VisuGUI_DialogRunner_moc.cxx \ + VisuGUI_OffsetDlg_moc.cxx \ + VisuGUI_Prs3dDlg_moc.cxx \ + VisuGUI_ScalarBarDlg_moc.cxx \ + VisuGUI_Plot3DDlg_moc.cxx \ + VisuGUI_GaussPointsDlg_moc.cxx \ + VisuGUI_DeformedShapeDlg_moc.cxx \ + VisuGUI_IsoSurfacesDlg_moc.cxx \ + VisuGUI_CutLinesDlg_moc.cxx \ + VisuGUI_CutPlanesDlg_moc.cxx \ + VisuGUI_StreamLinesDlg_moc.cxx \ + VisuGUI_VectorsDlg_moc.cxx \ + VisuGUI_ScalarMapOnDeformedShapeDlg_moc.cxx \ + VisuGUI_SetupPlot2dDlg_moc.cxx \ + VisuGUI_BuildProgressDlg_moc.cxx \ + VisuGUI_TransparencyDlg_moc.cxx \ + VisuGUI_Slider_moc.cxx \ + VisuGUI_InputPane_moc.cxx \ + VisuGUI_CacheDlg_moc.cxx + +nodist_libVISU_la_SOURCES=$(MOC_FILES) + +# additionnal information to compil and link file +libVISU_la_CPPFLAGS= \ + -ftemplate-depth-32 $(QT_INCLUDES) $(VTK_INCLUDES) @CAS_CXXFLAGS@ @CAS_CPPFLAGS@ \ + $(PYTHON_INCLUDES) $(HDF5_INCLUDES) $(QWT_INCLUDES) \ + $(KERNEL_CXXFLAGS) \ + $(MED_CXXFLAGS) \ + $(BOOST_CPPFLAGS) \ + $(GUI_CXXFLAGS) \ + $(CORBA_CXXFLAGS) $(CORBA_INCLUDES) \ + -I$(srcdir)/../VVTK -I$(srcdir)/../OBJECT -I$(srcdir)/../VISU_I -I$(srcdir)/../GUITOOLS \ + -I$(top_builddir)/idl -I$(srcdir)/../CONVERTOR -I$(srcdir)/../PIPELINE -I$(top_builddir)/salome_adm/unix + +libVISU_la_LDFLAGS= $(QWT_LIBS) -lSalomeNS $(KERNEL_LDFLAGS) $(GUI_LDFLAGS) -lSVTK -lSPlot2d \ + ../VVTK/libVVTK.la ../OBJECT/libVisuObject.la ../VISU_I/libVISUEngineImpl.la ../GUITOOLS/libVISUGUITOOLS.la \ + ../../idl/libSalomeIDLVISU.la diff --git a/src/VISUGUI/Makefile.in b/src/VISUGUI/Makefile.in index 51f876d7..efed931f 100644 --- a/src/VISUGUI/Makefile.in +++ b/src/VISUGUI/Makefile.in @@ -1,3 +1,19 @@ +# Makefile.in generated by automake 1.9.5 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + # VISU VISUGUI : GUI of VISU component # # Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, @@ -21,124 +37,1350 @@ # # # -# File : Makefile.in +# File : Makefile.am # Author : Marc Tajchman (CEA) # Module : VISU # $Header$ -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@ +# +# ============================================================ +# This file defines the common definitions used in several +# Makefile. This file must be included, if needed, by the file +# Makefile.am. +# ============================================================ +# + + + +SOURCES = $(dist_libVISU_la_SOURCES) $(nodist_libVISU_la_SOURCES) -@COMMENCE@ +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = ../.. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +DIST_COMMON = $(salomeinclude_HEADERS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in \ + $(top_srcdir)/adm_local/unix/make_common_starter.am +subdir = ./src/VISUGUI +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_depend_flag.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_have_sstream.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_namespaces.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_option.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_use_std_iostream.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/ac_linker_options.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/acx_pthread.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/check_Kernel.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/check_boost.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/check_cas.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/check_corba.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/check_hdf5.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/check_htmlgen.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/check_mpich.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/check_omniorb.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/check_opengl.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/check_qt.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/check_swig.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/enable_pthreads.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/production.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/python.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_CLEAN_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(salomeresdir)" \ + "$(DESTDIR)$(salomeincludedir)" +libLTLIBRARIES_INSTALL = $(INSTALL) +LTLIBRARIES = $(lib_LTLIBRARIES) +libVISU_la_LIBADD = +dist_libVISU_la_OBJECTS = libVISU_la-VisuGUI.lo \ + libVISU_la-VisuGUI_Factory.lo libVISU_la-VisuGUI_Module.lo \ + libVISU_la-VisuGUI_Selection.lo libVISU_la-VisuGUI_Tools.lo \ + libVISU_la-VisuGUI_ViewTools.lo \ + libVISU_la-VisuGUI_PopupTools.lo libVISU_la-VisuGUI_NameDlg.lo \ + libVISU_la-VisuGUI_FileDlg.lo libVISU_la-VisuGUI_CursorDlg.lo \ + libVISU_la-VisuGUI_TimeAnimation.lo \ + libVISU_la-VisuGUI_EditContainerDlg.lo \ + libVISU_la-VisuGUI_ClippingDlg.lo \ + libVISU_la-VisuGUI_DialogRunner.lo \ + libVISU_la-VisuGUI_OffsetDlg.lo libVISU_la-VisuGUI_Prs3dDlg.lo \ + libVISU_la-VisuGUI_ScalarBarDlg.lo \ + libVISU_la-VisuGUI_Plot3DDlg.lo \ + libVISU_la-VisuGUI_GaussPointsDlg.lo \ + libVISU_la-VisuGUI_DeformedShapeDlg.lo \ + libVISU_la-VisuGUI_IsoSurfacesDlg.lo \ + libVISU_la-VisuGUI_CutLinesDlg.lo \ + libVISU_la-VisuGUI_CutPlanesDlg.lo \ + libVISU_la-VisuGUI_StreamLinesDlg.lo \ + libVISU_la-VisuGUI_VectorsDlg.lo \ + libVISU_la-VisuGUI_Displayer.lo \ + libVISU_la-VisuGUI_ScalarMapOnDeformedShapeDlg.lo \ + libVISU_la-VisuGUI_SetupPlot2dDlg.lo \ + libVISU_la-VisuGUI_BuildProgressDlg.lo \ + libVISU_la-VisuGUI_TransparencyDlg.lo \ + libVISU_la-VisuGUI_Timer.lo libVISU_la-VisuGUI_Slider.lo \ + libVISU_la-VisuGUI_InputPane.lo libVISU_la-VisuGUI_CacheDlg.lo \ + libVISU_la-VisuGUI_FieldFilter.lo +am__objects_1 = libVISU_la-VisuGUI_moc.lo \ + libVISU_la-VisuGUI_Module_moc.lo \ + libVISU_la-VisuGUI_Selection_moc.lo \ + libVISU_la-VisuGUI_NameDlg_moc.lo \ + libVISU_la-VisuGUI_FileDlg_moc.lo \ + libVISU_la-VisuGUI_CursorDlg_moc.lo \ + libVISU_la-VisuGUI_TimeAnimation_moc.lo \ + libVISU_la-VisuGUI_EditContainerDlg_moc.lo \ + libVISU_la-VisuGUI_ClippingDlg_moc.lo \ + libVISU_la-VisuGUI_DialogRunner_moc.lo \ + libVISU_la-VisuGUI_OffsetDlg_moc.lo \ + libVISU_la-VisuGUI_Prs3dDlg_moc.lo \ + libVISU_la-VisuGUI_ScalarBarDlg_moc.lo \ + libVISU_la-VisuGUI_Plot3DDlg_moc.lo \ + libVISU_la-VisuGUI_GaussPointsDlg_moc.lo \ + libVISU_la-VisuGUI_DeformedShapeDlg_moc.lo \ + libVISU_la-VisuGUI_IsoSurfacesDlg_moc.lo \ + libVISU_la-VisuGUI_CutLinesDlg_moc.lo \ + libVISU_la-VisuGUI_CutPlanesDlg_moc.lo \ + libVISU_la-VisuGUI_StreamLinesDlg_moc.lo \ + libVISU_la-VisuGUI_VectorsDlg_moc.lo \ + libVISU_la-VisuGUI_ScalarMapOnDeformedShapeDlg_moc.lo \ + libVISU_la-VisuGUI_SetupPlot2dDlg_moc.lo \ + libVISU_la-VisuGUI_BuildProgressDlg_moc.lo \ + libVISU_la-VisuGUI_TransparencyDlg_moc.lo \ + libVISU_la-VisuGUI_Slider_moc.lo \ + libVISU_la-VisuGUI_InputPane_moc.lo \ + libVISU_la-VisuGUI_CacheDlg_moc.lo +nodist_libVISU_la_OBJECTS = $(am__objects_1) +libVISU_la_OBJECTS = $(dist_libVISU_la_OBJECTS) \ + $(nodist_libVISU_la_OBJECTS) +DEFAULT_INCLUDES = -I. -I$(srcdir) +depcomp = $(SHELL) $(top_srcdir)/salome_adm/unix/config_files/depcomp +am__depfiles_maybe = depfiles +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +CXXLD = $(CXX) +CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = $(dist_libVISU_la_SOURCES) $(nodist_libVISU_la_SOURCES) +DIST_SOURCES = $(dist_libVISU_la_SOURCES) +nodist_salomeresDATA_INSTALL = $(INSTALL_DATA) +DATA = $(nodist_salomeres_DATA) +salomeincludeHEADERS_INSTALL = $(INSTALL_HEADER) +HEADERS = $(salomeinclude_HEADERS) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ +BOOST_LIBS = @BOOST_LIBS@ +BOOST_LIBSUFFIX = @BOOST_LIBSUFFIX@ +BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@ +CAS_CPPFLAGS = @CAS_CPPFLAGS@ +CAS_CXXFLAGS = @CAS_CXXFLAGS@ +CAS_DATAEXCHANGE = @CAS_DATAEXCHANGE@ +CAS_KERNEL = @CAS_KERNEL@ +CAS_LDFLAGS = @CAS_LDFLAGS@ +CAS_LDPATH = @CAS_LDPATH@ +CAS_MATH = @CAS_MATH@ +CAS_MODELER = @CAS_MODELER@ +CAS_OCAF = @CAS_OCAF@ +CAS_OCAFVIS = @CAS_OCAFVIS@ +CAS_STDPLUGIN = @CAS_STDPLUGIN@ +CAS_TKTopAlgo = @CAS_TKTopAlgo@ +CAS_VIEWER = @CAS_VIEWER@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CORBA_CXXFLAGS = @CORBA_CXXFLAGS@ +CORBA_INCLUDES = @CORBA_INCLUDES@ +CORBA_IN_GUI = @CORBA_IN_GUI@ +CORBA_LIBS = @CORBA_LIBS@ +CORBA_ROOT = @CORBA_ROOT@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CXX_DEPEND_FLAG = @CXX_DEPEND_FLAG@ +CYGPATH_W = @CYGPATH_W@ +C_DEPEND_FLAG = @C_DEPEND_FLAG@ +DEFS = @DEFS@ +DEPCC = @DEPCC@ +DEPCXX = @DEPCXX@ +DEPCXXFLAGS = @DEPCXXFLAGS@ +DEPDIR = @DEPDIR@ +DOT = @DOT@ +DOXYGEN = @DOXYGEN@ +DOXYGEN_WITH_PYTHON = @DOXYGEN_WITH_PYTHON@ +DOXYGEN_WITH_STL = @DOXYGEN_WITH_STL@ +DVIPS = @DVIPS@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GUI_CXXFLAGS = @GUI_CXXFLAGS@ +GUI_LDFLAGS = @GUI_LDFLAGS@ +GUI_ROOT_DIR = @GUI_ROOT_DIR@ +HAVE_SSTREAM = @HAVE_SSTREAM@ +HDF5_INCLUDES = @HDF5_INCLUDES@ +HDF5_LIBS = @HDF5_LIBS@ +HDF5_MT_LIBS = @HDF5_MT_LIBS@ +IDL = @IDL@ +IDLCXXFLAGS = @IDLCXXFLAGS@ +IDLPYFLAGS = @IDLPYFLAGS@ +IDL_CLN_CXX = @IDL_CLN_CXX@ +IDL_CLN_H = @IDL_CLN_H@ +IDL_CLN_OBJ = @IDL_CLN_OBJ@ +IDL_SRV_CXX = @IDL_SRV_CXX@ +IDL_SRV_H = @IDL_SRV_H@ +IDL_SRV_OBJ = @IDL_SRV_OBJ@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +KERNEL_CXXFLAGS = @KERNEL_CXXFLAGS@ +KERNEL_LDFLAGS = @KERNEL_LDFLAGS@ +KERNEL_ROOT_DIR = @KERNEL_ROOT_DIR@ +KERNEL_SITE_DIR = @KERNEL_SITE_DIR@ +LATEX = @LATEX@ +LDEXPDYNFLAGS = @LDEXPDYNFLAGS@ +LDFLAGS = @LDFLAGS@ +LEX = @LEX@ +LEXLIB = @LEXLIB@ +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIB_LOCATION_SUFFIX = @LIB_LOCATION_SUFFIX@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MACHINE = @MACHINE@ +MAKEINFO = @MAKEINFO@ +MED_CXXFLAGS = @MED_CXXFLAGS@ +MED_LDFLAGS = @MED_LDFLAGS@ +MED_ROOT_DIR = @MED_ROOT_DIR@ +MOC = @MOC@ +MODULE_NAME = @MODULE_NAME@ +MSG2QM = @MSG2QM@ +OBJEXT = @OBJEXT@ +OGL_INCLUDES = @OGL_INCLUDES@ +OGL_LIBS = @OGL_LIBS@ +OMNIORB_CXXFLAGS = @OMNIORB_CXXFLAGS@ +OMNIORB_IDL = @OMNIORB_IDL@ +OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@ +OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ +OMNIORB_IDL_CLN_CXX = @OMNIORB_IDL_CLN_CXX@ +OMNIORB_IDL_CLN_H = @OMNIORB_IDL_CLN_H@ +OMNIORB_IDL_CLN_OBJ = @OMNIORB_IDL_CLN_OBJ@ +OMNIORB_IDL_SRV_CXX = @OMNIORB_IDL_SRV_CXX@ +OMNIORB_IDL_SRV_H = @OMNIORB_IDL_SRV_H@ +OMNIORB_IDL_SRV_OBJ = @OMNIORB_IDL_SRV_OBJ@ +OMNIORB_IDL_TIE_CXX = @OMNIORB_IDL_TIE_CXX@ +OMNIORB_IDL_TIE_H = @OMNIORB_IDL_TIE_H@ +OMNIORB_INCLUDES = @OMNIORB_INCLUDES@ +OMNIORB_LIBS = @OMNIORB_LIBS@ +OMNIORB_ROOT = @OMNIORB_ROOT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PDFLATEX = @PDFLATEX@ +PTHREAD_CC = @PTHREAD_CC@ +PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ +PTHREAD_LIBS = @PTHREAD_LIBS@ +PYTHON = @PYTHON@ +PYTHONHOME = @PYTHONHOME@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_INCLUDES = @PYTHON_INCLUDES@ +PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_SITE = @PYTHON_SITE@ +PYTHON_SITE_EXEC = @PYTHON_SITE_EXEC@ +PYTHON_SITE_INSTALL = @PYTHON_SITE_INSTALL@ +PYTHON_SITE_PACKAGE = @PYTHON_SITE_PACKAGE@ +PYTHON_VERSION = @PYTHON_VERSION@ +QTDIR = @QTDIR@ +QT_INCLUDES = @QT_INCLUDES@ +QT_LIBS = @QT_LIBS@ +QT_MT_INCLUDES = @QT_MT_INCLUDES@ +QT_MT_LIBS = @QT_MT_LIBS@ +QT_ROOT = @QT_ROOT@ +QT_VERS = @QT_VERS@ +QWT_INCLUDES = @QWT_INCLUDES@ +QWT_LIBS = @QWT_LIBS@ +RANLIB = @RANLIB@ +ROOT_BUILDDIR = @ROOT_BUILDDIR@ +ROOT_SRCDIR = @ROOT_SRCDIR@ +RST2HTML = @RST2HTML@ +RST2HTML_IS_OK_FALSE = @RST2HTML_IS_OK_FALSE@ +RST2HTML_IS_OK_TRUE = @RST2HTML_IS_OK_TRUE@ +SETX = @SETX@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STDLIB = @STDLIB@ +STRIP = @STRIP@ +SWIG = @SWIG@ +SWIG_FLAGS = @SWIG_FLAGS@ +TEMP = @TEMP@ +UIC = @UIC@ +VERSION = @VERSION@ +VTKPY_MODULES = @VTKPY_MODULES@ +VTK_INCLUDES = @VTK_INCLUDES@ +VTK_LIBS = @VTK_LIBS@ +XVERSION = @XVERSION@ +YACC = @YACC@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +acx_pthread_config = @acx_pthread_config@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = $(prefix)/bin/@PACKAGE@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = $(prefix)/lib@LIB_LOCATION_SUFFIX@/@PACKAGE@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ -# header files -EXPORT_HEADERS= \ - VisuGUI_Tools.h +# Standard directory for installation +salomeincludedir = $(includedir)/@PACKAGE@ +purebindir = $(prefix)/bin +salomescriptdir = $(bindir) + +# Tests environment folders +testsenvirondir = $(prefix)/Tests/environ +testsenvironcshdir = $(prefix)/Tests/environ/csh + +# Directory for installing idl files +salomeidldir = $(prefix)/idl/@PACKAGE@ + +# Directory for installing resource files +salomeresdir = $(prefix)/share/@PACKAGE@/resources/@MODULE_NAME@ + +# Directories for installing admin files +admlocaldir = $(prefix)/adm_local +admlocalunixdir = $(admlocaldir)/unix +admlocalm4dir = $(admlocaldir)/unix/config_files + +# Shared modules installation directory +sharedpkgpythondir = $(pkgpythondir)/shared_modules + +# Documentation directory +docdir = $(datadir)/doc/@PACKAGE@ +EXTRA_DIST = $(MOC_FILES:%_moc.cxx=%.h) $(nodist_salomeres_DATA:%.qm=%.po) +lib_LTLIBRARIES = libVISU.la +salomeinclude_HEADERS = VisuGUI_Tools.h # .po files to transform in .qm -PO_FILES = \ - VISU_msg_en.po VISU_images.po - -# Libraries targets -LIB = libVISU.la -#LIB_SRC = VisuGUI_SweepPrefDlg.cxx -#LIB_MOC = VisuGUI_SweepPrefDlg.h - -LIB_SRC = VisuGUI.cxx \ - VisuGUI_Factory.cxx \ - VisuGUI_Module.cxx \ - VisuGUI_Selection.cxx \ - VisuGUI_Tools.cxx \ - VisuGUI_ViewTools.cxx \ - VisuGUI_PopupTools.cxx \ - VisuGUI_NameDlg.cxx \ - VisuGUI_FileDlg.cxx \ - VisuGUI_CursorDlg.cxx \ - VisuGUI_TimeAnimation.cxx \ - VisuGUI_EditContainerDlg.cxx \ - VisuGUI_ClippingDlg.cxx \ - VisuGUI_DialogRunner.cxx \ - VisuGUI_OffsetDlg.cxx \ - VisuGUI_Prs3dDlg.cxx \ - VisuGUI_ScalarBarDlg.cxx \ - VisuGUI_Plot3DDlg.cxx \ - VisuGUI_GaussPointsDlg.cxx \ - VisuGUI_DeformedShapeDlg.cxx \ - VisuGUI_IsoSurfacesDlg.cxx \ - VisuGUI_CutLinesDlg.cxx \ - VisuGUI_CutPlanesDlg.cxx \ - VisuGUI_StreamLinesDlg.cxx \ - VisuGUI_VectorsDlg.cxx \ - VisuGUI_Displayer.cxx \ - VisuGUI_ScalarMapOnDeformedShapeDlg.cxx \ - VisuGUI_SetupPlot2dDlg.cxx \ - VisuGUI_BuildProgressDlg.cxx \ - VisuGUI_TransparencyDlg.cxx \ - VisuGUI_Timer.cxx \ - VisuGUI_Slider.cxx \ - VisuGUI_InputPane.cxx \ - VisuGUI_CacheDlg.cxx \ - VisuGUI_FieldFilter.cxx - -LIB_MOC = VisuGUI.h \ - VisuGUI_Module.h \ - VisuGUI_Selection.h \ - VisuGUI_NameDlg.h \ - VisuGUI_FileDlg.h \ - VisuGUI_CursorDlg.h \ - VisuGUI_TimeAnimation.h \ - VisuGUI_EditContainerDlg.h \ - VisuGUI_ClippingDlg.h \ - VisuGUI_DialogRunner.h \ - VisuGUI_OffsetDlg.h \ - VisuGUI_Prs3dDlg.h \ - VisuGUI_ScalarBarDlg.h \ - VisuGUI_Plot3DDlg.h \ - VisuGUI_GaussPointsDlg.h \ - VisuGUI_DeformedShapeDlg.h \ - VisuGUI_IsoSurfacesDlg.h \ - VisuGUI_CutLinesDlg.h \ - VisuGUI_CutPlanesDlg.h \ - VisuGUI_StreamLinesDlg.h \ - VisuGUI_VectorsDlg.h \ - VisuGUI_ScalarMapOnDeformedShapeDlg.h \ - VisuGUI_SetupPlot2dDlg.h \ - VisuGUI_BuildProgressDlg.h \ - VisuGUI_TransparencyDlg.h \ - VisuGUI_Slider.h \ - VisuGUI_InputPane.h \ - VisuGUI_CacheDlg.h - -LIB_CLIENT_IDL = SALOME_Exception.idl \ - VISU_Gen.idl \ - MED_Gen.idl \ - MED.idl \ - SALOMEDS.idl \ - SALOME_GenericObj.idl \ - SALOME_ModuleCatalog.idl \ - SALOME_Component.idl \ - SALOMEDS_Attributes.idl \ - SALOME_Comm.idl - -LIB_SERVER_IDL = +nodist_salomeres_DATA = \ + VISU_msg_en.qm VISU_images.qm -# additionnal information to compil and link file +dist_libVISU_la_SOURCES = \ + VisuGUI.cxx \ + VisuGUI_Factory.cxx \ + VisuGUI_Module.cxx \ + VisuGUI_Selection.cxx \ + VisuGUI_Tools.cxx \ + VisuGUI_ViewTools.cxx \ + VisuGUI_PopupTools.cxx \ + VisuGUI_NameDlg.cxx \ + VisuGUI_FileDlg.cxx \ + VisuGUI_CursorDlg.cxx \ + VisuGUI_TimeAnimation.cxx \ + VisuGUI_EditContainerDlg.cxx \ + VisuGUI_ClippingDlg.cxx \ + VisuGUI_DialogRunner.cxx \ + VisuGUI_OffsetDlg.cxx \ + VisuGUI_Prs3dDlg.cxx \ + VisuGUI_ScalarBarDlg.cxx \ + VisuGUI_Plot3DDlg.cxx \ + VisuGUI_GaussPointsDlg.cxx \ + VisuGUI_DeformedShapeDlg.cxx \ + VisuGUI_IsoSurfacesDlg.cxx \ + VisuGUI_CutLinesDlg.cxx \ + VisuGUI_CutPlanesDlg.cxx \ + VisuGUI_StreamLinesDlg.cxx \ + VisuGUI_VectorsDlg.cxx \ + VisuGUI_Displayer.cxx \ + VisuGUI_ScalarMapOnDeformedShapeDlg.cxx \ + VisuGUI_SetupPlot2dDlg.cxx \ + VisuGUI_BuildProgressDlg.cxx \ + VisuGUI_TransparencyDlg.cxx \ + VisuGUI_Timer.cxx \ + VisuGUI_Slider.cxx \ + VisuGUI_InputPane.cxx \ + VisuGUI_CacheDlg.cxx \ + VisuGUI_FieldFilter.cxx + +MOC_FILES = \ + VisuGUI_moc.cxx \ + VisuGUI_Module_moc.cxx \ + VisuGUI_Selection_moc.cxx \ + VisuGUI_NameDlg_moc.cxx \ + VisuGUI_FileDlg_moc.cxx \ + VisuGUI_CursorDlg_moc.cxx \ + VisuGUI_TimeAnimation_moc.cxx \ + VisuGUI_EditContainerDlg_moc.cxx \ + VisuGUI_ClippingDlg_moc.cxx \ + VisuGUI_DialogRunner_moc.cxx \ + VisuGUI_OffsetDlg_moc.cxx \ + VisuGUI_Prs3dDlg_moc.cxx \ + VisuGUI_ScalarBarDlg_moc.cxx \ + VisuGUI_Plot3DDlg_moc.cxx \ + VisuGUI_GaussPointsDlg_moc.cxx \ + VisuGUI_DeformedShapeDlg_moc.cxx \ + VisuGUI_IsoSurfacesDlg_moc.cxx \ + VisuGUI_CutLinesDlg_moc.cxx \ + VisuGUI_CutPlanesDlg_moc.cxx \ + VisuGUI_StreamLinesDlg_moc.cxx \ + VisuGUI_VectorsDlg_moc.cxx \ + VisuGUI_ScalarMapOnDeformedShapeDlg_moc.cxx \ + VisuGUI_SetupPlot2dDlg_moc.cxx \ + VisuGUI_BuildProgressDlg_moc.cxx \ + VisuGUI_TransparencyDlg_moc.cxx \ + VisuGUI_Slider_moc.cxx \ + VisuGUI_InputPane_moc.cxx \ + VisuGUI_CacheDlg_moc.cxx -CPPFLAGS += -ftemplate-depth-32 $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) \ +nodist_libVISU_la_SOURCES = $(MOC_FILES) + +# additionnal information to compil and link file +libVISU_la_CPPFLAGS = \ + -ftemplate-depth-32 $(QT_INCLUDES) $(VTK_INCLUDES) @CAS_CXXFLAGS@ @CAS_CPPFLAGS@ \ $(PYTHON_INCLUDES) $(HDF5_INCLUDES) $(QWT_INCLUDES) \ $(KERNEL_CXXFLAGS) \ $(MED_CXXFLAGS) \ - $(BOOST_CPPFLAGS) -CXXFLAGS += -ftemplate-depth-32 $(OCC_CXXFLAGS) \ - $(KERNEL_CXXFLAGS) \ - $(GUI_CXXFLAGS) + $(BOOST_CPPFLAGS) \ + $(GUI_CXXFLAGS) \ + $(CORBA_CXXFLAGS) $(CORBA_INCLUDES) \ + -I$(srcdir)/../VVTK -I$(srcdir)/../OBJECT -I$(srcdir)/../VISU_I -I$(srcdir)/../GUITOOLS \ + -I$(top_builddir)/idl -I$(srcdir)/../CONVERTOR -I$(srcdir)/../PIPELINE -I$(top_builddir)/salome_adm/unix + +libVISU_la_LDFLAGS = $(QWT_LIBS) -lSalomeNS $(KERNEL_LDFLAGS) $(GUI_LDFLAGS) -lSVTK -lSPlot2d \ + ../VVTK/libVVTK.la ../OBJECT/libVisuObject.la ../VISU_I/libVISUEngineImpl.la ../GUITOOLS/libVISUGUITOOLS.la \ + ../../idl/libSalomeIDLVISU.la + +all: all-am + +.SUFFIXES: +.SUFFIXES: .cxx .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/adm_local/unix/make_common_starter.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu ./src/VISUGUI/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu ./src/VISUGUI/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ + echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ + $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ + else :; fi; \ + done + +uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ + done + +clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +libVISU.la: $(libVISU_la_OBJECTS) $(libVISU_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libVISU_la_LDFLAGS) $(libVISU_la_OBJECTS) $(libVISU_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_BuildProgressDlg.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_BuildProgressDlg_moc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_CacheDlg.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_CacheDlg_moc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_ClippingDlg.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_ClippingDlg_moc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_CursorDlg.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_CursorDlg_moc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_CutLinesDlg.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_CutLinesDlg_moc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_CutPlanesDlg.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_CutPlanesDlg_moc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_DeformedShapeDlg.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_DeformedShapeDlg_moc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_DialogRunner.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_DialogRunner_moc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_Displayer.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_EditContainerDlg.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_EditContainerDlg_moc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_Factory.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_FieldFilter.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_FileDlg.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_FileDlg_moc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_GaussPointsDlg.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_GaussPointsDlg_moc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_InputPane.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_InputPane_moc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_IsoSurfacesDlg.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_IsoSurfacesDlg_moc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_Module.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_Module_moc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_NameDlg.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_NameDlg_moc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_OffsetDlg.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_OffsetDlg_moc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_Plot3DDlg.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_Plot3DDlg_moc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_PopupTools.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_Prs3dDlg.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_Prs3dDlg_moc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_ScalarBarDlg.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_ScalarBarDlg_moc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_ScalarMapOnDeformedShapeDlg.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_ScalarMapOnDeformedShapeDlg_moc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_Selection.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_Selection_moc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_SetupPlot2dDlg.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_SetupPlot2dDlg_moc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_Slider.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_Slider_moc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_StreamLinesDlg.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_StreamLinesDlg_moc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_TimeAnimation.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_TimeAnimation_moc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_Timer.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_Tools.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_TransparencyDlg.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_TransparencyDlg_moc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_VectorsDlg.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_VectorsDlg_moc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_ViewTools.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_la-VisuGUI_moc.Plo@am__quote@ + +.cxx.o: +@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< + +.cxx.obj: +@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.cxx.lo: +@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< + +libVISU_la-VisuGUI.lo: VisuGUI.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI.Tpo" -c -o libVISU_la-VisuGUI.lo `test -f 'VisuGUI.cxx' || echo '$(srcdir)/'`VisuGUI.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI.cxx' object='libVISU_la-VisuGUI.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI.lo `test -f 'VisuGUI.cxx' || echo '$(srcdir)/'`VisuGUI.cxx + +libVISU_la-VisuGUI_Factory.lo: VisuGUI_Factory.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_Factory.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_Factory.Tpo" -c -o libVISU_la-VisuGUI_Factory.lo `test -f 'VisuGUI_Factory.cxx' || echo '$(srcdir)/'`VisuGUI_Factory.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_Factory.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_Factory.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_Factory.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_Factory.cxx' object='libVISU_la-VisuGUI_Factory.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_Factory.lo `test -f 'VisuGUI_Factory.cxx' || echo '$(srcdir)/'`VisuGUI_Factory.cxx + +libVISU_la-VisuGUI_Module.lo: VisuGUI_Module.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_Module.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_Module.Tpo" -c -o libVISU_la-VisuGUI_Module.lo `test -f 'VisuGUI_Module.cxx' || echo '$(srcdir)/'`VisuGUI_Module.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_Module.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_Module.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_Module.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_Module.cxx' object='libVISU_la-VisuGUI_Module.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_Module.lo `test -f 'VisuGUI_Module.cxx' || echo '$(srcdir)/'`VisuGUI_Module.cxx + +libVISU_la-VisuGUI_Selection.lo: VisuGUI_Selection.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_Selection.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_Selection.Tpo" -c -o libVISU_la-VisuGUI_Selection.lo `test -f 'VisuGUI_Selection.cxx' || echo '$(srcdir)/'`VisuGUI_Selection.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_Selection.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_Selection.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_Selection.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_Selection.cxx' object='libVISU_la-VisuGUI_Selection.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_Selection.lo `test -f 'VisuGUI_Selection.cxx' || echo '$(srcdir)/'`VisuGUI_Selection.cxx + +libVISU_la-VisuGUI_Tools.lo: VisuGUI_Tools.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_Tools.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_Tools.Tpo" -c -o libVISU_la-VisuGUI_Tools.lo `test -f 'VisuGUI_Tools.cxx' || echo '$(srcdir)/'`VisuGUI_Tools.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_Tools.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_Tools.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_Tools.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_Tools.cxx' object='libVISU_la-VisuGUI_Tools.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_Tools.lo `test -f 'VisuGUI_Tools.cxx' || echo '$(srcdir)/'`VisuGUI_Tools.cxx + +libVISU_la-VisuGUI_ViewTools.lo: VisuGUI_ViewTools.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_ViewTools.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_ViewTools.Tpo" -c -o libVISU_la-VisuGUI_ViewTools.lo `test -f 'VisuGUI_ViewTools.cxx' || echo '$(srcdir)/'`VisuGUI_ViewTools.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_ViewTools.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_ViewTools.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_ViewTools.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_ViewTools.cxx' object='libVISU_la-VisuGUI_ViewTools.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_ViewTools.lo `test -f 'VisuGUI_ViewTools.cxx' || echo '$(srcdir)/'`VisuGUI_ViewTools.cxx + +libVISU_la-VisuGUI_PopupTools.lo: VisuGUI_PopupTools.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_PopupTools.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_PopupTools.Tpo" -c -o libVISU_la-VisuGUI_PopupTools.lo `test -f 'VisuGUI_PopupTools.cxx' || echo '$(srcdir)/'`VisuGUI_PopupTools.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_PopupTools.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_PopupTools.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_PopupTools.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_PopupTools.cxx' object='libVISU_la-VisuGUI_PopupTools.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_PopupTools.lo `test -f 'VisuGUI_PopupTools.cxx' || echo '$(srcdir)/'`VisuGUI_PopupTools.cxx + +libVISU_la-VisuGUI_NameDlg.lo: VisuGUI_NameDlg.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_NameDlg.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_NameDlg.Tpo" -c -o libVISU_la-VisuGUI_NameDlg.lo `test -f 'VisuGUI_NameDlg.cxx' || echo '$(srcdir)/'`VisuGUI_NameDlg.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_NameDlg.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_NameDlg.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_NameDlg.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_NameDlg.cxx' object='libVISU_la-VisuGUI_NameDlg.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_NameDlg.lo `test -f 'VisuGUI_NameDlg.cxx' || echo '$(srcdir)/'`VisuGUI_NameDlg.cxx + +libVISU_la-VisuGUI_FileDlg.lo: VisuGUI_FileDlg.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_FileDlg.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_FileDlg.Tpo" -c -o libVISU_la-VisuGUI_FileDlg.lo `test -f 'VisuGUI_FileDlg.cxx' || echo '$(srcdir)/'`VisuGUI_FileDlg.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_FileDlg.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_FileDlg.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_FileDlg.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_FileDlg.cxx' object='libVISU_la-VisuGUI_FileDlg.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_FileDlg.lo `test -f 'VisuGUI_FileDlg.cxx' || echo '$(srcdir)/'`VisuGUI_FileDlg.cxx + +libVISU_la-VisuGUI_CursorDlg.lo: VisuGUI_CursorDlg.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_CursorDlg.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_CursorDlg.Tpo" -c -o libVISU_la-VisuGUI_CursorDlg.lo `test -f 'VisuGUI_CursorDlg.cxx' || echo '$(srcdir)/'`VisuGUI_CursorDlg.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_CursorDlg.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_CursorDlg.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_CursorDlg.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_CursorDlg.cxx' object='libVISU_la-VisuGUI_CursorDlg.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_CursorDlg.lo `test -f 'VisuGUI_CursorDlg.cxx' || echo '$(srcdir)/'`VisuGUI_CursorDlg.cxx + +libVISU_la-VisuGUI_TimeAnimation.lo: VisuGUI_TimeAnimation.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_TimeAnimation.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_TimeAnimation.Tpo" -c -o libVISU_la-VisuGUI_TimeAnimation.lo `test -f 'VisuGUI_TimeAnimation.cxx' || echo '$(srcdir)/'`VisuGUI_TimeAnimation.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_TimeAnimation.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_TimeAnimation.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_TimeAnimation.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_TimeAnimation.cxx' object='libVISU_la-VisuGUI_TimeAnimation.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_TimeAnimation.lo `test -f 'VisuGUI_TimeAnimation.cxx' || echo '$(srcdir)/'`VisuGUI_TimeAnimation.cxx + +libVISU_la-VisuGUI_EditContainerDlg.lo: VisuGUI_EditContainerDlg.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_EditContainerDlg.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_EditContainerDlg.Tpo" -c -o libVISU_la-VisuGUI_EditContainerDlg.lo `test -f 'VisuGUI_EditContainerDlg.cxx' || echo '$(srcdir)/'`VisuGUI_EditContainerDlg.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_EditContainerDlg.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_EditContainerDlg.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_EditContainerDlg.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_EditContainerDlg.cxx' object='libVISU_la-VisuGUI_EditContainerDlg.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_EditContainerDlg.lo `test -f 'VisuGUI_EditContainerDlg.cxx' || echo '$(srcdir)/'`VisuGUI_EditContainerDlg.cxx + +libVISU_la-VisuGUI_ClippingDlg.lo: VisuGUI_ClippingDlg.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_ClippingDlg.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_ClippingDlg.Tpo" -c -o libVISU_la-VisuGUI_ClippingDlg.lo `test -f 'VisuGUI_ClippingDlg.cxx' || echo '$(srcdir)/'`VisuGUI_ClippingDlg.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_ClippingDlg.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_ClippingDlg.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_ClippingDlg.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_ClippingDlg.cxx' object='libVISU_la-VisuGUI_ClippingDlg.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_ClippingDlg.lo `test -f 'VisuGUI_ClippingDlg.cxx' || echo '$(srcdir)/'`VisuGUI_ClippingDlg.cxx + +libVISU_la-VisuGUI_DialogRunner.lo: VisuGUI_DialogRunner.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_DialogRunner.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_DialogRunner.Tpo" -c -o libVISU_la-VisuGUI_DialogRunner.lo `test -f 'VisuGUI_DialogRunner.cxx' || echo '$(srcdir)/'`VisuGUI_DialogRunner.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_DialogRunner.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_DialogRunner.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_DialogRunner.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_DialogRunner.cxx' object='libVISU_la-VisuGUI_DialogRunner.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_DialogRunner.lo `test -f 'VisuGUI_DialogRunner.cxx' || echo '$(srcdir)/'`VisuGUI_DialogRunner.cxx + +libVISU_la-VisuGUI_OffsetDlg.lo: VisuGUI_OffsetDlg.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_OffsetDlg.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_OffsetDlg.Tpo" -c -o libVISU_la-VisuGUI_OffsetDlg.lo `test -f 'VisuGUI_OffsetDlg.cxx' || echo '$(srcdir)/'`VisuGUI_OffsetDlg.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_OffsetDlg.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_OffsetDlg.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_OffsetDlg.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_OffsetDlg.cxx' object='libVISU_la-VisuGUI_OffsetDlg.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_OffsetDlg.lo `test -f 'VisuGUI_OffsetDlg.cxx' || echo '$(srcdir)/'`VisuGUI_OffsetDlg.cxx + +libVISU_la-VisuGUI_Prs3dDlg.lo: VisuGUI_Prs3dDlg.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_Prs3dDlg.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_Prs3dDlg.Tpo" -c -o libVISU_la-VisuGUI_Prs3dDlg.lo `test -f 'VisuGUI_Prs3dDlg.cxx' || echo '$(srcdir)/'`VisuGUI_Prs3dDlg.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_Prs3dDlg.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_Prs3dDlg.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_Prs3dDlg.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_Prs3dDlg.cxx' object='libVISU_la-VisuGUI_Prs3dDlg.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_Prs3dDlg.lo `test -f 'VisuGUI_Prs3dDlg.cxx' || echo '$(srcdir)/'`VisuGUI_Prs3dDlg.cxx + +libVISU_la-VisuGUI_ScalarBarDlg.lo: VisuGUI_ScalarBarDlg.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_ScalarBarDlg.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_ScalarBarDlg.Tpo" -c -o libVISU_la-VisuGUI_ScalarBarDlg.lo `test -f 'VisuGUI_ScalarBarDlg.cxx' || echo '$(srcdir)/'`VisuGUI_ScalarBarDlg.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_ScalarBarDlg.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_ScalarBarDlg.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_ScalarBarDlg.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_ScalarBarDlg.cxx' object='libVISU_la-VisuGUI_ScalarBarDlg.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_ScalarBarDlg.lo `test -f 'VisuGUI_ScalarBarDlg.cxx' || echo '$(srcdir)/'`VisuGUI_ScalarBarDlg.cxx + +libVISU_la-VisuGUI_Plot3DDlg.lo: VisuGUI_Plot3DDlg.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_Plot3DDlg.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_Plot3DDlg.Tpo" -c -o libVISU_la-VisuGUI_Plot3DDlg.lo `test -f 'VisuGUI_Plot3DDlg.cxx' || echo '$(srcdir)/'`VisuGUI_Plot3DDlg.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_Plot3DDlg.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_Plot3DDlg.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_Plot3DDlg.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_Plot3DDlg.cxx' object='libVISU_la-VisuGUI_Plot3DDlg.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_Plot3DDlg.lo `test -f 'VisuGUI_Plot3DDlg.cxx' || echo '$(srcdir)/'`VisuGUI_Plot3DDlg.cxx + +libVISU_la-VisuGUI_GaussPointsDlg.lo: VisuGUI_GaussPointsDlg.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_GaussPointsDlg.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_GaussPointsDlg.Tpo" -c -o libVISU_la-VisuGUI_GaussPointsDlg.lo `test -f 'VisuGUI_GaussPointsDlg.cxx' || echo '$(srcdir)/'`VisuGUI_GaussPointsDlg.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_GaussPointsDlg.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_GaussPointsDlg.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_GaussPointsDlg.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_GaussPointsDlg.cxx' object='libVISU_la-VisuGUI_GaussPointsDlg.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_GaussPointsDlg.lo `test -f 'VisuGUI_GaussPointsDlg.cxx' || echo '$(srcdir)/'`VisuGUI_GaussPointsDlg.cxx + +libVISU_la-VisuGUI_DeformedShapeDlg.lo: VisuGUI_DeformedShapeDlg.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_DeformedShapeDlg.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_DeformedShapeDlg.Tpo" -c -o libVISU_la-VisuGUI_DeformedShapeDlg.lo `test -f 'VisuGUI_DeformedShapeDlg.cxx' || echo '$(srcdir)/'`VisuGUI_DeformedShapeDlg.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_DeformedShapeDlg.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_DeformedShapeDlg.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_DeformedShapeDlg.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_DeformedShapeDlg.cxx' object='libVISU_la-VisuGUI_DeformedShapeDlg.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_DeformedShapeDlg.lo `test -f 'VisuGUI_DeformedShapeDlg.cxx' || echo '$(srcdir)/'`VisuGUI_DeformedShapeDlg.cxx + +libVISU_la-VisuGUI_IsoSurfacesDlg.lo: VisuGUI_IsoSurfacesDlg.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_IsoSurfacesDlg.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_IsoSurfacesDlg.Tpo" -c -o libVISU_la-VisuGUI_IsoSurfacesDlg.lo `test -f 'VisuGUI_IsoSurfacesDlg.cxx' || echo '$(srcdir)/'`VisuGUI_IsoSurfacesDlg.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_IsoSurfacesDlg.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_IsoSurfacesDlg.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_IsoSurfacesDlg.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_IsoSurfacesDlg.cxx' object='libVISU_la-VisuGUI_IsoSurfacesDlg.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_IsoSurfacesDlg.lo `test -f 'VisuGUI_IsoSurfacesDlg.cxx' || echo '$(srcdir)/'`VisuGUI_IsoSurfacesDlg.cxx + +libVISU_la-VisuGUI_CutLinesDlg.lo: VisuGUI_CutLinesDlg.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_CutLinesDlg.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_CutLinesDlg.Tpo" -c -o libVISU_la-VisuGUI_CutLinesDlg.lo `test -f 'VisuGUI_CutLinesDlg.cxx' || echo '$(srcdir)/'`VisuGUI_CutLinesDlg.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_CutLinesDlg.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_CutLinesDlg.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_CutLinesDlg.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_CutLinesDlg.cxx' object='libVISU_la-VisuGUI_CutLinesDlg.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_CutLinesDlg.lo `test -f 'VisuGUI_CutLinesDlg.cxx' || echo '$(srcdir)/'`VisuGUI_CutLinesDlg.cxx + +libVISU_la-VisuGUI_CutPlanesDlg.lo: VisuGUI_CutPlanesDlg.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_CutPlanesDlg.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_CutPlanesDlg.Tpo" -c -o libVISU_la-VisuGUI_CutPlanesDlg.lo `test -f 'VisuGUI_CutPlanesDlg.cxx' || echo '$(srcdir)/'`VisuGUI_CutPlanesDlg.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_CutPlanesDlg.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_CutPlanesDlg.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_CutPlanesDlg.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_CutPlanesDlg.cxx' object='libVISU_la-VisuGUI_CutPlanesDlg.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_CutPlanesDlg.lo `test -f 'VisuGUI_CutPlanesDlg.cxx' || echo '$(srcdir)/'`VisuGUI_CutPlanesDlg.cxx + +libVISU_la-VisuGUI_StreamLinesDlg.lo: VisuGUI_StreamLinesDlg.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_StreamLinesDlg.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_StreamLinesDlg.Tpo" -c -o libVISU_la-VisuGUI_StreamLinesDlg.lo `test -f 'VisuGUI_StreamLinesDlg.cxx' || echo '$(srcdir)/'`VisuGUI_StreamLinesDlg.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_StreamLinesDlg.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_StreamLinesDlg.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_StreamLinesDlg.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_StreamLinesDlg.cxx' object='libVISU_la-VisuGUI_StreamLinesDlg.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_StreamLinesDlg.lo `test -f 'VisuGUI_StreamLinesDlg.cxx' || echo '$(srcdir)/'`VisuGUI_StreamLinesDlg.cxx + +libVISU_la-VisuGUI_VectorsDlg.lo: VisuGUI_VectorsDlg.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_VectorsDlg.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_VectorsDlg.Tpo" -c -o libVISU_la-VisuGUI_VectorsDlg.lo `test -f 'VisuGUI_VectorsDlg.cxx' || echo '$(srcdir)/'`VisuGUI_VectorsDlg.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_VectorsDlg.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_VectorsDlg.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_VectorsDlg.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_VectorsDlg.cxx' object='libVISU_la-VisuGUI_VectorsDlg.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_VectorsDlg.lo `test -f 'VisuGUI_VectorsDlg.cxx' || echo '$(srcdir)/'`VisuGUI_VectorsDlg.cxx + +libVISU_la-VisuGUI_Displayer.lo: VisuGUI_Displayer.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_Displayer.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_Displayer.Tpo" -c -o libVISU_la-VisuGUI_Displayer.lo `test -f 'VisuGUI_Displayer.cxx' || echo '$(srcdir)/'`VisuGUI_Displayer.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_Displayer.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_Displayer.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_Displayer.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_Displayer.cxx' object='libVISU_la-VisuGUI_Displayer.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_Displayer.lo `test -f 'VisuGUI_Displayer.cxx' || echo '$(srcdir)/'`VisuGUI_Displayer.cxx + +libVISU_la-VisuGUI_ScalarMapOnDeformedShapeDlg.lo: VisuGUI_ScalarMapOnDeformedShapeDlg.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_ScalarMapOnDeformedShapeDlg.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_ScalarMapOnDeformedShapeDlg.Tpo" -c -o libVISU_la-VisuGUI_ScalarMapOnDeformedShapeDlg.lo `test -f 'VisuGUI_ScalarMapOnDeformedShapeDlg.cxx' || echo '$(srcdir)/'`VisuGUI_ScalarMapOnDeformedShapeDlg.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_ScalarMapOnDeformedShapeDlg.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_ScalarMapOnDeformedShapeDlg.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_ScalarMapOnDeformedShapeDlg.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_ScalarMapOnDeformedShapeDlg.cxx' object='libVISU_la-VisuGUI_ScalarMapOnDeformedShapeDlg.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_ScalarMapOnDeformedShapeDlg.lo `test -f 'VisuGUI_ScalarMapOnDeformedShapeDlg.cxx' || echo '$(srcdir)/'`VisuGUI_ScalarMapOnDeformedShapeDlg.cxx + +libVISU_la-VisuGUI_SetupPlot2dDlg.lo: VisuGUI_SetupPlot2dDlg.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_SetupPlot2dDlg.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_SetupPlot2dDlg.Tpo" -c -o libVISU_la-VisuGUI_SetupPlot2dDlg.lo `test -f 'VisuGUI_SetupPlot2dDlg.cxx' || echo '$(srcdir)/'`VisuGUI_SetupPlot2dDlg.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_SetupPlot2dDlg.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_SetupPlot2dDlg.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_SetupPlot2dDlg.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_SetupPlot2dDlg.cxx' object='libVISU_la-VisuGUI_SetupPlot2dDlg.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_SetupPlot2dDlg.lo `test -f 'VisuGUI_SetupPlot2dDlg.cxx' || echo '$(srcdir)/'`VisuGUI_SetupPlot2dDlg.cxx + +libVISU_la-VisuGUI_BuildProgressDlg.lo: VisuGUI_BuildProgressDlg.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_BuildProgressDlg.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_BuildProgressDlg.Tpo" -c -o libVISU_la-VisuGUI_BuildProgressDlg.lo `test -f 'VisuGUI_BuildProgressDlg.cxx' || echo '$(srcdir)/'`VisuGUI_BuildProgressDlg.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_BuildProgressDlg.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_BuildProgressDlg.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_BuildProgressDlg.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_BuildProgressDlg.cxx' object='libVISU_la-VisuGUI_BuildProgressDlg.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_BuildProgressDlg.lo `test -f 'VisuGUI_BuildProgressDlg.cxx' || echo '$(srcdir)/'`VisuGUI_BuildProgressDlg.cxx + +libVISU_la-VisuGUI_TransparencyDlg.lo: VisuGUI_TransparencyDlg.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_TransparencyDlg.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_TransparencyDlg.Tpo" -c -o libVISU_la-VisuGUI_TransparencyDlg.lo `test -f 'VisuGUI_TransparencyDlg.cxx' || echo '$(srcdir)/'`VisuGUI_TransparencyDlg.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_TransparencyDlg.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_TransparencyDlg.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_TransparencyDlg.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_TransparencyDlg.cxx' object='libVISU_la-VisuGUI_TransparencyDlg.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_TransparencyDlg.lo `test -f 'VisuGUI_TransparencyDlg.cxx' || echo '$(srcdir)/'`VisuGUI_TransparencyDlg.cxx + +libVISU_la-VisuGUI_Timer.lo: VisuGUI_Timer.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_Timer.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_Timer.Tpo" -c -o libVISU_la-VisuGUI_Timer.lo `test -f 'VisuGUI_Timer.cxx' || echo '$(srcdir)/'`VisuGUI_Timer.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_Timer.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_Timer.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_Timer.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_Timer.cxx' object='libVISU_la-VisuGUI_Timer.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_Timer.lo `test -f 'VisuGUI_Timer.cxx' || echo '$(srcdir)/'`VisuGUI_Timer.cxx + +libVISU_la-VisuGUI_Slider.lo: VisuGUI_Slider.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_Slider.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_Slider.Tpo" -c -o libVISU_la-VisuGUI_Slider.lo `test -f 'VisuGUI_Slider.cxx' || echo '$(srcdir)/'`VisuGUI_Slider.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_Slider.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_Slider.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_Slider.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_Slider.cxx' object='libVISU_la-VisuGUI_Slider.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_Slider.lo `test -f 'VisuGUI_Slider.cxx' || echo '$(srcdir)/'`VisuGUI_Slider.cxx + +libVISU_la-VisuGUI_InputPane.lo: VisuGUI_InputPane.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_InputPane.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_InputPane.Tpo" -c -o libVISU_la-VisuGUI_InputPane.lo `test -f 'VisuGUI_InputPane.cxx' || echo '$(srcdir)/'`VisuGUI_InputPane.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_InputPane.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_InputPane.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_InputPane.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_InputPane.cxx' object='libVISU_la-VisuGUI_InputPane.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_InputPane.lo `test -f 'VisuGUI_InputPane.cxx' || echo '$(srcdir)/'`VisuGUI_InputPane.cxx + +libVISU_la-VisuGUI_CacheDlg.lo: VisuGUI_CacheDlg.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_CacheDlg.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_CacheDlg.Tpo" -c -o libVISU_la-VisuGUI_CacheDlg.lo `test -f 'VisuGUI_CacheDlg.cxx' || echo '$(srcdir)/'`VisuGUI_CacheDlg.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_CacheDlg.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_CacheDlg.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_CacheDlg.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_CacheDlg.cxx' object='libVISU_la-VisuGUI_CacheDlg.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_CacheDlg.lo `test -f 'VisuGUI_CacheDlg.cxx' || echo '$(srcdir)/'`VisuGUI_CacheDlg.cxx + +libVISU_la-VisuGUI_FieldFilter.lo: VisuGUI_FieldFilter.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_FieldFilter.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_FieldFilter.Tpo" -c -o libVISU_la-VisuGUI_FieldFilter.lo `test -f 'VisuGUI_FieldFilter.cxx' || echo '$(srcdir)/'`VisuGUI_FieldFilter.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_FieldFilter.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_FieldFilter.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_FieldFilter.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_FieldFilter.cxx' object='libVISU_la-VisuGUI_FieldFilter.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_FieldFilter.lo `test -f 'VisuGUI_FieldFilter.cxx' || echo '$(srcdir)/'`VisuGUI_FieldFilter.cxx + +libVISU_la-VisuGUI_moc.lo: VisuGUI_moc.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_moc.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_moc.Tpo" -c -o libVISU_la-VisuGUI_moc.lo `test -f 'VisuGUI_moc.cxx' || echo '$(srcdir)/'`VisuGUI_moc.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_moc.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_moc.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_moc.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_moc.cxx' object='libVISU_la-VisuGUI_moc.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_moc.lo `test -f 'VisuGUI_moc.cxx' || echo '$(srcdir)/'`VisuGUI_moc.cxx + +libVISU_la-VisuGUI_Module_moc.lo: VisuGUI_Module_moc.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_Module_moc.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_Module_moc.Tpo" -c -o libVISU_la-VisuGUI_Module_moc.lo `test -f 'VisuGUI_Module_moc.cxx' || echo '$(srcdir)/'`VisuGUI_Module_moc.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_Module_moc.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_Module_moc.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_Module_moc.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_Module_moc.cxx' object='libVISU_la-VisuGUI_Module_moc.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_Module_moc.lo `test -f 'VisuGUI_Module_moc.cxx' || echo '$(srcdir)/'`VisuGUI_Module_moc.cxx + +libVISU_la-VisuGUI_Selection_moc.lo: VisuGUI_Selection_moc.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_Selection_moc.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_Selection_moc.Tpo" -c -o libVISU_la-VisuGUI_Selection_moc.lo `test -f 'VisuGUI_Selection_moc.cxx' || echo '$(srcdir)/'`VisuGUI_Selection_moc.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_Selection_moc.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_Selection_moc.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_Selection_moc.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_Selection_moc.cxx' object='libVISU_la-VisuGUI_Selection_moc.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_Selection_moc.lo `test -f 'VisuGUI_Selection_moc.cxx' || echo '$(srcdir)/'`VisuGUI_Selection_moc.cxx + +libVISU_la-VisuGUI_NameDlg_moc.lo: VisuGUI_NameDlg_moc.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_NameDlg_moc.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_NameDlg_moc.Tpo" -c -o libVISU_la-VisuGUI_NameDlg_moc.lo `test -f 'VisuGUI_NameDlg_moc.cxx' || echo '$(srcdir)/'`VisuGUI_NameDlg_moc.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_NameDlg_moc.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_NameDlg_moc.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_NameDlg_moc.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_NameDlg_moc.cxx' object='libVISU_la-VisuGUI_NameDlg_moc.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_NameDlg_moc.lo `test -f 'VisuGUI_NameDlg_moc.cxx' || echo '$(srcdir)/'`VisuGUI_NameDlg_moc.cxx + +libVISU_la-VisuGUI_FileDlg_moc.lo: VisuGUI_FileDlg_moc.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_FileDlg_moc.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_FileDlg_moc.Tpo" -c -o libVISU_la-VisuGUI_FileDlg_moc.lo `test -f 'VisuGUI_FileDlg_moc.cxx' || echo '$(srcdir)/'`VisuGUI_FileDlg_moc.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_FileDlg_moc.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_FileDlg_moc.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_FileDlg_moc.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_FileDlg_moc.cxx' object='libVISU_la-VisuGUI_FileDlg_moc.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_FileDlg_moc.lo `test -f 'VisuGUI_FileDlg_moc.cxx' || echo '$(srcdir)/'`VisuGUI_FileDlg_moc.cxx + +libVISU_la-VisuGUI_CursorDlg_moc.lo: VisuGUI_CursorDlg_moc.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_CursorDlg_moc.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_CursorDlg_moc.Tpo" -c -o libVISU_la-VisuGUI_CursorDlg_moc.lo `test -f 'VisuGUI_CursorDlg_moc.cxx' || echo '$(srcdir)/'`VisuGUI_CursorDlg_moc.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_CursorDlg_moc.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_CursorDlg_moc.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_CursorDlg_moc.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_CursorDlg_moc.cxx' object='libVISU_la-VisuGUI_CursorDlg_moc.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_CursorDlg_moc.lo `test -f 'VisuGUI_CursorDlg_moc.cxx' || echo '$(srcdir)/'`VisuGUI_CursorDlg_moc.cxx + +libVISU_la-VisuGUI_TimeAnimation_moc.lo: VisuGUI_TimeAnimation_moc.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_TimeAnimation_moc.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_TimeAnimation_moc.Tpo" -c -o libVISU_la-VisuGUI_TimeAnimation_moc.lo `test -f 'VisuGUI_TimeAnimation_moc.cxx' || echo '$(srcdir)/'`VisuGUI_TimeAnimation_moc.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_TimeAnimation_moc.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_TimeAnimation_moc.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_TimeAnimation_moc.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_TimeAnimation_moc.cxx' object='libVISU_la-VisuGUI_TimeAnimation_moc.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_TimeAnimation_moc.lo `test -f 'VisuGUI_TimeAnimation_moc.cxx' || echo '$(srcdir)/'`VisuGUI_TimeAnimation_moc.cxx + +libVISU_la-VisuGUI_EditContainerDlg_moc.lo: VisuGUI_EditContainerDlg_moc.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_EditContainerDlg_moc.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_EditContainerDlg_moc.Tpo" -c -o libVISU_la-VisuGUI_EditContainerDlg_moc.lo `test -f 'VisuGUI_EditContainerDlg_moc.cxx' || echo '$(srcdir)/'`VisuGUI_EditContainerDlg_moc.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_EditContainerDlg_moc.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_EditContainerDlg_moc.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_EditContainerDlg_moc.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_EditContainerDlg_moc.cxx' object='libVISU_la-VisuGUI_EditContainerDlg_moc.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_EditContainerDlg_moc.lo `test -f 'VisuGUI_EditContainerDlg_moc.cxx' || echo '$(srcdir)/'`VisuGUI_EditContainerDlg_moc.cxx + +libVISU_la-VisuGUI_ClippingDlg_moc.lo: VisuGUI_ClippingDlg_moc.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_ClippingDlg_moc.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_ClippingDlg_moc.Tpo" -c -o libVISU_la-VisuGUI_ClippingDlg_moc.lo `test -f 'VisuGUI_ClippingDlg_moc.cxx' || echo '$(srcdir)/'`VisuGUI_ClippingDlg_moc.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_ClippingDlg_moc.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_ClippingDlg_moc.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_ClippingDlg_moc.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_ClippingDlg_moc.cxx' object='libVISU_la-VisuGUI_ClippingDlg_moc.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_ClippingDlg_moc.lo `test -f 'VisuGUI_ClippingDlg_moc.cxx' || echo '$(srcdir)/'`VisuGUI_ClippingDlg_moc.cxx + +libVISU_la-VisuGUI_DialogRunner_moc.lo: VisuGUI_DialogRunner_moc.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_DialogRunner_moc.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_DialogRunner_moc.Tpo" -c -o libVISU_la-VisuGUI_DialogRunner_moc.lo `test -f 'VisuGUI_DialogRunner_moc.cxx' || echo '$(srcdir)/'`VisuGUI_DialogRunner_moc.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_DialogRunner_moc.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_DialogRunner_moc.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_DialogRunner_moc.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_DialogRunner_moc.cxx' object='libVISU_la-VisuGUI_DialogRunner_moc.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_DialogRunner_moc.lo `test -f 'VisuGUI_DialogRunner_moc.cxx' || echo '$(srcdir)/'`VisuGUI_DialogRunner_moc.cxx + +libVISU_la-VisuGUI_OffsetDlg_moc.lo: VisuGUI_OffsetDlg_moc.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_OffsetDlg_moc.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_OffsetDlg_moc.Tpo" -c -o libVISU_la-VisuGUI_OffsetDlg_moc.lo `test -f 'VisuGUI_OffsetDlg_moc.cxx' || echo '$(srcdir)/'`VisuGUI_OffsetDlg_moc.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_OffsetDlg_moc.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_OffsetDlg_moc.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_OffsetDlg_moc.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_OffsetDlg_moc.cxx' object='libVISU_la-VisuGUI_OffsetDlg_moc.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_OffsetDlg_moc.lo `test -f 'VisuGUI_OffsetDlg_moc.cxx' || echo '$(srcdir)/'`VisuGUI_OffsetDlg_moc.cxx + +libVISU_la-VisuGUI_Prs3dDlg_moc.lo: VisuGUI_Prs3dDlg_moc.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_Prs3dDlg_moc.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_Prs3dDlg_moc.Tpo" -c -o libVISU_la-VisuGUI_Prs3dDlg_moc.lo `test -f 'VisuGUI_Prs3dDlg_moc.cxx' || echo '$(srcdir)/'`VisuGUI_Prs3dDlg_moc.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_Prs3dDlg_moc.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_Prs3dDlg_moc.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_Prs3dDlg_moc.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_Prs3dDlg_moc.cxx' object='libVISU_la-VisuGUI_Prs3dDlg_moc.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_Prs3dDlg_moc.lo `test -f 'VisuGUI_Prs3dDlg_moc.cxx' || echo '$(srcdir)/'`VisuGUI_Prs3dDlg_moc.cxx + +libVISU_la-VisuGUI_ScalarBarDlg_moc.lo: VisuGUI_ScalarBarDlg_moc.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_ScalarBarDlg_moc.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_ScalarBarDlg_moc.Tpo" -c -o libVISU_la-VisuGUI_ScalarBarDlg_moc.lo `test -f 'VisuGUI_ScalarBarDlg_moc.cxx' || echo '$(srcdir)/'`VisuGUI_ScalarBarDlg_moc.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_ScalarBarDlg_moc.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_ScalarBarDlg_moc.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_ScalarBarDlg_moc.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_ScalarBarDlg_moc.cxx' object='libVISU_la-VisuGUI_ScalarBarDlg_moc.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_ScalarBarDlg_moc.lo `test -f 'VisuGUI_ScalarBarDlg_moc.cxx' || echo '$(srcdir)/'`VisuGUI_ScalarBarDlg_moc.cxx + +libVISU_la-VisuGUI_Plot3DDlg_moc.lo: VisuGUI_Plot3DDlg_moc.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_Plot3DDlg_moc.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_Plot3DDlg_moc.Tpo" -c -o libVISU_la-VisuGUI_Plot3DDlg_moc.lo `test -f 'VisuGUI_Plot3DDlg_moc.cxx' || echo '$(srcdir)/'`VisuGUI_Plot3DDlg_moc.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_Plot3DDlg_moc.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_Plot3DDlg_moc.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_Plot3DDlg_moc.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_Plot3DDlg_moc.cxx' object='libVISU_la-VisuGUI_Plot3DDlg_moc.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_Plot3DDlg_moc.lo `test -f 'VisuGUI_Plot3DDlg_moc.cxx' || echo '$(srcdir)/'`VisuGUI_Plot3DDlg_moc.cxx + +libVISU_la-VisuGUI_GaussPointsDlg_moc.lo: VisuGUI_GaussPointsDlg_moc.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_GaussPointsDlg_moc.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_GaussPointsDlg_moc.Tpo" -c -o libVISU_la-VisuGUI_GaussPointsDlg_moc.lo `test -f 'VisuGUI_GaussPointsDlg_moc.cxx' || echo '$(srcdir)/'`VisuGUI_GaussPointsDlg_moc.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_GaussPointsDlg_moc.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_GaussPointsDlg_moc.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_GaussPointsDlg_moc.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_GaussPointsDlg_moc.cxx' object='libVISU_la-VisuGUI_GaussPointsDlg_moc.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_GaussPointsDlg_moc.lo `test -f 'VisuGUI_GaussPointsDlg_moc.cxx' || echo '$(srcdir)/'`VisuGUI_GaussPointsDlg_moc.cxx + +libVISU_la-VisuGUI_DeformedShapeDlg_moc.lo: VisuGUI_DeformedShapeDlg_moc.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_DeformedShapeDlg_moc.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_DeformedShapeDlg_moc.Tpo" -c -o libVISU_la-VisuGUI_DeformedShapeDlg_moc.lo `test -f 'VisuGUI_DeformedShapeDlg_moc.cxx' || echo '$(srcdir)/'`VisuGUI_DeformedShapeDlg_moc.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_DeformedShapeDlg_moc.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_DeformedShapeDlg_moc.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_DeformedShapeDlg_moc.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_DeformedShapeDlg_moc.cxx' object='libVISU_la-VisuGUI_DeformedShapeDlg_moc.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_DeformedShapeDlg_moc.lo `test -f 'VisuGUI_DeformedShapeDlg_moc.cxx' || echo '$(srcdir)/'`VisuGUI_DeformedShapeDlg_moc.cxx + +libVISU_la-VisuGUI_IsoSurfacesDlg_moc.lo: VisuGUI_IsoSurfacesDlg_moc.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_IsoSurfacesDlg_moc.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_IsoSurfacesDlg_moc.Tpo" -c -o libVISU_la-VisuGUI_IsoSurfacesDlg_moc.lo `test -f 'VisuGUI_IsoSurfacesDlg_moc.cxx' || echo '$(srcdir)/'`VisuGUI_IsoSurfacesDlg_moc.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_IsoSurfacesDlg_moc.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_IsoSurfacesDlg_moc.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_IsoSurfacesDlg_moc.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_IsoSurfacesDlg_moc.cxx' object='libVISU_la-VisuGUI_IsoSurfacesDlg_moc.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_IsoSurfacesDlg_moc.lo `test -f 'VisuGUI_IsoSurfacesDlg_moc.cxx' || echo '$(srcdir)/'`VisuGUI_IsoSurfacesDlg_moc.cxx + +libVISU_la-VisuGUI_CutLinesDlg_moc.lo: VisuGUI_CutLinesDlg_moc.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_CutLinesDlg_moc.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_CutLinesDlg_moc.Tpo" -c -o libVISU_la-VisuGUI_CutLinesDlg_moc.lo `test -f 'VisuGUI_CutLinesDlg_moc.cxx' || echo '$(srcdir)/'`VisuGUI_CutLinesDlg_moc.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_CutLinesDlg_moc.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_CutLinesDlg_moc.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_CutLinesDlg_moc.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_CutLinesDlg_moc.cxx' object='libVISU_la-VisuGUI_CutLinesDlg_moc.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_CutLinesDlg_moc.lo `test -f 'VisuGUI_CutLinesDlg_moc.cxx' || echo '$(srcdir)/'`VisuGUI_CutLinesDlg_moc.cxx + +libVISU_la-VisuGUI_CutPlanesDlg_moc.lo: VisuGUI_CutPlanesDlg_moc.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_CutPlanesDlg_moc.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_CutPlanesDlg_moc.Tpo" -c -o libVISU_la-VisuGUI_CutPlanesDlg_moc.lo `test -f 'VisuGUI_CutPlanesDlg_moc.cxx' || echo '$(srcdir)/'`VisuGUI_CutPlanesDlg_moc.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_CutPlanesDlg_moc.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_CutPlanesDlg_moc.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_CutPlanesDlg_moc.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_CutPlanesDlg_moc.cxx' object='libVISU_la-VisuGUI_CutPlanesDlg_moc.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_CutPlanesDlg_moc.lo `test -f 'VisuGUI_CutPlanesDlg_moc.cxx' || echo '$(srcdir)/'`VisuGUI_CutPlanesDlg_moc.cxx + +libVISU_la-VisuGUI_StreamLinesDlg_moc.lo: VisuGUI_StreamLinesDlg_moc.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_StreamLinesDlg_moc.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_StreamLinesDlg_moc.Tpo" -c -o libVISU_la-VisuGUI_StreamLinesDlg_moc.lo `test -f 'VisuGUI_StreamLinesDlg_moc.cxx' || echo '$(srcdir)/'`VisuGUI_StreamLinesDlg_moc.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_StreamLinesDlg_moc.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_StreamLinesDlg_moc.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_StreamLinesDlg_moc.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_StreamLinesDlg_moc.cxx' object='libVISU_la-VisuGUI_StreamLinesDlg_moc.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_StreamLinesDlg_moc.lo `test -f 'VisuGUI_StreamLinesDlg_moc.cxx' || echo '$(srcdir)/'`VisuGUI_StreamLinesDlg_moc.cxx + +libVISU_la-VisuGUI_VectorsDlg_moc.lo: VisuGUI_VectorsDlg_moc.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_VectorsDlg_moc.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_VectorsDlg_moc.Tpo" -c -o libVISU_la-VisuGUI_VectorsDlg_moc.lo `test -f 'VisuGUI_VectorsDlg_moc.cxx' || echo '$(srcdir)/'`VisuGUI_VectorsDlg_moc.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_VectorsDlg_moc.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_VectorsDlg_moc.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_VectorsDlg_moc.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_VectorsDlg_moc.cxx' object='libVISU_la-VisuGUI_VectorsDlg_moc.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_VectorsDlg_moc.lo `test -f 'VisuGUI_VectorsDlg_moc.cxx' || echo '$(srcdir)/'`VisuGUI_VectorsDlg_moc.cxx + +libVISU_la-VisuGUI_ScalarMapOnDeformedShapeDlg_moc.lo: VisuGUI_ScalarMapOnDeformedShapeDlg_moc.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_ScalarMapOnDeformedShapeDlg_moc.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_ScalarMapOnDeformedShapeDlg_moc.Tpo" -c -o libVISU_la-VisuGUI_ScalarMapOnDeformedShapeDlg_moc.lo `test -f 'VisuGUI_ScalarMapOnDeformedShapeDlg_moc.cxx' || echo '$(srcdir)/'`VisuGUI_ScalarMapOnDeformedShapeDlg_moc.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_ScalarMapOnDeformedShapeDlg_moc.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_ScalarMapOnDeformedShapeDlg_moc.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_ScalarMapOnDeformedShapeDlg_moc.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_ScalarMapOnDeformedShapeDlg_moc.cxx' object='libVISU_la-VisuGUI_ScalarMapOnDeformedShapeDlg_moc.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_ScalarMapOnDeformedShapeDlg_moc.lo `test -f 'VisuGUI_ScalarMapOnDeformedShapeDlg_moc.cxx' || echo '$(srcdir)/'`VisuGUI_ScalarMapOnDeformedShapeDlg_moc.cxx + +libVISU_la-VisuGUI_SetupPlot2dDlg_moc.lo: VisuGUI_SetupPlot2dDlg_moc.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_SetupPlot2dDlg_moc.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_SetupPlot2dDlg_moc.Tpo" -c -o libVISU_la-VisuGUI_SetupPlot2dDlg_moc.lo `test -f 'VisuGUI_SetupPlot2dDlg_moc.cxx' || echo '$(srcdir)/'`VisuGUI_SetupPlot2dDlg_moc.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_SetupPlot2dDlg_moc.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_SetupPlot2dDlg_moc.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_SetupPlot2dDlg_moc.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_SetupPlot2dDlg_moc.cxx' object='libVISU_la-VisuGUI_SetupPlot2dDlg_moc.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_SetupPlot2dDlg_moc.lo `test -f 'VisuGUI_SetupPlot2dDlg_moc.cxx' || echo '$(srcdir)/'`VisuGUI_SetupPlot2dDlg_moc.cxx + +libVISU_la-VisuGUI_BuildProgressDlg_moc.lo: VisuGUI_BuildProgressDlg_moc.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_BuildProgressDlg_moc.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_BuildProgressDlg_moc.Tpo" -c -o libVISU_la-VisuGUI_BuildProgressDlg_moc.lo `test -f 'VisuGUI_BuildProgressDlg_moc.cxx' || echo '$(srcdir)/'`VisuGUI_BuildProgressDlg_moc.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_BuildProgressDlg_moc.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_BuildProgressDlg_moc.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_BuildProgressDlg_moc.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_BuildProgressDlg_moc.cxx' object='libVISU_la-VisuGUI_BuildProgressDlg_moc.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_BuildProgressDlg_moc.lo `test -f 'VisuGUI_BuildProgressDlg_moc.cxx' || echo '$(srcdir)/'`VisuGUI_BuildProgressDlg_moc.cxx + +libVISU_la-VisuGUI_TransparencyDlg_moc.lo: VisuGUI_TransparencyDlg_moc.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_TransparencyDlg_moc.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_TransparencyDlg_moc.Tpo" -c -o libVISU_la-VisuGUI_TransparencyDlg_moc.lo `test -f 'VisuGUI_TransparencyDlg_moc.cxx' || echo '$(srcdir)/'`VisuGUI_TransparencyDlg_moc.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_TransparencyDlg_moc.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_TransparencyDlg_moc.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_TransparencyDlg_moc.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_TransparencyDlg_moc.cxx' object='libVISU_la-VisuGUI_TransparencyDlg_moc.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_TransparencyDlg_moc.lo `test -f 'VisuGUI_TransparencyDlg_moc.cxx' || echo '$(srcdir)/'`VisuGUI_TransparencyDlg_moc.cxx + +libVISU_la-VisuGUI_Slider_moc.lo: VisuGUI_Slider_moc.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_Slider_moc.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_Slider_moc.Tpo" -c -o libVISU_la-VisuGUI_Slider_moc.lo `test -f 'VisuGUI_Slider_moc.cxx' || echo '$(srcdir)/'`VisuGUI_Slider_moc.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_Slider_moc.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_Slider_moc.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_Slider_moc.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_Slider_moc.cxx' object='libVISU_la-VisuGUI_Slider_moc.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_Slider_moc.lo `test -f 'VisuGUI_Slider_moc.cxx' || echo '$(srcdir)/'`VisuGUI_Slider_moc.cxx + +libVISU_la-VisuGUI_InputPane_moc.lo: VisuGUI_InputPane_moc.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_InputPane_moc.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_InputPane_moc.Tpo" -c -o libVISU_la-VisuGUI_InputPane_moc.lo `test -f 'VisuGUI_InputPane_moc.cxx' || echo '$(srcdir)/'`VisuGUI_InputPane_moc.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_InputPane_moc.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_InputPane_moc.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_InputPane_moc.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_InputPane_moc.cxx' object='libVISU_la-VisuGUI_InputPane_moc.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_InputPane_moc.lo `test -f 'VisuGUI_InputPane_moc.cxx' || echo '$(srcdir)/'`VisuGUI_InputPane_moc.cxx + +libVISU_la-VisuGUI_CacheDlg_moc.lo: VisuGUI_CacheDlg_moc.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_la-VisuGUI_CacheDlg_moc.lo -MD -MP -MF "$(DEPDIR)/libVISU_la-VisuGUI_CacheDlg_moc.Tpo" -c -o libVISU_la-VisuGUI_CacheDlg_moc.lo `test -f 'VisuGUI_CacheDlg_moc.cxx' || echo '$(srcdir)/'`VisuGUI_CacheDlg_moc.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_la-VisuGUI_CacheDlg_moc.Tpo" "$(DEPDIR)/libVISU_la-VisuGUI_CacheDlg_moc.Plo"; else rm -f "$(DEPDIR)/libVISU_la-VisuGUI_CacheDlg_moc.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VisuGUI_CacheDlg_moc.cxx' object='libVISU_la-VisuGUI_CacheDlg_moc.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_la-VisuGUI_CacheDlg_moc.lo `test -f 'VisuGUI_CacheDlg_moc.cxx' || echo '$(srcdir)/'`VisuGUI_CacheDlg_moc.cxx + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: +install-nodist_salomeresDATA: $(nodist_salomeres_DATA) + @$(NORMAL_INSTALL) + test -z "$(salomeresdir)" || $(mkdir_p) "$(DESTDIR)$(salomeresdir)" + @list='$(nodist_salomeres_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(nodist_salomeresDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(salomeresdir)/$$f'"; \ + $(nodist_salomeresDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(salomeresdir)/$$f"; \ + done + +uninstall-nodist_salomeresDATA: + @$(NORMAL_UNINSTALL) + @list='$(nodist_salomeres_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(salomeresdir)/$$f'"; \ + rm -f "$(DESTDIR)$(salomeresdir)/$$f"; \ + done +install-salomeincludeHEADERS: $(salomeinclude_HEADERS) + @$(NORMAL_INSTALL) + test -z "$(salomeincludedir)" || $(mkdir_p) "$(DESTDIR)$(salomeincludedir)" + @list='$(salomeinclude_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(salomeincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(salomeincludedir)/$$f'"; \ + $(salomeincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(salomeincludedir)/$$f"; \ + done + +uninstall-salomeincludeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(salomeinclude_HEADERS)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(salomeincludedir)/$$f'"; \ + rm -f "$(DESTDIR)$(salomeincludedir)/$$f"; \ + done + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + $(mkdir_p) $(distdir)/../../adm_local/unix + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) +installdirs: + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(salomeresdir)" "$(DESTDIR)$(salomeincludedir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-libtool distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: install-nodist_salomeresDATA \ + install-salomeincludeHEADERS + +install-exec-am: install-libLTLIBRARIES + +install-info: install-info-am + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool mostlyclean-local + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \ + uninstall-nodist_salomeresDATA uninstall-salomeincludeHEADERS + +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libLTLIBRARIES clean-libtool ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-exec \ + install-exec-am install-info install-info-am \ + install-libLTLIBRARIES install-man \ + install-nodist_salomeresDATA install-salomeincludeHEADERS \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + mostlyclean-local pdf pdf-am ps ps-am tags uninstall \ + uninstall-am uninstall-info-am uninstall-libLTLIBRARIES \ + uninstall-nodist_salomeresDATA uninstall-salomeincludeHEADERS + + +# common rules + +# moc-files generation +%_moc.cxx: %.h + $(MOC) $< -o $@ + +# qm-files generation +%.qm: %.po + $(MSG2QM) $< $@ -LDFLAGS += $(QWT_LIBS) -lSalomeNS \ - -lSVTK -lVVTK -lSPlot2d -lVisuObject -lVISUEngineImpl -lVISUGUITOOLS \ - $(KERNEL_LDFLAGS) \ - $(GUI_LDFLAGS) +mostlyclean-local: + rm -f @builddir@/*_moc.cxx + rm -f @builddir@/*.qm +# tests +tests: unittest -@CONCLUDE@ +unittest: $(UNIT_TEST_PROG) + @if test "x$(UNIT_TEST_PROG)" != "x"; then \ + $(UNIT_TEST_PROG); \ + fi; +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/src/VISUGUI/VISU_images.po b/src/VISUGUI/VISU_images.po index 5f65758f..4c05e2ae 100644 --- a/src/VISUGUI/VISU_images.po +++ b/src/VISUGUI/VISU_images.po @@ -54,7 +54,7 @@ msgid "ICON_ISO_SURFACES" msgstr "Visu_isosurfaces.png" msgid "ICON_CUT_PLANES" -msgstr "Visu_cutplane.png" +msgstr "Visu_cutplanes.png" msgid "ICON_CUT_LINES" msgstr "Visu_cutlines.png" @@ -65,6 +65,80 @@ msgstr "Visu_streamlines.png" msgid "ICON_PLOT2D" msgstr "Visu_plot2d.png" +# Tree icons for presentations + +msgid "ICON_TREE_RESULT" +msgstr "Visu_tree_result.png" + +msgid "ICON_TREE_TABLE" +msgstr "Visu_tree_table.png" + +msgid "ICON_TREE_CURVE" +msgstr "Visu_tree_curve.png" + +msgid "ICON_TREE_CONTAINER" +msgstr "Visu_tree_container.png" + +msgid "ICON_TREE_MESH" +msgstr "Visu_tree_mesh.png" + +msgid "ICON_TREE_SCALAR_MAP" +msgstr "Visu_tree_scalars.png" + +msgid "ICON_TREE_SCALAR_MAP_GROUPS" +msgstr "Visu_tree_scalars_gr.png" + +msgid "ICON_TREE_DEFORMED_SHAPE" +msgstr "Visu_tree_deformed.png" + +msgid "ICON_TREE_DEFORMED_SHAPE_GROUPS" +msgstr "Visu_tree_deformed_gr.png" + +msgid "ICON_TREE_SCALAR_MAP_ON_DEFORMED_SHAPE" +msgstr "Visu_tree_scalarmapondeformedshape.png" + +msgid "ICON_TREE_SCALAR_MAP_ON_DEFORMED_SHAPE_GROUPS" +msgstr "Visu_tree_scalarmapondeformedshape_gr.png" + +msgid "ICON_TREE_VECTORS" +msgstr "Visu_tree_vectors.png" + +msgid "ICON_TREE_VECTORS_GROUPS" +msgstr "Visu_tree_vectors_gr.png" + +msgid "ICON_TREE_ISO_SURFACES" +msgstr "Visu_tree_isosurfaces.png" + +msgid "ICON_TREE_ISO_SURFACES_GROUPS" +msgstr "Visu_tree_isosurfaces_gr.png" + +msgid "ICON_TREE_CUT_PLANES" +msgstr "Visu_tree_cutplanes.png" + +msgid "ICON_TREE_CUT_PLANES_GROUPS" +msgstr "Visu_tree_cutplanes_gr.png" + +msgid "ICON_TREE_CUT_LINES" +msgstr "Visu_tree_cutlines.png" + +msgid "ICON_TREE_CUT_LINES_GROUPS" +msgstr "Visu_tree_cutlines_gr.png" + +msgid "ICON_TREE_STREAM_LINES" +msgstr "Visu_tree_streamlines.png" + +msgid "ICON_TREE_STREAM_LINES_GROUPS" +msgstr "Visu_tree_streamlines_gr.png" + +msgid "ICON_TREE_PLOT_3D" +msgstr "Visu_tree_plot3d.png" + +msgid "ICON_TREE_PLOT_3D_GROUPS" +msgstr "Visu_tree_plot3d_gr.png" + +msgid "ICON_TREE_GAUSS_POINTS" +msgstr "Visu_tree_gauss_points.png" + # Representation menu msgid "ICON_POINTS" @@ -133,6 +207,12 @@ msgstr "Visu_recording_stop.png" msgid "ICON_LOAD_TEXTURE" msgstr "Visu_load_texture.png" +msgid "ICON_ADD" +msgstr "Visu_add.png" + +msgid "ICON_REMOVE" +msgstr "Visu_remove.png" + msgid "ICON_SLIDER_MORE" msgstr "Visu_slider_more.png" diff --git a/src/VISUGUI/VISU_msg_en.po b/src/VISUGUI/VISU_msg_en.po index d6447064..ac0d608f 100644 --- a/src/VISUGUI/VISU_msg_en.po +++ b/src/VISUGUI/VISU_msg_en.po @@ -58,6 +58,9 @@ msgstr "The object can't be built" msgid "ERR_CANT_CREATE_ACTOR" msgstr "Can't create actor for this presentation" +msgid "ERR_CANT_CREATE_ANIMATION" +msgstr "Can't create animation for these fields:\n number of time stamps or number of components is not the same!" + # Preferences for VISU module (VisuGUI.cxx) msgid "VISU_SCALAR_BAR" @@ -117,6 +120,12 @@ msgstr "Height:" msgid "VISU_PREF_SECOND_TAB" msgstr "Scalar range, Sweep, MED import, Shading" +msgid "PRS_ON_GROUPS" +msgstr "Build presentation on groups" + +msgid "NO_GROUPS" +msgstr "No groups in the mesh" + msgid "VISU_SCALAR_RANGE" msgstr "Scalar range" @@ -153,6 +162,27 @@ msgstr "Max:" msgid "VISU_SWEEPING_PREF" msgstr "Sweeping preferences" +msgid "VISU_LINEAR_SWEEP" +msgstr "Linear" + +msgid "VISU_COS_SWEEP" +msgstr "Cosinusoidal ( (1 - cos(t))/2 )" + +msgid "VISU_SIN_SWEEP" +msgstr "Sinusoidal ( sin( t - PI/2 ) )" + +msgid "VISU_SWEEPING_MODES" +msgstr "Mode of the sweeping " + +msgid "VISU_IS2PI" +msgstr "Parameter varies:" + +msgid "PERIOD_2PI" +msgstr "From -PI to PI" + +msgid "PERIOD_PI" +msgstr "From 0 to PI" + msgid "VISU_TIME_STEP" msgstr "Time step(second)" @@ -162,6 +192,9 @@ msgstr "Number of cycles" msgid "VISU_NB_STEPS" msgstr "Number of steps" +msgid "VISU_CUTLINE_PREF" +msgstr "CutLine preferences" + msgid "VISU_PREF_MED_IMPORT" msgstr "MED files import" @@ -174,6 +207,9 @@ msgstr "Representation properties" msgid "VISU_USE_SHADING" msgstr "Use Shading" +msgid "VISU_DISP_ONLY" +msgstr "Display only on creation" + msgid "VISU_SHRINK" msgstr "Shrink" @@ -233,8 +269,17 @@ msgstr "Representation Toolbar" msgid "VisuGUI::MEN_SHOW_ANIMATION" msgstr "Show..." -msgid "VisuGUI::MEN_ANIMATION" -msgstr "Animation..." +msgid "VisuGUI::MEN_PARALLEL_ANIMATION" +msgstr "Parallel Animation..." + +msgid "VisuGUI::MEN_SUCCCESSIVE_ANIMATION" +msgstr "Successive Animation..." + +msgid "PARALLEL_ANIMATION" +msgstr "Parallel Animation" + +msgid "SUCCESSIVE_ANIMATION" +msgstr "Successive Animation" msgid "VisuGUI::MEN_CELL_COLOR" msgstr "Cell color" @@ -484,6 +529,9 @@ msgstr "minimal and maximal" msgid "VisuGUI_CutLinesDlg::LBL_INVERT_CURVES" msgstr "Invert all curves" +msgid "VisuGUI_CutLinesDlg::LBL_ABSOLUTE_LENGTH" +msgstr "Use absolute length" + msgid "VisuGUI_CutLinesDlg::LBL_GENERATE_CURVES" msgstr "Generate Curves" @@ -914,6 +962,9 @@ msgstr "Error" msgid "VisuGUI_TimeAnimationDlg::MSG_NO_ANIMATIONDATA" msgstr "There is no data for animation" +msgid "VisuGUI_TimeAnimationDlg::MSG_NO_AVI_MAKER" +msgstr "Tool jpeg2yuv, necessary for AVI recording, is not available.\nPlease, refer to the documentation." + #: VisuGUI_VectorsDlg.cxx @@ -1832,6 +1883,9 @@ msgstr "Stop recording" msgid "VVTK_MainWindow::DSC_VVTK_RECORDING_STOP" msgstr "Stop recording" +msgid "VVTK_MainWindow::MSG_NO_AVI_MAKER" +msgstr "Tool jpeg2yuv, necessary for AVI recording, is not available.\nPlease, refer to the documentation." + msgid "VVTK_MainWindow1::LBL_TOOLBAR_GAUSS_LABEL" msgstr "Gauss Viewer Tools" @@ -2193,4 +2247,4 @@ msgid "VISU_PLOT3D" msgstr "Plot3D" msgid "VISU_SCALAR_MAP_ON_DEFORMED_SHAPE" -msgstr "Scalar Map on Def. Shape" \ No newline at end of file +msgstr "Scalar Map on Def. Shape" diff --git a/src/VISUGUI/VisuGUI.cxx b/src/VISUGUI/VisuGUI.cxx index a579baba..2a6282a6 100644 --- a/src/VISUGUI/VisuGUI.cxx +++ b/src/VISUGUI/VisuGUI.cxx @@ -152,6 +152,10 @@ static int MYDEBUG = 0; static int MYDEBUG = 0; #endif +#ifdef WIN32 +#define usleep(A) _sleep(A/1000) +#endif + ////////////////////////////////////////////////// // Class: VisuGUI ////////////////////////////////////////////////// @@ -395,6 +399,44 @@ VisuGUI Handle(SALOME_InteractiveObject) anIO = It.Value(); SALOMEDS::SObject_var aSObject = aStudy->FindObjectID(anIO->getEntry()); if (!aSObject->_is_nil()) { + + // try to load a component data from an opened (presumably) study + // The same in SUPERVISION: NPAL14522 + { + SALOMEDS::SComponent_ptr aSComp = aSObject->GetFatherComponent(); + //std::string aCompIOR; + CORBA::String_var aCompIOR; + if (!aSComp->ComponentIOR(aCompIOR)) { // not loaded + CORBA::String_var aCompDataType = aSComp->ComponentDataType(); + //std::string aCompDataType = aSComp->ComponentDataType(); + + // obtain a driver by a component data type + // like it is done in SALOMEDS_DriverFactory_i::GetDriverByType + SALOMEDS::Driver_var anEngine = SALOMEDS::Driver::_nil(); + SALOME_LifeCycleCORBA * LCC = getApp()->lcc(); + try { + CORBA::Object_var + //anEngineObj = LCC->FindOrLoad_Component("FactoryServer", aCompDataType.c_str()); + anEngineObj = LCC->FindOrLoad_Component("FactoryServer", aCompDataType); + if (CORBA::is_nil(anEngineObj)) + //anEngineObj = LCC->FindOrLoad_Component("FactoryServerPy", aCompDataType.c_str()); + anEngineObj = LCC->FindOrLoad_Component("FactoryServerPy", aCompDataType); + + if (!CORBA::is_nil(anEngineObj)) + anEngine = SALOMEDS::Driver::_narrow(anEngineObj); + + if (!CORBA::is_nil(anEngine)) { + // try to load + SALOMEDS::StudyBuilder_ptr aStudyBuilder = aStudy->NewBuilder(); + //aStudyBuilder->LoadWith(aSComp, aDriverIOR.in()); + aStudyBuilder->LoadWith(aSComp, anEngine); + } + } + catch (...) { + } + } + } + CORBA::Object_var anObject = VISU::SObjectToObject(aSObject); if (!CORBA::is_nil(anObject)) { SALOME_MED::MED_var aMED = SALOME_MED::MED::_narrow(anObject); @@ -1129,12 +1171,12 @@ VisuGUI int i = 0, nbSelected = aList.Extent(); if (nbSelected < 1) return; - const char* entries [nbSelected]; + std::vector anEntries(nbSelected); Handle(SALOME_InteractiveObject) anIO; for (SALOME_ListIteratorOfListIO it (aList); it.More(); it.Next()) { anIO = it.Value(); if (anIO->hasEntry()) - entries[i++] = anIO->getEntry(); + anEntries[i++] = anIO->getEntry(); } nbSelected = i; if (nbSelected < 1) return; @@ -1144,7 +1186,7 @@ VisuGUI aStudyBuilder->NewCommand(); for (i = 0; i < nbSelected; i++) { - VISU::TObjectInfo anObjectInfo = GetObjectByEntry(GetAppStudy(this), entries[i]); + VISU::TObjectInfo anObjectInfo = GetObjectByEntry(GetAppStudy(this), anEntries[i]); if(_PTR(SObject) aSObject = anObjectInfo.mySObject){ _PTR(SObject) aRefSObject; if (aSObject->ReferencedObject(aRefSObject)) { @@ -1576,12 +1618,30 @@ VisuGUI int aCycles = aResourceMgr->integerValue("VISU", "sweeping_number_cycles", 1); int aSteps = aResourceMgr->integerValue("VISU", "sweeping_number_steps", 40); + int aMode = aResourceMgr->integerValue("VISU", "sweeping_modes", 0); + + int is2Pi = aResourceMgr->integerValue("VISU", "sweeping_is2PI", 0); + // Sweep QApplication::setOverrideCursor(Qt::waitCursor); + for (int j = 0; j < aCycles; j++) { for (int i = 0; i <= aSteps; i++) { try { - float aPercents = float(i)/aSteps; + float aPercents; + float aT; + if( aMode >= 1 ) + aT = ( is2Pi == 1 ? -PI + 2. * PI * float(i)/aSteps : PI * float(i)/aSteps ); + if( aMode == 1 ){ //if selected Periodic cosinusoidal mode of sweeping + //This is necessary in order for animation to return to the initial picture + aPercents = (1.-cos( aT ))/2.; + } + else if( aMode == 2 ){ //if selected Periodic sinusoidal mode of sweeping + //This is necessary in order for animation to return to the initial picture + aPercents = sin( aT - PI/2 ); + } + else //if selected Linear mode of sweeping + aPercents = float(i)/aSteps; aScalarMap->SetMapScale(aPercents); aScalarMap->UpdateActor(anActor); aViewWindow->getRenderWindow()->Render(); @@ -1599,40 +1659,46 @@ VisuGUI //---------------------------------------------------------------------------- void VisuGUI -::OnTimeAnimation() +::OnTimeAnimation(int theMode) { if (!VISU::GetActiveViewWindow(this)) return; _PTR(Study) aCStudy = GetCStudy(GetAppStudy(this)); VisuGUI_TimeAnimationDlg* aAnimationDlg = - new VisuGUI_TimeAnimationDlg (this, aCStudy); + new VisuGUI_TimeAnimationDlg (this, aCStudy, theMode); LightApp_SelectionMgr* aSelectionMgr = GetSelectionMgr(this); SALOME_ListIO aListIO; aSelectionMgr->selectedObjects(aListIO); - bool isDefined = false; - long aNbTimes = 0; SALOME_ListIteratorOfListIO It (aListIO); for (; It.More(); It.Next()) { _PTR(SObject) aSObject = aCStudy->FindObjectID(It.Value()->getEntry()); - if (!aSObject) continue; - if (getValue(aSObject, "myComment") == QString("FIELD")) { - long aNumber = getValue(aSObject, "myNbTimeStamps").toLong(); - if (aNumber > 1) { - if (!isDefined) { - aNbTimes = aNumber; - aAnimationDlg->addField(aSObject); - isDefined = true; - } else if (aNbTimes == aNumber) { - aAnimationDlg->addField(aSObject); - } - } + if ( !aAnimationDlg->addField(aSObject) ) { + SUIT_MessageBox::warn1(GetDesktop(this), + tr("WRN_VISU"), + tr("ERR_CANT_CREATE_ANIMATION"), + tr("BUT_OK")); + delete aAnimationDlg; + return; } } - if (isDefined) aAnimationDlg->show(); - else delete aAnimationDlg; + aAnimationDlg->show(); +} + +void +VisuGUI:: +OnParallelTimeAnimation() +{ + OnTimeAnimation(0); +} + +void +VisuGUI:: +OnSucccessiveTimeAnimation() +{ + OnTimeAnimation(1); } //---------------------------------------------------------------------------- @@ -1659,9 +1725,9 @@ VisuGUI VISU::Storable::TRestoringMap aMap; _PTR(GenericAttribute) anAttr; - if (!aSObj->FindAttribute(anAttr, "AttributeComment")) return; + if (!aSObj->FindAttribute(anAttr, "AttributeString")) return; - _PTR(AttributeComment) aComment (anAttr); + _PTR(AttributeString) aComment (anAttr); string aComm = aComment->Value(); QString strIn (aComm.c_str()); VISU::Storable::StrToMap(strIn, aMap); @@ -2184,9 +2250,14 @@ VisuGUI this, SLOT(OnSelectionInfo())); aPixmap = aResourceMgr->loadPixmap("VISU",tr("ICON_TIMEANIMATION")); - createAction( VISU_ANIMATION, tr("MEN_ANIMATION"), QIconSet(aPixmap), - tr("MEN_ANIMATION"), "", 0, aParent, false, - this, SLOT(OnTimeAnimation())); + createAction( VISU_PARALLELANIMATION, tr("MEN_PARALLEL_ANIMATION"), QIconSet(aPixmap), + tr("MEN_PARALLEL_ANIMATION"), "", 0, aParent, false, + this, SLOT(OnParallelTimeAnimation())); + + aPixmap = aResourceMgr->loadPixmap("VISU",tr("ICON_TIMEANIMATION")); + createAction( VISU_SUCCCESSIVEANIMATION, tr("MEN_SUCCCESSIVE_ANIMATION"), QIconSet(aPixmap), + tr("MEN_SUCCCESSIVE_ANIMATION"), "", 0, aParent, false, + this, SLOT(OnSucccessiveTimeAnimation())); aPixmap = aResourceMgr->loadPixmap("VISU",tr("ICON_ERASE_ALL")); createAction( VISU_ERASE_ALL, tr("MEN_ERASE_ALL"), QIconSet(aPixmap), @@ -2375,7 +2446,8 @@ VisuGUI mgr->insert( action( VISU_FREE_SCALAR_BARS ), -1, -1, -1 ); mgr->insert( action( VISU_SWEEP ), -1, -1, -1 ); - mgr->insert( action( VISU_ANIMATION ), -1, -1, -1 ); + mgr->insert( action( VISU_PARALLELANIMATION ), -1, -1, -1 ); + mgr->insert( action( VISU_SUCCCESSIVEANIMATION ), -1, -1, -1 ); mgr->insert( separator(), -1, -1, -1 ); @@ -2458,12 +2530,12 @@ VisuGUI // 3D presentations commands QString aPrsType = " and $type in {'VISU::TMESH' " + aPrsAll + "}"; QString aInsideType = " and $type in {'VISU::TMESH' 'VISU::TSCALARMAP' 'VISU::TDEFORMEDSHAPE'}"; - QString aSurfFrameType = " and $type in {'VISU::TMESH'}"; - QString aSurfType = " and $type in {'VISU::TMESH' 'VISU::TSCALARMAP' 'VISU::TISOSURFACE' 'VISU::TDEFORMEDSHAPE' 'VISU::TCUTPLANES' " + QString aSurfFrameType = " and $type in {'VISU::TMESH' 'VISU::TSCALARMAP''VISU::TDEFORMEDSHAPE' 'VISU::TSCALARMAPONDEFORMEDSHAPE'}"; + QString aSurfType = " and $type in {'VISU::TMESH' 'VISU::TSCALARMAP' 'VISU::TSCALARMAP' 'VISU::TISOSURFACE' 'VISU::TDEFORMEDSHAPE' 'VISU::TCUTPLANES' " " 'VISU::TPLOT3D' 'VISU::TSCALARMAPONDEFORMEDSHAPE'}"; - QString aShrinkType = " and $type in {'VISU::TMESH' 'VISU::TSCALARMAP' 'VISU::TISOSURFACE' " + QString aShrinkType = " and $type in {'VISU::TMESH' 'VISU::TSCALARMAP' 'VISU::TSCALARMAP' 'VISU::TISOSURFACE' " "'VISU::TDEFORMEDSHAPE' 'VISU::TCUTPLANES' 'VISU::TCUTLINES' 'VISU::TPLOT3D' 'VISU::TSCALARMAPONDEFORMEDSHAPE'}"; - QString aLineType = " and $type in {'VISU::TMESH' 'VISU::TSCALARMAP' 'VISU::TISOSURFACE' 'VISU::TDEFORMEDSHAPE' " + QString aLineType = " and $type in {'VISU::TMESH' 'VISU::TSCALARMAP' 'VISU::TSCALARMAP' 'VISU::TISOSURFACE' 'VISU::TDEFORMEDSHAPE' " "'VISU::TCUTPLANES' 'VISU::TCUTLINES' 'VISU::TSTREAMLINES' 'VISU::TPLOT3D' 'VISU::TSCALARMAPONDEFORMEDSHAPE' }"; aRule = "selcount=1"; @@ -2549,11 +2621,19 @@ VisuGUI aRule += " and $type in {'VISU::TFIELD'}"; aRule += " and nbTimeStamps>1"; aRule += " and activeView in {'VTKViewer' 'VVTK'}"; - mgr->setRule( action( VISU_ANIMATION ), aRule, true ); + mgr->setRule( action( VISU_PARALLELANIMATION ), aRule, true ); + + aRule = "client='ObjectBrowser' and selcount>0"; + aRule += " and $type in {'VISU::TFIELD'}"; + aRule += " and nbTimeStamps>0"; + aRule += " and activeView in {'VTKViewer' 'VVTK'}"; + mgr->setRule( action( VISU_SUCCCESSIVEANIMATION ), aRule, true ); aRule = "client='ObjectBrowser' and $type in {'VISU::TENTITY' 'VISU::TFAMILY' 'VISU::TGROUP'}"; mgr->setRule( action( VISU_CREATE_PRS ), aRule + " and selcount=1", true ); mgr->setRule( action( VISU_CREATE_MANY_PRS ), aRule + " and selcount>1", true ); + mgr->setRule( action( VISU_EDIT_PLOT3D ), + "selcount=1 and type='VISU::TPLOT3D'", true ); //aRule = "client='ObjectBrowser' and type='MEDFIELD'"; //mgr->setRule( action( VISU_IMPORT_MED ), aRule, true ); @@ -2589,8 +2669,8 @@ void VisuGUI::contextMenuPopup( const QString& theClient, QPopupMenu* theMenu, Q CORBA::Object_var aCORBAObject = VISU::ClientSObjectToObject(aSObject); if (CORBA::is_nil(aCORBAObject)) { _PTR(GenericAttribute) anAttr; - if (aSObject->FindAttribute(anAttr, "AttributeComment")) { - _PTR(AttributeComment) aComment (anAttr); + if (aSObject->FindAttribute(anAttr, "AttributeString")) { + _PTR(AttributeString) aComment (anAttr); string aComm = aComment->Value(); QString strIn (aComm.c_str()); VISU::Storable::TRestoringMap pMap; @@ -2629,8 +2709,8 @@ void VisuGUI::contextMenuPopup( const QString& theClient, QPopupMenu* theMenu, Q if ( !aSObject ) continue; _PTR(GenericAttribute) anAttr; - if (aSObject->FindAttribute(anAttr, "AttributeComment")) { - _PTR(AttributeComment) aComment (anAttr); + if (aSObject->FindAttribute(anAttr, "AttributeString")) { + _PTR(AttributeString) aComment (anAttr); string aComm = aComment->Value(); QString strIn (aComm.c_str()); VISU::Storable::TRestoringMap pMap; @@ -2820,6 +2900,20 @@ extern "C" { void VisuGUI::createPreferences() { + // TAB: "MED import" + int importTab = addPreference( tr( "MED import" ) ); + + // group: "MED files import" + int importGr = addPreference( tr( "MED files import" ), importTab ); + setPreferenceProperty( importGr, "columns", 1 ); + addPreference( tr( "Use build progress" ), importGr, LightApp_Preferences::Bool, "VISU", "use_build_progress" ); + addPreference( tr( "Full MED loading" ), importGr, LightApp_Preferences::Bool, "VISU", "full_med_loading" ); + addPreference( tr( "Build at once" ), importGr, LightApp_Preferences::Bool, "VISU", "build_at_once" ); + addPreference( tr( "Build fields" ), importGr, LightApp_Preferences::Bool, "VISU", "build_fields" ); + addPreference( tr( "Build min/max" ), importGr, LightApp_Preferences::Bool, "VISU", "build_min_max" ); + addPreference( tr( "Build groups" ), importGr, LightApp_Preferences::Bool, "VISU", "build_groups" ); + addPreference( tr( "Close dialog at finish" ), importGr, LightApp_Preferences::Bool, "VISU", "close_at_finish" ); + // TAB: "Scalar Bar" int sbarTab = addPreference( tr( "VISU_SCALAR_BAR" ) ); @@ -2961,11 +3055,36 @@ void VisuGUI::createPreferences() int scalarBarGr = addPreference( tr( "Scalar bars default position" ), sbarTab ); addPreference( tr( "Arrange Scalar Bars" ), scalarBarGr, LightApp_Preferences::Bool, "VISU", "scalar_bars_default_position" ); - int srangeTab = addPreference( tr( "Sweep, MED import" ) ); + // TAB: "CutLines" + int cutLineTab = addPreference( tr( "CutLines" ) ); + // group: "CutLines preferences" + int cutLineGr = addPreference( tr( "VISU_CUTLINE_PREF" ), cutLineTab ); + setPreferenceProperty( cutLineGr, "columns", 1 ); + addPreference( tr( "Show preview" ), cutLineGr, LightApp_Preferences::Bool, "VISU", "show_preview" ); + addPreference( tr( "Invert all curves" ), cutLineGr, LightApp_Preferences::Bool, "VISU", "invert_all_curves" ); + addPreference( tr( "Use absolute length" ), cutLineGr, LightApp_Preferences::Bool, "VISU", "use_absolute_length" ); + addPreference( tr( "Generate data table" ), cutLineGr, LightApp_Preferences::Bool, "VISU", "generate_data_table" ); + addPreference( tr( "Generate curves" ), cutLineGr, LightApp_Preferences::Bool, "VISU", "generate_curves" ); + + // TAB: "Sweep, Animation" + int srangeTab = addPreference( tr( "Sweep, Animation" ) ); + // group: "Sweeping preferences" int sweepGr = addPreference( tr( "VISU_SWEEPING_PREF" ), srangeTab ); setPreferenceProperty( sweepGr, "columns", 1 ); + + int modeSw = addPreference( tr( "VISU_SWEEPING_MODES" ), sweepGr, LightApp_Preferences::Selector, "VISU", "sweeping_modes" ); + QStringList sweep_modes; + sweep_modes.append( tr( "VISU_LINEAR_SWEEP" ) ); + sweep_modes.append( tr( "VISU_COS_SWEEP" ) ); + sweep_modes.append( tr( "VISU_SIN_SWEEP" ) ); + indices.clear(); + indices.append( 0 ); + indices.append( 1 ); + indices.append( 2 ); + setPreferenceProperty( modeSw, "strings", sweep_modes ); + setPreferenceProperty( modeSw, "indexes", indices ); int timestep = addPreference( tr( "VISU_TIME_STEP" ), sweepGr, LightApp_Preferences::DblSpin, "VISU", "sweeping_time_step" ); @@ -2973,22 +3092,33 @@ void VisuGUI::createPreferences() LightApp_Preferences::IntSpin, "VISU", "sweeping_number_cycles" ); int nbsteps = addPreference( tr( "VISU_NB_STEPS" ), sweepGr, LightApp_Preferences::IntSpin, "VISU", "sweeping_number_steps" ); + int rangeSw = addPreference( tr( "VISU_IS2PI" ), sweepGr, LightApp_Preferences::Selector, "VISU", "sweeping_is2PI" ); + QStringList ranges; + ranges.append( tr( "PERIOD_PI" ) ); + ranges.append( tr( "PERIOD_2PI" ) ); + indices.clear(); + indices.append( 0 ); + indices.append( 1 ); + setPreferenceProperty( rangeSw, "strings", ranges ); + setPreferenceProperty( rangeSw, "indexes", indices ); + setPreferenceProperty( timestep, "min", 0.1 ); setPreferenceProperty( timestep, "step", 0.1 ); setPreferenceProperty( timestep, "max", 1000 ); setPreferenceProperty( nbcycles, "max", 100 ); - setPreferenceProperty( nbsteps, "max", 200 ); + setPreferenceProperty( nbsteps, "max", 200 ); - // group: "MED files import" - int importGr = addPreference( tr( "MED files import" ), srangeTab ); - setPreferenceProperty( importGr, "columns", 1 ); - addPreference( tr( "Use build progress" ), importGr, LightApp_Preferences::Bool, "VISU", "use_build_progress" ); - addPreference( tr( "Full MED loading" ), importGr, LightApp_Preferences::Bool, "VISU", "full_med_loading" ); - addPreference( tr( "Build at once" ), importGr, LightApp_Preferences::Bool, "VISU", "build_at_once" ); - addPreference( tr( "Build fields" ), importGr, LightApp_Preferences::Bool, "VISU", "build_fields" ); - addPreference( tr( "Build min/max" ), importGr, LightApp_Preferences::Bool, "VISU", "build_min_max" ); - addPreference( tr( "Build groups" ), importGr, LightApp_Preferences::Bool, "VISU", "build_groups" ); - addPreference( tr( "Close dialog at finish" ), importGr, LightApp_Preferences::Bool, "VISU", "close_at_finish" ); + // group: "Animation preferences" + int animationGr = addPreference( tr( "Animation preferences" ), srangeTab ); + setPreferenceProperty( animationGr, "columns", 1 ); + + int speed = addPreference( tr( "Speed" ), animationGr, LightApp_Preferences::IntSpin, "VISU", "speed" ); + addPreference( tr( "Cycled animation" ), animationGr, LightApp_Preferences::Bool, "VISU", "cycled_animation" ); + addPreference( tr( "Use proportional timing" ), animationGr, LightApp_Preferences::Bool, "VISU", "use_proportional_timing" ); + addPreference( tr( "Clean memory at each frame" ), animationGr, LightApp_Preferences::Bool, "VISU", "clean_memory_at_each_frame" ); + + setPreferenceProperty( speed, "min", 1 ); + setPreferenceProperty( speed, "max", 99 ); // TAB: Representation ; group: "Representation properties" int representationTab = addPreference( tr( "Representation" ) ); @@ -3009,14 +3139,14 @@ void VisuGUI::createPreferences() mesh_indices.append( 2 ); QStringList modes1 = mesh_modes; - modes1.remove( "Surfaceframe" ); + modes1.remove( "Insideframe" ); QValueList indices1 = mesh_indices; - indices1.remove( 4 ); + indices1.remove( 3 ); QStringList modes2 = modes1; - modes2.remove( "Insideframe" ); + modes2.remove( "Surfaceframe" ); QValueList indices2 = indices1; - indices2.remove( 3 ); + indices2.remove( 4 ); QStringList modes3 = modes2; modes3.remove( "Surface" ); @@ -3030,8 +3160,8 @@ void VisuGUI::createPreferences() addPreference( tr( "VISU_SHRINK" ), representGr, LightApp_Preferences::Bool, "VISU", "mesh_shrink" ); int scalar_map_represent = addPreference( tr( "VISU_SCALAR_MAP" ), representGr, LightApp_Preferences::Selector, "VISU", "scalar_map_represent" ); - setPreferenceProperty( scalar_map_represent, "strings", modes1 ); - setPreferenceProperty( scalar_map_represent, "indexes", indices1 ); + setPreferenceProperty( scalar_map_represent, "strings", mesh_modes ); + setPreferenceProperty( scalar_map_represent, "indexes", mesh_indices ); addPreference( tr( "VISU_SHRINK" ), representGr, LightApp_Preferences::Bool, "VISU", "scalar_map_shrink" ); int iso_surfaces_represent = addPreference( tr( "VISU_ISO_SURFACES" ), representGr, LightApp_Preferences::Selector, "VISU", "iso_surfaces_represent" ); @@ -3050,8 +3180,8 @@ void VisuGUI::createPreferences() addPreference( "", representGr, LightApp_Preferences::Space ); int deformed_shape_represent = addPreference( tr( "VISU_DEFORMED_SHAPE" ), representGr, LightApp_Preferences::Selector, "VISU", "deformed_shape_represent" ); - setPreferenceProperty( deformed_shape_represent, "strings", modes1 ); - setPreferenceProperty( deformed_shape_represent, "indexes", indices1 ); + setPreferenceProperty( deformed_shape_represent, "strings", mesh_modes ); + setPreferenceProperty( deformed_shape_represent, "indexes", mesh_indices ); addPreference( tr( "VISU_SHRINK" ), representGr, LightApp_Preferences::Bool, "VISU", "deformed_shape_shrink" ); int vectors_represent = addPreference( tr( "VISU_VECTORS" ), representGr, LightApp_Preferences::Selector, "VISU", "vectors_represent" ); @@ -3070,13 +3200,16 @@ void VisuGUI::createPreferences() addPreference( "", representGr, LightApp_Preferences::Space ); int scalar_def_represent = addPreference( tr( "VISU_SCALAR_MAP_ON_DEFORMED_SHAPE" ), representGr, LightApp_Preferences::Selector, "VISU", "scalar_def_represent" ); - setPreferenceProperty( scalar_def_represent, "strings", modes2 ); - setPreferenceProperty( scalar_def_represent, "indexes", indices2 ); + setPreferenceProperty( scalar_def_represent, "strings", modes1 ); + setPreferenceProperty( scalar_def_represent, "indexes", indices1 ); addPreference( tr( "VISU_SHRINK" ), representGr, LightApp_Preferences::Bool, "VISU", "scalar_def_shrink" ); addPreference( tr( "VISU_USE_SHADING" ), representGr, LightApp_Preferences::Bool, "VISU", "represent_shading" ); + addPreference( "", representGr, LightApp_Preferences::Space ); + addPreference( tr( "VISU_DISP_ONLY" ), representGr, + LightApp_Preferences::Bool, "VISU", "display_only" ); // TAB: 3D Cache ; group: "Cache properties" int cacheTab = addPreference( tr( "3D Cache" ) ); @@ -3174,7 +3307,7 @@ VisuGUI return getApp()->getViewManager(theType,theIsCreate); } -TViewToPrs3d +TViewToPrs3d& VisuGUI ::getScalarBarsMap() { diff --git a/src/VISUGUI/VisuGUI.h b/src/VISUGUI/VisuGUI.h index a22dc200..d15639ef 100644 --- a/src/VISUGUI/VisuGUI.h +++ b/src/VISUGUI/VisuGUI.h @@ -40,10 +40,11 @@ class SUIT_ViewManager; class SVTK_ViewWindow; class Prs3d_i; -namespace VISU{ -typedef std::pair TPrs3dToInd; // prs pointer and default index of scalar bar placement -typedef std::set TSetPrs3d; -typedef std::map TViewToPrs3d; +namespace VISU +{ + typedef std::pair TPrs3dToInd; // prs pointer and default index of scalar bar placement + typedef std::set TSetPrs3d; + typedef std::map TViewToPrs3d; } class VisuGUI: public SalomeApp_Module @@ -74,14 +75,15 @@ public: getViewManager(const QString& theType, const bool theIsCreate); - VISU::TViewToPrs3d getScalarBarsMap(); - VISU::TViewToPrs3d myScalarBarsMap; + VISU::TViewToPrs3d& + getScalarBarsMap(); void selectedObjects( SALOME_ListIO& theList ) const; public slots: virtual bool deactivateModule( SUIT_Study* ); virtual bool activateModule( SUIT_Study* ); + virtual void OnEraseAll(); protected slots: void OnImportFromFile(); @@ -115,7 +117,7 @@ protected slots: virtual void OnDisplayPrs(); virtual void OnDisplayOnlyPrs(); virtual void OnErasePrs(); - virtual void OnEraseAll(); + // virtual void OnEraseAll(); void OnMakeSurfaceframe(); void OnMakeInsideframe(); @@ -149,7 +151,8 @@ protected slots: void OnRename(); void OnClippingPlanes(); void OnSweep(); - void OnTimeAnimation(); + void OnParallelTimeAnimation(); + void OnSucccessiveTimeAnimation(); void OnShowAnimation(); void OnCopyPresentation(); @@ -165,6 +168,8 @@ protected slots: protected: virtual LightApp_Selection* createSelection() const; + void OnTimeAnimation(int theMode); + private: void createActions(); void createMenus(); @@ -172,8 +177,9 @@ private: void createPopupMenus(); private: - LightApp_Displayer* myDisplayer; - SALOME_ListIO mySelectedObjects; + LightApp_Displayer* myDisplayer; + SALOME_ListIO mySelectedObjects; + VISU::TViewToPrs3d myScalarBarsMap; }; #endif diff --git a/src/VISUGUI/VisuGUI_ActionsDef.h b/src/VISUGUI/VisuGUI_ActionsDef.h index ca414299..6d539707 100644 --- a/src/VISUGUI/VisuGUI_ActionsDef.h +++ b/src/VISUGUI/VisuGUI_ActionsDef.h @@ -96,7 +96,8 @@ #define VISU_CREATE_TABLE 4063 #define VISU_SWEEP 4064 #define VISU_SELECTION_INFO 4065 -#define VISU_ANIMATION 4066 +#define VISU_PARALLELANIMATION 4066 +#define VISU_SUCCCESSIVEANIMATION 4067 #define VISU_ERASE_ALL 4070 #define VISU_GLOBAL_SELECTION 4071 diff --git a/src/VISUGUI/VisuGUI_BuildProgressDlg.cxx b/src/VISUGUI/VisuGUI_BuildProgressDlg.cxx index c1c9988d..e1dace81 100644 --- a/src/VISUGUI/VisuGUI_BuildProgressDlg.cxx +++ b/src/VISUGUI/VisuGUI_BuildProgressDlg.cxx @@ -268,9 +268,15 @@ void VisuGUI_BuildProgressDlg::onHelp() app->onHelpContextModule(aVisuGUI ? app->moduleName(aVisuGUI->moduleName()) : QString(""), aHelpFileName); } else { + QString platform; +#ifdef WIN32 + platform = "winapplication"; +#else + platform = "application"; +#endif SUIT_MessageBox::warn1(0, QObject::tr("WRN_WARNING"), QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE"). - arg(app->resourceMgr()->stringValue("ExternalBrowser", "application")).arg(aHelpFileName), + arg(app->resourceMgr()->stringValue("ExternalBrowser", platform)).arg(aHelpFileName), QObject::tr("BUT_OK")); } } diff --git a/src/VISUGUI/VisuGUI_ClippingDlg.cxx b/src/VISUGUI/VisuGUI_ClippingDlg.cxx index 2637de41..f6dac619 100644 --- a/src/VISUGUI/VisuGUI_ClippingDlg.cxx +++ b/src/VISUGUI/VisuGUI_ClippingDlg.cxx @@ -218,7 +218,8 @@ OrientedPlane::~OrientedPlane() myMapper->RemoveAllInputs(); myMapper->Delete(); - myPlaneSource->UnRegisterAllOutputs(); + // commented: porting to vtk 5.0 + //myPlaneSource->UnRegisterAllOutputs(); myPlaneSource->Delete(); } @@ -391,6 +392,7 @@ VisuGUI_ClippingDlg::VisuGUI_ClippingDlg (VisuGUI* theModule, VisuGUI_ClippingDlg::~VisuGUI_ClippingDlg() { // no need to delete child widgets, Qt does it all for us + SetPrs3d(NULL); std::for_each(myPlanes.begin(),myPlanes.end(),TSetVisiblity(false)); VISU::RenderViewWindow(VISU::GetActiveViewWindow(myVisuGUI)); } @@ -688,8 +690,15 @@ void VisuGUI_ClippingDlg::onSelectPlane(int theIndex) //================================================================================= void VisuGUI_ClippingDlg::ClickOnNew() { - if(!AutoApplyCheckBox->isChecked()) - ClickOnApply(); + VISU::TSelectionInfo aSelectionInfo = VISU::GetSelectedObjects(myVisuGUI); + if(aSelectionInfo.empty()) + return; + + const VISU::TSelectionItem& aSelectionItem = aSelectionInfo[0]; + if(!aSelectionItem.myObjectInfo.myBase) + return; + + SetCurrentPlaneParam(); if (!myPrs3d) return; @@ -801,6 +810,32 @@ void VisuGUI_ClippingDlg::Sinchronize() ButtonGroupIJKAxis ->setEnabled(anIsControlsEnable); SpinBoxIJKIndex ->setEnabled(anIsControlsEnable); CheckBoxIJKPlaneReverse->setEnabled(anIsControlsEnable); + //ENK: 23.11.2006 - PAL13176 - EDF228 VISU : Enhancement of structured datas processing + if(myPrs3d){ + VISU_PipeLine* aPipeLine = myPrs3d->GetPipeLine(); + VISU::PIDMapper anIDMapper = aPipeLine->GetIDMapper(); + if(anIDMapper->IsStructured()){ + VISU::TIdTypeVector aVec = anIDMapper->GetStructure(); + switch(aVec.size()){ + case 1: + ButtonGroupIJKAxis->find(0)->setEnabled(true); + ButtonGroupIJKAxis->find(1)->setEnabled(false); + ButtonGroupIJKAxis->find(2)->setEnabled(false); + break; + case 2: + ButtonGroupIJKAxis->find(0)->setEnabled(true); + ButtonGroupIJKAxis->find(1)->setEnabled(true); + ButtonGroupIJKAxis->find(2)->setEnabled(false); + break; + case 3: + ButtonGroupIJKAxis->find(0)->setEnabled(true); + ButtonGroupIJKAxis->find(1)->setEnabled(true); + ButtonGroupIJKAxis->find(2)->setEnabled(true); + break; + } + } + } + //ENK: 23.11.2006 } //================================================================================= @@ -995,18 +1030,18 @@ void VisuGUI_ClippingDlg::SetCurrentPlaneIJKParam() static double aCoeff = 180.0/vtkMath::Pi(); for (i = 0; i < 2; ++i) { vtkFloatingPointType cosin = cos[ rotId[ i ]]; - if (maxCos < 0) - cosin = -cosin; +// if (maxCos < 0) +// cosin = -cosin; angle[ i ] = asin(cosin) * aCoeff; - if (maxCos < 0) - angle[ i ] += 180. * (angle[ i ] < 0 ? 1. : -1.); +// if (maxCos < 0) +// angle[ i ] += 180. * (angle[ i ] < 0 ? 1. : -1.); } if (CheckBoxIJKPlaneReverse->isChecked()) { angle[ 0 ] += 180. * (angle[ 0 ] < 0 ? 1. : -1.); distance = 1. - distance; } - if (maxCos < 0) - distance = 1. - distance; +// if (maxCos < 0) +// distance = 1. - distance; // set paramerets myIsSelectPlane = true; @@ -1041,18 +1076,30 @@ void VisuGUI_ClippingDlg::setIJKByNonStructured() double maxDot = 0; const vector *curValues, *values = 0; VISU::Result_i* result = myPrs3d->GetCResult(); - for (i = 0; i < 3; ++i) { + int aNbAxes = 3; + VISU_PipeLine* aPipeLine = myPrs3d->GetPipeLine(); + VISU::PIDMapper anIDMapper = aPipeLine->GetIDMapper(); + if(anIDMapper->IsStructured() && !anIDMapper->myType) + aNbAxes = (anIDMapper->GetStructure()).size(); + for (i = 0; i < aNbAxes; ++i) { VISU::Result_i::TAxis axis = (VISU::Result_i::TAxis) i; CORBA::String_var aMeshName = myPrs3d->GetMeshName(); curValues = result->GetAxisInfo(aMeshName.in(), axis, dir); if (curValues) { double dot = normal * dir; - if (Abs(dot) > Abs(maxDot)) { + //ENK: 23.11.2006 - PAL13176 + if(i==0){ + maxDot = dot; + gridDir = dir; + values = curValues; + gridAxId = i; + } else if (Abs(dot) >= Abs(maxDot)) { maxDot = dot; gridDir = dir; values = curValues; gridAxId = i; } + //ENK: 23.11.2006 } if (Abs (planeNormal[ maxAx ]) < Abs (planeNormal[ i ])) maxAx = i; @@ -1063,11 +1110,11 @@ void VisuGUI_ClippingDlg::setIJKByNonStructured() // find index value double v = SpinBoxDistance->value(); // reverse value? - bool reverse = (normal * axDir < 0); // normal and axis are opposite - if (gridDir * axDir < 0) // grid dir and axis are opposite - reverse = !reverse; - if (reverse) - v = 1. - v; +// bool reverse = (normal * axDir < 0); // normal and axis are opposite +// if (gridDir * axDir < 0) // grid dir and axis are opposite +// reverse = !reverse; +// if (reverse) +// v = 1. - v; for (i = 0; i < values->size(); ++i) if ((*values)[ i ] > v) break; @@ -1160,3 +1207,15 @@ void VisuGUI_ClippingDlg::keyPressEvent( QKeyEvent* e ) ClickOnHelp(); } } + +void VisuGUI_ClippingDlg::SetPrs3d(VISU::Prs3d_i* thePrs) +{ + if(thePrs != myPrs3d){ + if(myPrs3d) + myPrs3d->Destroy(); + if(thePrs) + thePrs->Register(); + myPrs3d = thePrs; + } else + return; +} diff --git a/src/VISUGUI/VisuGUI_ClippingDlg.h b/src/VISUGUI/VisuGUI_ClippingDlg.h index be9dcb20..4d8c8977 100644 --- a/src/VISUGUI/VisuGUI_ClippingDlg.h +++ b/src/VISUGUI/VisuGUI_ClippingDlg.h @@ -136,6 +136,9 @@ public: private: void keyPressEvent( QKeyEvent* e ); + + void SetPrs3d(VISU::Prs3d_i* thePrs); + private: diff --git a/src/VISUGUI/VisuGUI_CursorDlg.cxx b/src/VISUGUI/VisuGUI_CursorDlg.cxx index d309c740..45de30f6 100644 --- a/src/VISUGUI/VisuGUI_CursorDlg.cxx +++ b/src/VISUGUI/VisuGUI_CursorDlg.cxx @@ -26,6 +26,7 @@ // Module : VISU // $Header$ +#include using namespace std; #include "VisuGUI.h" @@ -135,9 +136,15 @@ void VisuGUI_CursorDlg::onHelp() app->onHelpContextModule(aVisuGUI ? app->moduleName(aVisuGUI->moduleName()) : QString(""), aHelpFileName); } else { + QString platform; +#ifdef WIN32 + platform = "winapplication"; +#else + platform = "application"; +#endif SUIT_MessageBox::warn1(0, QObject::tr("WRN_WARNING"), QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE"). - arg(app->resourceMgr()->stringValue("ExternalBrowser", "application")).arg(aHelpFileName), + arg(app->resourceMgr()->stringValue("ExternalBrowser", platform)).arg(aHelpFileName), QObject::tr("BUT_OK")); } } diff --git a/src/VISUGUI/VisuGUI_CutLinesDlg.cxx b/src/VISUGUI/VisuGUI_CutLinesDlg.cxx index 38794bdc..eaa5a418 100644 --- a/src/VISUGUI/VisuGUI_CutLinesDlg.cxx +++ b/src/VISUGUI/VisuGUI_CutLinesDlg.cxx @@ -67,9 +67,6 @@ using namespace std; -bool VisuGUI_CutLinesDlg::MYGenerateTable = true; -bool VisuGUI_CutLinesDlg::MYGenerateCurve = true; - VisuGUI_CutLinesDlg::VisuGUI_CutLinesDlg (SalomeApp_Module* theModule) : VisuGUI_Prs3dDlg(theModule), myPreviewActor(0),myPreviewActorGlyphs(0) @@ -139,8 +136,12 @@ VisuGUI_CutLinesDlg::VisuGUI_CutLinesDlg (SalomeApp_Module* theModule) myAllCurvesInvertedCheck->setChecked(false); aPlaneLayout->addWidget(myAllCurvesInvertedCheck); + myUseAbsoluteLengthCheck = new QCheckBox(tr("LBL_ABSOLUTE_LENGTH"), aPlanePane); + myUseAbsoluteLengthCheck->setChecked(false); + aPlaneLayout->addWidget(myUseAbsoluteLengthCheck); + myCreateTable = new QCheckBox (tr("LBL_GENERATE_TABLE"), aPlanePane); - myCreateTable->setChecked(MYGenerateTable); + myCreateTable->setChecked(true); aPlaneLayout->addWidget( myCreateTable ); QHBox* aCheckPane = new QHBox(aPlanePane); @@ -148,8 +149,8 @@ VisuGUI_CutLinesDlg::VisuGUI_CutLinesDlg (SalomeApp_Module* theModule) aCheckPane->setStretchFactor(aLbl, 0); myCurvesCheck = new QCheckBox(tr("LBL_GENERATE_CURVES"), aCheckPane); aCheckPane->setStretchFactor(aCheckPane, 0); - myCurvesCheck->setChecked(MYGenerateCurve); - myCurvesCheck->setEnabled(MYGenerateTable); + myCurvesCheck->setChecked(true); + myCurvesCheck->setEnabled(true); QLabel* aLbl2 = new QLabel(" ", aCheckPane); aCheckPane->setStretchFactor(aLbl2, 1); aPlaneLayout->addWidget( aCheckPane ); @@ -506,6 +507,7 @@ void VisuGUI_CutLinesDlg::setBaseDefault (bool theUpdate) /* float aPos = myCutLines->GetBasePlanePosition(); myBasePlanePos->setText( QString::number(aPos) ); myBasePlanePos->setEnabled(false);*/ + myCutLines->SetDisplacement(myPosSpn->value()); SVTK_ViewWindow* aView = VISU::GetActiveViewWindow(); if (aView) { if (theUpdate && myPreviewCheck->isChecked() && (myCutLines != NULL)) { @@ -784,8 +786,6 @@ void VisuGUI_CutLinesDlg::accept() // reject(); // return; //} - MYGenerateTable = myCreateTable->isChecked(); - MYGenerateCurve = myCurvesCheck->isChecked(); // if (myScalarPane->check()) { /*jfa tmp:((QWidget*)sender())->setDisabled(true); storeToPrsObject(myPrsCopy); @@ -866,7 +866,6 @@ void VisuGUI_CutLinesDlg::accept() myScalarPane->deletePreview(); deletePlanes(); QDialog::accept(); - // } } void VisuGUI_CutLinesDlg::reject() @@ -955,9 +954,15 @@ void VisuGUI_CutLinesDlg::onHelp() app->onHelpContextModule(aVisuGUI ? app->moduleName(aVisuGUI->moduleName()) : QString(""), aHelpFileName); } else { + QString platform; +#ifdef WIN32 + platform = "winapplication"; +#else + platform = "application"; +#endif SUIT_MessageBox::warn1(0, QObject::tr("WRN_WARNING"), QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE"). - arg(app->resourceMgr()->stringValue("ExternalBrowser", "application")).arg(aHelpFileName), + arg(app->resourceMgr()->stringValue("ExternalBrowser", platform)).arg(aHelpFileName), QObject::tr("BUT_OK")); } } diff --git a/src/VISUGUI/VisuGUI_CutLinesDlg.h b/src/VISUGUI/VisuGUI_CutLinesDlg.h index dfbc28dc..9e7405e7 100644 --- a/src/VISUGUI/VisuGUI_CutLinesDlg.h +++ b/src/VISUGUI/VisuGUI_CutLinesDlg.h @@ -118,14 +118,9 @@ private: SALOME_Actor* myPreviewActorGlyphs; QCheckBox* myPreviewCheck; QCheckBox* myAllCurvesInvertedCheck; + QCheckBox* myUseAbsoluteLengthCheck; SALOME::GenericObjPtr myPrsCopy; - - //jfa tmp:SUIT_ViewManager *myMgr; - //jfa tmp:SUIT_ViewWindow *myStudyWnd; - - static bool MYGenerateTable; - static bool MYGenerateCurve; }; #endif // VISUGUI_CUTLINESDLG_H diff --git a/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx b/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx index 804c545e..22ae148d 100644 --- a/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx +++ b/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx @@ -601,9 +601,15 @@ void VisuGUI_CutPlanesDlg::onHelp() app->onHelpContextModule(aVisuGUI ? app->moduleName(aVisuGUI->moduleName()) : QString(""), aHelpFileName); } else { + QString platform; +#ifdef WIN32 + platform = "winapplication"; +#else + platform = "application"; +#endif SUIT_MessageBox::warn1(0, QObject::tr("WRN_WARNING"), QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE"). - arg(app->resourceMgr()->stringValue("ExternalBrowser", "application")).arg(aHelpFileName), + arg(app->resourceMgr()->stringValue("ExternalBrowser", platform)).arg(aHelpFileName), QObject::tr("BUT_OK")); } } diff --git a/src/VISUGUI/VisuGUI_DeformedShapeDlg.cxx b/src/VISUGUI/VisuGUI_DeformedShapeDlg.cxx index e60b0943..94a559a3 100644 --- a/src/VISUGUI/VisuGUI_DeformedShapeDlg.cxx +++ b/src/VISUGUI/VisuGUI_DeformedShapeDlg.cxx @@ -79,7 +79,7 @@ VisuGUI_DeformedShapeDlg::VisuGUI_DeformedShapeDlg (SalomeApp_Module* theModule) ScalFact = new QtxDblSpinBox (0.0, 1.0E+38, 0.1, TopGroup); ScalFact->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed)); - ScalFact->setPrecision(5); + ScalFact->setPrecision(38); ScalFact->setValue(0.1); TopGroupLayout->addWidget(ScalFact, 0, 1); @@ -202,9 +202,15 @@ void VisuGUI_DeformedShapeDlg::onHelp() app->onHelpContextModule(aVisuGUI ? app->moduleName(aVisuGUI->moduleName()) : QString(""), aHelpFileName); } else { + QString platform; +#ifdef WIN32 + platform = "winapplication"; +#else + platform = "application"; +#endif SUIT_MessageBox::warn1(0, QObject::tr("WRN_WARNING"), QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE"). - arg(app->resourceMgr()->stringValue("ExternalBrowser", "application")).arg(aHelpFileName), + arg(app->resourceMgr()->stringValue("ExternalBrowser", platform)).arg(aHelpFileName), QObject::tr("BUT_OK")); } } diff --git a/src/VISUGUI/VisuGUI_EditContainerDlg.cxx b/src/VISUGUI/VisuGUI_EditContainerDlg.cxx index 52defc0a..9850d1f4 100644 --- a/src/VISUGUI/VisuGUI_EditContainerDlg.cxx +++ b/src/VISUGUI/VisuGUI_EditContainerDlg.cxx @@ -456,9 +456,15 @@ void VisuGUI_EditContainerDlg::onHelp() if (app) app->onHelpContextModule(myVisuGUI ? app->moduleName(myVisuGUI->moduleName()) : QString(""), aHelpFileName); else { + QString platform; +#ifdef WIN32 + platform = "winapplication"; +#else + platform = "application"; +#endif SUIT_MessageBox::warn1(0, QObject::tr("WRN_WARNING"), QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE"). - arg(app->resourceMgr()->stringValue("ExternalBrowser", "application")).arg(aHelpFileName), + arg(app->resourceMgr()->stringValue("ExternalBrowser", platform)).arg(aHelpFileName), QObject::tr("BUT_OK")); } } diff --git a/src/VISUGUI/VisuGUI_Factory.cxx b/src/VISUGUI/VisuGUI_Factory.cxx index c7fe8352..5ef7af88 100644 --- a/src/VISUGUI/VisuGUI_Factory.cxx +++ b/src/VISUGUI/VisuGUI_Factory.cxx @@ -30,7 +30,18 @@ #include "CAM_Module.h" +#ifdef WNT +#ifdef VISU_VISUGUI_EXPORTS +#define VISU_VISUGUI_EXPORT __declspec(dllexport) +#else +#define VISU_VISUGUI_EXPORT __declspec(dllimport) +#endif +#else +#define VISU_VISUGUI_EXPORT +#endif + extern "C" { +VISU_VISUGUI_EXPORT CAM_Module* createModule() { diff --git a/src/VISUGUI/VisuGUI_FieldFilter.cxx b/src/VISUGUI/VisuGUI_FieldFilter.cxx index 3dd45bb1..50c42cdc 100644 --- a/src/VISUGUI/VisuGUI_FieldFilter.cxx +++ b/src/VISUGUI/VisuGUI_FieldFilter.cxx @@ -79,10 +79,10 @@ bool VisuGUI_FieldFilter::isOk( const SUIT_DataOwner* theDataOwner ) const return false; _PTR(GenericAttribute) anAttr; - if( !aSObject->FindAttribute( anAttr, "AttributeComment" ) ) + if( !aSObject->FindAttribute( anAttr, "AttributeString" ) ) return false; - _PTR(AttributeComment) aComment( anAttr ); + _PTR(AttributeString) aComment( anAttr ); string aComm = aComment->Value(); QString strIn( aComm.c_str() ); diff --git a/src/VISUGUI/VisuGUI_GaussPointsDlg.cxx b/src/VISUGUI/VisuGUI_GaussPointsDlg.cxx index 11688a78..6639a3d7 100644 --- a/src/VISUGUI/VisuGUI_GaussPointsDlg.cxx +++ b/src/VISUGUI/VisuGUI_GaussPointsDlg.cxx @@ -815,9 +815,15 @@ void VisuGUI_GaussPointsDlg::onHelp() if (app) app->onHelpContextModule(app->activeModule() ? app->moduleName(app->activeModule()->moduleName()) : QString(""), aHelpFileName); else { + QString platform; +#ifdef WIN32 + platform = "winapplication"; +#else + platform = "application"; +#endif SUIT_MessageBox::warn1(0, QObject::tr("WRN_WARNING"), QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE"). - arg(app->resourceMgr()->stringValue("ExternalBrowser", "application")).arg(aHelpFileName), + arg(app->resourceMgr()->stringValue("ExternalBrowser", platform)).arg(aHelpFileName), QObject::tr("BUT_OK")); } } diff --git a/src/VISUGUI/VisuGUI_InputPane.cxx b/src/VISUGUI/VisuGUI_InputPane.cxx index f20c92f3..efdcdbdb 100644 --- a/src/VISUGUI/VisuGUI_InputPane.cxx +++ b/src/VISUGUI/VisuGUI_InputPane.cxx @@ -43,7 +43,7 @@ #include "SALOME_ListIO.hxx" -#include "SALOMEDSClient_AttributeComment.hxx" +#include "SALOMEDSClient_AttributeString.hxx" #include "SALOMEDSClient_AttributeName.hxx" #include @@ -145,10 +145,10 @@ void VisuGUI_InputPane::onSelectionChanged() VISU::Storable::TRestoringMap aMap; _PTR(GenericAttribute) anAttr; - if (!aSObject->FindAttribute(anAttr, "AttributeComment")) + if (!aSObject->FindAttribute(anAttr, "AttributeString")) return; - _PTR(AttributeComment) aComment (anAttr); + _PTR(AttributeString) aComment (anAttr); string aComm = aComment->Value(); QString strIn (aComm.c_str()); VISU::Storable::StrToMap(strIn, aMap); diff --git a/src/VISUGUI/VisuGUI_IsoSurfacesDlg.cxx b/src/VISUGUI/VisuGUI_IsoSurfacesDlg.cxx index c24f76a9..1963b443 100644 --- a/src/VISUGUI/VisuGUI_IsoSurfacesDlg.cxx +++ b/src/VISUGUI/VisuGUI_IsoSurfacesDlg.cxx @@ -285,9 +285,15 @@ void VisuGUI_IsoSurfacesDlg::onHelp() app->onHelpContextModule(aVisuGUI ? app->moduleName(aVisuGUI->moduleName()) : QString(""), aHelpFileName); } else { + QString platform; +#ifdef WIN32 + platform = "winapplication"; +#else + platform = "application"; +#endif SUIT_MessageBox::warn1(0, QObject::tr("WRN_WARNING"), QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE"). - arg(app->resourceMgr()->stringValue("ExternalBrowser", "application")).arg(aHelpFileName), + arg(app->resourceMgr()->stringValue("ExternalBrowser", platform)).arg(aHelpFileName), QObject::tr("BUT_OK")); } } diff --git a/src/VISUGUI/VisuGUI_Module.cxx b/src/VISUGUI/VisuGUI_Module.cxx index 0406c812..af5fea40 100644 --- a/src/VISUGUI/VisuGUI_Module.cxx +++ b/src/VISUGUI/VisuGUI_Module.cxx @@ -1327,8 +1327,8 @@ namespace Storable::DataToStream(aStream,"mySubId",theSelection.mySubId); _PTR(GenericAttribute) anAttr; - anAttr = theStudyBuilder->FindOrCreateAttribute(aNewObj,"AttributeComment"); - _PTR(AttributeComment) aComment(anAttr); + anAttr = theStudyBuilder->FindOrCreateAttribute(aNewObj,"AttributeString"); + _PTR(AttributeString) aComment(anAttr); aComment->SetValue(aStream.str()); } @@ -1358,8 +1358,8 @@ namespace // To update selection _PTR(GenericAttribute) anAttr; - if(aChildSObject->FindAttribute(anAttr,"AttributeComment")){ - _PTR(AttributeComment) aComment(anAttr); + if(aChildSObject->FindAttribute(anAttr,"AttributeString")){ + _PTR(AttributeString) aComment(anAttr); QString aStream(aComment->Value().c_str()); Storable::TRestoringMap aMap; @@ -1431,8 +1431,8 @@ namespace Handle(SALOME_InteractiveObject) anIO = aListIter.Value(); _PTR(SObject) aSObject = aCStudy->FindObjectID(anIO->getEntry()); _PTR(GenericAttribute) anAttr; - if(aSObject->FindAttribute(anAttr,"AttributeComment")){ - _PTR(AttributeComment) aComment(anAttr); + if(aSObject->FindAttribute(anAttr,"AttributeString")){ + _PTR(AttributeString) aComment(anAttr); std::string aCommentValue(aComment->Value()); if(aCommentValue.compare("myComment=GAUSSVIEW") >= 0){ aComment->SetValue(aValue.c_str()); @@ -1486,8 +1486,8 @@ namespace _PTR(Study) aCStudy = GetCStudy(GetAppStudy(theModule)); _PTR(GenericAttribute) anAttr; - if(theSObject->FindAttribute(anAttr,"AttributeComment")){ - _PTR(AttributeComment) aComment(anAttr); + if(theSObject->FindAttribute(anAttr,"AttributeString")){ + _PTR(AttributeString) aComment(anAttr); QString aStream(aComment->Value().c_str()); Storable::TRestoringMap aMap; Storable::StrToMap(aStream,aMap); @@ -1533,8 +1533,8 @@ OnRestoreConfiguration() _PTR(SObject) aSObject = aCStudy->FindObjectID(anIO->getEntry()); myConfigSObject = aSObject; _PTR(GenericAttribute) anAttr; - if(aSObject->FindAttribute(anAttr,"AttributeComment")){ - _PTR(AttributeComment) aComment(anAttr); + if(aSObject->FindAttribute(anAttr,"AttributeString")){ + _PTR(AttributeString) aComment(anAttr); QString aStream(aComment->Value().c_str()); Storable::TRestoringMap aMap; Storable::StrToMap(aStream,aMap); diff --git a/src/VISUGUI/VisuGUI_NameDlg.cxx b/src/VISUGUI/VisuGUI_NameDlg.cxx index f0bf79f7..60b252af 100644 --- a/src/VISUGUI/VisuGUI_NameDlg.cxx +++ b/src/VISUGUI/VisuGUI_NameDlg.cxx @@ -151,9 +151,15 @@ void VisuGUI_NameDlg::onHelp() app->onHelpContextModule(aVisuGUI ? app->moduleName(aVisuGUI->moduleName()) : QString(""), aHelpFileName); } else { + QString platform; +#ifdef WIN32 + platform = "winapplication"; +#else + platform = "application"; +#endif SUIT_MessageBox::warn1(0, QObject::tr("WRN_WARNING"), QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE"). - arg(app->resourceMgr()->stringValue("ExternalBrowser", "application")).arg(aHelpFileName), + arg(app->resourceMgr()->stringValue("ExternalBrowser", platform)).arg(aHelpFileName), QObject::tr("BUT_OK")); } } diff --git a/src/VISUGUI/VisuGUI_OffsetDlg.cxx b/src/VISUGUI/VisuGUI_OffsetDlg.cxx index eb86611a..eca719e7 100644 --- a/src/VISUGUI/VisuGUI_OffsetDlg.cxx +++ b/src/VISUGUI/VisuGUI_OffsetDlg.cxx @@ -243,9 +243,15 @@ void VisuGUI_OffsetDlg::onHelp() if (app) app->onHelpContextModule(myModule ? app->moduleName(myModule->moduleName()) : QString(""), aHelpFileName); else { + QString platform; +#ifdef WIN32 + platform = "winapplication"; +#else + platform = "application"; +#endif SUIT_MessageBox::warn1(0, QObject::tr("WRN_WARNING"), QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE"). - arg(app->resourceMgr()->stringValue("ExternalBrowser", "application")).arg(aHelpFileName), + arg(app->resourceMgr()->stringValue("ExternalBrowser", platform)).arg(aHelpFileName), QObject::tr("BUT_OK")); } } diff --git a/src/VISUGUI/VisuGUI_Plot3DDlg.cxx b/src/VISUGUI/VisuGUI_Plot3DDlg.cxx index 70099107..08c5cb97 100644 --- a/src/VISUGUI/VisuGUI_Plot3DDlg.cxx +++ b/src/VISUGUI/VisuGUI_Plot3DDlg.cxx @@ -126,7 +126,8 @@ class TPlane : public SALOME_Actor ~TPlane() { myMapper->RemoveAllInputs(); myMapper->Delete(); - myPlaneSource->UnRegisterAllOutputs(); + // commented: porting to vtk 5.0 + //myPlaneSource->UnRegisterAllOutputs(); myPlaneSource->Delete(); }; // Not implemented. @@ -685,9 +686,15 @@ void VisuGUI_Plot3DDlg::onHelp() app->onHelpContextModule(aVisuGUI ? app->moduleName(aVisuGUI->moduleName()) : QString(""), aHelpFileName); } else { + QString platform; +#ifdef WIN32 + platform = "winapplication"; +#else + platform = "application"; +#endif SUIT_MessageBox::warn1(0, QObject::tr("WRN_WARNING"), QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE"). - arg(app->resourceMgr()->stringValue("ExternalBrowser", "application")).arg(aHelpFileName), + arg(app->resourceMgr()->stringValue("ExternalBrowser", platform)).arg(aHelpFileName), QObject::tr("BUT_OK")); } } diff --git a/src/VISUGUI/VisuGUI_Prs3dTools.h b/src/VISUGUI/VisuGUI_Prs3dTools.h index 4ca72b11..f169e8fc 100644 --- a/src/VISUGUI/VisuGUI_Prs3dTools.h +++ b/src/VISUGUI/VisuGUI_Prs3dTools.h @@ -34,6 +34,8 @@ #include "VISU_ColoredPrs3dFactory.hh" #include "VISU_PipeLine.hxx" +#include + #include namespace VISU @@ -232,11 +234,18 @@ namespace VISU if (aPrs3d) { SUIT_ResourceMgr* aResourceMgr = GetResourceMgr(); int aValue = aResourceMgr->integerValue("VISU","BuildDefaultPrs3d",0); + if(aResourceMgr->booleanValue("VISU","display_only",false)){ + theModule->OnEraseAll(); + } + if (!aValue) { if (TDlg* aDlg = new TDlg(theModule)) { // dialog box in creation mode aDlg->initFromPrsObject(aPrs3d); if (runAndWait(aDlg,IsDlgModal) && (aDlg->storeToPrsObject(aPrs3d))) { + if(aResourceMgr->booleanValue("VISU","display_only",false)){ + if(SPlot2d_Viewer* aPlot2d = GetPlot2dViewer(theModule, false)) aPlot2d->EraseAll(); + } // Optionally, create table and curves for cut lines QApplication::setOverrideCursor(Qt::waitCursor); CreateCurves( theModule, diff --git a/src/VISUGUI/VisuGUI_ScalarBarDlg.h b/src/VISUGUI/VisuGUI_ScalarBarDlg.h index 56cd2849..761f3d3d 100644 --- a/src/VISUGUI/VisuGUI_ScalarBarDlg.h +++ b/src/VISUGUI/VisuGUI_ScalarBarDlg.h @@ -43,6 +43,7 @@ #include #include "QtxDblSpinBox.h" +#include "QtxListBox.h" class VisuGUI_InputPane; diff --git a/src/VISUGUI/VisuGUI_ScalarMapOnDeformedShapeDlg.cxx b/src/VISUGUI/VisuGUI_ScalarMapOnDeformedShapeDlg.cxx index 8fb375ef..816da47b 100644 --- a/src/VISUGUI/VisuGUI_ScalarMapOnDeformedShapeDlg.cxx +++ b/src/VISUGUI/VisuGUI_ScalarMapOnDeformedShapeDlg.cxx @@ -49,7 +49,7 @@ #include "SALOME_ListIO.hxx" -#include "SALOMEDSClient_AttributeComment.hxx" +#include "SALOMEDSClient_AttributeString.hxx" #include "SALOMEDSClient_AttributeName.hxx" #include @@ -66,7 +66,6 @@ VisuGUI_ScalarMapOnDeformedShapeDlg::VisuGUI_ScalarMapOnDeformedShapeDlg (Salome : VisuGUI_Prs3dDlg(theModule), myIsAnimation(false), myUpdateScalars(true), - myIteration(1), myVisuGUI(theModule) { setCaption(tr("DLG_TITLE")); @@ -95,7 +94,7 @@ VisuGUI_ScalarMapOnDeformedShapeDlg::VisuGUI_ScalarMapOnDeformedShapeDlg (Salome ScalFact = new QtxDblSpinBox (0.0, 1.0E+38, 0.1, TopGroup); ScalFact->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed)); - ScalFact->setPrecision(5); + ScalFact->setPrecision(38); ScalFact->setValue(0.1); TopGroupLayout->addWidget(ScalFact, 0, 1); @@ -176,12 +175,13 @@ void VisuGUI_ScalarMapOnDeformedShapeDlg::initFromPrsObject(VISU::ColoredPrs3d_i myTimeStampsCombo->setDisabled(myIsAnimation); myCurrMeshName = myPrsCopy->GetCMeshName(); - QString aFieldName(myPrsCopy->GetScalarFieldName().c_str()); + CORBA::String_var aMeshName = myPrsCopy->GetMeshName(); + CORBA::String_var aFieldName(myPrsCopy->GetScalarCFieldName()); float aIterFloat = GetFloatValueOfTimeStamp(aMeshName.in(), - myPrsCopy->GetScalarFieldName().c_str(), - myPrsCopy->GetScalarIteration(), - myPrsCopy->GetScalarEntity()); + aFieldName.in(), + myPrsCopy->GetScalarLIteration(), + myPrsCopy->GetScalarEEntity()); QString aIteration(QString("%1").arg(aIterFloat)); if (myMeshFieldsTimes.size() == 0) @@ -197,8 +197,8 @@ void VisuGUI_ScalarMapOnDeformedShapeDlg::initFromPrsObject(VISU::ColoredPrs3d_i _PTR(SObject) aSObject = aActiveStudy->FindObjectID(aIO->getEntry()); _PTR(GenericAttribute) anTmpAttr; - if (aSObject->FindAttribute(anTmpAttr, "AttributeComment")) { - _PTR(AttributeComment) aTmpComment (anTmpAttr); + if (aSObject->FindAttribute(anTmpAttr, "AttributeString")) { + _PTR(AttributeString) aTmpComment (anTmpAttr); string aTmpComm = aTmpComment->Value(); QString aTmpstrIn (aTmpComm.c_str()); VISU::Storable::TRestoringMap aTmpaMap; @@ -254,8 +254,8 @@ void VisuGUI_ScalarMapOnDeformedShapeDlg::initFromPrsObject(VISU::ColoredPrs3d_i for (aIter->InitEx(true); aIter->More(); aIter->Next()) { _PTR(SObject) aChildSObj = aIter->Value(); _PTR(GenericAttribute) anAttr; - if (aChildSObj->FindAttribute(anAttr, "AttributeComment")) { - _PTR(AttributeComment) aComment (anAttr); + if (aChildSObj->FindAttribute(anAttr, "AttributeString")) { + _PTR(AttributeString) aComment (anAttr); string aComm = aComment->Value(); QString strIn (aComm.c_str()); VISU::Storable::TRestoringMap aMap; @@ -275,12 +275,12 @@ void VisuGUI_ScalarMapOnDeformedShapeDlg::initFromPrsObject(VISU::ColoredPrs3d_i QString aFieldName = VISU::getValue(aChildSObj, "myFieldName"); QString aTimeIter = VISU::getValue(aChildSObj, "myTimeStampId"); QString aEntity = VISU::getValue(aChildSObj, "myEntityId"); - VISU::TEntity anEntity; + VISU::Entity anEntity; switch (aEntity.toInt()) { - case 0: anEntity = VISU::NODE_ENTITY; break; - case 1: anEntity = VISU::EDGE_ENTITY; break; - case 2: anEntity = VISU::FACE_ENTITY; break; - case 3: anEntity = VISU::CELL_ENTITY; break; + case 0: anEntity = VISU::NODE; break; + case 1: anEntity = VISU::EDGE; break; + case 2: anEntity = VISU::FACE; break; + case 3: anEntity = VISU::CELL; break; } TFT &aFieldsMap = myMeshFieldsTimes[aMeshName.latin1()]; TFE aKey (aFieldName.latin1(), anEntity); @@ -298,7 +298,7 @@ void VisuGUI_ScalarMapOnDeformedShapeDlg::initFromPrsObject(VISU::ColoredPrs3d_i AddAllFieldNames(); } - myFieldsCombo->setCurrentText(aFieldName); + myFieldsCombo->setCurrentText(aFieldName.in()); AddAllTimes(myFieldsCombo->currentText()); myTimeStampsCombo->setCurrentText(aIteration); SetScalarField( false ); @@ -318,22 +318,20 @@ void VisuGUI_ScalarMapOnDeformedShapeDlg::initFromPrsObject(VISU::ColoredPrs3d_i myTabBox->setCurrentPage( 0 ); } -int VisuGUI_ScalarMapOnDeformedShapeDlg::storeToPrsObject(VISU::ColoredPrs3d_i* thePrs) +int +VisuGUI_ScalarMapOnDeformedShapeDlg +::storeToPrsObject(VISU::ColoredPrs3d_i* thePrs) { myPrsCopy->SetScale(getFactor()); - if (myIsAnimation) - myPrsCopy->SetCScalarField(myPrsCopy->GetScalarMeshName().c_str(), - getCurrentScalarFieldName().latin1(), - myIteration, - myPrsCopy->GetScalarEntity()); - else - myPrsCopy->SetCScalarField(myPrsCopy->GetScalarMeshName().c_str(), - getCurrentScalarFieldName().latin1(), - myTimeStampsCombo->currentItem() + 1, - myPrsCopy->GetScalarEntity()); + CORBA::String_var aMeshName = myPrsCopy->GetMeshName(); + myPrsCopy->SetScalarField(aMeshName.in(), + getCurrentScalarFieldName().latin1(), + myTimeStampID[ myTimeStampsCombo->currentItem() ], + myPrsCopy->GetScalarEEntity()); - if (myUpdateScalars) SetScalarField( false ); + if(myUpdateScalars) + SetScalarField( false ); myPrsCopy->ShowColored(true); @@ -363,8 +361,11 @@ int VisuGUI_ScalarMapOnDeformedShapeDlg::getCurrentScalarNbIterations(){ return myTimeStampsCombo->count(); } -VISU::TEntity VisuGUI_ScalarMapOnDeformedShapeDlg::getCurrentScalarEntity(){ - VISU::TEntity anEntity; +VISU::Entity +VisuGUI_ScalarMapOnDeformedShapeDlg +::getCurrentScalarEntity() +{ + VISU::Entity anEntity; TFT::const_iterator aIterField = myMeshFieldsTimes[myCurrMeshName].begin(); for(;aIterField != myMeshFieldsTimes[myCurrMeshName].end();aIterField++){ if (aIterField->first.first == myFieldsCombo->currentText()){ @@ -376,10 +377,15 @@ VISU::TEntity VisuGUI_ScalarMapOnDeformedShapeDlg::getCurrentScalarEntity(){ } void VisuGUI_ScalarMapOnDeformedShapeDlg::SetScalarField( const bool save_scalar_pane ){ - SetScalarField( myTimeStampsCombo->currentItem()+1, "", save_scalar_pane ); + SetScalarField( myTimeStampID[ myTimeStampsCombo->currentItem() ], "", save_scalar_pane ); } -void VisuGUI_ScalarMapOnDeformedShapeDlg::SetScalarField(int theIter,QString theFieldName, const bool save_scalar_pane ){ +void +VisuGUI_ScalarMapOnDeformedShapeDlg +::SetScalarField(int theIter, + QString theFieldName, + const bool save_scalar_pane ) +{ QString aFieldName; @@ -388,13 +394,13 @@ void VisuGUI_ScalarMapOnDeformedShapeDlg::SetScalarField(int theIter,QString the else aFieldName = theFieldName; - VISU::TEntity anEntity = getCurrentScalarEntity(); - - myPrsCopy->SetCScalarField(myCurrMeshName.latin1(), - aFieldName.latin1(), - theIter, - anEntity); - + VISU::Entity anEntity = getCurrentScalarEntity(); + + myPrsCopy->SetScalarField(myCurrMeshName.latin1(), + aFieldName.latin1(), + theIter, + anEntity); + if( save_scalar_pane ) { myScalarPane->storeToPrsObject(myPrsCopy); @@ -423,9 +429,15 @@ void VisuGUI_ScalarMapOnDeformedShapeDlg::onHelp() if (app) app->onHelpContextModule(myVisuGUI ? app->moduleName(myVisuGUI->moduleName()) : QString(""), aHelpFileName); else { + QString platform; +#ifdef WIN32 + platform = "winapplication"; +#else + platform = "application"; +#endif SUIT_MessageBox::warn1(0, QObject::tr("WRN_WARNING"), QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE"). - arg(app->resourceMgr()->stringValue("ExternalBrowser", "application")).arg(aHelpFileName), + arg(app->resourceMgr()->stringValue("ExternalBrowser", platform)).arg(aHelpFileName), QObject::tr("BUT_OK")); } } @@ -451,9 +463,13 @@ void VisuGUI_ScalarMapOnDeformedShapeDlg::AddAllTimes(const QString& theFieldNam QString aFieldName = aIterField->first.first; if(theFieldName != aFieldName) continue; myTimeStampsCombo->clear(); + myTimeStampID.clear(); + myTimeStampID.reserve( (aIterField->second).size() ); TTL::const_iterator aTimeIter = (aIterField->second).begin(); - for(;aTimeIter != (aIterField->second).end(); aTimeIter++) + for(;aTimeIter != (aIterField->second).end(); aTimeIter++) { myTimeStampsCombo->insertItem(QString("%1").arg(aTimeIter->second)); + myTimeStampID.push_back(aTimeIter->first); + } return; } } @@ -483,14 +499,22 @@ void VisuGUI_ScalarMapOnDeformedShapeDlg::UpdateScalarField(){ myScalarPane->setRange(aDoubleRange[0],aDoubleRange[1],myScalarPane->isIRange()); } -float VisuGUI_ScalarMapOnDeformedShapeDlg::GetFloatValueOfTimeStamp(const char* theMeshName, - const char* theFieldName, - const int theIter, - const VISU::TEntity theEntity){ +float +VisuGUI_ScalarMapOnDeformedShapeDlg +::GetFloatValueOfTimeStamp(const char* theMeshName, + const char* theFieldName, + const int theIter, + const VISU::Entity theEntity) +{ float ret=1; + VISU::TEntity anEntity = VISU::TEntity(theEntity); VISU::Result_i* theResult = myPrsCopy->GetCResult(); - VISU::PField aField = theResult->GetInput()->GetField(theMeshName,theEntity,theFieldName); - if(!aField) return ret; + VISU::Result_i::TInput* anInput = theResult->GetInput(); + VISU::PField aField = anInput->GetField(theMeshName, + anEntity, + theFieldName); + if(!aField) + return ret; VISU::TValField& aValField = aField->myValField; VISU::TValField::const_iterator aIter = aValField.find(theIter); if(aIter != aValField.end()){ diff --git a/src/VISUGUI/VisuGUI_ScalarMapOnDeformedShapeDlg.h b/src/VISUGUI/VisuGUI_ScalarMapOnDeformedShapeDlg.h index f891508f..e6178bcd 100644 --- a/src/VISUGUI/VisuGUI_ScalarMapOnDeformedShapeDlg.h +++ b/src/VISUGUI/VisuGUI_ScalarMapOnDeformedShapeDlg.h @@ -31,7 +31,6 @@ #include "VisuGUI_Prs3dDlg.h" #include "VISUConfig.hh" -#include "VISU_Convertor.hxx" #include "QtxDblSpinBox.h" @@ -44,6 +43,7 @@ #include #include +#include class SalomeApp_Module; class VisuGUI_InputPane; @@ -66,17 +66,13 @@ public: void setFactor(double theFactor) { ScalFact->setValue(theFactor); } - void setAnimation( bool on ) { myIsAnimation = on; } - void setUpdateScalars( bool on ) { myUpdateScalars = on; } - void setIteration( int value ) { myIteration = value; } - virtual void initFromPrsObject(VISU::ColoredPrs3d_i* thePrs, bool theInit = true); virtual int storeToPrsObject(VISU::ColoredPrs3d_i* thePrs); int getCurrentScalarFieldNamePos(); QString getCurrentScalarFieldName(); int getCurrentScalarNbIterations(); - VISU::TEntity getCurrentScalarEntity(); + VISU::Entity getCurrentScalarEntity(); void SetScalarField(int theIter,QString theFieldName=QString(""), const bool = true ); private: @@ -100,7 +96,7 @@ private: QComboBox *myTimeStampsCombo; typedef std::map TTL; // Times map definition (iteration time, real value of time) - typedef std::pair TFE; // pair field name and entity + typedef std::pair TFE; // pair field name and entity typedef std::map TFT; // Field name and enity to Times typedef std::map TMF; // Mesh to fields map @@ -109,7 +105,7 @@ private: int myCurrScalarIter; bool myIsAnimation; bool myUpdateScalars; - int myIteration; + std::vector myTimeStampID; _PTR(SObject) mySelectionObj; SALOME::GenericObjPtr myPrsCopy; @@ -123,7 +119,7 @@ protected: float GetFloatValueOfTimeStamp(const char* theMeshName, const char* theFieldName, const int theIteration, - const VISU::TEntity theEntity); + const VISU::Entity theEntity); }; #endif // VISUGUI_DEFORMEDSHAPEDLS_H diff --git a/src/VISUGUI/VisuGUI_Selection.cxx b/src/VISUGUI/VisuGUI_Selection.cxx index 3a5c5bdf..710582ca 100644 --- a/src/VISUGUI/VisuGUI_Selection.cxx +++ b/src/VISUGUI/VisuGUI_Selection.cxx @@ -163,14 +163,26 @@ VisuGUI_SelectionDlg::VisuGUI_SelectionDlg (const SalomeApp_Module* theModule): myVectorValLbl = new QLabel ("", aDataGrp); myVectorValLbl->setMinimumWidth(150); - QGroupBox* aCoordGrp = new QGroupBox (2, Qt::Horizontal, "Coordinates", myPointsPane); + QGroupBox* aCoordGrp = new QGroupBox (4, Qt::Horizontal, "Coordinates", myPointsPane); aCoordGrp->layout()->setSpacing(6); new QLabel ("X:", aCoordGrp); myXValLbl = new QLabel ("", aCoordGrp); + //ENK: 23.11.2006 - PAL13176 - EDF228 VISU : Enhancement of structured datas processing + new QLabel ("I:", aCoordGrp); + myIValLbl = new QLabel ("-", aCoordGrp); + //ENK: 23.11.2006 new QLabel ("Y:", aCoordGrp); myYValLbl = new QLabel ("", aCoordGrp); + //ENK: 23.11.2006 - PAL13176 - EDF228 VISU : Enhancement of structured datas processing + new QLabel ("J:", aCoordGrp); + myJValLbl = new QLabel ("-", aCoordGrp); + //ENK: 23.11.2006 new QLabel ("Z:",aCoordGrp ); myZValLbl = new QLabel ("", aCoordGrp); + //ENK: 23.11.2006 - PAL13176 - EDF228 VISU : Enhancement of structured datas processing + new QLabel ("K:", aCoordGrp); + myKValLbl = new QLabel ("-", aCoordGrp); + //ENK: 23.11.2006 myWidgetStack->addWidget(myPointsPane, 0); @@ -198,20 +210,26 @@ VisuGUI_SelectionDlg::VisuGUI_SelectionDlg (const SalomeApp_Module* theModule): myListPoints = new QTable (myCellsPane); myListPoints->setReadOnly(true); - myListPoints->setNumCols(6); + myListPoints->setNumCols(9); myListPoints->setNumRows(0); myListPoints->setColumnWidth(0, 40); myListPoints->setColumnWidth(1, 40); myListPoints->setColumnWidth(2, 40); myListPoints->setColumnWidth(3, 40); + myListPoints->setColumnWidth(4, 40);//ENK: 23.11.2006 - PAL13176 - EDF228 VISU : Enhancement of structured datas processing + myListPoints->setColumnWidth(5, 40);//ENK: 23.11.2006 - PAL13176 - EDF228 VISU : Enhancement of structured datas processing + myListPoints->setColumnWidth(6, 40);//ENK: 23.11.2006 - PAL13176 - EDF228 VISU : Enhancement of structured datas processing myListPoints->setSelectionMode(QTable::NoSelection); QHeader* aHeader = myListPoints->horizontalHeader(); aHeader->setLabel( 0, "ID" ); aHeader->setLabel( 1, "X" ); aHeader->setLabel( 2, "Y" ); aHeader->setLabel( 3, "Z" ); - aHeader->setLabel( 4, "Scalar" ); - aHeader->setLabel( 5, "Vector" ); + aHeader->setLabel( 4, "I" );//ENK: 23.11.2006 - PAL13176 - EDF228 VISU : Enhancement of structured datas processing + aHeader->setLabel( 5, "J" );//ENK: 23.11.2006 - PAL13176 - EDF228 VISU : Enhancement of structured datas processing + aHeader->setLabel( 6, "K" );//ENK: 23.11.2006 - PAL13176 - EDF228 VISU : Enhancement of structured datas processing + aHeader->setLabel( 7, "Scalar" ); + aHeader->setLabel( 8, "Vector" ); aCellLayout->addWidget(myListPoints, 1, 0); @@ -397,8 +415,8 @@ void VisuGUI_SelectionDlg::onSelectionEvent() { VISU::Storable::TRestoringMap aMap; if (aSObject) { _PTR(GenericAttribute) anAttr; - if (aSObject->FindAttribute(anAttr, "AttributeComment")) { - _PTR(AttributeComment) aComment (anAttr); + if (aSObject->FindAttribute(anAttr, "AttributeString")) { + _PTR(AttributeString) aComment (anAttr); std::string aString = aComment->Value(); QString strIn( aString.c_str() ); VISU::Storable::StrToMap(strIn, aMap); @@ -450,6 +468,23 @@ void VisuGUI_SelectionDlg::onSelectionEvent() { myIDValLbl->setText( QString::number(anID) ); myScalarValLbl->setText(getValue(aPntData, aVTKID)); myVectorValLbl->setText(getVector(aPntData, aVTKID)); + //ENK: 23.11.2006 - PAL13176 - EDF228 VISU : Enhancement of structured datas processing + const VISU::PIDMapper& aMapper = aPrs3d->GetPipeLine()->GetIDMapper(); + VISU::TIdTypeVector aVec = aMapper->GetIndexesOfNode(anID); + switch(aVec.size()){ + case 3: + myKValLbl->setText(QString::number(aVec[2])); + case 2: + myJValLbl->setText(QString::number(aVec[1])); + case 1: + myIValLbl->setText(QString::number(aVec[0])); + break; + default: + myIValLbl->setText("-"); + myJValLbl->setText("-"); + myKValLbl->setText("-"); + } + //ENK: 23.11.2006 } break; case 1: @@ -482,16 +517,38 @@ void VisuGUI_SelectionDlg::onSelectionEvent() { myListPoints->setNumRows(aPointsMap.size()); PointsMap::const_iterator It = aPointsMap.begin(); + + const VISU::PIDMapper& aMapper = aPrs3d->GetPipeLine()->GetIDMapper(); for (int i = 0; It != aPointsMap.end() && i < myListPoints->numRows(); It++, i++) { myListPoints->verticalHeader()->setLabel(i, QString::number( i )); int id = It->first; + //ENK: 23.11.2006 - PAL13176 - EDF228 VISU : Enhancement of structured datas processing + VISU::TIdTypeVector aVec = aMapper->GetIndexesOfNode(id); + QString aI,aJ,aK; + aI = "-"; + aJ = "-"; + aK = "-"; + switch(aVec.size()){ + case 3: + aK = QString::number(aVec[2]); + case 2: + aJ = QString::number(aVec[1]); + case 1: + aI = QString::number(aVec[0]); + break; + } + //ENK: 23.11.2006 + myListPoints->setText(i, 0, QString::number( id )); vtkFloatingPointType* aCoord = It->second; myListPoints->setText(i, 1, QString::number( aCoord[0] )); myListPoints->setText(i, 2, QString::number( aCoord[1] )); myListPoints->setText(i, 3, QString::number( aCoord[2] )); - myListPoints->setText(i, 4, getValue(aPntData, id)); - myListPoints->setText(i, 5, getVector(aPntData, id)); + myListPoints->setText(i, 4, aI);//ENK: 23.11.2006 - PAL13176 + myListPoints->setText(i, 5, aJ);//ENK: 23.11.2006 - PAL13176 + myListPoints->setText(i, 6, aK);//ENK: 23.11.2006 - PAL13176 + myListPoints->setText(i, 7, getValue(aPntData, id)); + myListPoints->setText(i, 8, getVector(aPntData, id)); } } } else { @@ -509,6 +566,9 @@ void VisuGUI_SelectionDlg::clearFields() { myXValLbl->setText( "" ); myYValLbl->setText( "" ); myZValLbl->setText( "" ); + myIValLbl->setText( "-" );//ENK: 23.11.2006 - PAL13176 + myJValLbl->setText( "-" );//ENK: 23.11.2006 - PAL13176 + myKValLbl->setText( "-" );//ENK: 23.11.2006 - PAL13176 myIDValLbl->setText( "" ); myScalarValLbl->setText(""); myVectorValLbl->setText(""); @@ -629,9 +689,15 @@ void VisuGUI_SelectionDlg::onHelp() if (app) app->onHelpContextModule(myModule ? app->moduleName(myModule->moduleName()) : QString(""), aHelpFileName); else { + QString platform; +#ifdef WIN32 + platform = "winapplication"; +#else + platform = "application"; +#endif SUIT_MessageBox::warn1(0, QObject::tr("WRN_WARNING"), QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE"). - arg(app->resourceMgr()->stringValue("ExternalBrowser", "application")).arg(aHelpFileName), + arg(app->resourceMgr()->stringValue("ExternalBrowser", platform)).arg(aHelpFileName), QObject::tr("BUT_OK")); } } diff --git a/src/VISUGUI/VisuGUI_Selection.h b/src/VISUGUI/VisuGUI_Selection.h index a6517bc1..ef118b82 100644 --- a/src/VISUGUI/VisuGUI_Selection.h +++ b/src/VISUGUI/VisuGUI_Selection.h @@ -72,6 +72,11 @@ private slots: QLabel* myXValLbl; QLabel* myYValLbl; QLabel* myZValLbl; + //ENK: 23.11.2006 - PAL13176 - EDF228 VISU : Enhancement of structured datas processing + QLabel* myIValLbl; //!< used for structured mesh selection + QLabel* myJValLbl; //!< used for structured mesh selection + QLabel* myKValLbl; //!< used for structured mesh selection + //ENK: 23.11.2006 QLineEdit* myIDValLbl; QLabel* myScalarValLbl; diff --git a/src/VISUGUI/VisuGUI_SetupPlot2dDlg.cxx b/src/VISUGUI/VisuGUI_SetupPlot2dDlg.cxx index 81e8fcc1..5c46ede4 100644 --- a/src/VISUGUI/VisuGUI_SetupPlot2dDlg.cxx +++ b/src/VISUGUI/VisuGUI_SetupPlot2dDlg.cxx @@ -490,9 +490,15 @@ void VisuGUI_SetupPlot2dDlg::onHelp() app->onHelpContextModule(aVisuGUI ? app->moduleName(aVisuGUI->moduleName()) : QString(""), aHelpFileName); } else { + QString platform; +#ifdef WIN32 + platform = "winapplication"; +#else + platform = "application"; +#endif SUIT_MessageBox::warn1(0, QObject::tr("WRN_WARNING"), QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE"). - arg(app->resourceMgr()->stringValue("ExternalBrowser", "application")).arg(aHelpFileName), + arg(app->resourceMgr()->stringValue("ExternalBrowser", platform)).arg(aHelpFileName), QObject::tr("BUT_OK")); } } diff --git a/src/VISUGUI/VisuGUI_StreamLinesDlg.cxx b/src/VISUGUI/VisuGUI_StreamLinesDlg.cxx index 6ed2d978..0a0e87fb 100644 --- a/src/VISUGUI/VisuGUI_StreamLinesDlg.cxx +++ b/src/VISUGUI/VisuGUI_StreamLinesDlg.cxx @@ -112,8 +112,8 @@ VisuGUI_StreamLinesDlg::VisuGUI_StreamLinesDlg (SalomeApp_Module* theModule) _PTR(SObject) aSObject = aActiveStudy->FindObjectID(aIO->getEntry()); _PTR(GenericAttribute) anTmpAttr; - if (aSObject->FindAttribute(anTmpAttr, "AttributeComment")) { - _PTR(AttributeComment) aTmpComment (anTmpAttr); + if (aSObject->FindAttribute(anTmpAttr, "AttributeString")) { + _PTR(AttributeString) aTmpComment (anTmpAttr); string aTmpComm = aTmpComment->Value(); QString aTmpstrIn (aTmpComm.c_str()); VISU::Storable::TRestoringMap aTmpaMap; @@ -187,8 +187,8 @@ VisuGUI_StreamLinesDlg::VisuGUI_StreamLinesDlg (SalomeApp_Module* theModule) } _PTR(GenericAttribute) anAttr; - if (aChildSObj->FindAttribute(anAttr, "AttributeComment")) { - _PTR(AttributeComment) aComment (anAttr); + if (aChildSObj->FindAttribute(anAttr, "AttributeString")) { + _PTR(AttributeString) aComment (anAttr); string aComm = aComment->Value(); QString strIn (aComm.c_str()); VISU::Storable::TRestoringMap aMap; @@ -573,8 +573,8 @@ VISU::Mesh_ptr VisuGUI_StreamLinesDlg::createMesh (VISU::VISUType theType, QStri for (aIter->InitEx(true); aIter->More(); aIter->Next() ) { SALOMEDSClient_SObject* aChildSObj = aIter->Value(); SALOMEDSClient_GenericAttribute* anAttr; - if (aChildSObj->FindAttribute(anAttr, "AttributeComment")) { - SALOMEDSClient_AttributeComment* aComment = dynamic_cast( anAttr ); + if (aChildSObj->FindAttribute(anAttr, "AttributeString")) { + SALOMEDSClient_AttributeString* aComment = dynamic_cast( anAttr ); CORBA::String_var aComm = aComment->Value().c_str(); QString strIn(aComm.in()); aMap.clear(); @@ -656,9 +656,15 @@ void VisuGUI_StreamLinesDlg::onHelp() if (app) app->onHelpContextModule(myVisuGUI ? app->moduleName(myVisuGUI->moduleName()) : QString(""), aHelpFileName); else { + QString platform; +#ifdef WIN32 + platform = "winapplication"; +#else + platform = "application"; +#endif SUIT_MessageBox::warn1(0, QObject::tr("WRN_WARNING"), QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE"). - arg(app->resourceMgr()->stringValue("ExternalBrowser", "application")).arg(aHelpFileName), + arg(app->resourceMgr()->stringValue("ExternalBrowser", platform)).arg(aHelpFileName), QObject::tr("BUT_OK")); } } diff --git a/src/VISUGUI/VisuGUI_TimeAnimation.cxx b/src/VISUGUI/VisuGUI_TimeAnimation.cxx index 70f7fc77..f44018d0 100644 --- a/src/VISUGUI/VisuGUI_TimeAnimation.cxx +++ b/src/VISUGUI/VisuGUI_TimeAnimation.cxx @@ -491,7 +491,14 @@ SetupDlg::SetupDlg (QWidget* theParent, double aMaxTime = myAnimator->getMaxTime(); double aMinTime = myAnimator->getMinTime(); - double aStep = (aMaxTime - aMinTime) / (myAnimator->getFieldData(0).myNbTimes - 1); + double aStep; + if ( myAnimator->getAnimationMode() == 0 ) + aStep = (aMaxTime - aMinTime) / (myAnimator->getFieldData(0).myNbTimes - 1); + else { // succcessive animation mode + std::pair aLastFieldFrame(myAnimator->getNbFields() - 1, + myAnimator->getFieldData(myAnimator->getNbFields() - 1).myNbTimes - 1); + aStep = (aMaxTime - aMinTime) / myAnimator->getAbsoluteFrameNumber(aLastFieldFrame); + } QLabel* aMinLbl = new QLabel("From", aRangeGrp); aMinLbl->setEnabled(myUseRangeChk->isChecked()); @@ -541,15 +548,26 @@ SetupDlg::SetupDlg (QWidget* theParent, // Find names of fields for (int i = 0; i < myAnimator->getNbFields(); i++) { _PTR(SObject) aSO = myAnimator->getFieldData(i).myField; - aFieldNames.append(VISU::getValue(aSO, "myName")); + QString aFieldName(VISU::getValue(aSO, "myName")); + if ( myAnimator->getAnimationMode() == 0 ) + aFieldNames.append(aFieldName); + else if ( myAnimator->getAnimationMode() == 1 ) { + QString aFileName(VISU::getValue(aSO->GetFather()->GetFather()->GetFather(),"myInitFileName")); + aFileName = aFileName.right(aFileName.length() - (aFileName.findRev("/") + 1)); + aFieldNames.append(aFileName + QString(" : ") + aFieldName); + } } myFieldLst->insertStringList(aFieldNames); - myFieldLst->setSelected(0, true); - connect( myFieldLst, SIGNAL( highlighted(int) ), - this, SLOT( onFieldChange(int) ) ); - - - QVBox* aSetupBox = new QVBox(aPropFrame); + + if ( myAnimator->getAnimationMode() == 0 ) { + myFieldLst->setSelected(0, true); + connect( myFieldLst, SIGNAL( highlighted(int) ), + this, SLOT( onFieldChange(int) ) ); + } + else if ( myAnimator->getAnimationMode() == 1 ) + myFieldLst->setSelectionMode(QListBox::NoSelection); + + QVBox* aSetupBox = new QVBox(aPropFrame); aSetupBox->setSpacing(5); QVGroupBox* aPropBox = new QVGroupBox("Properties", aSetupBox); @@ -567,7 +585,7 @@ SetupDlg::SetupDlg (QWidget* theParent, connect( myPropBtn, SIGNAL( clicked() ), this, SLOT( onPreferencesDlg() ) ); - if (myAnimator->getNbFields() > 1) { + if (myAnimator->getNbFields() > 1 && myAnimator->getAnimationMode() == 0) { myArrangeBtn = new QPushButton("Arrange...", aSetupBox); connect( myArrangeBtn, SIGNAL( clicked() ), this, SLOT( onArrangeDlg() ) ); } @@ -601,7 +619,6 @@ enum PrsComboItem { //------------------------------------------------------------------------ void SetupDlg::onFieldChange (int theIndex) { - FieldData& aData = myAnimator->getFieldData(theIndex); myTypeCombo->clear(); myTypeId2ComboId.clear(); myComboId2TypeId.clear(); @@ -627,9 +644,40 @@ void SetupDlg::onFieldChange (int theIndex) myTypeId2ComboId[TPLOT3D_ITEM] = myComboId2TypeId.size(); myComboId2TypeId.push_back(TPLOT3D_ITEM);; - _PTR(SObject) aSObject = aData.myField; - long aNumComp = VISU::getValue(aSObject, "myNumComponent").toLong(); - if (aNumComp > 1) { + bool anEnableItems = false; + bool anEnableGP = false; + VISU::VISUType aPrsType; + if ( myAnimator->getAnimationMode() == 0 ) { // parallel animation mode + + FieldData& aData = myAnimator->getFieldData(theIndex); + _PTR(SObject) aSObject = aData.myField; + long aNumComp = VISU::getValue(aSObject, "myNumComponent").toLong(); + anEnableItems = (aNumComp > 1); + + long anEntityId = VISU::getValue(aSObject, "myEntityId").toLong(); + anEnableGP = (anEntityId == VISU::CELL); + + aPrsType = aData.myPrsType; + + } + else if ( myAnimator->getAnimationMode() == 1 ) { // succcessive animation mode + + for (int i = 0; i < myAnimator->getNbFields(); i++) { + _PTR(SObject) aSO = myAnimator->getFieldData(i).myField; + long aNumComp = VISU::getValue(aSO, "myNumComponent").toLong(); + anEnableItems = (aNumComp > 1); + + long anEntityId = VISU::getValue(aSO, "myEntityId").toLong(); + anEnableGP = (anEntityId == VISU::CELL); + + if ( !anEnableItems && !anEnableGP ) break; + } + + aPrsType = myAnimator->getFieldData(0).myPrsType; + + } + + if (anEnableItems) { myTypeCombo->insertItem("Deformed Shape"); // item 5 myTypeId2ComboId[TDEFORMEDSHAPE_ITEM] = myComboId2TypeId.size(); myComboId2TypeId.push_back(TDEFORMEDSHAPE_ITEM);; @@ -647,14 +695,13 @@ void SetupDlg::onFieldChange (int theIndex) myComboId2TypeId.push_back(TSCALARMAPONDEFORMEDSHAPE_ITEM);; } - long anEntityId = VISU::getValue(aSObject, "myEntityId").toLong(); - if(anEntityId == VISU::CELL){ + if(anEnableGP){ myTypeCombo->insertItem("Gauss Points"); // item 8 myTypeId2ComboId[TGAUSSPOINTS_ITEM] = myComboId2TypeId.size(); myComboId2TypeId.push_back(TGAUSSPOINTS_ITEM);; } - switch (aData.myPrsType) { + switch (aPrsType) { case VISU::TSCALARMAP: //Scalar Map myTypeCombo->setCurrentItem(myTypeId2ComboId[TSCALARMAP_ITEM]); break; @@ -692,41 +739,50 @@ void SetupDlg::onFieldChange (int theIndex) //------------------------------------------------------------------------ void SetupDlg::onTypeChanged (int theIndex) { - FieldData& aData = myAnimator->getFieldData(myFieldLst->currentItem()); int aType = myComboId2TypeId[theIndex]; - switch (aType) { - case TSCALARMAP_ITEM: //Scalar Map - aData.myPrsType = VISU::TSCALARMAP; - break; - case TISOSURFACE_ITEM: //Iso Surfaces - aData.myPrsType = VISU::TISOSURFACE; - break; - case TCUTPLANES_ITEM: //Cut Planes - aData.myPrsType = VISU::TCUTPLANES; - break; - case TCUTLINES_ITEM: //Cut Lines - aData.myPrsType = VISU::TCUTLINES; - break; - case TPLOT3D_ITEM: //Plot 3D - aData.myPrsType = VISU::TPLOT3D; - break; - case TDEFORMEDSHAPE_ITEM: //Deformed Shape - aData.myPrsType = VISU::TDEFORMEDSHAPE; - break; - case TSCALARMAPONDEFORMEDSHAPE_ITEM: //Scalar Map on Deformed Shape - aData.myPrsType = VISU::TSCALARMAPONDEFORMEDSHAPE; - break; - case TVECTORS_ITEM: //Vectors - aData.myPrsType = VISU::TVECTORS; - break; - case TSTREAMLINES_ITEM: //Stream Lines - aData.myPrsType = VISU::TSTREAMLINES; - break; - case TGAUSSPOINTS_ITEM: //Gauss Points - aData.myPrsType = VISU::TGAUSSPOINTS; - break; + + for (int i = 0; i < myAnimator->getNbFields(); i++) { + FieldData& aData = ( myAnimator->getAnimationMode() == 0 ) ? + myAnimator->getFieldData(myFieldLst->currentItem()) : + myAnimator->getFieldData(i); + + switch (aType) { + case TSCALARMAP_ITEM: //Scalar Map + aData.myPrsType = VISU::TSCALARMAP; + break; + case TISOSURFACE_ITEM: //Iso Surfaces + aData.myPrsType = VISU::TISOSURFACE; + break; + case TCUTPLANES_ITEM: //Cut Planes + aData.myPrsType = VISU::TCUTPLANES; + break; + case TCUTLINES_ITEM: //Cut Lines + aData.myPrsType = VISU::TCUTLINES; + break; + case TPLOT3D_ITEM: //Plot 3D + aData.myPrsType = VISU::TPLOT3D; + break; + case TDEFORMEDSHAPE_ITEM: //Deformed Shape + aData.myPrsType = VISU::TDEFORMEDSHAPE; + break; + case TSCALARMAPONDEFORMEDSHAPE_ITEM: //Scalar Map on Deformed Shape + aData.myPrsType = VISU::TSCALARMAPONDEFORMEDSHAPE; + break; + case TVECTORS_ITEM: //Vectors + aData.myPrsType = VISU::TVECTORS; + break; + case TSTREAMLINES_ITEM: //Stream Lines + aData.myPrsType = VISU::TSTREAMLINES; + break; + case TGAUSSPOINTS_ITEM: //Gauss Points + aData.myPrsType = VISU::TGAUSSPOINTS; + break; + } + myAnimator->clearData(aData); + + if ( myAnimator->getAnimationMode() == 0 ) // parallel animation mode + break; } - myAnimator->clearData(aData); //myPropBtn->setEnabled(aData.myPrsType != VISU::TSCALARMAP); //myAnimator->generatePresentations(myFieldLst->currentItem()); } @@ -738,13 +794,21 @@ namespace template void EditPrs(VisuGUI* theModule, - FieldData& theData) + FieldData& theData, + VISU_TimeAnimation* theAnimator) { TDialog* aDlg = new TDialog(theModule); aDlg->initFromPrsObject(dynamic_cast(theData.myPrs[0])); - if (aDlg->exec()) + if (aDlg->exec()) { for (int i = 0; i < theData.myNbFrames; i++) aDlg->storeToPrsObject(dynamic_cast(theData.myPrs[i])); + if ( theAnimator->getAnimationMode() == 1 ) { + for (int i = 1; i < theAnimator->getNbFields(); i++) { + for (int j = 0; j < theAnimator->getFieldData(i).myNbFrames; j++) + aDlg->storeToPrsObject(dynamic_cast(theAnimator->getFieldData(i).myPrs[j])); + } + } + } delete aDlg; } } @@ -753,9 +817,26 @@ namespace void SetupDlg::onPreferencesDlg() { SUIT_OverrideCursor c; - FieldData& aData = myAnimator->getFieldData(myFieldLst->currentItem()); + + int id = ( myAnimator->getAnimationMode() == 0 ) ? myFieldLst->currentItem() : 0; + FieldData& aData = myAnimator->getFieldData(id); if (aData.myPrs.empty()) - myAnimator->generatePresentations(myFieldLst->currentItem()); + myAnimator->generatePresentations(id); + + if ( myAnimator->getAnimationMode() == 1 ) { + for (int i = 0; i < myAnimator->getNbFields(); i++) { + if ( i != id && myAnimator->getFieldData(i).myPrs.empty() ) myAnimator->generatePresentations(i); + } + } + + if(!aData.myNbFrames || !aData.myPrs[0]){ + QApplication::restoreOverrideCursor(); + SUIT_MessageBox::warn1(this, + tr("ERROR"), + VisuGUI_TimeAnimationDlg::tr("MSG_NO_ANIMATIONDATA"), + tr("&OK")); + return; + } if(!aData.myNbFrames || !aData.myPrs[0]){ QApplication::restoreOverrideCursor(); @@ -770,27 +851,27 @@ void SetupDlg::onPreferencesDlg() switch (aType) { case TSCALARMAP_ITEM: //Scalar Map c.suspend(); - EditPrs(myModule,aData); + EditPrs(myModule,aData,myAnimator); break; case TISOSURFACE_ITEM: //Iso Surfaces c.suspend(); - EditPrs(myModule,aData); + EditPrs(myModule,aData,myAnimator); break; case TCUTPLANES_ITEM: //Cut Planes c.suspend(); - EditPrs(myModule,aData); + EditPrs(myModule,aData,myAnimator); break; case TCUTLINES_ITEM: //Cut Lines c.suspend(); - EditPrs(myModule,aData); + EditPrs(myModule,aData,myAnimator); break; case TPLOT3D_ITEM: //Plot 3D c.suspend(); - EditPrs(myModule,aData); + EditPrs(myModule,aData,myAnimator); break; case TDEFORMEDSHAPE_ITEM: //Deformed Shape c.suspend(); - EditPrs(myModule,aData); + EditPrs(myModule,aData,myAnimator); break; case TSCALARMAPONDEFORMEDSHAPE_ITEM: //Scalar Map on Deformed Shape c.suspend(); @@ -798,7 +879,6 @@ void SetupDlg::onPreferencesDlg() typedef VisuGUI_ScalarMapOnDeformedShapeDlg DLG; typedef VISU::ScalarMapOnDeformedShape_i TYPE; DLG* aDlg = new DLG (myModule); - aDlg->setAnimation( true ); aDlg->initFromPrsObject(dynamic_cast(aData.myPrs[0])); if (aDlg->exec()) { @@ -809,8 +889,6 @@ void SetupDlg::onPreferencesDlg() aIter = i+1; if(i+1 > anbFrames) aIter=anbFrames; - aDlg->setUpdateScalars(false); - aDlg->setIteration(aIter); aDlg->storeToPrsObject(aCurrPrs_i); } } @@ -819,15 +897,15 @@ void SetupDlg::onPreferencesDlg() break; case TVECTORS_ITEM: //Vectors c.suspend(); - EditPrs(myModule,aData); + EditPrs(myModule,aData,myAnimator); break; case TSTREAMLINES_ITEM: //Stream Lines c.suspend(); - EditPrs(myModule,aData); + EditPrs(myModule,aData,myAnimator); break; case TGAUSSPOINTS_ITEM: //Gauss Points c.suspend(); - EditPrs(myModule,aData); + EditPrs(myModule,aData,myAnimator); break; } } @@ -994,24 +1072,25 @@ static const char * pauseIco[] = { static QPixmap MYpausePixmap(pauseIco); -VisuGUI_TimeAnimationDlg::VisuGUI_TimeAnimationDlg (VisuGUI* theModule, _PTR(Study) theStudy) : +VisuGUI_TimeAnimationDlg::VisuGUI_TimeAnimationDlg (VisuGUI* theModule, _PTR(Study) theStudy, int theMode) : QDialog(VISU::GetDesktop(theModule), "VisuGUI_TimeAnimationDlg", false, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu | WDestructiveClose), myModule(theModule), - myStudy(theStudy), mySetupDlg(NULL) { - setCaption("Animation"); + if ( theMode == 0 ) + setCaption(tr("PARALLEL_ANIMATION")); + else if ( theMode == 1 ) + setCaption(tr("SUCCESSIVE_ANIMATION")); setSizeGripEnabled( TRUE ); - isClosing = false; myAnimator = new VISU_TimeAnimation (theStudy); - myAnimator->setSpeed(1); myAnimator->setViewer(VISU::GetActiveViewWindow(theModule)); connect(myAnimator, SIGNAL(frameChanged(long, double)), this, SLOT(onExecution(long, double))); connect(myAnimator, SIGNAL(stopped()), this, SLOT(onStop())); + myAnimator->setAnimationMode(theMode); QVBoxLayout* aMainLayout = new QVBoxLayout(this, 7, 6); aMainLayout->setSpacing(5); @@ -1085,12 +1164,13 @@ VisuGUI_TimeAnimationDlg::VisuGUI_TimeAnimationDlg (VisuGUI* theModule, _PTR(Stu QLCDNumber* aSpeedNum = new QLCDNumber( 2, myPlayFrame ); aSpeedNum->setSegmentStyle(QLCDNumber::Flat); - aSpeedNum->display(1); + aSpeedNum->display((int)myAnimator->getSpeed()); TopLayout->addWidget(aSpeedNum, 4, 3); QwtWheel* aWheel = new QwtWheel(myPlayFrame); aWheel->setOrientation(Qt::Vertical); aWheel->setRange(1, 99, 1); + aWheel->setValue((int)myAnimator->getSpeed()); connect( aWheel, SIGNAL(valueChanged(double)), aSpeedNum, SLOT(display(double)) ); connect( aWheel, SIGNAL(valueChanged(double)), @@ -1168,32 +1248,37 @@ VisuGUI_TimeAnimationDlg::VisuGUI_TimeAnimationDlg (VisuGUI* theModule, _PTR(Stu this, SLOT( onCheckDump(bool) )); aSaveLay->addMultiCellWidget(mySaveAVICheck, 3, 3, 0, 2); - QLabel* aPathAVILbl = new QLabel("Path:", aSaveBox); - aPathAVILbl->setEnabled(false); - connect(mySaveAVICheck, SIGNAL( toggled(bool)), - aPathAVILbl, SLOT( setEnabled(bool) )); - aSaveLay->addWidget(aPathAVILbl, 4, 0); + myPathAVILbl = new QLabel("Path:", aSaveBox); + myPathAVILbl->setEnabled(false); + //connect(mySaveAVICheck, SIGNAL( toggled(bool)), + // myPathAVILbl, SLOT( setEnabled(bool) )); + aSaveLay->addWidget(myPathAVILbl, 4, 0); myPathAVIEdit = new QLineEdit(aSaveBox); myPathAVIEdit->setReadOnly(true); myPathAVIEdit->setEnabled(false); - connect(mySaveAVICheck, SIGNAL( toggled(bool)), - myPathAVIEdit, SLOT( setEnabled(bool) )); + //connect(mySaveAVICheck, SIGNAL( toggled(bool)), + // myPathAVIEdit, SLOT( setEnabled(bool) )); aSaveLay->addWidget(myPathAVIEdit, 4, 1); - QPushButton* aBrowseAVIBtn = new QPushButton("Browse...", aSaveBox); - aBrowseAVIBtn->setEnabled(false); - connect(mySaveAVICheck, SIGNAL( toggled(bool)), - aBrowseAVIBtn, SLOT( setEnabled(bool) )); - connect(aBrowseAVIBtn, SIGNAL( clicked()), + myBrowseAVIBtn = new QPushButton("Browse...", aSaveBox); + myBrowseAVIBtn->setEnabled(false); + //connect(mySaveAVICheck, SIGNAL( toggled(bool)), + // myBrowseAVIBtn, SLOT( setEnabled(bool) )); + connect(myBrowseAVIBtn, SIGNAL( clicked()), this, SLOT( onBrowseAVI() )); - aSaveLay->addWidget(aBrowseAVIBtn, 4, 2); + aSaveLay->addWidget(myBrowseAVIBtn, 4, 2); mySaveAVICheck->setChecked(false); - mySaveAVICheck->setEnabled(myAnimator->checkAVIMaker()); + //mySaveAVICheck->setEnabled(myAnimator->checkAVIMaker()); TopLayout->addMultiCellWidget(aSaveBox, 7, 7, 0, 3); + QCheckBox* aCleanMemCheck = new QCheckBox("Clean memory at each frame",myPlayFrame); + aCleanMemCheck->setChecked(myAnimator->isCleaningMemoryAtEachFrame()); + connect(aCleanMemCheck, SIGNAL(toggled(bool)), myAnimator, SLOT(setCleaningMemoryAtEachFrameSlot(bool))); + TopLayout->addMultiCellWidget(aCleanMemCheck, 8, 8, 0, 3); + aMainLayout->addWidget(myPlayFrame); // Animation publishing in study @@ -1234,10 +1319,11 @@ VisuGUI_TimeAnimationDlg::VisuGUI_TimeAnimationDlg (VisuGUI* theModule, _PTR(Stu //------------------------------------------------------------------------ VisuGUI_TimeAnimationDlg::~VisuGUI_TimeAnimationDlg() { - if(myAnimator != NULL){ + if (myAnimator != NULL) { delete myAnimator; myAnimator = NULL; - VISU::GetActiveViewWindow(myModule)->Repaint(); + if ( VISU::GetActiveViewWindow(myModule) ) + VISU::GetActiveViewWindow(myModule)->Repaint(); } } @@ -1252,10 +1338,10 @@ void VisuGUI_TimeAnimationDlg::onTypeChange (int index) } //------------------------------------------------------------------------ -void VisuGUI_TimeAnimationDlg::addField (_PTR(SObject) theSObject) +bool VisuGUI_TimeAnimationDlg::addField (_PTR(SObject) theSObject) { myPlayFrame->setEnabled(false); - myAnimator->addField(theSObject); + return myAnimator->addField(theSObject); } //------------------------------------------------------------------------ @@ -1354,29 +1440,16 @@ void VisuGUI_TimeAnimationDlg::showEvent(QShowEvent* theEvent) mySetupDlg = new SetupDlg(this,myModule, myAnimator); } -void VisuGUI_TimeAnimationDlg::reject() -{ - close(); - QDialog::reject(); -} - //------------------------------------------------------------------------ void VisuGUI_TimeAnimationDlg::closeEvent (QCloseEvent* theEvent) { - if(myAnimator != NULL){ + if (myAnimator != NULL) { myAnimator->stopAnimation(); myAnimator->wait(500); if (myAnimator->running() && (! myAnimator->finished())) { - isClosing = true; - myEvent = theEvent; - // * Destroing data in myAnimator before study closed. - // * It needed for correcting destroing of myAnimator, which - // * depend from SVTK_RenderWindowInteractor() e.t.c. - if(theEvent->type() == QEvent::Close){ - for (int i = 0; i < myAnimator->getNbFields(); i++) - myAnimator->clearData(myAnimator->getFieldData(i)); - myAnimator->clearFieldData(); - } + theEvent->ignore(); + QCloseEvent* aNewCloseEvent = new QCloseEvent; + QApplication::postEvent( this, aNewCloseEvent ); } else { QDialog::closeEvent(theEvent); } @@ -1471,12 +1544,33 @@ void VisuGUI_TimeAnimationDlg::onCheckDump(bool) } else { myAnimator->dumpTo(""); } - mySaveAVICheck->setEnabled(!mySaveCheck->isChecked() && myAnimator->checkAVIMaker()); + //mySaveAVICheck->setEnabled(!mySaveCheck->isChecked() && myAnimator->checkAVIMaker()); + mySaveAVICheck->setEnabled(!mySaveCheck->isChecked()); } else if (source == mySaveAVICheck) { if (mySaveAVICheck->isChecked()) { - if (mySaveCheck->isChecked()) - mySaveCheck->setChecked(false); + if (!myAnimator->checkAVIMaker()) { + // AVI maker is not available + SUIT_MessageBox::warn1(this, tr("ERROR"), tr("MSG_NO_AVI_MAKER"), tr("&OK")); + mySaveAVICheck->setChecked(false); + } + else { + if (mySaveCheck->isChecked()) { + mySaveCheck->setChecked(false); + } + myPathAVILbl->setEnabled(true); + myPathAVIEdit->setEnabled(true); + myBrowseAVIBtn->setEnabled(true); + } + } + else { + // it is necessary in case of not available AVI maker, + // because otherwise they will stay enabled + // (??? slots, connected on SIGNAL(toggled(bool)) of mySaveAVICheck, + // works in wrong order ???) + myPathAVILbl->setEnabled(false); + myPathAVIEdit->setEnabled(false); + myBrowseAVIBtn->setEnabled(false); } mySaveCheck->setEnabled(!mySaveAVICheck->isChecked()); } @@ -1485,14 +1579,10 @@ void VisuGUI_TimeAnimationDlg::onCheckDump(bool) //------------------------------------------------------------------------ void VisuGUI_TimeAnimationDlg::onStop() { - if (isClosing) { - QDialog::closeEvent(myEvent); - } else { - myPlayBtn->setOn(false); - myPlayBtn->setIconSet(MYplayPixmap); - mySetupBtn->setEnabled(true); - myGenBtn->setEnabled(true); - } + myPlayBtn->setOn(false); + myPlayBtn->setIconSet(MYplayPixmap); + mySetupBtn->setEnabled(true); + myGenBtn->setEnabled(true); } //------------------------------------------------------------------------ @@ -1503,9 +1593,15 @@ void VisuGUI_TimeAnimationDlg::onHelp() if (app) app->onHelpContextModule(myModule ? app->moduleName(myModule->moduleName()) : QString(""), aHelpFileName); else { + QString platform; +#ifdef WIN32 + platform = "winapplication"; +#else + platform = "application"; +#endif SUIT_MessageBox::warn1(0, QObject::tr("WRN_WARNING"), QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE"). - arg(app->resourceMgr()->stringValue("ExternalBrowser", "application")).arg(aHelpFileName), + arg(app->resourceMgr()->stringValue("ExternalBrowser", platform)).arg(aHelpFileName), QObject::tr("BUT_OK")); } } @@ -1530,6 +1626,8 @@ void VisuGUI_TimeAnimationDlg::restoreFromStudy(_PTR(SObject) theAnimation) { myAnimator->restoreFromStudy(theAnimation); mySaveBtn->setEnabled(myAnimator->isSavedInStudy()); + if ( myAnimator->getAnimationMode() == 1 ) + setCaption(tr("SUCCESSIVE_ANIMATION")); } //------------------------------------------------------------------------ @@ -1558,4 +1656,3 @@ void VisuGUI_TimeAnimationDlg::keyPressEvent( QKeyEvent* e ) onHelp(); } } - diff --git a/src/VISUGUI/VisuGUI_TimeAnimation.h b/src/VISUGUI/VisuGUI_TimeAnimation.h index dcaea8a0..70bd9952 100644 --- a/src/VISUGUI/VisuGUI_TimeAnimation.h +++ b/src/VISUGUI/VisuGUI_TimeAnimation.h @@ -150,10 +150,10 @@ class VisuGUI_TimeAnimationDlg: public QDialog { Q_OBJECT public: - VisuGUI_TimeAnimationDlg(VisuGUI* theModule, _PTR(Study) theStudy); + VisuGUI_TimeAnimationDlg(VisuGUI* theModule, _PTR(Study) theStudy, int theMode=0); ~VisuGUI_TimeAnimationDlg(); - void addField(_PTR(SObject) theField); + bool addField(_PTR(SObject) theField); void clearView(); void restoreFromStudy(_PTR(SObject) theAnimation); @@ -162,9 +162,8 @@ class VisuGUI_TimeAnimationDlg: public QDialog virtual void closeEvent(QCloseEvent* theEvent); virtual void showEvent(QShowEvent* theEvent); virtual void keyPressEvent(QKeyEvent* theEvent); - virtual void reject(); void stopAnimation(); - + private slots: void onTypeChange(int index); void onPlayPressed(); @@ -190,6 +189,11 @@ class VisuGUI_TimeAnimationDlg: public QDialog void onPathChanged(); private: + // Data + VisuGUI* myModule; + VISU_TimeAnimation* myAnimator; + + // widgets QSlider* mySlider; QComboBox* myTypeCombo; QPushButton* myPropBtn; @@ -200,18 +204,15 @@ class VisuGUI_TimeAnimationDlg: public QDialog QFrame* myPlayFrame; SetupDlg* mySetupDlg; - _PTR(Study) myStudy; - VisuGUI* myModule; - VISU_TimeAnimation* myAnimator; QCheckBox* mySaveCheck; QComboBox* myPicsFormat; QLineEdit* myPathEdit; - bool isClosing; - QCloseEvent* myEvent; - QCheckBox* mySaveAVICheck; - QLineEdit* myPathAVIEdit; + QCheckBox* mySaveAVICheck; + QLineEdit* myPathAVIEdit; + QLabel* myPathAVILbl; + QPushButton* myBrowseAVIBtn; QPushButton* myPublishBtn; QPushButton* mySaveBtn; diff --git a/src/VISUGUI/VisuGUI_Tools.cxx b/src/VISUGUI/VisuGUI_Tools.cxx index b3a939d3..da085f66 100644 --- a/src/VISUGUI/VisuGUI_Tools.cxx +++ b/src/VISUGUI/VisuGUI_Tools.cxx @@ -70,6 +70,8 @@ #include #include +#include + //============================================================================= namespace VISU @@ -216,8 +218,8 @@ namespace VISU Engines::Component_var aComponent = aLCC.FindOrLoad_Component("FactoryServer","VISU"); VISU_Gen_var aVISU = VISU_Gen::_narrow(aComponent); if(!CORBA::is_nil(aVISU)){ - aGen = VISU_Gen_i::GetVisuGenImpl(); - aGen->SetCurrentStudy(GetDSStudy(GetCStudy(GetAppStudy(theModule)))); + if((aGen = VISU_Gen_i::GetVisuGenImpl())) + aGen->SetCurrentStudy(GetDSStudy(GetCStudy(GetAppStudy(theModule)))); } } if(!aGen) @@ -248,8 +250,8 @@ namespace VISU VISU::Storable::TRestoringMap aMap; if (theSObject) { _PTR(GenericAttribute) anAttr; - if (theSObject->FindAttribute(anAttr, "AttributeComment")) { - _PTR(AttributeComment) aComment (anAttr); + if (theSObject->FindAttribute(anAttr, "AttributeString")) { + _PTR(AttributeString) aComment (anAttr); std::string aValue = aComment->Value(); QString aString (aValue.c_str()); VISU::Storable::StrToMap(aString, aMap); @@ -346,8 +348,8 @@ namespace VISU { Storable::TRestoringMap aMap; _PTR(GenericAttribute) anAttr; - if(theSObject->FindAttribute(anAttr,"AttributeComment")){ - _PTR(AttributeComment) aComment (anAttr); + if(theSObject->FindAttribute(anAttr,"AttributeString")){ + _PTR(AttributeString) aComment (anAttr); std::string aValue = aComment->Value(); VISU::Storable::StrToMap(aValue.c_str(), aMap); } @@ -483,14 +485,17 @@ namespace VISU // (first sub-level) or is a child of such an object string aNAME, aVisuNAME = GetVisuGen(theModule)->ComponentDataType(); _PTR(GenericAttribute) anAttr; - _PTR(AttributeComment) aComment; + _PTR(AttributeString) aComment; bool isUnderVISU = false; _PTR(SObject) aFatherSObject = aSObject->GetFather(); - if (aFatherSObject->FindAttribute(anAttr, "AttributeComment")) { - _PTR(AttributeComment) aComment (anAttr); + if (aFatherSObject->FindAttribute(anAttr, "AttributeName")) { + // mkr : 24.11.2006 : use AttributeName and module title for correct "Delete" + // popup item displaying in object browser popup + _PTR(AttributeName) aComment (anAttr); aNAME = aComment->Value(); - if (aNAME == aVisuNAME) { + QString aVisuTITLE = theModule->getApp()->moduleTitle(QString(aVisuNAME)); + if (!aVisuTITLE.compare(QString(aNAME))) { isUnderVISU = true; } } @@ -504,8 +509,8 @@ namespace VISU isUnderVISU = false; aFatherSObject = aFatherSObject->GetFather(); - if (aFatherSObject->FindAttribute(anAttr, "AttributeComment")) { - _PTR(AttributeComment) aComment (anAttr); + if (aFatherSObject->FindAttribute(anAttr, "AttributeString")) { + _PTR(AttributeString) aComment (anAttr); aNAME = aComment->Value(); if (aNAME == aVisuNAME) { isUnderVISU = true; @@ -513,7 +518,7 @@ namespace VISU } if (!isUnderVISU) { // Father is not directly under VISU component - return false; + return false; } } } @@ -1114,6 +1119,7 @@ namespace VISU } } aPlot->Repaint(); + aPlot->fitAll(); } //------------------------------------------------------------ @@ -1220,6 +1226,10 @@ namespace VISU Utils_Timer timer; timer.Start(); #endif + if(GetResourceMgr()->booleanValue("VISU","display_only",false)){ + const VisuGUI* av = dynamic_cast(theModule); + if(av)(const_cast(av))->OnEraseAll(); + } PublishMeshInView(theModule, pPresent, theViewWindow); SetFitAll(theViewWindow); #ifdef CHECKTIME @@ -1236,6 +1246,9 @@ namespace VISU } } + SalomeApp_Module* aModule = (SalomeApp_Module*)theModule; + UpdateObjBrowser(aModule, false, aResultSObj); + theModule->application()->putInfo(QObject::tr("INF_DONE")); // Make "Save" button active theModule->getApp()->updateActions(); @@ -1271,7 +1284,7 @@ namespace VISU if (!CORBA::is_nil(aVisuObj)) { VISU::VISUType aType = aVisuObj->GetType(); switch (aType) { - case VISU::TSCALARMAP: + case VISU::TSCALARMAP: case VISU::TISOSURFACE: case VISU::TDEFORMEDSHAPE: case VISU::TCUTPLANES: @@ -1314,8 +1327,8 @@ namespace VISU } } else { _PTR(GenericAttribute) anAttr; - if (theObject->FindAttribute(anAttr, "AttributeComment")) { - _PTR(AttributeComment) aComment (anAttr); + if (theObject->FindAttribute(anAttr, "AttributeString")) { + _PTR(AttributeString) aComment (anAttr); string aComm = aComment->Value(); QString strIn (aComm.c_str()); VISU::Storable::TRestoringMap pMap; @@ -1397,7 +1410,7 @@ namespace VISU void AddScalarBarPosition (VisuGUI* theModule, SVTK_ViewWindow* theViewWindow, VISU::Prs3d_i* thePrs3d, int pos) { - TViewToPrs3d& aMap = theModule->myScalarBarsMap; + TViewToPrs3d& aMap = theModule->getScalarBarsMap(); TPrs3dToInd aPair; aPair.first = thePrs3d; aPair.second = pos; aMap[theViewWindow].insert(aPair); } @@ -1406,7 +1419,7 @@ namespace VISU void RemoveScalarBarPosition(VisuGUI* theModule, SVTK_ViewWindow* theViewWindow, VISU::Prs3d_i* thePrs3d) { - TViewToPrs3d& aMap = theModule->myScalarBarsMap; + TViewToPrs3d& aMap = theModule->getScalarBarsMap(); TSetPrs3d::iterator aIter = aMap[theViewWindow].begin(); for (; aIter != aMap[theViewWindow].end(); aIter++) if ((*aIter).first == thePrs3d) { diff --git a/src/VISUGUI/VisuGUI_TransparencyDlg.cxx b/src/VISUGUI/VisuGUI_TransparencyDlg.cxx index af6de916..4685b597 100644 --- a/src/VISUGUI/VisuGUI_TransparencyDlg.cxx +++ b/src/VISUGUI/VisuGUI_TransparencyDlg.cxx @@ -187,9 +187,15 @@ void VisuGUI_TransparencyDlg::ClickOnHelp() app->onHelpContextModule(aVisuGUI ? app->moduleName(aVisuGUI->moduleName()) : QString(""), aHelpFileName); } else { + QString platform; +#ifdef WIN32 + platform = "winapplication"; +#else + platform = "application"; +#endif SUIT_MessageBox::warn1(0, QObject::tr("WRN_WARNING"), QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE"). - arg(app->resourceMgr()->stringValue("ExternalBrowser", "application")).arg(aHelpFileName), + arg(app->resourceMgr()->stringValue("ExternalBrowser", platform)).arg(aHelpFileName), QObject::tr("BUT_OK")); } } diff --git a/src/VISUGUI/VisuGUI_VectorsDlg.cxx b/src/VISUGUI/VisuGUI_VectorsDlg.cxx index 11331d55..03ef0f9f 100644 --- a/src/VISUGUI/VisuGUI_VectorsDlg.cxx +++ b/src/VISUGUI/VisuGUI_VectorsDlg.cxx @@ -466,9 +466,15 @@ void VisuGUI_VectorsDlg::onHelp() app->onHelpContextModule(aVisuGUI ? app->moduleName(aVisuGUI->moduleName()) : QString(""), aHelpFileName); } else { + QString platform; +#ifdef WIN32 + platform = "winapplication"; +#else + platform = "application"; +#endif SUIT_MessageBox::warn1(0, QObject::tr("WRN_WARNING"), QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE"). - arg(app->resourceMgr()->stringValue("ExternalBrowser", "application")).arg(aHelpFileName), + arg(app->resourceMgr()->stringValue("ExternalBrowser", platform)).arg(aHelpFileName), QObject::tr("BUT_OK")); } } diff --git a/src/VISU_I/VISUConfig.cc b/src/VISU_I/VISUConfig.cc index fc30bb21..c78fe7ec 100644 --- a/src/VISU_I/VISUConfig.cc +++ b/src/VISU_I/VISUConfig.cc @@ -333,7 +333,7 @@ namespace VISU{ std::string CreateAttributes(SALOMEDS::Study_ptr theStudyDocument, const std::string& theFatherEntry, - const std::string& theRefFatherEntry, + const std::string& theIconName, const std::string& theIOR, const std::string& theName, const std::string& thePersistentRef, @@ -342,38 +342,39 @@ namespace VISU{ { SALOMEDS::StudyBuilder_var aStudyBuilder = theStudyDocument->NewBuilder(); SALOMEDS::SObject_var aFather = theStudyDocument->FindObjectID(theFatherEntry.c_str()); - SALOMEDS::SObject_var newObj; - if (theCreateNew) newObj = aStudyBuilder->NewObject(aFather); - else newObj = aFather; + SALOMEDS::SObject_var aNewSObject; + if (theCreateNew) + aNewSObject = aStudyBuilder->NewObject(aFather); + else + aNewSObject = aFather; SALOMEDS::GenericAttribute_var anAttr; if(theIOR != ""){ - anAttr = aStudyBuilder->FindOrCreateAttribute(newObj, "AttributeIOR"); - SALOMEDS::AttributeIOR_var anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr); - anIOR->SetValue(theIOR.c_str()); + anAttr = aStudyBuilder->FindOrCreateAttribute(aNewSObject, "AttributeIOR"); + SALOMEDS::AttributeIOR_var aCustomAttr = SALOMEDS::AttributeIOR::_narrow(anAttr); + aCustomAttr->SetValue(theIOR.c_str()); } if(theName != ""){ - anAttr = aStudyBuilder->FindOrCreateAttribute(newObj, "AttributeName"); - SALOMEDS::AttributeName_var aName = SALOMEDS::AttributeName::_narrow(anAttr); - aName->SetValue(theName.c_str()); + anAttr = aStudyBuilder->FindOrCreateAttribute(aNewSObject, "AttributeName"); + SALOMEDS::AttributeName_var aCustomAttr = SALOMEDS::AttributeName::_narrow(anAttr); + aCustomAttr->SetValue(theName.c_str()); } if(thePersistentRef != ""){ - anAttr = aStudyBuilder->FindOrCreateAttribute(newObj, "AttributePersistentRef"); - SALOMEDS::AttributePersistentRef_var aPRef = SALOMEDS::AttributePersistentRef::_narrow(anAttr); - aPRef->SetValue(thePersistentRef.c_str()); + anAttr = aStudyBuilder->FindOrCreateAttribute(aNewSObject, "AttributePersistentRef"); + SALOMEDS::AttributePersistentRef_var aCustomAttr = SALOMEDS::AttributePersistentRef::_narrow(anAttr); + aCustomAttr->SetValue(thePersistentRef.c_str()); } if(theComment != ""){ - anAttr = aStudyBuilder->FindOrCreateAttribute(newObj, "AttributeString"); - SALOMEDS::AttributeString_var aCmnt = SALOMEDS::AttributeString::_narrow(anAttr); - aCmnt->SetValue(theComment.c_str()); - if(MYDEBUG) INFOS("CreateAttributes - Comment = "<FindOrCreateAttribute(aNewSObject, "AttributeString"); + SALOMEDS::AttributeString_var aCustomAttr = SALOMEDS::AttributeString::_narrow(anAttr); + aCustomAttr->SetValue(theComment.c_str()); } - if(theRefFatherEntry != ""){ - SALOMEDS::SObject_var aRefFather = theStudyDocument->FindObjectID(theRefFatherEntry.c_str()); - SALOMEDS::SObject_var anObj = aStudyBuilder->NewObject(aRefFather); - aStudyBuilder->Addreference(anObj,newObj); + if(theIconName != ""){ + anAttr = aStudyBuilder->FindOrCreateAttribute(aNewSObject, "AttributePixMap"); + SALOMEDS::AttributePixMap_var aCustomAttr = SALOMEDS::AttributePixMap::_narrow(anAttr); + aCustomAttr->SetPixMap(theIconName.c_str()); } - CORBA::String_var anEntry = newObj->GetID(); - string aRet(anEntry); + CORBA::String_var anEntry = aNewSObject->GetID(); + std::string aRet(anEntry); if(MYDEBUG) INFOS("CreateAttributes - StudyId = "<StudyId()<<"; anEntry = "<NewBuilder(); _PTR(SObject) aFather = theStudyDocument->FindObjectID(theFatherEntry); - _PTR(SObject) newObj; + _PTR(SObject) aNewSObject; if (theCreateNew) - newObj = aStudyBuilder->NewObject(aFather); + aNewSObject = aStudyBuilder->NewObject(aFather); else - newObj = aFather; + aNewSObject = aFather; _PTR(GenericAttribute) anAttr; if (theIOR != "") { - anAttr = aStudyBuilder->FindOrCreateAttribute(newObj, "AttributeIOR"); - _PTR(AttributeIOR) anIOR (anAttr); - anIOR->SetValue(theIOR); + anAttr = aStudyBuilder->FindOrCreateAttribute(aNewSObject, "AttributeIOR"); + _PTR(AttributeIOR) aCustomAttr (anAttr); + aCustomAttr->SetValue(theIOR); } if (theName != "") { - anAttr = aStudyBuilder->FindOrCreateAttribute(newObj, "AttributeName"); - _PTR(AttributeName) aName (anAttr); - aName->SetValue(theName); + anAttr = aStudyBuilder->FindOrCreateAttribute(aNewSObject, "AttributeName"); + _PTR(AttributeName) aCustomAttr (anAttr); + aCustomAttr->SetValue(theName); } if (thePersistentRef != "") { - anAttr = aStudyBuilder->FindOrCreateAttribute(newObj, "AttributePersistentRef"); - _PTR(AttributePersistentRef) aPRef (anAttr); - aPRef->SetValue(thePersistentRef); + anAttr = aStudyBuilder->FindOrCreateAttribute(aNewSObject, "AttributePersistentRef"); + _PTR(AttributePersistentRef) aCustomAttr (anAttr); + aCustomAttr->SetValue(thePersistentRef); } if (theComment != "") { - anAttr = aStudyBuilder->FindOrCreateAttribute(newObj, "AttributeString"); - _PTR(AttributeString) aCmnt (anAttr); - aCmnt->SetValue(theComment); - if (MYDEBUG) INFOS("CreateAttributes - Comment = " << theComment); + anAttr = aStudyBuilder->FindOrCreateAttribute(aNewSObject, "AttributeString"); + _PTR(AttributeString) aCustomAttr (anAttr); + aCustomAttr->SetValue(theComment); } - if (theRefFatherEntry != "") { - _PTR(SObject) aRefFather = theStudyDocument->FindObjectID(theRefFatherEntry); - _PTR(SObject) anObj = aStudyBuilder->NewObject(aRefFather); - aStudyBuilder->Addreference(anObj, newObj); + if (theIconName != "") { + anAttr = aStudyBuilder->FindOrCreateAttribute(aNewSObject, "AttributePixMap"); + _PTR(AttributePixMap) aCustomAttr (anAttr); + aCustomAttr->SetPixMap(theIconName); } - string aRet = newObj->GetID(); + std::string aRet = aNewSObject->GetID(); if (MYDEBUG) INFOS("CreateAttributes - StudyId = " << theStudyDocument->StudyId() << "; anEntry = " << aRet << "; IOR = '" << theIOR << "'"); diff --git a/src/VISU_I/VISUConfig.hh b/src/VISU_I/VISUConfig.hh index 48aeae5f..196cd0d6 100644 --- a/src/VISU_I/VISUConfig.hh +++ b/src/VISU_I/VISUConfig.hh @@ -218,7 +218,7 @@ namespace VISU std::string CreateAttributes(SALOMEDS::Study_ptr theStudyDocument, const std::string& theFatherEntry, - const std::string& theRefFatherEntry, + const std::string& theIconName, const std::string& theIOR, const std::string& theName, const std::string& thePersistentRef, @@ -229,7 +229,7 @@ namespace VISU std::string CreateAttributes(_PTR(Study) theStudyDocument, const std::string& theFatherEntry, - const std::string& theRefFatherEntry, + const std::string& theIconName, const std::string& theIOR, const std::string& theName, const std::string& thePersistentRef, @@ -249,7 +249,7 @@ namespace VISU VISU_I_EXPORT _PTR(SObject) - GetClientSObject(SALOMEDS::SObject_var, _PTR(Study)); + GetClientSObject(SALOMEDS::SObject_var, _PTR(Study)); VISU_I_EXPORT SALOMEDS::Study_var diff --git a/src/VISU_I/VISU_ColoredPrs3dCache_i.cc b/src/VISU_I/VISU_ColoredPrs3dCache_i.cc index 2e5f1983..7a5954ec 100644 --- a/src/VISU_I/VISU_ColoredPrs3dCache_i.cc +++ b/src/VISU_I/VISU_ColoredPrs3dCache_i.cc @@ -395,7 +395,7 @@ VISU::ColoredPrs3dCache_i VISU::ColoredPrs3dHolder_i* aHolder = new VISU::ColoredPrs3dHolder_i(*this); std::string aComment = std::string("myComment=") + aColoredPrs3d->GetComment(); std::string aName = aColoredPrs3d->GenerateName().latin1(); - aHolder->PublishInStudy(aName, aComment); + aHolder->PublishInStudy(aName, aColoredPrs3d->GetIconName(), aComment); RegisterInHolder(aColoredPrs3d, aHolder->GetEntry()); if( aRequiredMemory > 1.0 / VTK_LARGE_FLOAT ) ClearMemory( aRequiredMemory, aHolder->GetEntry() ); diff --git a/src/VISU_I/VISU_ColoredPrs3dHolder_i.cc b/src/VISU_I/VISU_ColoredPrs3dHolder_i.cc index cefa3e48..9927e98b 100644 --- a/src/VISU_I/VISU_ColoredPrs3dHolder_i.cc +++ b/src/VISU_I/VISU_ColoredPrs3dHolder_i.cc @@ -84,12 +84,20 @@ VISU::ColoredPrs3dHolder_i void VISU::ColoredPrs3dHolder_i ::PublishInStudy(const std::string& theName, + const std::string& theIconName, const std::string& theComment) { SetName(theName, false); CORBA::String_var anIOR = GetID(); std::string aFatherEntry = myCache.GetEntry(); - CreateAttributes(GetStudyDocument(), aFatherEntry, "", anIOR.in(), GetName(), "", theComment, true); + CreateAttributes(GetStudyDocument(), + aFatherEntry, + theIconName, + anIOR.in(), + GetName(), + "", + theComment, + true); } //---------------------------------------------------------------------------- @@ -196,7 +204,6 @@ CORBA::Float VISU::ColoredPrs3dHolder_i ::GetMemorySize() { - // tmp return GetDevice()->GetMemorySize(); } diff --git a/src/VISU_I/VISU_ColoredPrs3dHolder_i.hh b/src/VISU_I/VISU_ColoredPrs3dHolder_i.hh index 2b6a9c9d..2434272c 100644 --- a/src/VISU_I/VISU_ColoredPrs3dHolder_i.hh +++ b/src/VISU_I/VISU_ColoredPrs3dHolder_i.hh @@ -140,6 +140,7 @@ namespace VISU private: void PublishInStudy(const std::string& theName, + const std::string& theIconName, const std::string& theComment); VISU::ColoredPrs3dCache_i& myCache; diff --git a/src/VISU_I/VISU_ColoredPrs3d_i.cc b/src/VISU_I/VISU_ColoredPrs3d_i.cc index fa9ef352..35c6df03 100644 --- a/src/VISU_I/VISU_ColoredPrs3d_i.cc +++ b/src/VISU_I/VISU_ColoredPrs3d_i.cc @@ -1212,7 +1212,6 @@ VISU::ColoredPrs3d_i GetTimeStampNumber(), GetField()->myNbComp); std::string aResultEntry = GetCResult()->GetEntry(); - std::string aRefFatherEntry = GetCResult()->GetRefFatherEntry(); std::string anEntry = GetCResult()->GetEntry(aComment.latin1()); if(anEntry == "") throw std::runtime_error("There is no Entry for binding the presentation !!!"); @@ -1226,7 +1225,7 @@ VISU::ColoredPrs3d_i CORBA::String_var anIOR = GetID(); CreateAttributes(GetStudyDocument(), anEntry, - aRefFatherEntry, + GetIconName(), anIOR.in(), GetName(), "", @@ -1240,7 +1239,7 @@ VISU::ColoredPrs3d_i GetComment()); CreateAttributes(GetStudyDocument(), aFatherEntry, - "", + GetIconName(), anIOR.in(), GetName(), "", diff --git a/src/VISU_I/VISU_ColoredPrs3d_i.hh b/src/VISU_I/VISU_ColoredPrs3d_i.hh index 5426ac7f..f9539a32 100644 --- a/src/VISU_I/VISU_ColoredPrs3d_i.hh +++ b/src/VISU_I/VISU_ColoredPrs3d_i.hh @@ -233,6 +233,11 @@ namespace VISU std::string GetHolderEntry(); + //---------------------------------------------------------------------------- + virtual + const char* + GetIconName() = 0; + //---------------------------------------------------------------------------- public: /*! @@ -384,10 +389,6 @@ namespace VISU bool CheckIsPossible() = 0; - virtual - const char* - GetIconName() = 0; - /*! Creates proper instance of VTK pipeline. */ diff --git a/src/VISU_I/VISU_CutLines_i.cc b/src/VISU_I/VISU_CutLines_i.cc index 8bb713a6..1602d29a 100644 --- a/src/VISU_I/VISU_CutLines_i.cc +++ b/src/VISU_I/VISU_CutLines_i.cc @@ -85,6 +85,16 @@ VISU::CutLines_i return myComment.c_str(); } +//---------------------------------------------------------------------------- +const char* +VISU::CutLines_i +::GetIconName() +{ + if (!IsGroupsUsed()) + return "ICON_TREE_CUT_LINES"; + else + return "ICON_TREE_CUT_LINES_GROUPS"; +} //--------------------------------------------------------------- VISU::CutLines_i:: diff --git a/src/VISU_I/VISU_DeformedShape_i.cc b/src/VISU_I/VISU_DeformedShape_i.cc index f5f7cfd5..38afca52 100644 --- a/src/VISU_I/VISU_DeformedShape_i.cc +++ b/src/VISU_I/VISU_DeformedShape_i.cc @@ -273,6 +273,15 @@ VISU::DeformedShape_i } +//--------------------------------------------------------------- +void +VISU::DeformedShape_i +::SetMapScale(double theMapScale) +{ + myDeformedShapePL->SetMapScale(theMapScale); +} + + //--------------------------------------------------------------- VISU_Actor* VISU::DeformedShape_i diff --git a/src/VISU_I/VISU_DumpPython.cc b/src/VISU_I/VISU_DumpPython.cc index 27534607..49736c11 100644 --- a/src/VISU_I/VISU_DumpPython.cc +++ b/src/VISU_I/VISU_DumpPython.cc @@ -724,7 +724,6 @@ namespace VISU } break; case VISU::TSCALARMAP: - case VISU::TPRSMERGER: if(ScalarMap_i* aServant = dynamic_cast(GetServant(anObj).in())){ thePrefix = ScalarMapToPython(theSObject,aServant,theStr,aName,"ScalarMapOnField",theArgumentName,thePrefix); theStr< -#include -#include -#include - -using namespace VISU; -using namespace std; - -#ifdef _DEBUG_ -static int MYDEBUG = 0; -#else -static int MYDEBUG = 0; -#endif - -static int INCMEMORY = 4; - -int VISU::PrsMerger_i::IsPossible(Result_i* theResult, const char* theMeshName, VISU::Entity theEntity, - const char* theFieldName, int theIteration, int isMemoryCheck) -{ - try{ - float aSize = INCMEMORY* - theResult->GetInput()->GetTimeStampSize(theMeshName,(VISU::TEntity)theEntity,theFieldName,theIteration); - bool aResult = true; - if(isMemoryCheck){ - aResult = VISU_PipeLine::CheckAvailableMemory(aSize); - MESSAGE("PrsMerger_i::IsPossible - CheckAvailableMemory = "<GetStudyDocument()), - Prs3d_i(theResult,theAddToStudy), - ColoredPrs3d_i(theResult,theAddToStudy), - ScalarMap_i(theResult,theAddToStudy), - myPrsMergerPL(NULL), - myScalarsPL(VISU_ScalarMapPL::New()) -{ -} - -VISU::PrsMerger_i:: -PrsMerger_i(Result_i* theResult, - SALOMEDS::SObject_ptr theSObject): - PrsObject_i(theResult->GetStudyDocument()), - Prs3d_i(theResult,theSObject), - ColoredPrs3d_i(theResult,theSObject), - ScalarMap_i(theResult,theSObject), - myPrsMergerPL(NULL), - myScalarsPL(VISU_ScalarMapPL::New()) -{ -} - -VISU::Storable* VISU::PrsMerger_i::Create(const char* theMeshName, VISU::Entity theEntity, - const char* theFieldName, int theIteration) -{ - if (MYDEBUG) MESSAGE("PrsMerger_i::Create"); - myIsColored = true; - myColor.R = myColor.G = myColor.B = 0.5; - VISU::Storable* aRes = TSuperClass::Create(theMeshName,theEntity,theFieldName,theIteration); - this->SetScalarMap(theMeshName,theEntity,theFieldName,theIteration); - - return aRes; -} - -VISU::Storable* VISU::PrsMerger_i::Restore(const Storable::TRestoringMap& theMap) -{ - if (MYDEBUG) MESSAGE("VISU::PrsMerger_i::Restore"); - - TSuperClass::Restore(theMap); - - SetScalarMap(myMeshName.c_str(), - VISU::Entity(myEntity), - myFieldName.c_str(), - myIteration); - // myMeshName = VISU::Storable::FindValue(theMap,"myMeshName").latin1(); - QStringList aStrSubMeshName = QStringList::split("|",VISU::Storable::FindValue(theMap,"myGeomNameList") ); - QStringList aStrEntity = QStringList::split("|",VISU::Storable::FindValue(theMap,"myGeomEntityList") ); - int aC1 = aStrSubMeshName.count(); - int aC2 = aStrEntity.count(); - if(aC1 != aC2){ - // warning situation - return this; - } - if(aC1 == 1) - if(aStrSubMeshName[0] == QString("NULL")) - return this; - - for(int i=0;i < aC2;i++){ - std::string aSubMeshName = aStrSubMeshName[i]; - int aEntity = aStrEntity[i].toInt(); - if(aEntity == -1){ - // add group - AddMeshOnGroup(myMeshName.c_str(), - aSubMeshName.c_str()); - } else if (aEntity >= 0){ - // entity and family - if(aSubMeshName == ""){ - // entity - SetMeshOnEntity(myMeshName.c_str(), - VISU::Entity(aEntity)); - } else { - // family - SetFamilyOnEntity(myMeshName.c_str(), - VISU::Entity(aEntity), - aSubMeshName.c_str()); - } - - } - } - - return this; -} - -void -VISU::PrsMerger_i -::SetMapScale(double theMapScale) -{ - myPrsMergerPL->SetMapScale(theMapScale); -} - -void VISU::PrsMerger_i::ToStream(std::ostringstream& theStr) -{ - if (MYDEBUG) MESSAGE("VISU::PrsMerger_i::ToStream:"); - TSuperClass::ToStream(theStr); - - QString aStrSubMeshName,aStrEntity; - TNameAndEntityList::iterator aIter = myGeomNameEntityList.begin(); - for(;aIter!=myGeomNameEntityList.end();aIter++){ - std::string aStr = aIter->first + "|"; - aStrSubMeshName.append(aStr.c_str()); - aStrEntity.append(QString::number(aIter->second) + "|"); - } - - Storable::DataToStream( theStr, "myMeshName", myMeshName.c_str() ); - Storable::DataToStream( theStr, "myGeomNameList", aStrSubMeshName.latin1()); - Storable::DataToStream( theStr, "myGeomEntityList", aStrEntity.latin1()); - -} - -void VISU::PrsMerger_i::clearMeshList() -{ - VISU_PrsMergerPL::TPipeLines::const_iterator aIter = myMeshPLList.begin(); - for(int i=0;aIter != myMeshPLList.end();aIter++,i++){ - ((*aIter).GetPointer())->Delete(); - } - myMeshPLList.clear(); - myGeomNameEntityList.clear(); -} - -void VISU::PrsMerger_i::RemoveAllGeom() -{ - clearMeshList(); - myPrsMergerPL->RemoveAllGeom(); - - UpdateIcon(); -} - - -VISU::PrsMerger_i::~PrsMerger_i(){ - if(MYDEBUG) if (MYDEBUG) MESSAGE("PrsMerger_i::~PrsMerger_i()"); - this->clearMeshList(); -} - -void -VISU::PrsMerger_i -::SameAs(const Prs3d_i* theOrigin) -{ - if (MYDEBUG) MESSAGE("VISU::PrsMerger_i::SameAs: this="<(theOrigin)){ - PrsMerger_i* anOrigin = const_cast(aPrs3d); - if (MYDEBUG) MESSAGE("VISU::PrsMerger_i::SameAs: theOrigin="<SetScalarMap(myMeshName.c_str(),VISU::Entity(myEntity),myFieldName.c_str(),myIteration); - string_array_var aGroupNames = anOrigin->getGroupNames(); - RemoveAllGeom(); - for(int i=0;ilength();i++){ - this->AddMeshOnGroup(myMeshName.c_str(),aGroupNames[i]); - } - Update(); - } -} - -void VISU::PrsMerger_i::Update() -{ - TSuperClass::Update(); -} - -VISU_Actor* -VISU::PrsMerger_i -::CreateActor(const Handle(SALOME_InteractiveObject)& theIO, bool toSupressShrinking) -{ - if (MYDEBUG) MESSAGE("VISU::PrsMerger_i::CreateActor this="<GetInput()->GetMeshOnGroup(theMeshName,theGroupName); - - VISU_MeshPL* aTmpMesh = VISU_MeshPL::New(); - aTmpMesh->SetIDMapper(anIDMapper); - - if(myPrsMergerPL->SetGeometry(aTmpMesh)){ - this->clearMeshList(); - myMeshPLList.push_back(aTmpMesh); - TPairStringAndInt aPair((std::string)theGroupName,-1); - myGeomNameEntityList.push_back(aPair); - } - else - aTmpMesh->Delete(); - - UpdateIcon(); -} - -CORBA::Long -VISU::PrsMerger_i:: -AddMeshOnGroup(const char* theMeshName, - const char* theGroupName) -{ - if (MYDEBUG) MESSAGE("VISU::PrsMerger_i::AddMeshOnGroup |"<< theGroupName <<"| this="<GetInput()->GetMeshOnGroup(theMeshName,theGroupName); - if(!anIDMapper) - MESSAGE("Warning: There are no mesh with group=|"<Delete(); -} - -void -VISU::PrsMerger_i:: -SetScalarMap(const char* theMeshName, - const VISU::Entity theEntity, - const char* theFieldName, - CORBA::Long theStampsNum) -{ - if (MYDEBUG) MESSAGE("VISU::PrsMerger_i::SetScalarMap this="<GetInput()->GetTimeStampOnMesh(theMeshName,(VISU::TEntity)theEntity,theFieldName,int(theStampsNum)); - - myEntity = (VISU::TEntity)theEntity; - myFieldName = theFieldName; - myIteration = theStampsNum; - - myScalarsPL->SetIDMapper(anIDMapper); - myPrsMergerPL->SetScalars(myScalarsPL); -} - -void -VISU::PrsMerger_i:: -SetScalarMap(VISU_PipeLine* thePipeLine) -{ - if (MYDEBUG) MESSAGE("VISU::PrsMerger_i::SetScalarMap"); - VISU_ScalarMapPL* aInputScalars = dynamic_cast(thePipeLine); - VISU::PIDMapper anIDMapper = aInputScalars->GetIDMapper(); - myScalarsPL->SetIDMapper(anIDMapper); - if(aInputScalars) - myPrsMergerPL->SetScalars(myScalarsPL); -} - -void -VISU::PrsMerger_i:: -RemoveGeometryByName(const char* theName) -{ - // not implemented yet. -} - -void -VISU::PrsMerger_i:: -RemoveGeometryById(CORBA::Long theId) -{ - if(myGeomNameEntityList.size() != myMeshPLList.size()){ - // warning situation. Some information lost - // check myGeomNameEntityList and myMeshPLList - } - - if(theId >=0 && (int)theId < myMeshPLList.size()){ - VISU_PrsMergerPL::TPipeLines::iterator aIter = myMeshPLList.begin(); - for(;aIter != myMeshPLList.end();aIter++){ - if( myMeshPLList[theId] == (*aIter)){ - myMeshPLList.erase(aIter); - break; - } - } - } - if(theId >=0 && (int)theId < myGeomNameEntityList.size()){ - TNameAndEntityList::iterator aIter = myGeomNameEntityList.begin(); - for(;aIter != myGeomNameEntityList.end();aIter++){ - if( myGeomNameEntityList[theId] == (*aIter) ){ - myGeomNameEntityList.erase(aIter); - break; - } - } - } - myPrsMergerPL->RemoveGeometryById((int)theId); -} - -void -VISU::PrsMerger_i -::DoHook(){ - if(!myPipeLine) myPipeLine = VISU_PrsMergerPL::New(); - myPrsMergerPL = dynamic_cast(myPipeLine); - myPipeLine->GetMapper()->SetScalarVisibility(IsColored()); - TSuperClass::DoHook(); -} - -const char* -VISU::PrsMerger_i -::GetIconName() -{ - if (!IsGroupsUsed()) - return "ICON_TREE_SCALAR_MAP"; - else - return "ICON_TREE_SCALAR_MAP_GROUPS"; -} - -void VISU::PrsMerger_i -::UpdateIcon() -{ - if (mySObject->_is_nil()) - return; - - SALOMEDS::StudyBuilder_var aStudyBuilder = myStudy->NewBuilder(); - - // Check if the icon needs to be updated, update if necessary - SALOMEDS::GenericAttribute_var anAttr; - SALOMEDS::AttributePixMap_var aPixmap; - - anAttr = aStudyBuilder->FindOrCreateAttribute( mySObject, "AttributePixMap" ); - aPixmap = SALOMEDS::AttributePixMap::_narrow( anAttr ); - - if ( aPixmap->GetPixMap() != (std::string)GetIconName() ) - aPixmap->SetPixMap(GetIconName()); - - // Update Object Browser - SUIT_Session* aSession = SUIT_Session::session(); - QPtrList anApplications = aSession->applications(); - QPtrListIterator anIter (anApplications); - while (SUIT_Application* aSApp = anIter.current()) { - SalomeApp_Application* anApp = dynamic_cast(aSApp); - if (!anApp) return; - SalomeApp_Study* aStudy = dynamic_cast(anApp->activeStudy()); - if (!aStudy) return; - if (_PTR(Study) aCStudy = aStudy->studyDS()) { - if (myStudy->StudyId() == aCStudy->StudyId()) { - anApp->updateObjectBrowser(); - break; - } - } - ++anIter; - } -} - -CORBA::Long -VISU::PrsMerger_i -::GetNumberOfGeom() -{ - if(myPrsMergerPL) - return myPrsMergerPL->GetNbGeometry(); - else - return 0; -} - -string_array* -VISU::PrsMerger_i -::getGroupNames() -{ - string_array_var myseq = new string_array; - if(myPrsMergerPL){ - vector aGroupNames; - TNameAndEntityList::const_iterator aIter = myGeomNameEntityList.begin(); - for(;aIter!=myGeomNameEntityList.end();aIter++){ - TPairStringAndInt aPair = (*aIter); - if(aPair.second == -1) - aGroupNames.push_back(aPair.first); - } - myseq->length(aGroupNames.size()); - vector::const_iterator aNamesIter = aGroupNames.begin(); - for(int i=0;aNamesIter!=aGroupNames.end();i++,aNamesIter++){ - myseq[i] = CORBA::string_dup((*aNamesIter).c_str()); - } - } - return myseq._retn(); -} - -bool -VISU::PrsMerger_i -::CheckGroup(const char* theGroupName) -{ - if (MYDEBUG) MESSAGE("PrsMerger_i::CheckGroup :|"<GetInput()->GetMeshOnGroup(aMeshName,theGroupName); - if (MYDEBUG) MESSAGE("anIDMapper="<GetVTKOutput()->GetNumberOfCells(); - if(aNbCellsInGeom>0){ - int aVtkCellType = anIDMapper->GetVTKOutput()->GetCellType(0); - if (MYDEBUG) MESSAGE("CellType="< TPairStringAndInt; - typedef std::vector TNameAndEntityList; - - explicit - PrsMerger_i(Result_i* theResult, - bool theAddToStudy); - explicit - PrsMerger_i(Result_i* theResult, - SALOMEDS::SObject_ptr theSObject); - virtual void SameAs(const Prs3d_i* theOrigin); - virtual ~PrsMerger_i(); - - virtual VISU::VISUType GetType() { return VISU::TPRSMERGER;}; - - virtual CORBA::Boolean IsColored() { return myIsColored; } - virtual void ShowColored(CORBA::Boolean theColored) { myIsColored = theColored; } - - virtual SALOMEDS::Color GetColor() { return myColor;} - virtual void SetColor(const SALOMEDS::Color& theColor) { myColor = theColor;} - - VISU_PrsMergerPL* GetPrsMergerPL(){ return myPrsMergerPL;} - - virtual void Update(); - - protected: - virtual void DoHook(); - virtual const char* GetIconName(); - void UpdateIcon(); - void clearMeshList(); - - VISU_PrsMergerPL* myPrsMergerPL; - VISU_PrsMergerPL::TPipeLines myMeshPLList; - VISU_ScalarMapPL* myScalarsPL; - - SALOMEDS::Color myColor; - bool myIsColored; - - /*! Warning! This variable must be maked as list, if - * you we will need in different mesh entities (ENTITY,FAMILY,GROUP) as geometries. - */ - TNameAndEntityList myGeomNameEntityList; - - public: - static int IsPossible(Result_i* theResult, const char* theMeshName, VISU::Entity theEntity, - const char* theFieldName, int theIteration, int isMemoryCheck = true); - - virtual Storable* Create(const char* theMeshName, VISU::Entity theEntity, - const char* theFieldName, int theIteration); - - virtual void ToStream(std::ostringstream& theStr); - - virtual Storable* Restore(const Storable::TRestoringMap& theMap); - - virtual - void - SetMapScale(double theMapScale = 1.0); - - static const std::string myComment; - virtual const char* GetComment() const; - virtual QString GenerateName(); - - virtual - VISU_Actor* - CreateActor(const Handle(SALOME_InteractiveObject)& theIO = NULL); - - virtual - VISU_Actor* - CreateActor(const Handle(SALOME_InteractiveObject)& theIO, bool toSupressShrinking); - - virtual void UpdateActor(VISU_Actor* theActor) ; - - /*! - * Sets geometry of mesh as group - */ - virtual void SetMeshOnGroup(const char* theMeshName, - const char* theGroupName); - - /*! - * Add geometry of mesh as group - * \retval the id of added group. - */ - virtual CORBA::Long AddMeshOnGroup(const char* theMeshName, - const char* theGroupName); - - /*! - * Remove geometry from list by Name - */ - virtual void RemoveGeometryByName(const char* theName); - - /*! - * Removes geometry from list by id - * Note: theId number in [0,...] - * - * Waring: if you delete not 0 element, others indexes will be increased. - * Example: - * 0,1,2,3,4 - indexes - * remove 2 index - * new sequence: - * 0,1,2,3,4 , where are 0 = 0, 1 = 1, 3 = 2, 4 = 3. - */ - virtual void RemoveGeometryById(CORBA::Long theId); - - - /*! - * Sets geometry of mesh as family on entity - */ - virtual void SetFamilyOnEntity(const char* theMeshName, - const VISU::Entity theEntity, - const char* theFamilyName); - - /*! - * Sets geometry of mesh as mesh on entity - */ - virtual void SetMeshOnEntity(const char* theMeshName, - const VISU::Entity theEntity); - - - /*! - * Sets scalars as scalar map - */ - virtual void SetScalarMap(const char* theMeshName, - VISU::Entity theEntity, - const char* theFieldName, - CORBA::Long theStampsNum); - - /*! - * Get number of geometries. - */ - CORBA::Long GetNumberOfGeom(); - - - /*! - * Get group names. - */ - string_array* getGroupNames(); - - /*! - * Sets scalars as scalar map - */ - void SetScalarMap(VISU_PipeLine* thePipeLine); - - /*! - * Removes all geometries. - */ - virtual void RemoveAllGeom(); - - - /*! Warning! - * see \a myGeomNameEntityList - */ - virtual CORBA::Long GetMeshGeometryPlace(CORBA::Long theId){return CORBA::Long(1);};// must bee filled - - /*! - * Return true, if group is good, esle false. - * May be used, if SetScalarMap(...) olready . - */ - bool CheckGroup(const char* theGroupName); - - }; - -} - -#endif diff --git a/src/VISU_I/VISU_ScalarMapOnDeformedShape_i.cc b/src/VISU_I/VISU_ScalarMapOnDeformedShape_i.cc index fffd1ae1..3b34e977 100644 --- a/src/VISU_I/VISU_ScalarMapOnDeformedShape_i.cc +++ b/src/VISU_I/VISU_ScalarMapOnDeformedShape_i.cc @@ -112,6 +112,16 @@ VISU::ScalarMapOnDeformedShape_i return myComment.c_str(); } +//---------------------------------------------------------------------------- +const char* +VISU::ScalarMapOnDeformedShape_i +::GetIconName() +{ + if (!IsGroupsUsed()) + return "ICON_TREE_SCALAR_MAP_ON_DEFORMED_SHAPE"; + else + return "ICON_TREE_SCALAR_MAP_ON_DEFORMED_SHAPE_GROUPS"; +} //--------------------------------------------------------------- VISU::ScalarMapOnDeformedShape_i diff --git a/src/VISU_I/VISU_ScalarMap_i.hh b/src/VISU_I/VISU_ScalarMap_i.hh index a258a799..b5d1bc7d 100644 --- a/src/VISU_I/VISU_ScalarMap_i.hh +++ b/src/VISU_I/VISU_ScalarMap_i.hh @@ -94,12 +94,6 @@ namespace VISU GetBarOrientation(); //---------------------------------------------------------------------------- - //! Sets geometry of mesh as group - virtual - void - SetMeshOnGroup(const char* theMeshName, - const char* theGroupName); - //! Add geometry of mesh as group. \retval the id of added group. virtual void diff --git a/src/VISU_I/VISU_Table_i.cc b/src/VISU_I/VISU_Table_i.cc index 190a0642..adce191e 100644 --- a/src/VISU_I/VISU_Table_i.cc +++ b/src/VISU_I/VISU_Table_i.cc @@ -248,7 +248,7 @@ VISU::Storable* VISU::Table_i::Build( int theRestoring ) string anEntry = CreateAttributes( GetStudyDocument(), SO->GetID(),//SComponent->GetID(), - "", + "ICON_TREE_TABLE", GetID(), GetName(), "", @@ -264,13 +264,6 @@ VISU::Storable* VISU::Table_i::Build( int theRestoring ) //Builder->Addreference( refSO, SO ); } - // Set icon - SALOMEDS::AttributePixMap_var aPixmap; - - anAttr = Builder->FindOrCreateAttribute( mySObj, "AttributePixMap" ); - aPixmap = SALOMEDS::AttributePixMap::_narrow( anAttr ); - aPixmap->SetPixMap("ICON_TREE_TABLE"); - return this; } return NULL; diff --git a/src/VISU_I/VISU_TimeAnimation.cxx b/src/VISU_I/VISU_TimeAnimation.cxx index b2df6051..73c609b3 100644 --- a/src/VISU_I/VISU_TimeAnimation.cxx +++ b/src/VISU_I/VISU_TimeAnimation.cxx @@ -197,7 +197,7 @@ bool VISU_TimeAnimation::addField (_PTR(SObject) theField) FieldData aNewData; aNewData.myField = theField; aNewData.myNbFrames = 0; - aNewData.myPrsType = VISU::TPRSMERGER; + aNewData.myPrsType = VISU::TSCALARMAP; aNewData.myOffset[0] = aNewData.myOffset[1] = aNewData.myOffset[2] = 0; VISU::Storable::TRestoringMap aMap = getMapOfValue(aNewData.myField); if(VISU::Storable::FindValue(aMap,"myComment") != QString("FIELD")) @@ -449,7 +449,6 @@ void VISU_TimeAnimation::generatePresentations(CORBA::Long theFieldNum) { using namespace VISU; switch (aData.myPrsType) { case VISU::TSCALARMAP: - case VISU::TPRSMERGER: // ScalarMap GeneratePresentations(myStudy, aData, aResult, @@ -1479,7 +1478,6 @@ std::string GetPresentationComment (VISU::VISUType thePrsType) std::string aPrsCmt; switch (thePrsType) { case VISU::TSCALARMAP: - case VISU::TPRSMERGER: aPrsCmt = VISU::ScalarMap_i::myComment; break; case VISU::TISOSURFACE: @@ -1669,7 +1667,7 @@ void VISU_TimeAnimation::restoreFromStudy(_PTR(SObject) theField) QString strName (aStr.c_str()); if (strName == VISU::ScalarMap_i::myComment.c_str()) - aData.myPrsType = VISU::TPRSMERGER; + aData.myPrsType = VISU::TSCALARMAP; else if (strName == VISU::IsoSurfaces_i::myComment.c_str()) aData.myPrsType = VISU::TISOSURFACE; else if (strName == VISU::CutPlanes_i::myComment.c_str()) diff --git a/src/VISU_I/VISU_View_i.cc b/src/VISU_I/VISU_View_i.cc index 5f04b6ff..add80327 100644 --- a/src/VISU_I/VISU_View_i.cc +++ b/src/VISU_I/VISU_View_i.cc @@ -2310,7 +2310,6 @@ namespace VISU { { VISU::VISUType aType = myPrs->GetType(); if (aType != VISU::TSCALARMAP && - aType != VISU::TPRSMERGER && aType != VISU::TDEFORMEDSHAPE && aType != VISU::TSCALARMAPONDEFORMEDSHAPE) { myResult = "Insideframe representation is not available for this type of presentations."; diff --git a/src/VISU_SWIG/Makefile.am b/src/VISU_SWIG/Makefile.am new file mode 100644 index 00000000..dbf8e24b --- /dev/null +++ b/src/VISU_SWIG/Makefile.am @@ -0,0 +1,68 @@ +# VISU VISU_SWIG : binding of C++ implementation and Python +# +# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# +# File : Makefile.am +# Author : Paul RASCLE, EDF +# Module : VISU + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +lib_LTLIBRARIES= libVISU_Swigcmodule.la +dist_libVISU_Swigcmodule_la_SOURCES= VISU_Gen_s.cc +nodist_libVISU_Swigcmodule_la_SOURCES= libVISU_Swig_wrap.cxx + +SWIG_DEF = libVISU_Swig.i +SWIG_FLAGS= @SWIG_FLAGS@ -I$(srcdir) + +libVISU_Swig.py: libVISU_Swig_wrap.cxx +libVISU_Swig_wrap.cxx: $(SWIG_DEF) + $(SWIG) $(SWIG_FLAGS) -o $@ $< + +libVISU_Swigcmodule_la_CPPFLAGS= \ + -ftemplate-depth-32 \ + $(PYTHON_INCLUDES) \ + $(HDF5_INCLUDES) \ + $(QT_INCLUDES) \ + $(VTK_INCLUDES) \ + $(KERNEL_CXXFLAGS) \ + $(GUI_CXXFLAGS) \ + $(MED_CXXFLAGS) \ + $(BOOST_CPPFLAGS) \ + -I$(srcdir)/../CONVERTOR -I$(srcdir)/../PIPELINE + +libVISU_Swigcmodule_la_LDFLAGS= $(PYTHON_LIBS) ../CONVERTOR/libVisuConvertor.la ../PIPELINE/libVisuPipeLine.la + +dist_salomescript_DATA= libVISU_Swig.py batchmode_visu.py batchmode_visu_table.py batchmode_visu_view3d.py \ + visu_med.py visu_view3d.py visu.py visu_gui.py visu_prs_example.py \ + visu_table.py visu_big_table.py visu_view.py visu_delete.py \ + visu_swig_test.py visu_split_views.py \ + visu_succcessive_animation.py visu_apply_properties.py visu_apply_properties_successive.py \ + VISU_Example_01.py VISU_Example_02.py VISU_Example_03.py VISU_Example_04.py \ + VISU_Example_05.py VISU_Example_06.py VISU_Example_07.py +dist_sharedpkgpython_DATA= VISU_shared_modules.py + +CLEANFILES= libVISU_Swig.py libVISU_Swig_wrap.cxx + +install-exec-hook: $(libdir)/_libVISU_Swig.so + +$(libdir)/_libVISU_Swig.so: + ln -sf $(libdir)/libVISU_Swigcmodule.la $@ diff --git a/src/VISU_SWIG/Makefile.in b/src/VISU_SWIG/Makefile.in index 6f1cc70a..21067c69 100644 --- a/src/VISU_SWIG/Makefile.in +++ b/src/VISU_SWIG/Makefile.in @@ -1,3 +1,19 @@ +# Makefile.in generated by automake 1.9.5 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + # VISU VISU_SWIG : binding of C++ implementation and Python # # Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, @@ -20,36 +36,374 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # -# File : Makefile.in +# File : Makefile.am # Author : Paul RASCLE, EDF # Module : VISU -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl +# +# ============================================================ +# This file defines the common definitions used in several +# Makefile. This file must be included, if needed, by the file +# Makefile.am. +# ============================================================ +# -@COMMENCE@ +SOURCES = $(dist_libVISU_Swigcmodule_la_SOURCES) $(nodist_libVISU_Swigcmodule_la_SOURCES) -# Libraries targets +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = ../.. +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +INSTALL = @INSTALL@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +target_triplet = @target@ +DIST_COMMON = $(dist_salomescript_DATA) $(dist_sharedpkgpython_DATA) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/adm_local/unix/make_common_starter.am +subdir = ./src/VISU_SWIG +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_depend_flag.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_have_sstream.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_namespaces.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_option.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/ac_cxx_use_std_iostream.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/ac_linker_options.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/acx_pthread.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/check_Kernel.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/check_boost.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/check_cas.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/check_corba.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/check_hdf5.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/check_htmlgen.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/check_mpich.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/check_omniorb.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/check_opengl.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/check_qt.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/check_swig.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/enable_pthreads.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/production.m4 \ + $(top_srcdir)/salome_adm/unix/config_files/python.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(install_sh) -d +CONFIG_CLEAN_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(salomescriptdir)" \ + "$(DESTDIR)$(sharedpkgpythondir)" +libLTLIBRARIES_INSTALL = $(INSTALL) +LTLIBRARIES = $(lib_LTLIBRARIES) +libVISU_Swigcmodule_la_LIBADD = +dist_libVISU_Swigcmodule_la_OBJECTS = \ + libVISU_Swigcmodule_la-VISU_Gen_s.lo +nodist_libVISU_Swigcmodule_la_OBJECTS = \ + libVISU_Swigcmodule_la-libVISU_Swig_wrap.lo +libVISU_Swigcmodule_la_OBJECTS = \ + $(dist_libVISU_Swigcmodule_la_OBJECTS) \ + $(nodist_libVISU_Swigcmodule_la_OBJECTS) +DEFAULT_INCLUDES = -I. -I$(srcdir) +depcomp = $(SHELL) $(top_srcdir)/salome_adm/unix/config_files/depcomp +am__depfiles_maybe = depfiles +CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) +LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) +CXXLD = $(CXX) +CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ + $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +SOURCES = $(dist_libVISU_Swigcmodule_la_SOURCES) \ + $(nodist_libVISU_Swigcmodule_la_SOURCES) +DIST_SOURCES = $(dist_libVISU_Swigcmodule_la_SOURCES) +dist_salomescriptDATA_INSTALL = $(INSTALL_DATA) +dist_sharedpkgpythonDATA_INSTALL = $(INSTALL_DATA) +DATA = $(dist_salomescript_DATA) $(dist_sharedpkgpython_DATA) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ +BOOST_LIBS = @BOOST_LIBS@ +BOOST_LIBSUFFIX = @BOOST_LIBSUFFIX@ +BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@ +CAS_CPPFLAGS = @CAS_CPPFLAGS@ +CAS_CXXFLAGS = @CAS_CXXFLAGS@ +CAS_DATAEXCHANGE = @CAS_DATAEXCHANGE@ +CAS_KERNEL = @CAS_KERNEL@ +CAS_LDFLAGS = @CAS_LDFLAGS@ +CAS_LDPATH = @CAS_LDPATH@ +CAS_MATH = @CAS_MATH@ +CAS_MODELER = @CAS_MODELER@ +CAS_OCAF = @CAS_OCAF@ +CAS_OCAFVIS = @CAS_OCAFVIS@ +CAS_STDPLUGIN = @CAS_STDPLUGIN@ +CAS_TKTopAlgo = @CAS_TKTopAlgo@ +CAS_VIEWER = @CAS_VIEWER@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CORBA_CXXFLAGS = @CORBA_CXXFLAGS@ +CORBA_INCLUDES = @CORBA_INCLUDES@ +CORBA_IN_GUI = @CORBA_IN_GUI@ +CORBA_LIBS = @CORBA_LIBS@ +CORBA_ROOT = @CORBA_ROOT@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CXX_DEPEND_FLAG = @CXX_DEPEND_FLAG@ +CYGPATH_W = @CYGPATH_W@ +C_DEPEND_FLAG = @C_DEPEND_FLAG@ +DEFS = @DEFS@ +DEPCC = @DEPCC@ +DEPCXX = @DEPCXX@ +DEPCXXFLAGS = @DEPCXXFLAGS@ +DEPDIR = @DEPDIR@ +DOT = @DOT@ +DOXYGEN = @DOXYGEN@ +DOXYGEN_WITH_PYTHON = @DOXYGEN_WITH_PYTHON@ +DOXYGEN_WITH_STL = @DOXYGEN_WITH_STL@ +DVIPS = @DVIPS@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GUI_CXXFLAGS = @GUI_CXXFLAGS@ +GUI_LDFLAGS = @GUI_LDFLAGS@ +GUI_ROOT_DIR = @GUI_ROOT_DIR@ +HAVE_SSTREAM = @HAVE_SSTREAM@ +HDF5_INCLUDES = @HDF5_INCLUDES@ +HDF5_LIBS = @HDF5_LIBS@ +HDF5_MT_LIBS = @HDF5_MT_LIBS@ +IDL = @IDL@ +IDLCXXFLAGS = @IDLCXXFLAGS@ +IDLPYFLAGS = @IDLPYFLAGS@ +IDL_CLN_CXX = @IDL_CLN_CXX@ +IDL_CLN_H = @IDL_CLN_H@ +IDL_CLN_OBJ = @IDL_CLN_OBJ@ +IDL_SRV_CXX = @IDL_SRV_CXX@ +IDL_SRV_H = @IDL_SRV_H@ +IDL_SRV_OBJ = @IDL_SRV_OBJ@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +KERNEL_CXXFLAGS = @KERNEL_CXXFLAGS@ +KERNEL_LDFLAGS = @KERNEL_LDFLAGS@ +KERNEL_ROOT_DIR = @KERNEL_ROOT_DIR@ +KERNEL_SITE_DIR = @KERNEL_SITE_DIR@ +LATEX = @LATEX@ +LDEXPDYNFLAGS = @LDEXPDYNFLAGS@ +LDFLAGS = @LDFLAGS@ +LEX = @LEX@ +LEXLIB = @LEXLIB@ +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIB_LOCATION_SUFFIX = @LIB_LOCATION_SUFFIX@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +MACHINE = @MACHINE@ +MAKEINFO = @MAKEINFO@ +MED_CXXFLAGS = @MED_CXXFLAGS@ +MED_LDFLAGS = @MED_LDFLAGS@ +MED_ROOT_DIR = @MED_ROOT_DIR@ +MOC = @MOC@ +MODULE_NAME = @MODULE_NAME@ +MSG2QM = @MSG2QM@ +OBJEXT = @OBJEXT@ +OGL_INCLUDES = @OGL_INCLUDES@ +OGL_LIBS = @OGL_LIBS@ +OMNIORB_CXXFLAGS = @OMNIORB_CXXFLAGS@ +OMNIORB_IDL = @OMNIORB_IDL@ +OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@ +OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ +OMNIORB_IDL_CLN_CXX = @OMNIORB_IDL_CLN_CXX@ +OMNIORB_IDL_CLN_H = @OMNIORB_IDL_CLN_H@ +OMNIORB_IDL_CLN_OBJ = @OMNIORB_IDL_CLN_OBJ@ +OMNIORB_IDL_SRV_CXX = @OMNIORB_IDL_SRV_CXX@ +OMNIORB_IDL_SRV_H = @OMNIORB_IDL_SRV_H@ +OMNIORB_IDL_SRV_OBJ = @OMNIORB_IDL_SRV_OBJ@ +OMNIORB_IDL_TIE_CXX = @OMNIORB_IDL_TIE_CXX@ +OMNIORB_IDL_TIE_H = @OMNIORB_IDL_TIE_H@ +OMNIORB_INCLUDES = @OMNIORB_INCLUDES@ +OMNIORB_LIBS = @OMNIORB_LIBS@ +OMNIORB_ROOT = @OMNIORB_ROOT@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PDFLATEX = @PDFLATEX@ +PTHREAD_CC = @PTHREAD_CC@ +PTHREAD_CFLAGS = @PTHREAD_CFLAGS@ +PTHREAD_LIBS = @PTHREAD_LIBS@ +PYTHON = @PYTHON@ +PYTHONHOME = @PYTHONHOME@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_INCLUDES = @PYTHON_INCLUDES@ +PYTHON_LIBS = @PYTHON_LIBS@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_SITE = @PYTHON_SITE@ +PYTHON_SITE_EXEC = @PYTHON_SITE_EXEC@ +PYTHON_SITE_INSTALL = @PYTHON_SITE_INSTALL@ +PYTHON_SITE_PACKAGE = @PYTHON_SITE_PACKAGE@ +PYTHON_VERSION = @PYTHON_VERSION@ +QTDIR = @QTDIR@ +QT_INCLUDES = @QT_INCLUDES@ +QT_LIBS = @QT_LIBS@ +QT_MT_INCLUDES = @QT_MT_INCLUDES@ +QT_MT_LIBS = @QT_MT_LIBS@ +QT_ROOT = @QT_ROOT@ +QT_VERS = @QT_VERS@ +QWT_INCLUDES = @QWT_INCLUDES@ +QWT_LIBS = @QWT_LIBS@ +RANLIB = @RANLIB@ +ROOT_BUILDDIR = @ROOT_BUILDDIR@ +ROOT_SRCDIR = @ROOT_SRCDIR@ +RST2HTML = @RST2HTML@ +RST2HTML_IS_OK_FALSE = @RST2HTML_IS_OK_FALSE@ +RST2HTML_IS_OK_TRUE = @RST2HTML_IS_OK_TRUE@ +SETX = @SETX@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STDLIB = @STDLIB@ +STRIP = @STRIP@ +SWIG = @SWIG@ +SWIG_FLAGS = @SWIG_FLAGS@ -I$(srcdir) +TEMP = @TEMP@ +UIC = @UIC@ +VERSION = @VERSION@ +VTKPY_MODULES = @VTKPY_MODULES@ +VTK_INCLUDES = @VTK_INCLUDES@ +VTK_LIBS = @VTK_LIBS@ +XVERSION = @XVERSION@ +YACC = @YACC@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_STRIP = @ac_ct_STRIP@ +acx_pthread_config = @acx_pthread_config@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = $(prefix)/bin/@PACKAGE@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = $(prefix)/lib@LIB_LOCATION_SUFFIX@/@PACKAGE@ +libexecdir = @libexecdir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target = @target@ +target_alias = @target_alias@ +target_cpu = @target_cpu@ +target_os = @target_os@ +target_vendor = @target_vendor@ -LIB = libVISU_Swigcmodule.la -LIB_SRC = VISU_Gen_s.cc -SWIG_FLAGS += +# Standard directory for installation +salomeincludedir = $(includedir)/@PACKAGE@ +purebindir = $(prefix)/bin +salomescriptdir = $(bindir) -SWIG_DEF = libVISU_Swig.i -EXPORT_PYSCRIPTS = libVISU_Swig.py batchmode_visu.py batchmode_visu_table.py batchmode_visu_view3d.py \ - visu_med.py visu_view3d.py visu.py visu_gui.py visu_prs_example.py \ - visu_table.py visu_big_table.py visu_view.py visu_delete.py \ - visu_swig_test.py visu_split_views.py visu_change_input.py visu_cache.py \ - VISU_Example_01.py VISU_Example_02.py VISU_Example_03.py VISU_Example_04.py \ - VISU_Example_05.py VISU_Example_06.py VISU_Example_07.py -EXPORT_SHAREDPYSCRIPTS = VISU_shared_modules.py +# Tests environment folders +testsenvirondir = $(prefix)/Tests/environ +testsenvironcshdir = $(prefix)/Tests/environ/csh -LIB_CLIENT_IDL = +# Directory for installing idl files +salomeidldir = $(prefix)/idl/@PACKAGE@ -CPPFLAGS += -ftemplate-depth-32 \ +# Directory for installing resource files +salomeresdir = $(prefix)/share/@PACKAGE@/resources/@MODULE_NAME@ + +# Directories for installing admin files +admlocaldir = $(prefix)/adm_local +admlocalunixdir = $(admlocaldir)/unix +admlocalm4dir = $(admlocaldir)/unix/config_files + +# Shared modules installation directory +sharedpkgpythondir = $(pkgpythondir)/shared_modules + +# Documentation directory +docdir = $(datadir)/doc/@PACKAGE@ +EXTRA_DIST = $(MOC_FILES:%_moc.cxx=%.h) $(nodist_salomeres_DATA:%.qm=%.po) +lib_LTLIBRARIES = libVISU_Swigcmodule.la +dist_libVISU_Swigcmodule_la_SOURCES = VISU_Gen_s.cc +nodist_libVISU_Swigcmodule_la_SOURCES = libVISU_Swig_wrap.cxx +SWIG_DEF = libVISU_Swig.i +libVISU_Swigcmodule_la_CPPFLAGS = \ + -ftemplate-depth-32 \ $(PYTHON_INCLUDES) \ $(HDF5_INCLUDES) \ $(QT_INCLUDES) \ @@ -57,8 +411,403 @@ CPPFLAGS += -ftemplate-depth-32 \ $(KERNEL_CXXFLAGS) \ $(GUI_CXXFLAGS) \ $(MED_CXXFLAGS) \ - $(BOOST_CPPFLAGS) + $(BOOST_CPPFLAGS) \ + -I$(srcdir)/../CONVERTOR -I$(srcdir)/../PIPELINE + +libVISU_Swigcmodule_la_LDFLAGS = $(PYTHON_LIBS) ../CONVERTOR/libVisuConvertor.la ../PIPELINE/libVisuPipeLine.la +dist_salomescript_DATA = libVISU_Swig.py batchmode_visu.py batchmode_visu_table.py batchmode_visu_view3d.py \ + visu_med.py visu_view3d.py visu.py visu_gui.py visu_prs_example.py \ + visu_table.py visu_big_table.py visu_view.py visu_delete.py \ + visu_swig_test.py visu_split_views.py \ + visu_succcessive_animation.py visu_apply_properties.py visu_apply_properties_successive.py \ + VISU_Example_01.py VISU_Example_02.py VISU_Example_03.py VISU_Example_04.py \ + VISU_Example_05.py VISU_Example_06.py VISU_Example_07.py + +dist_sharedpkgpython_DATA = VISU_shared_modules.py +CLEANFILES = libVISU_Swig.py libVISU_Swig_wrap.cxx +all: all-am + +.SUFFIXES: +.SUFFIXES: .cc .cxx .lo .o .obj +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/adm_local/unix/make_common_starter.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu ./src/VISU_SWIG/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu ./src/VISU_SWIG/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ + echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ + $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ + else :; fi; \ + done + +uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ + echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ + $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ + done + +clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +libVISU_Swigcmodule.la: $(libVISU_Swigcmodule_la_OBJECTS) $(libVISU_Swigcmodule_la_DEPENDENCIES) + $(CXXLINK) -rpath $(libdir) $(libVISU_Swigcmodule_la_LDFLAGS) $(libVISU_Swigcmodule_la_OBJECTS) $(libVISU_Swigcmodule_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_Swigcmodule_la-VISU_Gen_s.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libVISU_Swigcmodule_la-libVISU_Swig_wrap.Plo@am__quote@ + +.cc.o: +@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< + +.cc.obj: +@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.cc.lo: +@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< + +libVISU_Swigcmodule_la-VISU_Gen_s.lo: VISU_Gen_s.cc +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_Swigcmodule_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_Swigcmodule_la-VISU_Gen_s.lo -MD -MP -MF "$(DEPDIR)/libVISU_Swigcmodule_la-VISU_Gen_s.Tpo" -c -o libVISU_Swigcmodule_la-VISU_Gen_s.lo `test -f 'VISU_Gen_s.cc' || echo '$(srcdir)/'`VISU_Gen_s.cc; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_Swigcmodule_la-VISU_Gen_s.Tpo" "$(DEPDIR)/libVISU_Swigcmodule_la-VISU_Gen_s.Plo"; else rm -f "$(DEPDIR)/libVISU_Swigcmodule_la-VISU_Gen_s.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='VISU_Gen_s.cc' object='libVISU_Swigcmodule_la-VISU_Gen_s.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_Swigcmodule_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_Swigcmodule_la-VISU_Gen_s.lo `test -f 'VISU_Gen_s.cc' || echo '$(srcdir)/'`VISU_Gen_s.cc + +libVISU_Swigcmodule_la-libVISU_Swig_wrap.lo: libVISU_Swig_wrap.cxx +@am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_Swigcmodule_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libVISU_Swigcmodule_la-libVISU_Swig_wrap.lo -MD -MP -MF "$(DEPDIR)/libVISU_Swigcmodule_la-libVISU_Swig_wrap.Tpo" -c -o libVISU_Swigcmodule_la-libVISU_Swig_wrap.lo `test -f 'libVISU_Swig_wrap.cxx' || echo '$(srcdir)/'`libVISU_Swig_wrap.cxx; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libVISU_Swigcmodule_la-libVISU_Swig_wrap.Tpo" "$(DEPDIR)/libVISU_Swigcmodule_la-libVISU_Swig_wrap.Plo"; else rm -f "$(DEPDIR)/libVISU_Swigcmodule_la-libVISU_Swig_wrap.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='libVISU_Swig_wrap.cxx' object='libVISU_Swigcmodule_la-libVISU_Swig_wrap.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libVISU_Swigcmodule_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libVISU_Swigcmodule_la-libVISU_Swig_wrap.lo `test -f 'libVISU_Swig_wrap.cxx' || echo '$(srcdir)/'`libVISU_Swig_wrap.cxx + +.cxx.o: +@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< + +.cxx.obj: +@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +.cxx.lo: +@am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + -rm -f libtool +uninstall-info-am: +install-dist_salomescriptDATA: $(dist_salomescript_DATA) + @$(NORMAL_INSTALL) + test -z "$(salomescriptdir)" || $(mkdir_p) "$(DESTDIR)$(salomescriptdir)" + @list='$(dist_salomescript_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(dist_salomescriptDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(salomescriptdir)/$$f'"; \ + $(dist_salomescriptDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(salomescriptdir)/$$f"; \ + done + +uninstall-dist_salomescriptDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_salomescript_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(salomescriptdir)/$$f'"; \ + rm -f "$(DESTDIR)$(salomescriptdir)/$$f"; \ + done +install-dist_sharedpkgpythonDATA: $(dist_sharedpkgpython_DATA) + @$(NORMAL_INSTALL) + test -z "$(sharedpkgpythondir)" || $(mkdir_p) "$(DESTDIR)$(sharedpkgpythondir)" + @list='$(dist_sharedpkgpython_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(dist_sharedpkgpythonDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sharedpkgpythondir)/$$f'"; \ + $(dist_sharedpkgpythonDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sharedpkgpythondir)/$$f"; \ + done + +uninstall-dist_sharedpkgpythonDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_sharedpkgpython_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(sharedpkgpythondir)/$$f'"; \ + rm -f "$(DESTDIR)$(sharedpkgpythondir)/$$f"; \ + done + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + $(mkdir_p) $(distdir)/../../adm_local/unix + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkdir_p) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile $(LTLIBRARIES) $(DATA) +installdirs: + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(salomescriptdir)" "$(DESTDIR)$(sharedpkgpythondir)"; do \ + test -z "$$dir" || $(mkdir_p) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ + mostlyclean-am + +distclean: distclean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-libtool distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: install-dist_salomescriptDATA \ + install-dist_sharedpkgpythonDATA + +install-exec-am: install-libLTLIBRARIES + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-exec-hook + +install-info: install-info-am + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool mostlyclean-local + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-dist_salomescriptDATA \ + uninstall-dist_sharedpkgpythonDATA uninstall-info-am \ + uninstall-libLTLIBRARIES + +.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ + clean-libLTLIBRARIES clean-libtool ctags distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-dist_salomescriptDATA install-dist_sharedpkgpythonDATA \ + install-exec install-exec-am install-exec-hook install-info \ + install-info-am install-libLTLIBRARIES install-man \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + mostlyclean-local pdf pdf-am ps ps-am tags uninstall \ + uninstall-am uninstall-dist_salomescriptDATA \ + uninstall-dist_sharedpkgpythonDATA uninstall-info-am \ + uninstall-libLTLIBRARIES + + +# common rules + +# moc-files generation +%_moc.cxx: %.h + $(MOC) $< -o $@ + +# qm-files generation +%.qm: %.po + $(MSG2QM) $< $@ + +mostlyclean-local: + rm -f @builddir@/*_moc.cxx + rm -f @builddir@/*.qm + +# tests +tests: unittest + +unittest: $(UNIT_TEST_PROG) + @if test "x$(UNIT_TEST_PROG)" != "x"; then \ + $(UNIT_TEST_PROG); \ + fi; + +libVISU_Swig.py: libVISU_Swig_wrap.cxx +libVISU_Swig_wrap.cxx: $(SWIG_DEF) + $(SWIG) $(SWIG_FLAGS) -o $@ $< -LDFLAGS += $(PYTHON_LIBS) -lVisuConvertor -lVisuPipeLine +install-exec-hook: $(libdir)/_libVISU_Swig.so -@CONCLUDE@ +$(libdir)/_libVISU_Swig.so: + ln -sf $(libdir)/libVISU_Swigcmodule.la $@ +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/src/VISU_SWIG/VISU_Example_02.py b/src/VISU_SWIG/VISU_Example_02.py index a65f4e50..cfe0ab77 100644 --- a/src/VISU_SWIG/VISU_Example_02.py +++ b/src/VISU_SWIG/VISU_Example_02.py @@ -27,6 +27,7 @@ import visu_gui import SALOMEDS import VISU import os +import sys medFile = os.getenv("DATA_DIR") + "/MedFiles/fra.med" @@ -244,7 +245,12 @@ study_id = salome.myStudy._get_StudyId() print "OK" file_new = str+'/VISU_005_new.hdf' -command = "mv " + file + " " + file_new + +if not sys.platform == "win32": + command = "mv " + file + " " + file_new +else: + command = "move /Y " + file + " " + file_new + os.system(command) file = file_new @@ -375,5 +381,8 @@ if aRestoreRes != 1 : print "Error" else : print "OK" # Remove the study file -command = "rm -r " + file +if not sys.platform == "win32": + command = "rm -r " + file +else: + command = "del /F " + file os.system(command) diff --git a/src/VISU_SWIG/VISU_shared_modules.py b/src/VISU_SWIG/VISU_shared_modules.py index f802f0ac..e7d7f454 100644 --- a/src/VISU_SWIG/VISU_shared_modules.py +++ b/src/VISU_SWIG/VISU_shared_modules.py @@ -25,7 +25,9 @@ # see salome_shared_modules.py # (avoids incomplete import at run time) -print "============== import VISU =======================" +from launchConfigureParser import verbose + +if verbose(): print "============== import VISU =======================" import VISU diff --git a/src/VISU_SWIG/visu.py b/src/VISU_SWIG/visu.py index 7e7b0e71..6399836b 100644 --- a/src/VISU_SWIG/visu.py +++ b/src/VISU_SWIG/visu.py @@ -465,8 +465,8 @@ def CreatePrsForResult(theVisu, theResult, theView, thePrsTypeList, thePictureDi aFieldName = anAttr.Value() print " ", aFieldName - anAttr = aFieldSObj.FindAttribute("AttributeComment")[1] - anAttr = anAttr._narrow(SALOMEDS.AttributeComment); + anAttr = aFieldSObj.FindAttribute("AttributeString")[1] + anAttr = anAttr._narrow(SALOMEDS.AttributeString); aFieldComment = anAttr.Value() aMap = StrToMap(aFieldComment) @@ -481,8 +481,8 @@ def CreatePrsForResult(theVisu, theResult, theView, thePrsTypeList, thePictureDi aTimeStampName = anAttr.Value() print " ", aTimeStampName - anAttr = aTimeStampSObj.FindAttribute("AttributeComment")[1] - anAttr = anAttr._narrow(SALOMEDS.AttributeComment); + anAttr = aTimeStampSObj.FindAttribute("AttributeString")[1] + anAttr = anAttr._narrow(SALOMEDS.AttributeString); aTimeStampComment = anAttr.Value() aMap = StrToMap(aTimeStampComment) aMeshName = aMap["myMeshName"] @@ -643,6 +643,26 @@ def CreatePrsForResult(theVisu, theResult, theView, thePrsTypeList, thePictureDi aPrsObj.RemoveFromStudy() else : aVISUObjList.append(aPrsObj) + + if HasValue(thePrsTypeList,VISU.TGAUSSPOINTS) : + print " Creating GaussPointsOnField", + aPrsObj = theVisu.GaussPointsOnField(theResult,aMeshName,anEntity,aFieldName,aTimeStampId) + if aPrsObj is None : print "Error" + else : + print ",OK" + theView.DisplayOnly(aPrsObj) + theView.FitAll() + aPictureName = thePictureDir + aMeshNamePic + "_" + anEntityId + "_" + aFieldName + "_" + str(aTimeStampId) + "_TGAUSSPOINTS." + thePictureExt + aPictureName = re.sub("\s+","_", aPictureName) + theView.SavePicture(aPictureName) + if theIsAutoDelete : + aPrsObj.RemoveFromStudy() + pass + else : + aVISUObjList.append(aPrsObj) + pass + pass + pass return aVISUObjList @@ -953,7 +973,7 @@ def try_vectors_parameters(thePattern, theNum): return anObj -def dump_vetctors_parameters(theObject): +def dump_vectors_parameters(theObject): dump_deformedshape_parameters(theObject) @@ -986,6 +1006,96 @@ def dump_isosurfaces_parameters(theObject): dump_scalarmap_parameters(theObject) print "GetNbSurfaces() = "+ str(theObject.GetNbSurfaces()) +# ---------------------------- +# SCALAR MAP ON DEFORMED SHAPE +# ---------------------------- +def dump_scalarmapondeformedshape_parameters(theObject): + dump_scalarmap_parameters(theObject) + print "GetScale() =", theObject.GetScale() + print "GetScalarCMeshName ()=|",theObject.GetScalarCMeshName(),"|" + print "GetScalarCFieldName()=|",theObject.GetScalarCFieldName(),"|" + print "GetScalarEEntity() =",theObject.GetScalarEEntity() + print "GetScalarLIteration()=",theObject.GetScalarLIteration() + pass + +def try_scalarmapondeformedshape_parameters(thePattern): + + if thePattern is None : return None + import copy + import random + + anObj = try_scalarmap_parameters(thePattern) + + # --- SCALING --- + print + anObj.SetScale( anObj.GetScale()/random.random()*random.randint(1,10)) + + # --- Scalar Field --- + # not implemented yet. + + return anObj +# ---------------------- +# PLOT 3D +# ---------------------- +def dump_plot3d_parameters(theObject): + dump_scalarmap_parameters(theObject) + print "GetOrientationType()=",str(theObject.GetOrientationType()) + print "GetRotateX()=",theObject.GetRotateX() + print "GetRotateY()=",theObject.GetRotateY() + print "GetPlanePosition()=",theObject.GetPlanePosition() + print "IsPositionRelative()=",theObject.IsPositionRelative() + print "GetScaleFactor()=",theObject.GetScaleFactor() + print "GetIsContourPrs()=",theObject.GetIsContourPrs() + print "GetNbOfContours()=",theObject.GetNbOfContours() + pass + +def try_plot3d_parameters(thePattern): + if thePattern is None : return None + import random + + anObj = try_scalarmap_parameters(thePattern) + + ORIENT = [VISU.Plot3D.XY, VISU.Plot3D.YZ, VISU.Plot3D.ZX] + + theXAngle = random.random()*random.randint(-180,180) + theYAngle = random.random()*random.randint(-180,180) + + # ORIENTATION and ANGLES + anObj.SetOrientation(ORIENT[random.randint(0,2)],theXAngle,theYAngle) + + # Plane position (revative) + anObj.SetPlanePosition(random.random(),1) + + # SCALE FACTOR + anObj.SetScaleFactor(random.random()*random.randint(-10000,10000)) + + # CONTOUR PRS + anObj.SetContourPrs(random.randint(0,1)) + if anObj.GetIsContourPrs(): + anObj.SetNbOfContours(random.randint(1,999)) + pass + + pass + +# ---------------------- +# Gauss points +# ---------------------- +def dump_gausspoints_parameters(theObject): + + print "\tGetScalarMode() = " + str(anObj.GetScalarMode()) + print "\tGetMin() = " + str(anObj.GetMin()) + " GetMax() = " + str (anObj.GetMax()) + print "\tGetPosX() = ", str(anObj.GetPosX()) + " GetPosY() = ", str(anObj.GetPosY()) + print "\tGetWidth() = ", str ( anObj.GetWidth()) + " GetHeight() = " + str(anObj.GetHeight()) + print "\tGetNbColors() = " + str(anObj.GetNbColors()) + print "\tGetLabels() = " + str(anObj.GetLabels()) + print "\tGetTitle() = " + str(anObj.GetTitle()) + pass + +def try_plot3d_parameters(thePattern): + if thePattern is None : return None + import random + + pass # ---------------------- # TABLES AND CURVES diff --git a/src/VISU_SWIG/visu_apply_properties.py b/src/VISU_SWIG/visu_apply_properties.py new file mode 100644 index 00000000..cdf8b6f6 --- /dev/null +++ b/src/VISU_SWIG/visu_apply_properties.py @@ -0,0 +1,119 @@ +# VISU VISU_SWIG : binding of C++ implementation and Python +# +# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# File : visu_apply_properties.py +# Module : VISU + +import os +import time +import math +import VISU +import SALOMEDS +from visu_gui import * + +aDelay = 0 + +myViewManager = myVisu.GetViewManager(); + +myView = myViewManager.Create3DView(); +myView.SetTitle("The viewer for Animation") +print "myViewManager.Create3DView()" +time.sleep(aDelay) + +medFile = "TimeStamps.med" +myFieldName = "temperature" + +medFile = os.getenv('DATA_DIR') + '/MedFiles/' + medFile +myResult = myVisu.ImportFile(medFile) + +anAnim = myVisu.CreateAnimation(myView); + +aSObj = myStudy.FindObjectIOR(myResult.GetID()) +aSObj = aSObj.FindSubObject(1)[1] +aSObj = aSObj.FindSubObject(3)[1] +aSObj = aSObj.FindSubObject(1)[1] +print "addField 1 : ", anAnim.addField(aSObj) + +print "Generate presentations for ", anAnim.getNbFields(), " fields" +for i in range(0,anAnim.getNbFields()): + anAnim.setPresentationType(i,VISU.TPLOT3D) + anAnim.generatePresentations(i) + +print "Generate frames" +anAnim.generateFrames() + +print "Start Animation" +anAnim.setSpeed(22) +anAnim.startAnimation() +myView.FitAll() + +while 1: + time.sleep(1+aDelay) + if not anAnim.isRunning(): + anAnim.stopAnimation() + break + +anAnim.publishInStudy() +anAnim.saveAnimation() + +for i in range(0,anAnim.getNbFields()): + aPrs = anAnim.getPresentation(i,0) + aPlot3D = aPrs._narrow(VISU.Plot3D) + + if aPlot3D: + aNbLabels = aPlot3D.GetLabels() + aPlot3D.SetLabels(aNbLabels+3) + + aWidth = aPlot3D.GetWidth() + aHeight = aPlot3D.GetHeight() + aPlot3D.SetSize(aWidth+0.07,aHeight+0.07) + + print "Apply properties for all time stamps of ", i, " field." + try: + anAnim.ApplyProperties(i,aPlot3D) + except SALOME.SALOME_Exception, inst: + msg = "SALOME.SALOME_Exception caught, see details:" + msg+="\n******* text:\t" + inst.details.text + msg+="\n******* type:\t" + str(inst.details.type) + msg+="\n******* where:\t" + inst.details.sourceFile + ":" + \ + str(inst.details.lineNumber) + print msg + raise RuntimeError, "There are some errors were occured... For more info see ERRORs above..." + +print "Generate frames" +anAnim.generateFrames() + +print "Start Animation" +anAnim.startAnimation() +myView.FitAll() + +while 1: + time.sleep(1+aDelay) + if not anAnim.isRunning(): + anAnim.stopAnimation() + break + +anAnim.publishInStudy() +anAnim.saveAnimation() + +anAnim.clearFields() +print "The number of fields in animation after clearFields method is", anAnim.getNbFields() + diff --git a/src/VISU_SWIG/visu_apply_properties_successive.py b/src/VISU_SWIG/visu_apply_properties_successive.py new file mode 100644 index 00000000..b1f931a0 --- /dev/null +++ b/src/VISU_SWIG/visu_apply_properties_successive.py @@ -0,0 +1,135 @@ +# VISU VISU_SWIG : binding of C++ implementation and Python +# +# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# File : visu_apply_properties_consecutive.py +# Module : VISU + +import os +import time +import math +import VISU +import SALOMEDS +from visu_gui import * + +aDelay = 0 + +myViewManager = myVisu.GetViewManager(); + +myView = myViewManager.Create3DView(); +myView.SetTitle("The viewer for Animation") +print "myViewManager.Create3DView()" +time.sleep(aDelay) + +medFile = "TimeStamps.med" +myFieldName = "temperature" + +medFile = os.getenv('DATA_DIR') + '/MedFiles/' + medFile +myResult = myVisu.ImportFile(medFile) + +anAnim = myVisu.CreateAnimation(myView); +anAnim.setAnimationMode(VISU.Animation.SUCCCESSIVE) + +aSObj = myStudy.FindObjectIOR(myResult.GetID()) +aSObj = aSObj.FindSubObject(1)[1] +aSObj = aSObj.FindSubObject(3)[1] +aSObj = aSObj.FindSubObject(1)[1] +print "addField 1 : ", anAnim.addField(aSObj) + +medFile1 = "TimeStamps_import22.med" +myFieldName1 = "pression" + +medFile1 = os.getenv('DATA_DIR') + '/MedFiles/' + medFile1 +myResult1 = myVisu.ImportFile(medFile1) + +aSObj1 = myStudy.FindObjectIOR(myResult1.GetID()) +aSObj1 = aSObj1.FindSubObject(1)[1] +aSObj1 = aSObj1.FindSubObject(3)[1] +aSObj1 = aSObj1.FindSubObject(3)[1] +print "addField 2 : ", anAnim.addField(aSObj1) + +print "Generate presentations for ", anAnim.getNbFields(), " fields" +for i in range(0,anAnim.getNbFields()): + anAnim.setPresentationType(i,VISU.TPLOT3D) + anAnim.generatePresentations(i) + +print "Generate frames" +anAnim.generateFrames() + +print "Start Animation" +anAnim.setSpeed(22) +anAnim.startAnimation() +myView.FitAll() + +while 1: + time.sleep(1+aDelay) + if not anAnim.isRunning(): + anAnim.stopAnimation() + break + +anAnim.publishInStudy() +anAnim.saveAnimation() + +if anAnim.getAnimationMode() == VISU.Animation.SUCCCESSIVE: + print "End of succcessive animation for 2 fields with presentation type VISU.Animation.SUCCCESSIVE" + +#for i in range(0,anAnim.getNbFields()): +aPrs = anAnim.getPresentation(0,0) +aPlot3D = aPrs._narrow(VISU.Plot3D) + +if aPlot3D: + aNbLabels = aPlot3D.GetLabels() + aPlot3D.SetLabels(aNbLabels+3) + + aWidth = aPlot3D.GetWidth() + aHeight = aPlot3D.GetHeight() + aPlot3D.SetSize(aWidth+0.07,aHeight+0.07) + + print "Apply properties for all time stamps of all fields." + try: + anAnim.ApplyProperties(0,aPlot3D) + except SALOME.SALOME_Exception, inst: + msg = "SALOME.SALOME_Exception caught, see details:" + msg+="\n******* text:\t" + inst.details.text + msg+="\n******* type:\t" + str(inst.details.type) + msg+="\n******* where:\t" + inst.details.sourceFile + ":" + \ + str(inst.details.lineNumber) + print msg + raise RuntimeError, "There are some errors were occured... For more info see ERRORs above..." + +print "Generate frames" +anAnim.generateFrames() + +print "Start Animation" +anAnim.startAnimation() +myView.FitAll() + +while 1: + time.sleep(1+aDelay) + if not anAnim.isRunning(): + anAnim.stopAnimation() + break + +anAnim.publishInStudy() +anAnim.saveAnimation() + +anAnim.clearFields() +print "The number of fields in animation after clearFields method is", anAnim.getNbFields() + diff --git a/src/VISU_SWIG/visu_succcessive_animation.py b/src/VISU_SWIG/visu_succcessive_animation.py new file mode 100644 index 00000000..08509e01 --- /dev/null +++ b/src/VISU_SWIG/visu_succcessive_animation.py @@ -0,0 +1,95 @@ +# VISU VISU_SWIG : binding of C++ implementation and Python +# +# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# File : visu_view3d.py +# Module : VISU + +import os +import time +import math +import VISU +import SALOMEDS +from visu_gui import * + +aDelay = 0 + +myViewManager = myVisu.GetViewManager(); + +myView = myViewManager.Create3DView(); +myView.SetTitle("The viewer for Animation") +print "myViewManager.Create3DView()" +time.sleep(aDelay) + +medFile = "TimeStamps.med" +myFieldName = "temperature" + +medFile = os.getenv('DATA_DIR') + '/MedFiles/' + medFile +myResult = myVisu.ImportFile(medFile) + +anAnim = myVisu.CreateAnimation(myView); +anAnim.setAnimationMode(VISU.Animation.SUCCCESSIVE); + +aSObj = myStudy.FindObjectIOR(myResult.GetID()) +aSObj = aSObj.FindSubObject(1)[1] +aSObj = aSObj.FindSubObject(3)[1] +aSObj = aSObj.FindSubObject(1)[1] +print "addField 1 : ", anAnim.addField(aSObj) + +medFile1 = "TimeStamps_import22.med" +myFieldName1 = "pression" + +medFile1 = os.getenv('DATA_DIR') + '/MedFiles/' + medFile1 +myResult1 = myVisu.ImportFile(medFile1) + +aSObj1 = myStudy.FindObjectIOR(myResult1.GetID()) +aSObj1 = aSObj1.FindSubObject(1)[1] +aSObj1 = aSObj1.FindSubObject(3)[1] +aSObj1 = aSObj1.FindSubObject(3)[1] +print "addField 2 : ", anAnim.addField(aSObj1) + +print "Generate presentations for ", anAnim.getNbFields(), " fields" +for i in range(0,anAnim.getNbFields()): + anAnim.setPresentationType(i,VISU.TPLOT3D) + anAnim.generatePresentations(i) + +print "Generate frames" +anAnim.generateFrames() + +print "Start Animation" +anAnim.setSpeed(22) +anAnim.startAnimation() +myView.FitAll() + +while 1: + time.sleep(1+aDelay) + if not anAnim.isRunning(): + anAnim.stopAnimation() + break + +anAnim.publishInStudy() +anAnim.saveAnimation() + +if anAnim.getAnimationMode() == VISU.Animation.SUCCCESSIVE: + print "End of succcessive animation for 2 fields with presentation type VISU.Animation.SUCCCESSIVE" + +anAnim.clearFields() +print "The number of fields in animation after clearFields method is", anAnim.getNbFields() + diff --git a/src/VVTK/Makefile.am b/src/VVTK/Makefile.am new file mode 100755 index 00000000..da1bf6c0 --- /dev/null +++ b/src/VVTK/Makefile.am @@ -0,0 +1,91 @@ +# 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.in +# Author : Alexander Solovyov(OCN) +# Module : VVTK +# $Header: + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +lib_LTLIBRARIES= libVVTK.la + +# header files +salomeinclude_HEADERS= \ + VVTK.h \ + VVTK_ViewManager.h \ + VVTK_ViewModel.h \ + VVTK_InteractorStyle.h \ + VVTK_PickingDlg.h \ + VVTK_SegmentationCursorDlg.h \ + VVTK_PrimitiveBox.h \ + VVTK_SizeBox.h \ + VVTK_ViewWindow.h \ + VVTK_MainWindow.h \ + VVTK_ImageWriter.h \ + VVTK_ImageWriterMgr.h \ + VVTK_RecorderDlg.h \ + VVTK_Recorder.h + +dist_libVVTK_la_SOURCES= \ + VVTK_ViewManager.cxx \ + VVTK_ViewModel.cxx \ + VVTK_InteractorStyle.cxx \ + VVTK_PickingDlg.cxx \ + VVTK_SegmentationCursorDlg.cxx \ + VVTK_PrimitiveBox.cxx \ + VVTK_SizeBox.cxx \ + VVTK_ViewWindow.cxx \ + VVTK_Renderer.cxx \ + VVTK_MainWindow.cxx \ + VVTK_ImageWriter.cxx \ + VVTK_ImageWriterMgr.cxx \ + VVTK_RecorderDlg.cxx \ + VVTK_Recorder.cxx + +MOC_FILES= \ + VVTK_ViewWindow_moc.cxx \ + VVTK_ViewModel_moc.cxx \ + VVTK_ViewManager_moc.cxx \ + VVTK_PickingDlg_moc.cxx \ + VVTK_SegmentationCursorDlg_moc.cxx \ + VVTK_RecorderDlg_moc.cxx \ + VVTK_PrimitiveBox_moc.cxx \ + VVTK_SizeBox_moc.cxx \ + VVTK_MainWindow_moc.cxx +nodist_libVVTK_la_SOURCES=$(MOC_FILES) + +libVVTK_la_CPPFLAGS= \ + $(QT_INCLUDES) \ + @CAS_CXXFLAGS@ @CAS_CPPFLAGS@ \ + $(VTK_INCLUDES) \ + $(BOOST_CPPFLAGS) \ + $(KERNEL_CXXFLAGS) \ + $(GUI_CXXFLAGS) \ + $(MED_CXXFLAGS) \ + -I$(srcdir)/../OBJECT -I$(srcdir)/../PIPELINE -I$(srcdir)/../CONVERTOR + +libVVTK_la_LDFLAGS= \ + $(QT_MT_LIBS) \ + $(OCC_LIBS) \ + $(VTK_LIBS) \ + $(KERNEL_LDFLAGS) \ + $(GUI_LDFLAGS) + +libVVTK_la_LIBADD= -lsuit -lCAM -lSalomeObject -lSVTK -lOpUtil diff --git a/src/VVTK/Makefile.in b/src/VVTK/Makefile.in deleted file mode 100755 index 9032e4d0..00000000 --- a/src/VVTK/Makefile.in +++ /dev/null @@ -1,99 +0,0 @@ -# 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.in -# Author : Alexander Solovyov(OCN) -# Module : VVTK -# $Header: - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@ - - -@COMMENCE@ - -# header files -EXPORT_HEADERS = \ - VVTK.h \ - VVTK_ViewManager.h \ - VVTK_ViewModel.h \ - VVTK_InteractorStyle.h \ - VVTK_PickingDlg.h \ - VVTK_SegmentationCursorDlg.h \ - VVTK_PrimitiveBox.h \ - VVTK_SizeBox.h \ - VVTK_ViewWindow.h \ - VVTK_MainWindow.h \ - VVTK_ImageWriter.h \ - VVTK_ImageWriterMgr.h \ - VVTK_RecorderDlg.h \ - VVTK_Recorder.h - -# Libraries targets -LIB = libVVTK.la - -LIB_SRC = \ - VVTK_ViewManager.cxx \ - VVTK_ViewModel.cxx \ - VVTK_InteractorStyle.cxx \ - VVTK_PickingDlg.cxx \ - VVTK_SegmentationCursorDlg.cxx \ - VVTK_PrimitiveBox.cxx \ - VVTK_SizeBox.cxx \ - VVTK_ViewWindow.cxx \ - VVTK_Renderer.cxx \ - VVTK_MainWindow.cxx \ - VVTK_ImageWriter.cxx \ - VVTK_ImageWriterMgr.cxx \ - VVTK_RecorderDlg.cxx \ - VVTK_Recorder.cxx - -LIB_MOC = \ - VVTK_ViewWindow.h \ - VVTK_ViewModel.h \ - VVTK_ViewManager.h \ - VVTK_PickingDlg.h \ - VVTK_SegmentationCursorDlg.h \ - VVTK_RecorderDlg.h \ - VVTK_PrimitiveBox.h \ - VVTK_SizeBox.h \ - VVTK_MainWindow.h - -CPPFLAGS += \ - $(QT_INCLUDES) \ - $(OCC_INCLUDES) \ - $(VTK_INCLUDES) \ - $(BOOST_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) \ - $(GUI_CXXFLAGS) \ - $(MED_CXXFLAGS) - -LDFLAGS += \ - $(QT_MT_LIBS) \ - $(OCC_LIBS) \ - $(VTK_LIBS) \ - $(KERNEL_LDFLAGS) \ - $(GUI_LDFLAGS) - -LIBS+= -lsuit -lCAM -lSalomeObject -lSVTK -lOpUtil - - -@CONCLUDE@ diff --git a/src/VVTK/VVTK.h b/src/VVTK/VVTK.h index 285a0b34..5954601c 100755 --- a/src/VVTK/VVTK.h +++ b/src/VVTK/VVTK.h @@ -18,7 +18,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifdef WNT -#ifdef SVTK_EXPORTS +#ifdef VISU_VVTK_EXPORTS #define VVTK_EXPORT __declspec(dllexport) #else #define VVTK_EXPORT __declspec(dllimport) diff --git a/src/VVTK/VVTK_MainWindow.cxx b/src/VVTK/VVTK_MainWindow.cxx index 4aa149fd..80a3345c 100644 --- a/src/VVTK/VVTK_MainWindow.cxx +++ b/src/VVTK/VVTK_MainWindow.cxx @@ -34,6 +34,7 @@ #include "VISU_GaussPtsAct.h" #include "VISU_Event.h" +#include "SVTK_ViewWindow.h" #include "SVTK_RenderWindowInteractor.h" #include "VVTK_Renderer.h" #include "VVTK_PickingDlg.h" @@ -46,6 +47,7 @@ #include "SUIT_ResourceMgr.h" #include "SUIT_ToolButton.h" #include "SUIT_Accel.h" +#include "SUIT_MessageBox.h" #include "QtxAction.h" #include @@ -114,9 +116,9 @@ VVTK_MainWindow connect( myStopAction, SIGNAL( activated() ), this, SLOT( OnStopRecording() ) ); myRecorder = VVTK_Recorder::New(); - myRecorder->CheckExistAVIMaker(); - if(myRecorder->ErrorStatus()) - myRecordingToolBar->setEnabled(false); + //myRecorder->CheckExistAVIMaker(); + //if(myRecorder->ErrorStatus()) + // myRecordingToolBar->setEnabled(false); } //---------------------------------------------------------------------------- @@ -190,17 +192,23 @@ VVTK_MainWindow //---------------------------------------------------------------------------- void VVTK_MainWindow::OnStartRecording() { - VVTK_RecorderDlg* aRecorderDlg = new VVTK_RecorderDlg( this, myRecorder ); + myRecorder->CheckExistAVIMaker(); + if (myRecorder->ErrorStatus()) { + SUIT_MessageBox::warn1(this, tr("ERROR"), tr("MSG_NO_AVI_MAKER"), tr("&OK")); + } + else { + VVTK_RecorderDlg* aRecorderDlg = new VVTK_RecorderDlg( this, myRecorder ); - if( !aRecorderDlg->exec() ) - return; + if( !aRecorderDlg->exec() ) + return; - myStartAction->setEnabled( false ); - myPlayAction->setEnabled( false ); - myPauseAction->setEnabled( true ); - myStopAction->setEnabled( true ); + myStartAction->setEnabled( false ); + myPlayAction->setEnabled( false ); + myPauseAction->setEnabled( true ); + myStopAction->setEnabled( true ); - myRecorder->Record(); + myRecorder->Record(); + } } //---------------------------------------------------------------------------- @@ -237,9 +245,6 @@ void VVTK_MainWindow::OnStopRecording() } //---------------------------------------------------------------------------- -int -convertAction( const int accelAction ); - void VVTK_MainWindow ::action( const int accelAction ) @@ -247,7 +252,7 @@ VVTK_MainWindow if ( accelAction == SUIT_Accel::ZoomFit ) onFitAll(); else { - int anEvent = convertAction( accelAction ); + int anEvent = SVTK::convertAction( accelAction ); InvokeEvent( anEvent, 0 ); } } diff --git a/src/VVTK/VVTK_PickingDlg.cxx b/src/VVTK/VVTK_PickingDlg.cxx index 3d0a5f4d..e59a57e9 100644 --- a/src/VVTK/VVTK_PickingDlg.cxx +++ b/src/VVTK/VVTK_PickingDlg.cxx @@ -394,9 +394,15 @@ void VVTK_PickingDlg::onClickHelp() if (app) app->onHelpContextModule(app->activeModule() ? app->moduleName(app->activeModule()->moduleName()) : QString(""), aHelpFileName); else { + QString platform; +#ifdef WIN32 + platform = "winapplication"; +#else + platform = "application"; +#endif SUIT_MessageBox::warn1(0, QObject::tr("WRN_WARNING"), QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE"). - arg(app->resourceMgr()->stringValue("ExternalBrowser", "application")).arg(aHelpFileName), + arg(app->resourceMgr()->stringValue("ExternalBrowser", platform)).arg(aHelpFileName), QObject::tr("BUT_OK")); } } diff --git a/src/VVTK/VVTK_PrimitiveBox.cxx b/src/VVTK/VVTK_PrimitiveBox.cxx index fc0aaa75..908d825b 100644 --- a/src/VVTK/VVTK_PrimitiveBox.cxx +++ b/src/VVTK/VVTK_PrimitiveBox.cxx @@ -43,7 +43,7 @@ #include #include -#include +#include using namespace std; diff --git a/src/VVTK/VVTK_PrimitiveBox.h b/src/VVTK/VVTK_PrimitiveBox.h index e5e8c6a3..722d17f2 100644 --- a/src/VVTK/VVTK_PrimitiveBox.h +++ b/src/VVTK/VVTK_PrimitiveBox.h @@ -28,6 +28,8 @@ #ifndef VVTK_PRIMITIVEBOX_H #define VVTK_PRIMITIVEBOX_H +#include "VVTK.h" + #include class QLabel; @@ -38,7 +40,7 @@ class QRadioButton; class QtxDblSpinBox; class QtxIntSpinBox; -class VVTK_PrimitiveBox : public QGroupBox +class VVTK_EXPORT VVTK_PrimitiveBox : public QGroupBox { Q_OBJECT diff --git a/src/VVTK/VVTK_Recorder.cxx b/src/VVTK/VVTK_Recorder.cxx index 873d4af5..f42b7252 100755 --- a/src/VVTK/VVTK_Recorder.cxx +++ b/src/VVTK/VVTK_Recorder.cxx @@ -44,7 +44,10 @@ #include #include +#ifndef WIN32 #include +#endif + #include #include @@ -351,7 +354,7 @@ VVTK_Recorder int aLastFrameIndex = myFrameIndexes.back(); if(aLastFrameIndex < 0){ myFrameIndexes.back() = abs(myFrameIndexes.back()); - double aPauseTime = fabs(aFrameIndex - myFrameIndex - 1) / myNbFPS; + double aPauseTime = fabs((double)(aFrameIndex - myFrameIndex - 1)) / myNbFPS; if(MYDEBUG) cout<<"VVTK_Recorder::DoRecord - aFrameIndex = "<resourceMgr()->stringValue("ExternalBrowser", "application")).arg(aHelpFileName), + arg(app->resourceMgr()->stringValue("ExternalBrowser", platform)).arg(aHelpFileName), QObject::tr("BUT_OK")); } } diff --git a/src/VVTK/VVTK_Renderer.cxx b/src/VVTK/VVTK_Renderer.cxx index 8517d78d..8b56aede 100644 --- a/src/VVTK/VVTK_Renderer.cxx +++ b/src/VVTK/VVTK_Renderer.cxx @@ -249,7 +249,7 @@ VVTK_Renderer1::VVTK_Renderer1(): vtkProperty* aPlaneProperty = aPlanesWidget->GetPlaneProperty(); aPlaneProperty->SetOpacity(aSelectedPlaneProperty->GetOpacity()*1.5); // - myWidgetCtrl->Delete(); + //myWidgetCtrl->Delete(); } VVTK_Renderer1 @@ -334,7 +334,7 @@ VISU_WidgetCtrl* VVTK_Renderer1 ::GetWidgetCtrl() { - return myWidgetCtrl.GetPointer(); + return myWidgetCtrl;//.GetPointer(); } //---------------------------------------------------------------------------- diff --git a/src/VVTK/VVTK_Renderer.h b/src/VVTK/VVTK_Renderer.h index 6cf53326..45c7e949 100644 --- a/src/VVTK/VVTK_Renderer.h +++ b/src/VVTK/VVTK_Renderer.h @@ -125,7 +125,8 @@ class VVTK_EXPORT VVTK_Renderer1 : public VVTK_Renderer void AdjustWidgetCtrl(); - vtkSmartPointer myWidgetCtrl; + VISU_WidgetCtrl* myWidgetCtrl; + //vtkSmartPointer myWidgetCtrl; VISU_OutsideCursorSettings* myOutsideCursorSettings; vtkSmartPointer myTextActor; }; diff --git a/src/VVTK/VVTK_SegmentationCursorDlg.cxx b/src/VVTK/VVTK_SegmentationCursorDlg.cxx index 0c20ac64..55b1fb7a 100644 --- a/src/VVTK/VVTK_SegmentationCursorDlg.cxx +++ b/src/VVTK/VVTK_SegmentationCursorDlg.cxx @@ -80,7 +80,12 @@ namespace VISU { QFileInfo aFileInfo(theImageFileName); QString aFormat = aFileInfo.extension(FALSE); - QString aVTIName = QString("/tmp/") + getenv("USER") + "-" + aFileInfo.baseName(TRUE) + ".vti"; +#ifdef WIN32 + QString aTmpDir = getenv( "TEMP" ); +#else + QString aTmpDir = QString( "/tmp/" ) + getenv("USER"); +#endif + QString aVTIName = aTmpDir + "-" + aFileInfo.baseName(TRUE) + ".vti"; QString aCommand = QString( "VISU_img2vti " ) + aFormat + " " + theImageFileName + " " + aVTIName; if(system( aCommand.latin1() ) == 0) @@ -94,7 +99,11 @@ namespace VISU RemoveFile(const QString& theFileName) { if( !theFileName.isNull() ){ +#ifndef WNT QString aCommand = QString( "rm -fr " ) + theFileName; +#else: + QString aCommand = QString( "del /F " ) + theFileName; +#endif system( aCommand.latin1() ); } } @@ -830,9 +839,15 @@ void VVTK_SegmentationCursorDlg::onClickHelp() if (app) app->onHelpContextModule(app->activeModule() ? app->moduleName(app->activeModule()->moduleName()) : QString(""), aHelpFileName); else { + QString platform; +#ifdef WIN32 + platform = "winapplication"; +#else + platform = "application"; +#endif SUIT_MessageBox::warn1(0, QObject::tr("WRN_WARNING"), QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE"). - arg(app->resourceMgr()->stringValue("ExternalBrowser", "application")).arg(aHelpFileName), + arg(app->resourceMgr()->stringValue("ExternalBrowser", platform)).arg(aHelpFileName), QObject::tr("BUT_OK")); } } diff --git a/src/VVTK/VVTK_SegmentationCursorDlg.h b/src/VVTK/VVTK_SegmentationCursorDlg.h index 082608ea..50d17609 100644 --- a/src/VVTK/VVTK_SegmentationCursorDlg.h +++ b/src/VVTK/VVTK_SegmentationCursorDlg.h @@ -24,6 +24,8 @@ #ifndef VVTK_SEGMENTATIONCURSORDLG_H #define VVTK_SEGMENTATIONCURSORDLG_H +#include "VVTK.h" + #include #include @@ -59,7 +61,7 @@ namespace VISU { typedef vtkSmartPointer TTextureValue; - TTextureValue + VVTK_EXPORT TTextureValue GetTexture(const QString& theMainTexture, const QString& theAlphaTexture); } diff --git a/src/VVTK/VVTK_SizeBox.h b/src/VVTK/VVTK_SizeBox.h index 1979ef7b..06e3971c 100644 --- a/src/VVTK/VVTK_SizeBox.h +++ b/src/VVTK/VVTK_SizeBox.h @@ -28,6 +28,8 @@ #ifndef VVTK_SIZEBOX_H #define VVTK_SIZEBOX_H +#include "VVTK.h" + #include class QLabel; @@ -39,7 +41,7 @@ class QGroupBox; class QtxDblSpinBox; class QtxIntSpinBox; -class VVTK_SizeBox : public QVBox +class VVTK_EXPORT VVTK_SizeBox : public QVBox { Q_OBJECT

The structure of MED - object has a tree-like form. It contains three main folders: Families, Groups, Fields.