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

Gui: PickRadius support for View3DPy.getObjectInfo()

Browse Source 
requested by Chris_G in forum thread "ActiveView.getObjectInfo ignores
pickRadius ?"
https://forum.freecadweb.org/viewtopic.php?f=22&t=22196
This commit is contained in:
DeepSOIC
2017-05-03 16:50:23 +03:00
parent 2d1c913300
commit 624a3c4146
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Gui/View3DPy.cpp
View File

@@ -127,14 +127,14 @@ void View3DInventorPy::init_type()
"Return the current cursor position relative to the coordinate system of the\n" "Return the current cursor position relative to the coordinate system of the\n"
"viewport region.\n"); "viewport region.\n");
add_varargs_method("getObjectInfo",&View3DInventorPy::getObjectInfo, add_varargs_method("getObjectInfo",&View3DInventorPy::getObjectInfo,
"getObjectInfo(tuple of integers) -> dictionary or None\n" "getObjectInfo(tuple(int,int), [pick_radius]) -> dictionary or None\n"
"\n" "\n"
"Return a dictionary with the name of document, object and component. The\n" "Return a dictionary with the name of document, object and component. The\n"
"dictionary also contains the coordinates of the appropriate 3d point of\n" "dictionary also contains the coordinates of the appropriate 3d point of\n"
"the underlying geometry in the scenegraph.\n" "the underlying geometry in the scenegraph.\n"
"If no geometry was found 'None' is returned, instead.\n"); "If no geometry was found 'None' is returned, instead.\n");
add_varargs_method("getObjectsInfo",&View3DInventorPy::getObjectsInfo, add_varargs_method("getObjectsInfo",&View3DInventorPy::getObjectsInfo,
"getObjectsInfo(tuple of integers) -> dictionary or None\n" "getObjectsInfo(tuple(int,int), [pick_radius]) -> dictionary or None\n"
"\n" "\n"
"Does the same as getObjectInfo() but returns a list of dictionaries or None.\n"); "Does the same as getObjectInfo() but returns a list of dictionaries or None.\n");
add_varargs_method("getSize",&View3DInventorPy::getSize,"getSize()"); add_varargs_method("getSize",&View3DInventorPy::getSize,"getSize()");
@@ -1172,7 +1172,8 @@ Py::Object View3DInventorPy::getCursorPos(const Py::Tuple& args)
Py::Object View3DInventorPy::getObjectInfo(const Py::Tuple& args) Py::Object View3DInventorPy::getObjectInfo(const Py::Tuple& args)
{ {
PyObject* object; PyObject* object;
if (!PyArg_ParseTuple(args.ptr(), "O", &object)) float r = _view->getViewer()->getPickRadius();
if (!PyArg_ParseTuple(args.ptr(), "O|f", &object, &r))
throw Py::Exception(); throw Py::Exception();
try { try {
@@ -1191,6 +1192,7 @@ Py::Object View3DInventorPy::getObjectInfo(const Py::Tuple& args)
// which is regarded as error-prone. // which is regarded as error-prone.
SoRayPickAction action(_view->getViewer()->getSoRenderManager()->getViewportRegion()); SoRayPickAction action(_view->getViewer()->getSoRenderManager()->getViewportRegion());
action.setPoint(SbVec2s((long)x,(long)y)); action.setPoint(SbVec2s((long)x,(long)y));
action.setRadius(r);
action.apply(_view->getViewer()->getSoRenderManager()->getSceneGraph()); action.apply(_view->getViewer()->getSoRenderManager()->getSceneGraph());
SoPickedPoint *Point = action.getPickedPoint(); SoPickedPoint *Point = action.getPickedPoint();
@@ -1241,7 +1243,8 @@ Py::Object View3DInventorPy::getObjectInfo(const Py::Tuple& args)
Py::Object View3DInventorPy::getObjectsInfo(const Py::Tuple& args) Py::Object View3DInventorPy::getObjectsInfo(const Py::Tuple& args)
{ {
PyObject* object; PyObject* object;
if (!PyArg_ParseTuple(args.ptr(), "O", &object)) float r = _view->getViewer()->getPickRadius();
if (!PyArg_ParseTuple(args.ptr(), "O|f", &object, &r))
throw Py::Exception(); throw Py::Exception();
try { try {
@@ -1260,6 +1263,7 @@ Py::Object View3DInventorPy::getObjectsInfo(const Py::Tuple& args)
// which is regarded as error-prone. // which is regarded as error-prone.
SoRayPickAction action(_view->getViewer()->getSoRenderManager()->getViewportRegion()); SoRayPickAction action(_view->getViewer()->getSoRenderManager()->getViewportRegion());
action.setPickAll(true); action.setPickAll(true);
action.setRadius(r);
action.setPoint(SbVec2s((long)x,(long)y)); action.setPoint(SbVec2s((long)x,(long)y));
action.apply(_view->getViewer()->getSoRenderManager()->getSceneGraph()); action.apply(_view->getViewer()->getSoRenderManager()->getSceneGraph());
const SoPickedPointList& pp = action.getPickedPointList(); const SoPickedPointList& pp = action.getPickedPointList();