batoolset 0.1.4__tar.gz → 0.1.6__tar.gz

{batoolset-0.1.4 → batoolset-0.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: batoolset
-Version: 0.1.4
+Version: 0.1.6
 Summary: An aggregate of functions I find useful
 Home-page: https://github.com/baigouy/batoolset
 Author: Benoit Aigouy

{batoolset-0.1.4 → batoolset-0.1.6}/batoolset/draw/shapes/group.py

@@ -317,10 +317,6 @@ class Group(Rectangle2D):
         self.isText = isText # this is just for pure text groups (will have a different behaviour on double click)
         # self.scale = 1
 
-    @classmethod
-    def reset_count(cls):
-        cls._count = 0
-
   # List-like behavior
     def __getitem__(self, key):
         # print(key)
@@ -364,7 +360,7 @@ class Group(Rectangle2D):
             if not self.isEmpty():
                 try:
                     # print('resizing', self, self.content)
-                    set_to_size(self,self.width() if self.orientation == 'X' else self.height())
+                    set_to_size(self, self.width() if self.orientation == 'X' else self.height())
                 except:
                     # print('just for info for now, comment that lines in the future')
                     traceback.print_exc()
@@ -883,6 +879,14 @@ class Group(Rectangle2D):
     def __setitem__(self, index, item):
         self.content[index] = item
 
+    def get_nested_groups(self):
+        groups = [self]
+        if self.content:
+            for group in self.content:
+                if isinstance(group, Group):
+                    groups.extend(group.get_nested_groups())
+        return groups
+
     def contains(self, *__args):
         # hacked contains that checks whether a point or an image is contained in the stuff
         # see for images

{batoolset-0.1.4 → batoolset-0.1.6}/batoolset/draw/shapes/image2d.py

@@ -311,6 +311,15 @@ class Image2D(Rectangle2D):
             self.px_to_unit_conversion_factor = 0
             # print()
 
+    def get_nb_channels(self):
+        if isinstance(self.img, np.ndarray):
+            guessed_dimensions =guess_dimensions(self.img)
+            if 'c' in guessed_dimensions:
+                return self.img.shape[guessed_dimensions.index('c')]
+            else:
+                return 1
+        else:
+            return 0
 
     def get_extra_dimensions(self, handle_proj=False):
         if not isinstance(self.img, np.ndarray):

{batoolset-0.1.4 → batoolset-0.1.6}/batoolset/images/centralstore.py

@@ -1,7 +1,5 @@
 import os.path
-import traceback
 import gc
-import zarr
 
 # from batoolset.img import Img
 # pb the store should also store metadata  -−> see how I can do that

{batoolset-0.1.4 → batoolset-0.1.6}/batoolset/version.py

@@ -1,6 +1,6 @@
 __MAJOR__ = 0
 __MINOR__ = 1
-__MICRO__ = 4
+__MICRO__ = 6
 __RELEASE__ = ''  # a #b  # https://www.python.org/dev/peps/pep-0440/#public-version-identifiers --> alpha beta, ...
 __VERSION__ = ''.join([str(__MAJOR__), '.', str(__MINOR__), '.', str(__MICRO__)])
 __DESCRIPTION__ = """An aggregate of functions I find useful"""

{batoolset-0.1.4 → batoolset-0.1.6}/batoolset.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: batoolset
-Version: 0.1.4
+Version: 0.1.6
 Summary: An aggregate of functions I find useful
 Home-page: https://github.com/baigouy/batoolset
 Author: Benoit Aigouy

{batoolset-0.1.4 → batoolset-0.1.6}/batoolset.egg-info/SOURCES.txt

@@ -164,6 +164,5 @@ batoolset/utils/loadlist.py
 batoolset/xml/__init__.py
 batoolset/xml/tools.py
 batoolset/zarr/__init__.py
-batoolset/zarr/centralstorezarrstore.py
 batoolset/zip_tools/__init__.py
 batoolset/zip_tools/tools.py

batoolset-0.1.4/batoolset/zarr/centralstorezarrstore.py

@@ -1,108 +0,0 @@
-import traceback
-import gc
-import zarr
-
-# from batoolset.img import Img
-# pb the store should also store metadata  -−> see how I can do that
-
-__DEBUG__ = True
-
-class ImageCentralStoreZarr:
-    store = None
-
-    @classmethod
-    def init(cls, folder_path=None):
-        try:
-            if folder_path is None:
-                # Create a Zarr store in memory
-                zarr_store = zarr.MemoryStore()
-            else:
-                zarr_store = zarr.DirectoryStore(folder_path)  # just a single line is sufficient to handle the stuff
-            zarr_root = zarr.group(store=zarr_store)
-            cls.store = zarr_root
-        except:
-            traceback.print_exc()
-            print('Error zarr store could not be created')
-
-    @classmethod
-    def set_store(cls, store):
-        if __DEBUG__:
-            print('setting store', cls.store)
-        # Set the central store (zarr store)
-        if isinstance(store, str):
-            cls.store = zarr.open(store, mode='a')
-        else:
-            cls.store = store
-
-    @classmethod
-    def get_store(cls):
-        if __DEBUG__:
-            print('getting store', cls.store)
-        return cls.store
-
-    @classmethod
-    def append(cls, image_id, data):
-        # Save the image data to the central store
-        if cls.store is not None:
-            if data is not None:
-                cls.store[image_id] = data
-            else:
-                try:
-                    if __DEBUG__:
-                        print('deleting image store entry because None')
-                    del cls.store[image_id]
-                except:
-                    pass
-            if __DEBUG__:
-                print(f"Image {image_id} added to central store.")
-
-            if hasattr(data, 'metadata'):
-                cls.store.attrs[image_id] = data.metadata
-            else:
-                cls.store.attrs[image_id] = None  # just in case there was already a metadata attribute --> make sure to have this
-        # else:
-        #     if __DEBUG__:
-        #         print("Central store is not set.")
-
-    @classmethod
-    def load(cls, image_id):
-        if False:
-            # shall I do gc
-            # Check if central store is available and if the image exists in the store
-            # gc.collect()
-            # Print the number of objects that were garbage collected
-            print(f"{gc.collect():,} objects were garbage collected")
-        if cls.store is not None:
-            if image_id in cls.store:
-                img = cls.store[image_id][:]
-                metadata = cls.store.attrs.get(image_id, None)
-                if __DEBUG__:
-                    print(f"Image {image_id} loaded from central store.")
-                return metadata,img
-            else:
-                metadata, img = cls.reload(image_id)
-                return metadata, img
-
-        if __DEBUG__:
-            print('No store found --> skipping loading from store for', image_id)
-        return None, None
-
-    # maybe put a relaod where the image is necessarily reloaded -−> force an update of the image from source file
-    @classmethod
-    def reload(cls, image_id):
-        from batoolset.img import Img
-        if __DEBUG__:
-            print('Img called for file', image_id)
-        img = Img(image_id,
-                  prefer_store_if_available=False)  # pb will this launch an infinite loop -−> maybe so make sure to prevent reload form it
-        metadata = None
-        if hasattr(img, 'metadata'):
-            metadata = img.metadata
-        # add image to the store
-        cls.append(image_id, img)
-        del img
-
-        img = cls.store[image_id] # then we reload it from the store in order not to duplicate it # MEGA TODO -−> check
-        metadata = cls.store.attrs.get(image_id, None)
-
-        return metadata, img