dclab 0.62.13__cp311-cp311-musllinux_1_2_x86_64.whl → 0.62.14__cp311-cp311-musllinux_1_2_x86_64.whl

dclab/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.62.13'
-__version_tuple__ = version_tuple = (0, 62, 13)
+__version__ = version = '0.62.14'
+__version_tuple__ = version_tuple = (0, 62, 14)

dclab/rtdc_dataset/fmt_dcor/tables.py

@@ -1,5 +1,7 @@
 import numpy as np
 
+from ..meta_table import MetaTable
+
 
 class DCORTables:
     def __init__(self, api):
@@ -35,7 +37,7 @@ class DCORTables:
         return self._tables_cache
 
 
-class DCORTable:
+class DCORTable(MetaTable):
     def __init__(self, table_content):
         self._columns, data = table_content
         self._tab_data = np.asarray(data)

dclab/rtdc_dataset/fmt_hdf5/tables.py

@@ -1,3 +1,6 @@
+from ..meta_table import MetaTable
+
+
 class H5Tables:
     def __init__(self, h5):
         self.h5file = h5
@@ -30,7 +33,7 @@ class H5Tables:
         return self._cache_keys
 
 
-class H5Table:
+class H5Table(MetaTable):
     def __init__(self, h5_ds):
         self._h5_ds = h5_ds
         self._keys = None

dclab/rtdc_dataset/meta_table.py

@@ -0,0 +1,25 @@
+import abc
+
+
+class MetaTable(abc.ABC):
+    @abc.abstractmethod
+    def __array__(self, *args, **kwargs):
+        """Return array representation of the table"""
+
+    @property
+    @abc.abstractmethod
+    def meta(self):
+        """Return metadata of the table (e.g. graph colors)"""
+
+    @abc.abstractmethod
+    def has_graphs(self):
+        """Return True when the table has key-based graphs"""
+
+    @abc.abstractmethod
+    def keys(self):
+        """Return keys of the graphs, None if `not self.has_graphs()`"""
+
+    @abc.abstractmethod
+    def __getitem__(self, key):
+        """Return a graph or otherwise part of the data array"""
+        pass

dclab/rtdc_dataset/writer.py

@@ -17,6 +17,7 @@ from ..util import hashobj
 from .._version import version
 
 from .feat_anc_plugin import PlugInFeature
+from .meta_table import MetaTable
 
 #: DEPRECATED (use `CHUNK_SIZE_BYTES` instead)
 CHUNK_SIZE = 100
@@ -641,6 +642,12 @@ class RTDCWriter:
         if h5_attrs is None:
             h5_attrs = {}
 
+        # Convert MetaTable to numpy data
+        if isinstance(cmp_array, MetaTable):
+            h5_attrs.update(cmp_array.meta)
+            cmp_array = cmp_array.__array__()
+
+        # Handle individual cases
         if isinstance(cmp_array, np.recarray):
             # A table is a compound array (np.recarray). If we are here,
             # this means that the user passed an instance of np.recarray.

