Commit 64840d9e authored by Adam Paquette's avatar Adam Paquette
Browse files

configure branch to match master and update get_keypoints method call in vis

parent f65e7283

autocnet/graph/network.py

+0 −36
Original line number Diff line number Diff line
@@ -395,42 +395,6 @@ class CandidateGraph(nx.Graph): 
            else:

                func(*args, **kwargs)



    def symmetry_checks(self):

        '''

        Apply a symmetry check to all edges in the graph

        '''

        self.apply_func_to_edges('symmetry_check')



    def ratio_checks(self, *args, **kwargs):

        '''

        Apply a symmetry check to all edges in the graph

        '''

        self.apply_func_to_edges('ratio_check', *args, **kwargs)



    def compute_homographies(self, *args, **kwargs):

        '''

        Apply a symmetry check to all edges in the graph

        '''

        self.apply_func_to_edges('compute_homography', *args, **kwargs)



    def compute_fundamental_matrices(self, *args, **kwargs):

        '''

        Apply a symmetry check to all edges in the graph

        '''

        self.apply_func_to_edges('compute_fundamental_matrix', *args, **kwargs)



    def subpixel_register(self, *args, **kwargs):

        '''

        Apply a symmetry check to all edges in the graph

        '''

        self.apply_func_to_edges('subpixel_register', *args, **kwargs)



    def suppress(self, *args, **kwargs):

        '''

        Apply a symmetry check to all edges in the graph

        '''

        self.apply_func_to_edges('suppress', *args, **kwargs)



    def minimum_spanning_tree(self):

        """

        Calculates the minimum spanning tree of the graph

autocnet/vis/graph_view.py

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ def plot_node(node, ax=None, clean_keys=[], **kwargs): 
    keypoints = node.get_keypoints()

    if clean_keys:

        matches, mask = node._clean(clean_keys)

        keypoints = node.keypoints[mask]

        keypoints = node.get_keypoints[mask]



    marker = '.'

    if 'marker' in kwargs.keys():