Merge branch 'main' of https://github.com/Neural-Systems-at-UIO/PyNutil

.vscode/settings.json

 {
-    "python.formatting.provider": "black",
-    "python.testing.unittestArgs": [
-        "-v",
-        "-s",
-        "./tests",
-        "-p",
-        "test*.py"
-    ],
-    "python.testing.pytestEnabled": false,
-    "python.testing.unittestEnabled": true
+    "python.formatting.provider": "black"
 }
\ No newline at end of file

PyNutil/processing/counting_and_load.py

@@ -209,10 +209,7 @@ def warp_image(image, triangulation, rescaleXY):
     newY[newY >= reg_h] = reg_h - 1
     newX[newX < 0] = 0
     newY[newY < 0] = 0
-    new_image = np.zeros_like(image)
-    mask = (newX <= reg_w) & (newY <= reg_h) & (newX > 0) & (newY > 0)
-    new_image[mask] = image[mask]
-    new_image[~mask] = 0
+    new_image = image[newY, newX]
     return new_image
 
 
@@ -227,8 +224,14 @@ def flat_to_dataframe(
     if (image_vector is not None) and (volume is not None):
         image = generate_target_slice(image_vector, volume)
         image = np.float64(image)
+        random_number = np.random.randint(0,1000)
+        outim = ((image==0) * 255).astype(np.uint8)
+        cv2.imwrite(f"{random_number}_linear.jpg",  outim)
         if triangulation is not None:
             image = warp_image(image, triangulation, rescaleXY)
+            outim = ((image==0) * 255).astype(np.uint8)
+
+            cv2.imwrite(f"{random_number}_warped.jpg", outim)
     elif file.endswith(".flat"):
         image = read_flat_file(file)
     elif file.endswith(".seg"):

workflows/basic_example_custom_atlas.py

@@ -13,14 +13,15 @@ from PyNutil import PyNutil
 ###The label_path is the path to the corresponding atlas .csv
 ###The object_cutoff is a cut-off for min object size
 ### get_coordinates, if use_flat=True, place flat files in folder titled "flat_files" at same level as "segmentations" folder 
+#This does not use BrainGlobe API.
 
 pnt = PyNutil(
-    segmentation_folder="../tests/test_data/linear_allen_mouse/",
-    alignment_json="../tests/test_data/linear_allen_mouse/alignment_linear.json",
+    segmentation_folder="../tests/test_data/nonlinear_allen_mouse/",
+    alignment_json="../tests/test_data/nonlinear_allen_mouse/alignment.json",
     colour=[0, 0, 0],
     atlas_path="../tests/test_data/allen_mouse_2017_atlas/annotation_25_reoriented_2017.nrrd",
     label_path="../tests/test_data/allen_mouse_2017_atlas//allen2017_colours.csv",
 )
 pnt.get_coordinates(object_cutoff=0, use_flat=False)
 pnt.quantify_coordinates()
-pnt.save_analysis("../test_result/test_linear_allen_mouse")
+pnt.save_analysis("../test_result/test_nonlinear_allen_mouse_noflat_24_02_25")