dclab 0.62.12__cp39-cp39-win_amd64.whl → 0.62.13__cp39-cp39-win_amd64.whl

dclab/_version.py

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

dclab/rtdc_dataset/fmt_dcor/tables.py

@@ -29,14 +29,36 @@ class DCORTables:
             # assemble the tables
             tables = {}
             for key in table_data:
-                columns, data = table_data[key]
-                tab_data = np.asarray(data)
-                if columns is not None:
-                    # We have a rec-array (named columns)
-                    ds_dt = np.dtype({'names': columns,
-                                      'formats': [np.float64] * len(columns)})
-                    tab_data = np.rec.array(tab_data, dtype=ds_dt)
-                tables[key] = tab_data
+                tables[key] = DCORTable(table_data[key])
 
             self._tables_cache = tables
         return self._tables_cache
+
+
+class DCORTable:
+    def __init__(self, table_content):
+        self._columns, data = table_content
+        self._tab_data = np.asarray(data)
+        if self._columns is not None:
+            # We have a rec-array (named columns)
+
+            ds_dt = np.dtype({'names': self._columns,
+                              'formats': [np.float64] * len(self._columns)})
+            self._tab_data = np.rec.array(self._tab_data, dtype=ds_dt)
+
+    def __array__(self, *args, **kwargs):
+        return self._tab_data.__array__(*args, **kwargs)
+
+    @property
+    def meta(self):
+        # TODO: Implement metadata sending from DCOR.
+        return {}
+
+    def has_graphs(self):
+        return self._columns is not None
+
+    def keys(self):
+        return self._columns
+
+    def __getitem__(self, key):
+        return self._tab_data[key]

dclab/rtdc_dataset/fmt_hdf5/tables.py

@@ -5,7 +5,7 @@ class H5Tables:
 
     def __getitem__(self, key):
         if key in self.keys():
-            tab = self.h5file["tables"][key]
+            tab = H5Table(self.h5file["tables"][key])
         else:
             raise KeyError(f"Table '{key}' not found or empty "
                            f"in {self.h5file.file.filename}!")
@@ -28,3 +28,30 @@ class H5Tables:
                         names.append(key)
             self._cache_keys = names
         return self._cache_keys
+
+
+class H5Table:
+    def __init__(self, h5_ds):
+        self._h5_ds = h5_ds
+        self._keys = None
+        self._meta = None
+
+    def __array__(self, *args, **kwargs):
+        return self._h5_ds.__array__(*args, **kwargs)
+
+    @property
+    def meta(self):
+        if self._meta is None:
+            self._meta = dict(self._h5_ds.attrs)
+        return self._meta
+
+    def has_graphs(self):
+        return self.keys() is not None
+
+    def keys(self):
+        if self._keys is None:
+            self._keys = self._h5_ds.dtype.names
+        return self._keys
+
+    def __getitem__(self, key):
+        return self._h5_ds[key]

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: dclab
-Version: 0.62.12
+Version: 0.62.13
 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.12.dist-info → dclab-0.62.13.dist-info}/RECORD

@@ -1,7 +1,7 @@
 dclab/__init__.py,sha256=7_y6YtYcoL_a5M6Q9PiwZPzHSxS66yCTgs_uuK5C1dg,835
-dclab/_version.py,sha256=cXY7riTnQeDAsiSHtbPgtOEVh8S9rHT_F7YWjgX57_k,431
+dclab/_version.py,sha256=gpxuOmFXpEzKpKMUV-POrx0oECeyfYkEMyMPr4WO0mg,431
 dclab/cached.py,sha256=t01BYTf43VEsBYa0c-bMxgceF5vKoGV73b42UlLH6Lo,3014
-dclab/downsampling.cp39-win_amd64.pyd,sha256=OHfQLZWWWdJj87zMdeBM8LSON3TK6XTlTKsVfXZkzEA,187904
+dclab/downsampling.cp39-win_amd64.pyd,sha256=dtH4NrMB0AM4uIbYQUHcnMa5rgVDCnyA6_41ZrqNl00,187904
 dclab/downsampling.pyx,sha256=Ez6MbNbzCUzs2IXXKtAYsjtYqP22kI8hdA1IE-3mqvY,7488
 dclab/http_utils.py,sha256=nneq9Cx8dw8ChQx5oIg2pN0xGkvNWCMSY5VYmttqyXA,11232
 dclab/kde_contours.py,sha256=k0Y1UsJNtuYY8iqYmfQ-Nml-dFpJAcigd3vmt9U6zsY,6967
