From 9eedb17b70f02db2bbc3f96c68addddb4da489b6 Mon Sep 17 00:00:00 2001 From: wmayer Date: Wed, 6 Oct 2021 18:09:53 +0200 Subject: [PATCH] App: use consistent spelling of SubElement --- src/App/ComplexGeoData.cpp | 4 ++-- src/App/ComplexGeoData.h | 4 ++-- src/App/ComplexGeoDataPy.xml | 4 ++-- src/App/ComplexGeoDataPyImp.cpp | 8 ++++---- src/Gui/CommandView.cpp | 2 +- src/Mod/Mesh/App/Mesh.cpp | 2 +- src/Mod/Mesh/App/Mesh.h | 2 +- src/Mod/Mesh/App/MeshTestsApp.py | 4 ++-- src/Mod/Part/App/TopoShape.cpp | 4 ++-- src/Mod/Part/App/TopoShape.h | 4 ++-- src/Mod/Raytracing/App/PovTools.cpp | 2 +- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/App/ComplexGeoData.cpp b/src/App/ComplexGeoData.cpp index 658fc67110..da6890b96b 100644 --- a/src/App/ComplexGeoData.cpp +++ b/src/App/ComplexGeoData.cpp @@ -97,7 +97,7 @@ Base::Placement ComplexGeoData::getPlacement() const Base::Rotation(mat)); } -void ComplexGeoData::getLinesFromSubelement(const Segment*, +void ComplexGeoData::getLinesFromSubElement(const Segment*, std::vector &Points, std::vector &lines) const { @@ -105,7 +105,7 @@ void ComplexGeoData::getLinesFromSubelement(const Segment*, (void)lines; } -void ComplexGeoData::getFacesFromSubelement(const Segment*, +void ComplexGeoData::getFacesFromSubElement(const Segment*, std::vector &Points, std::vector &PointNormals, std::vector &faces) const diff --git a/src/App/ComplexGeoData.h b/src/App/ComplexGeoData.h index 6244096900..06bbf206bd 100644 --- a/src/App/ComplexGeoData.h +++ b/src/App/ComplexGeoData.h @@ -85,12 +85,12 @@ public: /// get subelement by combined name virtual Segment* getSubElementByName(const char* Name) const; /** Get lines from segment */ - virtual void getLinesFromSubelement( + virtual void getLinesFromSubElement( const Segment*, std::vector &Points, std::vector &lines) const; /** Get faces from segment */ - virtual void getFacesFromSubelement( + virtual void getFacesFromSubElement( const Segment*, std::vector &Points, std::vector &PointNormals, diff --git a/src/App/ComplexGeoDataPy.xml b/src/App/ComplexGeoDataPy.xml index c38e89532f..2202ccf8d8 100644 --- a/src/App/ComplexGeoDataPy.xml +++ b/src/App/ComplexGeoDataPy.xml @@ -24,12 +24,12 @@ Return the number of elements of a type - + Return vertexes and faces from a sub-element - + Return vertexes and lines from a sub-element diff --git a/src/App/ComplexGeoDataPyImp.cpp b/src/App/ComplexGeoDataPyImp.cpp index a493df7187..867d3969c1 100644 --- a/src/App/ComplexGeoDataPyImp.cpp +++ b/src/App/ComplexGeoDataPyImp.cpp @@ -75,7 +75,7 @@ PyObject* ComplexGeoDataPy::countSubElements(PyObject *args) } } -PyObject* ComplexGeoDataPy::getFacesFromSubelement(PyObject *args) +PyObject* ComplexGeoDataPy::getFacesFromSubElement(PyObject *args) { char *type; unsigned long index; @@ -87,7 +87,7 @@ PyObject* ComplexGeoDataPy::getFacesFromSubelement(PyObject *args) std::vector facets; try { std::unique_ptr segm(getComplexGeoDataPtr()->getSubElement(type, index)); - getComplexGeoDataPtr()->getFacesFromSubelement(segm.get(), points, normals, facets); + getComplexGeoDataPtr()->getFacesFromSubElement(segm.get(), points, normals, facets); } catch (...) { PyErr_SetString(PyExc_RuntimeError, "failed to get sub-element from object"); @@ -113,7 +113,7 @@ PyObject* ComplexGeoDataPy::getFacesFromSubelement(PyObject *args) return Py::new_reference_to(tuple); } -PyObject* ComplexGeoDataPy::getLinesFromSubelement(PyObject *args) +PyObject* ComplexGeoDataPy::getLinesFromSubElement(PyObject *args) { char *type; int index; @@ -124,7 +124,7 @@ PyObject* ComplexGeoDataPy::getLinesFromSubelement(PyObject *args) std::vector lines; try { std::unique_ptr segm(getComplexGeoDataPtr()->getSubElement(type, index)); - getComplexGeoDataPtr()->getLinesFromSubelement(segm.get(), points, lines); + getComplexGeoDataPtr()->getLinesFromSubElement(segm.get(), points, lines); } catch (...) { PyErr_SetString(PyExc_RuntimeError, "failed to get sub-element from object"); diff --git a/src/Gui/CommandView.cpp b/src/Gui/CommandView.cpp index e3a63ef978..8b725210fb 100644 --- a/src/Gui/CommandView.cpp +++ b/src/Gui/CommandView.cpp @@ -2824,7 +2824,7 @@ static std::vector getBoxSelection( continue; std::vector points; std::vector lines; - data->getLinesFromSubelement(segment.get(),points,lines); + data->getLinesFromSubElement(segment.get(),points,lines); if(lines.empty()) { if(points.empty()) continue; diff --git a/src/Mod/Mesh/App/Mesh.cpp b/src/Mod/Mesh/App/Mesh.cpp index f0427d8acd..e045a221cc 100644 --- a/src/Mod/Mesh/App/Mesh.cpp +++ b/src/Mod/Mesh/App/Mesh.cpp @@ -129,7 +129,7 @@ Data::Segment* MeshObject::getSubElement(const char* Type, unsigned long n) cons return nullptr; } -void MeshObject::getFacesFromSubelement(const Data::Segment* element, +void MeshObject::getFacesFromSubElement(const Data::Segment* element, std::vector &points, std::vector &/*pointNormals*/, std::vector &faces) const diff --git a/src/Mod/Mesh/App/Mesh.h b/src/Mod/Mesh/App/Mesh.h index f6bfe262e3..b2fa4c1fda 100644 --- a/src/Mod/Mesh/App/Mesh.h +++ b/src/Mod/Mesh/App/Mesh.h @@ -112,7 +112,7 @@ public: /// get the subelement by type and number virtual Data::Segment* getSubElement(const char* Type, unsigned long) const; /** Get faces from segment */ - virtual void getFacesFromSubelement( + virtual void getFacesFromSubElement( const Data::Segment*, std::vector &Points, std::vector &PointNormals, diff --git a/src/Mod/Mesh/App/MeshTestsApp.py b/src/Mod/Mesh/App/MeshTestsApp.py index cdad28c8e1..29093823c8 100644 --- a/src/Mod/Mesh/App/MeshTestsApp.py +++ b/src/Mod/Mesh/App/MeshTestsApp.py @@ -383,7 +383,7 @@ class MeshSubElement(unittest.TestCase): self.assertEqual(self.mesh.countSubElements("Segment"), 0) def testFacesFromSubElement(self): - element = self.mesh.getFacesFromSubelement("Mesh", 0) + element = self.mesh.getFacesFromSubElement("Mesh", 0) self.assertIsInstance(element, tuple) self.assertEqual(len(element), 2) self.assertEqual(len(element[0]), 8) @@ -393,7 +393,7 @@ class MeshSubElement(unittest.TestCase): self.mesh.addSegment([0, 2, 4, 6, 8]) self.assertEqual(self.mesh.countSegments(), 1) self.assertEqual(self.mesh.countSubElements("Segment"), 1) - element = self.mesh.getFacesFromSubelement("Segment", 0) + element = self.mesh.getFacesFromSubElement("Segment", 0) self.assertIsInstance(element, tuple) self.assertEqual(len(element), 2) self.assertEqual(len(element[0]), 7) diff --git a/src/Mod/Part/App/TopoShape.cpp b/src/Mod/Part/App/TopoShape.cpp index 60183e64ca..614661594d 100644 --- a/src/Mod/Part/App/TopoShape.cpp +++ b/src/Mod/Part/App/TopoShape.cpp @@ -3845,7 +3845,7 @@ void TopoShape::getPoints(std::vector &Points, Normals.clear(); } -void TopoShape::getLinesFromSubelement(const Data::Segment* element, +void TopoShape::getLinesFromSubElement(const Data::Segment* element, std::vector &vertices, std::vector &lines) const { @@ -3940,7 +3940,7 @@ void TopoShape::getLinesFromSubelement(const Data::Segment* element, } } -void TopoShape::getFacesFromSubelement(const Data::Segment* element, +void TopoShape::getFacesFromSubElement(const Data::Segment* element, std::vector &points, std::vector &pointNormals, std::vector &faces) const diff --git a/src/Mod/Part/App/TopoShape.h b/src/Mod/Part/App/TopoShape.h index f720dae87d..9d50ec0da6 100644 --- a/src/Mod/Part/App/TopoShape.h +++ b/src/Mod/Part/App/TopoShape.h @@ -135,12 +135,12 @@ public: /// get the subelement by type and number virtual Data::Segment* getSubElement(const char* Type, unsigned long) const; /** Get lines from segment */ - virtual void getLinesFromSubelement( + virtual void getLinesFromSubElement( const Data::Segment*, std::vector &Points, std::vector &lines) const; /** Get faces from segment */ - virtual void getFacesFromSubelement( + virtual void getFacesFromSubElement( const Data::Segment*, std::vector &Points, std::vector &PointNormals, diff --git a/src/Mod/Raytracing/App/PovTools.cpp b/src/Mod/Raytracing/App/PovTools.cpp index 1402a68530..e2d7c1f4d7 100644 --- a/src/Mod/Raytracing/App/PovTools.cpp +++ b/src/Mod/Raytracing/App/PovTools.cpp @@ -158,7 +158,7 @@ void PovTools::writeData(const char *FileName, const char *PartName, std::vector normals; std::vector facets; Data::Segment* segm = data->getSubElement("Face", i); - data->getFacesFromSubelement(segm, points, normals, facets); + data->getFacesFromSubElement(segm, points, normals, facets); delete segm; // writing per face header