diff --git a/src/Mod/TechDraw/Gui/Grabber3d.cpp b/src/Mod/TechDraw/Gui/Grabber3d.cpp index dcb6a31a2b..ba34298788 100644 --- a/src/Mod/TechDraw/Gui/Grabber3d.cpp +++ b/src/Mod/TechDraw/Gui/Grabber3d.cpp @@ -25,7 +25,11 @@ #ifndef _PreComp_ #endif -#include + +//#if QT_VERSION >= 0x050000 +//#include +//#endif + #include #include #include @@ -64,24 +68,17 @@ #include #include #include -#include #include -#include -#include #include -#include #include #include #include #include -#include #include #include #include -#include #include #include -#include #include #include "Rez.h" @@ -317,9 +314,21 @@ double Grabber3d::getViewerScale(Gui::View3DInventorViewer* viewer) double result = 1; // double printerpxmm = 3.94; //? 100 dpi? double coinpxmm = 2.83; //72 dpi + + //accurate dpmm for screen is not easily acquired! +// double qtpxmm = 96; +//#if QT_VERSION >=050000 // QScreen *screen = QGuiApplication::primaryScreen(); // double qtppi = screen->physicalDotsPerInch(); //~111 dpi -// double qtpxmm = qtppi / 25.4; +// qtpxmm = qtppi / 25.4; +//#else +//// QSize widgetSize = viewer->size(); +//// int qtDpiXLog = viewer->logicalDpiX(); +//// int qtDpiYLog = viewer->logicalDpiY(); +// int qtDpiXPhys = viewer->physicalDpiX(); +// int qtDpiYPhys = viewer->physicalDpiY(); +// qtpxmm = ((qtDpiXPhys + qtDpiYPhys) / 2.0) / 25.4; +//#endif SbViewportRegion vpRegion = viewer->getSoRenderManager()->getViewportRegion(); SbVec2s winSizePx = vpRegion.getWindowSize(); //pixel coords @@ -349,9 +358,22 @@ double Grabber3d::getPaperScale(Gui::View3DInventorViewer* viewer, double result = 1; // double printerpxmm = 3.94; //? 100 dpi? double coinpxmm = 2.83; //72 dpi + + //accurate dpmm for screen is not easily acquired! +// double qtpxmm = 96; +//#if QT_VERSION >=050000 // QScreen *screen = QGuiApplication::primaryScreen(); // double qtppi = screen->physicalDotsPerInch(); //~111 dpi -// double qtpxmm = qtppi / 25.4; +// qtpxmm = qtppi / 25.4; +//#else +//// QSize widgetSize = viewer->size(); +//// int qtDpiXLog = viewer->logicalDpiX(); +//// int qtDpiYLog = viewer->logicalDpiY(); +// int qtDpiXPhys = viewer->physicalDpiX(); +// int qtDpiYPhys = viewer->physicalDpiY(); +// qtpxmm = ((qtDpiXPhys + qtDpiYPhys) / 2.0) / 25.4; +//#endif + SbViewportRegion vpRegion = viewer->getSoRenderManager()->getViewportRegion(); SbVec2s winSizePx = vpRegion.getWindowSize(); //pixel coords