Skip to content
Snippets Groups Projects
Commit 5ed4b9b0 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

don't complain for generatrices of compounds not in old GEO db

parent e71bb70b
No related branches found
No related tags found
No related merge requests found
...@@ -44,7 +44,7 @@ class GFace : public GEntity{ ...@@ -44,7 +44,7 @@ class GFace : public GEntity{
mean_plane meanPlane; mean_plane meanPlane;
std::list<GEdge *> embedded_edges; std::list<GEdge *> embedded_edges;
std::list<GVertex *> embedded_vertices; std::list<GVertex *> embedded_vertices;
GFaceCompound *compound; // this model edge belongs to a compound GFaceCompound *compound; // this model face belongs to a compound
// replace edges (for gluing) for specific modelers, we have to // replace edges (for gluing) for specific modelers, we have to
// re-create internal data // re-create internal data
......
...@@ -479,7 +479,9 @@ void End_Curve(Curve *c) ...@@ -479,7 +479,9 @@ void End_Curve(Curve *c)
break; break;
} }
} }
if (tmp.size() == nbCurrent) Msg::Error("Could not order compound edge %d to find begin and end vertex", c->Num); if (tmp.size() == nbCurrent)
Msg::Error("Could not order compound edge %d to find begin and end vertex",
c->Num);
} }
c->beg = vtcs.first; c->beg = vtcs.first;
c->end = vtcs.second; c->end = vtcs.second;
...@@ -1657,7 +1659,8 @@ Curve *CreateReversedCurve(Curve *c) ...@@ -1657,7 +1659,8 @@ Curve *CreateReversedCurve(Curve *c)
} }
if(c->Typ == MSH_SEGM_COMPOUND) { if(c->Typ == MSH_SEGM_COMPOUND) {
newc->compound.insert(newc->compound.end(),c->compound.rbegin(),c->compound.rend()); newc->compound.insert(newc->compound.end(), c->compound.rbegin(),
c->compound.rend());
} }
if(c->Typ == MSH_SEGM_CIRC) if(c->Typ == MSH_SEGM_CIRC)
...@@ -2327,7 +2330,8 @@ static List_T *GetCompoundUniqueEdges(Surface *ps) ...@@ -2327,7 +2330,8 @@ static List_T *GetCompoundUniqueEdges(Surface *ps)
for(int i = 0; i < num_surfs; i++){ for(int i = 0; i < num_surfs; i++){
Surface *s = FindSurface(std::abs(comp_surfs[i])); Surface *s = FindSurface(std::abs(comp_surfs[i]));
if(!s){ if(!s){
Msg::Error("Unknown surface %d", std::abs(comp_surfs[i]) ); // don't complain: some compound surfaces are not in old GEO database
//Msg::Warning("Unknown surface %d", std::abs(comp_surfs[i]) );
List_Delete(bnd_c); List_Delete(bnd_c);
return 0; return 0;
} }
...@@ -2336,12 +2340,12 @@ static List_T *GetCompoundUniqueEdges(Surface *ps) ...@@ -2336,12 +2340,12 @@ static List_T *GetCompoundUniqueEdges(Surface *ps)
Curve *c=0; Curve *c=0;
List_Read(s->Generatrices, m, &c); List_Read(s->Generatrices, m, &c);
if(!c){ if(!c){
Msg::Error("Unknown curve"); Msg::Warning("Unknown curve");
List_Delete(bnd_c); List_Delete(bnd_c);
return 0; return 0;
} }
if(!FindCurve(-c->Num)) { if(!FindCurve(-c->Num)) {
Msg::Error("Unknown curve %d", -c->Num ); Msg::Warning("Unknown curve %d", -c->Num);
List_Delete(bnd_c); List_Delete(bnd_c);
return 0; return 0;
} }
...@@ -4668,7 +4672,8 @@ void setSurfaceGeneratrices(Surface *s, List_T *loops) ...@@ -4668,7 +4672,8 @@ void setSurfaceGeneratrices(Surface *s, List_T *loops)
if(s->Typ == MSH_SURF_COMPOUND){ if(s->Typ == MSH_SURF_COMPOUND){
s->Generatrices = GetOrderedUniqueEdges(s); s->Generatrices = GetOrderedUniqueEdges(s);
if(!List_Nbr(s->Generatrices)){ if(!List_Nbr(s->Generatrices)){
Msg::Warning("Could not make generatrices list for compound surface %d", s->Num); // don't complain: compounds can be not in old GEO database
//Msg::Warning("Could not make generatrices list for compound surface %d", s->Num);
return; return;
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment