ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-01-28 02:50:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug (from SALOME forum) in analytical curve creation - if the Python expression is wrong, an error is printed; but even after re-entering valid expression, the function still does not work.

Browse Source
This commit is contained in:
vsr 2011-06-14 07:29:30 +00:00
parent f6e7825814
commit e905eeaff1
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx
View File

@ -875,7 +875,7 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeCurveParametric(const char*
aPyScript += thezExpr; aPyScript += thezExpr;
aPyScript += "\n"; aPyScript += "\n";
aPyScript +="def coordCalucator(tmin, tmax, tstep): \n"; aPyScript +="def coordCalculator(tmin, tmax, tstep): \n";
aPyScript +=" coords = [] \n"; aPyScript +=" coords = [] \n";
aPyScript +=" while tmin <= tmax : \n"; aPyScript +=" while tmin <= tmax : \n";
aPyScript +=" coords.append([X(tmin), Y(tmin), Z(tmin)]) \n"; aPyScript +=" coords.append([X(tmin), Y(tmin), Z(tmin)]) \n";
@ -909,7 +909,8 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeCurveParametric(const char*
PyObject* obj = PyRun_String(aPyScript.ToCString(), Py_file_input, main_dict, NULL); PyObject* obj = PyRun_String(aPyScript.ToCString(), Py_file_input, main_dict, NULL);
if (obj == NULL) { if (obj == NULL) {
SetErrorCode("Error during run python script !!!"); SetErrorCode("Error during executing of python script !!!");
PyErr_Print();
PyGILState_Release(gstate); PyGILState_Release(gstate);
return NULL; return NULL;
} else { } else {
@ -917,7 +918,7 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeCurveParametric(const char*
} }
PyObject * func = NULL; PyObject * func = NULL;
func = PyObject_GetAttrString(main_mod, "coordCalucator"); func = PyObject_GetAttrString(main_mod, "coordCalculator");
if (func == NULL){ if (func == NULL){
SetErrorCode("Can't get function from python module !!!"); SetErrorCode("Can't get function from python module !!!");
@ -936,7 +937,7 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeCurveParametric(const char*
PyErr_Print(); PyErr_Print();
PySys_SetObject((char*)"stderr", PySys_GetObject((char*)"__stderr__")); PySys_SetObject((char*)"stderr", PySys_GetObject((char*)"__stderr__"));
Py_DECREF(new_stderr); Py_DECREF(new_stderr);
MESSAGE("Can't evaluate coordCalucator()" << " error is " << err_description); MESSAGE("Can't evaluate coordCalculator()" << " error is " << err_description);
SetErrorCode("Can't evaluate the expressions, please check them !!!"); SetErrorCode("Can't evaluate the expressions, please check them !!!");
PyGILState_Release(gstate); PyGILState_Release(gstate);
return NULL; return NULL;