Commit 6a1d3f5b authored by Christophe Geuzaine's avatar Christophe Geuzaine

cleanup

parent 893c52f1
Pipeline #1491 passed with stage
in 36 minutes 22 seconds
......@@ -2052,11 +2052,6 @@ optionWindow::optionWindow(int deltaFontSize)
geo.value[1]->when(FL_WHEN_RELEASE);
geo.value[1]->callback(geometry_options_ok_cb);
geo.butt[17] = new Fl_Check_Button
(L + 2 * WB, 2 * WB + 7 * BH, BW, BH, "Hide entities making up coumpounds");
geo.butt[17]->type(FL_TOGGLE_BUTTON);
geo.butt[17]->callback(geometry_options_ok_cb);
o->end();
}
{
......
......@@ -63,18 +63,22 @@ std::string GEntity::getInfoString(bool additional, bool multiline)
if(physicals.size()){
if(multiline) sstream << "\n";
else sstream << ": ";
sstream << "Physical ";
switch(dim()){
case 0: sstream << "Point"; break;
case 1: sstream << "Curve"; break;
case 2: sstream << "Surface"; break;
case 3: sstream << "Volume"; break;
}
else sstream << " ";
for(unsigned int i = 0; i < physicals.size(); i++){
sstream << "Physical ";
switch(dim()){
case 0: sstream << "Point"; break;
case 1: sstream << "Curve"; break;
case 2: sstream << "Surface"; break;
case 3: sstream << "Volume"; break;
}
sstream << " " << physicals[i];
std::string name = model()->getPhysicalName(dim(), physicals[i]);
if(name.size()) sstream << " " << "(" << name << ")";
if(name.size()){
if(multiline) sstream << "\n";
else sstream << ", ";
sstream << name;
}
}
}
......
......@@ -341,7 +341,8 @@ std::string GFace::getAdditionalInfoString(bool multline)
{
std::ostringstream sstream;
if(l_edges.size() > 20){
sstream << "Boundary curves: " << l_edges.front()->tag() << ", ...," << l_edges.back()->tag();
sstream << "Boundary curves: " << l_edges.front()->tag()
<< ", ...," << l_edges.back()->tag();
}
else if(l_edges.size()){
sstream << "Boundary curves: ";
......@@ -356,7 +357,7 @@ std::string GFace::getAdditionalInfoString(bool multline)
if(multline) sstream << "\n";
else sstream << " ";
}
sstream << "Mesh attributes: ";
sstream << "Mesh attributes:";
if(meshAttributes.recombine)
sstream << " recombined";
if(meshAttributes.method == MESH_TRANSFINITE)
......
......@@ -27,8 +27,9 @@ gmshFace::gmshFace(GModel *m, Surface *face)
resetMeshAttributes();
}
// a face is degenerate if
bool gmshFace::degenerate(int dim) const {
// a face is degenerate if
bool gmshFace::degenerate(int dim) const
{
std::list<GEdge*> eds = edges();
int numNonDegenerate = 0;
std::set<GEdge*> t;
......@@ -45,7 +46,6 @@ bool gmshFace::degenerate(int dim) const {
return numNonDegenerate <= 1;
}
void gmshFace::resetNativePtr(Surface *face)
{
s = face;
......@@ -104,7 +104,6 @@ void gmshFace::resetNativePtr(Surface *face)
// always compute and store the mean plane for plane surfaces (using
// the bounding vertices)
if(s->Typ == MSH_SURF_PLAN) computeMeanPlane();
}
double gmshFace::getMetricEigenvalue(const SPoint2 &pt)
......
......@@ -59,7 +59,7 @@ void drawContext::drawString(const std::string &s, double x, double y, double z,
}
}
// treat line number also for TeX
if(line_num) w[1] -= line_num * (1.25 * height);
if(line_num) w[1] -= line_num * (1.1 * height);
viewport2World(w, x);
glRasterPos3d(x[0], x[1], x[2]);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment