suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ fix possible scaling problem of datum label

Browse Source
This commit is contained in:
wmayer 2014-11-08 15:55:47 +01:00
parent 97696aadfa
commit e753af2fd7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Mod/Sketcher/Gui/SoDatumLabel.cpp
View File

@ -340,7 +340,7 @@ void SoDatumLabel::generatePrimitives(SoAction * action)
SoState *state = action->getState(); SoState *state = action->getState();
const SbViewVolume & vv = SoViewVolumeElement::get(state); const SbViewVolume & vv = SoViewVolumeElement::get(state);
float scale = vv.getWorldToScreenScale(SbVec3f(0.f,0.f,0.f), 1.0f); float scale = vv.getWorldToScreenScale(SbVec3f(0.f,0.f,0.f), 1.0f);
SbVec2s vp_size = SoViewportRegionElement::get(state).getWindowSize(); SbVec2s vp_size = SoViewportRegionElement::get(state).getViewportSizePixels();
scale /= float(vp_size[0]); scale /= float(vp_size[0]);
SbVec3f dir = (p2-p1); SbVec3f dir = (p2-p1);
@ -434,7 +434,7 @@ void SoDatumLabel::GLRender(SoGLRenderAction * action)
*/ */
const SbViewVolume & vv = SoViewVolumeElement::get(state); const SbViewVolume & vv = SoViewVolumeElement::get(state);
float scale = vv.getWorldToScreenScale(SbVec3f(0.f,0.f,0.f), 1.f); float scale = vv.getWorldToScreenScale(SbVec3f(0.f,0.f,0.f), 1.f);
SbVec2s vp_size = action->getViewportRegion().getWindowSize(); SbVec2s vp_size = action->getViewportRegion().getViewportSizePixels();
scale /= float(vp_size[0]); scale /= float(vp_size[0]);
const SbString* s = string.getValues(0); const SbString* s = string.getValues(0);