From 52fe0eec531ae4e9c647671345fc8bef92bf9584 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Br=C3=A6strup=20Sayoc?= Date: Mon, 18 Nov 2024 20:14:47 +0100 Subject: [PATCH] [TechDraw] Return logic simplification (#16504) * [TechDraw] AppTechDrawPy.cpp return logic simplification * [TechDraw] CosmeticExtension.cpp return logic simplification * [TechDraw] DrawBrokenView.cpp return logic simplification * [TechDraw] HatchLine.cpp return logic simplification * [TechDraw] LineGenerator.cpp return logic simplification * [TechDraw] Preferences.cpp return logic simplification * [TechDraw] ShapeExtractor.cpp return logic simplification * [TechDraw] MDIViewPage.cpp return logic simplification * [TechDraw] QGILeaderLine.cpp return logic simplification * [TechDraw] QGIRichAnno.cpp return logic simplification * [TechDraw] QGTracker.cpp return logic simplification --- src/Mod/TechDraw/App/AppTechDrawPy.cpp | 3 +-- src/Mod/TechDraw/App/CosmeticExtension.cpp | 3 +-- src/Mod/TechDraw/App/DrawBrokenView.cpp | 5 +---- src/Mod/TechDraw/App/HatchLine.cpp | 16 ++++++---------- src/Mod/TechDraw/App/LineGenerator.cpp | 22 +++++++--------------- src/Mod/TechDraw/App/Preferences.cpp | 15 +++++---------- src/Mod/TechDraw/App/ShapeExtractor.cpp | 11 +++++------ src/Mod/TechDraw/Gui/MDIViewPage.cpp | 4 +--- src/Mod/TechDraw/Gui/QGILeaderLine.cpp | 8 +++----- src/Mod/TechDraw/Gui/QGIRichAnno.cpp | 4 +--- src/Mod/TechDraw/Gui/QGTracker.cpp | 5 +---- 11 files changed, 32 insertions(+), 64 deletions(-) diff --git a/src/Mod/TechDraw/App/AppTechDrawPy.cpp b/src/Mod/TechDraw/App/AppTechDrawPy.cpp index 4bb3fc7254..05c3a7f919 100644 --- a/src/Mod/TechDraw/App/AppTechDrawPy.cpp +++ b/src/Mod/TechDraw/App/AppTechDrawPy.cpp @@ -835,8 +835,7 @@ private: const TopoDS_Shape& shape = pShape->getTopoShapePtr()->getShape(); Base::Vector3d dir = static_cast(pcObjDir)->value(); Base::Vector3d centroid = ShapeUtils::findCentroidVec(shape, dir); - PyObject* result = nullptr; - result = new Base::VectorPy(new Base::Vector3d(centroid)); + PyObject* result = new Base::VectorPy(new Base::Vector3d(centroid)); return Py::asObject(result); } diff --git a/src/Mod/TechDraw/App/CosmeticExtension.cpp b/src/Mod/TechDraw/App/CosmeticExtension.cpp index 48c40af539..3bf122c2f5 100644 --- a/src/Mod/TechDraw/App/CosmeticExtension.cpp +++ b/src/Mod/TechDraw/App/CosmeticExtension.cpp @@ -205,8 +205,7 @@ std::string CosmeticExtension::addCosmeticVertex(const Base::Vector3d& pos, bool TechDraw::CosmeticVertex* cv = new TechDraw::CosmeticVertex(tempPos); verts.push_back(cv); CosmeticVertexes.setValues(verts); - std::string result = cv->getTagAsString(); - return result; + return cv->getTagAsString(); } /// retrieve a cosmetic vertex by unique id diff --git a/src/Mod/TechDraw/App/DrawBrokenView.cpp b/src/Mod/TechDraw/App/DrawBrokenView.cpp index 117510df56..840bfdf4b8 100644 --- a/src/Mod/TechDraw/App/DrawBrokenView.cpp +++ b/src/Mod/TechDraw/App/DrawBrokenView.cpp @@ -240,11 +240,8 @@ TopoDS_Shape DrawBrokenView::apply1Break(const App::DocumentObject& breakObj, co TopoDS_Shape DrawBrokenView::compressShape(const TopoDS_Shape& shapeToCompress) const { // Base::Console().Message("DBV::compressShape()\n"); - TopoDS_Shape result; TopoDS_Shape compressed = compressHorizontal(shapeToCompress); - result = compressVertical(compressed); - - return result; + return compressVertical(compressed); } //! move the broken pieces in the input shape "right" to close up the removed areas. diff --git a/src/Mod/TechDraw/App/HatchLine.cpp b/src/Mod/TechDraw/App/HatchLine.cpp index 56ca50faec..88b0041746 100644 --- a/src/Mod/TechDraw/App/HatchLine.cpp +++ b/src/Mod/TechDraw/App/HatchLine.cpp @@ -79,21 +79,19 @@ bool LineSet::isDashed() //! calculates the apparent start point (ie start of overlay line) for dashed lines Base::Vector3d LineSet::calcApparentStart(TechDraw::BaseGeomPtr g) { - Base::Vector3d result; Base::Vector3d start(g->getStartPoint().x, g->getStartPoint().y, 0.0); double angle = getPATLineSpec().getAngle(); if (angle == 0.0) { //horizontal - result = Base::Vector3d(getMinX(), start.y, 0.0); + return Base::Vector3d(getMinX(), start.y, 0.0); } else if ((angle == 90.0) || (angle == -90.0)) { //vertical - result = Base::Vector3d(start.x, getMinY(), 0.0); + return Base::Vector3d(start.x, getMinY(), 0.0); } else { double slope = getPATLineSpec().getSlope(); double y = getMinY(); double x = ((y - start.y) / slope) + start.x; - result = Base::Vector3d(x, y,0); + return Base::Vector3d(x, y,0); } - return result; } Base::Vector3d LineSet::getUnitDir() @@ -132,20 +130,18 @@ Base::Vector3d LineSet::getUnitOrtho() Base::Vector3d LineSet::findAtomStart() { - Base::Vector3d result; Base::Vector3d origin = getOrigin(); double angle = getAngle(); if (angle == 0.0) { - result = Base::Vector3d(getMinX(), origin.y, 0.0); + return Base::Vector3d(getMinX(), origin.y, 0.0); } else if ( (angle == 90.0) || (angle == -90.0) ) { - result = Base::Vector3d(origin.x, getMinY(), 0.0); + return Base::Vector3d(origin.x, getMinY(), 0.0); } else { double minY = getMinY(); double x = origin.x - (origin.y - minY)/getSlope(); - result = Base::Vector3d(x, minY, 0.0); + return Base::Vector3d(x, minY, 0.0); } - return result; } Base::Vector3d LineSet::getPatternStartPoint(TechDraw::BaseGeomPtr g, double &offset, double scale) diff --git a/src/Mod/TechDraw/App/LineGenerator.cpp b/src/Mod/TechDraw/App/LineGenerator.cpp index 8770c137f1..d793cee635 100644 --- a/src/Mod/TechDraw/App/LineGenerator.cpp +++ b/src/Mod/TechDraw/App/LineGenerator.cpp @@ -177,7 +177,6 @@ int LineGenerator::fromQtStyle(Qt::PenStyle style) { // Base::Console().Message("DLG::fromQtStyle(%d)\n", style); - int result { 0 }; // the 4 standard Qt::PenStyles and ISO128 equivalents int dashed = 2; int dotted = 7; @@ -199,29 +198,22 @@ int LineGenerator::fromQtStyle(Qt::PenStyle style) switch (style) { case Qt::NoPen: case Qt::SolidLine: - result = 1; - break; + return 1; case Qt::DashLine: - result = dashed; - break; + return dashed; case Qt::DotLine: - result = dotted; - break; + return dotted; case Qt::DashDotLine: - result = dashDot; - break; + return dashDot; case Qt::DashDotDotLine: - result = dashDotDot; - break; + return dashDotDot; case Qt::CustomDashLine: // not sure what to do here. we would have to match the custom pattern // to the patterns of the ISO lines and set the dash pattern accordingly. - result = 2; - break; + return 2; default: - result = 0; + return 0; } - return result; } diff --git a/src/Mod/TechDraw/App/Preferences.cpp b/src/Mod/TechDraw/App/Preferences.cpp index ef8f72e4f0..56cf903583 100644 --- a/src/Mod/TechDraw/App/Preferences.cpp +++ b/src/Mod/TechDraw/App/Preferences.cpp @@ -549,21 +549,16 @@ std::string Preferences::currentElementDefFile() int Preferences::LineCapStyle() { int currentIndex = LineCapIndex(); - int result{0x20}; - switch (currentIndex) { + switch (currentIndex) { case 0: - result = static_cast(0x20); //round; - break; + return static_cast(0x20); //round; case 1: - result = static_cast(0x10); //square; - break; + return static_cast(0x10); //square; case 2: - result = static_cast(0x00); //flat - break; + return static_cast(0x00); //flat default: - result = static_cast(0x20); + return static_cast(0x20); } - return result; } //! returns the line cap index without conversion to a Qt::PenCapStyle diff --git a/src/Mod/TechDraw/App/ShapeExtractor.cpp b/src/Mod/TechDraw/App/ShapeExtractor.cpp index 277d054ccc..99b74df521 100644 --- a/src/Mod/TechDraw/App/ShapeExtractor.cpp +++ b/src/Mod/TechDraw/App/ShapeExtractor.cpp @@ -421,18 +421,17 @@ bool ShapeExtractor::is2dObject(const App::DocumentObject* obj) // just these for now bool ShapeExtractor::isEdgeType(const App::DocumentObject* obj) { - bool result = false; Base::Type t = obj->getTypeId(); if (t.isDerivedFrom(Part::Line::getClassTypeId()) ) { - result = true; + return true; } else if (t.isDerivedFrom(Part::Circle::getClassTypeId())) { - result = true; + return true; } else if (t.isDerivedFrom(Part::Ellipse::getClassTypeId())) { - result = true; + return true; } else if (t.isDerivedFrom(Part::RegularPolygon::getClassTypeId())) { - result = true; + return true; } - return result; + return false; } bool ShapeExtractor::isPointType(const App::DocumentObject* obj) diff --git a/src/Mod/TechDraw/Gui/MDIViewPage.cpp b/src/Mod/TechDraw/Gui/MDIViewPage.cpp index 3e344c9d21..e87c38a5a4 100644 --- a/src/Mod/TechDraw/Gui/MDIViewPage.cpp +++ b/src/Mod/TechDraw/Gui/MDIViewPage.cpp @@ -1061,8 +1061,6 @@ void MDIViewPage::removeUnselectedTreeSelection(QList sceneSelec bool MDIViewPage::compareSelections(std::vector treeSel, QList sceneSel) { - bool result = true; - if (treeSel.empty() && sceneSel.empty()) { return true; } @@ -1141,7 +1139,7 @@ bool MDIViewPage::compareSelections(std::vector treeSel, return false; } - return result; + return true; } ///////////////////end Selection Routines ////////////////////// diff --git a/src/Mod/TechDraw/Gui/QGILeaderLine.cpp b/src/Mod/TechDraw/Gui/QGILeaderLine.cpp index 3e1a0c58c3..2b31f9b361 100644 --- a/src/Mod/TechDraw/Gui/QGILeaderLine.cpp +++ b/src/Mod/TechDraw/Gui/QGILeaderLine.cpp @@ -596,8 +596,7 @@ double QGILeaderLine::getLineWidth() TechDraw::DrawLeaderLine* QGILeaderLine::getLeaderFeature() { - TechDraw::DrawLeaderLine* result = static_cast(getViewObject()); - return result; + return static_cast(getViewObject()); } double QGILeaderLine::getEdgeFuzz() const @@ -637,12 +636,11 @@ void QGILeaderLine::paint(QPainter* painter, const QStyleOptionGraphicsItem* opt bool QGILeaderLine::useOldCoords() const { - bool result = false; auto vp = dynamic_cast(getViewProvider(getViewObject())); if (vp) { - result = vp->UseOldCoords.getValue(); + return vp->UseOldCoords.getValue(); } - return result; + return false; } diff --git a/src/Mod/TechDraw/Gui/QGIRichAnno.cpp b/src/Mod/TechDraw/Gui/QGIRichAnno.cpp index 77c698f286..494326b623 100644 --- a/src/Mod/TechDraw/Gui/QGIRichAnno.cpp +++ b/src/Mod/TechDraw/Gui/QGIRichAnno.cpp @@ -279,9 +279,7 @@ QString QGIRichAnno::convertTextSizes(const QString& inHtml) const TechDraw::DrawRichAnno* QGIRichAnno::getFeature() { - TechDraw::DrawRichAnno* result = - static_cast(getViewObject()); - return result; + return static_cast(getViewObject()); } diff --git a/src/Mod/TechDraw/Gui/QGTracker.cpp b/src/Mod/TechDraw/Gui/QGTracker.cpp index e0bd826715..c32eb66884 100644 --- a/src/Mod/TechDraw/Gui/QGTracker.cpp +++ b/src/Mod/TechDraw/Gui/QGTracker.cpp @@ -483,10 +483,7 @@ QColor QGTracker::getTrackerColor() double QGTracker::getTrackerWeight() { - double result = 1.0; - result = Preferences::getPreferenceGroup("Tracker")->GetFloat("TrackerWeight", 4.0); - - return result; + return Preferences::getPreferenceGroup("Tracker")->GetFloat("TrackerWeight", 4.0); } #include