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

Mesh: remove py2 code

Browse Source
This commit is contained in:
luz paz
2021-04-23 16:32:11 -04:00
committed by wwmayer
parent 1e795e869c
commit 086063f75e
3 changed files with 0 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Mod/Mesh/App/AppMeshPy.cpp
View File

@@ -226,11 +226,7 @@ private:
"exportAmfCompressed", NULL};
if (!PyArg_ParseTupleAndKeywords( args.ptr(), keywds.ptr(),
#if PY_MAJOR_VERSION >= 3
"Oet|dp",
#else
"Oet|di",
#endif // Python version switch
kwList, &objects, "utf-8", &fileNamePy,
&fTolerance, &exportAmfCompressed )) {
throw Py::Exception();

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

@@ -1597,11 +1597,7 @@ MeshObject* MeshObject::createSphere(float radius, int sampling)
Py::Callable call(dict.getItem("Sphere"));
Py::Tuple args(2);
args.setItem(0, Py::Float(radius));
#if PY_MAJOR_VERSION >= 3
args.setItem(1, Py::Long(sampling));
#else
args.setItem(1, Py::Int(sampling));
#endif
Py::List list(call.apply(args));
return createMeshFromList(list);
}
@@ -1625,11 +1621,7 @@ MeshObject* MeshObject::createEllipsoid(float radius1, float radius2, int sampli
Py::Tuple args(3);
args.setItem(0, Py::Float(radius1));
args.setItem(1, Py::Float(radius2));
#if PY_MAJOR_VERSION >= 3
args.setItem(2, Py::Long(sampling));
#else
args.setItem(2, Py::Int(sampling));
#endif
Py::List list(call.apply(args));
return createMeshFromList(list);
}
@@ -1653,15 +1645,9 @@ MeshObject* MeshObject::createCylinder(float radius, float length, int closed, f
Py::Tuple args(5);
args.setItem(0, Py::Float(radius));
args.setItem(1, Py::Float(length));
#if PY_MAJOR_VERSION >= 3
args.setItem(2, Py::Long(closed));
args.setItem(3, Py::Float(edgelen));
args.setItem(4, Py::Long(sampling));
#else
args.setItem(2, Py::Int(closed));
args.setItem(3, Py::Float(edgelen));
args.setItem(4, Py::Int(sampling));
#endif
Py::List list(call.apply(args));
return createMeshFromList(list);
}
@@ -1686,15 +1672,9 @@ MeshObject* MeshObject::createCone(float radius1, float radius2, float len, int
args.setItem(0, Py::Float(radius1));
args.setItem(1, Py::Float(radius2));
args.setItem(2, Py::Float(len));
#if PY_MAJOR_VERSION >= 3
args.setItem(3, Py::Long(closed));
args.setItem(4, Py::Float(edgelen));
args.setItem(5, Py::Long(sampling));
#else
args.setItem(3, Py::Int(closed));
args.setItem(4, Py::Float(edgelen));
args.setItem(5, Py::Int(sampling));
#endif
Py::List list(call.apply(args));
return createMeshFromList(list);
}
@@ -1718,11 +1698,7 @@ MeshObject* MeshObject::createTorus(float radius1, float radius2, int sampling)
Py::Tuple args(3);
args.setItem(0, Py::Float(radius1));
args.setItem(1, Py::Float(radius2));
#if PY_MAJOR_VERSION >= 3
args.setItem(2, Py::Long(sampling));
#else
args.setItem(2, Py::Int(sampling));
#endif
Py::List list(call.apply(args));
return createMeshFromList(list);
}

72
src/Mod/Mesh/App/MeshPyImp.cpp
View File

