From 526e6c5a62ea0aecd74931160fc366142dfa74f8 Mon Sep 17 00:00:00 2001 From: wandererfan Date: Wed, 12 Jun 2024 18:25:59 -0400 Subject: [PATCH] [TD]remove spurious error messages --- src/Mod/TechDraw/App/DrawViewPart.cpp | 7 ++++++- src/Mod/TechDraw/App/Geometry.cpp | 16 ++++++++-------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/Mod/TechDraw/App/DrawViewPart.cpp b/src/Mod/TechDraw/App/DrawViewPart.cpp index 9e39ce5af5..544ef9837f 100644 --- a/src/Mod/TechDraw/App/DrawViewPart.cpp +++ b/src/Mod/TechDraw/App/DrawViewPart.cpp @@ -387,7 +387,12 @@ void DrawViewPart::onHlrFinished() m_tempGeometryObject = nullptr; //superfluous? } if (!geometryObject) { - throw Base::RuntimeError("DrawViewPart has lost its geometry"); + throw Base::RuntimeError("DrawViewPart has lost its geometry object"); + } + + if (!hasGeometry()) { + Base::Console().Error("TechDraw did not retrieve any geometry for %s/%s\n", + getNameInDocument(), Label.getValue()); } //the last hlr related task is to make a bbox of the results diff --git a/src/Mod/TechDraw/App/Geometry.cpp b/src/Mod/TechDraw/App/Geometry.cpp index d8fe538f30..749ba0d4ee 100644 --- a/src/Mod/TechDraw/App/Geometry.cpp +++ b/src/Mod/TechDraw/App/Geometry.cpp @@ -532,7 +532,7 @@ BaseGeomPtr BaseGeom::baseFactory(TopoDS_Edge edge) BSplinePtr bspline = std::make_shared(edge); if (bspline->isLine()) { result = std::make_shared(edge); - } else { + } else if (bspline->isCircle()) { circEdge = bspline->asCircle(isArc); if (!circEdge.IsNull()) { if (isArc) { @@ -540,20 +540,20 @@ BaseGeomPtr BaseGeom::baseFactory(TopoDS_Edge edge) } else { result = std::make_shared(circEdge); } - } else { -// Base::Console().Message("Geom::baseFactory - circEdge is Null\n"); - result = bspline; - } + } + } else { +// Base::Console().Message("Geom::baseFactory - circEdge is Null\n"); + result = bspline; } break; } catch (const Standard_Failure& e) { - Base::Console().Error("Geom::baseFactory - OCC error - %s - while making spline\n", + Base::Console().Log("Geom::baseFactory - OCC error - %s - while making spline\n", e.GetMessageString()); break; } catch (...) { - Base::Console().Error("Geom::baseFactory - unknown error occurred while making spline\n"); + Base::Console().Log("Geom::baseFactory - unknown error occurred while making spline\n"); break; } break; } // end bspline case @@ -1593,7 +1593,7 @@ bool GeometryUtils::getCircleParms(TopoDS_Edge occEdge, double& radius, Base::Ve sumCenter += DrawUtil::toVector3d(curveCenter); } catch (Standard_Failure&) { - Base::Console().Error("OCC error. Could not interpret BSpline as Circle\n"); + // Base::Console().Error("OCC error. Could not interpret BSpline as Circle\n"); return false; } Base::Vector3d avgCenter = sumCenter/testCount;