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

better offset for entity labels

parent 97ccb30a
No related branches found
No related tags found
No related merge requests found
...@@ -72,7 +72,7 @@ class drawGVertex { ...@@ -72,7 +72,7 @@ class drawGVertex {
char Num[100]; char Num[100];
sprintf(Num, "%d", v->tag()); sprintf(Num, "%d", v->tag());
double offset = (0.5 * CTX::instance()->geom.pointSize + double offset = (0.5 * CTX::instance()->geom.pointSize +
0.3 * CTX::instance()->glFontSize) * _ctx->pixel_equiv_x; 0.1 * CTX::instance()->glFontSize) * _ctx->pixel_equiv_x;
glRasterPos3d(x + offset / _ctx->s[0], glRasterPos3d(x + offset / _ctx->s[0],
y + offset / _ctx->s[1], y + offset / _ctx->s[1],
z + offset / _ctx->s[2]); z + offset / _ctx->s[2]);
...@@ -166,7 +166,7 @@ class drawGEdge { ...@@ -166,7 +166,7 @@ class drawGEdge {
char Num[100]; char Num[100];
sprintf(Num, "%d", e->tag()); sprintf(Num, "%d", e->tag());
double offset = (0.5 * CTX::instance()->geom.lineWidth + double offset = (0.5 * CTX::instance()->geom.lineWidth +
0.3 * CTX::instance()->glFontSize) * _ctx->pixel_equiv_x; 0.1 * CTX::instance()->glFontSize) * _ctx->pixel_equiv_x;
double x = p.x(), y = p.y(), z = p.z(); double x = p.x(), y = p.y(), z = p.z();
_ctx->transform(x, y, z); _ctx->transform(x, y, z);
glRasterPos3d(x + offset / _ctx->s[0], glRasterPos3d(x + offset / _ctx->s[0],
...@@ -287,7 +287,7 @@ class drawGFace { ...@@ -287,7 +287,7 @@ class drawGFace {
GPoint p = f->point(uav, vav); GPoint p = f->point(uav, vav);
char Num[100]; char Num[100];
sprintf(Num, "%d", f->tag()); sprintf(Num, "%d", f->tag());
double offset = 0.3 * CTX::instance()->glFontSize * _ctx->pixel_equiv_x; double offset = 0.1 * CTX::instance()->glFontSize * _ctx->pixel_equiv_x;
double x = p.x(), y = p.y(), z = p.z(); double x = p.x(), y = p.y(), z = p.z();
_ctx->transform(x, y, z); _ctx->transform(x, y, z);
glRasterPos3d(x + offset / _ctx->s[0], glRasterPos3d(x + offset / _ctx->s[0],
...@@ -344,7 +344,7 @@ class drawGFace { ...@@ -344,7 +344,7 @@ class drawGFace {
if(CTX::instance()->geom.surfacesNum) { if(CTX::instance()->geom.surfacesNum) {
char Num[100]; char Num[100];
sprintf(Num, "%d", f->tag()); sprintf(Num, "%d", f->tag());
double offset = 0.3 * CTX::instance()->glFontSize * _ctx->pixel_equiv_x; double offset = 0.1 * CTX::instance()->glFontSize * _ctx->pixel_equiv_x;
double x = 0.5 * (f->cross[0].x() + f->cross[1].x()); double x = 0.5 * (f->cross[0].x() + f->cross[1].x());
double y = 0.5 * (f->cross[0].y() + f->cross[1].y()); double y = 0.5 * (f->cross[0].y() + f->cross[1].y());
double z = 0.5 * (f->cross[0].z() + f->cross[1].z()); double z = 0.5 * (f->cross[0].z() + f->cross[1].z());
...@@ -447,7 +447,7 @@ class drawGRegion { ...@@ -447,7 +447,7 @@ class drawGRegion {
if(CTX::instance()->geom.volumesNum){ if(CTX::instance()->geom.volumesNum){
char Num[100]; char Num[100];
sprintf(Num, "%d", r->tag()); sprintf(Num, "%d", r->tag());
double offset = (0.5 * size + 0.3 * CTX::instance()->glFontSize) * double offset = (0.5 * size + 0.1 * CTX::instance()->glFontSize) *
_ctx->pixel_equiv_x; _ctx->pixel_equiv_x;
glRasterPos3d(x + offset / _ctx->s[0], glRasterPos3d(x + offset / _ctx->s[0],
y + offset / _ctx->s[1], y + offset / _ctx->s[1],
... ...
......
...@@ -260,7 +260,7 @@ static void drawVertexLabel(drawContext *ctx, GEntity *e, MVertex *v, ...@@ -260,7 +260,7 @@ static void drawVertexLabel(drawContext *ctx, GEntity *e, MVertex *v,
glColor4ubv((GLubyte *) & CTX::instance()->color.mesh.vertex); glColor4ubv((GLubyte *) & CTX::instance()->color.mesh.vertex);
double offset = (0.5 * CTX::instance()->mesh.pointSize + double offset = (0.5 * CTX::instance()->mesh.pointSize +
0.3 * CTX::instance()->glFontSize) * ctx->pixel_equiv_x; 0.1 * CTX::instance()->glFontSize) * ctx->pixel_equiv_x;
glRasterPos3d(v->x() + offset / ctx->s[0], glRasterPos3d(v->x() + offset / ctx->s[0],
v->y() + offset / ctx->s[1], v->y() + offset / ctx->s[1],
v->z() + offset / ctx->s[2]); v->z() + offset / ctx->s[2]);
... ...
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment