fusion-tools 2.2.0__tar.gz → 2.2.2__tar.gz

{fusion_tools-2.2.0 → fusion_tools-2.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fusion-tools
-Version: 2.2.0
+Version: 2.2.2
 Summary: Modular visualization and analysis dashboard creation for high-resolution microscopy images
 Home-page: https://github.com/spborder/fusion-tools
 Author: Sam Border

{fusion_tools-2.2.0 → fusion_tools-2.2.2}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="fusion-tools",
-    version="2.2.0",
+    version="2.2.2",
     author="Sam Border",
     author_email="sam.border2256@gmail.com",
     description="Modular visualization and analysis dashboard creation for high-resolution microscopy images",

{fusion_tools-2.2.0 → fusion_tools-2.2.2}/src/fusion_tools/components/segmentation.py

@@ -1270,6 +1270,9 @@ class BulkLabels(Tool):
             ],
             [
                 Output({'type': 'bulk-labels-add-property-div','index': ALL},'children')
+            ],
+            [
+                State({'type': 'bulk-labels-property-info','index': ALL},'data')
             ]
         )(self.update_label_properties)
 
@@ -1723,7 +1726,7 @@ class BulkLabels(Tool):
         
         properties_div = Patch()
         add_click = get_pattern_matching_value(add_click)
-        property_info = json.loads(get_pattern_matching_value(property_info))
+        property_info = json.loads(get_pattern_matching_value(property_info))['property_info']
 
         if 'bulk-labels-add-property-icon' in ctx.triggered_id['type']:
 
@@ -1785,7 +1788,7 @@ class BulkLabels(Tool):
         if not any([i['value'] for i in ctx.triggered]):
             raise exceptions.PreventUpdate
         
-        property_info = json.loads(get_pattern_matching_value(property_info))
+        property_info = json.loads(get_pattern_matching_value(property_info))['property_info']
         property_values = property_info[property_value]
 
         if 'min' in property_values:

{fusion_tools-2.2.0 → fusion_tools-2.2.2}/src/fusion_tools/tileserver.py

@@ -215,11 +215,13 @@ class LocalTileServer(TileServer):
         
         if image<len(self.tile_sources) and image>=0:
             try:
+                if not style=='':
+                    self.tile_sources[image] = large_image.open(self.local_image_paths[image],style=json.loads(style))
+
                 raw_tile = self.tile_sources[image].getTile(
                             x = x,
                             y = y,
                             z = z,
-                            style = json.loads(style) if not style=='' else None
                         )
                 
             except large_image.exceptions.TileSourceXYZRangeError:
@@ -257,6 +259,8 @@ class LocalTileServer(TileServer):
         :rtype: Response
         """
         if image<len(self.tile_sources) and image>=0:
+            if not style=='':
+                self.tile_sources[image] = large_image.open(self.local_image_paths[image],style = json.loads(style))
             image_region, mime_type = self.tile_sources[image].getRegion(
                 region = {
                     'left': left,
@@ -264,7 +268,6 @@ class LocalTileServer(TileServer):
                     'right': right,
                     'bottom': bottom
                 },
-                style = json.loads(style)
             )
 
             return Response(content = image_region, media_type = 'image/png')

{fusion_tools-2.2.0 → fusion_tools-2.2.2}/src/fusion_tools/utils/shapes.py

@@ -66,18 +66,34 @@ def load_geojson(geojson_path: str, name:Union[str,None]=None) -> dict:
 
     with open(geojson_path,'r') as f:
         geojson_anns = json.load(f)
-
         f.close()
+    
+    print(type(geojson_anns))
+    print(len(geojson_anns))
 
-    if not 'properties' in geojson_anns:
-        geojson_anns['properties'] = {}
+    if type(geojson_anns)==list:
+        for g in geojson_anns:
+            if not 'properties' in g:
+                g['properties'] = {}
+
+            geo_id = uuid.uuid4().hex[:24] if not '_id' in g['properties'] else g['properties']['_id']
+            g['properties'] = g['properties'] | {'name': name if not name is None else geo_id, '_id': geo_id}
+
+            
+            for f_idx, f in enumerate(g['features']):
+                f['properties'] = f['properties'] | {'name': name if not name is None else geo_id, '_id': uuid.uuid4().hex[:24], '_index': f_idx}
+
+    elif type(geojson_anns)==dict:
+        if not 'properties' in geojson_anns:
+            geojson_anns['properties'] = {}
+            geo_id = uuid.uuid4().hex[:24] if not '_id' in g['properties'] else geojson_anns['properties']['_id']
+            geojson_anns['properties'] = geojson_anns['properties'] | {'name': name if not name is None else geo_id, '_id': geo_id}
+
+            
+            for f_idx, f in enumerate(geojson_anns['features']):
+                f['properties'] = f['properties'] | {'name': name if not name is None else geo_id, '_id': uuid.uuid4().hex[:24], '_index': f_idx}
 
-    geo_id = uuid.uuid4().hex[:24] if not '_id' in geojson_anns['properties'] else geojson_anns['properties']['_id']
-    geojson_anns['properties'] = geojson_anns['properties'] | {'name': name if not name is None else geo_id, '_id': geo_id}
 
-    
-    for f_idx, f in enumerate(geojson_anns['features']):
-        f['properties'] = f['properties'] | {'name': name if not name is None else geo_id, '_id': uuid.uuid4().hex[:24], '_index': f_idx}
 
     return geojson_anns
 

{fusion_tools-2.2.0 → fusion_tools-2.2.2}/src/fusion_tools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fusion-tools
-Version: 2.2.0
+Version: 2.2.2
 Summary: Modular visualization and analysis dashboard creation for high-resolution microscopy images
 Home-page: https://github.com/spborder/fusion-tools
 Author: Sam Border