Commit b7ccb051 authored by Adam Paquette's avatar Adam Paquette
Browse files

Fixed unchanged handle variables to geodata variables

parent 374c5f50
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -292,7 +292,7 @@ class Edge(dict, MutableMapping):
            raise AttributeError('This edge does not yet have any matches computed.')
            raise AttributeError('This edge does not yet have any matches computed.')


        matches, mask = self._clean(clean_keys)
        matches, mask = self._clean(clean_keys)
        domain = self.source.handle.raster_size
        domain = self.source.geodata.raster_size


        # Massage the dataframe into the correct structure
        # Massage the dataframe into the correct structure
        coords = self.source.get_keypoint_coordinates()
        coords = self.source.get_keypoint_coordinates()
+1 −1
Original line number Original line Diff line number Diff line
@@ -272,7 +272,7 @@ class Node(dict, MutableMapping):
        if not hasattr(self, '_keypoints'):
        if not hasattr(self, '_keypoints'):
            raise AttributeError('No keypoints extracted for this node.')
            raise AttributeError('No keypoints extracted for this node.')


        domain = self.handle.raster_size
        domain = self.geodata.raster_size
        self._keypoints['strength'] = self._keypoints.apply(func, axis=1)
        self._keypoints['strength'] = self._keypoints.apply(func, axis=1)


        if not hasattr(self, 'suppression'):
        if not hasattr(self, 'suppression'):
+1 −3
Original line number Original line Diff line number Diff line
@@ -37,8 +37,6 @@ fundamental_matrices:
subpixel_register:
subpixel_register:
    clean_keys:
    clean_keys:
        - ratio
        - ratio
        - symmetry
        - fundamental
    template_size: 5
    template_size: 5
    threshold: 0.8
    threshold: 0.8
    search_size: 15
    search_size: 15
@@ -52,7 +50,7 @@ subpixel_register:


suppress:
suppress:
    clean_keys:
    clean_keys:
        - fundamental
        - ratio


# Keyword arguments
# Keyword arguments
    min_radius: 2
    min_radius: 2