{dclab-0.62.13.dist-info → dclab-0.62.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dclab
-Version: 0.62.13
+Version: 0.62.14
 Summary: Library for real-time deformability cytometry (RT-DC)
 Author: Benedikt Hartmann, Eoghan O'Connell, Maik Herbig, Maximilian Schlögel, Nadia Sbaa, Paul Müller, Philipp Rosendahl, Raghava Alajangi
 Maintainer-email: Paul Müller <dev@craban.de>

{dclab-0.62.13.dist-info → dclab-0.62.14.dist-info}/RECORD

@@ -1,5 +1,5 @@
 dclab/cached.py,sha256=eWTYBiI-HQM7JuPH-oxa5LLnhAX32GpRwlYg2kQ3sTA,2917
-dclab/_version.py,sha256=BStrLKf1_ahS_0f5AwaERVLxxQT0VoDKL1AD-6iDlyw,415
+dclab/_version.py,sha256=XRYJOVRTVlCADg2_TgjmbG5T_76D28phoj0PXxmNXe0,415
 dclab/statistics.py,sha256=tJDqPlY_Jw2Hhl-s7ugMBSZAxcRuPu4LQuBAZBXz7t8,6355
 dclab/kde_contours.py,sha256=5K7PzZz-FtSGvW4IR2tLpbEKKqCSsSTQPsupu7zIsPg,6745
 dclab/__init__.py,sha256=1mskJAUo8HbvDhJRJFbcFB6HccFeqoRUCEHLuS64t_g,812
@@ -8,7 +8,7 @@ dclab/warn.py,sha256=MjJvyQeuvIXFQ2-fHDzbmXJ0scnHqqRJlIxfuLI_utE,523
 dclab/polygon_filter.py,sha256=qexmo-rXe06CUPZhN6EMJy4y4B5gXZeqejdvIB2arOE,13480
 dclab/downsampling.pyx,sha256=OK7zbgGLl5gVyoU8ZBHo9EWwb8C9ChavmLNEvQvC9T0,7258
 dclab/kde_methods.py,sha256=awlqkj819VRJzArG6Fx6myDa6qGpLoZ8S9IJ1J1YECA,9206
-dclab/downsampling.cpython-311-x86_64-linux-musl.so,sha256=NMsntoAEtjjXP2a8IXQhDjOxUSc5UVXF10ZbWNBCHjQ,1544816
+dclab/downsampling.cpython-311-x86_64-linux-musl.so,sha256=0SkQlIFm0MmsEVMdBF9gzkwevomnXIXYna1aTIAeYbE,1544816
 dclab/util.py,sha256=nLL5jwG14h1YFJ_d0L-5DwsWgyfst5hVndaiLbTkYH4,5253
 dclab/rtdc_dataset/load.py,sha256=wGJuIv7pH1zpBhg6Cj_H0wxHZb-KwHR8TWnyDosCBBA,2473
 dclab/rtdc_dataset/fmt_http.py,sha256=vXVxRLXZp2_V1v3xk4lu4VUHYXfNHJdsRkVt3trC1RU,3374
@@ -19,14 +19,15 @@ dclab/rtdc_dataset/fmt_s3.py,sha256=OavOOGa2oOyG-VSfehFf6JVNs2k5iZalRm6ZTBu6sY4,
 dclab/rtdc_dataset/__init__.py,sha256=MUHSGVQJ4Zc0IyU2lf01dpDWyOyNveHip-UjSkmPNvQ,486
 dclab/rtdc_dataset/core.py,sha256=hho2XD4-s-mag8xtaukf7NC-_XyE8W0dql2wAoGuS3A,37998
 dclab/rtdc_dataset/copier.py,sha256=-2ISiOs4ytxN_ttXQGhaepuD2Ppy80G9UlDSZVyEoOU,14175
-dclab/rtdc_dataset/writer.py,sha256=KVane_1X2fHJCJjLJ6kAWWHxnKOabO2Akb_54ANu1aU,41172
+dclab/rtdc_dataset/writer.py,sha256=jc6ADyxGoujXpoXu1vF2nfZjGFMaO5LbRmoYJZ83JVo,41418
 dclab/rtdc_dataset/feat_basin.py,sha256=ViKdvJcwFM8joysnrBYdZbA5t_wZix-6xn_FsvzpYsQ,21072
 dclab/rtdc_dataset/check.py,sha256=lJNaz4QTe2WNlxik6zSohRHTiAYuP_bKOzSDjPGTUS0,35006
+dclab/rtdc_dataset/meta_table.py,sha256=ucqBNrgI6rDAuQFuMRckY8lp1LpnYAoRgEsLObWTJCE,648
 dclab/rtdc_dataset/feat_temp.py,sha256=XbDIS1iUUkRH0Zp9uVlwvK_untJ7hkOnKshK1Drsnt8,3694
 dclab/rtdc_dataset/fmt_dict.py,sha256=gumVQOiVVDFUKow_483PY7cxInqo-NiBBnBhIU8s4lg,3009
 dclab/rtdc_dataset/fmt_dcor/access_token.py,sha256=jotLQay138RUlv8wbdF2ishRnyE9N0KwGGBlbCL0wRI,2028
 dclab/rtdc_dataset/fmt_dcor/base.py,sha256=wD127W5LvvhkUy8SvFVVwAR6EEYtzgoWJ4booh45rfA,6588
-dclab/rtdc_dataset/fmt_dcor/tables.py,sha256=FY7AuJ9DEN55nQsCCyAp8ZlqO4hrwP5EDkQOov2OOfk,1635
+dclab/rtdc_dataset/fmt_dcor/tables.py,sha256=NaVEwLKmOg7Mz5iAMe2S8C4xRVC_YO3zeT7g5EbQE1M,1682
 dclab/rtdc_dataset/fmt_dcor/__init__.py,sha256=WjO1uM_Vlof15Y7HkhkV5Xv75q9TDIdOBIuS_I38qps,210
 dclab/rtdc_dataset/fmt_dcor/basin.py,sha256=tQZ4GumqURjS3eppRrSyUq1zBPD0y_8rwznMRDXiDUs,2526
 dclab/rtdc_dataset/fmt_dcor/api.py,sha256=COPRnPfPBcxbQGxHFEbGxp2CjK-Mgnt3cIu20-Zz04M,4245
@@ -41,7 +42,7 @@ dclab/rtdc_dataset/fmt_tdms/exc.py,sha256=WzrMqnyrzp8gsT8Pf7JKqGGv43ewx7d_qgtirU
 dclab/rtdc_dataset/fmt_tdms/event_image.py,sha256=-jp7Z-N91e4ieumYQ1huMicj7PMJqwIr5VsNWE_-EEk,8006
 dclab/rtdc_dataset/fmt_tdms/naming.py,sha256=biI9l1EO6BuSYgwZG0deacj4i1fMHQcW78AKXEcm5Wc,5373
 dclab/rtdc_dataset/fmt_hdf5/base.py,sha256=_PgmDq2K7RGCuhV9J4YZwg9noW1hi2w14ZP8ooRR8Lw,6391
-dclab/rtdc_dataset/fmt_hdf5/tables.py,sha256=DFIYoeNiGO0dut-wK1gBX-kuPD603mw_2VbFDtPkDNg,1505
+dclab/rtdc_dataset/fmt_hdf5/tables.py,sha256=9Q-9N52BTtOT_9avGObpe71t6MpLAKQDhbJrcETJ4a8,1553
 dclab/rtdc_dataset/fmt_hdf5/__init__.py,sha256=yWLYK-Fq0EYnp2eYfl1Ze02RBMOWg-iALJWs4dFSxxY,270
 dclab/rtdc_dataset/fmt_hdf5/basin.py,sha256=mJZR92Qoa71EwDVDYAP9KtOcjvRyjtA2wO1DkCBfBQc,792
 dclab/rtdc_dataset/fmt_hdf5/events.py,sha256=JUuPviS4lEXMjfNgJE-jkeArAwUVkdA1bmAszJGjPvc,8231
@@ -90,10 +91,10 @@ dclab/external/packaging/__init__.py,sha256=VR57BXHvzwDGR4c0M_RcsxYm0kUpvUq6l6HV
 dclab/external/packaging/LICENSE,sha256=ytHvW9NA1z4HS6YU0m996spceUDD2MNIUuZcSQlobEg,197
 dclab/external/packaging/LICENSE.APACHE,sha256=DVQuDIgE45qn836wDaWnYhSdxoLXgpRRKH4RuTjpRZQ,10174
 dclab/external/skimage/measure.py,sha256=y1idCqD9TUxp3-QnOiWR_d674OKaeqBJ4MN2-gVP6ro,247
-dclab/external/skimage/_pnpoly.cpython-311-x86_64-linux-musl.so,sha256=AcAOMvIoASF2bWTujCGLyKthSrnBTYx5QSLnNRNEXYY,1244128
+dclab/external/skimage/_pnpoly.cpython-311-x86_64-linux-musl.so,sha256=OkQvm_U03RbgFiiuvwImI5dhfDQH0oEw6XIhQSoF78U,1244128
 dclab/external/skimage/_pnpoly.pyx,sha256=Qdn6xPazDschBqbr46DzB75MB2MnqvdnoTSBMK7kUGE,2504
 dclab/external/skimage/__init__.py,sha256=-B2QUKHAFzQuBWuuKvPDC5JIl0Zb-x3OGmbwPaE9VwQ,72
-dclab/external/skimage/_find_contours_cy.cpython-311-x86_64-linux-musl.so,sha256=AFPQ9HWC7wjuNVGBhmQWY4DXQvlnTjv63SDKtwSqyPE,1166296
+dclab/external/skimage/_find_contours_cy.cpython-311-x86_64-linux-musl.so,sha256=STf2aC7POhZjhnvrmMaTem_NCO9KIFP13nkwA9jQ_AM,1166296
 dclab/external/skimage/LICENSE,sha256=ivsSBvn3c0R9mOctWRRdza7C7wdZSRYgCVxlVqUdlB8,1452
 dclab/external/skimage/pnpoly.py,sha256=r8hFNiTz5XlUoNZjosqA0iyv1FPn0l7ewbplgFgkdaw,1347
 dclab/external/skimage/_find_contours_cy.pyx,sha256=pZJOBhMHzYEMkcz4WQVyjn7jDNrdjCfet47FU1hRAxk,7161
@@ -129,9 +130,9 @@ dclab/lme4/wrapr.py,sha256=rdIc2hS8GhgdU9WFA6pLzohJGlBga-mkm60qqqk6VO4,15017
 dclab/lme4/rsetup.py,sha256=kH9VFtcK83ZaF9jvh1n5kcmGmPLLsmCPia_ElEHBLes,5890
 dclab/lme4/__init__.py,sha256=5WPFMTK-Yia3NJuwZEEBQ3fCyW3DiFgpZFrAwU33TV4,272
 dclab/lme4/lme4_template.R,sha256=CEXQIquvYCla9dCvRYgiBemI6fiVgAKnJTetJA2LAtk,2570
-dclab-0.62.13.dist-info/RECORD,,
-dclab-0.62.13.dist-info/entry_points.txt,sha256=eOpjgznu-eW-9utUpLU-77O5098YyUEgGF3ksGMdtec,273
-dclab-0.62.13.dist-info/top_level.txt,sha256=irvwZMgs1edY1Zj60ZFk7Almb9Zhk4k6E6aC4YPFnnM,6
-dclab-0.62.13.dist-info/LICENSE,sha256=1mLfjOTOaeiMSGPJiF5hHnMQfKX88QVeZpCCXwJGj3k,18131
-dclab-0.62.13.dist-info/METADATA,sha256=WtnYmez3PYa8IxgLQu5z2n8IZMbzCLxIctZujrctsaQ,4755
-dclab-0.62.13.dist-info/WHEEL,sha256=bazm_2wUv8r3ZdI3EFF1W8XzzfWWNf0Zi3x2NpmmA_0,112
+dclab-0.62.14.dist-info/RECORD,,
+dclab-0.62.14.dist-info/entry_points.txt,sha256=eOpjgznu-eW-9utUpLU-77O5098YyUEgGF3ksGMdtec,273
+dclab-0.62.14.dist-info/top_level.txt,sha256=irvwZMgs1edY1Zj60ZFk7Almb9Zhk4k6E6aC4YPFnnM,6
+dclab-0.62.14.dist-info/LICENSE,sha256=1mLfjOTOaeiMSGPJiF5hHnMQfKX88QVeZpCCXwJGj3k,18131
+dclab-0.62.14.dist-info/METADATA,sha256=XVHDxxvc44fr7hNw7wKreETjqa9utJ6hCHSN08b1h8Q,4755
+dclab-0.62.14.dist-info/WHEEL,sha256=bazm_2wUv8r3ZdI3EFF1W8XzzfWWNf0Zi3x2NpmmA_0,112