Commit d2a6f05

committed

active shape added params

1 parent 443f524 commit d2a6f05Copy full SHA for d2a6f05

File tree

-9

lines changed

-9

lines changed

Lines changed: 1 addition & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,6 @@ def active_shape_scale(img, tooth_points, pca_tooth, length, scale):`
`40`	`40`
`41`	`41`	`def active_shape(edge_img, tooth_points, pca_tooth, length, alfa, activeFitON, MatchingON=True):`
`42`	`42`
`43`		`-<<<<<<< HEAD`
`44`	`43`	`if(activeFitON):`
`45`	`44`	`new_points = af.active_contour(tooth_points, edge_img, length, alfa)`
`46`	`45`	`else:`
`@@ -54,14 +53,7 @@ def active_shape(edge_img, tooth_points, pca_tooth, length, alfa, activeFitON, M`
`54`	`53`	`y = new_points`
`55`	`54`
`56`	`55`	`return y`
`57`		`-=======`
`58`		`- new_points, error = fit.fit_measure(tooth_points, length, edge_img)`
`59`		`- # new_points = af.active_contour(tooth_points, edge_img, length, alfa)`
`60`		`- b, pose_param = match.match_model_points(new_points, pca_tooth)`
`61`		`-`
`62`		`- x = match.generate_model_point(b, pca_tooth)`
`63`		`- return match.inv_transform(x.reshape(40,2),pose_param)`
`64`		`->>>>>>> 9a9ab79babd5afacb4cce519e68d518d3fe242c9`
	`56`	`+`
`65`	`57`
`66`	`58`	`def active_shape_n_times(edge_img, tooth_points, pca_tooth, length,alfa, n_times):`
`67`	`59`

Comments

(0)