- change to MIT license
- thread local image reader instances - add keywords and categories - add python dependencies - README
This commit is contained in:
@@ -1,13 +1,16 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "ndbioimage"
|
name = "ndbioimage"
|
||||||
version = "2025.2.1"
|
version = "2025.2.2"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
rust-version = "1.78.0"
|
||||||
authors = ["Wim Pomp <w.pomp@nki.nl>"]
|
authors = ["Wim Pomp <w.pomp@nki.nl>"]
|
||||||
license = "GPL-3.0-or-later"
|
license = "MIT"
|
||||||
description = "Read bio image formats using the bio-formats java package."
|
description = "Read bio image formats using the bio-formats java package."
|
||||||
homepage = "https://github.com/wimpomp/ndbioimage/tree/rs"
|
homepage = "https://github.com/wimpomp/ndbioimage/tree/rs"
|
||||||
repository = "https://github.com/wimpomp/ndbioimage/tree/rs"
|
repository = "https://github.com/wimpomp/ndbioimage/tree/rs"
|
||||||
readme = "README.md"
|
readme = "README.md"
|
||||||
|
keywords = ["bioformats", "imread", "ndarray", "metadata"]
|
||||||
|
categories = ["multimedia::images", "science"]
|
||||||
exclude = ["/tests"]
|
exclude = ["/tests"]
|
||||||
|
|
||||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||||
@@ -21,6 +24,7 @@ j4rs = "0.22.0"
|
|||||||
ndarray = "0.16.1"
|
ndarray = "0.16.1"
|
||||||
num = "0.4.3"
|
num = "0.4.3"
|
||||||
numpy = { version = "0.23.0", optional = true }
|
numpy = { version = "0.23.0", optional = true }
|
||||||
|
thread_local = "1.1.8"
|
||||||
|
|
||||||
[dependencies.pyo3]
|
[dependencies.pyo3]
|
||||||
version = "0.23.4"
|
version = "0.23.4"
|
||||||
|
|||||||
693
LICENSE
693
LICENSE
@@ -1,674 +1,19 @@
|
|||||||
GNU GENERAL PUBLIC LICENSE
|
Copyright (c) 2025 Wim Pomp
|
||||||
Version 3, 29 June 2007
|
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
Everyone is permitted to copy and distribute verbatim copies
|
in the Software without restriction, including without limitation the rights
|
||||||
of this license document, but changing it is not allowed.
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
copies of the Software, and to permit persons to whom the Software is
|
||||||
Preamble
|
furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
The GNU General Public License is a free, copyleft license for
|
The above copyright notice and this permission notice shall be included in all
|
||||||
software and other kinds of works.
|
copies or substantial portions of the Software.
|
||||||
|
|
||||||
The licenses for most software and other practical works are designed
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
to take away your freedom to share and change the works. By contrast,
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
the GNU General Public License is intended to guarantee your freedom to
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
share and change all versions of a program--to make sure it remains free
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
software for all its users. We, the Free Software Foundation, use the
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
GNU General Public License for most of our software; it applies also to
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
any other work released this way by its authors. You can apply it to
|
SOFTWARE.
|
||||||
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 <https://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
|
|
||||||
<https://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
|
|
||||||
<https://www.gnu.org/licenses/why-not-lgpl.html>.
|
|
||||||
113
README.md
113
README.md
@@ -1,4 +1,115 @@
|
|||||||
# ndbioimage
|
# ndbioimage
|
||||||
|
[](https://github.com/wimpomp/ndbioimage/actions/workflows/pytest.yml)
|
||||||
|
|
||||||
## Work in progress
|
## Work in progress
|
||||||
Rust rewrite of python version. Read bio image formats using the bio-formats java package.
|
Rust rewrite of python version. Read bio image formats using the bio-formats java package.
|
||||||
[https://www.openmicroscopy.org/bio-formats/](https://www.openmicroscopy.org/bio-formats/)
|
[https://www.openmicroscopy.org/bio-formats/](https://www.openmicroscopy.org/bio-formats/)
|
||||||
|
|
||||||
|
Exposes (bio) images as a numpy ndarray-like object, but without loading the whole
|
||||||
|
image into memory, reading from the file only when needed. Some metadata is read
|
||||||
|
and stored in an [ome](https://genomebiology.biomedcentral.com/articles/10.1186/gb-2005-6-5-r47) structure.
|
||||||
|
Additionally, it can automatically calculate an affine transform that corrects for chromatic aberrations etc. and apply
|
||||||
|
it on the fly to the image.
|
||||||
|
|
||||||
|
Currently, it supports imagej tif files, czi files, micromanager tif sequences and anything
|
||||||
|
[bioformats](https://www.openmicroscopy.org/bio-formats/) can handle.
|
||||||
|
|
||||||
|
## Installation
|
||||||
|
|
||||||
|
```
|
||||||
|
pip install ndbioimage
|
||||||
|
```
|
||||||
|
|
||||||
|
### Installation with option to write mp4 or mkv:
|
||||||
|
Work in progress! Make sure ffmpeg is installed.
|
||||||
|
|
||||||
|
```
|
||||||
|
pip install ndbioimage[write]
|
||||||
|
```
|
||||||
|
|
||||||
|
## Usage
|
||||||
|
### Python
|
||||||
|
|
||||||
|
- Reading an image file and plotting the frame at channel=2, time=1
|
||||||
|
|
||||||
|
```
|
||||||
|
import matplotlib.pyplot as plt
|
||||||
|
from ndbioimage import Imread
|
||||||
|
with Imread('image_file.tif', axes='ctyx', dtype=int) as im:
|
||||||
|
plt.imshow(im[2, 1])
|
||||||
|
```
|
||||||
|
|
||||||
|
- Showing some image metadata
|
||||||
|
|
||||||
|
```
|
||||||
|
from ndbioimage import Imread
|
||||||
|
from pprint import pprint
|
||||||
|
with Imread('image_file.tif') as im:
|
||||||
|
pprint(im)
|
||||||
|
```
|
||||||
|
|
||||||
|
- Slicing the image without loading the image into memory
|
||||||
|
|
||||||
|
```
|
||||||
|
from ndbioimage import Imread
|
||||||
|
with Imread('image_file.tif', axes='cztyx') as im:
|
||||||
|
sliced_im = im[1, :, :, 100:200, 100:200]
|
||||||
|
```
|
||||||
|
|
||||||
|
sliced_im is an instance of Imread which will load any image data from file only when needed
|
||||||
|
|
||||||
|
|
||||||
|
- Converting (part) of the image to a numpy ndarray
|
||||||
|
|
||||||
|
```
|
||||||
|
from ndbioimage import Imread
|
||||||
|
import numpy as np
|
||||||
|
with Imread('image_file.tif', axes='cztyx') as im:
|
||||||
|
array = np.asarray(im[0, 0])
|
||||||
|
```
|
||||||
|
|
||||||
|
### Rust
|
||||||
|
```
|
||||||
|
use ndarray::Array2;
|
||||||
|
use ndbioimage::Reader;
|
||||||
|
|
||||||
|
let path = "/path/to/file";
|
||||||
|
let reader = Reader::new(&path, 0).unwrap();
|
||||||
|
println!("size: {}, {}", reader.size_y, reader.size_y);
|
||||||
|
let frame = reader.get_frame(0, 0, 0).unwrap();
|
||||||
|
if let Ok(arr) = <Frame as TryInto<Array2<i8>>>::try_into(frame) {
|
||||||
|
println!("{:?}", arr);
|
||||||
|
} else {
|
||||||
|
println!("could not convert Frame to Array<i8>");
|
||||||
|
}
|
||||||
|
let xml = reader.get_ome_xml().unwrap();
|
||||||
|
println!("{}", xml);
|
||||||
|
```
|
||||||
|
|
||||||
|
### Command line
|
||||||
|
```ndbioimage --help```: show help
|
||||||
|
```ndbioimage image```: show metadata about image
|
||||||
|
```ndbioimage image -w {name}.tif -r```: copy image into image.tif (replacing {name} with image), while registering channels
|
||||||
|
```ndbioimage image -w image.mp4 -C cyan lime red``` copy image into image.mp4 (z will be max projected), make channel colors cyan lime and red
|
||||||
|
|
||||||
|
## Adding more formats
|
||||||
|
Readers for image formats subclass AbstractReader. When an image reader is imported, Imread will
|
||||||
|
automatically recognize it and use it to open the appropriate file format. Image readers
|
||||||
|
are required to implement the following methods:
|
||||||
|
|
||||||
|
- staticmethod _can_open(path): return True if path can be opened by this reader
|
||||||
|
- \_\_frame__(self, c, z, t): return the frame at channel=c, z-slice=z, time=t from the file
|
||||||
|
|
||||||
|
Optional methods:
|
||||||
|
- get_ome: reads metadata from file and adds them to an OME object imported
|
||||||
|
from the ome-types library
|
||||||
|
- open(self): maybe open some file handle
|
||||||
|
- close(self): close any file handles
|
||||||
|
|
||||||
|
Optional fields:
|
||||||
|
- priority (int): Imread will try readers with a lower number first, default: 99
|
||||||
|
- do_not_pickle (strings): any attributes that should not be included when the object is pickled,
|
||||||
|
for example: any file handles
|
||||||
|
|
||||||
|
# TODO
|
||||||
|
- more image formats
|
||||||
|
|||||||
@@ -968,7 +968,7 @@ class Imread(np.lib.mixins.NDArrayOperatorsMixin, ABC):
|
|||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def kill_vm() -> None:
|
def kill_vm() -> None:
|
||||||
JVM().kill_vm()
|
pass
|
||||||
|
|
||||||
def new(self, *args: Any, **kwargs: Any) -> View:
|
def new(self, *args: Any, **kwargs: Any) -> View:
|
||||||
warnings.warn('Imread.new has been deprecated, use Imread.view instead.', DeprecationWarning, 2)
|
warnings.warn('Imread.new has been deprecated, use Imread.view instead.', DeprecationWarning, 2)
|
||||||
|
|||||||
@@ -1,16 +1,56 @@
|
|||||||
[build-system]
|
[build-system]
|
||||||
requires = ["maturin>=1.8.2"]
|
requires = ["maturin>=1.8,<2.0"]
|
||||||
build-backend = "maturin"
|
build-backend = "maturin"
|
||||||
|
|
||||||
[project]
|
[project]
|
||||||
name = "ndbioimage"
|
name = "ndbioimage"
|
||||||
|
description = "Bio image reading, metadata and some affine registration."
|
||||||
|
authors = [
|
||||||
|
{ name = "W. Pomp", email = "w.pomp@nki.nl" }
|
||||||
|
]
|
||||||
|
license = "MIT"
|
||||||
|
readme = "README.md"
|
||||||
|
keywords = ["bioformats", "imread", "numpy", "metadata"]
|
||||||
requires-python = ">=3.10"
|
requires-python = ">=3.10"
|
||||||
classifiers = [
|
classifiers = [
|
||||||
|
"License :: OSI Approved :: MIT License",
|
||||||
"Programming Language :: Rust",
|
"Programming Language :: Rust",
|
||||||
"Programming Language :: Python :: Implementation :: CPython",
|
"Programming Language :: Python",
|
||||||
"Programming Language :: Python :: Implementation :: PyPy",
|
"Programming Language :: Python :: 3",
|
||||||
|
"Programming Language :: Python :: 3 :: Only",
|
||||||
|
"Programming Language :: Python :: 3.10",
|
||||||
|
"Programming Language :: Python :: 3.11",
|
||||||
|
"Programming Language :: Python :: 3.12",
|
||||||
|
"Programming Language :: Python :: 3.13",
|
||||||
|
"Programming Language :: Python :: 3.14",
|
||||||
]
|
]
|
||||||
dynamic = ["version"]
|
dynamic = ["version"]
|
||||||
|
dependencies = [
|
||||||
|
"numpy",
|
||||||
|
"pandas",
|
||||||
|
"tiffwrite",
|
||||||
|
"ome-types",
|
||||||
|
"pint",
|
||||||
|
"tqdm",
|
||||||
|
"lxml",
|
||||||
|
"pyyaml",
|
||||||
|
"parfor",
|
||||||
|
"SimpleITK-SimpleElastix",
|
||||||
|
"scikit-image",
|
||||||
|
]
|
||||||
|
|
||||||
|
[project.optional-dependencies]
|
||||||
|
test = ["pytest"]
|
||||||
|
write = ["matplotlib", "scikit-video"]
|
||||||
|
|
||||||
|
[project.urls]
|
||||||
|
Repository = "https://github.com/wimpomp/ndbioimage/tree/rs"
|
||||||
|
|
||||||
|
[project.scripts]
|
||||||
|
ndbioimage = "ndbioimage:main"
|
||||||
|
|
||||||
|
[tool.pytest.ini_options]
|
||||||
|
filterwarnings = ["ignore:::(colorcet)"]
|
||||||
|
|
||||||
[tool.maturin]
|
[tool.maturin]
|
||||||
python-source = "py"
|
python-source = "py"
|
||||||
|
|||||||
@@ -71,6 +71,7 @@ macro_rules! method_arg {
|
|||||||
|
|
||||||
macro_rules! method {
|
macro_rules! method {
|
||||||
($name:ident, $method:expr $(,[$($n:tt: $t:ty$(|$p:tt)?),*])? $(=> $tt:ty$(|$c:tt)?)?) => {
|
($name:ident, $method:expr $(,[$($n:tt: $t:ty$(|$p:tt)?),*])? $(=> $tt:ty$(|$c:tt)?)?) => {
|
||||||
|
#[allow(dead_code)]
|
||||||
pub(crate) fn $name(&self, $($($n: $t),*)?) -> method_return!($($tt)?) {
|
pub(crate) fn $name(&self, $($($n: $t),*)?) -> method_return!($($tt)?) {
|
||||||
let args: Vec<InvocationArg> = vec![$($( method_arg!($n:$t$(|$p)?) ),*)?];
|
let args: Vec<InvocationArg> = vec![$($( method_arg!($n:$t$(|$p)?) ),*)?];
|
||||||
let _result = jvm().invoke(&self.0, $method, &args)?;
|
let _result = jvm().invoke(&self.0, $method, &args)?;
|
||||||
@@ -95,10 +96,12 @@ macro_rules! method {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) struct DebugTools;
|
/// Wrapper around bioformats java class loci.common.DebugTools
|
||||||
|
pub struct DebugTools;
|
||||||
|
|
||||||
impl DebugTools {
|
impl DebugTools {
|
||||||
pub(crate) fn set_root_level(level: &str) -> Result<()> {
|
/// set debug root level: ERROR, DEBUG, TRACE, INFO, OFF
|
||||||
|
pub fn set_root_level(level: &str) -> Result<()> {
|
||||||
jvm().invoke_static(
|
jvm().invoke_static(
|
||||||
"loci.common.DebugTools",
|
"loci.common.DebugTools",
|
||||||
"setRootLevel",
|
"setRootLevel",
|
||||||
@@ -108,6 +111,7 @@ impl DebugTools {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Wrapper around bioformats java class loci.formats.ChannelSeparator
|
||||||
pub(crate) struct ChannelSeparator(Instance);
|
pub(crate) struct ChannelSeparator(Instance);
|
||||||
|
|
||||||
impl ChannelSeparator {
|
impl ChannelSeparator {
|
||||||
@@ -129,7 +133,8 @@ impl ChannelSeparator {
|
|||||||
method!(get_index, "getIndex", [z: i32|p, c: i32|p, t: i32|p] => i32|c);
|
method!(get_index, "getIndex", [z: i32|p, c: i32|p, t: i32|p] => i32|c);
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) struct ImageReader(Instance);
|
/// Wrapper around bioformats java class loci.formats.ImageReader
|
||||||
|
pub struct ImageReader(Instance);
|
||||||
|
|
||||||
impl Drop for ImageReader {
|
impl Drop for ImageReader {
|
||||||
fn drop(&mut self) {
|
fn drop(&mut self) {
|
||||||
@@ -179,6 +184,7 @@ impl ImageReader {
|
|||||||
method!(close, "close");
|
method!(close, "close");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Wrapper around bioformats java class loci.formats.MetadataTools
|
||||||
pub(crate) struct MetadataTools(Instance);
|
pub(crate) struct MetadataTools(Instance);
|
||||||
|
|
||||||
impl MetadataTools {
|
impl MetadataTools {
|
||||||
|
|||||||
83
src/lib.rs
83
src/lib.rs
@@ -9,7 +9,9 @@ use ndarray::Array2;
|
|||||||
use num::{FromPrimitive, Zero};
|
use num::{FromPrimitive, Zero};
|
||||||
use std::any::type_name;
|
use std::any::type_name;
|
||||||
use std::fmt::Debug;
|
use std::fmt::Debug;
|
||||||
|
use std::ops::Deref;
|
||||||
use std::path::{Path, PathBuf};
|
use std::path::{Path, PathBuf};
|
||||||
|
use thread_local::ThreadLocal;
|
||||||
|
|
||||||
/// Pixel types (u)int(8/16/32) or float(32/64)
|
/// Pixel types (u)int(8/16/32) or float(32/64)
|
||||||
#[derive(Clone, Debug)]
|
#[derive(Clone, Debug)]
|
||||||
@@ -141,7 +143,7 @@ where
|
|||||||
|
|
||||||
/// Reader interface to file. Use get_frame to get data.
|
/// Reader interface to file. Use get_frame to get data.
|
||||||
pub struct Reader {
|
pub struct Reader {
|
||||||
image_reader: ImageReader,
|
image_reader: ThreadLocal<ImageReader>,
|
||||||
/// path to file
|
/// path to file
|
||||||
pub path: PathBuf,
|
pub path: PathBuf,
|
||||||
/// which (if more than 1) of the series in the file to open
|
/// which (if more than 1) of the series in the file to open
|
||||||
@@ -161,6 +163,22 @@ pub struct Reader {
|
|||||||
little_endian: bool,
|
little_endian: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl Deref for Reader {
|
||||||
|
type Target = ImageReader;
|
||||||
|
|
||||||
|
fn deref(&self) -> &Self::Target {
|
||||||
|
self.image_reader.get_or(|| {
|
||||||
|
let reader = ImageReader::new().unwrap();
|
||||||
|
let meta_data_tools = MetadataTools::new().unwrap();
|
||||||
|
let ome_meta = meta_data_tools.create_ome_xml_metadata().unwrap();
|
||||||
|
reader.set_metadata_store(ome_meta).unwrap();
|
||||||
|
reader.set_id(self.path.to_str().unwrap()).unwrap();
|
||||||
|
reader.set_series(self.series).unwrap();
|
||||||
|
reader
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
impl Clone for Reader {
|
impl Clone for Reader {
|
||||||
fn clone(&self) -> Self {
|
fn clone(&self) -> Self {
|
||||||
Reader::new(&self.path, self.series).unwrap()
|
Reader::new(&self.path, self.series).unwrap()
|
||||||
@@ -187,36 +205,31 @@ impl Reader {
|
|||||||
/// Create new reader for image file at path.
|
/// Create new reader for image file at path.
|
||||||
pub fn new(path: &Path, series: i32) -> Result<Self> {
|
pub fn new(path: &Path, series: i32) -> Result<Self> {
|
||||||
DebugTools::set_root_level("ERROR")?;
|
DebugTools::set_root_level("ERROR")?;
|
||||||
let reader = ImageReader::new()?;
|
let mut reader = Reader {
|
||||||
let meta_data_tools = MetadataTools::new()?;
|
image_reader: ThreadLocal::new(),
|
||||||
let ome_meta = meta_data_tools.create_ome_xml_metadata()?;
|
|
||||||
reader.set_metadata_store(ome_meta)?;
|
|
||||||
reader.set_id(path.to_str().unwrap())?;
|
|
||||||
reader.set_series(series)?;
|
|
||||||
let size_x = reader.get_size_x()?;
|
|
||||||
let size_y = reader.get_size_y()?;
|
|
||||||
let size_c = reader.get_size_c()?;
|
|
||||||
let size_z = reader.get_size_z()?;
|
|
||||||
let size_t = reader.get_size_t()?;
|
|
||||||
let pixel_type = PixelType::try_from(reader.get_pixel_type()?)?;
|
|
||||||
let little_endian = reader.is_little_endian()?;
|
|
||||||
Ok(Reader {
|
|
||||||
image_reader: reader,
|
|
||||||
path: PathBuf::from(path),
|
path: PathBuf::from(path),
|
||||||
series,
|
series,
|
||||||
size_x: size_x as usize,
|
size_x: 0,
|
||||||
size_y: size_y as usize,
|
size_y: 0,
|
||||||
size_c: size_c as usize,
|
size_c: 0,
|
||||||
size_z: size_z as usize,
|
size_z: 0,
|
||||||
size_t: size_t as usize,
|
size_t: 0,
|
||||||
pixel_type,
|
pixel_type: PixelType::INT8,
|
||||||
little_endian,
|
little_endian: false,
|
||||||
})
|
};
|
||||||
|
reader.size_x = reader.get_size_x()? as usize;
|
||||||
|
reader.size_y = reader.get_size_y()? as usize;
|
||||||
|
reader.size_c = reader.get_size_c()? as usize;
|
||||||
|
reader.size_z = reader.get_size_z()? as usize;
|
||||||
|
reader.size_t = reader.get_size_t()? as usize;
|
||||||
|
reader.pixel_type = PixelType::try_from(reader.get_pixel_type()?)?;
|
||||||
|
reader.little_endian = reader.is_little_endian()?;
|
||||||
|
Ok(reader)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Get ome metadata as xml string
|
/// Get ome metadata as xml string
|
||||||
pub fn get_ome_xml(&self) -> Result<String> {
|
pub fn get_ome_xml(&self) -> Result<String> {
|
||||||
self.image_reader.ome_xml()
|
self.ome_xml()
|
||||||
}
|
}
|
||||||
|
|
||||||
fn deinterleave(&self, bytes: Vec<u8>, channel: usize) -> Result<Vec<u8>> {
|
fn deinterleave(&self, bytes: Vec<u8>, channel: usize) -> Result<Vec<u8>> {
|
||||||
@@ -240,16 +253,16 @@ impl Reader {
|
|||||||
|
|
||||||
/// Retrieve fame at channel c, slize z and time t.
|
/// Retrieve fame at channel c, slize z and time t.
|
||||||
pub fn get_frame(&self, c: usize, z: usize, t: usize) -> Result<Frame> {
|
pub fn get_frame(&self, c: usize, z: usize, t: usize) -> Result<Frame> {
|
||||||
let bytes = if self.image_reader.is_rgb()? & self.image_reader.is_interleaved()? {
|
let bytes = if self.is_rgb()? & self.is_interleaved()? {
|
||||||
let index = self.image_reader.get_index(z as i32, 0, t as i32)?;
|
let index = self.get_index(z as i32, 0, t as i32)?;
|
||||||
self.deinterleave(self.image_reader.open_bytes(index)?, c)?
|
self.deinterleave(self.open_bytes(index)?, c)?
|
||||||
} else if self.image_reader.get_rgb_channel_count()? > 1 {
|
} else if self.get_rgb_channel_count()? > 1 {
|
||||||
let channel_separator = bioformats::ChannelSeparator::new(&self.image_reader)?;
|
let channel_separator = bioformats::ChannelSeparator::new(self)?;
|
||||||
let index = channel_separator.get_index(z as i32, c as i32, t as i32)?;
|
let index = channel_separator.get_index(z as i32, c as i32, t as i32)?;
|
||||||
channel_separator.open_bytes(index)?
|
channel_separator.open_bytes(index)?
|
||||||
} else if self.image_reader.is_indexed()? {
|
} else if self.is_indexed()? {
|
||||||
let index = self.image_reader.get_index(z as i32, 0, t as i32)?;
|
let index = self.get_index(z as i32, 0, t as i32)?;
|
||||||
self.image_reader.open_bytes(index)?
|
self.open_bytes(index)?
|
||||||
// TODO: apply LUT
|
// TODO: apply LUT
|
||||||
// let _bytes_lut = match self.pixel_type {
|
// let _bytes_lut = match self.pixel_type {
|
||||||
// PixelType::INT8 | PixelType::UINT8 => {
|
// PixelType::INT8 | PixelType::UINT8 => {
|
||||||
@@ -261,8 +274,8 @@ impl Reader {
|
|||||||
// _ => {}
|
// _ => {}
|
||||||
// };
|
// };
|
||||||
} else {
|
} else {
|
||||||
let index = self.image_reader.get_index(z as i32, c as i32, t as i32)?;
|
let index = self.get_index(z as i32, c as i32, t as i32)?;
|
||||||
self.image_reader.open_bytes(index)?
|
self.open_bytes(index)?
|
||||||
};
|
};
|
||||||
self.bytes_to_frame(bytes)
|
self.bytes_to_frame(bytes)
|
||||||
}
|
}
|
||||||
|
|||||||
13
src/py.rs
13
src/py.rs
@@ -8,17 +8,16 @@ use std::path::PathBuf;
|
|||||||
#[pyo3(name = "Reader")]
|
#[pyo3(name = "Reader")]
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
struct PyReader {
|
struct PyReader {
|
||||||
path: PathBuf,
|
reader: Reader,
|
||||||
series: i32,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[pymethods]
|
#[pymethods]
|
||||||
impl PyReader {
|
impl PyReader {
|
||||||
#[new]
|
#[new]
|
||||||
fn new(path: &str, series: usize) -> PyResult<Self> {
|
fn new(path: &str, series: usize) -> PyResult<Self> {
|
||||||
|
let path = PathBuf::from(path);
|
||||||
Ok(PyReader {
|
Ok(PyReader {
|
||||||
path: PathBuf::from(path),
|
reader: Reader::new(&path, series as i32)?,
|
||||||
series: series as i32,
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -29,8 +28,7 @@ impl PyReader {
|
|||||||
z: usize,
|
z: usize,
|
||||||
t: usize,
|
t: usize,
|
||||||
) -> PyResult<Bound<'py, PyAny>> {
|
) -> PyResult<Bound<'py, PyAny>> {
|
||||||
let reader = Reader::new(&self.path, self.series)?; // TODO: prevent making a new Reader each time
|
Ok(match self.reader.get_frame(c, z, t)? {
|
||||||
Ok(match reader.get_frame(c, z, t)? {
|
|
||||||
Frame::INT8(arr) => arr.to_pyarray(py).into_any(),
|
Frame::INT8(arr) => arr.to_pyarray(py).into_any(),
|
||||||
Frame::UINT8(arr) => arr.to_pyarray(py).into_any(),
|
Frame::UINT8(arr) => arr.to_pyarray(py).into_any(),
|
||||||
Frame::INT16(arr) => arr.to_pyarray(py).into_any(),
|
Frame::INT16(arr) => arr.to_pyarray(py).into_any(),
|
||||||
@@ -43,8 +41,7 @@ impl PyReader {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn get_ome_xml(&self) -> PyResult<String> {
|
fn get_ome_xml(&self) -> PyResult<String> {
|
||||||
let reader = Reader::new(&self.path, self.series)?; // TODO: prevent making a new Reader each time
|
Ok(self.reader.get_ome_xml()?)
|
||||||
Ok(reader.get_ome_xml()?)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user