batoolset 0.1.5__tar.gz → 0.1.7__tar.gz

{batoolset-0.1.5 → batoolset-0.1.7}/PKG-INFO

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

{batoolset-0.1.5 → batoolset-0.1.7}/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.5 → batoolset-0.1.7}/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.5 → batoolset-0.1.7}/batoolset/version.py

@@ -1,6 +1,6 @@
 __MAJOR__ = 0
 __MINOR__ = 1
-__MICRO__ = 5
+__MICRO__ = 7
 __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.5 → batoolset-0.1.7}/batoolset.egg-info/PKG-INFO

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