From: nge Date: Tue, 20 Oct 2009 08:08:09 +0000 (+0000) Subject: Porting to Qt4 and autotools X-Git-Tag: RELIQUAT_5x_30102009~4 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b843e11a7c1378fa4c1f104f4fbb5674781aee27;p=modules%2Fmultipr.git Porting to Qt4 and autotools --- diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 0000000..e69de29 diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/COPYING @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If 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 convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state 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 program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..e69de29 diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..68303bd --- /dev/null +++ b/Makefile.am @@ -0,0 +1,52 @@ +# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# -* Makefile *- +# Author : Patrick GOLDBRONN (CEA) +# Date : 28/06/2001 +# Modified by : Alexander BORODIN (OCN) - autotools usage +# $Header: +# +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +if MULTIPR_ENABLE_GUI + ACLOCAL_AMFLAGS = -I adm_local/unix/config_files \ + -I ${GUI_ROOT_DIR}/adm_local/unix/config_files \ + -I ${MED_ROOT_DIR}/adm_local/unix/config_files \ + -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files +else !MULTIPR_ENABLE_GUI + ACLOCAL_AMFLAGS = -I adm_local/unix/config_files \ + -I ${MED_ROOT_DIR}/adm_local/unix/config_files \ + -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files +endif + +SUBDIRS = idl adm_local resources src bin doc + +DISTCLEANFILES = a.out aclocal.m4 configure local-install.sh + +salomeinclude_DATA = MULTIPR_version.h + +EXTRA_DIST += \ + build_configure \ + clean_configure + +dist-hook: + rm -rf `find $(distdir) -name CVS` diff --git a/Makefile.in b/Makefile.in deleted file mode 100644 index f5d9791..0000000 --- a/Makefile.in +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright (C) 2005 CEA/DEN, EDF R&D -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# -* Makefile *- -# -# Author : C. Caremoli -# Date : 10/10/2003 -# $Header$ -# - -# source path -top_srcdir=@top_srcdir@ -top_builddir=. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/bin:./bin/salome:./resources:@top_srcdir@/resources:./bin:@top_srcdir@/idl - - -@COMMENCE@ - -SUBDIRS = idl src adm_local - -RESOURCES_FILES = MULTIPRCatalog.xml MULTIPR.png ExecMULTIPR.png MULTIPR_import_med.png MULTIPR_save_med.png SalomeApp.xml - -BIN_SCRIPT= VERSION runAppli myrunSalome.py - -# copy header files in common directory - -include_list = include/salome/SALOMEconfig.h \ - include/salome/MULTIPR_version.h - -ifneq ($(HAVE_SSTREAM),yes) - include_list += include/salome/sstream -endif - -inc: idl $(include_list) - -bin: bin/salome/VERSION - -bin/salome/VERSION : bin/VERSION - -$(RM) $@ - $(LN_S) ../../$< $@ - -include/salome/SALOMEconfig.h: salome_adm/unix/SALOMEconfig.ref - -$(RM) $@ - $(LN_S) ../../$< $@ - -# test if SALOMEconfig.h has changed (contents) -salome_adm/unix/SALOMEconfig.ref: salome_adm/unix/SALOMEconfig.h - @if ! [ -a $@ ]; then \ - cp -p $< $@; \ - fi; \ - if ! cmp $< $@; then \ - cp -p $< $@; \ - fi; \ - -include/salome/sstream: salome_adm/unix/sstream - -$(RM) $@ - $(LN_S) ../../$< $@ - -include/salome/MULTIPR_version.h: MULTIPR_version.h - -$(RM) $@ - $(LN_S) ../../$< $@ - -depend: depend_idl - -depend_idl: - (cd idl ; $(MAKE) $@) || exit 1 - -# doc is already build : if you want to had documents, go manually to doc and run 'make doc' -#doc: -# (cd doc && $(MAKE) $@) || exit 1 - -install-end: -# finish libtool install -# @$(LT) --mode=finish $(libdir) - -install-include: $(include_list) - $(INSTALL) -d $(includedir) - @for f in X $(include_list); do \ - if test $$f != X; then \ - ($(INSTALL_DATA) $$f $(includedir)/. || exit 1); \ - fi; \ - done - -# install script in $(bindir) : -install-bin: $(BIN_SCRIPT) - $(INSTALL) -d $(bindir) - $(INSTALL_PROGRAM) $^ $(bindir) - -uninstall: uninstall-idl - -uninstall-idl: - $(RM) $(idldir)/*.idl - -distclean: distclean-other - -distclean-other: - -$(RM) salome_adm/unix/*~ salome_adm/unix/*% salome_adm/unix/*.bak salome_adm/unix/*.new salome_adm/unix/*.old - -$(RM) salome_adm/unix/make_* - -$(RM) salome_adm/unix/depend salome_adm/unix/SALOMEconfig.h - -$(RM) config.cache config.log config.status local-install.sh - -@MODULE@ - -install: install-bin install-include install-end - diff --git a/NEWS b/NEWS new file mode 100644 index 0000000..e69de29 diff --git a/adm_local/Makefile.am b/adm_local/Makefile.am new file mode 100644 index 0000000..b2db2eb --- /dev/null +++ b/adm_local/Makefile.am @@ -0,0 +1,24 @@ +# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 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 +# +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +SUBDIRS = unix diff --git a/adm_local/Makefile.in b/adm_local/Makefile.in deleted file mode 100644 index cfbe6f4..0000000 --- a/adm_local/Makefile.in +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright (C) 2005 CEA/DEN, EDF R&D -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# source path -top_srcdir=@top_srcdir@ -top_builddir=.. -srcdir=@srcdir@ -VPATH=.:$(srcdir)/adm_local - - -all: resources - -install: - cp -rf @top_srcdir@/adm_local @prefix@ - -bin: - -resources : - cp -rf @top_srcdir@/adm_local $(top_builddir) - -inc: - -lib: - -depend: - -depend_idl: - -install-end: - -install-include: - -install-bin: - -uninstall: - -uninstall-idl: - -distclean: - -clean: - -distclean-other: - diff --git a/adm_local/unix/Makefile.am b/adm_local/unix/Makefile.am new file mode 100644 index 0000000..5f6d5f7 --- /dev/null +++ b/adm_local/unix/Makefile.am @@ -0,0 +1,24 @@ +# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 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 +# +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +SUBDIRS = config_files diff --git a/adm_local/unix/config_files/Makefile.am b/adm_local/unix/config_files/Makefile.am new file mode 100644 index 0000000..84b2504 --- /dev/null +++ b/adm_local/unix/config_files/Makefile.am @@ -0,0 +1,25 @@ +# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 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 +# +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +dist_admlocalm4_DATA = \ + check_MULTIPR.m4 diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in deleted file mode 100644 index 19c8b68..0000000 --- a/adm_local/unix/make_commence.in +++ /dev/null @@ -1,288 +0,0 @@ -# common directories to put headerfiles -inc_builddir=$(top_builddir)/include/salome - -MODULE_NAME=@MODULE_NAME@ - -@SET_MAKE@ -SHELL=/bin/sh - -# header missing - -HAVE_SSTREAM=@HAVE_SSTREAM@ - - -LIBS=@LIBS@ -LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome -Xlinker -rpath-link -Xlinker $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome -# add libstdc++ to link c++ library with libtool ! -LDFLAGS+= -lstdc++ - -CP=@CP@ - -# CPP - -CPP=@CPP@ -CXXCPP=@CXXCPP@ -CPPFLAGS=@CPPFLAGS@ -I$(inc_builddir) -I$(srcdir) -I. - -# C - -CC = @CC@ -CFLAGS = @CFLAGS@ -C_DEPEND_FLAG = @C_DEPEND_FLAG@ - -# C++ - -CXX = @CXX@ -CXXFLAGS = @CXXFLAGS@ -CXX_DEPEND_FLAG = @CXX_DEPEND_FLAG@ - -# BOOST Library - -BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ -BOOST_LIBSUFFIX = @BOOST_LIBSUFFIX@ -BOOST_LIBS = @BOOST_LIBS@ - -# JAVA - -JAVA_INCLUDES = @JAVA_INCLUDES@ -JAVA_LIBS = @JAVA_LIBS@ -JAVA_LDPATH = @JAVA_LDPATH@ - -# PYTHON - -PYTHON = @PYTHON@ -PYTHONHOME = @PYTHONHOME@ -PYTHON_INCLUDES = @PYTHON_INCLUDES@ -PYTHON_LIBS = @PYTHON_LIBS@ -PYTHON_VERSION = @PYTHON_VERSION@ -PYTHON_SITE = $(prefix)/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages -PYTHON_SITE_INSTALL = $(prefix)/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages/salome - -# QT - -QT_ROOT = @QT_ROOT@ -QT_INCLUDES = @QT_INCLUDES@ -QT_MT_INCLUDES = @QT_INCLUDES@ -DQT_THREAD_SUPPORT -QT_LIBS = @QT_LIBS@ -QT_MT_LIBS = @QT_MT_LIBS@ - -MOC = @MOC@ -UIC = @UIC@ - -# msg2qm - -MSG2QM = @MSG2QM@ - -#QWT - -QWT_INCLUDES=@QWT_INCLUDES@ -QWT_LIBS=@QWT_LIBS@ - -# SIP -SIP = @SIP@ -SIP_INCLUDES = @SIP_INCLUDES@ -SIP_LIBS = @SIP_LIBS@ - -# PYQT -PYQT_SIPS = @PYQT_SIPS@ -PYQT_LIBS = @PYQT_LIBS@ - -# openGL -OGL_INCLUDES=@OGL_INCLUDES@ -OGL_LIBS=@OGL_LIBS@ - -# VTK -VTK_INCLUDES=@VTK_INCLUDES@ -VTK_LIBS=@VTK_LIBS@ - -# HDF5 - -HDF5_INCLUDES=@HDF5_INCLUDES@ -HDF5_LIBS=@HDF5_LIBS@ -HDF5_MT_LIBS=@HDF5_MT_LIBS@ - -# MED2 - -MED2_INCLUDES=@MED2_INCLUDES@ -MED2_LIBS=@MED2_LIBS@ -MED2_MT_LIBS=@MED2_MT_LIBS@ - -# OpenCasCade - -OCC_INCLUDES=@CAS_CPPFLAGS@ -OCC_CXXFLAGS=@CAS_CXXFLAGS@ - -OCC_KERNEL_LIBS=@CAS_KERNEL@ -OCC_OCAF_LIBS=@CAS_OCAF@ -OCC_VIEWER_LIBS=@CAS_VIEWER@ -OCC_MODELER_LIBS=@CAS_MODELER@ -OCC_DATAEXCHANGE_LIBS=@CAS_DATAEXCHANGE@ -OCC_LIBS=@CAS_LDFLAGS@ - -# MPICH - -MPICH_INCLUDES=@MPICH_INCLUDES@ -MPICH_LIBS=@MPICH_LIBS@ - -# Swig C++ Python - -SWIG = @SWIG@ -SWIG_FLAGS = @SWIG_FLAGS@ -I$(inc_builddir) -I$(srcdir) -I. - -# OMNIORB - -OMNIORB_ROOT = @OMNIORB_ROOT@ -OMNIORB_INCLUDES = @OMNIORB_INCLUDES@ -OMNIORB_LIBS = @OMNIORB_LIBS@ -OMNIORB_CXXFLAGS = @OMNIORB_CXXFLAGS@ - -OMNIORB_IDL = @OMNIORB_IDL@ -OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@ -OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl -I$(KERNEL_ROOT_DIR)/idl/salome - -OMNIORB_IDL_CLN_H = @OMNIORB_IDL_CLN_H@ -OMNIORB_IDL_CLN_CXX = @OMNIORB_IDL_CLN_CXX@ -OMNIORB_IDL_CLN_OBJ = @OMNIORB_IDL_CLN_OBJ@ - -OMNIORB_IDL_SRV_H = @OMNIORB_IDL_SRV_H@ -OMNIORB_IDL_SRV_CXX = @OMNIORB_IDL_SRV_CXX@ -OMNIORB_IDL_SRV_OBJ = @OMNIORB_IDL_SRV_OBJ@ - -# Default ORB - -CORBA_ROOT = @CORBA_ROOT@ -CORBA_INCLUDES = @CORBA_INCLUDES@ -CORBA_LIBS = @CORBA_LIBS@ -CORBA_CXXFLAGS = @CORBA_CXXFLAGS@ - -IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl -I$(KERNEL_ROOT_DIR)/idl/salome -IDLPYFLAGS = @IDLPYFLAGS@ - -IDL = @IDL@ - -IDL_CLN_H = @IDL_CLN_H@ -IDL_CLN_CXX = @IDL_CLN_CXX@ -IDL_CLN_OBJ = @IDL_CLN_OBJ@ - -IDL_SRV_H = @IDL_SRV_H@ -IDL_SRV_CXX = @IDL_SRV_CXX@ -IDL_SRV_OBJ = @IDL_SRV_OBJ@ - -CPPFLAGS+= $(CORBA_INCLUDES) -CXXFLAGS+= $(CORBA_CXXFLAGS) - -# add corba libs when link salome application ! -#LDFLAGS+= $(CORBA_LIBS) -LIBS+=$(CORBA_LIBS) - -## Shared libraries -LT_STATIC_EXEC=@LT_STATIC_EXEC@ -DYNAMIC_DIRS=@DYNAMIC_DIRS@ -LT_LIB=libtool -LT=$(top_builddir)/libtool -LT_COMPILE=$(LT) --mode=compile $(CC) -LT_LINK_LIB=$(LT_LIB) --mode=link $(CC) -rpath $(libdir) -LT_LINK_EXE=$(LT) --mode=link $(CC) $(LT_STATIC_EXEC) -dlopen self -rpath $(bindir) $(DYNAMIC_DIRS) -LT_RUN=$(LT) --mode=execute -LT_INSTALL_PROG=$(LT) --mode=install $(INSTALL_PROGRAM) -LT_INSTALL_LIB=$(LT) --mode=install $(INSTALL_DATA) -LT_UNINSTALL=$(LT) --mode=uninstall $(RM) - -INSTALL=@INSTALL@ -INSTALL_PROGRAM=@INSTALL_PROGRAM@ -INSTALL_DATA=@INSTALL_DATA@ - -# create a symbolic link (or a copie ?) -LN_S=@LN_S@ - -KERNEL_ROOT_DIR=@KERNEL_ROOT_DIR@ -KERNEL_SITE_DIR=@KERNEL_SITE_DIR@ -KERNEL_LDFLAGS=@KERNEL_LDFLAGS@ -KERNEL_CXXFLAGS=@KERNEL_CXXFLAGS@ - -GUI_ROOT_DIR=@GUI_ROOT_DIR@ -GUI_LDFLAGS=@GUI_LDFLAGS@ -GUI_CXXFLAGS=@GUI_CXXFLAGS@ - -MED_ROOT_DIR=@MED_ROOT_DIR@ -MED_LDFLAGS=@MED_LDFLAGS@ -MED_CXXFLAGS=@MED_CXXFLAGS@ - -## Installation points -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@bindir@/salome -libdir=@exec_prefix@/lib@LIB_LOCATION_SUFFIX@/salome -# warning : if user give this path in configure we could have salome/salome :-( -includedir=@includedir@/salome -datadir=@datadir@/salome -idldir=$(prefix)/idl/salome -sharedpydir=@exec_prefix@/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages/salome/shared_modules - -docdir=$(datadir)/doc - -# -# begin of package rules -# - -.PHONY: all lib bin inc resources tests install uninstall dep depend depend_idl cleandep mostlyclean clean distclean - -.SUFFIXES: .cxx .cc .c .f .o .lo .idl .py .i .ui .po .qm - -all: - $(MAKE) inc - $(MAKE) depend_idl - $(MAKE) depend - $(MAKE) lib - $(MAKE) bin - $(MAKE) resources - -# -# add target to build administrative files -# - -Makefile: $(top_builddir)/config.status $(srcdir)/Makefile.in - cd $(top_builddir) ; ./config.status - -LOCAL_MAKE = make_commence make_omniorb - -KERNEL_MAKE = make_module make_conclude depend SALOMEconfig.h F77config.h sstream envScript - -$(top_builddir)/config.status: $(top_srcdir)/configure \ - $(LOCAL_MAKE:%=$(top_srcdir)/adm_local/unix/%.in) \ - $(KERNEL_MAKE:%=$(KERNEL_ROOT_DIR)/salome_adm/unix/%.in) - cd $(top_builddir) ; ./config.status --recheck - -# VPATH contain $(srcdir), so make configure is good in top_srcdir and we must add target configure otherwise :-) -ifneq ($(top_srcdir),$(srcdir)) -configure: $(top_srcdir)/configure -endif - -$(top_srcdir)/configure: $(top_srcdir)/configure.ac $(top_srcdir)/aclocal.m4 - cd $(top_srcdir) ; autoconf - -$(top_srcdir)/configure.ac: $(top_srcdir)/configure.in.base - cd $(top_srcdir) && ./build_configure - -ACLOCAL_SRC = \ -check_corba.m4 ac_cxx_depend_flag.m4 check_hdf5.m4 \ -enable_pthreads.m4 ac_cxx_namespaces.m4 check_omniorb.m4 \ -pyembed.m4 python.m4 check_cas.m4 \ -check_swig.m4 - -ACLOCAL_SRC_DEPR = \ -ac_cxx_bool.m4 ac_cxx_mutable.m4 ac_cxx_partial_specialization.m4 \ -check_mico.m4 libtool.m4 ac_cxx_typename.m4 \ -check_pthreads.m4 ac_cc_warnings.m4 - -ACLOCAL_GUI = \ -check_vtk.m4 check_opengl.m4 check_qt.m4 \ -check_GUI.m4 check_corba_in_GUI.m4 - -$(top_srcdir)/aclocal.m4: $(ACLOCAL_SRC:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%) \ - $(ACLOCAL_SRC_DEPR:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/DEPRECATED/%) \ - $(ACLOCAL_GUI:%=@GUI_ROOT_DIR@/adm_local/unix/config_files/%) - cd $(top_srcdir) ; aclocal -I adm_local/unix/config_files -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files \ - -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files/DEPRECATED \ - -I @GUI_ROOT_DIR@/adm_local/unix/config_files \ - -I @MED_ROOT_DIR@/adm_local/unix/config_files diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am new file mode 100644 index 0000000..cd85151 --- /dev/null +++ b/adm_local/unix/make_common_starter.am @@ -0,0 +1,96 @@ +# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 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 +# + +# ============================================================ +# The following is to avoid PACKAGE_... env variable +# redefinition compilation warnings +# ============================================================ +AM_CXXFLAGS = @KERNEL_CXXFLAGS@ -include SALOMEconfig.h +AM_CPPFLAGS = @KERNEL_CXXFLAGS@ -include SALOMEconfig.h + +# ============================================================ +# 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)/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/salome + +# Directory for installing resource files +salomeresdir = $(prefix)/share/salome/resources/@MODULE_NAME@ + +# Directories for installing admin files +admlocaldir = $(prefix)/adm_local +admlocalunixdir = $(admlocaldir)/unix +admlocalm4dir = $(admlocaldir)/unix/config_files + +# Shared modules installation directory +sharedpkgpythondir = $(salomepythondir)/shared_modules + +# Documentation directory +docdir = $(datadir)/doc/salome + +# common rules + +# meta object implementation files generation (moc) +%_moc.cxx: %.h + $(MOC) $< -o $@ + +# 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 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 + +unittest: $(UNIT_TEST_PROG) + @if test "x$(UNIT_TEST_PROG)" != "x"; then \ + $(UNIT_TEST_PROG); \ + fi; diff --git a/adm_local/unix/make_omniorb.in b/adm_local/unix/make_omniorb.in deleted file mode 100644 index c91ccbf..0000000 --- a/adm_local/unix/make_omniorb.in +++ /dev/null @@ -1,52 +0,0 @@ -#======================================================================= -# Begin specific part to omniorb -# (include from file adm/unix/make_omniorb generated by -# adm/unix/make_omniorb.in) -#======================================================================= -# -* Makefile *- -# -# Author : Patrick GOLDBRONN (CEA) -# Date : 29/06/2001 -# - -# Client and server object are the same with omniorb -# There are one header file and one source file generate - -#IDLOBJ=$(IDLSRC:%.idl=%$(IDL_CLN_OBJ)) - -# dependancies between idl and it's generated files -%$(OMNIORB_IDL_CLN_CXX) %$(OMNIORB_IDL_CLN_H): ${KERNEL_ROOT_DIR}/idl/salome/%.idl - $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< - -%$(OMNIORB_IDL_CLN_CXX) %$(OMNIORB_IDL_CLN_H): ${top_srcdir}/idl/%.idl - $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< - -# dependncies between idl files -depend_idl: .depidl - -# we use cpp to generate dependencies between idl files. -# we change cpp output to keep only idl file and transform it to get a suitable rule -.depidl: $(IDL_FILES) - @touch $@ - @for dep in $? dummy; do \ - if [ $$dep != "dummy" ]; then \ - echo Building dependencies for $$dep; \ - basedep=`basename $$dep .idl`; \ - header="$$basedep"$(IDL_CLN_H); \ - sed '\%^'"$$header"':%,\%[^\\]$$%d' <$@ >$@- && mv $@- $@; \ - $(CPP) $(C_DEPEND_FLAG) -I$(srcdir) $$dep 2>/dev/null | \ - sed `echo "s%$$basedep\\.idl%$$header:%g"` | \ - sed 's% $(srcdir)/% %g' | \ - sed 's% $(top_srcdir)/% %g' | \ - sed 's% $(top_builddir)/% %g' | \ - sed 's%^.*:\.o: *%%' | sed 's%^ *\\ *%%'| sed 's%^ *\(.*\):%\1:%' | \ - sed 's/\.idl/$(IDL_CLN_H)/' >>$@; \ - echo '' >>$@; \ - fi; \ - done ; - --include .depidl - -#======================================================================= -# End specific part to omniorb -#======================================================================= diff --git a/bin/Makefile.am b/bin/Makefile.am new file mode 100644 index 0000000..f9eb701 --- /dev/null +++ b/bin/Makefile.am @@ -0,0 +1,35 @@ +# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# -* Makefile *- +# Author : Guillaume Boulant (CSSI) +# Module : COMPONENT +# +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +dist_salomescript_SCRIPTS = \ + myrunSalome.py + +nodist_salomescript_SCRIPTS = \ + runAppli + +nodist_salomescript_DATA = \ + VERSION diff --git a/build_configure b/build_configure index cf7a2a4..4715034 100755 --- a/build_configure +++ b/build_configure @@ -1,14 +1,31 @@ #!/bin/bash - +# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 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 # # Tool for updating list of .in file for the SALOME project # and regenerating configure script -# -# Author : Marc Tajchman - CEA +# Author : +# Modified by : Alexander BORODIN (OCN) - autotools usage # Date : 10/10/2002 -# $Header $ # - ORIG_DIR=`pwd` CONF_DIR=`echo $0 | sed -e "s,[^/]*$,,;s,/$,,;s,^$,.,"` @@ -20,14 +37,6 @@ if test ! -d "${KERNEL_ROOT_DIR}"; then exit fi -######################################################################## -# Test if the GUI_ROOT_DIR is set correctly - -if test ! -d "${GUI_ROOT_DIR}"; then - echo "failed : GUI_ROOT_DIR variable is not correct !" - exit -fi - ######################################################################## # Test if the MED_ROOT_DIR is set correctly @@ -36,233 +45,75 @@ if test ! -d "${MED_ROOT_DIR}"; then exit fi -######################################################################## -# Test if the MED2HOME is set correctly - -if test ! -d "${MED2HOME}"; then - echo "failed : MED2HOME variable is not correct !" - exit -fi - -######################################################################## -# Test if the HDF5HOME is set correctly - -if test ! -d "${HDF5HOME}"; then - echo "failed : HDF5HOME variable is not correct !" - exit -fi - -######################################################################## -# Test if the CASROOT is set correctly - -if test ! -d "${CASROOT}"; then - echo "failed : CASROOT variable is not correct !" - exit -fi - -######################################################################## -# Test if the QTDIR is set correctly - -if test ! -d "${QTDIR}"; then - echo "failed : QTDIR variable is not correct !" - exit -fi - -######################################################################## -# Test if the OMNIORBDIR is set correctly - -if test ! -d "${OMNIORBDIR}"; then - echo "failed : OMNIORBDIR variable is not correct !" - exit -fi ######################################################################## -# find_in - utility function -# -# usage : -# find_in directory filename -# -# Finds files following the *.in pattern, recursively in the -# directory (first argument). -# Results are appended into the file (second argument) -# -# Difference from the standard unix find is that files are tested -# before directories -# - -find_in() -{ - local i - local f=$2 - -# if the first argument is not a directory, returns - - if [ ! -d "$1" ] ; then - return - fi - -# dont look in the CVS directories - - case $1 in - */CVS) return ;; - */adm_local/*) return ;; - *) ;; - esac - -# for each regular file contained in the directory -# test if it's a .in file - - for i in "$1"/* - do - if [ -f "$i" ] ; then - case $i in - *.in) echo $i" \\" >> $f;; - *) ;; - esac - fi - done - -# for each subdirectory of the first argument, proceeds recursively - - for i in "$1"/* - do - if [ -d "$i" ] ; then - find_in "$i" "$f" - fi - done -} - +# Test if the GUI_ROOT_DIR is set correctly -####################################################################### -# Generate list of .in files (Makefile.in, config.h.in, etc) -# appending it in file configure.ac +#if test ! -d "${GUI_ROOT_DIR}"; then +# echo "failed : GUI_ROOT_DIR variable is not correct !" +# exit +#fi cd ${CONF_DIR} ABS_CONF_DIR=`pwd` -# -# Common part of the configure.ac file -# -chmod u+w configure.in.base -if ! \cp -f configure.in.base configure.in_tmp1 -then - echo - echo "error : can't create files in" ${CONF_DIR} - echo "aborting ..." - chmod u-w configure.in.base - exit -fi -chmod u-w configure.in.base - -if [ -e "${CONF_DIR}/salome_adm" ] ; then - \rm -f ${CONF_DIR}/salome_adm -fi - -# make a link allowing AC_OUTPUT to find the salome_adm/.../*.in files -echo "" >> configure.in_tmp1 -echo 'ln -fs ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}' >> configure.in_tmp1 - -echo "" >> configure.in_tmp1 -echo "AC_OUTPUT([ \\" >> configure.in_tmp1 - -# -# List of .in files in the adm/unix directory -# These files MUST be on top of AC_OUTPUT list so we -# put them "manually" -# - -echo "./salome_adm/unix/SALOMEconfig.h \\" >> configure.in_tmp1 -echo "./salome_adm/unix/F77config.h \\" >> configure.in_tmp1 -echo "./salome_adm/unix/sstream \\" >> configure.in_tmp1 -echo "./salome_adm/unix/depend \\" >> configure.in_tmp1 -echo "./adm_local/unix/make_omniorb:${ABS_CONF_DIR}/adm_local/unix/make_omniorb.in \\" >> configure.in_tmp1 -echo "./salome_adm/unix/envScript \\" >> configure.in_tmp1 -echo "./adm_local/unix/make_commence:${ABS_CONF_DIR}/adm_local/unix/make_commence.in \\" >> configure.in_tmp1 -echo "./salome_adm/unix/make_conclude \\" >> configure.in_tmp1 -echo "./salome_adm/unix/make_module \\" >> configure.in_tmp1 - -\rm -f configure.in_tmp2 -touch configure.in_tmp2 -find_in . configure.in_tmp2 - -sed -e '/^...salome_adm/d' \ - -e '/configure.in/d' \ - -e '/configure.ac/d' \ - -e '/^...adm_local/d' \ - -e 's/.in / /' \ - configure.in_tmp2 >> configure.in_tmp1 - -echo "])" >> configure.in_tmp1 - -# delete the link created for AC_OUTPUT -echo "" >> configure.in_tmp1 -\mv configure.in_tmp1 configure.in_new -\rm -f configure.in_tmp2 - - -######################################################################## -# Create new (or replace old) configure.ac file -# Print a message if the file is write protected -# - -echo -if test ! -f configure.ac -then - echo -n "Creating new file 'configure.ac' ... " - if \mv configure.in_new configure.ac >& /dev/null - then - echo "done" - else - echo "error, check your file permissions" - fi -else - echo -n "Updating 'configure.ac' file ... " - if ! \cp configure.ac configure.in_old >& /dev/null - then - echo - echo - echo "Can't backup previous configure.ac" - echo -n "Continue (you will not be able to revert) - (Y/N) ? " - read R - case "x$R" in - xn*) exit;; - xN*) exit;; - esac - echo - echo -n " " - fi - if \cp configure.in_new configure.ac >& /dev/null - then - \rm -f configure.in_new - echo "done" - else - echo - echo "error, can't update previous configure.ac" - fi -fi - ######################################################################## -# Use autoconf to rebuild the configure script -# -if test -f configure -then - echo -n "Updating 'configure' script ... " +# ____________________________________________________________________ +# aclocal creates the aclocal.m4 file from the standard macro and the +# custom macro embedded in the directory adm_local/unix/config_files +# and KERNEL config_files directory. +# output: +# aclocal.m4 +# autom4te.cache (directory) +echo "======================================================= aclocal" + +if test -d "${GUI_ROOT_DIR}"; then + aclocal -I adm_local/unix/config_files \ + -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \ + -I ${MED_ROOT_DIR}/adm_local/unix/config_files \ + -I ${GUI_ROOT_DIR}/adm_local/unix/config_files || exit 1 else - echo -n "Creating 'configure' script ... " + aclocal -I adm_local/unix/config_files \ + -I ${MED_ROOT_DIR}/adm_local/unix/config_files \ + -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files || exit 1 fi -aclocal -I adm_local/unix/config_files -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \ - -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files/DEPRECATED \ - -I ${GUI_ROOT_DIR}/adm_local/unix/config_files \ - -I ${MED_ROOT_DIR}/adm_local/unix/config_files -if autoconf -then - echo "done" -else - echo "failed (check file permissions and/or user quotas ...)" -fi - -cd ${ORIG_DIR} - -echo +# ____________________________________________________________________ +# libtoolize creates some configuration files (ltmain.sh, +# config.guess and config.sub). It only depends on the libtool +# version. The files are created in the directory specified with the +# AC_CONFIG_AUX_DIR() tag (see configure.ac). +# output: +# adm_local/unix/config_files/config.guess +# adm_local/unix/config_files/config.sub +# adm_local/unix/config_files/ltmain.sh +echo "==================================================== libtoolize" + +libtoolize --force --copy --automake || exit 1 + +# ____________________________________________________________________ +# autoconf creates the configure script from the file configure.ac (or +# configure.in if configure.ac doesn't exist) +# output: +# configure +echo "====================================================== autoconf" + +autoconf + +# ____________________________________________________________________ +# automake creates some scripts used in building process +# (install-sh, missing, ...). It only depends on the automake +# version. The files are created in the directory specified with the +# AC_CONFIG_AUX_DIR() tag (see configure.ac). This step also +# creates the Makefile.in files from the Makefile.am files. +# output: +# adm_local/unix/config_files/compile +# adm_local/unix/config_files/depcomp +# adm_local/unix/config_files/install-sh +# adm_local/unix/config_files/missing +# adm_local/unix/config_files/py-compile +# Makefile.in (from Makefile.am) +echo "====================================================== automake" + +automake --copy --gnu --add-missing diff --git a/clean_configure b/clean_configure new file mode 100755 index 0000000..7543381 --- /dev/null +++ b/clean_configure @@ -0,0 +1,35 @@ +#!/bin/sh +# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 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 +# +rm -rf autom4te.cache aclocal.m4 configure make_config salome_adm +find . -name "*~" -print -exec rm {} \; +find . -name "*.pyc" -print -exec rm {} \; +#exit +# ==================== ON SORT AVANT + +find bin -name Makefile.in | xargs rm -f +find doc -name Makefile.in | xargs rm -f +find idl -name Makefile.in | xargs rm -f +find resources -name Makefile.in | xargs rm -f +#find salome_adm -name Makefile.in | xargs rm -f +find src -name Makefile.in | xargs rm -f +rm -f Makefile.in diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..7d4cf25 --- /dev/null +++ b/configure.ac @@ -0,0 +1,333 @@ +# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 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 +# +# 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 MULTIPR module],[5.1.3], [webmaster.salome@opencascade.com], [SalomeMULTIPR]) +AC_CONFIG_AUX_DIR(adm_local/unix/config_files) +AC_CANONICAL_HOST +AC_CANONICAL_TARGET +AM_INIT_AUTOMAKE([-Wno-portability]) + +XVERSION=`echo $VERSION | awk -F. '{printf("0x%02x%02x%02x",$1,$2,$3)}'` +AC_SUBST(XVERSION) + +# set up MODULE_NAME variable for dynamic construction of directories (resources, etc.) +MODULE_NAME=multipr +AC_SUBST(MODULE_NAME) + +dnl +dnl Initialize source and build root directories +dnl + +ROOT_BUILDDIR=`pwd` +ROOT_SRCDIR=`echo $0 | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"` +cd $ROOT_SRCDIR +ROOT_SRCDIR=`pwd` +cd $ROOT_BUILDDIR + +AC_SUBST(ROOT_SRCDIR) +AC_SUBST(ROOT_BUILDDIR) + +echo +echo Source root directory : $ROOT_SRCDIR +echo Build root directory : $ROOT_BUILDDIR +echo +echo + +AC_CHECK_PROG(SHELL,sh) +AC_SUBST(SHELL) + +if test -z "$AR"; then + AC_CHECK_PROGS(AR,ar xar,:,$PATH) +fi +AC_SUBST(AR) + +dnl Export the AR macro so that it will be placed in the libtool file +dnl correctly. +export AR + +echo +echo --------------------------------------------- +echo testing make +echo --------------------------------------------- +echo + +AC_PROG_MAKE_SET +AC_PROG_INSTALL +AC_LOCAL_INSTALL +dnl +dnl libtool macro check for CC, LD, NM, LN_S, RANLIB, STRIP + for shared libraries + +AC_ENABLE_DEBUG(yes) +AC_DISABLE_PRODUCTION + +echo --------------------------------------------- +echo testing libtool +echo --------------------------------------------- + +dnl first, we set static to no! +dnl if we want it, use --enable-static +AC_ENABLE_STATIC(no) + +AC_LIBTOOL_DLOPEN +AC_PROG_LIBTOOL + +dnl Fix up the INSTALL macro if it s a relative path. We want the +dnl full-path to the binary instead. +case "$INSTALL" in + *install-sh*) + INSTALL='\${KERNEL_ROOT_DIR}'/adm_local/unix/config_files/install-sh + ;; +esac + +echo +echo --------------------------------------------- +echo testing C/C++ +echo --------------------------------------------- +echo + +cc_ok=no +dnl inutil car libtool +dnl AC_PROG_CC +AC_PROG_CXX +AC_CXX_WARNINGS +AC_CXX_TEMPLATE_OPTIONS +AC_DEPEND_FLAG +# AC_CC_WARNINGS([ansi]) +cc_ok=yes + +dnl Library libdl : +AC_CHECK_LIB(dl,dlopen) + +dnl Library librt : for alpha/osf +AC_CHECK_LIB(rt,nanosleep) + +dnl add library libm : +AC_CHECK_LIB(m,ceil) + +AC_CXX_USE_STD_IOSTREAM +AC_CXX_HAVE_SSTREAM + +dnl +dnl --------------------------------------------- +dnl testing linker +dnl --------------------------------------------- +dnl + +AC_LINKER_OPTIONS + +echo +echo --------------------------------------------- +echo testing threads +echo --------------------------------------------- +echo + +ENABLE_PTHREADS + +echo +echo --------------------------------------------- +echo testing python +echo --------------------------------------------- +echo + +CHECK_PYTHON + +AM_PATH_PYTHON(2.3) + +echo +echo --------------------------------------------- +echo Testing GUI +echo --------------------------------------------- +echo + +CHECK_GUI_MODULE + +gui_ok=no +if test "${SalomeGUI_need}" != "no" -a "${FullGUI_ok}" = "yes" ; then + gui_ok=yes +fi + +AM_CONDITIONAL(MULTIPR_ENABLE_GUI, [test "${gui_ok}" = "yes"]) + +if test "${SalomeGUI_need}" == "yes"; then + if test "${FullGUI_ok}" != "yes"; then + AC_MSG_WARN(For configure MULTIPR module necessary full GUI!) + fi +elif test "${SalomeGUI_need}" == "auto"; then + if test "${FullGUI_ok}" != "yes"; then + AC_MSG_WARN(Full GUI not found. Build will be done without GUI!) + fi +elif test "${SalomeGUI_need}" == "no"; then + echo Build without GUI option has been chosen +fi + +if test "${gui_ok}" = "yes"; then + echo + echo --------------------------------------------- + echo testing QT + echo --------------------------------------------- + echo + + CHECK_QT + +fi + +echo +echo --------------------------------------------- +echo BOOST Library +echo --------------------------------------------- +echo + +CHECK_BOOST + +echo +echo --------------------------------------------- +echo Testing OpenCascade +echo --------------------------------------------- +echo + +CHECK_CAS + +echo +echo --------------------------------------------- +echo testing omniORB +echo --------------------------------------------- +echo + +CHECK_OMNIORB + +echo +echo --------------------------------------------- +echo default ORB : omniORB +echo --------------------------------------------- +echo + +DEFAULT_ORB=omniORB +CHECK_CORBA + +AC_SUBST_FILE(CORBA) +corba=make_$ORB +CORBA=adm_local/unix/$corba + +echo +echo --------------------------------------------- +echo Testing Kernel +echo --------------------------------------------- +echo + +CHECK_KERNEL + +echo +echo --------------------------------------------- +echo Testing Med +echo --------------------------------------------- +echo + +CHECK_MED + +echo +echo --------------------------------------------- +echo testing HDF5 +echo --------------------------------------------- +echo + +CHECK_HDF5 + +echo +echo --------------------------------------------- +echo testing MED2 +echo --------------------------------------------- +echo + +CHECK_MED2 + +echo +echo --------------------------------------------- +echo Summary +echo --------------------------------------------- +echo + +echo Configure +if test "${gui_ok}" = "yes"; then + variables="cc_ok threads_ok boost_ok python_ok omniORB_ok qt_ok Kernel_ok Med_ok hdf5_ok med2_ok gui_ok" +elif test "${SalomeGUI_need}" != "no"; then + variables="cc_ok threads_ok boost_ok python_ok omniORB_ok Kernel_ok Med_ok hdf5_ok med2_ok gui_ok" +else + variables="cc_ok threads_ok boost_ok python_ok omniORB_ok Kernel_ok Med_ok hdf5_ok med2_ok" +fi + +for var in $variables +do + printf " %10s : " `echo \$var | sed -e "s,_ok,,"` + eval echo \$$var +done + +echo +echo "Default ORB : $DEFAULT_ORB" +echo + +dnl We don t need to say when we re entering directories if we re using +dnl GNU make becuase make does it for us. +if test "X$GMAKE" = "Xyes"; then + AC_SUBST(SETX) SETX=":" +else + AC_SUBST(SETX) SETX="set -x" +fi +echo +echo --------------------------------------------- +echo generating Makefiles and configure files +echo --------------------------------------------- +echo + +AC_OUTPUT_COMMANDS([ \ + chmod +x ./bin/*; \ +]) + +# This list is initiated using autoscan and must be updated manually +# when adding a new file .in to manage. When you execute +# autoscan, the Makefile list is generated in the output file configure.scan. +# This could be helpfull to update de configuration. +AC_OUTPUT([ \ + adm_local/Makefile \ + adm_local/unix/Makefile \ + adm_local/unix/config_files/Makefile \ + bin/VERSION \ + bin/runAppli \ + bin/Makefile \ + doc/Makefile \ + MULTIPR_version.h \ + resources/MULTIPRCatalog.xml \ + src/Makefile \ + src/MULTIPR/Makefile \ + src/MULTIPRGUI/Makefile \ + resources/Makefile \ + idl/Makefile \ + Makefile \ +]) diff --git a/configure.in.base b/configure.in.base deleted file mode 100644 index e067cb9..0000000 --- a/configure.in.base +++ /dev/null @@ -1,338 +0,0 @@ -# -# PLEASE DO NOT MODIFY configure.in FILE -# -# ALL CHANGES WILL BE DISCARDED BY THE NEXT -# build_configure COMMAND -# -# CHANGES MUST BE MADE IN configure.in.base FILE -# -# -# Author : Marc Tajchman (CEA) -# Date : 28/06/2001 -# Modified by : Patrick GOLDBRONN (CEA) -# Modified by : Marc Tajchman (CEA) -# -# Created from configure.in.base -# - -AC_INIT(src) -AC_CONFIG_AUX_DIR(${KERNEL_ROOT_DIR}/salome_adm/unix/config_files/DEPRECATED) -AC_CANONICAL_HOST - -PACKAGE=salome -AC_SUBST(PACKAGE) - -VERSION=4.1.5 -XVERSION=0x040105 -AC_SUBST(VERSION) -AC_SUBST(XVERSION) - -# set up MODULE_NAME variable for dynamic construction of directories (resources, etc.) -MODULE_NAME=multipr -AC_SUBST(MODULE_NAME) - -dnl -dnl Initialize source and build root directories -dnl - -ROOT_BUILDDIR=`pwd` -ROOT_SRCDIR=`echo $0 | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"` -cd $ROOT_SRCDIR -ROOT_SRCDIR=`pwd` -cd $ROOT_BUILDDIR - -AC_SUBST(ROOT_SRCDIR) -AC_SUBST(ROOT_BUILDDIR) - -echo -echo Source root directory : $ROOT_SRCDIR -echo Build root directory : $ROOT_BUILDDIR -echo -echo - -if test -z "$AR"; then - AC_CHECK_PROGS(AR,ar xar,:,$PATH) -fi -AC_SUBST(AR) - -dnl Export the AR macro so that it will be placed in the libtool file -dnl correctly. -export AR - -echo -echo --------------------------------------------- -echo testing make -echo --------------------------------------------- -echo - -AC_PROG_MAKE_SET -AC_PROG_INSTALL -AC_LOCAL_INSTALL -dnl -dnl libtool macro check for CC, LD, NM, LN_S, RANLIB, STRIP + for shared libraries - -AC_ENABLE_DEBUG(yes) -AC_DISABLE_PRODUCTION - -echo --------------------------------------------- -echo testing libtool -echo --------------------------------------------- - -dnl first, we set static to no! -dnl if we want it, use --enable-static -AC_ENABLE_STATIC(no) - -AC_LIBTOOL_DLOPEN -AC_PROG_LIBTOOL - -dnl Fix up the INSTALL macro if it s a relative path. We want the -dnl full-path to the binary instead. -case "$INSTALL" in - *install-sh*) - INSTALL='\${KERNEL_ROOT_DIR}'/salome_adm/unix/config_files/DEPRECATED/install-sh - ;; -esac - -echo -echo --------------------------------------------- -echo testing C/C++ -echo --------------------------------------------- -echo - -cc_ok=no -dnl inutil car libtool -dnl AC_PROG_CC -AC_PROG_CXX -AC_CXX_WARNINGS -AC_CXX_TEMPLATE_OPTIONS -AC_DEPEND_FLAG -# AC_CC_WARNINGS([ansi]) -cc_ok=yes - -dnl Library libdl : -AC_CHECK_LIB(dl,dlopen) - -dnl Library librt : for alpha/osf -AC_CHECK_LIB(rt,nanosleep) - -dnl add library libm : -AC_CHECK_LIB(m,ceil) - -AC_CXX_USE_STD_IOSTREAM -AC_CXX_HAVE_SSTREAM - -dnl -dnl --------------------------------------------- -dnl testing linker -dnl --------------------------------------------- -dnl - -AC_LINKER_OPTIONS - -echo -echo --------------------------------------------- -echo testing threads -echo --------------------------------------------- -echo - -ENABLE_PTHREADS - -echo -echo --------------------------------------------- -echo testing python -echo --------------------------------------------- -echo - -CHECK_PYTHON - -echo -echo --------------------------------------------- -echo testing QT -echo --------------------------------------------- -echo - -CHECK_QT - -echo -echo --------------------------------------------- -echo testing msg2qm -echo --------------------------------------------- -echo - -CHECK_MSG2QM - -echo -echo --------------------------------------------- -echo BOOST Library -echo --------------------------------------------- -echo - -CHECK_BOOST - -echo -echo --------------------------------------------- -echo Testing OpenCascade -echo --------------------------------------------- -echo - -CHECK_CAS - -echo -echo --------------------------------------------- -echo testing omniORB -echo --------------------------------------------- -echo - -CHECK_OMNIORB - -echo -echo --------------------------------------------- -echo default ORB : omniORB -echo --------------------------------------------- -echo - -DEFAULT_ORB=omniORB -CHECK_CORBA - -AC_SUBST_FILE(CORBA) -corba=make_$ORB -CORBA=adm_local/unix/$corba - -echo -echo --------------------------------------------- -echo Testing GUI -echo --------------------------------------------- -echo - -CHECK_SALOME_GUI - -echo -echo --------------------------------------------- -echo Testing full GUI -echo --------------------------------------------- -echo - -CHECK_CORBA_IN_GUI -if test "x${CORBA_IN_GUI}" != "xyes"; then - echo "failed : For configure MULTIPR module necessary full GUI !" - exit -fi - -echo -echo --------------------------------------------- -echo Testing Kernel -echo --------------------------------------------- -echo - -CHECK_KERNEL - -echo -echo --------------------------------------------- -echo Testing Med -echo --------------------------------------------- -echo - -CHECK_MED - -echo -echo --------------------------------------------- -echo testing HDF5 -echo --------------------------------------------- -echo - -CHECK_HDF5 - -echo -echo --------------------------------------------- -echo testing MED2 -echo --------------------------------------------- -echo - -CHECK_MED2 - -echo -echo --------------------------------------------- -echo Testing GUI -echo --------------------------------------------- -echo - -CHECK_SALOME_GUI - -echo -echo --------------------------------------------- -echo Summary -echo --------------------------------------------- -echo - -echo Configure -variables="cc_ok threads_ok boost_ok python_ok omniORB_ok qt_ok msg2qm_ok Kernel_ok Med_ok hdf5_ok med2_ok SalomeGUI_ok" - -for var in $variables -do - printf " %10s : " `echo \$var | sed -e "s,_ok,,"` - eval echo \$$var -done - -echo -echo "Default ORB : $DEFAULT_ORB" -echo - -dnl generals files which could be included in every makefile - -AC_SUBST_FILE(COMMENCE) COMMENCE=adm_local/unix/make_commence -AC_SUBST_FILE(CONCLUDE) CONCLUDE=salome_adm/unix/make_conclude -AC_SUBST_FILE(MODULE) MODULE=salome_adm/unix/make_module - -dnl les dependences -AC_SUBST_FILE(DEPEND) DEPEND=salome_adm/unix/depend - -dnl We don t need to say when we re entering directories if we re using -dnl GNU make becuase make does it for us. -if test "X$GMAKE" = "Xyes"; then - AC_SUBST(SETX) SETX=":" -else - AC_SUBST(SETX) SETX="set -x" -fi - -# make other build directories -for rep in salome_adm adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources/${MODULE_NAME} share/salome/doc idl -do - $INSTALL -d $rep -done - -echo -echo --------------------------------------------- -echo copying resource files, shell scripts, and -echo xml files -echo --------------------------------------------- -echo - -dnl copy shells and utilities contained in the bin directory -dnl excluding .in files (treated in AC-OUTPUT below) and CVS -dnl directory - -cd bin -for i in $ROOT_SRCDIR/bin/* -do - local_bin=`echo $i | sed -e "s,$ROOT_SRCDIR,.,"` - case "$local_bin" in - *.in | *~) ;; - ./bin/CVS) ;; - *) ln -fs $i; echo $local_bin ;; - esac -done -cd $ROOT_BUILDDIR - -AC_SUBST_FILE(ENVSCRIPT) ENVSCRIPT=salome_adm/unix/envScript - -echo -echo --------------------------------------------- -echo generating Makefiles and configure files -echo --------------------------------------------- -echo - -AC_OUTPUT_COMMANDS([ \ - chmod +x ./bin/* \ -]) - -## do not delete this line diff --git a/doc/Makefile.am b/doc/Makefile.am new file mode 100755 index 0000000..53a117f --- /dev/null +++ b/doc/Makefile.am @@ -0,0 +1,26 @@ +# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 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 +# +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +dist_doc_DATA = CSSI_DRV_EDF-IOLS-MULTIPR_spec-conception_1_1.pdf + +EXTRA_DIST += SSI_DRV_EDF-IOLS-MULTIPR_spec-conception_1_1.odt diff --git a/idl/Makefile.am b/idl/Makefile.am new file mode 100644 index 0000000..e5ae78d --- /dev/null +++ b/idl/Makefile.am @@ -0,0 +1,108 @@ +# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 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 +# +# 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 = MULTIPR.idl + +# This variable defines the files to be installed +dist_salomeidl_DATA = $(BASEIDL_FILES) + +# GUI idl common library +lib_LTLIBRARIES = libSalomeIDLMULTIPR.la + +# Sources built from idl files +nodist_libSalomeIDLMULTIPR_la_SOURCES = \ + MULTIPRSK.cc \ + MULTIPRDynSK.cc +MULTIPRDynSK.cc: MULTIPRSK.cc + +# header files must be exported: other modules have to use this library +nodist_salomeinclude_HEADERS = $(BASEIDL_FILES:%.idl=%.hh) + +libSalomeIDLMULTIPR_la_CPPFLAGS = \ + $(KERNEL_CXXFLAGS) \ + -I$(top_builddir)/idl \ + @CORBA_CXXFLAGS@ \ + @CORBA_INCLUDES@ + +libSalomeIDLMULTIPR_la_LDFLAGS = -no-undefined -version-info=0:0:0 +libSalomeIDLMULTIPR_la_LIBADD = \ + $(KERNEL_LDFLAGS) -lSalomeIDLKernel \ + @CORBA_LIBS@ + +# These variables defines the building process of CORBA files +OMNIORB_IDL = @OMNIORB_IDL@ +OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@ +OMNIORB_IDLPYFLAGS = \ + @OMNIORB_IDLPYFLAGS@ \ + -I$(top_builddir)/idl/salome \ + -I$(KERNEL_ROOT_DIR)/idl/salome + +IDLCXXFLAGS = \ + -bcxx \ + @IDLCXXFLAGS@ \ + -I$(top_builddir)/idl/salome \ + -I$(KERNEL_ROOT_DIR)/idl/salome +IDLPYFLAGS = \ + @IDLPYFLAGS@ \ + -I$(KERNEL_ROOT_DIR)/idl/salome + +# potential problem on parallel make on the following - multiple outputs +SUFFIXES = .idl .hh SK.cc +.idlSK.cc: + $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< +.idl.hh: + $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< + +install-exec-local: $(BASEIDL_FILES:%=$(top_srcdir)/idl/%) + $(INSTALL) -d $(DESTDIR)$(salomepythondir) + ls $^ | while read file; do \ + $(OMNIORB_IDL) $(IDLPYFLAGS) -C$(DESTDIR)$(salomepythondir) $$file ; \ + done + +# uninstall-local removes too much, but it works in distcheck +uninstall-local: + rm -rf $(DESTDIR)$(salomepythondir)/* + +mostlyclean-local: + -rm -f *.hh *.cc .depidl + +# we use cpp to generate dependencies between idl files. +# option x c tells the preprocessor to consider idl as a c file. +# if an idl is modified, all idl dependencies are rebuilt + +.depidl: $(BASEIDL_FILES) + @echo "" > $@ + @for dep in $^ dummy; do \ + if [ $$dep != "dummy" ]; then \ + echo Building dependencies for $$dep; \ + $(CPP) $(C_DEPEND_FLAG) -x c -I$(srcdir) -I$(KERNEL_ROOT_DIR)/idl/salome $$dep 2>/dev/null | \ + sed 's/\.o/\SK.cc/' >>$@; \ + fi; \ + done ; + +-include .depidl diff --git a/idl/Makefile.in b/idl/Makefile.in deleted file mode 100644 index 57b0c2f..0000000 --- a/idl/Makefile.in +++ /dev/null @@ -1,86 +0,0 @@ -# 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 -# -# -# generate dependencies for idl file : -# - -# source path -top_srcdir=@top_srcdir@ -top_builddir=.. -srcdir=@srcdir@ -VPATH=.:${KERNEL_ROOT_DIR}/idl/salome - -@COMMENCE@ - -IDL_FILES = \ - MULTIPR.idl - -PY_CLIENT_IDL = $(IDL_FILES) - -# we copy all idl file in $(top_builddir)/idl -inc: $(top_builddir)/idl/salome $(IDL_FILES:%=$(top_builddir)/idl/salome/%) - -$(top_builddir)/idl/salome: - mkdir $@ - -$(IDL_FILES:%=$(top_builddir)/idl/salome/%):$(IDL_FILES:%=$(top_srcdir)/idl/%) -# $(CP) $< $@ - cp -f $^ $(top_builddir)/idl/salome - - -lib: pyidl - -PYTHON_BUILD_SITE=$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages/@PACKAGE@ - -pyidl: $(PYTHON_BUILD_SITE) $(IDL_FILES:%.idl=$(PYTHON_BUILD_SITE)/%_idl.py) - -$(PYTHON_BUILD_SITE): - $(INSTALL) -d $@ - -$(PYTHON_BUILD_SITE)/%_idl.py: $(top_builddir)/idl/salome/%.idl - $(OMNIORB_IDL) $(OMNIORB_IDLPYFLAGS) -C$(PYTHON_BUILD_SITE) $< - - -# install python client (generated from idl file -install: install-pyidl install-idl - -# create directory $(idldir) and copy idl files into it -install-idl: $(IDL_FILES:%=$(top_builddir)/idl/salome/%) - $(INSTALL) -d $(idldir) - $(INSTALL_DATA) $^ $(idldir) - - -install-pyidl: $(IDL_FILES:%=$(top_builddir)/idl/salome/%) - $(INSTALL) -d $(PYTHON_SITE_INSTALL) - @for file in $^ dummy; do \ - if [ $$file != "dummy" ]; then \ - $(OMNIORB_IDL) $(OMNIORB_IDLPYFLAGS) -C$(PYTHON_SITE_INSTALL) $$file ; \ - fi ; \ - done ; - -#@ CONCLUDE @ - -cleandep: - -$(RM) .dep* - -distclean: - -$(RM) *.py - -$(RM) $(IDL_FILES:%=$(top_builddir)/idl/salome/%) - -$(RM) Makefile - diff --git a/resources/Makefile.am b/resources/Makefile.am new file mode 100644 index 0000000..bd101d2 --- /dev/null +++ b/resources/Makefile.am @@ -0,0 +1,34 @@ +# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# $Header$ +# +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +dist_salomeres_DATA = \ +SalomeApp.xml \ +MULTIPR_import_med.png \ +MULTIPR.png \ +MULTIPR_save_med.png \ +ExecMULTIPR.png + +# VSR: little trick to avoid putting if HELLOCatalog.xml to the distribution archive +nodist_salomeres_SCRIPTS = MULTIPRCatalog.xml diff --git a/src/MULTIPR/Makefile.am b/src/MULTIPR/Makefile.am new file mode 100755 index 0000000..abbdffe --- /dev/null +++ b/src/MULTIPR/Makefile.am @@ -0,0 +1,57 @@ +# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 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 +# +# SuperVisionTest AddComponent : example of component that adds two numbers +# File : Makefile.in +# Author : , CEA +# Modified by : Alexander BORODIN (OCN) - autotools usage +# +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +# header files +salomeinclude_HEADERS = MULTIPR_i.hxx + +# Libraries targets +lib_LTLIBRARIES = libMULTIPREngine.la +dist_libMULTIPREngine_la_SOURCES = \ + MULTIPR_i.cxx + +libMULTIPREngine_la_CPPFLAGS = \ + $(MED_CXXFLAGS) \ + $(MED2_INCLUDES) \ + $(BOOST_CPPFLAGS) \ + $(KERNEL_CXXFLAGS) \ + -I$(top_builddir)/idl + +libMULTIPREngine_la_LDFLAGS = \ + ../../idl/libSalomeIDLMULTIPR.la \ + $(KERNEL_LDFLAGS) \ + -lSalomeContainer \ + -lSalomeGenericObj \ + -lOpUtil \ + -lTOOLSDS \ + -lSALOMELocalTrace \ + $(MED2_LIBS) $(MED_LDFLAGS) \ + $(BOOST_LIBS) -lboost_thread${BOOST_LIBSUFFIX} \ + -lmedsplitter \ + -lmedmem \ + -lmed \ + -lMULTIPR_API diff --git a/src/MULTIPR/Makefile.in b/src/MULTIPR/Makefile.in deleted file mode 100644 index 3a0d876..0000000 --- a/src/MULTIPR/Makefile.in +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright (C) 2005 CEA/DEN, EDF R&D -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# Source path - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - -MACHINE=PCLINUX - -@COMMENCE@ - -# Libraries targets - -LIB = libMULTIPREngine.la - -LIB_SRC = MULTIPR_i.cxx - -LIB_SERVER_IDL = MULTIPR.idl - -LIB_CLIENT_IDL = SALOME_Component.idl SALOME_Exception.idl SALOMEDS.idl SALOME_GenericObj.idl Logger.idl - -EXPORT_HEADERS = - -# additionnal information to compile and link file - -CPPFLAGS += $(KERNEL_CXXFLAGS) $(MED_CXXFLAGS) $(MED2_INCLUDES) $(BOOST_CPPFLAGS) -Wall -pthread - -LDFLAGS += \ - $(KERNEL_LDFLAGS) \ - -lSalomeContainer \ - -lSalomeGenericObj \ - -lOpUtil \ - -lTOOLSDS \ - -lSALOMELocalTrace \ - $(MED2_LIBS) $(MED_LDFLAGS) \ - $(BOOST_LIBS) -lboost_thread${BOOST_LIBSUFFIX} \ - -lmedsplitter \ - -lmedmem \ - -lmed_V2_1 \ - -lMULTIPR_API - -# Executables targets - -@CONCLUDE@ diff --git a/src/MULTIPRGUI/MULTIPR_GUI.cxx b/src/MULTIPRGUI/MULTIPR_GUI.cxx index 466a8da..d635228 100644 --- a/src/MULTIPRGUI/MULTIPR_GUI.cxx +++ b/src/MULTIPRGUI/MULTIPR_GUI.cxx @@ -41,37 +41,37 @@ #include #include -#include +#include #include // QT Includes -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +//#include +#include #include using namespace std; - //***************************************************************************** // Global variable //***************************************************************************** @@ -95,10 +95,11 @@ public: virtual void Execute() { if (myIsError) { - SUIT_MessageBox::error1(myApp->desktop(), - "Save distributed MED file error", - "Error while writing distributed MED file", - myApp->tr("MULTIPR_BUT_OK")); + SUIT_MessageBox::critical((QWidget*) MULTIPR_GUI::desktop(), + QObject::tr("SAVE_DISTMED_ERROR"), +// QString("Save distributed MED file error"), + QObject::tr("WRIT_DISTMED_ERROR")); +// QString("Error while writing distributed MED file")); } else { myApp->updateObjectBrowser(); @@ -131,7 +132,7 @@ void MULTIPR_GUI_SaveThread::run() { try { - mObj->save(mPath); + mObj->save(mPath.toLatin1()); } catch(...) { @@ -147,20 +148,19 @@ void MULTIPR_GUI_SaveThread::run() //***************************************************************************** // singleton -MULTIPR_ORB::MULTIPR_Gen_ptr GetMultiprGen (const CAM_Module* theModule) +MULTIPR_ORB::MULTIPR_Gen_ptr GetMultiprGen (SalomeApp_Application* app) { static MULTIPR_ORB::MULTIPR_Gen_ptr aGen = NULL; if (!aGen) { SALOME_LifeCycleCORBA aLCC (SalomeApp_Application::namingService()); - Engines::Component_var aComponent = aLCC.FindOrLoad_Component("FactoryServer", "MULTIPR"); - aGen = MULTIPR_ORB::MULTIPR_Gen::_narrow(aComponent); + Engines::Component_var comp = app->lcc()->FindOrLoad_Component( "FactoryServer","MULTIPR" ); + aGen = MULTIPR_ORB::MULTIPR_Gen::_narrow(comp); if (!CORBA::is_nil(aGen)) { // Set current study - SalomeApp_Study* aSAStudy = - dynamic_cast(theModule->application()->activeStudy()); + SalomeApp_Study* aSAStudy =dynamic_cast(app->activeStudy()); _PTR(Study) aStudy = aSAStudy->studyDS(); SALOMEDS::Study_ptr aStudyDS; if (aStudy) @@ -182,6 +182,7 @@ MULTIPR_ORB::MULTIPR_Gen_ptr GetMultiprGen (const CAM_Module* theModule) MULTIPR_GUI::MULTIPR_GUI() : SalomeApp_Module("MULTIPR"), + LightApp_Module( "MULTIPR" ), //mMULTIPRObj(NULL), mMEDFileName(""), mProgress(NULL) @@ -221,9 +222,9 @@ void MULTIPR_GUI::initialize(CAM_Application* app) { SalomeApp_Module::initialize(app); - GetMultiprGen(this); + GetMultiprGen(dynamic_cast( app )); - QWidget* aParent = app->desktop(); + QWidget* aParent = (QWidget*) application()->desktop(); SUIT_ResourceMgr* aResourceMgr = app->resourceMgr(); //------------------------------------------------------------------------- @@ -234,10 +235,10 @@ void MULTIPR_GUI::initialize(CAM_Application* app) createAction( ACTION_IMPORT_MED, tr("MULTIPR_TLT_IMPORT_FROM_MED_FILE"), - QIconSet(aPixmapImportFromMEDFile), + QIcon(aPixmapImportFromMEDFile), tr("MULTIPR_MEN_IMPORT_FROM_MED_FILE"), tr("MULTIPR_STS_IMPORT_FROM_MED_FILE"), - (CTRL + Key_I), + (Qt::CTRL + Qt::Key_I), aParent, false, this, @@ -246,7 +247,7 @@ void MULTIPR_GUI::initialize(CAM_Application* app) createAction( ACTION_SPLIT, tr("MULTIPR_TLT_SPLIT"), - QIconSet(), + QIcon(), tr("MULTIPR_MEN_SPLIT"), tr("MULTIPR_STS_SPLIT"), 0, @@ -258,7 +259,7 @@ void MULTIPR_GUI::initialize(CAM_Application* app) createAction( ACTION_DECIMATE, tr("MULTIPR_TLT_DECIMATE"), - QIconSet(), + QIcon(), tr("MULTIPR_MEN_DECIMATE"), tr("MULTIPR_STS_DECIMATE"), 0, @@ -270,7 +271,7 @@ void MULTIPR_GUI::initialize(CAM_Application* app) createAction( ACTION_REMOVE, tr("MULTIPR_TLT_REMOVE"), - QIconSet(), + QIcon(), tr("MULTIPR_MEN_REMOVE"), tr("MULTIPR_STS_REMOVE"), 0, @@ -284,7 +285,7 @@ void MULTIPR_GUI::initialize(CAM_Application* app) createAction( ACTION_SAVE, tr("MULTIPR_TLT_SAVE"), - QIconSet(aPixmapSaveMEDFile), + QIcon(aPixmapSaveMEDFile), tr("MULTIPR_MEN_SAVE"), tr("MULTIPR_STS_SAVE"), 0, @@ -326,10 +327,10 @@ void MULTIPR_GUI::initialize(CAM_Application* app) mgr->insert( action(ACTION_SAVE), -1, -1, -1 ); QString aRule = "client='ObjectBrowser' and selcount>=1"; // $type in {'VISU::TMESH'}"; - mgr->setRule(action(ACTION_SPLIT), aRule, true); - mgr->setRule(action(ACTION_DECIMATE), aRule, true); - mgr->setRule(action(ACTION_REMOVE), aRule, true); - mgr->setRule(action(ACTION_SAVE), aRule, true); + mgr->setRule(action(ACTION_SPLIT), aRule); + mgr->setRule(action(ACTION_DECIMATE), aRule); + mgr->setRule(action(ACTION_REMOVE), aRule); + mgr->setRule(action(ACTION_SAVE), aRule); //------------------------------------------------------------------------- // set progress dialog @@ -352,7 +353,8 @@ CAM_DataModel* MULTIPR_GUI::createDataModel() QString MULTIPR_GUI::engineIOR() const { - CORBA::String_var anIOR = getApp()->orb()->object_to_string(GetMultiprGen(this)); +// SalomeApp_Application* app = dynamic_cast(this); + CORBA::String_var anIOR = getApp()->orb()->object_to_string(GetMultiprGen(getApp())); return QString(anIOR.in()); } @@ -363,10 +365,10 @@ bool MULTIPR_GUI::activateModule(SUIT_Study* theStudy) setMenuShown(true); setToolShown(true); - action(ACTION_IMPORT_MED)->setAccel(QKeySequence(CTRL + Key_I)); + action(ACTION_IMPORT_MED)->setShortcut(QKeySequence(Qt::CTRL+Qt::Key_I)); // Set current study - MULTIPR_ORB::MULTIPR_Gen_ptr aGen = GetMultiprGen(this); + MULTIPR_ORB::MULTIPR_Gen_ptr aGen = GetMultiprGen(dynamic_cast(this)); SalomeApp_Study* aSAStudy = dynamic_cast(theStudy); _PTR(Study) aStudy = aSAStudy->studyDS(); SALOMEDS::Study_ptr aStudyDS; @@ -375,7 +377,7 @@ bool MULTIPR_GUI::activateModule(SUIT_Study* theStudy) aGen->SetCurrentStudy(aStudyDS); // Init mMULTIPRObj - _PTR(SComponent) aSComp = aStudy->FindComponent(name()); + _PTR(SComponent) aSComp = aStudy->FindComponent(name().toStdString()); if (aSComp) { _PTR(ChildIterator) it (aStudy->NewChildIterator(aSComp)); if (it->More()) { @@ -398,7 +400,7 @@ bool MULTIPR_GUI::deactivateModule(SUIT_Study* theStudy) setToolShown(false); // Unset actions accelerator keys - action(ACTION_IMPORT_MED)->setAccel(QKeySequence()); + action(ACTION_IMPORT_MED)->setShortcut(QKeySequence()); mMULTIPRObj = MULTIPR_ORB::MULTIPR_Obj::_nil(); @@ -409,8 +411,8 @@ bool MULTIPR_GUI::deactivateModule(SUIT_Study* theStudy) void MULTIPR_GUI::windows(QMap& theMap) const { theMap.clear(); - theMap.insert(SalomeApp_Application::WT_ObjectBrowser, Qt::DockLeft); - theMap.insert(SalomeApp_Application::WT_PyConsole, Qt::DockBottom); + theMap.insert(SalomeApp_Application::WT_ObjectBrowser, Qt::LeftDockWidgetArea); + theMap.insert(SalomeApp_Application::WT_PyConsole, Qt::BottomDockWidgetArea); } @@ -446,11 +448,11 @@ void MULTIPR_GUI::OnImportFromMEDFile() aFilter.append(tr("MULTIPR_FLT_ALL_FILES")); SalomeApp_CheckFileDlg* fd = new SalomeApp_CheckFileDlg( - this->application()->desktop(), + (QWidget*) MULTIPR_GUI::desktop(), true, tr("") ); - fd->setCaption(tr("MULTIPR_MEN_IMPORT_FROM_MED_FILE")); + fd->setWindowTitle(tr("MULTIPR_MEN_IMPORT_FROM_MED_FILE")); fd->setFilters(aFilter); if (fd->exec() == QDialog::Rejected) { @@ -467,7 +469,7 @@ void MULTIPR_GUI::OnImportFromMEDFile() mMEDFileName = aFileInfo.filePath(); - QApplication::setOverrideCursor(Qt::waitCursor); + QApplication::setOverrideCursor(Qt::WaitCursor); // Delete previous MULTIPR object. //if (mMULTIPRObj != NULL) @@ -476,19 +478,20 @@ void MULTIPR_GUI::OnImportFromMEDFile() mMULTIPRObj->reset(); } - MULTIPR_ORB::MULTIPR_Gen_ptr multiprgen = GetMultiprGen(this); + MULTIPR_ORB::MULTIPR_Gen_ptr multiprgen = GetMultiprGen(dynamic_cast( this )); try { - mMULTIPRObj = multiprgen->getObject(mMEDFileName.latin1()); + mMULTIPRObj = multiprgen->getObject(mMEDFileName.toLatin1()); } catch(...) { - SUIT_MessageBox::error1( - getApp()->desktop(), - "Import MED file error", - "Invalid MED file (not recognized by MULTIPR)", - tr("MULTIPR_BUT_OK") ); + SUIT_MessageBox::critical( + (QWidget*) MULTIPR_GUI::desktop(), + QObject::tr("IMPORT_MED_ERROR"), +// "Import MED file error", + QObject::tr("INVALID_MED_FILE")); +// "Invalid MED file (not recognized by MULTIPR)"); } QApplication::restoreOverrideCursor(); @@ -534,12 +537,12 @@ void MULTIPR_GUI::OnPartition1() // Now we need to save the file. SalomeApp_CheckFileDlg* fd = new SalomeApp_CheckFileDlg( - this->application()->desktop(), + (QWidget*) MULTIPR_GUI::desktop(), true, tr("") ); - fd->setCaption(tr("Save distributed MED file - Destination directory")); - fd->setMode(QFileDialog::DirectoryOnly); + fd->setWindowTitle(tr("Save distributed MED file - Destination directory")); + fd->setFileMode(QFileDialog::DirectoryOnly); if (fd->exec() == QDialog::Rejected) { @@ -554,7 +557,7 @@ void MULTIPR_GUI::OnPartition1() QString path = aFileInfo.filePath(); - QApplication::setOverrideCursor(Qt::waitCursor); + QApplication::setOverrideCursor(QCursor(Qt::WaitCursor)); mMULTIPRObj->resetSaveProgress(); MULTIPR_GUI_SaveThread* a = new MULTIPR_GUI_SaveThread (this, mMULTIPRObj, path); @@ -564,7 +567,7 @@ void MULTIPR_GUI::OnPartition1() //mProgress = new MULTIPR_GUI_ProgressCallbackDlg (getApp()->desktop()); //mProgress->start("Save mesh", 100); if (mProgress == NULL) - mProgress = new QProgressDialog ("Save mesh", "Cancel", /*totalSteps*/100, getApp()->desktop()); + mProgress = new QProgressDialog ("Save mesh", "Cancel", 0,/*totalSteps*/100, (QWidget*) MULTIPR_GUI::desktop()); //mProgress->setProgress(0); //mProgress->init(100); //mTimer->start(500); // 0.5 seconds timer @@ -587,11 +590,12 @@ void MULTIPR_GUI::OnPartition2() if (mSelectedParts.count() == 0) { - SUIT_MessageBox::warn1( - getApp()->desktop(), - "Split warning", - "No parts selected", - tr("MULTIPR_BUT_OK") ); + SUIT_MessageBox::warning( + (QWidget*) MULTIPR_GUI::desktop(), + QObject::tr("SPLIT_WARN"), +// "Split warning", + QObject::tr("NO_PART_SELECTED")); +// "No parts selected"); return; } @@ -621,11 +625,12 @@ void MULTIPR_GUI::OnDecimate() if (mSelectedParts.count() == 0) { - SUIT_MessageBox::warn1( - getApp()->desktop(), - "Decimation warning", - "No parts selected", - tr("MULTIPR_BUT_OK") ); + SUIT_MessageBox::warning( + (QWidget*) MULTIPR_GUI::desktop(), + QObject::tr("DECIMATION_WARN"), +// "Decimation warning", + QObject::tr("NO_PART_SELECTED")); +// "No parts selected"); return; } @@ -636,14 +641,15 @@ void MULTIPR_GUI::OnDecimate() const QStringList& partsList = this->getSelectedParts(); QString allParts = partsList.join("|"); - MULTIPR_ORB::string_array* listFields = this->getMULTIPRObj()->getFields(allParts.latin1()); + MULTIPR_ORB::string_array* listFields = this->getMULTIPRObj()->getFields(allParts.toLatin1()); if (listFields->length() == 0) { - SUIT_MessageBox::error1( - this->getAppli()->desktop(), - "Decimation error", - "No field for this part.", - tr("OK") ); + SUIT_MessageBox::critical( + (QWidget*) MULTIPR_GUI::desktop(), + QObject::tr("DECIM_ERROR"), +// "Decimation error", + QObject::tr("NO_FIELD_ON_PART")); +// "No field for this part.",); return ; } @@ -668,25 +674,28 @@ void MULTIPR_GUI::OnRemove() if (mSelectedParts.count() == 0) { - SUIT_MessageBox::warn1( - getApp()->desktop(), - "Remove warning", - "No parts selected", - tr("MULTIPR_BUT_OK") ); + SUIT_MessageBox::warning( + (QWidget*) MULTIPR_GUI::desktop(), + QObject::tr("DEL_WARN"), +// "Remove warning", + QObject::tr("NO_PART_SELECTED")); +// "No parts selected"); return; } if (QMessageBox::question( - getApp()->desktop(), - tr("Remove selected part(s)"), - tr("Do you want to remove selected part(s)?"), - tr("&Yes"), tr("&No"), + (QWidget*) MULTIPR_GUI::desktop(), + QObject::tr("DEL_SELECTED_PARTS"), +// QObject::tr("Remove selected part(s)"), + QObject::tr("DEL_SELECTED_PARTS_QUEST"), +// QObject::tr("Do you want to remove selected part(s)?"), + QObject::tr("&Yes"), tr("&No"), QString::null, 0, 1 ) ) { return; } - QApplication::setOverrideCursor(Qt::waitCursor); + QApplication::setOverrideCursor(Qt::WaitCursor); try { @@ -694,17 +703,18 @@ void MULTIPR_GUI::OnRemove() for (; it != last; it++) { const QString& partName = (*it); - cout << "Remove " << partName.latin1() << endl; - mMULTIPRObj->removeParts(partName.latin1()); + cout << "Remove " << (const char*)partName.toLatin1() << endl; + mMULTIPRObj->removeParts(partName.toLatin1()); } } catch(...) { - SUIT_MessageBox::error1( - getApp()->desktop(), - "Remove error", - "Error while removing selected part(s)", - tr("MULTIPR_BUT_OK") ); + SUIT_MessageBox::critical( + (QWidget*) MULTIPR_GUI::desktop(), + QObject::tr("DEL_ERROR"), +// "Remove error", + QObject::tr("ERROR_DEL_PART")); +// "Error while removing selected part(s)"); } QApplication::restoreOverrideCursor(); @@ -723,13 +733,10 @@ void MULTIPR_GUI::OnSave() return; } - SalomeApp_CheckFileDlg* fd = - new SalomeApp_CheckFileDlg(this->application()->desktop(), - true, - tr("")); + SalomeApp_CheckFileDlg* fd = new SalomeApp_CheckFileDlg( (QWidget*) MULTIPR_GUI::desktop(), true,tr("")); - fd->setCaption(tr("Save distributed MED file - Destination directory")); - fd->setMode(QFileDialog::DirectoryOnly); + fd->setWindowTitle(tr("Save distributed MED file - Destination directory")); + fd->setFileMode(QFileDialog::DirectoryOnly); if (fd->exec() == QDialog::Rejected) { @@ -740,7 +747,7 @@ void MULTIPR_GUI::OnSave() QFileInfo aFileInfo(fd->selectedFile()); delete fd; - QApplication::setOverrideCursor(Qt::waitCursor); + QApplication::setOverrideCursor(Qt::WaitCursor); QString path = aFileInfo.filePath(); mMULTIPRObj->resetSaveProgress(); @@ -752,7 +759,7 @@ void MULTIPR_GUI::OnSave() //mProgress = new MULTIPR_GUI_ProgressCallbackDlg (getApp()->desktop()); //mProgress->start("Save mesh", 100); if (mProgress == NULL) - mProgress = new QProgressDialog ("Save mesh", "Cancel", /*totalSteps*/100, getApp()->desktop()); + mProgress = new QProgressDialog ("Save mesh", "Cancel", 0,/*totalSteps*/100, (QWidget*) MULTIPR_GUI::desktop()); //mProgress->setProgress(0); //mProgress->init(100); mTimer->start(500); // 0.5 seconds timer @@ -764,7 +771,7 @@ void MULTIPR_GUI::timerDone() { int progress = mMULTIPRObj->getSaveProgress(); if (mProgress != NULL) { - mProgress->setProgress(progress); + mProgress->setValue(progress); if (progress >= 100) { mTimer->stop(); @@ -781,7 +788,7 @@ void MULTIPR_GUI::retrieveSelectedParts() for (QStringList::const_iterator it = userSelection.begin(), last = userSelection.end(); it != last; it++) { const QString& str = (*it); - QStringList words = QStringList::split(":", str); + QStringList words = str.split(":"); if (words.count() == 2) { if (words[0] == "MULTIPR_PART") @@ -822,35 +829,37 @@ bool MULTIPR_GUI::removeLowerResolution() const QString& partName = (*it); QString partNameLow = partName + "_LOW"; QString partNameMed = partName + "_MED"; - const char* strPartNameLow = partNameLow.latin1(); - const char* strPartNameMed = partNameMed.latin1(); + const char* strPartNameLow = partNameLow.toLatin1(); + const char* strPartNameMed = partNameMed.toLatin1(); if (isPartExist(strPartNameLow)) { partNameLowerResolution.push_back(partNameLow); - cout << "Part to be removed: " << partNameLow << endl; + cout << "Part to be removed: " << strPartNameLow << endl; } if (isPartExist(strPartNameMed)) { partNameLowerResolution.push_back(partNameMed); - cout << "Part to be removed: " << partNameMed << endl; + cout << "Part to be removed: " << strPartNameMed << endl; } } if (partNameLowerResolution.count() > 0) { if (QMessageBox::question( - getApp()->desktop(), - tr("Remove previous results"), - tr("Do you want to remove previous results?"), + (QWidget*) MULTIPR_GUI::desktop(), + QObject::tr("DEL_PREV_RESULTS"), +// tr("Remove previous results"), + QObject::tr("DEL_PREV_RESULTS_QUEST"), +// tr("Do you want to remove previous results?"), tr("&Yes"), tr("&No"), QString::null, 0, 1 ) ) { return false; } - QApplication::setOverrideCursor(Qt::waitCursor); + QApplication::setOverrideCursor(Qt::WaitCursor); try { @@ -858,18 +867,19 @@ bool MULTIPR_GUI::removeLowerResolution() last = partNameLowerResolution.end(); it != last; it++) { const QString& partName = (*it); - cout << "Remove " << partName.latin1() << endl; - mMULTIPRObj->removeParts(partName.latin1()); + cout << "Remove " << (const char*)partName.toLatin1() << endl; + mMULTIPRObj->removeParts(partName.toLatin1()); } } catch(...) { - SUIT_MessageBox::error1( - getApp()->desktop(), - "Remove error", - "Error while removing previous results", - tr("MULTIPR_BUT_OK") ); + SUIT_MessageBox::critical( + (QWidget*) MULTIPR_GUI::desktop(), + QObject::tr("DEL_ERROR"), +// "Remove error", + QObject::tr("ERROR_DEL_PREV_RESULT")); +// "Error while removing previous results", } QApplication::restoreOverrideCursor(); @@ -881,6 +891,15 @@ bool MULTIPR_GUI::removeLowerResolution() return true; } +SUIT_Desktop* MULTIPR_GUI::desktop() +{ + SalomeApp_Application* app = dynamic_cast( SUIT_Session::session()->activeApplication() ); + if( app ) + return app->desktop(); + else + return 0; +} + //***************************************************************************** // Super class Data Object implementation @@ -931,14 +950,17 @@ QString MULTIPR_GUI_DataObject::toolTip() const // Class Data Object Module implementation //***************************************************************************** + MULTIPR_GUI_DataObject_Module::MULTIPR_GUI_DataObject_Module (CAM_DataModel* dm, SUIT_DataObject* parent, const char* name) : MULTIPR_GUI_DataObject(parent, name), - LightApp_ModuleObject(dm, parent), +// LightApp_DataObject(dm, parent), CAM_DataObject(parent) { // do nothing! + mDm = dm; + mParent = parent; } @@ -956,7 +978,8 @@ QString MULTIPR_GUI_DataObject_Module::entry() const QString MULTIPR_GUI_DataObject_Module::name() const { - return CAM_RootObject::name(); + CAM_ModuleObject cam(mDm,mParent); + return cam.name(); } @@ -1114,7 +1137,7 @@ QString MULTIPR_GUI_DataObject_Resolution::toolTip() const //***************************************************************************** MULTIPR_GUI_DataModel::MULTIPR_GUI_DataModel(CAM_Module* module) - //: LightApp_DataModel(module) +// : LightApp_DataModel(module) : SalomeApp_DataModel(module) { mMULTIPR_GUI = dynamic_cast(module); @@ -1125,17 +1148,18 @@ MULTIPR_GUI_DataModel::~MULTIPR_GUI_DataModel() // do nothing! } - void MULTIPR_GUI_DataModel::update (LightApp_DataObject*, LightApp_Study* theStudy) { LightApp_ModuleObject* modelRoot = dynamic_cast( root() ); DataObjectList ch; + //QListIterator it1,it2; QMap aMap; if( modelRoot ) { ch = modelRoot->children(); - for ( DataObjectListIterator it( ch ); it.current(); ++it ) - it.current()->setParent( 0 ); + DataObjectList::const_iterator it = ch.begin(), it_last = ch.end(); + for (; it != it_last; it++) + (*it)->setParent( 0); } buildAll(theStudy); @@ -1144,15 +1168,16 @@ void MULTIPR_GUI_DataModel::update (LightApp_DataObject*, LightApp_Study* theStu if( modelRoot ) { DataObjectList new_ch = modelRoot->children(); - for ( DataObjectListIterator it1( new_ch ); it1.current(); ++it1 ) - aMap.insert( it1.current(), 0 ); + DataObjectList::const_iterator it1 = new_ch.begin(), it1_last = new_ch.end(); + for (; it1 != it1_last; it1++) + aMap.insert((*it1),0); } updateWidgets(); - - for( DataObjectListIterator it( ch ); it.current(); ++it ) - if( !aMap.contains( it.current() ) ) - delete it.current(); + DataObjectList::const_iterator it_del = ch.begin(), it_del_last = ch.end(); + for (; it_del != it_del_last; it_del++) + if( !aMap.contains( (*it_del) ) ) + delete (*it_del); } void MULTIPR_GUI_DataModel::build() @@ -1180,7 +1205,7 @@ void MULTIPR_GUI_DataModel::buildAll (LightApp_Study* theStudy) // find SObject in Study MULTIPR_ORB::MULTIPR_Obj_ptr obj = MULTIPR_ORB::MULTIPR_Obj::_nil(); - _PTR(SComponent) aSComp = aSAStudy->studyDS()->FindComponent(module()->name()); + _PTR(SComponent) aSComp = aSAStudy->studyDS()->FindComponent(module()->name().toStdString()); if (aSComp) { _PTR(ChildIterator) it (aSAStudy->studyDS()->NewChildIterator(aSComp)); diff --git a/src/MULTIPRGUI/MULTIPR_GUI.h b/src/MULTIPRGUI/MULTIPR_GUI.h index 6fccaf9..91aa2d2 100644 --- a/src/MULTIPRGUI/MULTIPR_GUI.h +++ b/src/MULTIPRGUI/MULTIPR_GUI.h @@ -37,6 +37,8 @@ class SalomeApp_Application; class CAM_Module; +class SUIT_Desktop; + class QVBoxLayout; class QHBoxLayout; class QGridLayout; @@ -82,6 +84,8 @@ public: const QStringList& getSelectedParts() const { return mSelectedParts; } + static SUIT_Desktop* desktop(); + public slots: bool deactivateModule(SUIT_Study*); @@ -158,7 +162,8 @@ protected: // Class MULTIPR_GUI_DataObject_Module //***************************************************************************** -class MULTIPR_GUI_DataObject_Module : public MULTIPR_GUI_DataObject, public LightApp_ModuleObject + +class MULTIPR_GUI_DataObject_Module : public MULTIPR_GUI_DataObject { public: @@ -169,8 +174,13 @@ public: virtual QString name() const; virtual QPixmap icon() const; virtual QString toolTip() const; -}; +private: + + CAM_DataModel* mDm; + SUIT_DataObject* mParent; + +}; //***************************************************************************** // Class MULTIPR_GUI_DataObject_Mesh @@ -238,6 +248,7 @@ public: //class MULTIPR_GUI_DataModel : public LightApp_DataModel class MULTIPR_GUI_DataModel : public SalomeApp_DataModel { + public: MULTIPR_GUI_DataModel(CAM_Module*); diff --git a/src/MULTIPRGUI/MULTIPR_GUI_Dlg.cxx b/src/MULTIPRGUI/MULTIPR_GUI_Dlg.cxx index 1549a4d..0f53ce0 100644 --- a/src/MULTIPRGUI/MULTIPR_GUI_Dlg.cxx +++ b/src/MULTIPRGUI/MULTIPR_GUI_Dlg.cxx @@ -29,22 +29,20 @@ #include // QT Includes -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include // MED include extern "C" @@ -54,50 +52,47 @@ extern "C" using namespace std; - MULTIPR_GUI_Partition1Dlg::MULTIPR_GUI_Partition1Dlg(MULTIPR_GUI* theModule) : QDialog( - theModule->application()->desktop(), - 0, - false, - WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) + (QWidget*)theModule->application()->desktop(), + Qt::WindowTitleHint | Qt::WindowSystemMenuHint) { mModule = theModule; - buttonGroupProcess = new QButtonGroup( this, "buttonGroupProcess" ); - buttonGroupProcess->setGeometry( QRect( 10, 110, 450, 60 ) ); + groupBoxProcess = new QGroupBox( "groupBoxProcess",this ); + groupBoxProcess->setGeometry( QRect( 10, 110, 450, 60 ) ); - pushButtonOK = new QPushButton( buttonGroupProcess, "pushButtonOK" ); + pushButtonOK = new QPushButton( QString("pushButtonOK"),groupBoxProcess ); pushButtonOK->setGeometry( QRect( 10, 10, 110, 41 ) ); - pushButtonCancel = new QPushButton( buttonGroupProcess, "pushButtonCancel" ); + pushButtonCancel = new QPushButton( QString("pushButtonCancel"),groupBoxProcess ); pushButtonCancel->setGeometry( QRect( 321, 10, 110, 41 ) ); - buttonGroupSelectMesh = new QButtonGroup( this, "buttonGroupSelectMesh" ); - buttonGroupSelectMesh->setGeometry( QRect( 10, 10, 450, 91 ) ); + groupBoxSelectMesh = new QGroupBox( "groupBoxSelectMesh",this ); + groupBoxSelectMesh->setGeometry( QRect( 10, 10, 450, 91 ) ); - comboBoxSelectMesh = new QComboBox( FALSE, buttonGroupSelectMesh, "comboBoxSelectMesh" ); + comboBoxSelectMesh = new QComboBox( groupBoxSelectMesh ); comboBoxSelectMesh->setGeometry( QRect( 160, 30, 280, 40 ) ); MULTIPR_ORB::string_array* listMeshes = theModule->getMULTIPRObj()->getMeshes(); for (int i=0; ilength() ; i++) { const char* strItem = (*listMeshes)[i]; - comboBoxSelectMesh->insertItem(strItem); + comboBoxSelectMesh->insertItem(0,strItem); } comboBoxSelectMesh->setEditable(false); - textLabelSelectMesh = new QLabel( buttonGroupSelectMesh, "textLabelSelectMesh" ); + textLabelSelectMesh = new QLabel( "textLabelSelectMesh",groupBoxSelectMesh ); textLabelSelectMesh->setGeometry( QRect( 20, 30, 110, 40 ) ); - setCaption( tr( "Extract groups from sequential MED file" ) ); - buttonGroupProcess->setTitle( QString::null ); + setWindowTitle( tr( "Extract groups from sequential MED file" ) ); + groupBoxProcess->setTitle( QString::null ); pushButtonCancel->setText( tr( "Cancel" ) ); pushButtonOK->setText( tr("OK") ); - buttonGroupSelectMesh->setTitle( tr( "Select mesh" ) ); + groupBoxSelectMesh->setTitle( tr( "Select mesh" ) ); textLabelSelectMesh->setText( tr( "Mesh name" ) ); resize( QSize(471, 185).expandedTo(minimumSizeHint()) ); - clearWState( WState_Polished ); + //clearWState( WState_Polished ); connect(pushButtonOK, SIGNAL(clicked()), this, SLOT(accept())); connect(pushButtonCancel, SIGNAL(clicked()), this, SLOT(reject())); @@ -115,24 +110,23 @@ MULTIPR_GUI_Partition1Dlg::~MULTIPR_GUI_Partition1Dlg() void MULTIPR_GUI_Partition1Dlg::accept() { - const char* meshName = comboBoxSelectMesh->currentText().latin1(); + const char* meshName = comboBoxSelectMesh->currentText().toLatin1(); try { mModule->getMULTIPRObj()->setMesh(meshName); - QApplication::setOverrideCursor(Qt::waitCursor); + QApplication::setOverrideCursor(Qt::WaitCursor); mModule->getMULTIPRObj()->partitionneDomaine(); QApplication::restoreOverrideCursor(); } catch(...) { - SUIT_MessageBox::error1( - mModule->getAppli()->desktop(), - "Import MED file error", - "Unable to set mesh", - tr("OK") ); + SUIT_MessageBox::critical( + (QWidget*)mModule->getAppli()->desktop(), + QString("Import MED file error"), + QString("Unable to set mesh")); } QDialog::accept(); @@ -147,53 +141,51 @@ void MULTIPR_GUI_Partition1Dlg::reject() MULTIPR_GUI_Partition2Dlg::MULTIPR_GUI_Partition2Dlg(MULTIPR_GUI* theModule) : QDialog( - theModule->application()->desktop(), - 0, - false, - WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) + (QWidget*)theModule->application()->desktop(), + Qt::WindowTitleHint | Qt::WindowSystemMenuHint) { mModule = theModule; - buttonGroupSplitParameters = new QButtonGroup( this, "buttonGroupSplitParameters" ); - buttonGroupSplitParameters->setGeometry( QRect( 10, 10, 380, 140 ) ); + groupBoxSplitParameters = new QGroupBox( "groupBoxSplitParameters",this ); + groupBoxSplitParameters->setGeometry( QRect( 10, 10, 380, 140 ) ); - textLabelSelectNbParts = new QLabel( buttonGroupSplitParameters, "textLabelSelectNbParts" ); + textLabelSelectNbParts = new QLabel( "textLabelSelectNbParts",groupBoxSplitParameters ); textLabelSelectNbParts->setGeometry( QRect( 30, 30, 160, 31 ) ); - textLabelSelectSplitter = new QLabel( buttonGroupSplitParameters, "textLabelSelectSplitter" ); + textLabelSelectSplitter = new QLabel( "textLabelSelectSplitter",groupBoxSplitParameters ); textLabelSelectSplitter->setGeometry( QRect( 30, 80, 111, 31 ) ); - comboBoxSelectSplitter = new QComboBox( FALSE, buttonGroupSplitParameters, "comboBoxSelectSplitter" ); + comboBoxSelectSplitter = new QComboBox(groupBoxSplitParameters); comboBoxSelectSplitter->setGeometry( QRect( 210, 80, 150, 40 ) ); - comboBoxSelectSplitter->insertItem("METIS"); - comboBoxSelectSplitter->insertItem("SCOTCH"); + comboBoxSelectSplitter->insertItem(0,"METIS"); + comboBoxSelectSplitter->insertItem(0,"SCOTCH"); comboBoxSelectSplitter->setEditable(false); - spinBoxNbParts = new QSpinBox( buttonGroupSplitParameters, "spinBoxNbParts" ); + spinBoxNbParts = new QSpinBox( groupBoxSplitParameters); spinBoxNbParts->setGeometry( QRect( 210, 30, 150, 30 ) ); - spinBoxNbParts->setMaxValue( 1000 ); - spinBoxNbParts->setMinValue( 2 ); + spinBoxNbParts->setMaximum( 1000 ); + spinBoxNbParts->setMinimum( 2 ); spinBoxNbParts->setValue( 2 ); - buttonGroupProcess = new QButtonGroup( this, "buttonGroupProcess" ); - buttonGroupProcess->setGeometry( QRect( 10, 160, 380, 60 ) ); + groupBoxProcess = new QGroupBox( "groupBoxProcess",this ); + groupBoxProcess->setGeometry( QRect( 10, 160, 380, 60 ) ); - pushButtonOK = new QPushButton( buttonGroupProcess, "pushButtonOK" ); + pushButtonOK = new QPushButton( QString("pushButtonOK"),groupBoxProcess ); pushButtonOK->setGeometry( QRect( 10, 10, 110, 41 ) ); - pushButtonCancel = new QPushButton( buttonGroupProcess, "pushButtonCancel" ); + pushButtonCancel = new QPushButton( QString("pushButtonCancel"),groupBoxProcess ); pushButtonCancel->setGeometry( QRect( 250, 10, 110, 41 ) ); - setCaption( tr( "Split selected part" ) ); - buttonGroupSplitParameters->setTitle( tr( "Split parameters" ) ); + setWindowTitle( tr( "Split selected part" ) ); + groupBoxSplitParameters->setTitle( tr( "Split parameters" ) ); textLabelSelectNbParts->setText( tr( "Number of sub-parts" ) ); textLabelSelectSplitter->setText( tr( "Splitter" ) ); - buttonGroupProcess->setTitle( QString::null ); + groupBoxProcess->setTitle( QString::null ); pushButtonOK->setText( tr("OK") ); pushButtonCancel->setText( tr( "Cancel" ) ); resize( QSize(403, 234).expandedTo(minimumSizeHint()) ); - clearWState( WState_Polished ); + //clearWState( WState_Polished ); connect(pushButtonOK, SIGNAL(clicked()), this, SLOT(accept())); connect(pushButtonCancel, SIGNAL(clicked()), this, SLOT(reject())); @@ -211,7 +203,7 @@ MULTIPR_GUI_Partition2Dlg::~MULTIPR_GUI_Partition2Dlg() void MULTIPR_GUI_Partition2Dlg::accept() { - const char* strSplitter = comboBoxSelectSplitter->currentText().latin1(); + const char* strSplitter = comboBoxSelectSplitter->currentText().toLatin1(); int nbParts = spinBoxNbParts->value(); int partitionner = -1; if (strcmp(strSplitter, "METIS") == 0) @@ -223,7 +215,7 @@ void MULTIPR_GUI_Partition2Dlg::accept() partitionner = 1; } - QApplication::setOverrideCursor(Qt::waitCursor); + QApplication::setOverrideCursor(Qt::WaitCursor); try { @@ -231,18 +223,17 @@ void MULTIPR_GUI_Partition2Dlg::accept() for (QStringList::const_iterator it = partsList.begin(), last = partsList.end(); it != last; it++) { const QString& partName = (*it); - //cout << "Split " << partName.latin1() << " #parts=" << nbParts << " splitter=" << strSplitter << endl; - mModule->getMULTIPRObj()->partitionneGroupe(partName.latin1(), nbParts, partitionner); + //cout << "Split " << partName.toLatin1() << " #parts=" << nbParts << " splitter=" << strSplitter << endl; + mModule->getMULTIPRObj()->partitionneGroupe(partName.toLatin1(), nbParts, partitionner); } } catch(...) { - SUIT_MessageBox::error1( - mModule->getAppli()->desktop(), + SUIT_MessageBox::critical( + (QWidget*)mModule->getAppli()->desktop(), "Split error", - "Error while splitting selected part(s)", - tr("OK") ); + "Error while splitting selected part(s)"); } QApplication::restoreOverrideCursor(); @@ -258,25 +249,23 @@ void MULTIPR_GUI_Partition2Dlg::reject() MULTIPR_GUI_DecimateDlg::MULTIPR_GUI_DecimateDlg(MULTIPR_GUI* theModule) : QDialog( - theModule->application()->desktop(), - 0, - false, - WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) + (QWidget*)theModule->application()->desktop(), + Qt::WindowTitleHint | Qt::WindowSystemMenuHint) { mModule = theModule; - buttonGroupSelectField = new QButtonGroup( this, "buttonGroupSelectField" ); - buttonGroupSelectField->setGeometry( QRect( 10, 10, 710, 140 ) ); + groupBoxSelectField = new QGroupBox("groupBoxSelectField",this ); + groupBoxSelectField->setGeometry( QRect( 10, 10, 710, 140 ) ); - textLabelSelectFieldName = new QLabel( buttonGroupSelectField, "textLabelSelectFieldName" ); + textLabelSelectFieldName = new QLabel( "textLabelSelectFieldName",groupBoxSelectField ); textLabelSelectFieldName->setGeometry( QRect( 30, 30, 141, 31 ) ); - textLabelSelectFieldIteration = new QLabel( buttonGroupSelectField, "textLabelSelectFieldIteration" ); + textLabelSelectFieldIteration = new QLabel( "textLabelSelectFieldIteration",groupBoxSelectField ); textLabelSelectFieldIteration->setGeometry( QRect( 30, 80, 111, 31 ) ); const QStringList& partsList = mModule->getSelectedParts(); // Lets get the fields !. QString allParts = partsList.join("|"); - MULTIPR_ORB::string_array* listFields = theModule->getMULTIPRObj()->getFields(allParts.latin1()); + MULTIPR_ORB::string_array* listFields = theModule->getMULTIPRObj()->getFields(allParts.toLatin1()); int maxIteration = 0; int i, j; for (i = 0 ; i < listFields->length() ; ++i) @@ -284,7 +273,7 @@ MULTIPR_GUI_DecimateDlg::MULTIPR_GUI_DecimateDlg(MULTIPR_GUI* theModule) : char* strItem = (*listFields)[i]; for (j = 0; strItem[j] && strItem[j] != ' '; ++j); strItem[j] = 0; - CORBA::Long nbIteration = theModule->getMULTIPRObj()->getTimeStamps(allParts.latin1(), strItem); + CORBA::Long nbIteration = theModule->getMULTIPRObj()->getTimeStamps(allParts.toLatin1(), strItem); strItem[j] = ' '; if (nbIteration > maxIteration) { @@ -292,66 +281,66 @@ MULTIPR_GUI_DecimateDlg::MULTIPR_GUI_DecimateDlg(MULTIPR_GUI* theModule) : } } - comboBoxSelectFieldIteration = new QComboBox( FALSE, buttonGroupSelectField, "comboBoxSelectFieldIteration" ); + comboBoxSelectFieldIteration = new QComboBox( groupBoxSelectField ); comboBoxSelectFieldIteration->setGeometry( QRect( 150, 80, 540, 40 ) ); for (int i=1 ; i<=maxIteration ; i++) { - comboBoxSelectFieldIteration->insertItem(QString::number(i)); + comboBoxSelectFieldIteration->insertItem(0,QString::number(i)); } - comboBoxSelectFieldName = new QComboBox( FALSE, buttonGroupSelectField, "comboBoxSelectFieldName" ); + comboBoxSelectFieldName = new QComboBox(groupBoxSelectField ); comboBoxSelectFieldName->setGeometry( QRect( 150, 30, 540, 40 ) ); for (int i=0 ; ilength() ; i++) { const char* strItem = (*listFields)[i]; - comboBoxSelectFieldName->insertItem(strItem); + comboBoxSelectFieldName->insertItem(0,strItem); } comboBoxSelectFieldName->setEditable(false); - QToolTip::add( comboBoxSelectFieldName, tr( "only scalar fields are listed (multi-component fields are not displayed)" ) ); + comboBoxSelectFieldName->setToolTip(tr( "only scalar fields are listed (multi-component fields are not displayed)" )); - buttonGroupSelectFilter = new QButtonGroup( this, "buttonGroupSelectFilter" ); - buttonGroupSelectFilter->setGeometry( QRect( 10, 160, 710, 90 ) ); + groupBoxSelectFilter = new QGroupBox("groupBoxSelectFilter",this ); + groupBoxSelectFilter->setGeometry( QRect( 10, 160, 710, 90 ) ); - textLabelSelectFilter = new QLabel( buttonGroupSelectFilter, "textLabelSelectFilter" ); + textLabelSelectFilter = new QLabel( "textLabelSelectFilter",groupBoxSelectFilter ); textLabelSelectFilter->setGeometry( QRect( 30, 30, 101, 31 ) ); - comboBoxSelectFilter = new QComboBox( FALSE, buttonGroupSelectFilter, "comboBoxSelectFilter" ); + comboBoxSelectFilter = new QComboBox( groupBoxSelectFilter ); comboBoxSelectFilter->setGeometry( QRect( 150, 30, 540, 40 ) ); - comboBoxSelectFilter->insertItem("Filtre_GradientMoyen"); - comboBoxSelectFilter->insertItem("Filtre_Direct"); + comboBoxSelectFilter->insertItem(0,"Filtre_GradientMoyen"); + comboBoxSelectFilter->insertItem(0,"Filtre_Direct"); - buttonGroupParameters = new QButtonGroup( this, "buttonGroupParameters" ); - buttonGroupParameters->setGeometry( QRect( 10, 260, 710, 210 ) ); + groupBoxParameters = new QGroupBox( "groupBoxParameters" ,this); + groupBoxParameters->setGeometry( QRect( 10, 260, 710, 210 ) ); - textLabelTMed = new QLabel( buttonGroupParameters, "textLabelTMed" ); + textLabelTMed = new QLabel( "textLabelTMed",groupBoxParameters ); textLabelTMed->setGeometry( QRect( 20, 40, 242, 30 ) ); - textLabelTLow = new QLabel( buttonGroupParameters, "textLabelTLow" ); + textLabelTLow = new QLabel( "textLabelTLow",groupBoxParameters ); textLabelTLow->setGeometry( QRect( 20, 80, 208, 30 ) ); - textLabelRadius = new QLabel( buttonGroupParameters, "textLabelRadius" ); + textLabelRadius = new QLabel( "textLabelRadius",groupBoxParameters ); textLabelRadius->setGeometry( QRect( 20, 120, 211, 30 ) ); - textLabelBoxing = new QLabel( buttonGroupParameters, "textLabelBoxing" ); + textLabelBoxing = new QLabel( "textLabelBoxing",groupBoxParameters ); textLabelBoxing->setGeometry( QRect( 20, 160, 241, 30 ) ); - lineEditTMed = new QLineEdit( buttonGroupParameters, "lineEditTMed" ); + lineEditTMed = new QLineEdit( groupBoxParameters ); lineEditTMed->setGeometry( QRect( 580, 40, 111, 30 ) ); - lineEditTLow = new QLineEdit( buttonGroupParameters, "lineEditTLow" ); + lineEditTLow = new QLineEdit( groupBoxParameters ); lineEditTLow->setGeometry( QRect( 580, 80, 111, 30 ) ); - lineEditRadius = new QLineEdit( buttonGroupParameters, "lineEditRadius" ); + lineEditRadius = new QLineEdit( groupBoxParameters ); lineEditRadius->setGeometry( QRect( 580, 120, 111, 30 ) ); - spinBoxBoxing = new QSpinBox( buttonGroupParameters, "spinBoxBoxing" ); + spinBoxBoxing = new QSpinBox( groupBoxParameters ); spinBoxBoxing->setGeometry( QRect( 580, 160, 111, 30 ) ); - spinBoxBoxing->setMaxValue( 200 ); - spinBoxBoxing->setMinValue( 2 ); + spinBoxBoxing->setMaximum( 200 ); + spinBoxBoxing->setMinimum( 2 ); spinBoxBoxing->setValue( 100 ); - QToolTip::add( spinBoxBoxing, tr( "grid: number of cells along each axis" ) ); + spinBoxBoxing->setToolTip(tr( "grid: number of cells along each axis" ) ); - infoGroup = new QButtonGroup(this, "infoGroup"); + infoGroup = new QGroupBox("infoGroup",this); infoGroup->setGeometry( QRect( 10, 480, 710, 60 ) ); char* stats; @@ -361,38 +350,38 @@ MULTIPR_GUI_DecimateDlg::MULTIPR_GUI_DecimateDlg(MULTIPR_GUI* theModule) : for (QStringList::const_iterator it = partsList.begin(), last = partsList.end(); it != last; it++) { const QString& partName = (*it); - stats = theModule->getMULTIPRObj()->getMEDInfo(partName.latin1()); + stats = theModule->getMULTIPRObj()->getMEDInfo(partName.toLatin1()); sscanf(stats, "%d", &tmp); acum += tmp; } char buf[512]; sprintf(buf, "%d", acum); - textLabelInfo = new QLabel( infoGroup, "textLabelInfo"); + textLabelInfo = new QLabel( "textLabelInfo",infoGroup); textLabelInfo->setText("Number of cells:"); textLabelInfo->setGeometry( QRect( 20, 10, 242, 30 ) ); - textLabelInfoValue = new QLabel( infoGroup, "textLabelInfoValue"); - textLabelInfoValue->setAlignment(AlignRight); + textLabelInfoValue = new QLabel( "textLabelInfoValue",infoGroup); + textLabelInfoValue->setAlignment(Qt::AlignRight); textLabelInfoValue->setText(buf); textLabelInfoValue->setGeometry( QRect( 400, 10, 290, 30 ) ); - buttonGroupProcess = new QButtonGroup( this, "buttonGroupProcess" ); - buttonGroupProcess->setGeometry( QRect( 10, 580, 710, 60 ) ); + groupBoxProcess = new QGroupBox("groupBoxProcess",this ); + groupBoxProcess->setGeometry( QRect( 10, 580, 710, 60 ) ); - pushButtonOK = new QPushButton( buttonGroupProcess, "pushButtonOK" ); + pushButtonOK = new QPushButton( QString( "pushButtonOK"),groupBoxProcess ); pushButtonOK->setGeometry( QRect( 10, 10, 110, 41 ) ); - pushButtonCancel = new QPushButton( buttonGroupProcess, "pushButtonCancel" ); + pushButtonCancel = new QPushButton( QString("pushButtonCancel"),groupBoxProcess ); pushButtonCancel->setGeometry( QRect( 581, 10, 110, 41 ) ); - pushButtonCancel->setAccel( QKeySequence( tr( "Esc" ) ) ); + pushButtonCancel->setShortcut( QKeySequence( tr( "Esc" ) ) ); - setCaption( tr( "Decimation" ) ); - buttonGroupSelectField->setTitle( tr( "Select field" ) ); + setWindowTitle( tr( "Decimation" ) ); + groupBoxSelectField->setTitle( tr( "Select field" ) ); textLabelSelectFieldName->setText( tr( "Field name" ) ); textLabelSelectFieldIteration->setText( tr( "Field iteration" ) ); - buttonGroupSelectFilter->setTitle( tr( "Select filter" ) ); + groupBoxSelectFilter->setTitle( tr( "Select filter" ) ); textLabelSelectFilter->setText( tr( "Filter name" ) ); - buttonGroupParameters->setTitle( tr( "Set parameters" ) ); + groupBoxParameters->setTitle( tr( "Set parameters" ) ); textLabelTMed->setText( tr( "Threshold for medium resolution" ) ); textLabelTLow->setText( tr( "Threshold for low resolution" ) ); textLabelRadius->setText( tr( "Radius (neighborhood)" ) ); @@ -402,28 +391,28 @@ MULTIPR_GUI_DecimateDlg::MULTIPR_GUI_DecimateDlg(MULTIPR_GUI* theModule) : float defaultRadius = 0.5f; lineEditRadius->setText( QString::number(defaultRadius) ); - buttonGroupProcess->setTitle( QString::null ); + groupBoxProcess->setTitle( QString::null ); pushButtonCancel->setText( tr( "Cancel" ) ); pushButtonOK->setText( tr("OK") ); - pushButtonThresholdAuto = new QPushButton( buttonGroupParameters, "pushButtonThresholdAuto" ); + pushButtonThresholdAuto = new QPushButton( QString("pushButtonThresholdAuto"),groupBoxParameters ); pushButtonThresholdAuto->setGeometry( QRect( 520, 80, 50, 30 ) ); QFont pushButtonThresholdAuto_font( pushButtonThresholdAuto->font() ); pushButtonThresholdAuto_font.setPointSize( 11 ); pushButtonThresholdAuto->setFont( pushButtonThresholdAuto_font ); pushButtonThresholdAuto->setText( tr( "auto" ) ); - QToolTip::add( pushButtonThresholdAuto, tr( "compute extremum for gradient (set medium=MIN and low=MAX)" ) ); + pushButtonThresholdAuto->setToolTip(tr( "compute extremum for gradient (set medium=MIN and low=MAX)" ) ); - pushButtonRadiusAuto = new QPushButton( buttonGroupParameters, "pushButtonRadiusAuto" ); + pushButtonRadiusAuto = new QPushButton( QString("pushButtonRadiusAuto"),groupBoxParameters ); pushButtonRadiusAuto->setGeometry( QRect( 520, 120, 50, 30 ) ); QFont pushButtonRadiusAuto_font( pushButtonRadiusAuto->font() ); pushButtonRadiusAuto_font.setPointSize( 11 ); pushButtonRadiusAuto->setFont( pushButtonRadiusAuto_font ); pushButtonRadiusAuto->setText( tr( "auto" ) ); - QToolTip::add( pushButtonRadiusAuto, tr( "set radius automatically (average #neighbours equal to 8)" ) ); + pushButtonRadiusAuto->setToolTip(tr( "set radius automatically (average #neighbours equal to 8)" )); resize( QSize(730, 654).expandedTo(minimumSizeHint()) ); - clearWState( WState_Polished ); + //clearWState( WState_Polished ); connect(pushButtonOK, SIGNAL(clicked()), this, SLOT(accept())); connect(pushButtonCancel, SIGNAL(clicked()), this, SLOT(reject())); @@ -444,12 +433,12 @@ MULTIPR_GUI_DecimateDlg::~MULTIPR_GUI_DecimateDlg() void MULTIPR_GUI_DecimateDlg::accept() { - const char* strFieldNameTmp = comboBoxSelectFieldName->currentText().latin1(); - const char* strFieldIt = comboBoxSelectFieldIteration->currentText().latin1(); + const char* strFieldNameTmp = comboBoxSelectFieldName->currentText().toLatin1(); + const char* strFieldIt = comboBoxSelectFieldIteration->currentText().toLatin1(); int fieldIteration = atoi(strFieldIt); char strFieldName[MED_TAILLE_NOM + 1]; - const char* filterName = comboBoxSelectFilter->currentText().latin1(); + const char* filterName = comboBoxSelectFilter->currentText().toLatin1(); char params[MULTIPR_GUI_MAX_PARAMS_LENGTH]; int i; @@ -476,13 +465,13 @@ void MULTIPR_GUI_DecimateDlg::accept() } else { - SUIT_MessageBox::error1(mModule->getAppli()->desktop(), - "Decimation error", - "Unknown filter name.", - tr("OK") ); + SUIT_MessageBox::critical( + (QWidget*)mModule->getAppli()->desktop(), + "Decimation error", + "Unknown filter name."); } - QApplication::setOverrideCursor(Qt::waitCursor); + QApplication::setOverrideCursor(Qt::WaitCursor); MULTIPR_ORB::string_array* list = NULL; try @@ -492,7 +481,7 @@ void MULTIPR_GUI_DecimateDlg::accept() { const QString& partName = (*it); - list = mModule->getMULTIPRObj()->decimePartition(partName.latin1(), + list = mModule->getMULTIPRObj()->decimePartition(partName.toLatin1(), strFieldName, fieldIteration, filterName, @@ -501,20 +490,18 @@ void MULTIPR_GUI_DecimateDlg::accept() } catch(...) { - SUIT_MessageBox::error1( - mModule->getAppli()->desktop(), + SUIT_MessageBox::critical( + (QWidget*)mModule->getAppli()->desktop(), "Decimation error", - "Error while decimating selected part(s)", - tr("OK") ); + "Error while decimating selected part(s)"); } if (list != NULL && list->length() >= 4) { const char* rate = (*list)[list->length() - 1]; - SUIT_MessageBox::info1(mModule->getAppli()->desktop(), + SUIT_MessageBox::information((QWidget*)mModule->getAppli()->desktop(), "Compression rate", - rate, - tr("OK") ); + rate); } QApplication::restoreOverrideCursor(); QDialog::accept(); @@ -525,51 +512,47 @@ bool MULTIPR_GUI_DecimateDlg::setGradAvgFilterParams(char* pParams) int boxing = spinBoxBoxing->value(); double thresholdMed; - int ret = sscanf(lineEditTMed->text().latin1(), "%lf", &thresholdMed); + int ret = sscanf(lineEditTMed->text().toLatin1(), "%lf", &thresholdMed); if ((ret != 1) || (thresholdMed <= 0.0f)) { - SUIT_MessageBox::error1( - mModule->getAppli()->desktop(), + SUIT_MessageBox::critical( + (QWidget*)mModule->getAppli()->desktop(), "Decimation parameters error", - "Invalid medium threshold (should be > 0.0)", - tr("OK") ); + "Invalid medium threshold (should be > 0.0)"); return false; } double thresholdLow; - ret = sscanf(lineEditTLow->text().latin1(), "%lf", &thresholdLow); + ret = sscanf(lineEditTLow->text().toLatin1(), "%lf", &thresholdLow); if ((ret != 1) || (thresholdLow <= 0.0f)) { - SUIT_MessageBox::error1( - mModule->getAppli()->desktop(), + SUIT_MessageBox::critical( + (QWidget*)mModule->getAppli()->desktop(), "Decimation parameters error", - "Invalid low threshold (should be > 0.0)", - tr("OK") ); + "Invalid low threshold (should be > 0.0)"); return false; } if (thresholdMed >= thresholdLow) { - SUIT_MessageBox::error1( - mModule->getAppli()->desktop(), + SUIT_MessageBox::critical( + (QWidget*)mModule->getAppli()->desktop(), "Decimation parameters error", - "Medium threshold must be < low threshold", - tr("OK") ); + "Medium threshold must be < low threshold"); return false; } double radius; - ret = sscanf(lineEditRadius->text().latin1(), "%lf", &radius); + ret = sscanf(lineEditRadius->text().toLatin1(), "%lf", &radius); if ((ret != 1) || (radius <= 0.0f)) { - SUIT_MessageBox::error1( - mModule->getAppli()->desktop(), + SUIT_MessageBox::critical( + (QWidget*)mModule->getAppli()->desktop(), "Decimation parameters error", - "Invalid radius (should be > 0.0)", - tr("OK") ); + "Invalid radius (should be > 0.0)"); return false; } @@ -581,41 +564,36 @@ bool MULTIPR_GUI_DecimateDlg::setGradAvgFilterParams(char* pParams) bool MULTIPR_GUI_DecimateDlg::setDirectFilterParams(char* pParams) { - int boxing = spinBoxBoxing->value(); - double thresholdMed; - int ret = sscanf(lineEditTMed->text().latin1(), "%lf", &thresholdMed); + int ret = sscanf(lineEditTMed->text().toLatin1(), "%lf", &thresholdMed); if (ret != 1) { - SUIT_MessageBox::error1( - mModule->getAppli()->desktop(), + SUIT_MessageBox::critical( + (QWidget*)mModule->getAppli()->desktop(), "Decimation parameters error", - "Invalid medium threshold.", - tr("OK") ); + "Invalid medium threshold."); return false; } double thresholdLow; - ret = sscanf(lineEditTLow->text().latin1(), "%lf", &thresholdLow); + ret = sscanf(lineEditTLow->text().toLatin1(), "%lf", &thresholdLow); if (ret != 1) { - SUIT_MessageBox::error1( - mModule->getAppli()->desktop(), + SUIT_MessageBox::critical( + (QWidget*)mModule->getAppli()->desktop(), "Decimation parameters error", - "Invalid low threshold.", - tr("OK") ); + "Invalid low threshold."); return false; } if (thresholdMed >= thresholdLow) { - SUIT_MessageBox::error1( - mModule->getAppli()->desktop(), + SUIT_MessageBox::critical( + (QWidget*)mModule->getAppli()->desktop(), "Decimation parameters error", - "Medium threshold must be < low threshold", - tr("OK") ); + "Medium threshold must be < low threshold"); return false; } @@ -647,11 +625,10 @@ void MULTIPR_GUI_DecimateDlg::selectField(const QString& valueText) } else { - SUIT_MessageBox::error1( - mModule->getAppli()->desktop(), + SUIT_MessageBox::critical( + (QWidget*)mModule->getAppli()->desktop(), "Decimation error", - "Unknown filter name.", - tr("OK") ); + "Unknown filter name."); } } @@ -665,9 +642,9 @@ void MULTIPR_GUI_DecimateDlg::OnRadiusAuto() { // evaluates default radius for the first selected part const QStringList& partsList = mModule->getSelectedParts(); - const char* strFieldIt = comboBoxSelectFieldIteration->currentText().latin1(); + const char* strFieldIt = comboBoxSelectFieldIteration->currentText().toLatin1(); int fieldIteration = atoi(strFieldIt); - char* strPartInfo0 = mModule->getMULTIPRObj()->getPartInfo(partsList[0].latin1()); + char* strPartInfo0 = mModule->getMULTIPRObj()->getPartInfo(partsList[0].toLatin1()); char lMeshName[256]; int lId; @@ -688,7 +665,7 @@ void MULTIPR_GUI_DecimateDlg::OnRadiusAuto() return; } - QApplication::setOverrideCursor(Qt::waitCursor); + QApplication::setOverrideCursor(Qt::WaitCursor); float defaultRadius = 0.5f; try { @@ -697,9 +674,9 @@ void MULTIPR_GUI_DecimateDlg::OnRadiusAuto() char* res = mModule->getMULTIPRObj()->evalDecimationParams( lPartName, - comboBoxSelectFieldName->currentText().latin1(), + comboBoxSelectFieldName->currentText().toLatin1(), fieldIteration, - comboBoxSelectFilter->currentText().latin1(), + comboBoxSelectFilter->currentText().toLatin1(), strParams); sscanf(res, "%f", &defaultRadius); @@ -717,9 +694,9 @@ void MULTIPR_GUI_DecimateDlg::OnThresholdAuto() { // evaluates default radius for the first selected part const QStringList& partsList = mModule->getSelectedParts(); - const char* strFieldIt = comboBoxSelectFieldIteration->currentText().latin1(); + const char* strFieldIt = comboBoxSelectFieldIteration->currentText().toLatin1(); int fieldIteration = atoi(strFieldIt); - char* strPartInfo0 = mModule->getMULTIPRObj()->getPartInfo(partsList[0].latin1()); + char* strPartInfo0 = mModule->getMULTIPRObj()->getPartInfo(partsList[0].toLatin1()); QString filterName = comboBoxSelectFilter->currentText(); char lMeshName[256]; @@ -736,20 +713,19 @@ void MULTIPR_GUI_DecimateDlg::OnThresholdAuto() lPath, lMEDFileName); - QApplication::setOverrideCursor(Qt::waitCursor); + QApplication::setOverrideCursor(Qt::WaitCursor); if (filterName == "Filtre_GradientMoyen") { try { float radius; - ret = sscanf(lineEditRadius->text().latin1(), "%f", &radius); + ret = sscanf(lineEditRadius->text().toLatin1(), "%f", &radius); if ((ret != 1) || (radius <= 0.0f)) { - SUIT_MessageBox::error1( - mModule->getAppli()->desktop(), + SUIT_MessageBox::critical( + (QWidget*)mModule->getAppli()->desktop(), "Decimation parameters error", - "Invalid radius (should be > 0.0)", - tr("OK") ); + "Invalid radius (should be > 0.0)"); return; } @@ -759,9 +735,9 @@ void MULTIPR_GUI_DecimateDlg::OnThresholdAuto() char* res = mModule->getMULTIPRObj()->evalDecimationParams( lPartName, - comboBoxSelectFieldName->currentText().latin1(), + comboBoxSelectFieldName->currentText().toLatin1(), fieldIteration, - comboBoxSelectFilter->currentText().latin1(), + comboBoxSelectFilter->currentText().toLatin1(), strParams); float gradMin, gradAvg, gradMax; @@ -779,17 +755,16 @@ void MULTIPR_GUI_DecimateDlg::OnThresholdAuto() float lMin = 1.0f; float lMax = 2.0f; - mModule->getMULTIPRObj()->getFieldMinMax(lPartName, comboBoxSelectFieldName->currentText().latin1(), lMin, lMax); + mModule->getMULTIPRObj()->getFieldMinMax(lPartName, comboBoxSelectFieldName->currentText().toLatin1(), lMin, lMax); lineEditTMed->setText(QString::number(lMin)); lineEditTLow->setText(QString::number(lMax)); } else { - SUIT_MessageBox::error1( - mModule->getAppli()->desktop(), + SUIT_MessageBox::critical( + (QWidget*)mModule->getAppli()->desktop(), "Decimation error", - "Unknown filter name.", - tr("OK") ); + "Unknown filter name."); } QApplication::restoreOverrideCursor(); } @@ -802,13 +777,11 @@ void MULTIPR_GUI_DecimateDlg::OnThresholdAuto() MULTIPR_GUI_ProgressCallbackDlg::MULTIPR_GUI_ProgressCallbackDlg(QWidget* parent) : QProgressDialog( parent, - 0, - false, - WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) + Qt::WindowTitleHint | Qt::WindowSystemMenuHint) { - setLabel(new QLabel(this, "Please wait")); + setLabel(new QLabel(QString("Please wait"),this)); setLabelText("Please wait"); - setTotalSteps(100); +// setTotalSteps(100); } @@ -820,20 +793,20 @@ MULTIPR_GUI_ProgressCallbackDlg::~MULTIPR_GUI_ProgressCallbackDlg() void MULTIPR_GUI_ProgressCallbackDlg::start(const char* pTaskTitle, int pNumStep) { - setCaption(pTaskTitle); + setWindowTitle(pTaskTitle); MULTIPR_ProgressCallback::init(pNumStep); } void MULTIPR_GUI_ProgressCallbackDlg::done() { - setProgress(100); + setValue(100); } void MULTIPR_GUI_ProgressCallbackDlg::progress(float pPercent) { - setProgress(int(pPercent)); + setValue(int(pPercent)); } @@ -859,11 +832,10 @@ void MULTIPR_GUI_EmptyMeshCallbackDlg::reportEmptyMesh(string pInfo) char msg[256]; sprintf(msg, "Empty mesh detected (%s)", pInfo.c_str()); - SUIT_MessageBox::warn1( + SUIT_MessageBox::warning( mParent, "Empty mesh detected", - msg, - "OK" ); + msg); } // EOF diff --git a/src/MULTIPRGUI/MULTIPR_GUI_Dlg.h b/src/MULTIPRGUI/MULTIPR_GUI_Dlg.h index 2b0c7f8..7e69163 100644 --- a/src/MULTIPRGUI/MULTIPR_GUI_Dlg.h +++ b/src/MULTIPRGUI/MULTIPR_GUI_Dlg.h @@ -19,8 +19,8 @@ // Includes section //***************************************************************************** -#include -#include +#include +#include #include "MULTIPR_ProgressCallback.hxx" @@ -36,7 +36,7 @@ class QVBoxLayout; class QHBoxLayout; class QGridLayout; class QSpacerItem; -class QButtonGroup; +class QGroupBox; class QLabel; class QComboBox; class QLineEdit; @@ -63,10 +63,10 @@ public: MULTIPR_GUI_Partition1Dlg(MULTIPR_GUI* theModule); ~MULTIPR_GUI_Partition1Dlg(); - QButtonGroup* buttonGroupProcess; + QGroupBox* groupBoxProcess; QPushButton* pushButtonCancel; QPushButton* pushButtonOK; - QButtonGroup* buttonGroupSelectMesh; + QGroupBox* groupBoxSelectMesh; QComboBox* comboBoxSelectMesh; QLabel* textLabelSelectMesh; @@ -93,12 +93,12 @@ public: MULTIPR_GUI_Partition2Dlg(MULTIPR_GUI* theModule); ~MULTIPR_GUI_Partition2Dlg(); - QButtonGroup* buttonGroupSplitParameters; + QGroupBox* groupBoxSplitParameters; QLabel* textLabelSelectNbParts; QLabel* textLabelSelectSplitter; QComboBox* comboBoxSelectSplitter; QSpinBox* spinBoxNbParts; - QButtonGroup* buttonGroupProcess; + QGroupBox* groupBoxProcess; QPushButton* pushButtonOK; QPushButton* pushButtonCancel; @@ -124,15 +124,15 @@ public: MULTIPR_GUI_DecimateDlg(MULTIPR_GUI* theModule); ~MULTIPR_GUI_DecimateDlg(); - QButtonGroup* buttonGroupSelectField; + QGroupBox* groupBoxSelectField; QLabel* textLabelSelectFieldName; QLabel* textLabelSelectFieldIteration; QComboBox* comboBoxSelectFieldIteration; QComboBox* comboBoxSelectFieldName; - QButtonGroup* buttonGroupSelectFilter; + QGroupBox* groupBoxSelectFilter; QLabel* textLabelSelectFilter; QComboBox* comboBoxSelectFilter; - QButtonGroup* buttonGroupParameters; + QGroupBox* groupBoxParameters; QLabel* textLabelTMed; QLabel* textLabelTLow; QLabel* textLabelRadius; @@ -141,12 +141,12 @@ public: QLineEdit* lineEditTLow; QLineEdit* lineEditRadius; QSpinBox* spinBoxBoxing; - QButtonGroup* buttonGroupProcess; + QGroupBox* groupBoxProcess; QPushButton* pushButtonCancel; QPushButton* pushButtonOK; QPushButton* pushButtonThresholdAuto; QPushButton* pushButtonRadiusAuto; - QButtonGroup* infoGroup; + QGroupBox* infoGroup; QLabel* textLabelInfo; QLabel* textLabelInfoValue; diff --git a/src/MULTIPRGUI/MULTIPR_icons.po b/src/MULTIPRGUI/MULTIPR_icons.po deleted file mode 100644 index 546ec0c..0000000 --- a/src/MULTIPRGUI/MULTIPR_icons.po +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright (C) 2005 CEA/DEN, EDF R&D -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# 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" - -msgid "MULTIPR_ICON_GET_BANNER" -msgstr "ExecMULTIPR.png" - -msgid "MULTIPR_ICON_IMPORT_MED" -msgstr "MULTIPR_import_med.png" - -msgid "MULTIPR_ICON_SAVE_MED" -msgstr "MULTIPR_save_med.png" diff --git a/src/MULTIPRGUI/MULTIPR_icons.ts b/src/MULTIPRGUI/MULTIPR_icons.ts new file mode 100644 index 0000000..a6b59f0 --- /dev/null +++ b/src/MULTIPRGUI/MULTIPR_icons.ts @@ -0,0 +1,42 @@ + + + + + @default + + MULTIPR_ICON_GET_BANNER + ExecMULTIPR.png + + + MULTIPR_ICON_IMPORT_MED + MULTIPR_import_med.png + + + MULTIPR_ICON_SAVE_MED + MULTIPR_save_med.png + + + + diff --git a/src/MULTIPRGUI/MULTIPR_msg_en.po b/src/MULTIPRGUI/MULTIPR_msg_en.po deleted file mode 100644 index 0a579fd..0000000 --- a/src/MULTIPRGUI/MULTIPR_msg_en.po +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright (C) 2005 CEA/DEN, EDF R&D -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but MULTIPR_GUI 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 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 "MULTIPR_BUT_OK" -msgstr "OK" - -msgid "MULTIPR_BUT_CANCEL" -msgstr "Cancel" - -msgid "MULTIPR_TLT_IMPORT_FROM_MED_FILE" -msgstr "Import from MED file" - -msgid "MULTIPR_MEN_IMPORT_FROM_MED_FILE" -msgstr "Import from MED file" - -msgid "MULTIPR_STS_IMPORT_FROM_MED_FILE" -msgstr "Open a sequential or a distributed MED file" - -msgid "MULTIPR_TLT_SPLIT" -msgstr "Split part" - -msgid "MULTIPR_MEN_SPLIT" -msgstr "Split part" - -msgid "MULTIPR_STS_SPLIT" -msgstr "Split selected parts of the current distributed mesh" - -msgid "MULTIPR_TLT_DECIMATE" -msgstr "Decimate" - -msgid "MULTIPR_MEN_DECIMATE" -msgstr "Decimate" - -msgid "MULTIPR_STS_DECIMATE" -msgstr "Decimate selected parts (build two new meshes at lower resolution)" - -msgid "MULTIPR_TLT_REMOVE" -msgstr "Remove" - -msgid "MULTIPR_MEN_REMOVE" -msgstr "Remove" - -msgid "MULTIPR_STS_REMOVE" -msgstr "Remove selected parts" - -msgid "MULTIPR_TLT_SAVE" -msgstr "Save distributed mesh" - -msgid "MULTIPR_MEN_SAVE" -msgstr "Save distributed mesh" - -msgid "MULTIPR_STS_SAVE" -msgstr "Save the current distributed MED file" - -msgid "MULTIPR_MEN_FILE" -msgstr "&File" - -msgid "MULTIPR_MEN_FILE_MULTIPR" -msgstr "Multipr" - -msgid "MULTIPR_MEN_MULTIPR" -msgstr "Multipr" - -msgid "MULTIPR_TOOL_MULTIPR" -msgstr "MULTIPR" - -msgid "MULTIPR_FLT_ALL_FILES" -msgstr "All Files (*.*)" - -msgid "MULTIPR_FLT_MED_FILES" -msgstr "MED Files (*.med)" - diff --git a/src/MULTIPRGUI/MULTIPR_msg_en.ts b/src/MULTIPRGUI/MULTIPR_msg_en.ts new file mode 100644 index 0000000..1468b35 --- /dev/null +++ b/src/MULTIPRGUI/MULTIPR_msg_en.ts @@ -0,0 +1,120 @@ + + + + + + @default + + MULTIPR_BUT_OK + OK + + + MULTIPR_BUT_CANCEL + Cancel + + + MULTIPR_MEN_IMPORT_FROM_MED_FILE + Import from MED file + + + MULTIPR_TLT_IMPORT_FROM_MED_FILE + Import from MED file + + + MULTIPR_STS_IMPORT_FROM_MED_FILE + Open a sequential or a distributed MED file + + + MULTIPR_TLT_SPLIT + Split part + + + MULTIPR_MEN_SPLIT + Split part + + + MULTIPR_STS_SPLIT + Split selected parts of the current distributed mesh + + + MULTIPR_TLT_DECIMATE + Decimate + + + MULTIPR_MEN_DECIMATE + Decimate + + + MULTIPR_STS_DECIMATE + Decimate selected parts (build two new meshes at lower resolution) + + + MULTIPR_TLT_REMOVE + Remove + + + MULTIPR_MEN_REMOVE + Remove + + + MULTIPR_STS_REMOVE + Remove selected parts + + + MULTIPR_TLT_SAVE + Save distributed mesh + + + MULTIPR_MEN_SAVE + Save distributed mesh + + + MULTIPR_STS_SAVE + Save the current distributed MED file + + + MULTIPR_MEN_FILE + &File + + + MULTIPR_MEN_FILE_MULTIPR + Multipr + + + MULTIPR_MEN_MULTIPR + Multipr + + + MULTIPR_TOOL_MULTIPR + MULTIPR + + + MULTIPR_FLT_ALL_FILES + All Files (*.*) + + + MULTIPR_FLT_MED_FILES + MED Files (*.med) + + + + + diff --git a/src/MULTIPRGUI/MULTIPR_msg_fr.po b/src/MULTIPRGUI/MULTIPR_msg_fr.po deleted file mode 100644 index 3722623..0000000 --- a/src/MULTIPRGUI/MULTIPR_msg_fr.po +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright (C) 2005 CEA/DEN, EDF R&D -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# 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:25 PM CET\n" -"PO-Revision-Date: YYYY-MM-DD\n" -"Last-Translator: FULLNAME \n" -"Content-Type: text/plain; charset=iso-8859-1\n" - -#: MULTIPR_GUI.cxx:76 -msgid "MULTIPR_GUI::BUT_OK" -msgstr "OK" - -#: MULTIPR_GUI.cxx:76 -msgid "MULTIPR_GUI::INF_MULTIPR_BANNER" -msgstr "Information MULTIPR" - -#: MULTIPR_GUI.cxx:76 -msgid "MULTIPR_GUI::INF_MULTIPR_MENU" -msgstr "Ceci est un simple test" - -#: MULTIPR_GUI.cxx:57 -msgid "MULTIPR_GUI::QUE_MULTIPR_LABEL" -msgstr "Import Prénom" - -#: MULTIPR_GUI.cxx:57 -msgid "MULTIPR_GUI::QUE_MULTIPR_NAME" -msgstr "Entrez votre prénom, s'il vous plait" - -msgid "TLT_MY_NEW_ITEM" -msgstr "My menu item" - -msgid "MEN_MY_NEW_ITEM" -msgstr "My menu item" - -msgid "STS_MY_NEW_ITEM" -msgstr "Call my menu item" - -msgid "TLT_GET_BANNER" -msgstr "Get MULTIPR banner" - -msgid "MEN_GET_BANNER" -msgstr "Get banner" - -msgid "STS_GET_BANNER" -msgstr "Get MULTIPR banner" - -msgid "MEN_FILE" -msgstr "&File" - -msgid "MEN_FILE_MULTIPR" -msgstr "Multipr" - -msgid "MEN_MULTIPR" -msgstr "MULTIPR" - -msgid "TOOL_MULTIPR" -msgstr "MULTIPR" - diff --git a/src/MULTIPRGUI/MULTIPR_msg_fr.ts b/src/MULTIPRGUI/MULTIPR_msg_fr.ts new file mode 100644 index 0000000..1468b35 --- /dev/null +++ b/src/MULTIPRGUI/MULTIPR_msg_fr.ts @@ -0,0 +1,120 @@ + + + + + + @default + + MULTIPR_BUT_OK + OK + + + MULTIPR_BUT_CANCEL + Cancel + + + MULTIPR_MEN_IMPORT_FROM_MED_FILE + Import from MED file + + + MULTIPR_TLT_IMPORT_FROM_MED_FILE + Import from MED file + + + MULTIPR_STS_IMPORT_FROM_MED_FILE + Open a sequential or a distributed MED file + + + MULTIPR_TLT_SPLIT + Split part + + + MULTIPR_MEN_SPLIT + Split part + + + MULTIPR_STS_SPLIT + Split selected parts of the current distributed mesh + + + MULTIPR_TLT_DECIMATE + Decimate + + + MULTIPR_MEN_DECIMATE + Decimate + + + MULTIPR_STS_DECIMATE + Decimate selected parts (build two new meshes at lower resolution) + + + MULTIPR_TLT_REMOVE + Remove + + + MULTIPR_MEN_REMOVE + Remove + + + MULTIPR_STS_REMOVE + Remove selected parts + + + MULTIPR_TLT_SAVE + Save distributed mesh + + + MULTIPR_MEN_SAVE + Save distributed mesh + + + MULTIPR_STS_SAVE + Save the current distributed MED file + + + MULTIPR_MEN_FILE + &File + + + MULTIPR_MEN_FILE_MULTIPR + Multipr + + + MULTIPR_MEN_MULTIPR + Multipr + + + MULTIPR_TOOL_MULTIPR + MULTIPR + + + MULTIPR_FLT_ALL_FILES + All Files (*.*) + + + MULTIPR_FLT_MED_FILES + MED Files (*.med) + + + + + diff --git a/src/MULTIPRGUI/Makefile.am b/src/MULTIPRGUI/Makefile.am new file mode 100644 index 0000000..2ecc3a9 --- /dev/null +++ b/src/MULTIPRGUI/Makefile.am @@ -0,0 +1,79 @@ +# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# -* Makefile *- +# Author : +# Modified by : Alexander BORODIN (OCN) - autotools usage +# Module : GHS3DPLUGIN +# +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +# header files +salomeinclude_HEADERS = \ + MULTIPR_GUI.h MULTIPR_GUI_Dlg.h + +# Libraries targets +lib_LTLIBRARIES = libMULTIPR.la + +dist_libMULTIPR_la_SOURCES = \ + MULTIPR_GUI_Dlg.cxx MULTIPR_GUI.cxx + +# MOC pre-processing +MOC_FILES = \ + MULTIPR_GUI_moc.cxx MULTIPR_GUI_Dlg_moc.cxx + +nodist_libMULTIPR_la_SOURCES = $(MOC_FILES) + +libMULTIPR_la_CPPFLAGS = \ + $(QT_INCLUDES) \ + $(CAS_CPPFLAGS) \ + $(KERNEL_CXXFLAGS) \ + $(MED_CXXFLAGS) \ + $(GUI_CXXFLAGS) \ + $(MED2_INCLUDES) \ + $(BOOST_CPPFLAGS) \ + $(PYTHON_INCLUDES) \ + $(CORBA_CXXFLAGS) \ + $(CORBA_INCLUDES) \ + $(KERNEL_CXXFLAGS) \ + -I$(srcdir)/../MULTIPR \ + -I$(top_builddir)/idl + +libMULTIPR_la_LDFLAGS = \ + ../../idl/libSalomeIDLMULTIPR.la \ + ../MULTIPR/libMULTIPREngine.la \ + $(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA \ + $(GUI_LDFLAGS) \ + $(QT_LIBS) \ + $(MED_LDFLAGS) $(MED2_LIBS) \ + $(BOOST_LIBS) -lboost_thread${BOOST_LIBSUFFIX} \ + -lSALOMELocalTrace \ + -lSalomeApp \ + -lmedsplitter \ + -lmedmem \ + -lmed \ + -lMULTIPR_API + +# resources files +nodist_salomeres_DATA = \ + MULTIPR_msg_en.qm \ + MULTIPR_msg_fr.qm \ + MULTIPR_icons.qm diff --git a/src/MULTIPRGUI/Makefile.in b/src/MULTIPRGUI/Makefile.in deleted file mode 100644 index 926c2b0..0000000 --- a/src/MULTIPRGUI/Makefile.in +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright (C) 2005 CEA/DEN, EDF R&D -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# source path -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl:$(top_builddir)/idl:${KERNEL_ROOT_DIR}/idl/salome - -@COMMENCE@ - -# header files -EXPORT_HEADERS= - -# .po files to transform in .qm -PO_FILES = MULTIPR_msg_en.po MULTIPR_icons.po - -# Libraries targets -LIB = libMULTIPR.la -LIB_SRC = MULTIPR_GUI.cxx MULTIPR_GUI_Dlg.cxx -LIB_MOC = MULTIPR_GUI.h MULTIPR_GUI_Dlg.h - - -LIB_CLIENT_IDL = SALOMEDS.idl SALOME_Exception.idl SALOME_ModuleCatalog.idl \ - SALOMEDS_Attributes.idl SALOME_Component.idl SALOME_GenericObj.idl \ - MULTIPR.idl Logger.idl - -LIB_SERVER_IDL = - -# additionnal information to compil and link file - -CPPFLAGS += \ - $(QT_INCLUDES) \ - $(OCC_INCLUDES) \ - $(KERNEL_CXXFLAGS) \ - $(MED_CXXFLAGS) \ - $(GUI_CXXFLAGS) \ - $(MED2_INCLUDES) \ - $(BOOST_CPPFLAGS) - -CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) $(BOOST_CPPFLAGS) - -LDFLAGS += \ - $(KERNEL_LDFLAGS) \ - $(GUI_LDFLAGS) \ - $(MED_LDFLAGS) $(MED2_LIBS) \ - $(BOOST_LIBS) -lboost_thread${BOOST_LIBSUFFIX} \ - -lSALOMELocalTrace \ - -lSalomeApp \ - -lmedsplitter \ - -lmedmem \ - -lmed_V2_1 \ - -lMULTIPR_API - -@CONCLUDE@ diff --git a/src/Makefile.am b/src/Makefile.am new file mode 100755 index 0000000..494ec9c --- /dev/null +++ b/src/Makefile.am @@ -0,0 +1,32 @@ +# Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# File : Makefile.in +# Author : (CEA) +# Modified by : Alexander BORODIN (OCN) - autotools usage +# +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +SUBDIRS = MULTIPR MULTIPRGUI + +#if MULTIPR_ENABLE_GUI +# SUBDIRS += MULTIPRGUI +#endif diff --git a/src/Makefile.in b/src/Makefile.in deleted file mode 100644 index c8862d4..0000000 --- a/src/Makefile.in +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright (C) 2005 CEA/DEN, EDF R&D -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -#============================================================================== -# File : Makefile.in -# Author : O. LE ROUX, CS -# Project : SALOME -#============================================================================== - -# source path -top_srcdir=@top_srcdir@ -top_builddir=.. -srcdir=@srcdir@ -VPATH=.:@srcdir@ - -@COMMENCE@ - -SUBDIRS = MULTIPR MULTIPRGUI - -@MODULE@