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

py3: FEM, PyMods, preprocessor conditions, Py::Long vs Py::Int

Browse Source
This commit is contained in:
looooo
2017-02-18 20:58:58 +01:00
committed by wmayer
parent 3fab41f567
commit 5c0bcf611f
6 changed files with 135 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Mod/Fem/App/HypothesisPy.cpp
View File

@@ -928,7 +928,11 @@ StdMeshers_NumberOfSegmentsPy::~StdMeshers_NumberOfSegmentsPy()
Py::Object StdMeshers_NumberOfSegmentsPy::setNumSegm(const Py::Tuple& args)
{
#if PY_MAJOR_VERSION >= 3
hypothesis<StdMeshers_NumberOfSegments>()->SetNumberOfSegments((int)Py::Long(args[0]));
#else
hypothesis<StdMeshers_NumberOfSegments>()->SetNumberOfSegments((int)Py::Int(args[0]));
#endif
return Py::None();
}
@@ -936,7 +940,7 @@ Py::Object StdMeshers_NumberOfSegmentsPy::getNumSegm(const Py::Tuple& args)
{
if (!PyArg_ParseTuple(args.ptr(), ""))
throw Py::Exception();
return Py::Int(hypothesis<StdMeshers_NumberOfSegments>()->GetNumberOfSegments());
return Py::Long(hypothesis<StdMeshers_NumberOfSegments>()->GetNumberOfSegments());
}
// ----------------------------------------------------------------------------
@@ -961,7 +965,11 @@ StdMeshers_NumberOfLayersPy::~StdMeshers_NumberOfLayersPy()
Py::Object StdMeshers_NumberOfLayersPy::setNumLayers(const Py::Tuple& args)
{
#if PY_MAJOR_VERSION >= 3
hypothesis<StdMeshers_NumberOfLayers>()->SetNumberOfLayers((int)Py::Long(args[0]));
#else
hypothesis<StdMeshers_NumberOfLayers>()->SetNumberOfLayers((int)Py::Int(args[0]));
#endif
return Py::None();
}
@@ -969,7 +977,7 @@ Py::Object StdMeshers_NumberOfLayersPy::getNumLayers(const Py::Tuple& args)
{
if (!PyArg_ParseTuple(args.ptr(), ""))
throw Py::Exception();
return Py::Int(hypothesis<StdMeshers_NumberOfLayers>()->GetNumberOfLayers());
return Py::Long(hypothesis<StdMeshers_NumberOfLayers>()->GetNumberOfLayers());
}
// ----------------------------------------------------------------------------
@@ -1045,7 +1053,11 @@ StdMeshers_LengthFromEdgesPy::~StdMeshers_LengthFromEdgesPy()
Py::Object StdMeshers_LengthFromEdgesPy::setMode(const Py::Tuple& args)
{
#if PY_MAJOR_VERSION >= 3
hypothesis<StdMeshers_LengthFromEdges>()->SetMode((int)Py::Long(args[0]));
#else
hypothesis<StdMeshers_LengthFromEdges>()->SetMode((int)Py::Int(args[0]));
#endif
return Py::None();
}
@@ -1053,7 +1065,7 @@ Py::Object StdMeshers_LengthFromEdgesPy::getMode(const Py::Tuple& args)
{
if (!PyArg_ParseTuple(args.ptr(), ""))
throw Py::Exception();
return Py::Int(hypothesis<StdMeshers_LengthFromEdges>()->GetMode());
return Py::Long(hypothesis<StdMeshers_LengthFromEdges>()->GetMode());
}
// ----------------------------------------------------------------------------