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

[TD]CI clang warnings

Browse Source
This commit is contained in:
wandererfan
2022-08-23 15:32:13 -04:00
committed by WandererFan
parent c075a298ae
commit aa2b1b8392
246 changed files with 3944 additions and 4241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,7 +58,7 @@ using namespace Gui;
//notes for selection view
//SoSeparator* newSG;
//for obj in objList:
//for obj in objList:
// vProv = obj.ViewObject
// sg = vProv.getSG(obj);
// for child in sg:
@@ -66,7 +66,7 @@ using namespace Gui;
//
//creates Svg file and returns estimate of scale
double Grabber3d::copyActiveViewToSvgFile(App::Document* appDoc,
double Grabber3d::copyActiveViewToSvgFile(App::Document* appDoc,
std::string fileSpec,
double outWidth, double outHeight,
bool paintBackground, const QColor& bgColor,
@@ -115,7 +115,7 @@ double Grabber3d::copyActiveViewToSvgFile(App::Document* appDoc,
if (sourceCam->getTypeId() == SoOrthographicCamera::getClassTypeId()) {
oCam = static_cast<SoOrthographicCamera*>(sourceCam);
sourceHeight = oCam->height.getValue();
} else if (sourceCam->getTypeId() == SoPerspectiveCamera::getClassTypeId()) {
} else if (sourceCam->getTypeId() == SoPerspectiveCamera::getClassTypeId()) {
pCam = static_cast<SoPerspectiveCamera*>(sourceCam);
sourceAngle = pCam->heightAngle.getValue();
}
@@ -144,7 +144,7 @@ double Grabber3d::copyActiveViewToSvgFile(App::Document* appDoc,
if (sourceCam->getTypeId() == SoOrthographicCamera::getClassTypeId()) {
viewerSvg->setCameraType(SoOrthographicCamera::getClassTypeId());
} else if (sourceCam->getTypeId() == SoPerspectiveCamera::getClassTypeId()) {
} else if (sourceCam->getTypeId() == SoPerspectiveCamera::getClassTypeId()) {
viewerSvg->setCameraType(SoPerspectiveCamera::getClassTypeId());
}
@@ -164,7 +164,7 @@ double Grabber3d::copyActiveViewToSvgFile(App::Document* appDoc,
SoOrthographicCamera* oSvgCam = static_cast<SoOrthographicCamera*>(svgCam);
double newHeight = sourceHeight * zoomFactor;
oSvgCam->height.setValue(newHeight);
} else if (svgCam->getTypeId() == SoPerspectiveCamera::getClassTypeId()) {
} else if (svgCam->getTypeId() == SoPerspectiveCamera::getClassTypeId()) {
SoPerspectiveCamera* vSvgCam = static_cast<SoPerspectiveCamera*>(svgCam);
vSvgCam->heightAngle.setValue(sourceAngle);
}
@@ -241,7 +241,7 @@ SoSeparator* Grabber3d::copySceneGraph(SoNode* sgIn)
//loosely based on View3DInventorViewer::saveGraphic
void Grabber3d::execVectorizeAction(Gui::View3DInventorViewer* viewer,
SoVectorizeAction* va,
double width, double height,
double width, double height,
bool paintBackground, const QColor& bgColor,
double lineWidth, double border)
{
@@ -252,7 +252,7 @@ void Grabber3d::execVectorizeAction(Gui::View3DInventorViewer* viewer,
vaFC->setLineWidth(lineWidth);
vaFC->setUseMM(true);
}
if (paintBackground && bgColor.isValid()) {
va->setBackgroundColor(true, SbColor(bgColor.redF(), bgColor.greenF(), bgColor.blueF()));
} else {
@@ -282,17 +282,17 @@ double Grabber3d::getViewerScale(Gui::View3DInventorViewer* viewer)
// double qtpxmm = 96;
// QScreen *screen = QGuiApplication::primaryScreen();
// double qtppi = screen->physicalDotsPerInch(); //~111 dpi
// qtpxmm = qtppi / 25.4;
// qtpxmm = qtppi / 25.4;
SbViewportRegion vpRegion = viewer->getSoRenderManager()->getViewportRegion();
SbVec2s winSizePx = vpRegion.getWindowSize(); //pixel coords
Base::Vector3d p1v(0,0,0);
Base::Vector3d p1v(0, 0,0);
Base::Vector3d p2v(winSizePx[0] - 1, winSizePx[1] - 1);
double screenLengthpx = (p2v - p1v).Length(); //length in pixels
double screenLengthmm = (screenLengthpx / coinpxmm);
SbVec2s p1s(0,0);
SbVec2s p1s(0, 0);
SbVec2s p2s(winSizePx[0] - 1, winSizePx[1] - 1);
SbVec3f p1w = viewer->getPointOnFocalPlane(p1s);
SbVec3f p2w = viewer->getPointOnFocalPlane(p2s);
@@ -317,12 +317,12 @@ double Grabber3d::getPaperScale(Gui::View3DInventorViewer* viewer,
// double qtpxmm = 96;
// QScreen *screen = QGuiApplication::primaryScreen();
// double qtppi = screen->physicalDotsPerInch(); //~111 dpi
// qtpxmm = qtppi / 25.4;
// qtpxmm = qtppi / 25.4;
SbViewportRegion vpRegion = viewer->getSoRenderManager()->getViewportRegion();
SbVec2s winSizePx = vpRegion.getWindowSize(); //pixel coords
Base::Vector3d p1v(0,0,0);
Base::Vector3d p1v(0, 0,0);
Base::Vector3d p2v(winSizePx[0] - 1, winSizePx[1] - 1);
double screenLengthpx = (p2v - p1v).Length(); //length in pixels