@@ -35,14 +35,14 @@ dclab/external/packaging/version.py,sha256=NgEgv7me4UCvFMyiNYD-nc_28b9UHUvBVh8RD
 dclab/external/skimage/LICENSE,sha256=Tdv08zzxYV32WRdYnco9P3nVyS5w17OTxIAFeRSd1wc,1480
 dclab/external/skimage/__init__.py,sha256=icOIlThkyn_hxmnM_i7OpbU7fhvqYWNpGdNGD38qthU,74
 dclab/external/skimage/_find_contours.py,sha256=auRMNfZg7B73DX7kPXxgD8gMXXB3Lk9QDWt4wlQnUWg,9556
-dclab/external/skimage/_find_contours_cy.cp39-win_amd64.pyd,sha256=FLFR_gzLALNsJRBLFhunnQuVj3BH3Lty39smn3nNujo,142848
+dclab/external/skimage/_find_contours_cy.cp39-win_amd64.pyd,sha256=bM0ruHar6QIcGFgQ6jhf1_dWlJeuhIer_7Mp0KDEe-k,142848
 dclab/external/skimage/_find_contours_cy.pyx,sha256=c-EobLhKjZNCpuqWxmvrcH35uAY_Bu-_hZiUHbXODms,7349
-dclab/external/skimage/_pnpoly.cp39-win_amd64.pyd,sha256=gHzoXyDG8TujGy7JOukQNpQMDE8uJkB91q7z1Kw4thU,159232
+dclab/external/skimage/_pnpoly.cp39-win_amd64.pyd,sha256=dTUAQjRwumsyK_UkTljZvsYv89xK-Td8OqgUG2IPQC0,159232
 dclab/external/skimage/_pnpoly.pyx,sha256=eHV3DlIGcBhAQ12-Y58EYq8xcq0Sibyc4xTxzX9NJsk,2603
 dclab/external/skimage/measure.py,sha256=rzyI0HCr9O9GJNieVW8pcqDjTGRAdSehDUawD8QkIAE,254
 dclab/external/skimage/pnpoly.py,sha256=zB4rSxjHJyY1OsGZ7QfFQqxIEDLGK8CWPehwutoFqm4,1400
 dclab/external/skimage/_shared/__init__.py,sha256=q29esTsNh0HfQxcd2EuwdYNbEBJwo_qY4dfv7RihzoA,38
-dclab/external/skimage/_shared/geometry.cp39-win_amd64.pyd,sha256=x90IXtiqkifqpeWmuuwRWB-HdQzrjrVRwJgXJLAONBY,21504
+dclab/external/skimage/_shared/geometry.cp39-win_amd64.pyd,sha256=dDEcxRSjY7SbMFXbmEHaIvCZtt87Ey9H7moZ5gUTSbM,21504
 dclab/external/skimage/_shared/geometry.pxd,sha256=3gJ7fbXXsxJunSN4biE0dzEbZpX9ZqzR4cUDDN0JnAU,352
 dclab/external/skimage/_shared/geometry.pyx,sha256=b6hADE8chse63haO1Kdt13_oQ54J9tkBf7dVA22-s-M,1722
 dclab/external/statsmodels/LICENSE,sha256=8D7nwukc6YgsZCdN9mG0psM3I9j-z8fuUgFyVhnMXpU,1672
@@ -109,14 +109,14 @@ dclab/rtdc_dataset/fmt_dcor/api.py,sha256=v7xAxZtjPpQiSRq9AgYhrV6I9iM7KpPv38WzSE
 dclab/rtdc_dataset/fmt_dcor/base.py,sha256=i9VWbKtPlY3K1WeFll3iAKXEhznVvJjQE1jVaEM2c9g,6788
 dclab/rtdc_dataset/fmt_dcor/basin.py,sha256=JzofdU45r-TTBGl8Nnvo-j-YsnT23X2gXnvaOSINJxg,2599
 dclab/rtdc_dataset/fmt_dcor/logs.py,sha256=e1BiJ8we4IghbxVAZM56K4P4IjJDHIBfHH_Uz-p2w9g,609
