Skip to content
Snippets Groups Projects
Commit 8d9f938d authored by Emilie Marchandise's avatar Emilie Marchandise
Browse files

ReadSTL should not create a volume (wrong if stl not closed)

GetStatistics for 2D meshes gives now mean value quality also
parent 8d9b107d
No related branches found
No related tags found
No related merge requests found
...@@ -1079,13 +1079,13 @@ int GModel::readSTL(const std::string &name, double tolerance) ...@@ -1079,13 +1079,13 @@ int GModel::readSTL(const std::string &name, double tolerance)
Msg::Info("%d facets in solid %d", points[i].size() / 3, i); Msg::Info("%d facets in solid %d", points[i].size() / 3, i);
// create face // create face
GFace *face = new discreteFace(this, getMaxElementaryNumber(2) + 1); GFace *face = new discreteFace(this, getMaxElementaryNumber(2) + 1);
GRegion *region = new GRegion(this, getMaxElementaryNumber(3) + 1);
faces.push_back(face); faces.push_back(face);
add(face); add(face);
add(region); //GRegion *region = new GRegion(this, getMaxElementaryNumber(3) + 1);
std::list<GFace*> _temp; //add(region);
_temp.push_back(face); //std::list<GFace*> _temp;
region->set(_temp); //_temp.push_back(face);
//region->set(_temp);
} }
// create triangles using unique vertices // create triangles using unique vertices
......
...@@ -205,7 +205,7 @@ void GetStatistics(double stat[50], double quality[4][100]) ...@@ -205,7 +205,7 @@ void GetStatistics(double stat[50], double quality[4][100])
stat[1] = m->getNumEdges(); stat[1] = m->getNumEdges();
stat[2] = m->getNumFaces(); stat[2] = m->getNumFaces();
stat[3] = m->getNumRegions(); stat[3] = m->getNumRegions();
std::map<int, std::vector<GEntity*> > physicals[4]; std::map<int, std::vector<GEntity*> > physicals[4];
m->getPhysicalGroups(physicals); m->getPhysicalGroups(physicals);
stat[45] = physicals[0].size() + physicals[1].size() + stat[45] = physicals[0].size() + physicals[1].size() +
...@@ -240,6 +240,7 @@ void GetStatistics(double stat[50], double quality[4][100]) ...@@ -240,6 +240,7 @@ void GetStatistics(double stat[50], double quality[4][100])
double eta=0., etaMin=1., etaMax=0.; double eta=0., etaMin=1., etaMax=0.;
double rho=0., rhoMin=1., rhoMax=0.; double rho=0., rhoMin=1., rhoMax=0.;
double disto=0., distoMin=1., distoMax=0.; double disto=0., distoMin=1., distoMax=0.;
double N = 0.0;
if (m->firstRegion() == m->lastRegion()){ if (m->firstRegion() == m->lastRegion()){
for(GModel::fiter it = m->firstFace(); it != m->lastFace(); ++it){ for(GModel::fiter it = m->firstFace(); it != m->lastFace(); ++it){
GetQualityMeasure((*it)->quadrangles, gamma, gammaMin, gammaMax, GetQualityMeasure((*it)->quadrangles, gamma, gammaMin, gammaMax,
...@@ -249,6 +250,7 @@ void GetStatistics(double stat[50], double quality[4][100]) ...@@ -249,6 +250,7 @@ void GetStatistics(double stat[50], double quality[4][100])
eta, etaMin, etaMax, rho, rhoMin, rhoMax, eta, etaMin, etaMax, rho, rhoMin, rhoMax,
disto, distoMin, distoMax, quality); disto, distoMin, distoMax, quality);
} }
N = stat[7] + stat[8];
} }
else{ else{
for(GModel::riter it = m->firstRegion(); it != m->lastRegion(); ++it){ for(GModel::riter it = m->firstRegion(); it != m->lastRegion(); ++it){
...@@ -265,18 +267,18 @@ void GetStatistics(double stat[50], double quality[4][100]) ...@@ -265,18 +267,18 @@ void GetStatistics(double stat[50], double quality[4][100])
eta, etaMin, etaMax, rho, rhoMin, rhoMax, eta, etaMin, etaMax, rho, rhoMin, rhoMax,
disto, distoMin, distoMax, quality); disto, distoMin, distoMax, quality);
} }
N = stat[9] + stat[10] + stat[11] + stat[12];
} }
double N = stat[9] + stat[10] + stat[11] + stat[12]; stat[17] = gamma / N ;
stat[17] = N ? gamma / N : 0.;
stat[18] = gammaMin; stat[18] = gammaMin;
stat[19] = gammaMax; stat[19] = gammaMax;
stat[20] = N ? eta / N : 0.; stat[20] = eta / N ;
stat[21] = etaMin; stat[21] = etaMin;
stat[22] = etaMax; stat[22] = etaMax;
stat[23] = N ? rho / N : 0; stat[23] = rho / N ;
stat[24] = rhoMin; stat[24] = rhoMin;
stat[25] = rhoMax; stat[25] = rhoMax;
stat[46] = N ? disto / N : 0; stat[46] = disto / N ;
stat[47] = distoMin; stat[47] = distoMin;
stat[48] = distoMax; stat[48] = distoMax;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment