numpyimage 2.0.0__tar.gz → 2.1.0__tar.gz

{numpyimage-2.0.0/numpyimage.egg-info → numpyimage-2.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: numpyimage
-Version: 2.0.0
+Version: 2.1.0
 Summary: Load, save, and manipulate image files as numpy arrays
 Home-page: https://github.com/jasper-tms/npimage
 Author: Jasper Phelps

numpyimage-2.1.0/npimage/align_scratch.py

@@ -0,0 +1,50 @@
+
+
+
+def align(im1, im2, num_divisions=4):
+    """
+    Return a translated version of im1 that is aligned with im2.
+
+    To align the images, this function divides im1 into a grid of
+    num_divisions x num_divisions regions. For each region, we find the
+    region in im2 that is most similar to it. After removing outliers
+    for which the similarity score is too low, we calculate the average
+    translation between the two images. We then shift im1 by this
+    average translation.
+    """
+    # The code below is entirely GitHub copilot generated and needs to
+    # be looked at, finished, tested, etc
+
+    # Divide the image into a grid of num_divisions x num_divisions regions
+    height, width = im1.shape
+    region_height = height // num_divisions
+    region_width = width // num_divisions
+
+    # Initialize lists to store the translations for each region
+    translations = []
+
+    # For each region in im1, find the most similar region in im2
+    for i in range(num_divisions):
+        for j in range(num_divisions):
+            # Define the region in im1
+            top_left = (i * region_height, j * region_width)
+            bottom_right = ((i + 1) * region_height, (j + 1) * region_width)
+            region1 = im1[top_left[0]:bottom_right[0], top_left[1]:bottom_right[1]]
+
+            # Define the search region in im2
+            search_bbox = (slice(max(0, top_left[0] - region_height),
+                                 min(height, bottom_right[0] + region_height)),
+                           slice(max(0, top_left[1] - region_width),
+                                 min(width, bottom_right[1] + region_width)))
+
+            # Find the most similar region in im2
+            top_left2, score = find_landmark(im2, region1, search_bbox=search_bbox)
+
+            # Add the translation to the list of translations
+            translations.append((top_left[0] - top_left2[0], top_left[1] - top_left2[1]))
+
+    # Remove outliers from the list of translations
+    translations = np.array(translations)
+    mean_translations = np.mean(translations)
+    # Shift im1 by the average translation
+    aligned_im1 = np.roll(im1, mean_translations, axis=(0, 1))

{numpyimage-2.0.0 → numpyimage-2.1.0}/npimage/graphics.py

@@ -131,6 +131,7 @@ def drawline(image, pt1, pt2, value, thickness=1,
 
 # TODO switch to kwargs
 def drawtriangle(image, pt1, pt2, pt3, value, thickness=1,
+                 watertight=True,
                  fill_value=None, convention='corner', out_of_bounds='ignore'):
 
     if fill_value is None:
@@ -181,7 +182,7 @@ def drawtriangle(image, pt1, pt2, pt3, value, thickness=1,
 
         # To ensure 3D triangles end up water-tight, need the thickness of the
         # filler lines must be >1 in at least one dimension.
-        if all(thickness == 1):
+        if watertight and all(thickness == 1):
             slopes = abs(endpt - basept)
             if all(eq(slopes, 0)):
                 pass

{numpyimage-2.0.0 → numpyimage-2.1.0/numpyimage.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: numpyimage
-Version: 2.0.0
+Version: 2.1.0
 Summary: Load, save, and manipulate image files as numpy arrays
 Home-page: https://github.com/jasper-tms/npimage
 Author: Jasper Phelps

{numpyimage-2.0.0 → numpyimage-2.1.0}/numpyimage.egg-info/SOURCES.txt

@@ -5,6 +5,7 @@ requirements.txt
 setup.py
 npimage/__init__.py
 npimage/align.py
+npimage/align_scratch.py
 npimage/core.py
 npimage/graphics.py
 npimage/nrrd_utils.py

{numpyimage-2.0.0 → numpyimage-2.1.0}/setup.py

@@ -9,7 +9,7 @@ with open("requirements.txt", "r") as f:
 
 setuptools.setup(
     name="numpyimage",
-    version="2.0.0",
+    version="2.1.0",
     author="Jasper Phelps",
     author_email="jasper.s.phelps@gmail.com",
     description="Load, save, and manipulate image files as numpy arrays",