From 69cc91949a21a3383efd5e278f172aa4d9480bc8 Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 17 Feb 2009 09:05:36 +0000 Subject: [PATCH] Merge from BR_V5_DEV 17Feb09 --- LICENCE | 504 ------------------ Makefile.am | 21 +- SIERPINSKY_version.h.in | 33 +- adm_local/Makefile.am | 38 +- adm_local/unix/Makefile.am | 37 +- adm_local/unix/config_files/Makefile.am | 40 +- .../unix/config_files/check_SIERPINSKY.m4 | 18 + adm_local/unix/config_files/check_gd.m4 | 34 +- adm_local/unix/make_common_starter.am | 65 ++- bin/Makefile.am | 52 +- build_configure | 20 +- .../SIERPINSKY_icons.po => clean_configure | 29 +- configure.ac | 36 +- idl/Makefile.am | 51 +- idl/Sierpinsky.idl | 21 +- resources/Makefile.am | 11 +- resources/SIERPINSKY.png | Bin 447 -> 4021 bytes resources/SIERPINSKYCatalog.xml.in | 20 + resources/SalomeApp.xml | 20 + resources/graph1.xml | 20 + resources/graph2.xml | 20 + src/Makefile.am | 37 +- src/Sierpinsky/Makefile.am | 21 +- src/Sierpinsky/SIERPINSKY_Gen_i.cxx | 21 +- src/Sierpinsky/SIERPINSKY_Gen_i.hxx | 21 +- src/SierpinskyGUI/Makefile.am | 25 +- src/SierpinskyGUI/SIERPINSKY_icons.ts | 30 ++ src/SierpinskyGUI/SIERPINSKY_msg_en.po | 120 ----- src/SierpinskyGUI/SIERPINSKY_msg_en.ts | 152 ++++++ src/SierpinskyGUI/SierpinskyGUI.cxx | 25 +- src/SierpinskyGUI/SierpinskyGUI.h | 21 +- src/SierpinskyGUI/SierpinskyGUI_RunDlg.cxx | 207 +++---- src/SierpinskyGUI/SierpinskyGUI_RunDlg.h | 95 ++-- 33 files changed, 857 insertions(+), 1008 deletions(-) delete mode 100644 LICENCE rename src/SierpinskyGUI/SIERPINSKY_icons.po => clean_configure (54%) mode change 100644 => 100755 create mode 100644 src/SierpinskyGUI/SIERPINSKY_icons.ts delete mode 100644 src/SierpinskyGUI/SIERPINSKY_msg_en.po create mode 100644 src/SierpinskyGUI/SIERPINSKY_msg_en.ts diff --git a/LICENCE b/LICENCE deleted file mode 100644 index b1e3f5a..0000000 --- a/LICENCE +++ /dev/null @@ -1,504 +0,0 @@ - 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/Makefile.am b/Makefile.am index e4803d7..3047d0e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2005 CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D +# Copyright (C) 2005-2008 OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -14,29 +14,32 @@ # 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # -* Makefile *- -# # Author : Patrick GOLDBRONN (CEA) # Date : 28/06/2001 # Modified by : Alexander BORODIN (OCN) - autotools usage # $Header: # - include $(top_srcdir)/adm_local/unix/make_common_starter.am +ACLOCAL_AMFLAGS = -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 \ + -I ${VISU_ROOT_DIR}/adm_local/unix/config_files \ + -I ${RANDOMIZER_ROOT_DIR}/adm_local/unix/config_files SUBDIRS = idl adm_local resources src bin -DIST_SUBDIRS = idl adm_local resources src bin - DISTCLEANFILES = a.out aclocal.m4 configure -EXTRA_DIST+= \ +salomeinclude_DATA = SIERPINSKY_version.h + +EXTRA_DIST += \ build_configure \ - clean_configure \ - LICENCE + clean_configure dist-hook: rm -rf `find $(distdir) -name CVS` diff --git a/SIERPINSKY_version.h.in b/SIERPINSKY_version.h.in index c3c023f..4a439e2 100644 --- a/SIERPINSKY_version.h.in +++ b/SIERPINSKY_version.h.in @@ -1,26 +1,25 @@ -// 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. +// Copyright (C) 2005-2008 OPEN CASCADE // -// 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 +// 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. // -// See http://www.salome-platform.org/ +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : SIERPINSKY_version.h // Author : Vadim SANDLER // Module : SALOME - +// #if !defined(__SIERPINSKY_VERSION_H__) #define __SIERPINSKY_VERSION_H__ diff --git a/adm_local/Makefile.am b/adm_local/Makefile.am index 7ae83a6..9d4ddd6 100644 --- a/adm_local/Makefile.am +++ b/adm_local/Makefile.am @@ -1,19 +1,21 @@ -# 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 -# +# Copyright (C) 2005-2008 OPEN CASCADE +# +# 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 diff --git a/adm_local/unix/Makefile.am b/adm_local/unix/Makefile.am index facd4e6..16d9fdd 100644 --- a/adm_local/unix/Makefile.am +++ b/adm_local/unix/Makefile.am @@ -1,22 +1,21 @@ -# 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 -# - +# Copyright (C) 2005-2008 OPEN CASCADE +# +# 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 index 3af757f..a90ae88 100644 --- a/adm_local/unix/config_files/Makefile.am +++ b/adm_local/unix/config_files/Makefile.am @@ -1,23 +1,23 @@ -# 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 -# +# Copyright (C) 2005-2008 OPEN CASCADE +# +# 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_SIERPINSKY.m4 \ +dist_admlocalm4_DATA = \ + check_SIERPINSKY.m4 \ check_gd.m4 diff --git a/adm_local/unix/config_files/check_SIERPINSKY.m4 b/adm_local/unix/config_files/check_SIERPINSKY.m4 index 34cbc06..1428bf2 100755 --- a/adm_local/unix/config_files/check_SIERPINSKY.m4 +++ b/adm_local/unix/config_files/check_SIERPINSKY.m4 @@ -1,3 +1,21 @@ +dnl Copyright (C) 2005-2008 OPEN CASCADE +dnl +dnl This library is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU Lesser General Public +dnl License as published by the Free Software Foundation; either +dnl version 2.1 of the License. +dnl +dnl This library is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl Lesser General Public License for more details. +dnl +dnl You should have received a copy of the GNU Lesser General Public +dnl License along with this library; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +dnl +dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +dnl # Check availability of SIERPINSKY binary distribution # # Author : Marc Tajchman (CEA, 2002) diff --git a/adm_local/unix/config_files/check_gd.m4 b/adm_local/unix/config_files/check_gd.m4 index 7115c74..36b03b7 100644 --- a/adm_local/unix/config_files/check_gd.m4 +++ b/adm_local/unix/config_files/check_gd.m4 @@ -1,25 +1,21 @@ -dnl Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library; if not, write to the Free Software -dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -dnl -dnl See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +dnl Copyright (C) 2005-2008 OPEN CASCADE dnl +dnl This library is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU Lesser General Public +dnl License as published by the Free Software Foundation; either +dnl version 2.1 of the License. dnl +dnl This library is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl Lesser General Public License for more details. +dnl +dnl You should have received a copy of the GNU Lesser General Public +dnl License along with this library; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +dnl +dnl See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com dnl - AC_DEFUN([CHECK_GDLIB],[ AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_PROG_CPP])dnl diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am index 5339413..d1939bc 100644 --- a/adm_local/unix/make_common_starter.am +++ b/adm_local/unix/make_common_starter.am @@ -1,49 +1,80 @@ +# Copyright (C) 2005-2008 OPEN CASCADE +# +# 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 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@ +# +salomeincludedir = $(includedir)/salome +libdir = $(prefix)/lib@LIB_LOCATION_SUFFIX@/salome +bindir = $(prefix)/bin/salome salomescriptdir = $(bindir) +salomepythondir = $(pythondir)/salome +salomepyexecdir = $(pyexecdir)/salome # Directory for installing idl files -salomeidldir = $(prefix)/idl/@PACKAGE@ +salomeidldir = $(prefix)/idl/salome # Directory for installing resource files -salomeresdir = $(prefix)/share/@PACKAGE@/resources/@MODULE_NAME@ +salomeresdir = $(prefix)/share/salome/resources/@MODULE_NAME@ # Directories for installing admin files -admlocaldir = $(prefix)/adm_local -admlocalunixdir = $(admlocaldir)/unix -admlocalm4dir = $(admlocaldir)/unix/config_files +admlocaldir = $(prefix)/adm_local +admlocalunixdir = $(admlocaldir)/unix +admlocalm4dir = $(admlocaldir)/unix/config_files # Shared modules installation directory -sharedpkgpythondir =$(pkgpythondir)/shared_modules +sharedpkgpythondir = $(salomepythondir)/shared_modules # Documentation directory -docdir = $(datadir)/doc/@PACKAGE@ +docdir = $(datadir)/doc/salome # common rules -# moc-files generation +# meta object implementation files generation (moc) %_moc.cxx: %.h $(MOC) $< -o $@ -# qm-files generation -%.qm: %.po - $(MSG2QM) $< $@ +# translation (*.qm) files generation (lrelease) +%.qm: %.ts + $(LRELEASE) $< -qm $@ + +# resource files generation (qrcc) +qrc_%.cxx: %.qrc + $(QRCC) $< -o $@ -name $(*F) + +# qt forms files generation (uic) +ui_%.h: %.ui + $(UIC) -o $@ $< -EXTRA_DIST=$(MOC_FILES:%_moc.cxx=%.h) $(nodist_salomeres_DATA:%.qm=%.po) +# extra distributed files +EXTRA_DIST = $(MOC_FILES:%_moc.cxx=%.h) $(QRC_FILES:qrc_%.cxx=%.qrc) \ + $(UIC_FILES:ui_%.h=%.ui) $(nodist_salomeres_DATA:%.qm=%.ts) +# customize clean operation mostlyclean-local: rm -f @builddir@/*_moc.cxx rm -f @builddir@/*.qm + rm -f @builddir@/ui_*.h + rm -f @builddir@/qrc_*.cxx # tests tests: unittest diff --git a/bin/Makefile.am b/bin/Makefile.am index ea73523..095aea0 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,37 +1,29 @@ -# 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 -# -* Makefile *- +# Copyright (C) 2005-2008 OPEN CASCADE +# +# 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 : # Module : LIGHT # - include $(top_srcdir)/adm_local/unix/make_common_starter.am -# -# =============================================================== -# Files to be installed -# =============================================================== -# - -# These files are data, module or lib files - -nodist_salomescript_DATA= \ - VERSION +# non-distributed files +nodist_salomescript_DATA = VERSION -EXTRA_DIST+= VERSION.in +# distributed files +dist_salomescript_SCRIPTS = diff --git a/build_configure b/build_configure index b659522..bb256d0 100755 --- a/build_configure +++ b/build_configure @@ -1,14 +1,28 @@ #!/bin/bash - +# Copyright (C) 2005-2008 OPEN CASCADE +# +# 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 # # Tool for updating list of .in file for the SALOME project # and regenerating configure script -# # File : build_configure # Author : Marc Tajchman - CEA # Created : 10/10/2002 # - ORIG_DIR=`pwd` CONF_DIR=`echo $0 | sed -e "s,[^/]*$,,;s,/$,,;s,^$,.,"` diff --git a/src/SierpinskyGUI/SIERPINSKY_icons.po b/clean_configure old mode 100644 new mode 100755 similarity index 54% rename from src/SierpinskyGUI/SIERPINSKY_icons.po rename to clean_configure index 3b19f50..5e49ef4 --- a/src/SierpinskyGUI/SIERPINSKY_icons.po +++ b/clean_configure @@ -1,4 +1,5 @@ -# Copyright (C) 2005 OPEN CASCADE +#!/bin/sh +# Copyright (C) 2005-2008 OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -14,18 +15,18 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# See http://www.salome-platform.org/ +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# This is a Qt message file in .po format. Each msgid starts with -# a scope. This scope should *NOT* be translated - eg. "Foo::Bar" -# would be translated to "Pub", not "Foo::Pub". -msgid "" -msgstr "" -"Project-Id-Version: PROJECT VERSION\n" -"POT-Creation-Date: 2002-05-28 10:57:43 AM CEST\n" -"PO-Revision-Date: YYYY-MM-DD\n" -"Last-Translator: FULLNAME \n" -"Content-Type: text/plain; charset=iso-8859-1\n" +rm -rf autom4te.cache aclocal.m4 configure make_config +find . -name "*~" -print -exec rm {} \; +find . -name "*.pyc" -print -exec rm {} \; +#exit +# ==================== ON SORT AVANT -msgid "ICON_RUN_DLG" -msgstr "go.png" +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 index be5ecf1..3209e31 100644 --- a/configure.ac +++ b/configure.ac @@ -1,21 +1,32 @@ +# Copyright (C) 2005-2008 OPEN CASCADE # -# PLEASE DO NOT MODIFY configure.in FILE +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. # -# ALL CHANGES WILL BE DISCARDED BY THE NEXT -# build_configure COMMAND +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. # -# CHANGES MUST BE MADE IN configure.in.base FILE +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # +# 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([Salome2 Project SIERPINSKY module],[4.1.1], [webmaster.salome@opencascade.com], [salome]) +AC_INIT([Salome2 Project SIERPINSKY module],[5.1.0], [webmaster.salome@opencascade.com], [SalomeSIERPINSKY]) AC_CONFIG_AUX_DIR(salome_adm/unix/config_files) AC_CANONICAL_HOST AC_CANONICAL_TARGET @@ -217,14 +228,6 @@ echo CHECK_QT -echo -echo --------------------------------------------- -echo testing msg2qm -echo --------------------------------------------- -echo - -CHECK_MSG2QM - echo echo --------------------------------------------- echo testing VTK @@ -349,7 +352,7 @@ echo echo Configure variables="cc_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok -OpenGL_ok qt_ok msg2qm_ok vtk_ok hdf5_ok med2_ok omniORB_ok occ_ok doxygen_ok graphviz_ok gd_ok Kernel_ok Med_ok Visu_ok Randomizer_ok" +OpenGL_ok qt_ok vtk_ok hdf5_ok med2_ok omniORB_ok occ_ok doxygen_ok graphviz_ok gd_ok Kernel_ok Med_ok Visu_ok Randomizer_ok" for var in $variables do @@ -395,5 +398,6 @@ AC_OUTPUT([ \ ./resources/Makefile \ ./resources/SIERPINSKYCatalog.xml \ ./idl/Makefile \ + ./SIERPINSKY_version.h \ Makefile \ ]) diff --git a/idl/Makefile.am b/idl/Makefile.am index 0fd23f1..584f6e8 100644 --- a/idl/Makefile.am +++ b/idl/Makefile.am @@ -1,37 +1,32 @@ -# 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 -# - +# Copyright (C) 2005-2008 OPEN CASCADE +# +# 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 = Sierpinsky.idl -EXTRA_DIST+= $(BASEIDL_FILES) - # This variable defines the files to be installed -salomeidl_DATA = $(BASEIDL_FILES) +dist_salomeidl_DATA = $(BASEIDL_FILES) # GUI idl common library lib_LTLIBRARIES = libSalomeIDLSIERPINSKY.la @@ -43,9 +38,9 @@ nodist_libSalomeIDLSIERPINSKY_la_SOURCES = \ SierpinskyDynSK.cc: SierpinskySK.cc # header files must be exported: other modules have to use this library -nodist_salomeinclude_HEADERS= $(BASEIDL_FILES:%.idl=%.hh) +nodist_salomeinclude_HEADERS = $(BASEIDL_FILES:%.idl=%.hh) -libSalomeIDLSIERPINSKY_la_CPPFLAGS =\ +libSalomeIDLSIERPINSKY_la_CPPFLAGS = \ $(KERNEL_CXXFLAGS) \ -I$(top_builddir)/salome_adm/unix \ -I$(top_builddir)/idl \ @@ -83,14 +78,14 @@ SUFFIXES = .idl .hh SK.cc $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< install-exec-local: $(BASEIDL_FILES:%=$(top_srcdir)/idl/%) - $(INSTALL) -d $(pkgpythondir) + $(INSTALL) -d $(DESTDIR)$(salomepythondir) ls $^ | while read file; do \ - $(OMNIORB_IDL) $(IDLPYFLAGS) -C$(pkgpythondir) $$file ; \ + $(OMNIORB_IDL) $(IDLPYFLAGS) -C$(DESTDIR)$(salomepythondir) $$file ; \ done # uninstall-local removes too much, but it works in distcheck uninstall-local: - rm -rf $(pkgpythondir)/* + rm -rf $(DESTDIR)$(salomepythondir)/* mostlyclean-local: -rm -f *.hh *.cc .depidl diff --git a/idl/Sierpinsky.idl b/idl/Sierpinsky.idl index a9816f2..792d9e9 100644 --- a/idl/Sierpinsky.idl +++ b/idl/Sierpinsky.idl @@ -1,10 +1,27 @@ +// Copyright (C) 2005-2008 OPEN CASCADE +// +// 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 : Sierpinsky.idl // Author : Vadim SANDLER (OCN) // Created : 13/07/05 -// Copyright (C) 2005 Open CASCADE /////////////////////////////////////////////////////////// - +// #ifndef __SIERPINSKY_IDL #define __SIERPINSKY_IDL diff --git a/resources/Makefile.am b/resources/Makefile.am index e1882b1..057e35f 100644 --- a/resources/Makefile.am +++ b/resources/Makefile.am @@ -1,5 +1,4 @@ -# Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2005-2008 OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -15,14 +14,13 @@ # 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # -* Makefile *- -# # Author : # Date : 28/06/2001 # Modified by : Alexander BORODIN (OCN) - autotools usage - +# include $(top_srcdir)/adm_local/unix/make_common_starter.am dist_salomeres_DATA = \ @@ -32,4 +30,5 @@ dist_salomeres_DATA = \ graph2.xml \ SalomeApp.xml -nodist_salomeres_DATA = SIERPINSKYCatalog.xml +# VSR: little trick to avoid putting if SIERPINSKYCatalog.xml to the distribution archive +nodist_salomeres_SCRIPTS = SIERPINSKYCatalog.xml diff --git a/resources/SIERPINSKY.png b/resources/SIERPINSKY.png index a830145ce4821332cf68836d1f27e6fa140bde50..f726756a99bc69e194d7e7454b5aef21a5ce6877 100755 GIT binary patch literal 4021 zcmW+(c|6qX_y5ddY@->(%qXE!B3Vn>X3#BCnWT*68av6gBylaXkf9LQmNql`R#&B{ z+^A%RQMN3V%0Bi~GNZA~Ff*Uu^!wvH=k+|V=kuc>J)MijE2Z0BUZo z2R-H9{I@9~GU4<`Q=XVV?l)kX6ZvO*UdS=D%UlBdvVt3DL??;x58{#!$~}-!(s(}f~SaxITOy9owvqRX%uqtPzz$wgjET6)!zev zqd$d=FAwvPy%p53WWn4vZaV8QR@M}b4u;*`j5tGrJN=ZZs!8z#Nr68~e*Kh?^Txym zWTy!8C&amC$O2|sc=D1+lbh>J#s-iZdJ6-1FVR&8HF6ATBy5hDR-XHz5kM2X^6B+_ zig{y-uyjJ)Wrog%g=FSR&0w2^c*GcayjCN->>#TURC&XzOnVv((Wg~u!yoCw&z2%cc}+pdk|j-UFO!Frf#4fXyC|D}>6;!*xY~;hcyBPRV`&zGEA&NB5wW3+jC_{|;$*r|YrmXoRu%Zhxfp>XsYx4G~6eju4GZV@brcLr9mBSaFhDGW92j({wn zkkB+9PLwROh&yL)Wp44zQnJQv5iHA07#W|h?5>*1s&rE>s~mLg?)xo*{659I;s`TG z%QV@N4(X14(0Fhv>Zm1%8yIN7k_Jdv?6n4LxzB!j^dSbG3Rx9fL{cTS!1@34M`w7IFM}4RR}|wzPCMm{^DjE-XX` zjZbJn7-o9h0!2RVNb1hJTMZ2%=YAvIHbRU6?$rj#4{>;(vw+RL>Ei+a`v2t$TQ=1uu$vHJL>YvCN7^( z4*F{gCDPT>MHd>irxAAQ!`7BYWOa2klH8PF+4yQH&!8st$UZMqd{IErWjTYbT`-#% z9^|UHm$rAIID&}_fSNpF{u^u25K&TdkzuQ7z0~A1Y;RWf*s-L$v$I9O*W1QjFJRN3 ztX`d%xtonN)O83WI%E(%XahG}cNqRZVhs<-?f%NdEkHj0y0y;72Cykzf^R|_26>fi zx&6!YPcFr?dXaPNp`^KJ?w439Es8=nY49fWX8zicLs?Y!(&7}WztgnuBLo^u%SE(x z5a#`O6v~ic7>7LwGcvnC1f^H7-nNOsW79k4R`Cq{(dgQ`Zou?Z6D?{QrPpND2ny8Z z=ru?@H7#7U_|v4%1&#*pUvLbM^m}fBD}z5@u(h1}bfcG$O$`?b)XP0&>CiGF4@)Ws>5o8Z_O*$1 z>S@vwWBBq#eNWHOH(!5~zW*~`Jd_XG#JmpMPZi_1r9V7y75EoDf@NU>gU!ZU0mU{j z6v`&Es!BgIBLkUv`IcJdc5{qezwjl&PKF|?0v7T^i@Uzc#8M<8wdi1Ti`s-Z%eaIm z=1R)umhE${7U#9Udcb{!@Ekqp;x^(KeYP^TVGRjDj7)EArv+kF@U0|^MDSHZPN{BG zrPpCeN&kKzHx%3oj#e$3!k8Bcg7eh4sQD9h3G&`pAf+xdmEH>+vJ>oWOeu z7j72%=UEo0KO{ygY{mJo&U4GMVDDKI_p9cw&OPnXG+bEudhfkFcaZUM9{GyMp<1$Ok_Kr zF?qF*BvLWO673;q!oeB(CeG*CTyGx7uvd7MiEE<5wSJ7BS23v%y1T)s)sfI8Eg*VG z4n>JueA(>Eb9z}>$+SnO!WkaqL2SUEDes7b_!k?acHlh&I6l9th-UoW1ytY%ai?H< zm$?u+yiPvu9~5_~YXtG%Mc9M+P5l$BzEqXgURLF*_Wd#`G%T|<;PK%3J0)3JTBH;U z%f@uoYRs4Q5EH$`qkKj!>lt4cpYkAu4g(&u>B$ zrw_td<9j0;H^<_VUo=5dNmTlbohBC_sJ1pGJIm;Fv-((x%g6X;a4a`RPyfVNFHtJk z=cS5~t&`uLp$N}-RuYNqGCg~0FHG-?H)0R#MRoN%&IYs{m*1v`Rk7Q-eOp+#Q}iQw z`E2=4_e)xkP!*2ydjn{;#!ReCngX5YH37cAlu2i0L1^vJu<@^7gU83GAqW_Tdo?>2 z_j1~#C1x;0=_mz zca9*^Ywr>EPmb7P4b>GLW8OBX<@V;>fp!{Yc+4}&3p;8lf|ERGj{39L2}1C%!2DF{ zXA_29OBzzBxjDbmVK;8B{W`k8lC?Ge3G19&YdxQh+ds&*a-DOx^g5)l&nefPv};MH z^ z{70&;Pb;teZ&}{KsKmrmQcyMV3je&!23glMy@ncRW@g}JGkM6^F)J&3J1{4xbJiiz z)zm%C6S{H>pJB{7?BQr(kI+_Oj%9wgC}}pG-hi%xr*`$Wsm)7(+&r^tWGscQ>b~#J z6;vZhK}mndQq0!s4#7rJe7a*?MRR>^5X#yo&c&+7BT`+g(%%&v92_KC6yj^2%aoTy zct#t~=bvJY1|;>@ylOH_)oXj^k^g$L_gE%>{XFmdAk3$)I}9FvgU?wT|Kz9dn7}ls zKYQ*#znT$FNB*qBVY?byCF;kHCg5#LM4-ADHE^cm$2D8^>l=cOF>JE0{22-CNM|rP zlM6q-;5jM_7;~N^D7o&3t&8-E`(C2^!PC`t7v^MK)cE_TzCbgh3+yy$mq2g80D65G zwRaW&^aYy=Mu?P+k2{$T*W+ml9cBz~j?T-vhnNEwoMwd(INDy54c~{^0_&PpEEvmt zb(y8C5_5%*oaf}N7pvXT_P@Sr`!?i_)f!h*Toe0HUH9U+v_qpQX z)TR?C7@}J!?KC_Y{yc8X2 z8yfI@c04be&}N?|shEIN`H3fC+!}r?mLg5=5=@M`GqO=+OMl2cvG8hz#m!ful8LRg zu=7(Z?u?|^0LaefW#Pu43$+_Pt2T2HAi%%bWojP6!?vD+C}5|j5i{Ess0F3Gzh zkt%b_2OpX%!JU#vt(uPdPOYyxHNWjVbkIN>a^m*a%d>V&&iDP;GTj(z`2N*BzY?r6 z4es_O9nE3D5$_X9NZ!?xJ!h^Sdh)#TN#w$=k`~3)Pnmx(b;%k`!%Ge#EeZ7RfO70a zu3N!B>*s^E#5AMUQ{x96ItNg2|7pXP_xGjK;?55*A9U*b$e>DIDD#DvDO0>#KfYie z|M{vzFg}*furVWBNcd>f~Nw7Yx|BrGwvCs3sl$k7XgXY{{mrON#m0z=0qW8?DBSmc`!+SyFM~v1ii_3e>M*gYaSx(<+CTEx7?mi&oSA1T`);;! zTBK@pXLX;?h?=ekAQ#6dj!??ncpax#)e;P{A!HIG=zC^lKDktpU6(RxMtTD423jNqH zIQl7<;-V{oL=AY~i41XmCcqE*DjupUG*m1M-t+DwTRz_^xJ~KR4GMc*-yeFmS8HR+ ziWvbgSVwE0+U;6?25r0L%{Dp5zYZWZeRqUxZru_HD47F4J1*?0-*#0?K4JrIe;hyf J*f}uc{{Z3uitGRY delta 400 zcmV;B0dM}bAHM^TBo78+OGiWi{{a60|De66laV19e+P6)O+^RQ2Mq}U9lN1L<^TWz zOi4sRRCt{2ncES9Knz8rV*_+#0rp@Eeo%-l(1Qig8UC1A-kaBD946;`$tJl8y8)sk zNpLjnK(Eh$+~NYW+_c5<=bh;Nfb4Ze7(Eh<0^{s6AQe)91#8)704k&c6ZW#t1gj7i zfW&zwe=vwFAtKUcp9xYS6)W*WUceq?8t0AZ6hO_n4!d#%fOR}U z+0gb93OIy_$ekEj07qq?Q6$IL#9kEw5>sy$cGQ>{WcTFr0BX(+w7b0_YD^5ad(slp zo{ZA<0J|rg2j&~q-t|_;w01YvPbJZQn3b+a*(GEXbH>2ekP<*`Bh-|owL4p1q?0 + diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml index 93e0a47..d8b9560 100644 --- a/resources/SalomeApp.xml +++ b/resources/SalomeApp.xml @@ -1,3 +1,23 @@ +
diff --git a/resources/graph1.xml b/resources/graph1.xml index 16de742..765ff22 100644 --- a/resources/graph1.xml +++ b/resources/graph1.xml @@ -1,4 +1,24 @@ + diff --git a/resources/graph2.xml b/resources/graph2.xml index 13dc9f9..b646857 100644 --- a/resources/graph2.xml +++ b/resources/graph2.xml @@ -1,4 +1,24 @@ + diff --git a/src/Makefile.am b/src/Makefile.am index 9854db5..9165b44 100755 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,30 +1,27 @@ -# Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# Copyright (C) 2005-2008 OPEN CASCADE # +# 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 : Patrick GOLDBRONN (CEA) # Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : SuperVisionTest +# Module : SIERPINSKY # $Header: - +# include $(top_srcdir)/adm_local/unix/make_common_starter.am SUBDIRS = Sierpinsky SierpinskyGUI diff --git a/src/Sierpinsky/Makefile.am b/src/Sierpinsky/Makefile.am index ab95302..bfd61a5 100644 --- a/src/Sierpinsky/Makefile.am +++ b/src/Sierpinsky/Makefile.am @@ -1,11 +1,28 @@ +# Copyright (C) 2005-2008 OPEN CASCADE +# +# 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 : Vadim SANDLER (OCN) # Modified by : Alexander BORODIN (OCN) - autotools usage # Created : 13/07/05 -# Copyright (C) 2005 Open CASCADE ############################################################### - +# include $(top_srcdir)/adm_local/unix/make_common_starter.am # header files diff --git a/src/Sierpinsky/SIERPINSKY_Gen_i.cxx b/src/Sierpinsky/SIERPINSKY_Gen_i.cxx index 974d76c..8372c0d 100644 --- a/src/Sierpinsky/SIERPINSKY_Gen_i.cxx +++ b/src/Sierpinsky/SIERPINSKY_Gen_i.cxx @@ -1,10 +1,27 @@ +// Copyright (C) 2005-2008 OPEN CASCADE +// +// 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 : SIERPINSKY_Gen_i.cxx // Author : Vadim SANDLER (OCN) // Created : 13/07/05 -// Copyright (C) 2005 Open CASCADE /////////////////////////////////////////////////////////// - +// #include "SIERPINSKY_Gen_i.hxx" #include #include diff --git a/src/Sierpinsky/SIERPINSKY_Gen_i.hxx b/src/Sierpinsky/SIERPINSKY_Gen_i.hxx index 5f1df19..e82fa80 100644 --- a/src/Sierpinsky/SIERPINSKY_Gen_i.hxx +++ b/src/Sierpinsky/SIERPINSKY_Gen_i.hxx @@ -1,10 +1,27 @@ +// Copyright (C) 2005-2008 OPEN CASCADE +// +// 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 : SIERPINSKY_Gen_i.hxx // Author : Vadim SANDLER (OCN) // Created : 13/07/05 -// Copyright (C) 2005 Open CASCADE /////////////////////////////////////////////////////////// - +// #ifndef __SIERPINSKY_GEN_I_HXX #define __SIERPINSKY_GEN_I_HXX diff --git a/src/SierpinskyGUI/Makefile.am b/src/SierpinskyGUI/Makefile.am index 56cc6e1..da48498 100644 --- a/src/SierpinskyGUI/Makefile.am +++ b/src/SierpinskyGUI/Makefile.am @@ -1,11 +1,28 @@ +# Copyright (C) 2005-2008 OPEN CASCADE +# +# 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 : Vadim SANDLER (OCN) # Modified by : Alexander BORODIN (OCN) - autotools usage # Created : 13/07/05 -# Copyright (C) 2005 Open CASCADE ############################################################### - +# include $(top_srcdir)/adm_local/unix/make_common_starter.am # header files @@ -13,7 +30,9 @@ salomeinclude_HEADERS = SierpinskyGUI.h \ SierpinskyGUI_RunDlg.h -PO_FILES = SIERPINSKY_msg_en.po SIERPINSKY_icons.po +nodist_salomeres_DATA= \ + SIERPINSKY_icons.qm \ + SIERPINSKY_msg_en.qm # Libraries targets lib_LTLIBRARIES = libSIERPINSKY.la diff --git a/src/SierpinskyGUI/SIERPINSKY_icons.ts b/src/SierpinskyGUI/SIERPINSKY_icons.ts new file mode 100644 index 0000000..f81af53 --- /dev/null +++ b/src/SierpinskyGUI/SIERPINSKY_icons.ts @@ -0,0 +1,30 @@ + + + + + @default + + ICON_RUN_DLG + go.png + + + diff --git a/src/SierpinskyGUI/SIERPINSKY_msg_en.po b/src/SierpinskyGUI/SIERPINSKY_msg_en.po deleted file mode 100644 index aa604a4..0000000 --- a/src/SierpinskyGUI/SIERPINSKY_msg_en.po +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright (C) 2005 OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ -# -# This is a Qt message file in .po format. Each msgid starts with -# a scope. This scope should *NOT* be translated - eg. translating -# from French to English, "Foo::Bar" would be translated to "Pub", -# not "Foo::Pub". -msgid "" -msgstr "" -"Project-Id-Version: PROJECT VERSION\n" -"POT-Creation-Date: 2003-11-19 03:10:19 PM CET\n" -"PO-Revision-Date: YYYY-MM-DD\n" -"Last-Translator: FULLNAME \n" -"Content-Type: text/plain; charset=iso-8859-1\n" - -msgid "SierpinskyGUI::RUN" -msgstr "Run" - -msgid "SierpinskyGUI::CAPTION" -msgstr "Run Sierpinsky dialog" - -msgid "SierpinskyGUI::MENU_Sierpinsky" -msgstr "Sierpinsky" - -msgid "SierpinskyGUI_RunDlg::CAPTION" -msgstr "Run Sierpinsky Algo" - -msgid "SierpinskyGUI_RunDlg::START_POINT" -msgstr "Start point" - -msgid "SierpinskyGUI_RunDlg::RANDOM" -msgstr "Random" - -msgid "SierpinskyGUI_RunDlg::BASE_POINTS" -msgstr "Base points" - -msgid "SierpinskyGUI_RunDlg::DEFAULT" -msgstr "Default" - -msgid "SierpinskyGUI_RunDlg::NB_ITERATIONS" -msgstr "Number of iterations:" - -msgid "SierpinskyGUI_RunDlg::RESULTS" -msgstr "Results" - -msgid "SierpinskyGUI_RunDlg::EXPORT_2_JPEG" -msgstr "Export to JPEG" - -msgid "SierpinskyGUI_RunDlg::IMAGE_SIZE" -msgstr "Image size:" - -msgid "SierpinskyGUI_RunDlg::EXPORT_2_MED" -msgstr "Export to MED" - -msgid "SierpinskyGUI_RunDlg::MESH_SIZE" -msgstr "Mesh size:" - -msgid "SierpinskyGUI_RunDlg::IMPORT_MED_2_VISU" -msgstr "Import to Post-Pro" - -msgid "SierpinskyGUI_RunDlg::START_BTN" -msgstr "&Start" - -msgid "SierpinskyGUI_RunDlg::STOP_BTN" -msgstr "&Stop" - -msgid "SierpinskyGUI_RunDlg::CANCEL_BTN" -msgstr "&Cancel" - -msgid "JPEG_FILES" -msgstr "JPEG files (*.jpg; *.jpeg)" - -msgid "MED_FILES" -msgstr "MED files (*.med)" - -msgid "EXPORT_JPEG_FILE" -msgstr "Export JPEG image" - -msgid "EXPORT_MED_FILE" -msgstr "Export MED file" - -msgid "SierpinskyGUI_RunDlg::OK_BTN" -msgstr "&OK" - -msgid "SierpinskyGUI_RunDlg::ERR_ERROR" -msgstr "Warning" - -msgid "SierpinskyGUI_RunDlg::EXEC_ERROR" -msgstr "Can't run execution!" - -msgid "SierpinskyGUI_RunDlg::WRN_WARNING" -msgstr "Warning" - -msgid "SierpinskyGUI_RunDlg::YES_BTN" -msgstr "&Yes" - -msgid "SierpinskyGUI_RunDlg::NO_BTN" -msgstr "&No" - -msgid "SierpinskyGUI_RunDlg::JPEG_PARAMETERS_ERROR" -msgstr "JPEG file name is not given or image size is 0.\nContinue?" - -msgid "SierpinskyGUI_RunDlg::MED_PARAMETERS_ERROR" -msgstr "MED file name is not given or mesh size is 0.\nContinue?" - diff --git a/src/SierpinskyGUI/SIERPINSKY_msg_en.ts b/src/SierpinskyGUI/SIERPINSKY_msg_en.ts new file mode 100644 index 0000000..0a1e947 --- /dev/null +++ b/src/SierpinskyGUI/SIERPINSKY_msg_en.ts @@ -0,0 +1,152 @@ + + + + + @default + + EXPORT_JPEG_FILE + Export JPEG image + + + EXPORT_MED_FILE + Export MED file + + + JPEG_FILES + JPEG files (*.jpg; *.jpeg) + + + MED_FILES + MED files (*.med) + + + + SierpinskyGUI + + CAPTION + Run Sierpinsky dialog + + + MENU_Sierpinsky + Sierpinsky + + + RUN + Run + + + + SierpinskyGUI_RunDlg + + BASE_POINTS + Base points + + + CANCEL_BTN + &Cancel + + + CAPTION + Run Sierpinsky Algo + + + DEFAULT + Default + + + ERR_ERROR + Warning + + + EXEC_ERROR + Can't run execution! + + + EXPORT_2_JPEG + Export to JPEG + + + EXPORT_2_MED + Export to MED + + + IMAGE_SIZE + Image size: + + + IMPORT_MED_2_VISU + Import to Post-Pro + + + JPEG_PARAMETERS_ERROR + JPEG file name is not given or image size is 0.\nContinue? + + + MED_PARAMETERS_ERROR + MED file name is not given or mesh size is 0.\nContinue? + + + MESH_SIZE + Mesh size: + + + NB_ITERATIONS + Number of iterations: + + + NO_BTN + &No + + + OK_BTN + &OK + + + RANDOM + Random + + + RESULTS + Results + + + START_BTN + &Start + + + START_POINT + Start point + + + STOP_BTN + &Stop + + + WRN_WARNING + Warning + + + YES_BTN + &Yes + + + diff --git a/src/SierpinskyGUI/SierpinskyGUI.cxx b/src/SierpinskyGUI/SierpinskyGUI.cxx index f6176b8..0132c63 100644 --- a/src/SierpinskyGUI/SierpinskyGUI.cxx +++ b/src/SierpinskyGUI/SierpinskyGUI.cxx @@ -1,10 +1,27 @@ +// Copyright (C) 2005-2008 OPEN CASCADE +// +// 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 : SierpinskyGUI.cxx // Author : Vadim SANDLER (OCN) // Created : 13/07/05 -// Copyright (C) 2005 Open CASCADE /////////////////////////////////////////////////////////// - +// #include "SierpinskyGUI.h" #include @@ -56,7 +73,7 @@ void SierpinskyGUI::initialize( CAM_Application* app ) // create actions QPixmap aPixmap = aResourceMgr->loadPixmap( "SIERPINSKY",tr( "ICON_RUN_DLG" ) ); - createAction( 901, tr( "Run Dialog" ), QIconSet(aPixmap), tr( "RUN" ), tr( "CAPTION" ), 0, aParent, false, + createAction( 901, tr( "Run Dialog" ), QIcon(aPixmap), tr( "RUN" ), tr( "CAPTION" ), 0, aParent, false, this, SLOT( OnRun() ) ); // create menus @@ -83,7 +100,7 @@ QString SierpinskyGUI::engineIOR() const */ void SierpinskyGUI::windows( QMap& wmap ) const { - wmap.insert( SalomeApp_Application::WT_ObjectBrowser, Qt::DockLeft ); + wmap.insert( SalomeApp_Application::WT_ObjectBrowser, Qt::LeftDockWidgetArea ); } /*! diff --git a/src/SierpinskyGUI/SierpinskyGUI.h b/src/SierpinskyGUI/SierpinskyGUI.h index 6ba7f9d..3ad8625 100644 --- a/src/SierpinskyGUI/SierpinskyGUI.h +++ b/src/SierpinskyGUI/SierpinskyGUI.h @@ -1,10 +1,27 @@ +// Copyright (C) 2005-2008 OPEN CASCADE +// +// 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 : SierpinskyGUI.h // Author : Vadim SANDLER (OCN) // Created : 13/07/05 -// Copyright (C) 2005 Open CASCADE /////////////////////////////////////////////////////////// - +// #ifndef __SIERPINSKYGUI_H #define __SIERPINSKYGUI_H diff --git a/src/SierpinskyGUI/SierpinskyGUI_RunDlg.cxx b/src/SierpinskyGUI/SierpinskyGUI_RunDlg.cxx index 98c2c40..6871e35 100644 --- a/src/SierpinskyGUI/SierpinskyGUI_RunDlg.cxx +++ b/src/SierpinskyGUI/SierpinskyGUI_RunDlg.cxx @@ -1,31 +1,47 @@ +// Copyright (C) 2005-2008 OPEN CASCADE +// +// 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 : SierpinskyGUI_RunDlg.cxx // Author : Vadim SANDLER (OCN) // Created : 13/07/05 -// Copyright (C) 2005 Open CASCADE /////////////////////////////////////////////////////////// - +// #include "SierpinskyGUI_RunDlg.h" #include "SierpinskyGUI.h" #include "SALOME_LifeCycleCORBA.hxx" #include "SalomeApp_Application.h" -//#include "VisuGUI_Tools.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include -#include +#include #include #include @@ -102,10 +118,10 @@ static VISU::VISU_Gen_var getVisuEngine() } #define MY_EVENT QEvent::User + 555 -class MyEvent : public QCustomEvent +class MyEvent : public QEvent { public: - MyEvent( const int iter ) : QCustomEvent( MY_EVENT ), myIter( iter ) {} + MyEvent( const int iter ) : QEvent( (QEvent::Type)(MY_EVENT) ), myIter( iter ) {} int iter() const { return myIter; } private: @@ -156,11 +172,15 @@ private: * Constructor */ SierpinskyGUI_RunDlg::SierpinskyGUI_RunDlg( QWidget* parent, SierpinskyGUI* module ) - : QDialog( parent, "SierpinskyGUI_RunDlg", true, - WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu | WDestructiveClose ), + : QDialog( parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint ), myThread( 0 ), myModule( module ) { - setCaption( tr( "CAPTION" ) ); + setAttribute( Qt::WA_DeleteOnClose ); + + setObjectName("SierpinskyGUI_RunDlg"); + setModal(true); + + setWindowTitle( tr( "CAPTION" ) ); setSizeGripEnabled( true ); QGridLayout* topLayout = new QGridLayout( this ); @@ -168,18 +188,17 @@ SierpinskyGUI_RunDlg::SierpinskyGUI_RunDlg( QWidget* parent, SierpinskyGUI* modu // start point group box1 = new QGroupBox( tr( "START_POINT" ), this ); - box1->setColumnLayout( 0, Qt::Vertical ); - box1->layout()->setMargin( 0 ); box1->layout()->setSpacing( 0 ); - QGridLayout* box1Layout = new QGridLayout( box1->layout() ); + QGridLayout* box1Layout = new QGridLayout( box1 ); box1Layout->setAlignment( Qt::AlignTop ); - box1Layout->setMargin( MARGIN_SIZE ); box1Layout->setSpacing( SPACING_SIZE ); + box1Layout->setMargin( MARGIN_SIZE ); + box1Layout->setSpacing( SPACING_SIZE ); QLabel* labX = new QLabel( "X:", box1 ); - myStartX = new QtxDblSpinBox( 0.0, 1.0, 0.1 ,box1); + myStartX = new QtxDoubleSpinBox( 0.0, 1.0, 0.1 ,box1); myStartX->setMinimumWidth( 150 ); QLabel* labY = new QLabel( "Y:", box1 ); - myStartY = new QtxDblSpinBox( 0.0, 1.0, 0.1 ,box1); + myStartY = new QtxDoubleSpinBox( 0.0, 1.0, 0.1 ,box1); myStartY->setMinimumWidth( 150 ); myStartRandom = new QCheckBox( tr( "RANDOM" ), box1 ); @@ -192,34 +211,33 @@ SierpinskyGUI_RunDlg::SierpinskyGUI_RunDlg( QWidget* parent, SierpinskyGUI* modu // base points group box2 = new QGroupBox( tr( "BASE_POINTS" ), this ); - box2->setColumnLayout( 0, Qt::Vertical ); - box2->layout()->setMargin( 0 ); box2->layout()->setSpacing( 0 ); - QGridLayout* box2Layout = new QGridLayout( box2->layout() ); + QGridLayout* box2Layout = new QGridLayout( box2 ); box2Layout->setAlignment( Qt::AlignTop ); - box2Layout->setMargin( MARGIN_SIZE ); box2Layout->setSpacing( SPACING_SIZE ); + box2Layout->setMargin( MARGIN_SIZE ); + box2Layout->setSpacing( SPACING_SIZE ); QLabel* labX1 = new QLabel( "X1:", box2 ); - myX1 = new QtxDblSpinBox( 0.0, 1.0, 0.1 , box2); + myX1 = new QtxDoubleSpinBox( 0.0, 1.0, 0.1 , box2); myX1->setMinimumWidth( 150 ); QLabel* labY1 = new QLabel( "Y1:", box2 ); - myY1 = new QtxDblSpinBox( 0.0, 1.0, 0.1 , box2); + myY1 = new QtxDoubleSpinBox( 0.0, 1.0, 0.1 , box2); myY1->setMinimumWidth( 150 ); QLabel* labX2 = new QLabel( "X2:", box2 ); - myX2 = new QtxDblSpinBox( 0.0, 1.0, 0.1 , box2); + myX2 = new QtxDoubleSpinBox( 0.0, 1.0, 0.1 , box2); myX2->setMinimumWidth( 150 ); QLabel* labY2 = new QLabel( "Y2:", box2 ); - myY2 = new QtxDblSpinBox( 0.0, 1.0, 0.1, box2); + myY2 = new QtxDoubleSpinBox( 0.0, 1.0, 0.1, box2); myY2->setMinimumWidth( 150 ); QLabel* labX3 = new QLabel( "X3:", box2 ); - myX3 = new QtxDblSpinBox( 0.0, 1.0, 0.1, box2); + myX3 = new QtxDoubleSpinBox( 0.0, 1.0, 0.1, box2); myX3->setMinimumWidth( 150 ); QLabel* labY3 = new QLabel( "Y3:", box2 ); - myY3 = new QtxDblSpinBox( 0.0, 1.0, 0.1, box2); + myY3 = new QtxDoubleSpinBox( 0.0, 1.0, 0.1, box2); myY3->setMinimumWidth( 150 ); myBaseRandom = new QCheckBox( tr( "RANDOM" ), box2 ); @@ -242,15 +260,17 @@ SierpinskyGUI_RunDlg::SierpinskyGUI_RunDlg( QWidget* parent, SierpinskyGUI* modu // number of iterations QLabel* labIter = new QLabel( tr( "NB_ITERATIONS" ), this ); - myIter = new QSpinBox( 1, 100000, 1, this ); + myIter = new QSpinBox( this ); + myIter->setMinimum(1); + myIter->setMaximum(100000); + myIter->setSingleStep(1); // results box3 = new QGroupBox( tr( "RESULTS" ), this ); - box3->setColumnLayout( 0, Qt::Vertical ); - box3->layout()->setMargin( 0 ); box3->layout()->setSpacing( 0 ); - QGridLayout* box3Layout = new QGridLayout( box3->layout() ); + QGridLayout* box3Layout = new QGridLayout( box3 ); box3Layout->setAlignment( Qt::AlignTop ); - box3Layout->setMargin( MARGIN_SIZE ); box3Layout->setSpacing( SPACING_SIZE ); + box3Layout->setMargin( MARGIN_SIZE ); + box3Layout->setSpacing( SPACING_SIZE ); myJpegCheck = new QCheckBox( tr( "EXPORT_2_JPEG" ), box3 ); myJpegFile = new QLineEdit( box3 ); @@ -260,7 +280,10 @@ SierpinskyGUI_RunDlg::SierpinskyGUI_RunDlg( QWidget* parent, SierpinskyGUI* modu myJpegBtn->setFixedSize( 20, 20 ); QLabel* labJpeg = new QLabel( tr( "IMAGE_SIZE" ), box3 ); - myJpegSize = new QSpinBox( 0, 1280, 10, box3 ); + myJpegSize = new QSpinBox( box3 ); + myJpegSize->setMinimum(0); + myJpegSize->setMaximum(1280); + myJpegSize->setSingleStep(10); myJpegSize->setMinimumWidth( 150 ); QFrame* line = new QFrame( box3 ); @@ -274,27 +297,27 @@ SierpinskyGUI_RunDlg::SierpinskyGUI_RunDlg( QWidget* parent, SierpinskyGUI* modu myMedBtn->setFixedSize( 20, 20 ); QLabel* labMed = new QLabel( tr( "MESH_SIZE" ), box3 ); - myMedSize = new QtxDblSpinBox( 0.0, 1000, 1.0, box3); + myMedSize = new QtxDoubleSpinBox( 0.0, 1000, 1.0, box3); myMedSize->setMinimumWidth( 150 ); myVisuCheck = new QCheckBox( tr( "IMPORT_MED_2_VISU" ), box3 ); - box3Layout->addMultiCellWidget( myJpegCheck, 0, 0, 0, 3 ); - box3Layout->addMultiCellWidget( myJpegFile, 1, 1, 0, 2 ); - box3Layout->addWidget( myJpegBtn, 1, 3 ); - box3Layout->addWidget( labJpeg, 2, 0 ); - box3Layout->addWidget( myJpegSize, 2, 1 ); - box3Layout->addMultiCellWidget( line, 3, 3, 0, 3 ); - box3Layout->addMultiCellWidget( myMedCheck, 4, 4, 0, 3 ); - box3Layout->addMultiCellWidget( myMedFile, 5, 5, 0, 2 ); - box3Layout->addWidget( myMedBtn, 5, 3 ); - box3Layout->addWidget( labMed, 6, 0 ); - box3Layout->addWidget( myMedSize, 6, 1 ); - box3Layout->addMultiCellWidget( myVisuCheck, 7, 7, 0, 3 ); + box3Layout->addWidget( myJpegCheck, 0, 0, 1, 4 ); + box3Layout->addWidget( myJpegFile, 1, 0, 1, 3 ); + box3Layout->addWidget( myJpegBtn, 1, 3 ); + box3Layout->addWidget( labJpeg, 2, 0 ); + box3Layout->addWidget( myJpegSize, 2, 1 ); + box3Layout->addWidget( line, 3, 0, 1, 4 ); + box3Layout->addWidget( myMedCheck, 4, 0, 1, 4 ); + box3Layout->addWidget( myMedFile, 5, 0, 1, 3 ); + box3Layout->addWidget( myMedBtn, 5, 3 ); + box3Layout->addWidget( labMed, 6, 0 ); + box3Layout->addWidget( myMedSize, 6, 1 ); + box3Layout->addWidget( myVisuCheck, 7, 0, 1, 4 ); // progress bar myProgress = new QProgressBar( this ); - myProgress->setPercentageVisible( false ); + myProgress->setTextVisible( false ); myProgress->setFixedHeight( 10 ); // common buttons @@ -305,13 +328,13 @@ SierpinskyGUI_RunDlg::SierpinskyGUI_RunDlg( QWidget* parent, SierpinskyGUI* modu btnLayout->addStretch(); btnLayout->addWidget( myCancelBtn ); - topLayout->addMultiCellWidget( box1, 0, 0, 0, 1 ); - topLayout->addMultiCellWidget( box2, 1, 1, 0, 1 ); - topLayout->addWidget( labIter, 2, 0 ); - topLayout->addWidget( myIter, 2, 1 ); - topLayout->addMultiCellWidget( box3, 3, 3, 0, 1 ); - topLayout->addMultiCellWidget( myProgress,4, 4, 0, 1 ); - topLayout->addMultiCellLayout( btnLayout, 5, 5, 0, 1 ); + topLayout->addWidget( box1, 0, 0, 1, 2 ); + topLayout->addWidget( box2, 1, 0, 1, 2 ); + topLayout->addWidget( labIter, 2, 0 ); + topLayout->addWidget( myIter, 2, 1 ); + topLayout->addWidget( box3, 3, 0, 1, 2 ); + topLayout->addWidget( myProgress, 4, 0, 1, 2 ); + topLayout->addLayout( btnLayout, 5, 0, 1, 2 ); // signals and slots connections connect( myJpegBtn, SIGNAL( clicked() ), this, SLOT( onBrowse() ) ); @@ -361,10 +384,10 @@ void SierpinskyGUI_RunDlg::onBrowse() const QObject* snd = sender(); bool jpg = snd == myJpegBtn; QString aFileName = SUIT_FileDlg::getFileName( this, - jpg ? myJpegFile->text() : myMedFile->text(), - QStringList::split( ":", jpg ? tr( "JPEG_FILES") : tr( "MED_FILES" ) ), - jpg ? tr( "EXPORT_JPEG_FILE" ) : tr( "EXPORT_MED_FILE" ), - false ); + jpg ? myJpegFile->text() : myMedFile->text(), + (jpg ? tr( "JPEG_FILES") : tr( "MED_FILES" )).split( ":", QString::SkipEmptyParts ), + jpg ? tr( "EXPORT_JPEG_FILE" ) : tr( "EXPORT_MED_FILE" ), + false ); if ( !aFileName.isEmpty() ) { jpg ? myJpegFile->setText( aFileName ) : myMedFile->setText( aFileName ); } @@ -415,10 +438,10 @@ void SierpinskyGUI_RunDlg::accept() SIERPINSKY_ORB::SIERPINSKY_var aSierpGen = getSierpinskyEngine(); if( CORBA::is_nil( aRandGen ) || CORBA::is_nil( aSierpGen ) ) { - SUIT_MessageBox::error1( this, - tr( "ERR_ERROR" ), - tr( "EXEC_ERROR" ), - tr( "OK_BTN") ); + SUIT_MessageBox::critical( this, + tr( "ERR_ERROR" ), + tr( "EXEC_ERROR" ), + tr( "OK_BTN") ); return; } @@ -426,13 +449,13 @@ void SierpinskyGUI_RunDlg::accept() QString aJPEGFile; int aJPEGSize = 0; if ( myJpegCheck->isChecked() ) { - aJPEGFile = myJpegFile->text().stripWhiteSpace(); + aJPEGFile = myJpegFile->text().trimmed(); aJPEGSize = myJpegSize->value(); if ( aJPEGFile.isEmpty() || aJPEGSize <= 0 ) { - int res = SUIT_MessageBox::warn2( this, - tr( "WRN_WARNING" ), - tr( "JPEG_PARAMETERS_ERROR" ), - tr( "YES_BTN"), tr( "NO_BTN" ), 0, 1, 0 ); + int res = SUIT_MessageBox::warning( this, + tr( "WRN_WARNING" ), + tr( "JPEG_PARAMETERS_ERROR" ), + tr( "YES_BTN"), tr( "NO_BTN" ), 0, 1, 0 ); if ( res ) return; } } @@ -441,13 +464,13 @@ void SierpinskyGUI_RunDlg::accept() QString aMEDFile; double aMEDSize = 0; if ( myMedCheck->isChecked() ) { - aMEDFile = myMedFile->text().stripWhiteSpace(); + aMEDFile = myMedFile->text().trimmed(); aMEDSize = myMedSize->value(); if ( aMEDFile.isEmpty() || aMEDSize <= 0 ) { - int res = SUIT_MessageBox::warn2( this, - tr( "WRN_WARNING" ), - tr( "MED_PARAMETERS_ERROR" ), - tr( "YES_BTN"), tr( "NO_BTN" ), 0, 1, 0 ); + int res = SUIT_MessageBox::warning( this, + tr( "WRN_WARNING" ), + tr( "MED_PARAMETERS_ERROR" ), + tr( "YES_BTN"), tr( "NO_BTN" ), 0, 1, 0 ); if ( res ) return; } } @@ -481,8 +504,8 @@ void SierpinskyGUI_RunDlg::accept() int iter = myIter->value(); // start execution - myProgress->setTotalSteps( iter ); - myProgress->setProgress( 0 ); + myProgress->setMaximum( iter ); + myProgress->setValue( 0 ); if ( !myThread ) myThread = new MyThread( this, x, y, iter ); else @@ -505,7 +528,7 @@ void SierpinskyGUI_RunDlg::stop() disconnect( myStartBtn, SIGNAL( clicked() ), this, SLOT( stop() ) ); connect( myStartBtn, SIGNAL( clicked() ), this, SLOT( accept() ) ); myStartBtn->setText( tr( "START_BTN" ) ); - myProgress->setProgress( 0 ); + myProgress->setValue( 0 ); box1->setEnabled( true ); box2->setEnabled( true ); box3->setEnabled( true ); @@ -521,7 +544,7 @@ void SierpinskyGUI_RunDlg::nextStep( const int step ) disconnect( myStartBtn, SIGNAL( clicked() ), this, SLOT( stop() ) ); connect( myStartBtn, SIGNAL( clicked() ), this, SLOT( accept() ) ); myStartBtn->setText( tr( "START_BTN" ) ); - myProgress->setProgress( 0 ); + myProgress->setValue( 0 ); box1->setEnabled( true ); box2->setEnabled( true ); box3->setEnabled( true ); @@ -529,10 +552,10 @@ void SierpinskyGUI_RunDlg::nextStep( const int step ) // export to JPEG if ( myJpegCheck->isChecked() ) { - QString aJPEGFile = myJpegFile->text().stripWhiteSpace(); + QString aJPEGFile = myJpegFile->text().trimmed(); int aJPEGSize = myJpegSize->value(); if ( !aJPEGFile.isEmpty() && aJPEGSize > 0 ) { - bool res = getSierpinskyEngine()->ExportToJPEG( aJPEGFile.latin1(), aJPEGSize ); + bool res = getSierpinskyEngine()->ExportToJPEG( aJPEGFile.toLatin1().data(), aJPEGSize ); if ( !res ) { // error: can't create JPEG image } @@ -540,14 +563,14 @@ void SierpinskyGUI_RunDlg::nextStep( const int step ) } // export to MED if ( myMedCheck->isChecked() ) { - QString aMEDFile = myMedFile->text().stripWhiteSpace(); + QString aMEDFile = myMedFile->text().trimmed(); double aMEDSize = myMedSize->value(); if ( !aMEDFile.isEmpty() && aMEDSize > 0 ) { - bool res = getSierpinskyEngine()->ExportToMED( aMEDFile.latin1(), aMEDSize ); + bool res = getSierpinskyEngine()->ExportToMED( aMEDFile.toLatin1().data(), aMEDSize ); if ( res && myVisuCheck->isChecked() ) { VISU::VISU_Gen_var aVisuGen = getVisuEngine(); if ( !CORBA::is_nil( aVisuGen ) ) { - VISU::Result_var aResult = aVisuGen->ImportFile( aMEDFile.latin1() ); + VISU::Result_var aResult = aVisuGen->ImportFile( aMEDFile.toLatin1().data() ); if ( !CORBA::is_nil( aResult ) ) aVisuGen->MeshOnEntity( aResult, "Sierpinsky", VISU::NODE ); myModule->getApp()->updateObjectBrowser( true ); @@ -557,14 +580,14 @@ void SierpinskyGUI_RunDlg::nextStep( const int step ) } } else { - myProgress->setProgress( myProgress->totalSteps() - step ); + myProgress->setValue( myProgress->maximum() - step ); } } /*! * Process progress event */ -void SierpinskyGUI_RunDlg::customEvent( QCustomEvent* e ) +void SierpinskyGUI_RunDlg::customEvent( QEvent* e ) { if ( e->type() == MY_EVENT ) { MyEvent* me = (MyEvent*)e; diff --git a/src/SierpinskyGUI/SierpinskyGUI_RunDlg.h b/src/SierpinskyGUI/SierpinskyGUI_RunDlg.h index c21a994..8b20345 100644 --- a/src/SierpinskyGUI/SierpinskyGUI_RunDlg.h +++ b/src/SierpinskyGUI/SierpinskyGUI_RunDlg.h @@ -1,21 +1,38 @@ +// Copyright (C) 2005-2008 OPEN CASCADE +// +// 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 : SierpinskyGUI_RunDlg.h // Author : Vadim SANDLER (OCN) // Created : 13/07/05 -// Copyright (C) 2005 Open CASCADE /////////////////////////////////////////////////////////// - +// #ifndef __SIERPINSKYGUI_RUNDLG_H #define __SIERPINSKYGUI_RUNDLG_H -#include +#include class QLineEdit; class QCheckBox; class QSpinBox; class QPushButton; class QGroupBox; -class QtxDblSpinBox; +class QtxDoubleSpinBox; class MyThread; class QProgressBar; class SierpinskyGUI; @@ -35,7 +52,7 @@ public: protected: // process progress event - void customEvent( QCustomEvent* ); + void customEvent( QEvent* ); protected slots: void accept(); // Called when user presses 'Start' button @@ -46,44 +63,44 @@ protected slots: private: // module - SierpinskyGUI* myModule; + SierpinskyGUI* myModule; // widgets - QGroupBox* box1; - QtxDblSpinBox* myStartX; - QtxDblSpinBox* myStartY; - QCheckBox* myStartRandom; - - QGroupBox* box2; - QtxDblSpinBox* myX1; - QtxDblSpinBox* myY1; - QtxDblSpinBox* myX2; - QtxDblSpinBox* myY2; - QtxDblSpinBox* myX3; - QtxDblSpinBox* myY3; - QCheckBox* myBaseRandom; - QCheckBox* myBaseDefault; - - QSpinBox* myIter; - - QGroupBox* box3; - QCheckBox* myJpegCheck; - QLineEdit* myJpegFile; - QPushButton* myJpegBtn; - QSpinBox* myJpegSize; - QCheckBox* myMedCheck; - QLineEdit* myMedFile; - QPushButton* myMedBtn; - QtxDblSpinBox* myMedSize; - QCheckBox* myVisuCheck; - - QPushButton* myStartBtn; - QPushButton* myCancelBtn; - - QProgressBar* myProgress; + QGroupBox* box1; + QtxDoubleSpinBox* myStartX; + QtxDoubleSpinBox* myStartY; + QCheckBox* myStartRandom; + + QGroupBox* box2; + QtxDoubleSpinBox* myX1; + QtxDoubleSpinBox* myY1; + QtxDoubleSpinBox* myX2; + QtxDoubleSpinBox* myY2; + QtxDoubleSpinBox* myX3; + QtxDoubleSpinBox* myY3; + QCheckBox* myBaseRandom; + QCheckBox* myBaseDefault; + + QSpinBox* myIter; + + QGroupBox* box3; + QCheckBox* myJpegCheck; + QLineEdit* myJpegFile; + QPushButton* myJpegBtn; + QSpinBox* myJpegSize; + QCheckBox* myMedCheck; + QLineEdit* myMedFile; + QPushButton* myMedBtn; + QtxDoubleSpinBox* myMedSize; + QCheckBox* myVisuCheck; + + QPushButton* myStartBtn; + QPushButton* myCancelBtn; + + QProgressBar* myProgress; // progress thread - MyThread* myThread; + MyThread* myThread; }; #endif // __SIERPINSKYGUI_RUNDLG_H -- 2.39.2