X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_ISelection.cpp;h=d5c325558b186df333cc949b379e9a2fef344754;hb=450d1bd65c11870d3942a30164518037b9a7503e;hp=9eaf186dc4181b9e8f8a66016250f9fbdf7fef66;hpb=83e85cedfb936e7755500322e1afa638d318a863;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_ISelection.cpp b/src/ModuleBase/ModuleBase_ISelection.cpp index 9eaf186dc..d5c325558 100644 --- a/src/ModuleBase/ModuleBase_ISelection.cpp +++ b/src/ModuleBase/ModuleBase_ISelection.cpp @@ -38,13 +38,12 @@ ResultPtr ModuleBase_ISelection::getResult(const ModuleBase_ViewerPrs& thePrs) { ResultPtr aResult; - if (!thePrs.owner().IsNull()) { + if (thePrs.object().get()) + aResult = std::dynamic_pointer_cast(thePrs.object()); + else if (!thePrs.owner().IsNull()) { ObjectPtr anObject = getSelectableObject(thePrs.owner()); aResult = std::dynamic_pointer_cast(anObject); } - else { - aResult = std::dynamic_pointer_cast(thePrs.object()); - } return aResult; } @@ -84,7 +83,7 @@ QList ModuleBase_ISelection::getViewerPrs(const QObjectPtr } //******************************************************************** -void ModuleBase_ISelection::filterPreselectionOnEqualPoints +void ModuleBase_ISelection::filterSelectionOnEqualPoints (QList& theSelected) { QList aCandidatesToRemove;