Mercurial > hg > orthanc-tests
changeset 13:7b69a561f4d3
cont
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Thu, 18 Jun 2015 16:22:44 +0200 |
| parents | 15c166240dfb |
| children | ed9a9fe66002 |
| files | COPYING Database/Beaufix/IM-0001-0001.dcm Database/ColorTestImageJ.dcm Database/PilatesArgenturGEUltrasoundOsiriX.dcm Database/README.txt GenerateConfigurationForTests.py Tests/Run.py Tests/Tests.py Tests/Toolbox.py |
| diffstat | 9 files changed, 1187 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/COPYING Thu Jun 18 16:22:44 2015 +0200 @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + <program> Copyright (C) <year> <name of author> + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +<http://www.gnu.org/licenses/>. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +<http://www.gnu.org/philosophy/why-not-lgpl.html>.
--- a/Database/README.txt Thu Jun 18 14:33:01 2015 +0200 +++ b/Database/README.txt Thu Jun 18 16:22:44 2015 +0200 @@ -39,7 +39,10 @@ Here is the source of each set of sample images: +- Beaufix/* : From OsiriX, "BEAUFIX". - Brainix/* : From OsiriX, "BRAINIX". +- ColorTestImageJ.dcm : From ImageJ, http://imagej.nih.gov/ij/images/cardio.dcm +- ColorTestMalaterre.dcm : From Mathieu Malaterre, Debian bug #698417 - DummyCT.dcm : From Osirix, "KNIX" with PixelData removed. - Issue16.dcm : From Chris Hafey on Google Code (AT VR's are not returned properly as JSON) - Issue19.dcm : From Chris Hafey on Google Code (YBR_FULL are not decoded incorrectly) @@ -48,6 +51,6 @@ - Knee/* : From OsiriX, "KNEE". - Multiframe.dcm : From GDCM, "images_of_interest/PHILIPS_Integris_H-8-MONO2-Multiframe.dcm" - Phenix/* : From OsiriX, "PHENIX". -- PrivateTags.dcm : From GDCM, "images_of_interest/494APG9K.dcm" +- PilatesArgenturGEUltrasoundOsiriX.dcm: From https://groups.google.com/d/msg/orthanc-users/m3zQLyl_jNc/TUrR462UKSMJ - PrivateMDNTags.dcm : From University Hospital of Liege -- ColorTestMalaterre.dcm : From Mathieu Malaterre, Debian bug #698417 +- PrivateTags.dcm : From GDCM, "images_of_interest/494APG9K.dcm"
--- a/GenerateConfigurationForTests.py Thu Jun 18 14:33:01 2015 +0200 +++ b/GenerateConfigurationForTests.py Thu Jun 18 16:22:44 2015 +0200 @@ -80,6 +80,9 @@ config = re.sub(r'("OrthancPeers"\s*:)\s*{', r'\1 { "peer" : [ "http://%s:%d/", "%s", "%s" ]' % (ip, 5000, 'alice', 'orthanctest'), config) +# Enable case-insensitive PN (the default on versions <= 0.8.6) +config = re.sub(r'("CaseSensitivePN"\s*:)\s*true', r'\1 false', config) + with open(args.target, 'wt') as f: f.write(config)
--- a/Tests/Run.py Thu Jun 18 14:33:01 2015 +0200 +++ b/Tests/Run.py Thu Jun 18 16:22:44 2015 +0200 @@ -110,16 +110,18 @@ LOCAL = DefineOrthanc(aet = 'ORTHANCTEST', - url = 'http://localhost:5000', + server = 'localhost', dicomPort = 5001, + restPort = 5000, username = 'alice', password = 'orthanctest') -REMOTE = DefineOrthanc(url = 'http://%s:%d/' % (args.server, args.rest), +REMOTE = DefineOrthanc(server = args.server, username = args.username, password = args.password, aet = args.aet, - dicomPort = args.dicom) + dicomPort = args.dicom, + restPort = args.rest)
--- a/Tests/Tests.py Thu Jun 18 14:33:01 2015 +0200 +++ b/Tests/Tests.py Thu Jun 18 16:22:44 2015 +0200 @@ -20,6 +20,7 @@ from PIL import ImageChops from Toolbox import * +from xml.dom import minidom _LOCAL = None _REMOTE = None @@ -738,7 +739,7 @@ self.assertEqual(41, im.size[1]) # http://effbot.org/zone/pil-comparing-images.htm - truth = Image.open(os.path.join(os.path.dirname(__file__), '..', 'Database', 'ColorTestMalaterre.png')) + truth = Image.open(GetDatabasePath('ColorTestMalaterre.png')) self.assertTrue(ImageChops.difference(im, truth).getbbox() is None) @@ -830,3 +831,485 @@ m = DoGet(_REMOTE, '/patients/%s/metadata' % p) self.assertEqual(1, len(m)) self.assertTrue('LastUpdate' in m) + + + def test_statistics(self): + # Upload 16 instances + for i in range(4): + UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-000%d.dcm' % (i + 1)) + UploadInstance(_REMOTE, 'Brainix/Epi/IM-0001-000%d.dcm' % (i + 1)) + UploadInstance(_REMOTE, 'Knee/T1/IM-0001-000%d.dcm' % (i + 1)) + UploadInstance(_REMOTE, 'Knee/T2/IM-0001-000%d.dcm' % (i + 1)) + + s = DoGet(_REMOTE, '/statistics') + self.assertEqual(16, s['CountInstances']) + self.assertEqual(2, s['CountPatients']) + self.assertEqual(2, s['CountStudies']) + self.assertEqual(4, s['CountSeries']) + d = int(s['TotalUncompressedSize']) + + e = 0 + for patient in DoGet(_REMOTE, '/patients'): + s = DoGet(_REMOTE, '/patients/%s/statistics' % patient) + self.assertEqual(8, s['CountInstances']) + self.assertEqual(1, s['CountStudies']) + self.assertEqual(2, s['CountSeries']) + e += int(s['UncompressedSize']) + + for study in DoGet(_REMOTE, '/studies'): + s = DoGet(_REMOTE, '/studies/%s/statistics' % study) + self.assertEqual(8, s['CountInstances']) + self.assertEqual(2, s['CountSeries']) + e += int(s['UncompressedSize']) + + for series in DoGet(_REMOTE, '/series'): + s = DoGet(_REMOTE, '/series/%s/statistics' % series) + self.assertEqual(4, s['CountInstances']) + e += int(s['UncompressedSize']) + + self.assertEqual(3 * d, e) + + + def test_custom_attachment(self): + UploadInstance(_REMOTE, 'Brainix/Flair/IM-0001-0001.dcm') + patient = DoGet(_REMOTE, '/patients')[0] + instance = DoGet(_REMOTE, '/instances')[0] + size = int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']) + self.assertEqual(size, int(DoGet(_REMOTE, '/statistics')['TotalDiskSize'])) + + self.assertEqual(0, len(DoGet(_REMOTE, '/patients/%s/attachments' % patient))) + self.assertEqual(2, len(DoGet(_REMOTE, '/instances/%s/attachments' % instance))) + self.assertTrue('dicom' in DoGet(_REMOTE, '/instances/%s/attachments' % instance)) + self.assertTrue('dicom-as-json' in DoGet(_REMOTE, '/instances/%s/attachments' % instance)) + + self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/patients/%s/attachments/22' % patient, 'hello')) + hello = 'hellohellohellohellohellohellohellohellohello' + DoPut(_REMOTE, '/patients/%s/attachments/1025' % patient, hello) + self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']), + int(DoGet(_REMOTE, '/statistics')['TotalDiskSize'])) + self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']), + size + int(DoGet(_REMOTE, '/patients/%s/attachments/1025/compressed-size' % patient))) + + DoPut(_REMOTE, '/patients/%s/attachments/1026' % patient, 'world') + self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']), + int(DoGet(_REMOTE, '/statistics')['TotalDiskSize'])) + self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']), + size + + int(DoGet(_REMOTE, '/patients/%s/attachments/1025/compressed-size' % patient)) + + int(DoGet(_REMOTE, '/patients/%s/attachments/1026/compressed-size' % patient))) + + self.assertEqual(2, len(DoGet(_REMOTE, '/patients/%s/attachments' % patient))) + self.assertEqual(hello, DoGet(_REMOTE, '/patients/%s/attachments/1025/data' % patient)) + self.assertEqual('world', DoGet(_REMOTE, '/patients/%s/attachments/1026/data' % patient)) + DoPost(_REMOTE, '/patients/%s/attachments/1025/verify-md5' % patient) + DoPost(_REMOTE, '/patients/%s/attachments/1026/verify-md5' % patient) + DoPut(_REMOTE, '/patients/%s/attachments/1026' % patient, 'world2') + self.assertEqual('world2', DoGet(_REMOTE, '/patients/%s/attachments/1026/data' % patient)) + + self.assertRaises(Exception, lambda: DoDelete(_REMOTE, '/instances/%s/attachments/dicom' % instance)) + DoDelete(_REMOTE, '/patients/%s/attachments/1025' % patient) + self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']), + int(DoGet(_REMOTE, '/statistics')['TotalDiskSize'])) + self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']), + size + int(DoGet(_REMOTE, '/patients/%s/attachments/1026/compressed-size' % patient))) + + self.assertEqual(1, len(DoGet(_REMOTE, '/patients/%s/attachments' % patient))) + DoDelete(_REMOTE, '/patients/%s/attachments/1026' % patient) + self.assertEqual(0, len(DoGet(_REMOTE, '/patients/%s/attachments' % patient))) + + self.assertEqual(int(DoGet(_REMOTE, '/patients/%s/statistics' % patient)['DiskSize']), size) + self.assertEqual(size, int(DoGet(_REMOTE, '/statistics')['TotalDiskSize'])) + + + def test_incoming_storescu(self): + self.assertEqual(0, len(DoGet(_REMOTE, '/patients'))) + subprocess.check_call([ 'storescu', _REMOTE['Server'], str(_REMOTE['DicomPort']), + GetDatabasePath('ColorTestImageJ.dcm') ]) + self.assertEqual(1, len(DoGet(_REMOTE, '/patients'))) + + + def test_incoming_findscu(self): + def CallFindScu(args): + p = subprocess.Popen([ 'findscu', '-P', '-aec', _REMOTE['DicomAet'], '-aet', _LOCAL['DicomAet'], + _REMOTE['Server'], str(_REMOTE['DicomPort']) ] + args, + stderr=subprocess.PIPE) + return p.communicate()[1] + + UploadInstance(_REMOTE, 'Multiframe.dcm') + UploadInstance(_REMOTE, 'ColorTestImageJ.dcm') + + i = CallFindScu([ '-k', '0008,0052=PATIENT', '-k', '0010,0010' ]) + patientNames = re.findall('\(0010,0010\).*?\[(.*?)\]', i) + self.assertEqual(2, len(patientNames)) + self.assertTrue('Test Patient BG ' in patientNames) + self.assertTrue('Anonymized' in patientNames) + + i = CallFindScu([ '-k', '0008,0052=SERIES', '-k', '0008,0021' ]) + series = re.findall('\(0008,0021\).*?\[\s*(.*?)\s*\]', i) + self.assertEqual(2, len(series)) + self.assertTrue('20070208' in series) + self.assertTrue('19980312' in series) + + i = CallFindScu([ '-k', '0008,0052=SERIES', '-k', 'PatientName=Anonymized' ]) + series = re.findall('\(0010,0010\).*?\[\s*(.*?)\s*\]', i) + self.assertEqual(1, len(series)) + + # Test the "CaseSentitivePN" flag (false by default) + i = CallFindScu([ '-k', '0008,0052=SERIES', '-k', 'PatientName=anonymized' ]) + series = re.findall('\(0010,0010\).*?\[\s*(.*?)\s*\]', i) + self.assertEqual(1, len(series)) + + + @unittest.skip("This test fails, to fix") + def test_incoming_movescu(self): + def CallMoveScu(args): + subprocess.check_call([ 'movescu', + '--move', _LOCAL['DicomAet'], # Target AET (i.e. storescp) + '--call', _REMOTE['DicomAet'], # Called AET (i.e. Orthanc) + '--aetitle', _LOCAL['DicomAet'], # Calling AET (i.e. storescp) + _REMOTE['Server'], str(_REMOTE['DicomPort']) ] + args, + stderr=subprocess.PIPE) + + UploadInstance(_REMOTE, 'Multiframe.dcm') + + self.assertEqual(0, len(DoGet(_LOCAL, '/patients'))) + #CallMoveScu([ '--patient', '-k', '0008,0052=PATIENT', '-k', 'PatientID=none' ]) + self.assertEqual(0, len(DoGet(_LOCAL, '/patients'))) + CallMoveScu([ '--patient', '-k', '0008,0052=PATIENT', '-k', 'PatientID=12345678' ]) + self.assertEqual(1, len(DoGet(_LOCAL, '/patients'))) + + + def test_findscu(self): + i = UploadInstance(_REMOTE, 'DummyCT.dcm')['ID'] + j = UploadInstance(_REMOTE, 'Issue22.dcm')['ID'] + k = UploadInstance(_REMOTE, 'ColorTestImageJ.dcm')['ID'] + DoPost(_REMOTE, '/modalities/orthanctest/store', str(i), 'text/plain') + + # Test the "find-patient" level + p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { }) + self.assertEqual(1, len(p)) + self.assertEqual('ozp00SjY2xG', p[0]['PatientID']) + + # Test wildcards constraints. The "LO" value representation + # for PatientID is always case-sensitive, but the "PN" for + # PatientName might depend on the implementation: + # "GenerateConfigurationForTests.py" will force it to be case + # insensitive (which was the default until Orthanc 0.8.6). + p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientName' : 'K*' }) + self.assertEqual(1, len(p)) + + p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientName' : 'k*' }) + self.assertEqual(1, len(p)) + + p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientID' : 'ozp*' }) + self.assertEqual(1, len(p)) + + p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientID' : 'o?p*' }) + self.assertEqual(1, len(p)) + + p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientID' : '0?q*' }) + self.assertEqual(0, len(p)) + + p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientName' : 'B*' }) + self.assertEqual(0, len(p)) + + p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientName' : 'b*' }) + self.assertEqual(0, len(p)) + + DoPost(_REMOTE, '/modalities/orthanctest/store', str(j), 'text/plain') + DoPost(_REMOTE, '/modalities/orthanctest/store', str(k), 'text/plain') + DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { }) + self.assertEqual(3, len(DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { }))) + + p = DoPost(_REMOTE, '/modalities/orthanctest/find-patient', { 'PatientName' : 'A*' }) + self.assertEqual(2, len(p)) + + # Test the "find-study" level. This is the instance "ColorTestImageJ.dcm" + s = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ' }) + self.assertEqual(1, len(s)) + self.assertEqual('20070208', s[0]['StudyDate']) + + # Test range searches + t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ', + 'StudyDate' : '-20070101' }) + self.assertEqual(0, len(t)) + + t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ', + 'StudyDate' : '20090101-' }) + self.assertEqual(0, len(t)) + + t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ', + 'StudyDate' : '20070101-' }) + self.assertEqual(1, len(t)) + + t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ', + 'StudyDate' : '-20090101' }) + self.assertEqual(1, len(t)) + + t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ', + 'StudyDate' : '20070207-20070207' }) + self.assertEqual(0, len(t)) + + t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ', + 'StudyDate' : '20070208-20070208' }) + self.assertEqual(1, len(t)) + + t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { 'PatientID' : 'B9uTHKOZ', + 'StudyDate' : '20070209-20070209' }) + self.assertEqual(0, len(t)) + + # Test the ModalitiesInStudy tag + t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { + 'PatientID' : 'B9uTHKOZ', + 'ModalitiesInStudy' : 'US' }) + self.assertEqual(0, len(t)) + + t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { + 'PatientID' : 'B9uTHKOZ', + 'ModalitiesInStudy' : 'CT' }) + self.assertEqual(1, len(t)) + + t = DoPost(_REMOTE, '/modalities/orthanctest/find-study', { + 'PatientID' : 'B9uTHKOZ', + 'ModalitiesInStudy' : 'US\\CT' }) + self.assertEqual(1, len(t)) + + # Test the "find-series" level + t = DoPost(_REMOTE, '/modalities/orthanctest/find-series', { + 'PatientID' : 'B9uTHKOZ', + 'StudyInstanceUID' : s[0]['StudyInstanceUID'] }) + self.assertEqual(1, len(t)) + + # Test "\" separator + t = DoPost(_REMOTE, '/modalities/orthanctest/find-series', { + 'PatientID' : 'B9uTHKOZ', + 'StudyInstanceUID' : s[0]['StudyInstanceUID'], + 'Modality' : 'MR\\CT\\US' }) + self.assertEqual(1, len(t)) + + t = DoPost(_REMOTE, '/modalities/orthanctest/find-series', { + 'PatientID' : 'B9uTHKOZ', + 'StudyInstanceUID' : s[0]['StudyInstanceUID'], + 'Modality' : 'MR\\US' }) + self.assertEqual(0, len(t)) + + + def test_update_modalities(self): + try: + DoDelete(_REMOTE, '/modalities/toto') + except: + pass + try: + DoDelete(_REMOTE, '/modalities/tata') + except: + pass + self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/modalities/toto')) + DoPut(_REMOTE, '/modalities/toto', [ "STORESCP", "localhost", 2000 ]) + DoPut(_REMOTE, '/modalities/tata', [ "STORESCP", "localhost", 2000, 'MedInria' ]) + self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/modalities/toto', [ "STORESCP", "localhost", 2000, 'MedInriaaa' ])) + self.assertTrue('store' in DoGet(_REMOTE, '/modalities/toto')) + self.assertTrue('store' in DoGet(_REMOTE, '/modalities/tata')) + DoDelete(_REMOTE, '/modalities/toto') + DoDelete(_REMOTE, '/modalities/tata') + self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/modalities/toto')) + self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/modalities/tata')) + + + def test_update_peers(self): + # curl -X PUT http://localhost:8042/peers/toto -d '["http://localhost:8042/"]' -v + try: + DoDelete(_REMOTE, '/peers/toto') + except: + pass + try: + DoDelete(_REMOTE, '/peers/tata') + except: + pass + self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/peers/toto')) + DoPut(_REMOTE, '/peers/toto', [ 'http://localhost:8042/' ]) + DoPut(_REMOTE, '/peers/tata', [ 'http://localhost:8042/', 'user', 'pass' ]) + self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/peers/toto', [ 'http://localhost:8042/', 'a' ])) + self.assertRaises(Exception, lambda: DoPut(_REMOTE, '/peers/toto', [ 'http://localhost:8042/', 'a', 'b', 'c' ])) + self.assertTrue('store' in DoGet(_REMOTE, '/peers/toto')) + self.assertTrue('store' in DoGet(_REMOTE, '/peers/tata')) + DoDelete(_REMOTE, '/peers/toto') + DoDelete(_REMOTE, '/peers/tata') + self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/peers/toto')) + self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/peers/tata')) + + + def test_mesterhazy_modification(self): + # When I modify a series ( eg. curl + # http://localhost:8042/series/uidhere/modify -X POST -d + # '{"Replace":{"SeriesDate":"19990101"}}' ) the modified + # series is added to a new Study, instead of the existing + # Study. Fixed in Orthanc 0.7.5 + + u = UploadInstance(_REMOTE, 'DummyCT.dcm') + study = 'b9c08539-26f93bde-c81ab0d7-bffaf2cb-a4d0bdd0' + series = 'f2635388-f01d497a-15f7c06b-ad7dba06-c4c599fe' + + modified = DoPost(_REMOTE, '/series/%s/modify' % series, + json.dumps({ "Replace" : { "SeriesDate" : "19990101" }})) + + self.assertEqual(study, DoGet(_REMOTE, '/series/%s' % modified['ID']) ['ParentStudy']) + + + def test_create(self): + i = DoPost(_REMOTE, '/tools/create-dicom', + json.dumps({ + 'PatientName' : 'Jodogne', + 'Modality' : 'CT', + 'PixelData' : 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==' # red dot in RGBA + })) + + self.assertEqual('Jodogne', DoGet(_REMOTE, '/instances/%s/content/PatientName' % i['ID']).strip()) + self.assertEqual('CT', DoGet(_REMOTE, '/instances/%s/content/Modality' % i['ID']).strip()) + + png = GetImage(_REMOTE, '/instances/%s/preview' % i['ID']) + self.assertEqual((5, 5), png.size) + + + def test_pilates(self): + # "SCU failed error when accessing orthanc with osirix" by + # Pilates Agentur (Mar 10, 2014 at 9:33 PM) + i = UploadInstance(_REMOTE, 'PilatesArgenturGEUltrasoundOsiriX.dcm')['ID'] + self.assertEqual(0, len(DoGet(_LOCAL, '/patients'))) + j = DoPost(_REMOTE, '/modalities/orthanctest/store', str(i), 'text/plain') + self.assertEqual(1, len(DoGet(_LOCAL, '/patients'))) + + + def test_shared_tags(self): + a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')['ID'] + b = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0002.dcm')['ID'] + p = DoGet(_REMOTE, '/patients')[0] + + self.assertTrue('0010,0010' in DoGet(_REMOTE, '/patients/%s/shared-tags' % p)) + self.assertTrue('PatientName' in DoGet(_REMOTE, '/patients/%s/shared-tags?simplify' % p)) + self.assertTrue('0008,1030' in DoGet(_REMOTE, '/patients/%s/shared-tags' % p)) + self.assertTrue('StudyDescription' in DoGet(_REMOTE, '/patients/%s/shared-tags?simplify' % p)) + self.assertTrue('0008,103e' in DoGet(_REMOTE, '/patients/%s/shared-tags' % p)) + self.assertTrue('SeriesDescription' in DoGet(_REMOTE, '/patients/%s/shared-tags?simplify' % p)) + self.assertFalse('0008,0018' in DoGet(_REMOTE, '/patients/%s/shared-tags' % p)) + self.assertFalse('SOPInstanceUID' in DoGet(_REMOTE, '/patients/%s/shared-tags?simplify' % p)) + + self.assertTrue('0008,0018' in DoGet(_REMOTE, '/instances/%s/tags' % a)) + self.assertTrue('SOPInstanceUID' in DoGet(_REMOTE, '/instances/%s/tags?simplify' % a)) + + + def test_modules(self): + a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')['ID'] + p = DoGet(_REMOTE, '/patients')[0] + s = DoGet(_REMOTE, '/studies')[0] + t = DoGet(_REMOTE, '/series')[0] + + self.assertTrue('0010,0010' in DoGet(_REMOTE, '/patients/%s/module' % p)) + self.assertTrue('PatientName' in DoGet(_REMOTE, '/patients/%s/module?simplify' % p)) + self.assertTrue('0010,0010' in DoGet(_REMOTE, '/studies/%s/module-patient' % p)) + self.assertTrue('PatientName' in DoGet(_REMOTE, '/studies/%s/module-patient?simplify' % p)) + self.assertTrue('0008,1030' in DoGet(_REMOTE, '/studies/%s/module' % s)) + self.assertTrue('StudyDescription' in DoGet(_REMOTE, '/studies/%s/module?simplify' % s)) + self.assertTrue('0008,103e' in DoGet(_REMOTE, '/series/%s/module' % p)) + self.assertTrue('SeriesDescription' in DoGet(_REMOTE, '/series/%s/module?simplify' % p)) + self.assertTrue('0008,0018' in DoGet(_REMOTE, '/instances/%s/module' % a)) + self.assertTrue('SOPInstanceUID' in DoGet(_REMOTE, '/instances/%s/module?simplify' % a)) + + + def test_auto_directory(self): + a = UploadInstance(_REMOTE, 'Knee/T1/IM-0001-0001.dcm')['ID'] + self.assertTrue('now' in DoGet(_REMOTE, '/tools')) + self.assertTrue('dicom-conformance' in DoGet(_REMOTE, '/tools')) + self.assertTrue(len(DoGet(_REMOTE, '/tools/dicom-conformance')) > 1000) + self.assertTrue('orthanctest' in DoGet(_REMOTE, '/modalities')) + self.assertTrue('echo' in DoGet(_REMOTE, '/modalities/orthanctest')) + self.assertTrue('find' in DoGet(_REMOTE, '/modalities/orthanctest')) + self.assertTrue('find-instance' in DoGet(_REMOTE, '/modalities/orthanctest')) + self.assertTrue('find-patient' in DoGet(_REMOTE, '/modalities/orthanctest')) + self.assertTrue('find-series' in DoGet(_REMOTE, '/modalities/orthanctest')) + self.assertTrue('find-study' in DoGet(_REMOTE, '/modalities/orthanctest')) + self.assertTrue('store' in DoGet(_REMOTE, '/modalities/orthanctest')) + self.assertTrue('store' in DoGet(_REMOTE, '/peers/peer')) + self.assertTrue('matlab' in DoGet(_REMOTE, '/instances/%s/frames/0' % a)) + self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/tools/nope')) + + + def test_echo(self): + DoPost(_REMOTE, '/modalities/orthanctest/echo') + + + def test_xml(self): + json = DoGet(_REMOTE, '/tools', headers = { 'accept' : 'application/json' }) + xml = minidom.parseString(DoGet(_REMOTE, '/tools', headers = { 'accept' : 'application/xml' })) + items = xml.getElementsByTagName('root')[0].getElementsByTagName('item') + self.assertEqual(len(items), len(json)) + + self.assertTrue('dicom-conformance' in json) + + ok = False + for i in items: + if i.childNodes[0].data == 'dicom-conformance': + ok = True + self.assertTrue(ok) + + + def test_issue_16(self): + i = UploadInstance(_REMOTE, 'Issue16.dcm')['ID'] + t = DoGet(_REMOTE, '/instances/%s/tags?simplify' % i)['FrameIncrementPointer'] + self.assertEqual('0018,1063', t) + + + def test_issue_22(self): + s = UploadInstance(_REMOTE, 'Issue22.dcm')['ID'] + a = [ + "f804691f62197040438f4627c6b994f1", # Frame 0 + "c69eee9a51eea3e8611e82e578897254", + "315666be83e2d0111c77bc0996d84901", + "3e27aa959d911172c48a1436443c72b1", + "958642c9e7e9d232d3869faff546058c", + "5e7ea8e3e4230cae707d143481355c59", + "eda37f83558d858a596175aed8b2ad47", + "486713bd2895c4ecbe0e97715ac7f80a", + "091ef729eb169e67da8a0faa9631f9a8", + "5aa2b8c7ffe0a483efaa8e12417686ca", + "e2f39e85896fe58876654b94cd0b5013", + "6fd2129e4950abbe1be053bc814d5da8", + "c3331a8ba7a757f3d423735ab7fa81f9", + "746f808582156734dd6b6fdfd3a0b72c", + "8075ea2b227a70c60ea6b7b75a6bb190", + "806b8b3e300c615099c11a5ec23465aa", + "7c836aa298ba6eef96434579af631a11", + "a0357dc9f4f72d73a885c33d7c287446", + "f25ba3be1cc7d7fad95706adc199ea7d", + "8b114c526b8cbed6cad8a3248b7b480c", + "44e6670f127e612a2b4aa60a0d207698", + "b8945f90fe02facf2ace24ca1ecbe0a5", + "95c796c2fa8f59018b15cf2987b1f79b", + "ce0a51ab30224205b44920221dc27351", # Frame 23 + ] + + self.assertEqual(24, len(DoGet(_REMOTE, '/instances/%s/frames' % s))) + self.assertRaises(Exception, lambda: DoGet(_REMOTE, '/instances/%s/frames/24/preview' % s)) + + for i in range(len(a)): + self.assertEqual(a[i], ComputeMD5(DoGet(_REMOTE, '/instances/%s/frames/%d/preview' % (s, i)))) + + + def test_issue_19(self): + # This is an image with "YBR_FULL" photometric interpretation + # gdcmconv -i /home/jodogne/DICOM/GdcmDatabase/US_DataSet/HDI5000_US/3EAF5E01 -w -o Issue19.dcm + + a = UploadInstance(_REMOTE, 'Issue19.dcm')['ID'] + i = DoGet(_REMOTE, '/instances/941ad3c8-05d05b88-560459f9-0eae0e20-6cddd533/preview') + + # eb5d156c3594497f589158a6c6f3ca51 <=> Unsupported.png + self.assertEqual('eb5d156c3594497f589158a6c6f3ca51', ComputeMD5(i)) + + + def test_issue_37(self): + # Same test for issues 35 and 37. Fixed in Orthanc 0.9.1 + u = UploadInstance(_REMOTE, 'Beaufix/IM-0001-0001.dcm')['ID'] + + a = DoPost(_REMOTE, '/tools/find', { 'Level' : 'Series', + 'CaseSensitive' : True, + 'Query' : { 'StationName' : 'SMR4-MP3' }}) + self.assertEqual(1, len(a))
--- a/Tests/Toolbox.py Thu Jun 18 14:33:01 2015 +0200 +++ b/Tests/Toolbox.py Thu Jun 18 16:22:44 2015 +0200 @@ -33,9 +33,6 @@ from urllib import urlencode -HERE = os.path.dirname(__file__) - - # http://stackoverflow.com/a/1313868/881731 try: from cStringIO import StringIO @@ -43,22 +40,24 @@ from StringIO import StringIO -def DefineOrthanc(url = 'http://localhost:8042', +def DefineOrthanc(server = 'localhost', + restPort = 8042, username = None, password = None, aet = 'ORTHANC', dicomPort = 4242): - m = re.match(r'(http|https)://([^:]+):([^@]+)@([^@]+)', url) - if m != None: - url = m.groups()[0] + '://' + m.groups()[3] - username = m.groups()[1] - password = m.groups()[2] + #m = re.match(r'(http|https)://([^:]+):([^@]+)@([^@]+)', url) + #if m != None: + # url = m.groups()[0] + '://' + m.groups()[3] + # username = m.groups()[1] + # password = m.groups()[2] - if not url.endswith('/'): - url += '/' + #if not url.endswith('/'): + # url += '/' return { - 'Url' : url, + 'Server' : server, + 'Url' : 'http://%s:%d/' % (server, restPort), 'Username' : username, 'Password' : password, 'DicomAet' : aet, @@ -134,18 +133,17 @@ def DoPost(orthanc, uri, data = {}, contentType = '', headers = {}): return _DoPutOrPost(orthanc, uri, 'POST', data, contentType, headers) +def GetDatabasePath(filename): + return os.path.join(os.path.dirname(__file__), '..', 'Database', filename) + def UploadInstance(orthanc, filename): - global HERE - p = os.path.join(HERE, '..', 'Database', filename) - f = open(p, 'rb') + f = open(GetDatabasePath(filename), 'rb') d = f.read() f.close() return DoPost(orthanc, '/instances', d, 'application/dicom') def UploadFolder(orthanc, path): - global HERE - p = os.path.join(HERE, '..', 'Database', path) - for i in os.listdir(p): + for i in os.listdir(GetDatabasePath(path)): try: UploadInstance(orthanc, os.path.join(path, i)) except: