kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

[TD] Remove deprecated Qt < 5.9 code

Browse Source
This commit is contained in:
Chris Hennes
2021-03-31 12:03:36 -05:00
committed by wwmayer
parent 37eb08380a
commit bd86b4dcfe
7 changed files with 5 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Mod/TechDraw/Gui/Grabber3d.cpp
View File

@@ -26,9 +26,7 @@
#endif
//#if QT_VERSION >= 0x050000
//#include <QGuiApplication>
//#endif
#include <QImage>
#include <QPixmap>
@@ -317,18 +315,9 @@ double Grabber3d::getViewerScale(Gui::View3DInventorViewer* viewer)
//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
// 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
@@ -361,18 +350,9 @@ double Grabber3d::getPaperScale(Gui::View3DInventorViewer* viewer,
//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
// 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