Skip to content
Snippets Groups Projects
Commit 8c752d54 authored by Richard Torenvliet's avatar Richard Torenvliet
Browse files

refactoring some namings

parent be4ae8da
No related branches found
No related tags found
No related merge requests found
......@@ -183,13 +183,13 @@ def sample_from_triangles(src, points2d_src, points2d_dst, triangles, dst):
)
def build_texture_feature_vectors(files, get_image_with_points, MeanPoints, triangles):
def build_texture_feature_vectors(files, get_image_with_points, mean_points, triangles):
"""
Args:
files (list): list files
flattened (bool): Flatten the inner feature vectors, see
flatten_feature_vectors.
MeanPoints(AAMPoints): AAMPoints object
mean_points(AAMPoints): AAMPoints object
Returns:
list: list of feature vectors
......@@ -197,9 +197,9 @@ def build_texture_feature_vectors(files, get_image_with_points, MeanPoints, tria
mean_texture = []
image, points = get_image_with_points(files[0])
MeanPoints.get_scaled_points(image.shape)
mean_points.get_scaled_points(image.shape)
x, y, w_slice, h_slice = MeanPoints.get_bounding_box()
x, y, w_slice, h_slice = mean_points.get_bounding_box()
for i, f in enumerate(files):
image, points = get_image_with_points(f)
......@@ -215,7 +215,7 @@ def build_texture_feature_vectors(files, get_image_with_points, MeanPoints, tria
sample_from_triangles(
image,
Points.get_scaled_points(image.shape),
MeanPoints.get_scaled_points(image.shape),
mean_points.get_scaled_points(image.shape),
triangles,
dst
)
......
......@@ -97,20 +97,8 @@ def save_pca_model_texture(args):
assert args.model_texture_file, '--model_texture_file needs to be provided to save the pca model'
shape_model = pca.PcaModel(args.model_shape_file)
mean_points = imm.IMMPoints(points_list=shape_model.mean_values)
#reconstruction.reconstruct_texture(
# input_image, # src image
# input_image, # dst image
# texture_model,
# input_points, # shape points input
# mean_points, # shape points mean
#)
# old
#Vt, s, n_components, mean_shape, triangles = pca.load(args.model_shape_file)
textures = aam.build_texture_feature_vectors(
args.files,
imm.get_imm_image_with_landmarks,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment