Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix some alignment issues #2253

Merged
merged 2 commits into from
May 15, 2024
Merged

Fix some alignment issues #2253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cdc1518
Fix some alignment issues
akenmorris May 15, 2024
e4e1bcd
Fix progress of groom output.
akenmorris May 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions Libs/Groom/Groom.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,6 +513,7 @@ bool Groom::run_alignment() {

bool global_icp = false;
bool global_landmarks = false;
bool any_alignment = false;

int reference_index = -1;
int subset_size = -1;
Expand All @@ -524,6 +525,9 @@ bool Groom::run_alignment() {
}

auto params = GroomParameters(project_, project_->get_domain_names()[domain]);
if (params.get_alignment_enabled()) {
any_alignment = true;
}

if (params.get_use_icp()) {
global_icp = true;
Expand Down Expand Up @@ -594,16 +598,17 @@ bool Groom::run_alignment() {
meshes.push_back(mesh);
} else {
// insert blank for each excluded shape
meshes.push_back(vtkSmartPointer<vtkPolyData>::New());
meshes.emplace_back(vtkSmartPointer<vtkPolyData>::New());
}
}

if (global_icp) {
std::vector<Mesh> reference_meshes;

Mesh reference_mesh = vtkSmartPointer<vtkPolyData>::New();
if (reference_index < 0 || reference_index >= reference_meshes.size()) {
reference_index = MeshUtils::findReferenceMesh(reference_meshes, subset_size);
if (reference_index < 0 || reference_index >= reference_meshes.size()) {
throw std::runtime_error("could not find reference mesh");
}
reference_mesh = reference_meshes[reference_index];
} else {
reference_mesh = get_mesh(reference_index, 0, true);
Expand All @@ -623,12 +628,14 @@ bool Groom::run_alignment() {
size_t domain = num_domains; // end
assign_transforms(transforms, domain, true /* global */);

} else { // just center
} else {
std::vector<std::vector<double>> transforms;
for (size_t i = 0; i < subjects.size(); i++) {
auto subject = subjects[i];
auto transform = vtkSmartPointer<vtkTransform>::New();
Groom::add_center_transform(transform, meshes[i]);
if (any_alignment) { // just center
Groom::add_center_transform(transform, meshes[i]);
}
transforms.push_back(ProjectUtils::convert_transform(transform));
}
size_t domain = num_domains; // end
Expand Down
1 change: 1 addition & 0 deletions Studio/Groom/GroomTool.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,6 +605,7 @@ void GroomTool::skip_grooming_toggled() {
groom_ = QSharedPointer<Groom>(new Groom(session_->get_project()));
groom_->run();
SW_MESSAGE("Skipped Grooming");
SW_PROGRESS(100, "Grooming Skipped");
Q_EMIT groom_complete();
}
}
Expand Down
Loading