Commit 56f5689e authored by Christophe Geuzaine's avatar Christophe Geuzaine

fine tune display of selected entities

parent fbd515e1
Pipeline #1497 passed with stage
in 51 minutes 34 seconds
......@@ -854,7 +854,7 @@ StringXNumber GeometryOptions_Number[] = {
"Display geometry curves?" },
{ F|O, "LineNumbers" , opt_geometry_curves_num , 0. ,
"Display curve numbers?" },
{ F|O, "LineSelectWidth" , opt_geometry_curve_sel_width , 2. ,
{ F|O, "LineSelectWidth" , opt_geometry_curve_sel_width , 3. ,
"Display width of selected curves (in pixels)" },
{ F|O, "LineType" , opt_geometry_curve_type , 0. ,
"Display curves as solid color segments (0), 3D cylinders (1) or tapered "
......@@ -907,7 +907,7 @@ StringXNumber GeometryOptions_Number[] = {
"Display geometry points?" },
{ F|O, "PointNumbers" , opt_geometry_points_num , 0. ,
"Display points numbers?" },
{ F|O, "PointSelectSize" , opt_geometry_point_sel_size , 5. ,
{ F|O, "PointSelectSize" , opt_geometry_point_sel_size , 6. ,
"Display size of selected points (in pixels)" },
{ F|O, "PointSize" , opt_geometry_point_size , 4. ,
"Display size of points (in pixels)" },
......
......@@ -110,6 +110,8 @@ class drawGVertex {
if(CTX::instance()->geom.pointsNum || v->getSelection() > 1) {
double offset = (0.5 * ps +
0.1 * CTX::instance()->glFontSize) * _ctx->pixel_equiv_x;
if(v->getSelection() > 1)
glColor4ubv((GLubyte *) & CTX::instance()->color.fg);
drawEntityLabel(_ctx, v, x, y, z, offset);
}
......@@ -203,6 +205,8 @@ class drawGEdge {
0.1 * CTX::instance()->glFontSize) * _ctx->pixel_equiv_x;
double x = p.x(), y = p.y(), z = p.z();
_ctx->transform(x, y, z);
if(e->getSelection() > 1)
glColor4ubv((GLubyte *) & CTX::instance()->color.fg);
drawEntityLabel(_ctx, e, x, y, z, offset);
}
......@@ -329,7 +333,7 @@ class drawGFace {
}
else{
glEnable(GL_LINE_STIPPLE);
glLineStipple(1, 0x1F1F);
glLineStipple(1, 0x0F0F);
gl2psEnable(GL2PS_LINE_STIPPLE);
for(int dim = 0; dim < 2; dim++){
for(unsigned int i = 0; i < f->cross[dim].size(); i++){
......@@ -357,6 +361,8 @@ class drawGFace {
double y = f->cross[0][0][idx].y();
double z = f->cross[0][0][idx].z();
_ctx->transform(x, y, z);
if(f->getSelection() > 1)
glColor4ubv((GLubyte *) & CTX::instance()->color.fg);
drawEntityLabel(_ctx, f, x, y, z, offset);
}
......@@ -420,8 +426,10 @@ class drawGRegion {
_ctx->drawSphere(size, x, y, z, CTX::instance()->geom.light);
if(CTX::instance()->geom.volumesNum || r->getSelection() > 1){
double offset = (0.5 * size + 0.1 * CTX::instance()->glFontSize) *
double offset = (1. * size + 0.1 * CTX::instance()->glFontSize) *
_ctx->pixel_equiv_x;
if(r->getSelection() > 1)
glColor4ubv((GLubyte *) & CTX::instance()->color.fg);
drawEntityLabel(_ctx, r, x, y, z, offset);
}
......
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