From eb01381266af8198deef28bb16eae577fdcfc488 Mon Sep 17 00:00:00 2001 From: jfa Date: Thu, 10 Mar 2011 10:15:45 +0000 Subject: [PATCH 1/1] Example of a c++ component with engine from Salome tutorial --- ATOMSOLV_version.h.in | 32 ++ AUTHORS | 0 COPYING | 340 ++++++++++++ ChangeLog | 0 INSTALL | 1 + LICENCE | 504 ++++++++++++++++++ Makefile.am | 39 ++ NEWS | 0 README | 0 adm_local/Makefile.am | 24 + adm_local/unix/Makefile.am | 24 + adm_local/unix/config_files/Makefile.am | 24 + adm_local/unix/config_files/check_ATOMSOLV.m4 | 55 ++ adm_local/unix/make_common_starter.am | 95 ++++ bin/Makefile.am | 28 + bin/VERSION.in | 1 + bin/myrunSalome.py | 54 ++ bin/runAppli.in | 61 +++ build_configure | 97 ++++ clean_configure | 33 ++ configure.ac | 303 +++++++++++ idl/ATOMSOLV.idl | 69 +++ idl/Makefile.am | 90 ++++ resources/ATOMSOLV.png | Bin 0 -> 928 bytes resources/ATOMSOLVCatalog.xml | 27 + resources/ExecATOMSOLV.png | Bin 0 -> 831 bytes resources/Makefile.am | 34 ++ resources/SalomeApp.xml | 11 + resources/atom.png | Bin 0 -> 505 bytes resources/display.png | Bin 0 -> 247 bytes resources/erase.png | Bin 0 -> 311 bytes resources/import.xpm | 28 + resources/molecule.png | Bin 0 -> 642 bytes resources/run.png | Bin 0 -> 684 bytes src/ATOMSOLV/ATOMSOLV.cxx | 103 ++++ src/ATOMSOLV/ATOMSOLV.hxx | 60 +++ src/ATOMSOLV/Makefile.am | 34 ++ src/ATOMSOLVGUI/ATOMSOLVGUI.cxx | 434 +++++++++++++++ src/ATOMSOLVGUI/ATOMSOLVGUI.h | 84 +++ src/ATOMSOLVGUI/ATOMSOLVGUI_DataModel.cxx | 70 +++ src/ATOMSOLVGUI/ATOMSOLVGUI_DataModel.h | 43 ++ src/ATOMSOLVGUI/ATOMSOLVGUI_DataObject.cxx | 151 ++++++ src/ATOMSOLVGUI/ATOMSOLVGUI_DataObject.h | 75 +++ src/ATOMSOLVGUI/ATOMSOLVGUI_Displayer.cxx | 273 ++++++++++ src/ATOMSOLVGUI/ATOMSOLVGUI_Displayer.h | 61 +++ src/ATOMSOLVGUI/ATOMSOLVGUI_Selection.cxx | 94 ++++ src/ATOMSOLVGUI/ATOMSOLVGUI_Selection.h | 39 ++ .../ATOMSOLVGUI_TransparencyDlg.cxx | 129 +++++ src/ATOMSOLVGUI/ATOMSOLVGUI_TransparencyDlg.h | 52 ++ src/ATOMSOLVGUI/Makefile.am | 73 +++ src/ATOMSOLVGUI/resources/ATOMSOLV_icons.ts | 31 ++ src/ATOMSOLVGUI/resources/ATOMSOLV_msg_en.ts | 163 ++++++ src/Makefile.am | 24 + 53 files changed, 3967 insertions(+) create mode 100644 ATOMSOLV_version.h.in create mode 100644 AUTHORS create mode 100644 COPYING create mode 100644 ChangeLog create mode 100755 INSTALL create mode 100755 LICENCE create mode 100755 Makefile.am create mode 100644 NEWS create mode 100755 README create mode 100644 adm_local/Makefile.am create mode 100644 adm_local/unix/Makefile.am create mode 100644 adm_local/unix/config_files/Makefile.am create mode 100755 adm_local/unix/config_files/check_ATOMSOLV.m4 create mode 100644 adm_local/unix/make_common_starter.am create mode 100755 bin/Makefile.am create mode 100755 bin/VERSION.in create mode 100755 bin/myrunSalome.py create mode 100755 bin/runAppli.in create mode 100755 build_configure create mode 100755 clean_configure create mode 100755 configure.ac create mode 100644 idl/ATOMSOLV.idl create mode 100644 idl/Makefile.am create mode 100644 resources/ATOMSOLV.png create mode 100644 resources/ATOMSOLVCatalog.xml create mode 100644 resources/ExecATOMSOLV.png create mode 100644 resources/Makefile.am create mode 100644 resources/SalomeApp.xml create mode 100644 resources/atom.png create mode 100644 resources/display.png create mode 100644 resources/erase.png create mode 100644 resources/import.xpm create mode 100644 resources/molecule.png create mode 100644 resources/run.png create mode 100755 src/ATOMSOLV/ATOMSOLV.cxx create mode 100644 src/ATOMSOLV/ATOMSOLV.hxx create mode 100644 src/ATOMSOLV/Makefile.am create mode 100644 src/ATOMSOLVGUI/ATOMSOLVGUI.cxx create mode 100644 src/ATOMSOLVGUI/ATOMSOLVGUI.h create mode 100644 src/ATOMSOLVGUI/ATOMSOLVGUI_DataModel.cxx create mode 100644 src/ATOMSOLVGUI/ATOMSOLVGUI_DataModel.h create mode 100644 src/ATOMSOLVGUI/ATOMSOLVGUI_DataObject.cxx create mode 100644 src/ATOMSOLVGUI/ATOMSOLVGUI_DataObject.h create mode 100644 src/ATOMSOLVGUI/ATOMSOLVGUI_Displayer.cxx create mode 100644 src/ATOMSOLVGUI/ATOMSOLVGUI_Displayer.h create mode 100644 src/ATOMSOLVGUI/ATOMSOLVGUI_Selection.cxx create mode 100644 src/ATOMSOLVGUI/ATOMSOLVGUI_Selection.h create mode 100644 src/ATOMSOLVGUI/ATOMSOLVGUI_TransparencyDlg.cxx create mode 100644 src/ATOMSOLVGUI/ATOMSOLVGUI_TransparencyDlg.h create mode 100644 src/ATOMSOLVGUI/Makefile.am create mode 100644 src/ATOMSOLVGUI/resources/ATOMSOLV_icons.ts create mode 100644 src/ATOMSOLVGUI/resources/ATOMSOLV_msg_en.ts create mode 100755 src/Makefile.am diff --git a/ATOMSOLV_version.h.in b/ATOMSOLV_version.h.in new file mode 100644 index 0000000..421f127 --- /dev/null +++ b/ATOMSOLV_version.h.in @@ -0,0 +1,32 @@ +// Copyright (C) 2007-2010 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org + +#if !defined(__ATOMSOLV_VERSION_H__) +#define __ATOMSOLV_VERSION_H__ + +/* + ATOMSOLV_VERSION is (major << 16) + (minor << 8) + patch. +*/ + +#define ATOMSOLV_VERSION_STR "@VERSION@" +#define ATOMSOLV_VERSION @XVERSION@ + +#endif // __ATOMSOLV_VERSION_H__ 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..d60c31a --- /dev/null +++ b/COPYING @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + 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 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..e69de29 diff --git a/INSTALL b/INSTALL new file mode 100755 index 0000000..113bdba --- /dev/null +++ b/INSTALL @@ -0,0 +1 @@ +This is the version 0.3.0 of ATOMSOLV (sample corba-engine) SALOME module diff --git a/LICENCE b/LICENCE new file mode 100755 index 0000000..b1e3f5a --- /dev/null +++ b/LICENCE @@ -0,0 +1,504 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + diff --git a/Makefile.am b/Makefile.am new file mode 100755 index 0000000..2b376b0 --- /dev/null +++ b/Makefile.am @@ -0,0 +1,39 @@ +# Copyright (C) 2007-2010 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 + +ACLOCAL_AMFLAGS = -I adm_local/unix/config_files \ + -I ${GUI_ROOT_DIR}/adm_local/unix/config_files \ + -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files + +SUBDIRS = adm_local resources idl src bin + +DISTCLEANFILES = a.out aclocal.m4 configure local-install.sh + +salomeinclude_DATA = ATOMSOLV_version.h + +EXTRA_DIST += \ + build_configure \ + clean_configure + +dist-hook: + rm -rf `find $(distdir) -name CVS` diff --git a/NEWS b/NEWS new file mode 100644 index 0000000..e69de29 diff --git a/README b/README new file mode 100755 index 0000000..e69de29 diff --git a/adm_local/Makefile.am b/adm_local/Makefile.am new file mode 100644 index 0000000..3d75631 --- /dev/null +++ b/adm_local/Makefile.am @@ -0,0 +1,24 @@ +# Copyright (C) 2007-2010 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +SUBDIRS = unix diff --git a/adm_local/unix/Makefile.am b/adm_local/unix/Makefile.am new file mode 100644 index 0000000..bb49b05 --- /dev/null +++ b/adm_local/unix/Makefile.am @@ -0,0 +1,24 @@ +# Copyright (C) 2007-2010 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org + +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..a2de3d8 --- /dev/null +++ b/adm_local/unix/config_files/Makefile.am @@ -0,0 +1,24 @@ +# Copyright (C) 2007-2010 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +dist_admlocalm4_DATA = check_ATOMSOLV.m4 diff --git a/adm_local/unix/config_files/check_ATOMSOLV.m4 b/adm_local/unix/config_files/check_ATOMSOLV.m4 new file mode 100755 index 0000000..722eb90 --- /dev/null +++ b/adm_local/unix/config_files/check_ATOMSOLV.m4 @@ -0,0 +1,55 @@ +# Copyright (C) 2007-2010 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org + +AC_DEFUN([CHECK_ATOMSOLV],[ + +AC_CHECKING(for ATOMSOLV) + +ATOMSOLV_ok=no + +AC_ARG_WITH(atomic, + [ --with-atomic=DIR root directory path of ATOMSOLV module installation ], + ATOMSOLV_DIR="$withval",ATOMSOLV_DIR="") + +if test "x$ATOMSOLV_DIR" == "x" ; then + # no --with-atomic-dir option used + if test "x$ATOMSOLV_ROOT_DIR" != "x" ; then + # ATOMSOLV_ROOT_DIR environment variable defined + ATOMSOLV_DIR=$ATOMSOLV_ROOT_DIR + fi +fi + +if test -f ${ATOMSOLV_DIR}/lib/salome/libATOMSOLV.so ; then + ATOMSOLV_ok=yes + AC_MSG_RESULT(Using ATOMSOLV module distribution in ${ATOMSOLV_DIR}) + + if test "x$ATOMSOLV_ROOT_DIR" == "x" ; then + ATOMSOLV_ROOT_DIR=${ATOMSOLV_DIR} + fi + AC_SUBST(ATOMSOLV_ROOT_DIR) +else + AC_MSG_WARN("Cannot find ATOMSOLV module sources") +fi + +AC_MSG_RESULT(for ATOMSOLV: $ATOMSOLV_ok) + +])dnl + diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am new file mode 100644 index 0000000..22199ed --- /dev/null +++ b/adm_local/unix/make_common_starter.am @@ -0,0 +1,95 @@ +# Copyright (C) 2007-2010 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org + +# ============================================================ +# 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 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 + +# IDL directory +salomeidldir = ${prefix}/idl/salome + +# common rules + +# meta object implementation files generation (moc) +%_moc.cxx: %.h + $(MOC) $< -o $@ + +# translation (*.qm) files generation (lrelease) +%.qm: resources/%.ts + $(LRELEASE) $< -qm $@ + +# resource files generation (qrcc) +qrc_%.cxx: %.qrc + $(QRCC) $< -o $@ -name $(*F) + +# qt forms python files generation (pyuic) +ui_%.py: %.ui + $(PYUIC) -o $@ $< + +# extra distributed files +EXTRA_DIST = $(MOC_FILES:%_moc.cxx=%.h) $(QRC_FILES:qrc_%.cxx=%.qrc) \ + $(nodist_salomeres_DATA:%.qm=resources/%.ts) + +# customize clean operation +mostlyclean-local: + rm -f @builddir@/*_moc.cxx + rm -f @builddir@/*.qm + rm -f @builddir@/ui_*.py + 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/bin/Makefile.am b/bin/Makefile.am new file mode 100755 index 0000000..2cb6735 --- /dev/null +++ b/bin/Makefile.am @@ -0,0 +1,28 @@ +# Copyright (C) 2007-2010 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +# non-distributed files +nodist_salomescript_DATA = VERSION runAppli + +# distributed files +dist_salomescript_SCRIPTS = myrunSalome.py diff --git a/bin/VERSION.in b/bin/VERSION.in new file mode 100755 index 0000000..f7a0097 --- /dev/null +++ b/bin/VERSION.in @@ -0,0 +1 @@ +THIS IS SAMPLE CORBA-ENGINE MODULE : ATOMSOLV : VERSION: @VERSION@ diff --git a/bin/myrunSalome.py b/bin/myrunSalome.py new file mode 100755 index 0000000..6feba5b --- /dev/null +++ b/bin/myrunSalome.py @@ -0,0 +1,54 @@ +#!/usr/bin/env python + +# Copyright (C) 2007-2010 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org + +def test(clt): + """ + Test function that creates an instance of ATOMSOLV component + usage : atomsolv=test(clt) + """ + # create an LifeCycleCORBA instance + import LifeCycleCORBA + lcc = LifeCycleCORBA.LifeCycleCORBA(clt.orb) + import ATOMSOLV_ORB + atomsolv = lcc.FindOrLoadComponent("FactoryServer", "ATOMSOLV") + return atomsolv + +# + +if __name__ == "__main__": + import user + from runSalome import * + clt,args = main() + + # + # Impression arborescence Naming Service + # + + if clt != None: + print + print " --- registered objects tree in Naming Service ---" + clt.showNS() + session=clt.waitNS("/Kernel/Session") + catalog=clt.waitNS("/Kernel/ModulCatalog") + import socket + container = clt.waitNS("/Containers/" + socket.gethostname().split('.')[0] + "/FactoryServer") diff --git a/bin/runAppli.in b/bin/runAppli.in new file mode 100755 index 0000000..f4f88f9 --- /dev/null +++ b/bin/runAppli.in @@ -0,0 +1,61 @@ +#!/bin/sh + +# Copyright (C) 2007-2010 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org + +export KERNEL_ROOT_DIR=@KERNEL_ROOT_DIR@ +export ATOMSOLV_ROOT_DIR=@prefix@ + +searchFreePort() { + echo -n "Searching for a free port for naming service: " + export NSPORT=2810 + local limit=$NSPORT + let limit=limit+100 + while [ 1 ] + do + aRes=`netstat -ltn | grep -E :${NSPORT}` + if [ -z "$aRes" ]; then + echo ${NSPORT} - Ok + local myhost=`hostname` + export OMNIORB_CONFIG=${HOME}/.omniORB_${myhost}_${NSPORT}.cfg + local initref="NameService=corbaname::"`hostname`":$NSPORT" + if [[ `python -c "import CORBA; print CORBA.ORB_ID"` = "omniORB4" ]]; then + echo "InitRef = $initref" > $OMNIORB_CONFIG + else + echo "ORBInitRef $initref" > $OMNIORB_CONFIG + fi + break + fi + echo -n "${NSPORT} " + if [[ $NSPORT -eq $limit ]] ; then + echo + echo "Can't find a free port to launch omniNames" + echo "Try to kill the running servers and then launch SALOME again." + exit + fi + let NSPORT=NSPORT+1 + done +} + +searchFreePort + + +${KERNEL_ROOT_DIR}/bin/salome/envSalome.py python -i $ATOMSOLV_ROOT_DIR/bin/salome/myrunSalome.py --modules=ATOMSOLV --containers=cpp,python --killall diff --git a/build_configure b/build_configure new file mode 100755 index 0000000..4851b99 --- /dev/null +++ b/build_configure @@ -0,0 +1,97 @@ +#!/bin/bash + +# Copyright (C) 2007-2010 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org + +ORIG_DIR=`pwd` +CONF_DIR=`echo $0 | sed -e "s,[^/]*$,,;s,/$,,;s,^$,.,"` + +# ____________________________________________________________________ +# Test if the KERNEL_ROOT_DIR is set correctly + +if test ! -d "${KERNEL_ROOT_DIR}"; then + echo "failed : KERNEL_ROOT_DIR variable is not correct !" + exit +fi + +# ____________________________________________________________________ +# Test if the GUI_ROOT_DIR is set correctly + +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` + +# ____________________________________________________________________ +# 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" + +aclocal -I adm_local/unix/config_files \ + -I ${GUI_ROOT_DIR}/adm_local/unix/config_files \ + -I ${ATOMGEN_ROOT_DIR}/adm_local/unix/config_files \ + -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files || exit 1 + +# ____________________________________________________________________ +# libtoolize creates some configuration files (ltmain.sh, +# config.guess and config.sub). It only depends on the libtool +# version. The files are created in the directory specified with the +# AC_CONFIG_AUX_DIR() tag (see configure.ac). +# output: +# 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..50b5324 --- /dev/null +++ b/clean_configure @@ -0,0 +1,33 @@ +#!/bin/bash + +# Copyright (C) 2007-2010 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org + +rm -rf autom4te.cache aclocal.m4 configure make_config +find . -name "*~" -print -exec rm {} \; +find . -name "*.pyc" -print -exec rm {} \; + +find adm_local -name Makefile.in | xargs rm -f +find bin -name Makefile.in | xargs rm -f +find resources -name Makefile.in | xargs rm -f +find idl -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 100755 index 0000000..ce8a18a --- /dev/null +++ b/configure.ac @@ -0,0 +1,303 @@ +# Copyright (C) 2007-2010 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org + +AC_INIT([Salome5 Project ATOMSOLV module], [0.3.0], [webmaster.salome@opencascade.com], [SalomeATOMSOLV]) +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=atomsolv +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 + pour les librairies dynamiques ! + +AC_ENABLE_DEBUG(yes) +AC_DISABLE_PRODUCTION + +echo --------------------------------------------- +echo testing libtool +echo --------------------------------------------- + +dnl first, we set static to no! +dnl if we want it, use --enable-static +AC_ENABLE_STATIC(no) + +AC_LIBTOOL_DLOPEN +AC_PROG_LIBTOOL + +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 add library libm : +AC_CHECK_LIB(m,ceil) + +dnl Library librt : for alpha/osf +AC_CHECK_LIB(rt,nanosleep) + +dnl +dnl Check if we use std iostream by default or if we must add +dnl a compiler directive for that +dnl + +AC_CXX_USE_STD_IOSTREAM + +dnl +dnl Well we use sstream which is not in gcc pre-2.95.3 +dnl We must test if it exists. If not, add it in include ! +dnl + +AC_CXX_HAVE_SSTREAM + +dnl +dnl --------------------------------------------- +dnl testing linker +dnl --------------------------------------------- +dnl + +AC_LINKER_OPTIONS + +dnl +dnl --------------------------------------------- +dnl testing WITHIHM +dnl --------------------------------------------- +dnl + +CHECK_WITHIHM + +echo +echo --------------------------------------------- +echo testing LEX \& YACC +echo --------------------------------------------- +echo + +lex_yacc_ok=no +AC_PROG_YACC +AC_PROG_LEX +lex_yacc_ok=yes + +echo +echo --------------------------------------------- +echo testing python +echo --------------------------------------------- +echo + +CHECK_PYTHON + +AM_PATH_PYTHON(2.3) + +echo +echo --------------------------------------------- +echo testing threads +echo --------------------------------------------- +echo + +ENABLE_PTHREADS + +echo +echo --------------------------------------------- +echo testing omniORB +echo --------------------------------------------- +echo + +CHECK_OMNIORB + +echo +echo --------------------------------------------- +echo default ORB : omniORB +echo --------------------------------------------- +echo + +DEFAULT_ORB=omniORB + +echo +echo --------------------------------------------- +echo testing Corba +echo --------------------------------------------- +echo + +CHECK_CORBA + +AC_SUBST_FILE(CORBA) +corba=make_$ORB +CORBA=adm_local/unix/$corba + +echo +echo --------------------------------------------- +echo Testing Qt +echo --------------------------------------------- +echo + +CHECK_QT + +echo +echo --------------------------------------------- +echo Testing OpenCascade +echo --------------------------------------------- +echo + +CHECK_CAS + +echo +echo --------------------------------------------- +echo Testing VTK +echo --------------------------------------------- +echo + +CHECK_VTK + +echo +echo --------------------------------------------- +echo Testing Kernel +echo --------------------------------------------- +echo + +CHECK_KERNEL + +echo +echo --------------------------------------------- +echo Testing GUI +echo --------------------------------------------- +echo + +CHECK_SALOME_GUI + +echo +echo --------------------------------------------- +echo Testing ATOMGEN +echo --------------------------------------------- +echo + +CHECK_ATOMGEN + +echo +echo --------------------------------------------- +echo Summary +echo --------------------------------------------- +echo + +echo Configure +variables="cc_ok lex_yacc_ok python_ok threads_ok omniORB_ok qt_ok occ_ok vtk_ok Kernel_ok SalomeGUI_ok ATOMGEN_ok" + +for var in $variables +do + printf " %10s : " `echo \$var | sed -e "s,_ok,,"` + eval echo \$$var +done + +dnl We don't need to say when we re entering directories if we re using +dnl GNU make because make does it for us. +if test "X$GMAKE" = "Xyes"; then + AC_SUBST(SETX) SETX=":" +else + AC_SUBST(SETX) SETX="set -x" +fi + +AC_OUTPUT_COMMANDS([ \ + chmod +x ./bin/* \ +]) + +echo +echo --------------------------------------------- +echo generating Makefiles and configure files +echo --------------------------------------------- +echo + +# 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 \ + idl/Makefile \ + resources/Makefile \ + src/Makefile \ + src/ATOMSOLV/Makefile \ + src/ATOMSOLVGUI/Makefile \ + ATOMSOLV_version.h \ + Makefile \ +]) diff --git a/idl/ATOMSOLV.idl b/idl/ATOMSOLV.idl new file mode 100644 index 0000000..526369d --- /dev/null +++ b/idl/ATOMSOLV.idl @@ -0,0 +1,69 @@ +// Copyright (C) 2007-2010 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 + +#ifndef __ATOMSOLV_GEN__ +#define __ATOMSOLV_GEN__ + +#include "SALOME_Component.idl" +#include "SALOME_Exception.idl" +#include "ATOMGEN.idl" + + +/*! \ingroup EXAMPLES + +This package contains the interface ATOMSOLV_ORB used +for %ATOMSOLV component as an example in %SALOME application. +*/ +module ATOMSOLV_ORB +{ + /*! + New type for Molecule with a double coefficient (temperature) + */ + struct TMolecule + { + ATOMGEN_ORB::Molecule molecule; + double temperature; + }; + + typedef sequence TMoleculeList; + + /*! \brief Interface of the %ATOMSOLV component + */ + interface ATOMSOLV_Gen : Engines::EngineComponent + { + /*! + Set internal data structure from external source (ATOMGEN component, for example). + */ + boolean setData( in long studyID, in TMoleculeList theData ); + + /*! + Get internal data structure + */ + boolean getData( in long studyID, out TMoleculeList outData ); + + /*! + Perform action on the atomic data + */ + boolean processData( in long studyID ); + }; +}; + +#endif diff --git a/idl/Makefile.am b/idl/Makefile.am new file mode 100644 index 0000000..079e90c --- /dev/null +++ b/idl/Makefile.am @@ -0,0 +1,90 @@ +# Copyright (C) 2007-2010 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 = ATOMSOLV.idl + +# This variable defines the files to be installed +dist_salomeidl_DATA = $(BASEIDL_FILES) + +# GUI idl common library +lib_LTLIBRARIES = libATOMSOLVIDL.la + +# Sources built from idl files +nodist_libATOMSOLVIDL_la_SOURCES = ATOMSOLVSK.cc + +# header files must be exported: other modules have to use this library +nodist_salomeinclude_HEADERS = $(BASEIDL_FILES:%.idl=%.hh) + +libATOMSOLVIDL_la_CPPFLAGS = \ + -I$(top_builddir)/idl -I$(ATOMGEN_ROOT_DIR)/include/salome \ + @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ @KERNEL_CXXFLAGS@ +libATOMSOLVIDL_la_LDFLAGS = -no-undefined -version-info=0:0:0 +libATOMSOLVIDL_la_LIBADD = $(STDLIB) @CORBA_LIBS@ $(KERNEL_LDFLAGS) -lSalomeIDLKernel -L$(ATOMGEN_ROOT_DIR)/lib/salome -lATOMGENIDL + +# These variables defines the building process of CORBA files +OMNIORB_IDL = @OMNIORB_IDL@ +OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@ +OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -I$(top_builddir)/idl/salome -I$(KERNEL_ROOT_DIR)/idl/salome -I$(ATOMGEN_ROOT_DIR)/idl/salome +IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_builddir)/idl/salome -I$(KERNEL_ROOT_DIR)/idl/salome -I$(ATOMGEN_ROOT_DIR)/idl/salome +IDLPYFLAGS = @IDLPYFLAGS@ -I$(KERNEL_ROOT_DIR)/idl/salome -I$(ATOMGEN_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 -I$(ATOMGEN_ROOT_DIR)/idl/salome $$dep 2>/dev/null | \ + sed 's/\.o/\SK.cc/' >>$@; \ + fi; \ + done ; + +-include .depidl diff --git a/resources/ATOMSOLV.png b/resources/ATOMSOLV.png new file mode 100644 index 0000000000000000000000000000000000000000..f66d64d1eebce026ba8cb0bdd81d46af8e2a9e6b GIT binary patch literal 928 zcmV;R17G}!P)p@HZ;dvA(8+911(8J zK~xyi#g$ELR8?pzN#zYp4iA{_cV`N1LQBfHi62qb&Oj{-`^U=;@AWq)vy!Y;5F&{0{8Pvptx4Q4# zbN=_-|2g-6;BkLS`9&$e{O_RoyeaYcpZ^-%Uu(FuWvjgQ;tK@3x*-}Z((~+P-=Q~9 zO0l@OQ1$!dx6hU{mKo`2*~Rls9UScHH6BW4?a!|uha+1F27(n+kd>9Ue*XSDv=(M( z69Bw_@gw)TJi9KQN36RyixM0ztF}tv&wsEZ*LI zunZ(1CFgLUDc3M#175kboRc@B9UvMEMWJ~UV?X}DjT?UfaQK}V?{4a2`>qI!R+f-| z1Io-G?@P9LQHeeirll)Qb8{Gx66db# zkjv#sBxbQ~`_WX)&D|oOzlYbjZ63OJYjNjiowCb zbyTRehKg}vVFA#HXr_N}MT~NHN$KqNz|&~$VcRwn6W7_viU>gOJ!JAwh`JDd#elnRf+qOkGdGcc(sd`HJ z<=VAh5%d9Z)AA*({+1| z20-27)fOWZdV==$HhjKy?sfhD^Au@oYnR79BOd@2kc`nYK3bjt0000 + + + + + + + + + + + + + + ATOMSOLV + ATOMSOLV GUI + Data + SALOME team + 0.3.0 + Open CASCADE S.A.S. + 1 + ATOMSOLV.png + 'linux' ~ OS + + + + diff --git a/resources/ExecATOMSOLV.png b/resources/ExecATOMSOLV.png new file mode 100644 index 0000000000000000000000000000000000000000..16a20c116e8243a6b49ed862613d2cc49bdf4caa GIT binary patch literal 831 zcmV-F1Hk-=P)A+3!%gdoE?w?yY*XMamxaAW~()k6;QGVVf3ZPpQcy+38CrH3{Qk zoaxN-vWJ+OcH(Y#5qvHK|CitMf1CdUU;7AQ8zF4-#i736F~#EMso~pq*Ek7JMLa$}POH_T(b)M|f)>8t;^3f3 zKA)#ntMKyW+7Z-s>l6xWsZ53jrMAEC5{41RXe`Snj$`6DMr+Vop|xgsc$hE@Sz20V zb@eG)%b|Y+_m{*NND_%L1}POFH@MUObOdhQq^%&CMdWZvC2q+x@_Pg_JQ$DGG%bJbwIyVzG#2o#E=$@5yGf z#Bm5%IplY1BB@I((}Bdlpj1;;nAaqNZEDBWHP2)F0;K|LMcrchIBe@ z&Ye4p5H>e&{)pCc=qTd1Z_6|q4IIZIpUy{Fg7-dG2KQ=nb2l+s9 +
+ + + +
+
+ + +
+ diff --git a/resources/atom.png b/resources/atom.png new file mode 100644 index 0000000000000000000000000000000000000000..6a7e92dab61008a6655f1b4d564a9dfcad0256df GIT binary patch literal 505 zcmVWFU8GbZ8({Xk{QrNlj4iWF>9@00CV|L_t&-)4h{BO9N35 zh0lHLCb`R^5=5-hh?PkrXl0|FsGz?<+tmI7tpsg%dj$(yEiAPYv9+;M0|AjlLy}$1 z-h0PF;v*Xn4LIe@oNwUF42Xy@K=3dO@mI))E(ikpErf_D2!c<|Zy;aAvYRZI%M1Xi zktsNC9st4GSCCD>cn0~=0#wey_0>LwVc6{l>!r^vY~a4~P-;bb(-^&GbEuDCCtIK2vO#Br4P^TJW8QL8{Fjixo7Gk{i_j~Cy!&E%wy9UW=CcD>4Iw=kXfSKichH+)%z^T}L(WYbOhULr zU|hzGXHR7&|1)5ArU=i=?%E_iazz`aQ-jgbImm2V9j5>(6SMvV+}s!#lkZg`2zMA( vM^OGasy7Gtzet^Hzh@eB$UuO?)-Yt zxcYW>#7pr)W)2y`@qr>mdKI;Vst00IeNLjV8( literal 0 HcmV?d00001 diff --git a/resources/erase.png b/resources/erase.png new file mode 100644 index 0000000000000000000000000000000000000000..7f21be762b8ebe3065f588db3c2e132075a2cf3f GIT binary patch literal 311 zcmV-70m%M|P)pF=}AOERCt`N)V&UZFcbyg^J@BJB;N1{45Vw>a3JYo!bZyO;OiU* zz2&b;(GDjtz?U9+3qas-07~_sR1dE2!vjYX$Ls`Ns{3vLknhAXq=NuRGF-V>@f)L- zoqkVtK?Q5kepuVJuO@OHlZ4;TpPvG82Nhvh7*`Aa*+eTIUzrT^Jx8Spw`a@YW+k1$8TV)zLc_?Bv9*{+U&+QmQNj{Vxo+UolF1#002ov JPDHLkV1mB0hMfQa literal 0 HcmV?d00001 diff --git a/resources/import.xpm b/resources/import.xpm new file mode 100644 index 0000000..2ed8134 --- /dev/null +++ b/resources/import.xpm @@ -0,0 +1,28 @@ +/* XPM */ +/* Drawn by Mark Donohoe for the K Desktop Environment */ +/* See http://www.kde.org */ +static char*forward[]={ +"16 16 5 1", +"# c #000000", +"a c #ffffff", +"c c #808080", +"b c #c0c0c0", +". c None", +"................", +"................", +".........#......", +".........##.....", +".........#a#....", +"..########aa#...", +"..#aaaaaaabaa#..", +"..#bbbbbbbbbaa#.", +"..#bbbbbbbbba#..", +"..########ba#c..", +"..ccccccc#a#c...", +"........c##c....", +"........c#c.....", +"........cc......", +"........c.......", +"................", +"................"}; + diff --git a/resources/molecule.png b/resources/molecule.png new file mode 100644 index 0000000000000000000000000000000000000000..9e877d1d5c74ac11ba5b33fd6b196eb479e6a074 GIT binary patch literal 642 zcmV-|0)737P)~84IQwG1dS803CEi zSad^gZEa<4bO1wgWnpw>WFU8GbZ8({Xk{QrNlj4iWF>9@00HJnL_t&-)5X$1Z__{+ z2Jq*6XFI-2P+f`gZvY{|08*uX0fvetQDNv%iAo*$2K@xFx;0;*6AMdMx-fLez`_Rr zRnQ74QVL3I;w1LDzB?Za5l-5Qfq`d!_2_+H{mA{tt>sCkw~f*3rIv)c{(!-^qCELi&I;ysQ?mggGu0=$H^LXIp@3qI1CQu4NBPyI~RE>*Qf|NTf7M{7pN~Zz-Wu*a*~?3 zFUCU`C^aY(Fwlsi2s09H!bOCbv!Sg)>z6nwn#G$aIl18W9xc9DE zEugO+?HRGOiTWJ@<^e?}F&cE~t$R<7WR{1%hZR*!P?qKp)+7;#Fb^aas&#<1{}x7FA)TE-pzl zN+OB-sEV~#gIp&JZ$8XOyiP2mp}%Y5F+-MZz@as;pbLEw&3{{n+U{^DS&3qU5T^#h cy09kt1@f~X`#pvJ2><{907*qoM6N<$g4W3lTL1t6 literal 0 HcmV?d00001 diff --git a/resources/run.png b/resources/run.png new file mode 100644 index 0000000000000000000000000000000000000000..0140a6667b1232eee2ee1680bf0ef475025b0ca4 GIT binary patch literal 684 zcmV;d0#p5oP)1u zMC(dLP(cK%ATBKUKq&Q9S}iTc8XFU%ZPKJkCYf|5lg#|?Tu5xQaN(lg_MH3Ro(r(R ze+SWw>Hc~D&Dl!j_Mr>O{y()#r;j+Sx4I|P->QO#imNetMY|hNgk)4>()U#cX9!DlJ%p zROV-_M^O|rMUgruLogjdif-X(KokR@VL&zdKx5wsfR%P>>UDc`Gy$>b=bgzyiI}Zo zMG#nJFlV@?b?=s)=HUnh0ILB2o_^aw#K-#D3^aen*GlZ^4pXFW1q~Wf2cQDTvINnu zlkn)}4;UWjL9Aj02$UQc6$>t#riaT7iV1{o{J!C_qlY0r)&~Z<4AVut&0<6+ysf6r zz$zcI*xDdp6kzDXi25a-lnR3KLPdtlc8B{Fi=)_OV}Y{=03qBslt{<~+~Spptf#w7 zM*TrEOYWb{R#T!VT;(guzv@0_n8`8Q#r z*Y93tshniAs!zpg>U~to6!~(;@})+`>sc}~k<6=&>Zmz}eFuQ!^KG=izvmY*NB literal 0 HcmV?d00001 diff --git a/src/ATOMSOLV/ATOMSOLV.cxx b/src/ATOMSOLV/ATOMSOLV.cxx new file mode 100755 index 0000000..b927f78 --- /dev/null +++ b/src/ATOMSOLV/ATOMSOLV.cxx @@ -0,0 +1,103 @@ +// Copyright (C) 2007-2010 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 + +using namespace std; +#include "ATOMSOLV.hxx" +#include "utilities.h" + +#include + + +ATOMSOLV::ATOMSOLV(CORBA::ORB_ptr orb, + PortableServer::POA_ptr poa, + PortableServer::ObjectId * contId, + const char *instanceName, + const char *interfaceName) : + Engines_Component_i(orb, poa, contId, instanceName, interfaceName) +{ + MESSAGE("activate object"); + _thisObj = this ; + _id = _poa->activate_object(_thisObj); +} + +ATOMSOLV::~ATOMSOLV() +{ +} + +CORBA::Boolean ATOMSOLV::setData( CORBA::Long studyID, const ATOMSOLV_ORB::TMoleculeList& theData ) +{ + const int n = theData.length(); + ATOMSOLV_ORB::TMoleculeList_var data = new ATOMSOLV_ORB::TMoleculeList(); + data->length( n ); + for ( int i = 0; i < n; i++ ) + data[ i ] = theData[ i ]; + + // printf( " -- ATOMSOLV::setData( %d ) length = %d\n", studyID, data->length() ); + myData[ studyID ] = data._retn(); + + return (bool)n; +} + +CORBA::Boolean ATOMSOLV::getData( CORBA::Long studyID, ATOMSOLV_ORB::TMoleculeList_out outData ) +{ + if ( myData.find( studyID ) != myData.end() ) { + ATOMSOLV_ORB::TMoleculeList* data = myData[ studyID ]; + + // printf( " -- ATOMSOLV::getData( %d ) length = %d\n", studyID, data->length() ); + const int n = data->length(); + outData = new ATOMSOLV_ORB::TMoleculeList(); + outData->length( n ); + + for ( int i = 0; i < n; i++ ) + (*outData)[ i ] = (*data)[ i ]; + + return true; + } + return false; +} + +CORBA::Boolean ATOMSOLV::processData( CORBA::Long studyID ) +{ + if ( myData.find( studyID ) != myData.end() ) { + ATOMSOLV_ORB::TMoleculeList* data = myData[ studyID ]; + for ( int i = 0, n = data->length(); i < n; i++ ) + (*data)[i].temperature = rand(); + } + return true; +} + + +extern "C" +{ + PortableServer::ObjectId * ATOMSOLVEngine_factory( + CORBA::ORB_ptr orb, + PortableServer::POA_ptr poa, + PortableServer::ObjectId * contId, + const char *instanceName, + const char *interfaceName) + { + MESSAGE("PortableServer::ObjectId * ATOMSOLVEngine_factory()"); + SCRUTE(interfaceName); + ATOMSOLV * myATOMSOLV + = new ATOMSOLV(orb, poa, contId, instanceName, interfaceName); + return myATOMSOLV->getId() ; + } +} diff --git a/src/ATOMSOLV/ATOMSOLV.hxx b/src/ATOMSOLV/ATOMSOLV.hxx new file mode 100644 index 0000000..91490f4 --- /dev/null +++ b/src/ATOMSOLV/ATOMSOLV.hxx @@ -0,0 +1,60 @@ +// Copyright (C) 2007-2010 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 + +#ifndef _ATOMSOLV_HXX_ +#define _ATOMSOLV_HXX_ + +#include +#include CORBA_SERVER_HEADER(ATOMSOLV) +#include CORBA_SERVER_HEADER(ATOMGEN) +#include "SALOME_Component_i.hxx" + +#include + +class ATOMSOLV: + public POA_ATOMSOLV_ORB::ATOMSOLV_Gen, + public Engines_Component_i +{ + +public: + ATOMSOLV(CORBA::ORB_ptr orb, + PortableServer::POA_ptr poa, + PortableServer::ObjectId * contId, + const char *instanceName, + const char *interfaceName); + virtual ~ATOMSOLV(); + + CORBA::Boolean setData( CORBA::Long studyID, const ATOMSOLV_ORB::TMoleculeList& theData ); + CORBA::Boolean getData( CORBA::Long studyID, ATOMSOLV_ORB::TMoleculeList_out outData ); + CORBA::Boolean processData( CORBA::Long studyID ); + +private: + std::map myData; +}; + +extern "C" +PortableServer::ObjectId * ATOMSOLVEngine_factory(CORBA::ORB_ptr orb, + PortableServer::POA_ptr poa, + PortableServer::ObjectId * contId, + const char *instanceName, + const char *interfaceName); + +#endif diff --git a/src/ATOMSOLV/Makefile.am b/src/ATOMSOLV/Makefile.am new file mode 100644 index 0000000..1cbdb7f --- /dev/null +++ b/src/ATOMSOLV/Makefile.am @@ -0,0 +1,34 @@ +# Copyright (C) 2007-2010 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +# Library target +lib_LTLIBRARIES = libATOMSOLVEngine.la + +# Library sources +dist_libATOMSOLVEngine_la_SOURCES = \ + ATOMSOLV.hxx \ + ATOMSOLV.cxx + +libATOMSOLVEngine_la_CPPFLAGS = -I$(top_builddir)/idl $(KERNEL_CXXFLAGS) -I$(ATOMGEN_ROOT_DIR)/include/salome + +libATOMSOLVEngine_la_LDFLAGS = ../../idl/libATOMSOLVIDL.la $(KERNEL_LDFLAGS) -lSalomeContainer -lOpUtil diff --git a/src/ATOMSOLVGUI/ATOMSOLVGUI.cxx b/src/ATOMSOLVGUI/ATOMSOLVGUI.cxx new file mode 100644 index 0000000..3d3c62c --- /dev/null +++ b/src/ATOMSOLVGUI/ATOMSOLVGUI.cxx @@ -0,0 +1,434 @@ +// Copyright (C) 2007-2010 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 "ATOMSOLVGUI.h" +#include "ATOMSOLVGUI_DataModel.h" +#include "ATOMSOLVGUI_Displayer.h" +#include "ATOMSOLVGUI_Selection.h" +#include "ATOMSOLVGUI_TransparencyDlg.h" + +#include +#include +#include +#include +#include + +#include + +#include +#include + +#include +#include +#include + +#include +#include +#include + +#include + +// QT includes +#include +#include +#include +#include + +// VTK includes +#include +#include + +using namespace std; + +ATOMSOLV_ORB::ATOMSOLV_Gen_var ATOMSOLVGUI::myEngine = ATOMSOLV_ORB::ATOMSOLV_Gen::_nil(); + +// Constructor +ATOMSOLVGUI::ATOMSOLVGUI() : + SalomeApp_Module( "ATOMSOLV" ), // default name + LightApp_Module( "ATOMSOLV" ) +{ +} + +// Initialize a reference to the module's engine +void ATOMSOLVGUI::InitATOMSOLVGen( SalomeApp_Application* app ) +{ + if ( !app ) + myEngine = ATOMSOLV_ORB::ATOMSOLV_Gen::_nil(); + else { + Engines::EngineComponent_var comp = app->lcc()->FindOrLoad_Component( "FactoryServer", "ATOMSOLV" ); + ATOMSOLV_ORB::ATOMSOLV_Gen_ptr atomGen = ATOMSOLV_ORB::ATOMSOLV_Gen::_narrow(comp); + ASSERT( !CORBA::is_nil( atomGen ) ); + myEngine = atomGen; + } +} + +// Gets an reference to the module's engine +ATOMSOLV_ORB::ATOMSOLV_Gen_var ATOMSOLVGUI::GetATOMSOLVGen() +{ + if ( CORBA::is_nil( myEngine ) ) { + SUIT_Application* suitApp = SUIT_Session::session()->activeApplication(); + SalomeApp_Application* app = dynamic_cast( suitApp ); + InitATOMSOLVGen( app ); + } + return myEngine; +} + +// Module's initialization +void ATOMSOLVGUI::initialize( CAM_Application* app ) +{ + SalomeApp_Module::initialize( app ); + + InitATOMSOLVGen( dynamic_cast( app ) ); + + SUIT_Desktop* aParent = app->desktop(); + SUIT_ResourceMgr* aResourceMgr = app->resourceMgr(); + + // create actions + QPixmap aPixmap = aResourceMgr->loadPixmap( "ATOMSOLV",tr( "ICON_IMPORT_DATA" ) ); + createAction( RetrieveData, tr( "TLT_RETRIEVE_DATA" ), QIcon( aPixmap ), tr( "MEN_RETRIEVE_DATA" ), + tr( "STS_RETRIEVE_DATA" ), 0, aParent, false, this, SLOT( OnRetrieveData() ) ); + aPixmap = aResourceMgr->loadPixmap( "ATOMSOLV",tr( "ICON_PROCESS_DATA" ) ); + createAction( ProcessData, tr( "TLT_PROCESS_DATA" ), QIcon( aPixmap ), tr( "MEN_PROCESS_DATA" ), + tr( "STS_PROCESS_DATA" ), 0, aParent, false, this, SLOT( OnProcessData() ) ); + + // create menus + int aMenuId = createMenu( tr( "MEN_ATOMSOLV" ), -1, -1, 30 ); + createMenu( RetrieveData, aMenuId, 10 ); + createMenu( ProcessData, aMenuId, 10 ); + + // create toolbars + int aToolId = createTool ( tr( "TOOL_ATOMSOLV" ) ); + createTool( RetrieveData, aToolId ); + createTool( ProcessData, aToolId ); + + // custom actions handled by displayer (display, erase, display mode, etc.) + aPixmap = aResourceMgr->loadPixmap( "ATOMSOLV",tr( "ICON_DISPLAY" ) ); + createAction( Display, tr( "TLT_DISPLAY" ), QIcon( aPixmap ), tr( "MEN_DISPLAY" ), + tr( "STS_DISPLAY" ), 0, aParent, false, this, SLOT( OnDisplayerCommand() ) ); + aPixmap = aResourceMgr->loadPixmap( "ATOMSOLV",tr( "ICON_ERASE" ) ); + createAction( Erase, tr( "TLT_ERASE" ), QIcon( aPixmap ), tr( "MEN_ERASE" ), + tr( "STS_ERASE" ), 0, aParent, false, this, SLOT( OnDisplayerCommand() ) ); + createAction( Shading, tr( "TLT_SHADING" ), QIcon(), tr( "MEN_SHADING" ), + tr( "STS_SHADING" ), 0, aParent, true, this, SLOT( OnDisplayerCommand() ) ); + createAction( Wireframe, tr( "TLT_WIREFRAME" ), QIcon(), tr( "MEN_WIREFRAME" ), + tr( "STS_WIREFRAME" ), 0, aParent, true, this, SLOT( OnDisplayerCommand() ) ); + createAction( PointsMode, tr( "TLT_POINTSMODE" ), QIcon(), tr( "MEN_POINTSMODE" ), + tr( "STS_POINTSMODE" ), 0, aParent, true, this, SLOT( OnDisplayerCommand() ) ); + createAction( Color, tr( "TLT_COLOR" ), QIcon(), tr( "MEN_COLOR" ), + tr( "STS_COLOR" ), 0, aParent, false, this, SLOT( OnDisplayerCommand() ) ); + createAction( Transparency, tr( "TLT_TRANSPARENCY" ), QIcon(), tr( "MEN_TRANSPARENCY" ), + tr( "STS_TRANSPARENCY" ), 0, aParent, false, this, SLOT( OnDisplayerCommand() ) ); + + QtxPopupMgr* mgr = popupMgr(); + mgr->insert( action( Display ), -1, 0 ); + mgr->insert( action( Erase ), -1, 0 ); + int dispmodeId = mgr->insert( tr( "MEN_DISPLAY_MODE" ), -1, -1 ); // display mode menu + mgr->insert( action( PointsMode ), dispmodeId, -1 ); + mgr->insert( action( Wireframe ), dispmodeId, -1 ); + mgr->insert( action( Shading ), dispmodeId, -1 ); + mgr->insert( action( Color ), -1, 0 ); + mgr->insert( action( Transparency ), -1, 0 ); + + mgr->setRule( action( Display ), "true in $canBeDisplayed and activeModule='ATOMSOLV' and !isVisible" ); + mgr->setRule( action( Erase ), "true in $canBeDisplayed and activeModule='ATOMSOLV' and isVisible" ); + mgr->setRule( action( PointsMode ), "client='VTKViewer' and selcount>0 and isVisible" ); + mgr->setRule( action( Wireframe ), "client='VTKViewer' and selcount>0 and isVisible" ); + mgr->setRule( action( Shading ), "client='VTKViewer' and selcount>0 and isVisible" ); + mgr->setRule( action( Color ), "client='VTKViewer' and selcount>0 and isVisible" ); + mgr->setRule( action( Transparency ), "client='VTKViewer' and selcount>0 and isVisible" ); + + mgr->setRule( action( PointsMode ), "$displaymode={'Points'}", QtxPopupMgr::ToggleRule ); + mgr->setRule( action( Wireframe ), "$displaymode={'Wireframe'}", QtxPopupMgr::ToggleRule ); + mgr->setRule( action( Shading ), "$displaymode={'Surface'}", QtxPopupMgr::ToggleRule ); +} + +// Module's engine IOR +QString ATOMSOLVGUI::engineIOR() const +{ + CORBA::String_var anIOR = getApp()->orb()->object_to_string( GetATOMSOLVGen() ); + return QString( anIOR.in() ); +} + +// Module's activation +bool ATOMSOLVGUI::activateModule( SUIT_Study* theStudy ) +{ + bool bOk = SalomeApp_Module::activateModule( theStudy ); + + setMenuShown( true ); + setToolShown( true ); + + return bOk; +} + +// Module's deactivation +bool ATOMSOLVGUI::deactivateModule( SUIT_Study* theStudy ) +{ + setMenuShown( false ); + setToolShown( false ); + + return SalomeApp_Module::deactivateModule( theStudy ); +} + +// Study closed callback +void ATOMSOLVGUI::studyClosed( SUIT_Study* theStudy ) +{ + if ( theStudy ) { + ATOMSOLV_ORB::ATOMSOLV_Gen_var engine = GetATOMSOLVGen(); + ATOMSOLV_ORB::TMoleculeList lst; + lst.length( 0 ); + engine->setData( theStudy->id(), lst ); + } + + SalomeApp_Module::studyClosed( theStudy ); +} + +// Default windows +void ATOMSOLVGUI::windows( QMap& theMap ) const +{ + theMap.insert( SalomeApp_Application::WT_ObjectBrowser, Qt::LeftDockWidgetArea ); + theMap.insert( SalomeApp_Application::WT_PyConsole, Qt::BottomDockWidgetArea ); +} + +// Default view managers +void ATOMSOLVGUI::viewManagers( QStringList& theViewMgrs ) const +{ + theViewMgrs.append( SVTK_Viewer::Type() ); +} + +// Create custom data model +CAM_DataModel* ATOMSOLVGUI::createDataModel() +{ + return new ATOMSOLVGUI_DataModel( this ); +} + +// Create custom selection object +LightApp_Selection* ATOMSOLVGUI::createSelection() const +{ + return new ATOMSOLVGUI_Selection(); +} + +/*! Returns list of entities of selected objects. */ +void ATOMSOLVGUI::selected( QStringList& entries, const bool multiple ) +{ + LightApp_SelectionMgr* mgr = getApp()->selectionMgr(); + if( !mgr ) + return; + + SUIT_DataOwnerPtrList anOwnersList; + mgr->selected( anOwnersList ); + + for ( int i = 0; i < anOwnersList.size(); i++ ) + { + const LightApp_DataOwner* owner = dynamic_cast( anOwnersList[ i ].get() ); + QStringList es = owner->entry().split( "_" ); + if ( es.count() > 1 && es[ 0 ] == "ATOMSOLVGUI" && es[ 1 ] != "root" ) + { + if ( !entries.contains( owner->entry() ) ) + entries.append( owner->entry() ); + if( !multiple ) + break; + } + } +} + +// Action slot +void ATOMSOLVGUI::OnRetrieveData() +{ + ATOMSOLV_ORB::ATOMSOLV_Gen_var engine = GetATOMSOLVGen(); + SalomeApp_Application* app = getApp(); + if ( !CORBA::is_nil( engine ) && app ) { + Engines::EngineComponent_var comp = app->lcc()->FindOrLoad_Component( "FactoryServerPy","ATOMGEN" ); + ATOMGEN_ORB::ATOMGEN_Gen_var atomGen = ATOMGEN_ORB::ATOMGEN_Gen::_narrow( comp ); + SalomeApp_Study* appStudy = dynamic_cast( app->activeStudy() ); + if ( !CORBA::is_nil( atomGen ) && appStudy ) { + const int studyID = appStudy->id(); + // in case current study is not loaded by ATOMGEN component - call Load on it + if ( _PTR( Study ) studyDS = appStudy->studyDS() ) { + if ( _PTR( SComponent ) atomGenSComp = studyDS->FindComponent( "ATOMGEN" ) ) { + _PTR( StudyBuilder ) builder = studyDS->NewBuilder(); + std::string atomGenIOR = app->orb()->object_to_string( atomGen ); + builder->LoadWith( atomGenSComp, atomGenIOR ); + } + } + + // retrieve data from ATOMGEN + ATOMGEN_ORB::MoleculeList_var inData = atomGen->getData( studyID ); + + // "convert" Molecules to TMolecules, set default temperature of '0' + const int n = inData->length(); + ATOMSOLV_ORB::TMoleculeList_var outData = new ATOMSOLV_ORB::TMoleculeList(); + outData->length( n ); + for ( int i = 0; i < n; i++ ) { + ATOMSOLV_ORB::TMolecule_var tmol = new ATOMSOLV_ORB::TMolecule(); + tmol->molecule = ATOMGEN_ORB::Molecule::_duplicate( inData[i] ); + tmol->temperature = 0; + outData[ i ] = tmol; + } + + engine->setData( studyID, outData ); + + app->updateObjectBrowser(); + } + } +} + +// Action slot +void ATOMSOLVGUI::OnProcessData() +{ + ATOMSOLV_ORB::ATOMSOLV_Gen_var engine = GetATOMSOLVGen(); + SalomeApp_Application* app = getApp(); + if ( !CORBA::is_nil( engine ) && app ) { + if ( const int studyID = app->activeStudy()->id() > 0 ) { + // call processData on engine + engine->processData( studyID ); + // update data objects in object browser + updateObjBrowser(); + // redisplay atoms that are already displayed (as their temperature changed..) + ViewManagerList vmans; + getApp()->viewManagers( SVTK_Viewer::Type(), vmans ); + for ( QList::iterator it = vmans.begin(); it != vmans.end(); ++it ) { + QVector views = (*it)->getViews(); + for ( int i = 0; i < views.size(); i++ ) { + if ( SVTK_ViewWindow* svtkView = dynamic_cast( views[ i ] ) ) { + vtkActorCollection* actors = svtkView->getRenderer()->GetActors(); + actors->InitTraversal(); + while ( vtkActor* actor = actors->GetNextActor() ) + if ( SALOME_Actor* salomeActor = SALOME_Actor::SafeDownCast( actor ) ) + if ( salomeActor->hasIO() ) { + // printf( " -- must redisplay actor salomeActor: %s\n", salomeActor->getIO()->getEntry() ); + ATOMSOLVGUI_Displayer().updateActor( salomeActor ); + } + } + } + } + } + } +} + +// Action slot +void ATOMSOLVGUI::OnDisplayerCommand() +{ + const QObject* obj = sender(); + if ( obj && obj->inherits( "QAction" ) ) { + const int id = actionId ( (QAction*)obj ); + switch ( id ) { + case Display : { + QStringList entries; + selected ( entries, true ); + ATOMSOLVGUI_Displayer d; + for ( QStringList::const_iterator it = entries.begin(), last = entries.end(); it != last; it++ ) + d.Display( it->toLatin1(), /*updateviewer=*/false, 0 ); + d.UpdateViewer(); + } break; + case Erase : { + QStringList entries; + selected ( entries, true ); + ATOMSOLVGUI_Displayer d; + for ( QStringList::const_iterator it = entries.begin(), last = entries.end(); it != last; it++ ) + d.Erase( *it, /*forced=*/true, /*updateViewer=*/false, 0 ); + d.UpdateViewer(); + } break; + case Shading : { + QStringList entries; + selected ( entries, true ); + ATOMSOLVGUI_Displayer().setDisplayMode( entries, "Surface" ); + } break; + case Wireframe : { + QStringList entries; + selected ( entries, true ); + ATOMSOLVGUI_Displayer().setDisplayMode( entries, "Wireframe" ); + } break; + case PointsMode : { + QStringList entries; + selected ( entries, true ); + ATOMSOLVGUI_Displayer().setDisplayMode( entries, "Points" ); + } break; + case Color : { + QStringList entries; + selected ( entries, true ); + QColor initialColor( "white" ); + if ( entries.count() == 1 ) + initialColor = ATOMSOLVGUI_Displayer().getColor( entries[ 0 ] ); + QColor color = QColorDialog::getColor( initialColor, getApp()->desktop() ); + if ( color.isValid() ) + ATOMSOLVGUI_Displayer().setColor( entries, color ); + } break; + case Transparency : { + QStringList entries; + selected ( entries, true ); + ATOMSOLVGUI_TransparencyDlg( getApp()->desktop(), entries ).exec(); + } break; + default: printf( "ERROR: Action with ID = %d was not found in ATOMSOLVGUI\n", id ); break; + } + } +} + +// returns a custom displayer object +LightApp_Displayer* ATOMSOLVGUI::displayer() +{ + return new ATOMSOLVGUI_Displayer(); +} + +// create preferences for ATOMSOLV component +void ATOMSOLVGUI::createPreferences() +{ + int tabId = addPreference( tr( "ATOMSOLV_PREFERENCES" ) ); + int groupId = addPreference( tr( "PRESENTATION_PREF_GROUP" ), tabId ); + + setPreferenceProperty( groupId, "columns", 1 ); + + // Representation mode preference + int dispModeId = addPreference( tr( "DISPLAY_MODE_PREF" ), groupId, + LightApp_Preferences::Selector, "ATOMSOLV", "Representation" ); + QList intDispModes; + QStringList strDispModes; + intDispModes.append( 0 ); strDispModes.append( tr( "MEN_POINTSMODE" ) ); + intDispModes.append( 1 ); strDispModes.append( tr( "MEN_WIREFRAME" ) ); + intDispModes.append( 2 ); strDispModes.append( tr( "MEN_SHADING" ) ); + + setPreferenceProperty( dispModeId, "strings", strDispModes ); + setPreferenceProperty( dispModeId, "indexes", intDispModes ); + + // Radius preference + int radisusId = addPreference( tr( "RADIUS_PREF" ), groupId, + LightApp_Preferences::DblSpin, "ATOMSOLV", "Radius" ); + setPreferenceProperty( radisusId, "min", .001 ); + setPreferenceProperty( radisusId, "max", 1000 ); + setPreferenceProperty( radisusId, "precision", 3 ); +} + +// preferences of changed: update the corresponding values +void ATOMSOLVGUI::preferencesChanged( const QString& group, const QString& param ) +{ + if ( group == "ATOMSOLV" && param == "Representation" ) + ATOMSOLVGUI_Displayer::setDefaultRepresentation( getApp()->resourceMgr()->integerValue( group, param ) ); + else if ( group == "ATOMSOLV" && param == "Radius" ) + ATOMSOLVGUI_Displayer::setDefaultRadius( getApp()->resourceMgr()->doubleValue( group, param ) ); +} + + +// Export the module +extern "C" { + CAM_Module* createModule() + { + return new ATOMSOLVGUI(); + } +} diff --git a/src/ATOMSOLVGUI/ATOMSOLVGUI.h b/src/ATOMSOLVGUI/ATOMSOLVGUI.h new file mode 100644 index 0000000..2c7976d --- /dev/null +++ b/src/ATOMSOLVGUI/ATOMSOLVGUI.h @@ -0,0 +1,84 @@ +// Copyright (C) 2007-2010 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 + +#ifndef _ATOMSOLVGUI_H_ +#define _ATOMSOLVGUI_H_ + +#include + +#include +#include CORBA_CLIENT_HEADER(ATOMSOLV) + +class SalomeApp_Application; + +class ATOMSOLVGUI: public SalomeApp_Module +{ + Q_OBJECT + +public: + ATOMSOLVGUI(); + + void initialize( CAM_Application* ); + void windows( QMap& ) const; + void viewManagers( QStringList& ) const; + + virtual LightApp_Displayer* displayer(); + + virtual void createPreferences(); + virtual void preferencesChanged( const QString&, const QString& ); + + void selected( QStringList&, const bool ); + + virtual QString engineIOR() const; + + static void InitATOMSOLVGen( SalomeApp_Application* ); + static ATOMSOLV_ORB::ATOMSOLV_Gen_var GetATOMSOLVGen(); + +protected: + enum { ProcessData = 901, + RetrieveData, + Display, + Erase, + Shading, + PointsMode, + Wireframe, + Color, + Transparency }; + + virtual CAM_DataModel* createDataModel(); + virtual LightApp_Selection* createSelection() const; + +public slots: + virtual bool deactivateModule( SUIT_Study* ); + virtual bool activateModule( SUIT_Study* ); + + virtual void studyClosed( SUIT_Study* ); + +protected slots: + void OnProcessData(); + void OnRetrieveData(); + void OnDisplayerCommand(); + +private: + static ATOMSOLV_ORB::ATOMSOLV_Gen_var myEngine; +}; + +#endif diff --git a/src/ATOMSOLVGUI/ATOMSOLVGUI_DataModel.cxx b/src/ATOMSOLVGUI/ATOMSOLVGUI_DataModel.cxx new file mode 100644 index 0000000..29a09fc --- /dev/null +++ b/src/ATOMSOLVGUI/ATOMSOLVGUI_DataModel.cxx @@ -0,0 +1,70 @@ +// Copyright (C) 2007-2010 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 "ATOMSOLVGUI_DataModel.h" +#include "ATOMSOLVGUI_DataObject.h" +#include "ATOMSOLVGUI.h" + +#include + +#include +#include + +/*! Constructor */ +ATOMSOLVGUI_DataModel::ATOMSOLVGUI_DataModel( CAM_Module* module ) + : LightApp_DataModel( module ) +{ +} + +/*! Destructor */ +ATOMSOLVGUI_DataModel::~ATOMSOLVGUI_DataModel() +{ +} + +/*! Called on update of the structure of Data Objects */ +void ATOMSOLVGUI_DataModel::build() +{ + ATOMSOLVGUI_ModuleObject* modelRoot = dynamic_cast( root() ); + if( !modelRoot ) { // root is not set yet + modelRoot = new ATOMSOLVGUI_ModuleObject( this, 0 ); + setRoot( modelRoot ); + } + + // create 'molecule' objects under model root object and 'atom' objects under 'molecule'-s + ATOMSOLV_ORB::ATOMSOLV_Gen_var engine = ATOMSOLVGUI::GetATOMSOLVGen(); + if ( !CORBA::is_nil( engine ) ) { + const int studyID = getStudy()->id(); + ATOMSOLV_ORB::TMoleculeList_var molecules; + if ( !engine->getData( studyID, molecules ) ) { + // printf( " -- DataModel: getData() returned false! \n" ); + return; + } + for ( int i = 0, n = molecules->length(); i < n; i++ ) { + ATOMSOLVGUI_DataObject* molDO = new ATOMSOLVGUI_DataObject ( modelRoot, i ); + const ATOMSOLV_ORB::TMolecule& mol = molecules[i]; + const int atoms = mol.molecule->getNbAtoms(); + for ( int j = 0; j < atoms; j++ ) + new ATOMSOLVGUI_DataObject ( molDO, i, j ); + } + } + + // root()->dump(); +} diff --git a/src/ATOMSOLVGUI/ATOMSOLVGUI_DataModel.h b/src/ATOMSOLVGUI/ATOMSOLVGUI_DataModel.h new file mode 100644 index 0000000..0fb3083 --- /dev/null +++ b/src/ATOMSOLVGUI/ATOMSOLVGUI_DataModel.h @@ -0,0 +1,43 @@ +// Copyright (C) 2007-2010 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 + +#if !defined(ATOMSOLVGUI_DATAMODEL_H) +#define ATOMSOLVGUI_DATAMODEL_H + +#include + +class CAM_Module; + +/*! + * Class : ATOMSOLVGUI_DataModel + * Description : Data Model of ATOMIC component + */ +class ATOMSOLVGUI_DataModel : public LightApp_DataModel +{ +public: + ATOMSOLVGUI_DataModel ( CAM_Module* ); + virtual ~ATOMSOLVGUI_DataModel(); + +protected: + virtual void build(); +}; + +#endif // ATOMSOLVGUI_DATAMODEL_H diff --git a/src/ATOMSOLVGUI/ATOMSOLVGUI_DataObject.cxx b/src/ATOMSOLVGUI/ATOMSOLVGUI_DataObject.cxx new file mode 100644 index 0000000..ae9a105 --- /dev/null +++ b/src/ATOMSOLVGUI/ATOMSOLVGUI_DataObject.cxx @@ -0,0 +1,151 @@ +// Copyright (C) 2007-2010 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 "ATOMSOLVGUI_DataObject.h" +#include "ATOMSOLVGUI.h" + +#include +#include + +#include +#include + +#include +#include + +/*! Constructor */ +ATOMSOLVGUI_DataObject::ATOMSOLVGUI_DataObject( SUIT_DataObject* parent, int mi, int ai ) + : LightApp_DataObject( parent ), + CAM_DataObject( parent), + myMoleculeIndex( mi ), + myAtomIndex( ai ) +{ +} + +/*! Destructor */ +ATOMSOLVGUI_DataObject::~ATOMSOLVGUI_DataObject() +{ +} + +/*! Returns unique object ID */ +QString ATOMSOLVGUI_DataObject::entry() const +{ + QString id = "root"; + if ( myMoleculeIndex > -1 ) { + id = QString::number( myMoleculeIndex ); + if ( myAtomIndex >= 0 ) + id += QString( "_%1" ).arg( myAtomIndex ); + } + + return QString( "ATOMSOLVGUI_%1" ).arg( id ); +} + +/*! Returns a name of the Data Object. */ +QString ATOMSOLVGUI_DataObject::name() const +{ + ATOMSOLV_ORB::TMolecule tmolecule = getTMolecule(); + ATOMGEN_ORB::Molecule_var mol = tmolecule.molecule; + if ( !CORBA::is_nil( mol ) ) { + if ( !isAtom() ) + return QString( "%1 [%2]" ).arg( mol->getName() ).arg( tmolecule.temperature ); + else if ( myAtomIndex < mol->getNbAtoms() ) + return mol->getAtom( myAtomIndex )->getName(); + } + return QString("-Error-"); +} + +/*! Returns an icon of the Data Object. */ +QPixmap ATOMSOLVGUI_DataObject::icon(const int) const +{ + static QPixmap pxmole = SUIT_Session::session()->resourceMgr()->loadPixmap( "ATOMSOLV", QObject::tr( "ICON_MOLECULE" ), false ); + static QPixmap pxatom = SUIT_Session::session()->resourceMgr()->loadPixmap( "ATOMSOLV", QObject::tr( "ICON_ATOM" ), false ); + return isAtom() ? pxatom : pxmole; +} + +/*! Returns a tooltip for the object (to be displayed in the Object Browser). */ +QString ATOMSOLVGUI_DataObject::toolTip(const int) const +{ + ATOMSOLV_ORB::TMolecule tmolecule = getTMolecule(); + ATOMGEN_ORB::Molecule_var mol = tmolecule.molecule; + if ( !CORBA::is_nil( mol ) ) { + if ( !isAtom() ) + return QString( QObject::tr( "MOLECULE" ) + ": %1, temperature: %2" ). + arg( mol->getName() ).arg( tmolecule.temperature ); + else { + ATOMGEN_ORB::Atom_var atom = mol->getAtom( myAtomIndex ); + if ( !CORBA::is_nil( atom ) ) + return QString( QObject::tr( "ATOM" ) + ": %1: %2,%3,%4" ). + arg( atom->getName() ).arg( atom->getX() ).arg( atom->getY() ).arg( atom->getZ() ); + } + } + return QString(); +} + +ATOMSOLV_ORB::TMolecule ATOMSOLVGUI_DataObject::getTMolecule() const +{ + ATOMSOLV_ORB::ATOMSOLV_Gen_var engine = ATOMSOLVGUI::GetATOMSOLVGen(); + LightApp_RootObject* rootObj = dynamic_cast ( root() ); + if ( rootObj && !CORBA::is_nil( engine ) ) { + const int studyID = rootObj->study()->id(); + if ( studyID > 0 ) { + ATOMSOLV_ORB::TMoleculeList_var molecules; + if ( engine->getData( studyID, molecules ) && + myMoleculeIndex > -1 && + myMoleculeIndex < molecules->length() ) + return molecules[ myMoleculeIndex ]; + } + } + return ATOMSOLV_ORB::TMolecule(); +} + + +/*! Constructor */ +ATOMSOLVGUI_ModuleObject::ATOMSOLVGUI_ModuleObject( CAM_DataModel* dm, SUIT_DataObject* parent ) +: ATOMSOLVGUI_DataObject( parent, -1 ), + LightApp_ModuleObject( dm, parent ), + CAM_DataObject( parent ) +{ +} + +/*! Returns a name of the root object. */ +QString ATOMSOLVGUI_ModuleObject::name() const +{ + return CAM_ModuleObject::name(); +} + +/*! Returns an icon of the root object. */ +QPixmap ATOMSOLVGUI_ModuleObject::icon(const int) const +{ + QPixmap px; + if ( dataModel() ) { + QString anIconName = dataModel()->module()->iconName(); + if ( !anIconName.isEmpty() ) + px = SUIT_Session::session()->resourceMgr()->loadPixmap( "ATOMIC", anIconName, false ); + } + return px; +} + +/*! Returns a tooltip of the root object. */ +QString ATOMSOLVGUI_ModuleObject::toolTip(const int) const +{ + return QObject::tr( "ATOMIC_ROOT_TOOLTIP" ); +} + diff --git a/src/ATOMSOLVGUI/ATOMSOLVGUI_DataObject.h b/src/ATOMSOLVGUI/ATOMSOLVGUI_DataObject.h new file mode 100644 index 0000000..cfef2b3 --- /dev/null +++ b/src/ATOMSOLVGUI/ATOMSOLVGUI_DataObject.h @@ -0,0 +1,75 @@ +// Copyright (C) 2007-2010 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 + +#if !defined(ATOMSOLVGUI_DATAOBJECT_H) +#define ATOMSOLVGUI_DATAOBJECT_H + +#include + +#include + +#include +#include CORBA_CLIENT_HEADER(ATOMSOLV) + +/*! + * Class : ATOMSOLVGUI_DataObject + * Description : Data Object for data of ATOMSOLV component + * Using the same Data Object for Atoms and Molecules + * If it is an Atom then myIndex field is >= 0 + * For Molecule myIndex equals to -1. + */ +class ATOMSOLVGUI_DataObject : public virtual LightApp_DataObject +{ +public: + ATOMSOLVGUI_DataObject ( SUIT_DataObject*, int MoleculeIndex, int AtomIndex = -1 ); + virtual ~ATOMSOLVGUI_DataObject(); + + virtual QString entry() const; + + QString name() const; + QPixmap icon(const int = NameId) const; + QString toolTip(const int = NameId) const; + + int getMoleculeIndex() const { return myMoleculeIndex; } + int getAtomIndex() const { return myAtomIndex; } + + bool isMolecule() const { return !isAtom(); } + bool isAtom() const { return myAtomIndex > -1; } + +private: + ATOMSOLV_ORB::TMolecule getTMolecule() const; + + int myMoleculeIndex; + int myAtomIndex; +}; + +class ATOMSOLVGUI_ModuleObject : public ATOMSOLVGUI_DataObject, + public LightApp_ModuleObject +{ +public: + ATOMSOLVGUI_ModuleObject ( CAM_DataModel*, SUIT_DataObject* = 0 ); + + virtual QString name() const; + QPixmap icon(const int = NameId) const; + QString toolTip(const int = NameId) const; +}; + +#endif // ATOMSOLVGUI_DATAOBJECT_H diff --git a/src/ATOMSOLVGUI/ATOMSOLVGUI_Displayer.cxx b/src/ATOMSOLVGUI/ATOMSOLVGUI_Displayer.cxx new file mode 100644 index 0000000..cb11c88 --- /dev/null +++ b/src/ATOMSOLVGUI/ATOMSOLVGUI_Displayer.cxx @@ -0,0 +1,273 @@ +// Copyright (C) 2007-2010 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 "ATOMSOLVGUI_Displayer.h" +#include "ATOMSOLVGUI.h" + +#include +#include +#include +#include + +#include +#include +#include + +#include +#include CORBA_CLIENT_HEADER(ATOMSOLV) + +#include +#include +#include + +const float radius = 5.; // radius of a sphere that represents an atom in VTK viewer +const float quality_coefficient = .1; // for VTK viewer presentation: parameter that controls +// the quality of presentation of sphere (atom). 0 - very bad, 1. - very good (and slow). + +// default representation mode, is taken from preferences +int ATOMSOLVGUI_Displayer::myRepresentation = SUIT_Session::session()->resourceMgr( + )->integerValue( "ATOMSOLV", "Representation", 2 ); +// default radius, is taken from preferences +double ATOMSOLVGUI_Displayer::myRadius = SUIT_Session::session()->resourceMgr( + )->doubleValue( "ATOMSOLV", "Radius", 5. ); + +ATOMSOLVGUI_Displayer::ATOMSOLVGUI_Displayer() +{ +} + +ATOMSOLVGUI_Displayer::~ATOMSOLVGUI_Displayer() +{ +} + +bool ATOMSOLVGUI_Displayer::canBeDisplayed( const QString& entry, const QString& viewer_type ) const +{ + QStringList es = entry.split( "_" ); + bool result = ( es.count() == 3 && es[ 0 ] == "ATOMSOLVGUI" && viewer_type == SVTK_Viewer::Type() ); + // printf ( " canBeDisplayed : entry = %s, count = %d, res = %d \n", entry.latin1(), es.count(), result ); + return result; // entry of an atom for sure +} + +ATOMGEN_ORB::Atom_ptr getAtom( const QString& entry, const int studyID, double& temprature ) +{ + QStringList es = entry.split( "_" ); + + bool isAtom = (es.count() == 3 && es[ 0 ] == "ATOMSOLVGUI"); + if (!isAtom) + return ATOMGEN_ORB::Atom::_nil(); + + const int molID = es[1].toInt(); + const int atomID = es[2].toInt(); + + ATOMSOLV_ORB::ATOMSOLV_Gen_var engine = ATOMSOLVGUI::GetATOMSOLVGen(); + ATOMSOLV_ORB::TMoleculeList_var molecules; + if ( engine->getData( studyID, molecules ) && molID >= 0 && molID < molecules->length() ) { + ATOMSOLV_ORB::TMolecule tmol = molecules[ molID ]; + ATOMGEN_ORB::Molecule_var mol = tmol.molecule; + if ( atomID < mol->getNbAtoms() ) { + temprature = tmol.temperature; + return mol->getAtom( atomID ); + } + } + return ATOMGEN_ORB::Atom::_nil(); +} + +void setTemperature( SALOME_Actor* actor, double temperature ) +{ + if ( actor ) { + temperature = (((int)temperature) % 10 + 1.) / 10.; + actor->SetColor( temperature, 0., 1. - temperature ); + } +} + +int getStudyID() +{ + int studyID = -1; + if ( SUIT_Application* app = SUIT_Session::session()->activeApplication() ) + if ( SUIT_Study* study = app->activeStudy() ) + studyID = study->id(); + return studyID; +} + +SALOME_Prs* ATOMSOLVGUI_Displayer::buildPresentation( const QString& entry, SALOME_View* view ) +{ + const int studyID = getStudyID(); + if ( studyID == -1 ) + return 0; + + SVTK_Prs* prs = dynamic_cast( LightApp_Displayer::buildPresentation( entry, view ) ); + + if ( !prs ) return 0; + + double temperature; + ATOMGEN_ORB::Atom_var atom = getAtom( entry, studyID, temperature ); + + if ( !CORBA::is_nil( atom ) ) { + // PRESENTATION FOR OCC VIEWER + // double x = atom->getX(), y = atom->getY(), z = atom->getZ(); + // BRepPrimAPI_MakeSphere makeSphere( gp_Pnt( x, y, z ), radius ); + // Handle(AIS_Shape) aisShape = new AIS_Shape( makeSphere.Shell() ); + // if( !aisShape.IsNull() ) { + // aisShape->SetOwner( new SALOME_InteractiveObject( entry.latin1(), "ATOMSOLV" ) ); + // return new SOCC_Prs( aisShape ); + // } + double center[ 3 ]; + center[ 0 ] = atom->getX(); + center[ 1 ] = atom->getY(); + center[ 2 ] = atom->getZ(); + + vtkSphereSource* vtkObj = vtkSphereSource::New(); + vtkObj->SetRadius( radius ); + vtkObj->SetCenter( center ); + vtkObj->SetThetaResolution( (int)( vtkObj->GetEndTheta() * quality_coefficient ) ); + vtkObj->SetPhiResolution( (int)( vtkObj->GetEndPhi() * quality_coefficient ) ); + + vtkPolyDataMapper* vtkMapper = vtkPolyDataMapper::New(); + vtkMapper->SetInput( vtkObj->GetOutput() ); + + vtkObj->Delete(); + + SALOME_Actor* actor = SALOME_Actor::New(); + actor->SetMapper( vtkMapper ); + actor->setIO( new SALOME_InteractiveObject( entry.toLatin1(), "ATOMSOLV" ) ); + setTemperature( actor, temperature ); + + actor->SetRepresentation( 2 ); // 2 == surface mode + + vtkMapper->Delete(); + + prs->AddObject( actor ); + } + + return prs; +} + +void ATOMSOLVGUI_Displayer::updateActor( SALOME_Actor* actor ) +{ + const int studyID = getStudyID(); + if ( actor && actor->hasIO() && studyID >= 0 ) { + double temperature; + getAtom( actor->getIO()->getEntry(), studyID, temperature ); + setTemperature( actor, temperature ); + actor->Update(); + } +} + +void ATOMSOLVGUI_Displayer::setDisplayMode( const QStringList& entries, const QString& mode ) +{ + SALOME_View* view = GetActiveView(); + if ( view && dynamic_cast( view ) ) { + for ( QStringList::ConstIterator it = entries.begin(); it != entries.end(); ++it ) { + if ( SALOME_Prs* prs = view->CreatePrs( it->toLatin1() ) ) { + SVTK_Prs* vtkPrs = dynamic_cast( prs ); + vtkActorCollection* lst = vtkPrs ? vtkPrs->GetObjects() : 0; + if ( lst ) { + lst->InitTraversal(); + while ( vtkActor* actor = lst->GetNextActor() ) + if ( SALOME_Actor* salomeActor = SALOME_Actor::SafeDownCast( actor ) ) { + salomeActor->SetRepresentation( mode == "Points" ? 0 : mode == "Wireframe" ? 1 : 2 ); + salomeActor->Update(); + } + } + } + } + } +} + +void ATOMSOLVGUI_Displayer::setColor( const QStringList& entries, const QColor& color ) +{ + SALOME_View* view = GetActiveView(); + if ( view && dynamic_cast( view ) ) { + for ( QStringList::ConstIterator it = entries.begin(); it != entries.end(); ++it ) { + if ( SALOME_Prs* prs = view->CreatePrs( it->toLatin1() ) ) { + SVTK_Prs* vtkPrs = dynamic_cast( prs ); + vtkActorCollection* lst = vtkPrs ? vtkPrs->GetObjects() : 0; + if ( lst ) { + lst->InitTraversal(); + while ( vtkActor* actor = lst->GetNextActor() ) + if ( SALOME_Actor* salomeActor = SALOME_Actor::SafeDownCast( actor ) ) { + salomeActor->SetColor( (float)(color.red()) / 255., (float)(color.green()) / 255., (float)(color.blue()) / 255.); + salomeActor->Update(); + } + } + } + } + } +} + +QColor ATOMSOLVGUI_Displayer::getColor( const QString& entry ) +{ + SALOME_View* view = GetActiveView(); + if ( view && dynamic_cast( view ) ) { + if ( SALOME_Prs* prs = view->CreatePrs( entry.toLatin1() ) ) { + SVTK_Prs* vtkPrs = dynamic_cast( prs ); + vtkActorCollection* lst = vtkPrs ? vtkPrs->GetObjects() : 0; + if ( lst ) { + lst->InitTraversal(); + while ( vtkActor* actor = lst->GetNextActor() ) + if ( SALOME_Actor* salomeActor = SALOME_Actor::SafeDownCast( actor ) ) { + vtkFloatingPointType r, g, b; + salomeActor->GetColor( r, g, b ); + return QColor( (int)(r * 255.), (int)(g * 255.), (int)(b * 255.) ); + } + } + } + } + return QColor(); +} + +void ATOMSOLVGUI_Displayer::setTransparency( const QStringList& entries, const float transparency ) +{ + SALOME_View* view = GetActiveView(); + if ( view && dynamic_cast( view ) ) { + for ( QStringList::ConstIterator it = entries.begin(); it != entries.end(); ++it ) { + if ( SALOME_Prs* prs = view->CreatePrs( it->toLatin1() ) ) { + SVTK_Prs* vtkPrs = dynamic_cast( prs ); + vtkActorCollection* lst = vtkPrs ? vtkPrs->GetObjects() : 0; + if ( lst ) { + lst->InitTraversal(); + while ( vtkActor* actor = lst->GetNextActor() ) + if ( SALOME_Actor* salomeActor = SALOME_Actor::SafeDownCast( actor ) ) { + salomeActor->SetOpacity( transparency ); + salomeActor->Update(); + } + } + } + } + } +} + +float ATOMSOLVGUI_Displayer::getTransparency( const QString& entry ) +{ + SALOME_View* view = GetActiveView(); + if ( view && dynamic_cast( view ) ) { + if ( SALOME_Prs* prs = view->CreatePrs( entry.toLatin1() ) ) { + SVTK_Prs* vtkPrs = dynamic_cast( prs ); + vtkActorCollection* lst = vtkPrs ? vtkPrs->GetObjects() : 0; + if ( lst ) { + lst->InitTraversal(); + while ( vtkActor* actor = lst->GetNextActor() ) + if ( SALOME_Actor* salomeActor = SALOME_Actor::SafeDownCast( actor ) ) + return salomeActor->GetOpacity(); + } + } + } + return -1.; +} diff --git a/src/ATOMSOLVGUI/ATOMSOLVGUI_Displayer.h b/src/ATOMSOLVGUI/ATOMSOLVGUI_Displayer.h new file mode 100644 index 0000000..711e5b4 --- /dev/null +++ b/src/ATOMSOLVGUI/ATOMSOLVGUI_Displayer.h @@ -0,0 +1,61 @@ +// Copyright (C) 2007-2010 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 + +#ifndef ATOMSOLVGUI_DISPLAYER_HEADER +#define ATOMSOLVGUI_DISPLAYER_HEADER + +#include + +#include +#include + +class SALOME_Actor; + +class ATOMSOLVGUI_Displayer : public LightApp_Displayer +{ +public: + ATOMSOLVGUI_Displayer(); + virtual ~ATOMSOLVGUI_Displayer(); + + virtual bool canBeDisplayed( const QString& /*entry*/, const QString& /*viewer_type*/ ) const; + + void updateActor( SALOME_Actor* ); + + void setDisplayMode( const QStringList& entries, const QString& mode ); + void setColor( const QStringList& entries, const QColor& color ); + QColor getColor( const QString& entry ); + void setTransparency( const QStringList& entries, const float transparency ); + float getTransparency( const QString& entry ); + + static void setDefaultRepresentation( const int r ) { myRepresentation = r ; } + static int getDefaultRepresentation() { return myRepresentation; } + + static void setDefaultRadius( const double r ) { myRadius = r ; } + static double getDefaultRadius() { return myRadius; } + +protected: + virtual SALOME_Prs* buildPresentation( const QString&, SALOME_View* = 0 ); + + static int myRepresentation; // default 3D Representation mode + static double myRadius; // default radius of 3D sphere +}; + +#endif diff --git a/src/ATOMSOLVGUI/ATOMSOLVGUI_Selection.cxx b/src/ATOMSOLVGUI/ATOMSOLVGUI_Selection.cxx new file mode 100644 index 0000000..8d00913 --- /dev/null +++ b/src/ATOMSOLVGUI/ATOMSOLVGUI_Selection.cxx @@ -0,0 +1,94 @@ +// Copyright (C) 2007-2010 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 "ATOMSOLVGUI_Selection.h" + +#include +#include +#include + +#include + +#include +#include +#include +#include + +#include +#include + +#include +#include + +#include +#include + +#include + + +// VTK Includes +#include + +ATOMSOLVGUI_Selection::ATOMSOLVGUI_Selection() +{ +} + +ATOMSOLVGUI_Selection::~ATOMSOLVGUI_Selection() +{ +} + +QVariant ATOMSOLVGUI_Selection::parameter( const int ind, const QString& p ) const +{ + if ( p == "displaymode" ) + return QVariant( displayMode( ind ) ); + + return LightApp_Selection::parameter( ind, p ); +} + +QString ATOMSOLVGUI_Selection::displayMode( const int index ) const +{ + SALOME_View* view = LightApp_Displayer::GetActiveView(); + QString viewType = activeViewType(); + if ( view && viewType == SVTK_Viewer::Type() ) { + if ( SALOME_Prs* prs = view->CreatePrs( entry( index ).toLatin1() ) ) { + SVTK_Prs* vtkPrs = dynamic_cast( prs ); + vtkActorCollection* lst = vtkPrs ? vtkPrs->GetObjects() : 0; + if ( lst ) { + lst->InitTraversal(); + vtkActor* actor = lst->GetNextActor(); + if ( actor ) { + SALOME_Actor* salActor = dynamic_cast( actor ); + if ( salActor ) { + int dm = salActor->GetRepresentation(); + if ( dm == 0 ) + return "Points"; + else if ( dm == 1 ) + return "Wireframe"; + else if ( dm == 2 ) + return "Surface"; + } // if ( salome actor ) + } // if ( actor ) + } // if ( lst == vtkPrs->GetObjects() ) + } + } + return "Undefined"; +} + diff --git a/src/ATOMSOLVGUI/ATOMSOLVGUI_Selection.h b/src/ATOMSOLVGUI/ATOMSOLVGUI_Selection.h new file mode 100644 index 0000000..6c8ee60 --- /dev/null +++ b/src/ATOMSOLVGUI/ATOMSOLVGUI_Selection.h @@ -0,0 +1,39 @@ +// Copyright (C) 2007-2010 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 + +#ifndef ATOMSOLVGUI_SELECTION_HeaderFile +#define ATOMSOLVGUI_SELECTION_HeaderFile + +#include + +class ATOMSOLVGUI_Selection : public LightApp_Selection +{ +public: + ATOMSOLVGUI_Selection(); + virtual ~ATOMSOLVGUI_Selection(); + + virtual QVariant parameter( const int, const QString& ) const; + +private: + QString displayMode( const int ) const; +}; + +#endif diff --git a/src/ATOMSOLVGUI/ATOMSOLVGUI_TransparencyDlg.cxx b/src/ATOMSOLVGUI/ATOMSOLVGUI_TransparencyDlg.cxx new file mode 100644 index 0000000..120942a --- /dev/null +++ b/src/ATOMSOLVGUI/ATOMSOLVGUI_TransparencyDlg.cxx @@ -0,0 +1,129 @@ +// Copyright (C) 2007-2010 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 "ATOMSOLVGUI_TransparencyDlg.h" +#include "ATOMSOLVGUI_Displayer.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + + +ATOMSOLVGUI_TransparencyDlg::ATOMSOLVGUI_TransparencyDlg( QWidget* parent, const QStringList& entries ) + :QDialog( parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint ) +{ + myEntries = entries; + + resize(152, 107); + setWindowTitle(tr("TRANSPARENCY_DLG_TITLE")); + setSizeGripEnabled(TRUE); + QGridLayout* lay = new QGridLayout(this); + lay->setSpacing(6); + lay->setMargin(11); + + /*************************************************************************/ + QGroupBox* GroupButtons = new QGroupBox( this ); + QGridLayout* GroupButtonsLayout = new QGridLayout( GroupButtons ); + GroupButtonsLayout->setAlignment( Qt::AlignTop ); + GroupButtonsLayout->setSpacing( 6 ); + GroupButtonsLayout->setMargin( 11 ); + + QPushButton* buttonOk = new QPushButton( GroupButtons ); + buttonOk->setText( tr( "BUT_OK" ) ); + buttonOk->setAutoDefault( TRUE ); + buttonOk->setDefault( TRUE ); + + QPushButton* buttonHelp = new QPushButton( GroupButtons ); + buttonHelp->setText( tr( "BUT_HELP" ) ); + buttonHelp->setAutoDefault( TRUE ); + buttonHelp->setDefault( TRUE ); + + GroupButtonsLayout->addWidget( buttonOk, 0, 0 ); + GroupButtonsLayout->addItem( new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum), 0, 1 ); + GroupButtonsLayout->addWidget( buttonHelp, 0, 2 ); + + /*************************************************************************/ + QGroupBox* GroupC1 = new QGroupBox( this ); + QGridLayout* GroupC1Layout = new QGridLayout( GroupC1 ); + GroupC1Layout->setAlignment( Qt::AlignTop ); + GroupC1Layout->setSpacing( 6 ); + GroupC1Layout->setMargin( 11 ); + GroupC1Layout->setColumnMinimumWidth(1, 100); + + QLabel* TextLabelOpaque = new QLabel( GroupC1 ); + TextLabelOpaque->setText( tr( "TRANSPARENCY_TRANSPARENT" ) ); + TextLabelOpaque->setAlignment( Qt::AlignLeft ); + GroupC1Layout->addWidget( TextLabelOpaque, 0, 0 ); + GroupC1Layout->addItem( new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ), 0, 1 ); + + QLabel* TextLabelTransparent = new QLabel( GroupC1 ); + TextLabelTransparent->setText( tr( "TRANSPARENCY_OPAQUE" ) ); + TextLabelTransparent->setAlignment( Qt::AlignRight ); + GroupC1Layout->addWidget( TextLabelTransparent, 0, 2 ); + + mySlider = new QSlider( Qt::Horizontal, GroupC1 ); + mySlider->setMinimum( 0 ); + mySlider->setMaximum( 10 ); + GroupC1Layout->addWidget( mySlider, 0, 1 ); + /*************************************************************************/ + + lay->addWidget(GroupC1, 0, 0); + lay->addWidget(GroupButtons, 1, 0); + + if ( myEntries.count() == 1 ) { + int value = (int)(ATOMSOLVGUI_Displayer().getTransparency( myEntries[ 0 ] ) * 10.); + if ( value > 0 ) + mySlider->setValue( value ); + } + ValueHasChanged(mySlider->value()); + + // signals and slots connections : after ValueHasChanged() + connect(buttonOk, SIGNAL(clicked()), this, SLOT(accept())); + connect(buttonHelp, SIGNAL(clicked()), this, SLOT(ClickOnHelp())); + connect(mySlider, SIGNAL(valueChanged(int)), this, SLOT(ValueHasChanged(int))); +} + +//================================================================================= +// function : ClickOnHelp() +// purpose : +//================================================================================= +void ATOMSOLVGUI_TransparencyDlg::ClickOnHelp() +{ + // display a help in browser for example.. + // not implemented yet.. +} + +//================================================================================= +// function : ValueHasChanged() +// purpose : Called when value of slider change +// : or the first time as initilisation +//================================================================================= +void ATOMSOLVGUI_TransparencyDlg::ValueHasChanged( int newValue ) +{ + ATOMSOLVGUI_Displayer().setTransparency( myEntries, (float)mySlider->value() * .1 ); +} diff --git a/src/ATOMSOLVGUI/ATOMSOLVGUI_TransparencyDlg.h b/src/ATOMSOLVGUI/ATOMSOLVGUI_TransparencyDlg.h new file mode 100644 index 0000000..0cdb06e --- /dev/null +++ b/src/ATOMSOLVGUI/ATOMSOLVGUI_TransparencyDlg.h @@ -0,0 +1,52 @@ +// Copyright (C) 2007-2010 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 + +#ifndef TRANSPARENCYDLG_H +#define TRANSPARENCYDLG_H + +#include +#include + +class QSlider; + +//================================================================================= +// class : ATOMSOLVGUI_TransparencyDlg +// purpose : dialog box that allows to modify transparency of displayed objects +//================================================================================= +class ATOMSOLVGUI_TransparencyDlg : public QDialog +{ + Q_OBJECT + +public: + ATOMSOLVGUI_TransparencyDlg( QWidget* parent, const QStringList& entries ); + +private: + QSlider* mySlider; + QStringList myEntries; + +private slots: + void ClickOnHelp(); + void ValueHasChanged( int ) ; + +}; + +#endif // TRANSPARENCYDLG_H + diff --git a/src/ATOMSOLVGUI/Makefile.am b/src/ATOMSOLVGUI/Makefile.am new file mode 100644 index 0000000..d73d49e --- /dev/null +++ b/src/ATOMSOLVGUI/Makefile.am @@ -0,0 +1,73 @@ +# Copyright (C) 2007-2010 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +# Library target +lib_LTLIBRARIES = libATOMSOLV.la + +# Library sources +dist_libATOMSOLV_la_SOURCES = \ + ATOMSOLVGUI.h \ + ATOMSOLVGUI.cxx \ + ATOMSOLVGUI_DataModel.cxx \ + ATOMSOLVGUI_DataModel.h \ + ATOMSOLVGUI_DataObject.cxx \ + ATOMSOLVGUI_DataObject.h \ + ATOMSOLVGUI_Displayer.cxx \ + ATOMSOLVGUI_Displayer.h \ + ATOMSOLVGUI_Selection.cxx \ + ATOMSOLVGUI_Selection.h \ + ATOMSOLVGUI_TransparencyDlg.cxx \ + ATOMSOLVGUI_TransparencyDlg.h + +# MOC pre-processing +MOC_FILES = \ + ATOMSOLVGUI_moc.cxx \ + ATOMSOLVGUI_TransparencyDlg_moc.cxx + +nodist_libATOMSOLV_la_SOURCES = $(MOC_FILES) + +# additionnal compilation flags +libATOMSOLV_la_CPPFLAGS = \ + $(CAS_CPPFLAGS) \ + -I$(top_builddir)/idl \ + $(KERNEL_CXXFLAGS) \ + $(GUI_CXXFLAGS) \ + -I$(ATOMGEN_ROOT_DIR)/include/salome \ + $(QT_INCLUDES) \ + $(CORBA_CXXFLAGS) $(CORBA_INCLUDES) \ + $(VTK_INCLUDES) + +# additionnal linkage flags +libATOMSOLV_la_LDFLAGS = \ + $(GUI_LDFLAGS) -lLightApp \ + $(VTK_LIBS) + +libATOMSOLV_la_LIBADD = \ + ../../idl/libATOMSOLVIDL.la $(GUI_LDFLAGS) -lSalomeApp + +# -L $(ATOMGEN_ROOT_DIR)/lib/salome -lATOMGENIDL + +# resources files +nodist_salomeres_DATA = \ + ATOMSOLV_icons.qm \ + ATOMSOLV_msg_en.qm diff --git a/src/ATOMSOLVGUI/resources/ATOMSOLV_icons.ts b/src/ATOMSOLVGUI/resources/ATOMSOLV_icons.ts new file mode 100644 index 0000000..809f426 --- /dev/null +++ b/src/ATOMSOLVGUI/resources/ATOMSOLV_icons.ts @@ -0,0 +1,31 @@ + + + + + @default + + ICON_ATOM + atom.png + + + ICON_DISPLAY + display.png + + + ICON_ERASE + erase.png + + + ICON_IMPORT_DATA + import.xpm + + + ICON_MOLECULE + molecule.png + + + ICON_PROCESS_DATA + run.png + + + diff --git a/src/ATOMSOLVGUI/resources/ATOMSOLV_msg_en.ts b/src/ATOMSOLVGUI/resources/ATOMSOLV_msg_en.ts new file mode 100644 index 0000000..4122689 --- /dev/null +++ b/src/ATOMSOLVGUI/resources/ATOMSOLV_msg_en.ts @@ -0,0 +1,163 @@ + + + + + @default + + ATOM + Atom + + + ATOMSOLV_PREFERENCES + ATOMSOLV + + + DISPLAY_MODE_PREF + Default display mode + + + MEN_ATOMSOLV + AtomSolv + + + MEN_COLOR + Color + + + MEN_DISPLAY + Display + + + MEN_DISPLAY_MODE + Display mode + + + MEN_ERASE + Erase + + + MEN_POINTSMODE + Points + + + MEN_PROCESS_DATA + Process data + + + MEN_RETRIEVE_DATA + Retrieve data + + + MEN_SHADING + Surface + + + MEN_TRANSPARENCY + Transparency + + + MEN_WIREFRAME + Wireframe + + + MOLECULE + Molecule + + + PRESENTATION_PREF_GROUP + Atoms presentation + + + RADIUS_PREF + Default radius + + + STS_COLOR + Set color + + + STS_DISPLAY + Display atom + + + STS_ERASE + Erase atom + + + STS_POINTSMODE + Set Points representation mode + + + STS_PROCESS_DATA + Process data + + + STS_RETRIEVE_DATA + Retrieve data + + + STS_SHADING + Set Surface representation mode + + + STS_TRANSPARENCY + Set transparency + + + STS_WIREFRAME + Set Wireframe representation mode + + + TLT_COLOR + Color + + + TLT_DISPLAY + Display atom + + + TLT_ERASE + Erase atom + + + TLT_POINTSMODE + Points + + + TLT_PROCESS_DATA + Process data + + + TLT_RETRIEVE_DATA + Retrieve data + + + TLT_SHADING + Surface + + + TLT_TRANSPARENCY + Transparency + + + TLT_WIREFRAME + Wireframe + + + TOOL_ATOMSOLV + AtomSolv + + + TRANSPARENCY_DLG_TITLE + Set transparency + + + TRANSPARENCY_OPAQUE + Opaque + + + TRANSPARENCY_TRANSPARENT + Transparent + + + diff --git a/src/Makefile.am b/src/Makefile.am new file mode 100755 index 0000000..6779ce3 --- /dev/null +++ b/src/Makefile.am @@ -0,0 +1,24 @@ +# Copyright (C) 2007-2010 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +SUBDIRS = ATOMSOLV ATOMSOLVGUI -- 2.30.2