From b081aa87ef0e504aa6a78ccd926f61d296596f96 Mon Sep 17 00:00:00 2001 From: Artem Zhidkov Date: Wed, 15 Jul 2020 20:17:54 +0300 Subject: [PATCH] Fix warnings --- src/FeaturesPlugin/doc/TUI_fillet1DVertices.rst | 4 ++-- src/FeaturesPlugin/doc/TUI_fillet1DWire.rst | 4 ++-- src/FeaturesPlugin/doc/fillet1dFeature.rst | 17 +++++++++++------ src/GeomAlgoAPI/GeomAlgoAPI_CurveBuilder.cpp | 1 - src/GeomAlgoImpl/GEOMImpl_Fillet1d.cxx | 6 +++--- src/PartSet/PartSet_Module.cpp | 2 +- src/SketchPlugin/SketchPlugin_CurveFitting.cpp | 2 +- src/SketchPlugin/doc/SketchPlugin.rst | 1 + 8 files changed, 21 insertions(+), 16 deletions(-) diff --git a/src/FeaturesPlugin/doc/TUI_fillet1DVertices.rst b/src/FeaturesPlugin/doc/TUI_fillet1DVertices.rst index 6a7f0372c..d5fbab024 100644 --- a/src/FeaturesPlugin/doc/TUI_fillet1DVertices.rst +++ b/src/FeaturesPlugin/doc/TUI_fillet1DVertices.rst @@ -8,5 +8,5 @@ Create 1D-fillet for special vertices on a wire :linenos: :language: python -:download:`Download this script ` - +:download:`Download this script ` + diff --git a/src/FeaturesPlugin/doc/TUI_fillet1DWire.rst b/src/FeaturesPlugin/doc/TUI_fillet1DWire.rst index c22230616..5ae982d43 100644 --- a/src/FeaturesPlugin/doc/TUI_fillet1DWire.rst +++ b/src/FeaturesPlugin/doc/TUI_fillet1DWire.rst @@ -8,5 +8,5 @@ Create 1D-fillet on a wire :linenos: :language: python -:download:`Download this script ` - +:download:`Download this script ` + diff --git a/src/FeaturesPlugin/doc/fillet1dFeature.rst b/src/FeaturesPlugin/doc/fillet1dFeature.rst index e3a30a404..a3d18cf24 100644 --- a/src/FeaturesPlugin/doc/fillet1dFeature.rst +++ b/src/FeaturesPlugin/doc/fillet1dFeature.rst @@ -15,13 +15,17 @@ To create a 1D-fillet in the active part: There are 2 types of fillet: - .. image:: images/fillet1d_wire.png - :align: left - fillet all sharp corners on a wire +.. image:: images/fillet1d_wire.png + :align: left + :height: 24px - .. image:: images/fillet1d_points.png - :align: left - fillet only the specified corners +fillet all sharp corners on a wire + +.. image:: images/fillet1d_points.png + :align: left + :height: 24px + +fillet only the specified corners Fillet a wire ------------- @@ -80,6 +84,7 @@ Input fields: **TUI Command**: .. py:function:: model.addFillet(Part_doc, [vertices], radius) + :noindex: :param part: The current part object. :param list: A list of vertices subject to fillet operation in format *model.selection(TYPE, shape)*. diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_CurveBuilder.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_CurveBuilder.cpp index ab6499bf8..21b4df20d 100644 --- a/src/GeomAlgoAPI/GeomAlgoAPI_CurveBuilder.cpp +++ b/src/GeomAlgoAPI/GeomAlgoAPI_CurveBuilder.cpp @@ -172,7 +172,6 @@ void GeomAlgoAPI_CurveBuilder::reorderPoints(std::list& thePoints) return; } - int aNbDup = 0; std::list::iterator aPIt = thePoints.begin(); GeomPointPtr aPrevPnt = *aPIt; for (; aPIt != thePoints.end(); ++aPIt) { diff --git a/src/GeomAlgoImpl/GEOMImpl_Fillet1d.cxx b/src/GeomAlgoImpl/GEOMImpl_Fillet1d.cxx index b9aef213c..6ed7b3eac 100644 --- a/src/GeomAlgoImpl/GEOMImpl_Fillet1d.cxx +++ b/src/GeomAlgoImpl/GEOMImpl_Fillet1d.cxx @@ -578,7 +578,7 @@ TopoDS_Edge GEOMImpl_Fillet1d::Result(const gp_Pnt& thePoint, aTargetPoint2d.SetCoord(aX, aY); // choose the nearest circle - Standard_Real aDistance, aP; + Standard_Real aDistance = Precision::Infinite(); GEOMImpl_Fillet1dPoint *aNearest; Standard_Integer a; TColStd_ListIteratorOfListOfReal anIter(myResultParams); @@ -589,7 +589,7 @@ TopoDS_Edge GEOMImpl_Fillet1d::Result(const gp_Pnt& thePoint, fillPoint(aPoint); if (!aPoint->HasSolution(myRadius)) continue; - aP = fabs(aPoint->GetCenter().Distance(aTargetPoint2d) - myRadius); + Standard_Real aP = fabs(aPoint->GetCenter().Distance(aTargetPoint2d) - myRadius); if (!aNearest || aP < aDistance) { aNearest = aPoint; @@ -715,7 +715,7 @@ Standard_Boolean GEOMImpl_Fillet1dPoint::ComputeDifference(GEOMImpl_Fillet1dPoin { Standard_Integer a; Standard_Boolean aDiffsSet = (myD.Length() != 0); - Standard_Real aDX = thePoint->GetParam() - myParam, aDY; + Standard_Real aDX = thePoint->GetParam() - myParam, aDY = 0.0; if (thePoint->myV.Length() == myV.Length()) { // absolutely the same points for(a = 1; a <= myV.Length(); a++) diff --git a/src/PartSet/PartSet_Module.cpp b/src/PartSet/PartSet_Module.cpp index 108db7563..30d34b993 100644 --- a/src/PartSet/PartSet_Module.cpp +++ b/src/PartSet/PartSet_Module.cpp @@ -1573,7 +1573,7 @@ void PartSet_Module::processEvent(const std::shared_ptr& theMess return; XGUI_Workshop* aWorkshop = getWorkshop(); bool needUpdate = false; - XGUI_DataTree* aTreeView; + XGUI_DataTree* aTreeView = 0; if (aWorkshop->objectBrowser()) { aTreeView = aWorkshop->objectBrowser()->treeView(); QLabel* aLabel = aWorkshop->objectBrowser()->activeDocLabel(); diff --git a/src/SketchPlugin/SketchPlugin_CurveFitting.cpp b/src/SketchPlugin/SketchPlugin_CurveFitting.cpp index f775679bd..5f9fb8a71 100644 --- a/src/SketchPlugin/SketchPlugin_CurveFitting.cpp +++ b/src/SketchPlugin/SketchPlugin_CurveFitting.cpp @@ -262,7 +262,7 @@ void SketchPlugin_CurveFitting::reorderPoints() // to keep mapping between points and attributes std::map > aMap; std::list > aPointsList = aPointsAttr->list(); - bool isPointAdded = aCoordinates.size() != aPointsList.size(); + std::list::iterator aCoordIt = aCoordinates.begin(); std::list >::iterator anAttrIt = aPointsList.begin(); for (; aCoordIt != aCoordinates.end() && anAttrIt != aPointsList.end(); ++aCoordIt, ++anAttrIt) diff --git a/src/SketchPlugin/doc/SketchPlugin.rst b/src/SketchPlugin/doc/SketchPlugin.rst index 00eb370da..d1c47eb22 100644 --- a/src/SketchPlugin/doc/SketchPlugin.rst +++ b/src/SketchPlugin/doc/SketchPlugin.rst @@ -93,6 +93,7 @@ The plug-in includes the following features for creation of 2D objects: ellipseFeature.rst arcEllipseFeature.rst bsplineFeature.rst + curveFittingFeature.rst .. _sketch_constraints: -- 2.39.2