Fixed incorrect argument checking.
This commit is contained in:
@@ -108,12 +108,12 @@ int ViewMapGradientNormBP1D___init__( BPy_ViewMapGradientNormBP1D* self, PyObjec
|
||||
PyObject *obj;
|
||||
float f = 2.0;
|
||||
|
||||
if(!( PyArg_ParseTuple(args, "i|Of", &i, &obj) )) {
|
||||
if(!( PyArg_ParseTuple(args, "i|O!f", &i, &IntegrationType_Type, &obj, &f) )) {
|
||||
cout << "ERROR: ViewMapGradientNormBP1D___init__" << endl;
|
||||
return -1;
|
||||
}
|
||||
|
||||
IntegrationType t = ( obj && BPy_IntegrationType_Check(obj) ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
|
||||
IntegrationType t = ( obj ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
|
||||
self->py_bp1D.bp1D = new Predicates1D::ViewMapGradientNormBP1D(i,t,f);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -217,7 +217,7 @@ PyObject * UnaryFunction0DDouble___call__( BPy_UnaryFunction0DDouble *self, PyOb
|
||||
{
|
||||
PyObject *obj;
|
||||
|
||||
if( !PyArg_ParseTuple(args, "O", &obj) && BPy_Interface0DIterator_Check(obj) ) {
|
||||
if(!PyArg_ParseTuple(args, "O!", &Interface0DIterator_Type, &obj)) {
|
||||
cout << "ERROR: UnaryFunction0DDouble___call__ " << endl;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@@ -160,7 +160,7 @@ PyObject * UnaryFunction0DEdgeNature___call__( BPy_UnaryFunction0DEdgeNature *se
|
||||
{
|
||||
PyObject *obj;
|
||||
|
||||
if( !PyArg_ParseTuple(args, "O", &obj) && BPy_Interface0DIterator_Check(obj) ) {
|
||||
if(!PyArg_ParseTuple(args, "O!", &Interface0DIterator_Type, &obj)) {
|
||||
cout << "ERROR: UnaryFunction0DEdgeNature___call__ " << endl;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@@ -189,7 +189,7 @@ PyObject * UnaryFunction0DFloat___call__( BPy_UnaryFunction0DFloat *self, PyObje
|
||||
{
|
||||
PyObject *obj;
|
||||
|
||||
if( !PyArg_ParseTuple(args, "O", &obj) && BPy_Interface0DIterator_Check(obj) ) {
|
||||
if(!PyArg_ParseTuple(args, "O!", &Interface0DIterator_Type, &obj)) {
|
||||
cout << "ERROR: UnaryFunction0DFloat___call__ " << endl;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@@ -160,7 +160,7 @@ PyObject * UnaryFunction0DId___call__( BPy_UnaryFunction0DId *self, PyObject *ar
|
||||
{
|
||||
PyObject *obj;
|
||||
|
||||
if( !PyArg_ParseTuple(args, "O", &obj) && BPy_Interface0DIterator_Check(obj) ) {
|
||||
if(!PyArg_ParseTuple(args, "O!", &Interface0DIterator_Type, &obj)) {
|
||||
cout << "ERROR: UnaryFunction0DId___call__ " << endl;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@@ -160,7 +160,7 @@ PyObject * UnaryFunction0DMaterial___call__( BPy_UnaryFunction0DMaterial *self,
|
||||
{
|
||||
PyObject *obj;
|
||||
|
||||
if( !PyArg_ParseTuple(args, "O", &obj) && BPy_Interface0DIterator_Check(obj) ) {
|
||||
if(!PyArg_ParseTuple(args, "O!", &Interface0DIterator_Type, &obj)) {
|
||||
cout << "ERROR: UnaryFunction0DMaterial___call__ " << endl;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@@ -160,7 +160,7 @@ PyObject * UnaryFunction0DUnsigned___call__( BPy_UnaryFunction0DUnsigned *self,
|
||||
{
|
||||
PyObject *obj;
|
||||
|
||||
if( !PyArg_ParseTuple(args, "O", &obj) && BPy_Interface0DIterator_Check(obj) ) {
|
||||
if(!PyArg_ParseTuple(args, "O!", &Interface0DIterator_Type, &obj)) {
|
||||
cout << "ERROR: UnaryFunction0DUnsigned___call__ " << endl;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@@ -165,8 +165,7 @@ PyObject * UnaryFunction0DVec2f_getName( BPy_UnaryFunction0DVec2f *self )
|
||||
PyObject * UnaryFunction0DVec2f___call__( BPy_UnaryFunction0DVec2f *self, PyObject *args)
|
||||
{
|
||||
PyObject *obj;
|
||||
|
||||
if( !PyArg_ParseTuple(args, "O", &obj) && BPy_Interface0DIterator_Check(obj) ) {
|
||||
if(!PyArg_ParseTuple(args, "O!", &Interface0DIterator_Type, &obj)) {
|
||||
cout << "ERROR: UnaryFunction0DVec2f___call__ " << endl;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@@ -160,7 +160,7 @@ PyObject * UnaryFunction0DVec3f___call__( BPy_UnaryFunction0DVec3f *self, PyObje
|
||||
{
|
||||
PyObject *obj;
|
||||
|
||||
if( !PyArg_ParseTuple(args, "O", &obj) && BPy_Interface0DIterator_Check(obj) ) {
|
||||
if(!PyArg_ParseTuple(args, "O!", &Interface0DIterator_Type, &obj)) {
|
||||
cout << "ERROR: UnaryFunction0DVec3f___call__ " << endl;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@@ -160,7 +160,7 @@ PyObject * UnaryFunction0DVectorViewShape___call__( BPy_UnaryFunction0DVectorVie
|
||||
{
|
||||
PyObject *obj;
|
||||
|
||||
if( !PyArg_ParseTuple(args, "O", &obj) && BPy_Interface0DIterator_Check(obj) ) {
|
||||
if(!PyArg_ParseTuple(args, "O!", &Interface0DIterator_Type, &obj)) {
|
||||
cout << "ERROR: UnaryFunction0DVectorViewShape___call__ " << endl;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@@ -166,7 +166,7 @@ PyObject * UnaryFunction0DViewShape___call__( BPy_UnaryFunction0DViewShape *self
|
||||
{
|
||||
PyObject *obj;
|
||||
|
||||
if( !PyArg_ParseTuple(args, "O", &obj) && BPy_Interface0DIterator_Check(obj) ) {
|
||||
if(!PyArg_ParseTuple(args, "O!", &Interface0DIterator_Type, &obj)) {
|
||||
cout << "ERROR: UnaryFunction0DViewShape___call__ " << endl;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@@ -220,7 +220,7 @@ int UnaryFunction1DDouble___init__(BPy_UnaryFunction1DDouble* self, PyObject *ar
|
||||
{
|
||||
PyObject *obj;
|
||||
|
||||
if( !PyArg_ParseTuple(args, "|O", &obj) && BPy_IntegrationType_Check(obj) ) {
|
||||
if( !PyArg_ParseTuple(args, "|O!", &IntegrationType_Type, &obj) ) {
|
||||
cout << "ERROR: UnaryFunction1DDouble___init__ " << endl;
|
||||
return -1;
|
||||
}
|
||||
@@ -257,7 +257,7 @@ PyObject * UnaryFunction1DDouble___call__( BPy_UnaryFunction1DDouble *self, PyOb
|
||||
{
|
||||
PyObject *obj;
|
||||
|
||||
if( !PyArg_ParseTuple(args, "O", &obj) && BPy_Interface1D_Check(obj) ) {
|
||||
if( !PyArg_ParseTuple(args, "O!", &Interface1D_Type, &obj) ) {
|
||||
cout << "ERROR: UnaryFunction1DDouble___call__ " << endl;
|
||||
return NULL;
|
||||
}
|
||||
@@ -271,7 +271,7 @@ PyObject * UnaryFunction1DDouble_setIntegrationType(BPy_UnaryFunction1DDouble* s
|
||||
{
|
||||
PyObject *obj;
|
||||
|
||||
if( !PyArg_ParseTuple(args, "O", &obj) && BPy_IntegrationType_Check(obj) ) {
|
||||
if( !PyArg_ParseTuple(args, "O!", &IntegrationType_Type, &obj) ) {
|
||||
cout << "ERROR: UnaryFunction1DDouble_setIntegrationType " << endl;
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
|
||||
@@ -141,7 +141,7 @@ int UnaryFunction1DEdgeNature___init__(BPy_UnaryFunction1DEdgeNature* self, PyOb
|
||||
{
|
||||
PyObject *obj;
|
||||
|
||||
if( !PyArg_ParseTuple(args, "|O", &obj) && BPy_IntegrationType_Check(obj) ) {
|
||||
if( !PyArg_ParseTuple(args, "|O!", &IntegrationType_Type, &obj) ) {
|
||||
cout << "ERROR: UnaryFunction1DEdgeNature___init__ " << endl;
|
||||
return -1;
|
||||
}
|
||||
@@ -177,7 +177,7 @@ PyObject * UnaryFunction1DEdgeNature___call__( BPy_UnaryFunction1DEdgeNature *se
|
||||
{
|
||||
PyObject *obj;
|
||||
|
||||
if( !PyArg_ParseTuple(args, "O", &obj) && BPy_Interface1D_Check(obj) ) {
|
||||
if( !PyArg_ParseTuple(args, "O!", &Interface1D_Type, &obj) ) {
|
||||
cout << "ERROR: UnaryFunction1DEdgeNature___call__ " << endl;
|
||||
return NULL;
|
||||
}
|
||||
@@ -191,7 +191,7 @@ PyObject * UnaryFunction1DEdgeNature_setIntegrationType(BPy_UnaryFunction1DEdgeN
|
||||
{
|
||||
PyObject *obj;
|
||||
|
||||
if( !PyArg_ParseTuple(args, "O", &obj) && BPy_IntegrationType_Check(obj) ) {
|
||||
if( !PyArg_ParseTuple(args, "O!", &IntegrationType_Type, &obj) ) {
|
||||
cout << "ERROR: UnaryFunction1DEdgeNature_setIntegrationType " << endl;
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
|
||||
@@ -134,7 +134,7 @@ int UnaryFunction1DFloat___init__(BPy_UnaryFunction1DFloat* self, PyObject *args
|
||||
{
|
||||
PyObject *obj;
|
||||
|
||||
if( !PyArg_ParseTuple(args, "|O", &obj) && BPy_IntegrationType_Check(obj) ) {
|
||||
if( !PyArg_ParseTuple(args, "|O!", &IntegrationType_Type, &obj) ) {
|
||||
cout << "ERROR: UnaryFunction1DFloat___init__ " << endl;
|
||||
return -1;
|
||||
}
|
||||
@@ -170,7 +170,7 @@ PyObject * UnaryFunction1DFloat___call__( BPy_UnaryFunction1DFloat *self, PyObje
|
||||
{
|
||||
PyObject *obj;
|
||||
|
||||
if( !PyArg_ParseTuple(args, "O", &obj) && BPy_Interface1D_Check(obj) ) {
|
||||
if( !PyArg_ParseTuple(args, "O!", &Interface1D_Type, &obj) ) {
|
||||
cout << "ERROR: UnaryFunction1DFloat___call__ " << endl;
|
||||
return NULL;
|
||||
}
|
||||
@@ -184,7 +184,7 @@ PyObject * UnaryFunction1DFloat_setIntegrationType(BPy_UnaryFunction1DFloat* sel
|
||||
{
|
||||
PyObject *obj;
|
||||
|
||||
if( !PyArg_ParseTuple(args, "O", &obj) && BPy_IntegrationType_Check(obj) ) {
|
||||
if( !PyArg_ParseTuple(args, "O!", &IntegrationType_Type, &obj) ) {
|
||||
cout << "ERROR: UnaryFunction1DFloat_setIntegrationType " << endl;
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
|
||||
@@ -141,7 +141,7 @@ int UnaryFunction1DUnsigned___init__(BPy_UnaryFunction1DUnsigned* self, PyObject
|
||||
{
|
||||
PyObject *obj;
|
||||
|
||||
if( !PyArg_ParseTuple(args, "|O", &obj) && BPy_IntegrationType_Check(obj) ) {
|
||||
if( !PyArg_ParseTuple(args, "|O!", &IntegrationType_Type, &obj) ) {
|
||||
cout << "ERROR: UnaryFunction1DUnsigned___init__ " << endl;
|
||||
return -1;
|
||||
}
|
||||
@@ -177,7 +177,7 @@ PyObject * UnaryFunction1DUnsigned___call__( BPy_UnaryFunction1DUnsigned *self,
|
||||
{
|
||||
PyObject *obj;
|
||||
|
||||
if( !PyArg_ParseTuple(args, "O", &obj) && BPy_Interface1D_Check(obj) ) {
|
||||
if( !PyArg_ParseTuple(args, "O!", &Interface1D_Type, &obj) ) {
|
||||
cout << "ERROR: UnaryFunction1DUnsigned___call__ " << endl;
|
||||
return NULL;
|
||||
}
|
||||
@@ -191,7 +191,7 @@ PyObject * UnaryFunction1DUnsigned_setIntegrationType(BPy_UnaryFunction1DUnsigne
|
||||
{
|
||||
PyObject *obj;
|
||||
|
||||
if( !PyArg_ParseTuple(args, "O", &obj) && BPy_IntegrationType_Check(obj) ) {
|
||||
if( !PyArg_ParseTuple(args, "O!", &IntegrationType_Type, &obj) ) {
|
||||
cout << "ERROR: UnaryFunction1DUnsigned_setIntegrationType " << endl;
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
|
||||
@@ -147,7 +147,7 @@ int UnaryFunction1DVec2f___init__(BPy_UnaryFunction1DVec2f* self, PyObject *args
|
||||
{
|
||||
PyObject *obj;
|
||||
|
||||
if( !PyArg_ParseTuple(args, "|O", &obj) && BPy_IntegrationType_Check(obj) ) {
|
||||
if( !PyArg_ParseTuple(args, "|O!", &IntegrationType_Type, &obj) ) {
|
||||
cout << "ERROR: UnaryFunction1DVec2f___init__ " << endl;
|
||||
return -1;
|
||||
}
|
||||
@@ -183,7 +183,7 @@ PyObject * UnaryFunction1DVec2f___call__( BPy_UnaryFunction1DVec2f *self, PyObje
|
||||
{
|
||||
PyObject *obj;
|
||||
|
||||
if( !PyArg_ParseTuple(args, "O", &obj) && BPy_Interface1D_Check(obj) ) {
|
||||
if( !PyArg_ParseTuple(args, "O!", &Interface1D_Type, &obj) ) {
|
||||
cout << "ERROR: UnaryFunction1DVec2f___call__ " << endl;
|
||||
return NULL;
|
||||
}
|
||||
@@ -197,7 +197,7 @@ PyObject * UnaryFunction1DVec2f_setIntegrationType(BPy_UnaryFunction1DVec2f* sel
|
||||
{
|
||||
PyObject *obj;
|
||||
|
||||
if( !PyArg_ParseTuple(args, "O", &obj) && BPy_IntegrationType_Check(obj) ) {
|
||||
if( !PyArg_ParseTuple(args, "O!", &IntegrationType_Type, &obj) ) {
|
||||
cout << "ERROR: UnaryFunction1DVec2f_setIntegrationType " << endl;
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
|
||||
@@ -141,7 +141,7 @@ int UnaryFunction1DVec3f___init__(BPy_UnaryFunction1DVec3f* self, PyObject *args
|
||||
{
|
||||
PyObject *obj;
|
||||
|
||||
if( !PyArg_ParseTuple(args, "|O", &obj) && BPy_IntegrationType_Check(obj) ) {
|
||||
if( !PyArg_ParseTuple(args, "|O!", &IntegrationType_Type, &obj) ) {
|
||||
cout << "ERROR: UnaryFunction1DVec3f___init__ " << endl;
|
||||
return -1;
|
||||
}
|
||||
@@ -177,7 +177,7 @@ PyObject * UnaryFunction1DVec3f___call__( BPy_UnaryFunction1DVec3f *self, PyObje
|
||||
{
|
||||
PyObject *obj;
|
||||
|
||||
if( !PyArg_ParseTuple(args, "O", &obj) && BPy_Interface1D_Check(obj) ) {
|
||||
if( !PyArg_ParseTuple(args, "O!", &Interface1D_Type, &obj) ) {
|
||||
cout << "ERROR: UnaryFunction1DVec3f___call__ " << endl;
|
||||
return NULL;
|
||||
}
|
||||
@@ -191,7 +191,7 @@ PyObject * UnaryFunction1DVec3f_setIntegrationType(BPy_UnaryFunction1DVec3f* sel
|
||||
{
|
||||
PyObject *obj;
|
||||
|
||||
if( !PyArg_ParseTuple(args, "O", &obj) && BPy_IntegrationType_Check(obj) ) {
|
||||
if( !PyArg_ParseTuple(args, "O!", &IntegrationType_Type, &obj) ) {
|
||||
cout << "ERROR: UnaryFunction1DVec3f_setIntegrationType " << endl;
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
|
||||
@@ -154,7 +154,7 @@ int UnaryFunction1DVectorViewShape___init__(BPy_UnaryFunction1DVectorViewShape*
|
||||
{
|
||||
PyObject *obj;
|
||||
|
||||
if( !PyArg_ParseTuple(args, "|O", &obj) && BPy_IntegrationType_Check(obj) ) {
|
||||
if( !PyArg_ParseTuple(args, "|O!", &IntegrationType_Type, &obj) ) {
|
||||
cout << "ERROR: UnaryFunction1DVectorViewShape___init__ " << endl;
|
||||
return -1;
|
||||
}
|
||||
@@ -191,7 +191,7 @@ PyObject * UnaryFunction1DVectorViewShape___call__( BPy_UnaryFunction1DVectorVie
|
||||
{
|
||||
PyObject *obj;
|
||||
|
||||
if( !PyArg_ParseTuple(args, "O", &obj) && BPy_Interface1D_Check(obj) ) {
|
||||
if( !PyArg_ParseTuple(args, "O!", &Interface1D_Type, &obj) ) {
|
||||
cout << "ERROR: UnaryFunction1DVectorViewShape___call__ " << endl;
|
||||
return NULL;
|
||||
}
|
||||
@@ -210,7 +210,7 @@ PyObject * UnaryFunction1DVectorViewShape_setIntegrationType(BPy_UnaryFunction1D
|
||||
{
|
||||
PyObject *obj;
|
||||
|
||||
if( !PyArg_ParseTuple(args, "O", &obj) && BPy_IntegrationType_Check(obj) ) {
|
||||
if( !PyArg_ParseTuple(args, "O!", &IntegrationType_Type, &obj) ) {
|
||||
cout << "ERROR: UnaryFunction1DVectorViewShape_setIntegrationType " << endl;
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
|
||||
@@ -155,7 +155,7 @@ int UnaryFunction1DVoid___init__(BPy_UnaryFunction1DVoid* self, PyObject *args)
|
||||
{
|
||||
PyObject *obj;
|
||||
|
||||
if( !PyArg_ParseTuple(args, "|O", &obj) && BPy_IntegrationType_Check(obj) ) {
|
||||
if( !PyArg_ParseTuple(args, "|O!", &IntegrationType_Type, &obj) ) {
|
||||
cout << "ERROR: UnaryFunction1DVoid___init__ " << endl;
|
||||
return -1;
|
||||
}
|
||||
@@ -192,7 +192,7 @@ PyObject * UnaryFunction1DVoid___call__( BPy_UnaryFunction1DVoid *self, PyObject
|
||||
{
|
||||
PyObject *obj;
|
||||
|
||||
if( !PyArg_ParseTuple(args, "O", &obj) && BPy_Interface1D_Check(obj) ) {
|
||||
if( !PyArg_ParseTuple(args, "O!", &Interface1D_Type, &obj) ) {
|
||||
cout << "ERROR: UnaryFunction1DVoid___call__ " << endl;
|
||||
return NULL;
|
||||
}
|
||||
@@ -205,7 +205,7 @@ PyObject * UnaryFunction1DVoid_setIntegrationType(BPy_UnaryFunction1DVoid* self,
|
||||
{
|
||||
PyObject *obj;
|
||||
|
||||
if( !PyArg_ParseTuple(args, "O", &obj) && BPy_IntegrationType_Check(obj) ) {
|
||||
if( !PyArg_ParseTuple(args, "O!", &IntegrationType_Type, &obj) ) {
|
||||
cout << "ERROR: UnaryFunction1DVoid_setIntegrationType " << endl;
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
|
||||
@@ -104,12 +104,12 @@ int CurveNatureF1D___init__( BPy_CurveNatureF1D* self, PyObject *args)
|
||||
{
|
||||
PyObject *obj = 0;
|
||||
|
||||
if( !PyArg_ParseTuple(args, "|O", &obj) ) {
|
||||
if( !PyArg_ParseTuple(args, "|O!", &IntegrationType_Type, &obj) ) {
|
||||
cout << "ERROR: CurveNatureF1D___init__" << endl;
|
||||
return -1;
|
||||
}
|
||||
|
||||
IntegrationType t = ( obj && BPy_IntegrationType_Check(obj) ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
|
||||
IntegrationType t = ( obj ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
|
||||
self->py_uf1D_edgenature.uf1D_edgenature = new Functions1D::CurveNatureF1D(t);
|
||||
return 0;
|
||||
|
||||
|
||||
@@ -104,12 +104,12 @@ int Normal2DF1D___init__( BPy_Normal2DF1D* self, PyObject *args)
|
||||
{
|
||||
PyObject *obj = 0;
|
||||
|
||||
if( !PyArg_ParseTuple(args, "|O", &obj) ) {
|
||||
if( !PyArg_ParseTuple(args, "|O!", &IntegrationType_Type, &obj) ) {
|
||||
cout << "ERROR: Normal2DF1D___init__" << endl;
|
||||
return -1;
|
||||
}
|
||||
|
||||
IntegrationType t = ( obj && BPy_IntegrationType_Check(obj) ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
|
||||
IntegrationType t = ( obj ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
|
||||
self->py_uf1D_vec2f.uf1D_vec2f = new Functions1D::Normal2DF1D(t);
|
||||
return 0;
|
||||
|
||||
|
||||
@@ -104,12 +104,12 @@ int Orientation2DF1D___init__( BPy_Orientation2DF1D* self, PyObject *args)
|
||||
{
|
||||
PyObject *obj = 0;
|
||||
|
||||
if( !PyArg_ParseTuple(args, "|O", &obj) ) {
|
||||
if( !PyArg_ParseTuple(args, "|O!", &IntegrationType_Type, &obj) ) {
|
||||
cout << "ERROR: Orientation2DF1D___init__" << endl;
|
||||
return -1;
|
||||
}
|
||||
|
||||
IntegrationType t = ( obj && BPy_IntegrationType_Check(obj) ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
|
||||
IntegrationType t = ( obj ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
|
||||
self->py_uf1D_vec2f.uf1D_vec2f = new Functions1D::Orientation2DF1D(t);
|
||||
return 0;
|
||||
|
||||
|
||||
@@ -104,12 +104,12 @@ int Orientation3DF1D___init__( BPy_Orientation3DF1D* self, PyObject *args)
|
||||
{
|
||||
PyObject *obj = 0;
|
||||
|
||||
if( !PyArg_ParseTuple(args, "|O", &obj) ) {
|
||||
if( !PyArg_ParseTuple(args, "|O!", &IntegrationType_Type, &obj) ) {
|
||||
cout << "ERROR: Orientation3DF1D___init__" << endl;
|
||||
return -1;
|
||||
}
|
||||
|
||||
IntegrationType t = ( obj && BPy_IntegrationType_Check(obj) ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
|
||||
IntegrationType t = ( obj ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
|
||||
self->py_uf1D_vec3f.uf1D_vec3f = new Functions1D::Orientation3DF1D(t);
|
||||
return 0;
|
||||
|
||||
|
||||
@@ -104,12 +104,12 @@ int Curvature2DAngleF1D___init__( BPy_Curvature2DAngleF1D* self, PyObject *args)
|
||||
{
|
||||
PyObject *obj = 0;
|
||||
|
||||
if( !PyArg_ParseTuple(args, "|O", &obj) ) {
|
||||
if( !PyArg_ParseTuple(args, "|O!", &IntegrationType_Type, &obj) ) {
|
||||
cout << "ERROR: Curvature2DAngleF1D___init__ " << endl;
|
||||
return -1;
|
||||
}
|
||||
|
||||
IntegrationType t = ( obj && BPy_IntegrationType_Check(obj) ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
|
||||
IntegrationType t = ( obj ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
|
||||
self->py_uf1D_double.uf1D_double = new Functions1D::Curvature2DAngleF1D(t);
|
||||
return 0;
|
||||
|
||||
|
||||
@@ -106,12 +106,12 @@ int DensityF1D___init__( BPy_DensityF1D* self, PyObject *args)
|
||||
double d = 2.0;
|
||||
float f = 2.0;
|
||||
|
||||
if( !PyArg_ParseTuple(args, "|dOf", &d, &obj, &f) ) {
|
||||
if( !PyArg_ParseTuple(args, "|dO!f", &d, &IntegrationType_Type, &obj, &f) ) {
|
||||
cout << "ERROR: DensityF1D___init__ " << endl;
|
||||
return -1;
|
||||
}
|
||||
|
||||
IntegrationType t = ( obj && BPy_IntegrationType_Check(obj) ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
|
||||
IntegrationType t = ( obj ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
|
||||
self->py_uf1D_double.uf1D_double = new Functions1D::DensityF1D(d,t,f);
|
||||
return 0;
|
||||
|
||||
|
||||
@@ -106,12 +106,12 @@ int GetCompleteViewMapDensityF1D___init__( BPy_GetCompleteViewMapDensityF1D* sel
|
||||
unsigned i;
|
||||
float f = 2.0;
|
||||
|
||||
if( !PyArg_ParseTuple(args, "i|Of", &i, &obj, &f) ) {
|
||||
if( !PyArg_ParseTuple(args, "i|O!f", &i, &IntegrationType_Type, &obj, &f) ) {
|
||||
cout << "ERROR: GetCompleteViewMapDensityF1D___init__ " << endl;
|
||||
return -1;
|
||||
}
|
||||
|
||||
IntegrationType t = ( obj && BPy_IntegrationType_Check(obj) ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
|
||||
IntegrationType t = ( obj ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
|
||||
self->py_uf1D_double.uf1D_double = new Functions1D::GetCompleteViewMapDensityF1D(i,t,f);
|
||||
return 0;
|
||||
|
||||
|
||||
@@ -106,12 +106,12 @@ int GetDirectionalViewMapDensityF1D___init__( BPy_GetDirectionalViewMapDensityF1
|
||||
unsigned int u1, u2;
|
||||
float f = 2.0;
|
||||
|
||||
if( !PyArg_ParseTuple(args, "II|Of", &u1, &u2, &obj, &f) ) {
|
||||
if( !PyArg_ParseTuple(args, "II|O!f", &u1, &u2, &IntegrationType_Type, &obj, &f) ) {
|
||||
cout << "ERROR: GetDirectionalViewMapDensityF1D___init__ " << endl;
|
||||
return -1;
|
||||
}
|
||||
|
||||
IntegrationType t = ( obj && BPy_IntegrationType_Check(obj) ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
|
||||
IntegrationType t = ( obj ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
|
||||
self->py_uf1D_double.uf1D_double = new Functions1D::GetDirectionalViewMapDensityF1D(u1, u2, t, f);
|
||||
return 0;
|
||||
|
||||
|
||||
@@ -104,12 +104,12 @@ int GetProjectedXF1D___init__( BPy_GetProjectedXF1D* self, PyObject *args )
|
||||
{
|
||||
PyObject *obj = 0;
|
||||
|
||||
if( !PyArg_ParseTuple(args, "|O", &obj) ) {
|
||||
if( !PyArg_ParseTuple(args, "|O!", &IntegrationType_Type, &obj) ) {
|
||||
cout << "ERROR: GetProjectedXF1D___init__ " << endl;
|
||||
return -1;
|
||||
}
|
||||
|
||||
IntegrationType t = ( obj && BPy_IntegrationType_Check(obj) ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
|
||||
IntegrationType t = ( obj ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
|
||||
self->py_uf1D_double.uf1D_double = new Functions1D::GetProjectedXF1D(t);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -104,12 +104,12 @@ int GetProjectedYF1D___init__( BPy_GetProjectedYF1D* self, PyObject *args )
|
||||
{
|
||||
PyObject *obj = 0;
|
||||
|
||||
if( !PyArg_ParseTuple(args, "|O", &obj) ) {
|
||||
if( !PyArg_ParseTuple(args, "|O!", &IntegrationType_Type, &obj) ) {
|
||||
cout << "ERROR: GetProjectedYF1D___init__ " << endl;
|
||||
return -1;
|
||||
}
|
||||
|
||||
IntegrationType t = ( obj && BPy_IntegrationType_Check(obj) ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
|
||||
IntegrationType t = ( obj ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
|
||||
self->py_uf1D_double.uf1D_double = new Functions1D::GetProjectedYF1D(t);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -104,12 +104,12 @@ int GetProjectedZF1D___init__( BPy_GetProjectedZF1D* self, PyObject *args )
|
||||
{
|
||||
PyObject *obj = 0;
|
||||
|
||||
if( !PyArg_ParseTuple(args, "|O", &obj) ) {
|
||||
if( !PyArg_ParseTuple(args, "|O!", &IntegrationType_Type, &obj) ) {
|
||||
cout << "ERROR: GetProjectedZF1D___init__ " << endl;
|
||||
return -1;
|
||||
}
|
||||
|
||||
IntegrationType t = ( obj && BPy_IntegrationType_Check(obj) ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
|
||||
IntegrationType t = ( obj ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
|
||||
self->py_uf1D_double.uf1D_double = new Functions1D::GetProjectedZF1D(t);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -106,12 +106,12 @@ int GetSteerableViewMapDensityF1D___init__( BPy_GetSteerableViewMapDensityF1D* s
|
||||
int i;
|
||||
float f = 2.0;
|
||||
|
||||
if( !PyArg_ParseTuple(args, "i|Of", &i, &obj, &f) ) {
|
||||
if( !PyArg_ParseTuple(args, "i|O!f", &i, &IntegrationType_Type, &obj, &f) ) {
|
||||
cout << "ERROR: GetSteerableViewMapDensityF1D___init__ " << endl;
|
||||
return -1;
|
||||
}
|
||||
|
||||
IntegrationType t = ( obj && BPy_IntegrationType_Check(obj) ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
|
||||
IntegrationType t = ( obj ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
|
||||
self->py_uf1D_double.uf1D_double = new Functions1D::GetSteerableViewMapDensityF1D(i,t,f);
|
||||
return 0;
|
||||
|
||||
|
||||
@@ -106,12 +106,12 @@ int GetViewMapGradientNormF1D___init__( BPy_GetViewMapGradientNormF1D* self, PyO
|
||||
int i;
|
||||
float f = 2.0;
|
||||
|
||||
if( !PyArg_ParseTuple(args, "i|Of", &i, &obj, &f) ) {
|
||||
if( !PyArg_ParseTuple(args, "i|O!f", &i, &IntegrationType_Type, &obj, &f) ) {
|
||||
cout << "ERROR: GetViewMapGradientNormF1D___init__ " << endl;
|
||||
return -1;
|
||||
}
|
||||
|
||||
IntegrationType t = ( obj && BPy_IntegrationType_Check(obj) ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
|
||||
IntegrationType t = ( obj ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
|
||||
self->py_uf1D_double.uf1D_double = new Functions1D::GetViewMapGradientNormF1D(i,t,f);
|
||||
return 0;
|
||||
|
||||
|
||||
@@ -104,12 +104,12 @@ int GetXF1D___init__( BPy_GetXF1D* self, PyObject *args )
|
||||
{
|
||||
PyObject *obj = 0;
|
||||
|
||||
if( !PyArg_ParseTuple(args, "|O", &obj) ) {
|
||||
if( !PyArg_ParseTuple(args, "|O!", &IntegrationType_Type, &obj) ) {
|
||||
cout << "ERROR: GetXF1D___init__ " << endl;
|
||||
return -1;
|
||||
}
|
||||
|
||||
IntegrationType t = ( obj && BPy_IntegrationType_Check(obj) ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
|
||||
IntegrationType t = ( obj ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
|
||||
self->py_uf1D_double.uf1D_double = new Functions1D::GetXF1D(t);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -104,12 +104,12 @@ int GetYF1D___init__( BPy_GetYF1D* self, PyObject *args )
|
||||
{
|
||||
PyObject *obj = 0;
|
||||
|
||||
if( !PyArg_ParseTuple(args, "|O", &obj) ) {
|
||||
if( !PyArg_ParseTuple(args, "|O!", &IntegrationType_Type, &obj) ) {
|
||||
cout << "ERROR: GetYF1D___init__ " << endl;
|
||||
return -1;
|
||||
}
|
||||
|
||||
IntegrationType t = ( obj && BPy_IntegrationType_Check(obj) ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
|
||||
IntegrationType t = ( obj ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
|
||||
self->py_uf1D_double.uf1D_double = new Functions1D::GetYF1D(t);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -104,12 +104,12 @@ int GetZF1D___init__( BPy_GetZF1D* self, PyObject *args )
|
||||
{
|
||||
PyObject *obj = 0;
|
||||
|
||||
if( !PyArg_ParseTuple(args, "|O", &obj) ) {
|
||||
if( !PyArg_ParseTuple(args, "|O!", &IntegrationType_Type, &obj) ) {
|
||||
cout << "ERROR: GetZF1D___init__ " << endl;
|
||||
return -1;
|
||||
}
|
||||
|
||||
IntegrationType t = ( obj && BPy_IntegrationType_Check(obj) ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
|
||||
IntegrationType t = ( obj ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
|
||||
self->py_uf1D_double.uf1D_double = new Functions1D::GetZF1D(t);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -105,12 +105,12 @@ int LocalAverageDepthF1D___init__( BPy_LocalAverageDepthF1D* self, PyObject *arg
|
||||
PyObject *obj = 0;
|
||||
double d;
|
||||
|
||||
if( !PyArg_ParseTuple(args, "d|O", &d, &obj) ) {
|
||||
if( !PyArg_ParseTuple(args, "d|O!", &d, &IntegrationType_Type, &obj) ) {
|
||||
cout << "ERROR: LocalAverageDepthF1D___init__ " << endl;
|
||||
return -1;
|
||||
}
|
||||
|
||||
IntegrationType t = ( obj && BPy_IntegrationType_Check(obj) ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
|
||||
IntegrationType t = ( obj ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
|
||||
self->py_uf1D_double.uf1D_double = new Functions1D::LocalAverageDepthF1D(d,t);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -104,12 +104,12 @@ int ZDiscontinuityF1D___init__( BPy_ZDiscontinuityF1D* self, PyObject *args )
|
||||
{
|
||||
PyObject *obj = 0;
|
||||
|
||||
if( !PyArg_ParseTuple(args, "|O", &obj) ) {
|
||||
if( !PyArg_ParseTuple(args, "|O!", &IntegrationType_Type, &obj) ) {
|
||||
cout << "ERROR: ZDiscontinuityF1D___init__ " << endl;
|
||||
return -1;
|
||||
}
|
||||
|
||||
IntegrationType t = ( obj && BPy_IntegrationType_Check(obj) ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
|
||||
IntegrationType t = ( obj ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
|
||||
self->py_uf1D_double.uf1D_double = new Functions1D::ZDiscontinuityF1D(t);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -104,12 +104,12 @@ int QuantitativeInvisibilityF1D___init__( BPy_QuantitativeInvisibilityF1D* self,
|
||||
{
|
||||
PyObject *obj = 0;
|
||||
|
||||
if( !PyArg_ParseTuple(args, "|O", &obj) ) {
|
||||
if( !PyArg_ParseTuple(args, "|O!", &IntegrationType_Type, &obj) ) {
|
||||
cout << "ERROR: QuantitativeInvisibilityF1D___init__" << endl;
|
||||
return -1;
|
||||
}
|
||||
|
||||
IntegrationType t = ( obj && BPy_IntegrationType_Check(obj) ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
|
||||
IntegrationType t = ( obj ) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN;
|
||||
self->py_uf1D_unsigned.uf1D_unsigned = new Functions1D::QuantitativeInvisibilityF1D(t);
|
||||
return 0;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user