@@ -88,17 +88,7 @@ int MeshPy::PyInit(PyObject* args, PyObject*)
if (!ok) return -1;
}
else if (PyUnicode_Check(pcObj)) {
#if PY_MAJOR_VERSION >= 3
getMeshObjectPtr()->load(PyUnicode_AsUTF8(pcObj));
#else
PyObject* unicode = PyUnicode_AsEncodedString(pcObj, "utf-8", 0);
char* pItem = PyString_AsString(unicode);
Py_DECREF(unicode);
getMeshObjectPtr()->load(pItem);
}
else if (PyString_Check(pcObj)) {
getMeshObjectPtr()->load(PyString_AsString(pcObj));
#endif
}
else {
PyErr_Format(PyExc_TypeError, "Cannot create a mesh out of a '%s'",
@@ -723,15 +713,9 @@ PyObject* MeshPy::addFacets(PyObject *args)
for (Py::List::iterator it = list_f.begin(); it != list_f.end(); ++it) {
Py::Tuple f(*it);
MeshCore::MeshFacet face;
#if PY_MAJOR_VERSION >= 3
face._aulPoints[0] = (long)Py::Long(f.getItem(0));
face._aulPoints[1] = (long)Py::Long(f.getItem(1));
face._aulPoints[2] = (long)Py::Long(f.getItem(2));
#else
face._aulPoints[0] = (long)Py::Int(f.getItem(0));
face._aulPoints[1] = (long)Py::Int(f.getItem(1));
face._aulPoints[2] = (long)Py::Int(f.getItem(2));
#endif
faces.push_back(face);
}
@@ -755,11 +739,7 @@ PyObject* MeshPy::removeFacets(PyObject *args)
std::vector<unsigned long> indices;
Py::Sequence ary(list);
for (Py::Sequence::iterator it = ary.begin(); it != ary.end(); ++it) {
#if PY_MAJOR_VERSION >= 3
Py::Long f(*it);
#else
Py::Int f(*it);
#endif
indices.push_back((long)f);
}
@@ -863,11 +843,7 @@ PyObject* MeshPy::getSegment(PyObject *args)
Py::List ary;
const std::vector<unsigned long>& segm = getMeshObjectPtr()->getSegment(index).getIndices();
for (std::vector<unsigned long>::const_iterator it = segm.begin(); it != segm.end(); ++it) {
#if PY_MAJOR_VERSION >= 3
ary.append(Py::Long((int)*it));
#else
ary.append(Py::Int((int)*it));
#endif
}
return Py::new_reference_to(ary);
@@ -897,11 +873,7 @@ PyObject* MeshPy::getFacetSelection(PyObject *args)
std::vector<unsigned long> facets;
getMeshObjectPtr()->getFacetsFromSelection(facets);
for (std::vector<unsigned long>::const_iterator it = facets.begin(); it != facets.end(); ++it) {
#if PY_MAJOR_VERSION >= 3
ary.append(Py::Long((int)*it));
#else
ary.append(Py::Int((int)*it));
#endif
}
return Py::new_reference_to(ary);
@@ -916,11 +888,7 @@ PyObject* MeshPy::getPointSelection(PyObject *args)
std::vector<unsigned long> points;
getMeshObjectPtr()->getPointsFromSelection(points);
for (std::vector<unsigned long>::const_iterator it = points.begin(); it != points.end(); ++it) {
#if PY_MAJOR_VERSION >= 3
ary.append(Py::Long((int)*it));
#else
ary.append(Py::Int((int)*it));
#endif
}
return Py::new_reference_to(ary);
@@ -935,11 +903,7 @@ PyObject* MeshPy::meshFromSegment(PyObject *args)
std::vector<unsigned long> segment;
Py::Sequence ary(list);
for (Py::Sequence::iterator it = ary.begin(); it != ary.end(); ++it) {
#if PY_MAJOR_VERSION >= 3
Py::Long f(*it);
#else
Py::Int f(*it);
#endif
segment.push_back((long)f);
}
@@ -1588,15 +1552,9 @@ PyObject* MeshPy::collapseFacets(PyObject *args)
Py::Sequence list(pcObj);
std::vector<unsigned long> facets;
for (Py::Sequence::iterator it = list.begin(); it != list.end(); ++it) {
#if PY_MAJOR_VERSION >= 3
Py::Long idx(*it);
unsigned long iIdx = static_cast<unsigned long>(idx);
facets.push_back(iIdx);
#else
Py::Int idx(*it);
unsigned long iIdx = static_cast<unsigned long>(idx);
facets.push_back(iIdx);
#endif
}
getMeshObjectPtr()->collapseFacets(facets);
@@ -1636,11 +1594,7 @@ PyObject* MeshPy::foraminate(PyObject *args)
tuple.setItem(0, Py::Float(res.x));
tuple.setItem(1, Py::Float(res.y));
tuple.setItem(2, Py::Float(res.z));
#if PY_MAJOR_VERSION >= 3
dict.setItem(Py::Long(index), tuple);
#else
dict.setItem(Py::Int(index), tuple);
#endif
}
}
@@ -1818,11 +1772,7 @@ PyObject* MeshPy::nearestFacetOnRay(PyObject *args)
tuple.setItem(0, Py::Float(res.x));
tuple.setItem(1, Py::Float(res.y));
tuple.setItem(2, Py::Float(res.z));
#if PY_MAJOR_VERSION >= 3
dict.setItem(Py::Long((int)index), tuple);
#else
dict.setItem(Py::Int((int)index), tuple);
#endif
}
#if 0 // for testing only
@@ -1867,11 +1817,7 @@ PyObject* MeshPy::getPlanarSegments(PyObject *args)
const std::vector<unsigned long>& segm = it->getIndices();
Py::List ary;
for (std::vector<unsigned long>::const_iterator jt = segm.begin(); jt != segm.end(); ++jt) {
#if PY_MAJOR_VERSION >= 3
ary.append(Py::Long((int)*jt));
#else
ary.append(Py::Int((int)*jt));
#endif
}
s.append(ary);
}
@@ -1911,11 +1857,7 @@ PyObject* MeshPy::getSegmentsOfType(PyObject *args)
const std::vector<unsigned long>& segm = it->getIndices();
Py::List ary;
for (std::vector<unsigned long>::const_iterator jt = segm.begin(); jt != segm.end(); ++jt) {
#if PY_MAJOR_VERSION >= 3
ary.append(Py::Long((int)*jt));
#else
ary.append(Py::Int((int)*jt));
#endif
}
s.append(ary);
}
@@ -1942,11 +1884,7 @@ PyObject* MeshPy::getSegmentsByCurvature(PyObject *args)
float c2 = (float)Py::Float(t[1]);
float tol1 = (float)Py::Float(t[2]);
float tol2 = (float)Py::Float(t[3]);
#if PY_MAJOR_VERSION >= 3
int num = (int)Py::Long(t[4]);
#else
int num = (int)Py::Int(t[4]);
#endif
segm.emplace_back(std::make_shared<MeshCore::MeshCurvatureFreeformSegment>(meshCurv.GetCurvature(), num, tol1, tol2, c1, c2));
}
@@ -1958,11 +1896,7 @@ PyObject* MeshPy::getSegmentsByCurvature(PyObject *args)
for (std::vector<MeshCore::MeshSegment>::const_iterator it = data.begin(); it != data.end(); ++it) {
Py::List ary;
for (MeshCore::MeshSegment::const_iterator jt = it->begin(); jt != it->end(); ++jt) {
#if PY_MAJOR_VERSION >= 3
ary.append(Py::Long((int)*jt));
#else
ary.append(Py::Int((int)*jt));
#endif
}
list.append(ary);
}
@@ -2074,15 +2008,9 @@ Py::Tuple MeshPy::getTopology(void) const
for (std::vector<Data::ComplexGeoData::Facet>::const_iterator
it = Facets.begin(); it != Facets.end(); ++it) {
Py::Tuple f(3);
#if PY_MAJOR_VERSION >= 3
f.setItem(0,Py::Long((int)it->I1));
f.setItem(1,Py::Long((int)it->I2));
f.setItem(2,Py::Long((int)it->I3));
#else
f.setItem(0,Py::Int((int)it->I1));
f.setItem(1,Py::Int((int)it->I2));
f.setItem(2,Py::Int((int)it->I3));
#endif
facet.append(f);
}
tuple.setItem(1, facet);