-dclab/rtdc_dataset/fmt_dcor/tables.py,sha256=5-RFH8NAQ04LRiOnq0f22FqFirr7lUBkE9_WgxvLzBI,1223
+dclab/rtdc_dataset/fmt_dcor/tables.py,sha256=Q2HGOZDYmy922HMca-ZiwYeMeES0rxDWT6YcKaR8NYo,1699
 dclab/rtdc_dataset/fmt_hdf5/__init__.py,sha256=UnitCqiMkY8mMcUKgfLBRVBP5srpTNLrZd3BIRr2tZE,276
 dclab/rtdc_dataset/fmt_hdf5/base.py,sha256=CAcYaN_6X10NK-R1IvlJj6y70lNyAVyT0OnGMs4VMB4,6583
 dclab/rtdc_dataset/fmt_hdf5/basin.py,sha256=qbYgj0RKS9k6RTu5XmYEtgdcbqnVNokD3rAxogyrWrU,822
 dclab/rtdc_dataset/fmt_hdf5/events.py,sha256=6u2K86vqxd4qWaYk_hzRA5LMQRrduNvMxmloWWt4aMc,8488
 dclab/rtdc_dataset/fmt_hdf5/feat_defect.py,sha256=w7dfs6pULUVJ8Ypz2VBYIKokKVhCn6as6fn3GL8Z7s0,6704
 dclab/rtdc_dataset/fmt_hdf5/logs.py,sha256=c33YLC70h7RR4uw-RPc-vvTPTMZgSfd_0Nz9pAeA6d4,1037
-dclab/rtdc_dataset/fmt_hdf5/tables.py,sha256=9MJtLfDUyCr6bpBY7awaLSBBxeabbTo4yrkz0iYsRH8,902
+dclab/rtdc_dataset/fmt_hdf5/tables.py,sha256=hV2Ke7pEXQEV6iNO-PtD7pcr4JYqzX8AlzVmpkGR2l4,1562
 dclab/rtdc_dataset/fmt_hierarchy/__init__.py,sha256=NB8Tz6-AquG0rAiCeCSQGIzw_W1y7mNz4V4MI-yaEJ0,366
 dclab/rtdc_dataset/fmt_hierarchy/base.py,sha256=OivbnWpU9yNVoNJ6wcY8IFyTNTSAzm-lJa8gtz4GUK0,9718
 dclab/rtdc_dataset/fmt_hierarchy/events.py,sha256=36aIw3wyOLi6uPGUO4gG6DhLzJHFiwXTh-2bJjSqMmI,4693
@@ -129,9 +129,9 @@ dclab/rtdc_dataset/fmt_tdms/event_mask.py,sha256=cW-Tw2PIe6X1Hc4UZJ22-mI_qFaIMWA
 dclab/rtdc_dataset/fmt_tdms/event_trace.py,sha256=ktWnXfMir1v5Wfeo7tOd0txSOe1bgsXotf9Ul5T5-B4,5361
 dclab/rtdc_dataset/fmt_tdms/exc.py,sha256=FfxUY4LGIMPGJTYmGITmEm7X5iu8GBsj7OfZR8Zb-IE,850
 dclab/rtdc_dataset/fmt_tdms/naming.py,sha256=SFeWiwIN7sg0qNe0Aya2bZshN1Zbw4YcOKunZ6kfIGM,5524
-dclab-0.62.12.dist-info/LICENSE,sha256=ayjnuJcdf_kpkDyD61tUcVqVAQaNSYXJ73m5HVB4G8s,18474
-dclab-0.62.12.dist-info/METADATA,sha256=sKm7r3QYqnYSftBKow7iY3IQts60HWt78tEs_52F1MA,4901
-dclab-0.62.12.dist-info/WHEEL,sha256=agy-BJge3afXwWznUXANATmKFW4eqelqRR0uf608A_0,99
-dclab-0.62.12.dist-info/entry_points.txt,sha256=eOpjgznu-eW-9utUpLU-77O5098YyUEgGF3ksGMdtec,273
-dclab-0.62.12.dist-info/top_level.txt,sha256=irvwZMgs1edY1Zj60ZFk7Almb9Zhk4k6E6aC4YPFnnM,6
-dclab-0.62.12.dist-info/RECORD,,
+dclab-0.62.13.dist-info/LICENSE,sha256=ayjnuJcdf_kpkDyD61tUcVqVAQaNSYXJ73m5HVB4G8s,18474
+dclab-0.62.13.dist-info/METADATA,sha256=EjBFU1z3Ha7HKm4HZwqUM0K85vMSYWSMKixqpB_robE,4901
+dclab-0.62.13.dist-info/WHEEL,sha256=agy-BJge3afXwWznUXANATmKFW4eqelqRR0uf608A_0,99
+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/RECORD,,