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

App: use consistent spelling of SubElement

Browse Source
This commit is contained in:
wmayer
2021-10-06 18:09:53 +02:00
parent 766e9cffb1
commit 9eedb17b70
11 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/App/ComplexGeoData.cpp
View File

@@ -97,7 +97,7 @@ Base::Placement ComplexGeoData::getPlacement() const
Base::Rotation(mat));
}
void ComplexGeoData::getLinesFromSubelement(const Segment*,
void ComplexGeoData::getLinesFromSubElement(const Segment*,
std::vector<Base::Vector3d> &Points,
std::vector<Line> &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<Base::Vector3d> &Points,
std::vector<Base::Vector3d> &PointNormals,
std::vector<Facet> &faces) const

4
src/App/ComplexGeoData.h
View File

@@ -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<Base::Vector3d> &Points,
std::vector<Line> &lines) const;
/** Get faces from segment */
virtual void getFacesFromSubelement(
virtual void getFacesFromSubElement(
const Segment*,
std::vector<Base::Vector3d> &Points,
std::vector<Base::Vector3d> &PointNormals,

4
src/App/ComplexGeoDataPy.xml
View File

@@ -24,12 +24,12 @@
<UserDocu>Return the number of elements of a type</UserDocu>
</Documentation>
</Methode>
<Methode Name="getFacesFromSubelement" Const="true">
<Methode Name="getFacesFromSubElement" Const="true">
<Documentation>
<UserDocu>Return vertexes and faces from a sub-element</UserDocu>
</Documentation>
</Methode>
<Methode Name="getLinesFromSubelement" Const="true">
<Methode Name="getLinesFromSubElement" Const="true">
<Documentation>
<UserDocu>Return vertexes and lines from a sub-element</UserDocu>
</Documentation>

8
src/App/ComplexGeoDataPyImp.cpp
View File

@@ -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<Data::ComplexGeoData::Facet> facets;
try {
std::unique_ptr<Data::Segment> 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<Data::ComplexGeoData::Line> lines;
try {
std::unique_ptr<Data::Segment> 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");

2
src/Gui/CommandView.cpp
View File

@@ -2824,7 +2824,7 @@ static std::vector<std::string> getBoxSelection(
continue;
std::vector<Base::Vector3d> points;
std::vector<Data::ComplexGeoData::Line> lines;
data->getLinesFromSubelement(segment.get(),points,lines);
data->getLinesFromSubElement(segment.get(),points,lines);
if(lines.empty()) {
if(points.empty())
continue;

2
src/Mod/Mesh/App/Mesh.cpp
View File

@@ -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<Base::Vector3d> &points,
std::vector<Base::Vector3d> &/*pointNormals*/,
std::vector<Facet> &faces) const

2
src/Mod/Mesh/App/Mesh.h
View File

@@ -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<Base::Vector3d> &Points,
std::vector<Base::Vector3d> &PointNormals,

4
src/Mod/Mesh/App/MeshTestsApp.py
View File

@@ -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)

4
src/Mod/Part/App/TopoShape.cpp
View File

@@ -3845,7 +3845,7 @@ void TopoShape::getPoints(std::vector<Base::Vector3d> &Points,
Normals.clear();
}
void TopoShape::getLinesFromSubelement(const Data::Segment* element,
void TopoShape::getLinesFromSubElement(const Data::Segment* element,
std::vector<Base::Vector3d> &vertices,
std::vector<Line> &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<Base::Vector3d> &points,
std::vector<Base::Vector3d> &pointNormals,
std::vector<Facet> &faces) const

4
src/Mod/Part/App/TopoShape.h
View File

@@ -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<Base::Vector3d> &Points,
std::vector<Line> &lines) const;
/** Get faces from segment */
virtual void getFacesFromSubelement(
virtual void getFacesFromSubElement(
const Data::Segment*,
std::vector<Base::Vector3d> &Points,
std::vector<Base::Vector3d> &PointNormals,

2
src/Mod/Raytracing/App/PovTools.cpp
View File

@@ -158,7 +158,7 @@ void PovTools::writeData(const char *FileName, const char *PartName,
std::vector<Base::Vector3d> normals;
std::vector<Data::ComplexGeoData::Facet> 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