-// Copyright (C) 2014-2017 CEA/DEN, EDF R&D
+// Copyright (C) 2014-2023 CEA, EDF
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#include "ModuleBase_ISelection.h"
#include "ModuleBase_ViewerPrs.h"
+#include "ModelAPI_Feature.h"
#include <StdSelect_BRepOwner.hxx>
#include <TopoDS_Vertex.hxx>
{
// collect the objects from the viewer
QObjectPtrList anExistedObjects;
- QList<ModuleBase_ViewerPrsPtr>::const_iterator aPrsIt = theValuesTo.begin(),
- aPrsLast = theValuesTo.end();
- for (; aPrsIt != aPrsLast; aPrsIt++) {
- if ((*aPrsIt)->owner() && (*aPrsIt)->object())
- anExistedObjects.push_back((*aPrsIt)->object());
+ foreach(ModuleBase_ViewerPrsPtr aPrs, theValuesTo) {
+ if (aPrs->owner() && aPrs->object())
+ anExistedObjects.append(aPrs->object());
}
-
- QList<ModuleBase_ViewerPrsPtr>::const_iterator anIt = theValues.begin(),
- aLast = theValues.end();
- for (; anIt != aLast; anIt++) {
- ObjectPtr anObject = (*anIt)->object();
+ ObjectPtr anObject;
+ foreach(ModuleBase_ViewerPrsPtr aPrs, theValues) {
+ anObject = aPrs->object();
if (anObject.get() != NULL && !anExistedObjects.contains(anObject)) {
theValuesTo.append(std::shared_ptr<ModuleBase_ViewerPrs>(
new ModuleBase_ViewerPrs(anObject, GeomShapePtr(), NULL)));
}
}
-
}
//********************************************************************
{
ResultPtr aResult;
- if (thePrs->object().get())
- aResult = std::dynamic_pointer_cast<ModelAPI_Result>(thePrs->object());
+ if (thePrs->object().get()) {
+ ObjectPtr aObject = thePrs->object();
+ aResult = std::dynamic_pointer_cast<ModelAPI_Result>(aObject);
+ }
else if (!thePrs->owner().IsNull()) {
ObjectPtr anObject = getSelectableObject(thePrs->owner());
aResult = std::dynamic_pointer_cast<ModelAPI_Result>(anObject);
std::shared_ptr<GeomAPI_Vertex> aGeomPrsVertex = getPresentationVertex(aPrs);
if (aGeomPrsVertex.get()) {
const TopoDS_Vertex& aPrsVertex = aGeomPrsVertex->impl<TopoDS_Vertex>();
- std::set<std::shared_ptr<GeomAPI_Vertex> >::const_iterator anIt = aVerticesMap.begin(),
- aLast = aVerticesMap.end();
+ std::set<std::shared_ptr<GeomAPI_Vertex> >::const_iterator aVIt = aVerticesMap.begin(),
+ aVLast = aVerticesMap.end();
bool aFound = false;
- for (; anIt != aLast && !aFound; anIt++) {
- std::shared_ptr<GeomAPI_Vertex> aGeomVertex = *anIt;
+ for (; aVIt != aVLast && !aFound; aVIt++) {
+ std::shared_ptr<GeomAPI_Vertex> aGeomVertex = *aVIt;
const TopoDS_Vertex& aVertex = aGeomVertex->impl<TopoDS_Vertex>();
gp_Pnt aPoint1 = BRep_Tool::Pnt(aVertex);
gp_Pnt aPoint2 = BRep_Tool::Pnt(aPrsVertex);