Skip to content
Snippets Groups Projects
Commit df5f83e6 authored by Bastien Gorissen's avatar Bastien Gorissen
Browse files

Set correctly the visibility after matching.

parent 2b1cfe5e
No related branches found
No related tags found
No related merge requests found
...@@ -375,6 +375,8 @@ int MergeFile(std::string fileName, bool warnIfMissing) ...@@ -375,6 +375,8 @@ int MergeFile(std::string fileName, bool warnIfMissing)
tmp->readMSH(fileName); tmp->readMSH(fileName);
status = GeomMeshMatcher::instance()->match(tmp2, tmp); status = GeomMeshMatcher::instance()->match(tmp2, tmp);
delete tmp; delete tmp;
GModel::setCurrent(tmp2);
tmp2->setVisibility(1);
} }
else else
status = GModel::current()->readMSH(fileName); status = GModel::current()->readMSH(fileName);
......
...@@ -612,9 +612,6 @@ static void copy_vertices (GEdge* to, GEdge* from, std::map<MVertex*,MVertex*> & ...@@ -612,9 +612,6 @@ static void copy_vertices (GEdge* to, GEdge* from, std::map<MVertex*,MVertex*> &
MEdgeVertex *v_to = new MEdgeVertex (gp.x(),gp.y(),gp.z(), to, gp.u() ); MEdgeVertex *v_to = new MEdgeVertex (gp.x(),gp.y(),gp.z(), to, gp.u() );
to->mesh_vertices.push_back(v_to); to->mesh_vertices.push_back(v_to);
_mesh_to_geom[v_from] = v_to; _mesh_to_geom[v_from] = v_to;
if (v_from->getNum() == 3646) {
printf("FOUND IT!!\n");
}
} }
// printf("Ending Edge %d %d vertices to match\n",from->tag(),from->mesh_vertices.size()); // printf("Ending Edge %d %d vertices to match\n",from->tag(),from->mesh_vertices.size());
} }
...@@ -624,8 +621,6 @@ static void copy_vertices (GFace *geom, GFace *mesh, std::map<MVertex*,MVertex*> ...@@ -624,8 +621,6 @@ static void copy_vertices (GFace *geom, GFace *mesh, std::map<MVertex*,MVertex*>
MVertex *v_from = mesh->mesh_vertices[i]; MVertex *v_from = mesh->mesh_vertices[i];
double uv[2]; double uv[2];
GPoint gp = geom->closestPoint ( SPoint3(v_from->x(),v_from->y(),v_from->z()), uv ); GPoint gp = geom->closestPoint ( SPoint3(v_from->x(),v_from->y(),v_from->z()), uv );
// printf("Original point %f %f %f\n", v_from->x(), v_from->y(), v_from->z());
// printf("New point %f %f %f\n", gp.x(), gp.y(), gp.z());
double DDD = ( v_from->x() - gp.x()) * ( v_from->x() - gp.x()) + double DDD = ( v_from->x() - gp.x()) * ( v_from->x() - gp.x()) +
( v_from->y() - gp.y()) * ( v_from->y() - gp.y()) + ( v_from->y() - gp.y()) * ( v_from->y() - gp.y()) +
( v_from->z() - gp.z()) * ( v_from->z() - gp.z()) ; ( v_from->z() - gp.z()) * ( v_from->z() - gp.z()) ;
...@@ -723,9 +718,5 @@ int GeomMeshMatcher::match(GModel *geom, GModel *mesh) ...@@ -723,9 +718,5 @@ int GeomMeshMatcher::match(GModel *geom, GModel *mesh)
copy_vertices(geom, mesh, _mesh_to_geom,coresp_v,coresp_e,coresp_f); copy_vertices(geom, mesh, _mesh_to_geom,coresp_v,coresp_e,coresp_f);
copy_elements(geom, mesh, _mesh_to_geom,coresp_v,coresp_e,coresp_f); copy_elements(geom, mesh, _mesh_to_geom,coresp_v,coresp_e,coresp_f);
geom->writeMSH("testing.msh", 2.2, false, true);
return 1; return 1;
return 0;
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment