X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_ISelection.cpp;h=0025283060036b8ad61910cd0c0baa0db9c1b471;hb=39aa2839a4269a2fc87cfe3b4487cce8f3df9a6f;hp=9eaf186dc4181b9e8f8a66016250f9fbdf7fef66;hpb=83e85cedfb936e7755500322e1afa638d318a863;p=modules%2Fshaper.git

diff --git a/src/ModuleBase/ModuleBase_ISelection.cpp b/src/ModuleBase/ModuleBase_ISelection.cpp
index 9eaf186dc..002528306 100644
--- a/src/ModuleBase/ModuleBase_ISelection.cpp
+++ b/src/ModuleBase/ModuleBase_ISelection.cpp
@@ -2,6 +2,8 @@
 
 #include "ModuleBase_ISelection.h"
 
+#include "ModuleBase_ViewerPrs.h"
+
 #include <StdSelect_BRepOwner.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS.hxx>
@@ -9,58 +11,57 @@
 #include <GeomAPI_Pnt.h>
 
 //********************************************************************
-void ModuleBase_ISelection::appendSelected(const QList<ModuleBase_ViewerPrs> theValues,
-                                           QList<ModuleBase_ViewerPrs>& theValuesTo)
+void ModuleBase_ISelection::appendSelected(const QList<ModuleBase_ViewerPrsPtr> theValues,
+                                           QList<ModuleBase_ViewerPrsPtr>& theValuesTo)
 {
   // collect the objects from the viewer
   QObjectPtrList anExistedObjects;
-  QList<ModuleBase_ViewerPrs>::const_iterator aPrsIt = theValuesTo.begin(),
+  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());
+    if ((*aPrsIt)->owner() && (*aPrsIt)->object())
+      anExistedObjects.push_back((*aPrsIt)->object());
   }
 
 
-  QList<ModuleBase_ViewerPrs>::const_iterator anIt = theValues.begin(),
+  QList<ModuleBase_ViewerPrsPtr>::const_iterator anIt = theValues.begin(),
                                               aLast = theValues.end();
   for (; anIt != aLast; anIt++) {
-    ObjectPtr anObject = (*anIt).object();
+    ObjectPtr anObject = (*anIt)->object();
     if (anObject.get() != NULL && !anExistedObjects.contains(anObject)) {
-      theValuesTo.append(ModuleBase_ViewerPrs(anObject, TopoDS_Shape(), NULL));
+      theValuesTo.append(std::shared_ptr<ModuleBase_ViewerPrs>(
+               new ModuleBase_ViewerPrs(anObject, GeomShapePtr(), NULL)));
     }
   }
 
 }
 
 //********************************************************************
-ResultPtr ModuleBase_ISelection::getResult(const ModuleBase_ViewerPrs& thePrs)
+ResultPtr ModuleBase_ISelection::getResult(const ModuleBase_ViewerPrsPtr& thePrs)
 {
   ResultPtr aResult;
 
-  if (!thePrs.owner().IsNull()) {
-    ObjectPtr anObject = getSelectableObject(thePrs.owner());
+  if (thePrs->object().get())
+    aResult = std::dynamic_pointer_cast<ModelAPI_Result>(thePrs->object());
+  else if (!thePrs->owner().IsNull()) {
+    ObjectPtr anObject = getSelectableObject(thePrs->owner());
     aResult = std::dynamic_pointer_cast<ModelAPI_Result>(anObject);
   }
-  else {
-    aResult = std::dynamic_pointer_cast<ModelAPI_Result>(thePrs.object());
-  }
 
   return aResult;
 }
 
 //********************************************************************
-GeomShapePtr ModuleBase_ISelection::getShape(const ModuleBase_ViewerPrs& thePrs)
+GeomShapePtr ModuleBase_ISelection::getShape(const ModuleBase_ViewerPrsPtr& thePrs)
 {
   GeomShapePtr aShape;
 
-  const TopoDS_Shape& aTDSShape = thePrs.shape();
+  const GeomShapePtr& aPrsShape = thePrs->shape();
   // if only result is selected, an empty shape is set to the model
-  if (aTDSShape.IsNull()) {
+  if (!aPrsShape.get() || aPrsShape->isNull()) {
   }
   else {
-    aShape = GeomShapePtr(new GeomAPI_Shape());
-    aShape->setImpl(new TopoDS_Shape(aTDSShape));
+    aShape = aPrsShape;
     // If the result object is built on the same shape, the result shape here is empty one
     ResultPtr aResult = getResult(thePrs);
     if (aResult.get() && aShape->isEqual(aResult->shape()))
@@ -70,72 +71,81 @@ GeomShapePtr ModuleBase_ISelection::getShape(const ModuleBase_ViewerPrs& thePrs)
 }
 
 //********************************************************************
-QList<ModuleBase_ViewerPrs> ModuleBase_ISelection::getViewerPrs(const QObjectPtrList& theObjects)
+QList<ModuleBase_ViewerPrsPtr> ModuleBase_ISelection::getViewerPrs(const QObjectPtrList& theObjects)
 {
-  QList<ModuleBase_ViewerPrs> aSelectedPrs;
+  QList<ModuleBase_ViewerPrsPtr> aSelectedPrs;
   QObjectPtrList::const_iterator anIt = theObjects.begin(), aLast = theObjects.end();
   for (; anIt != aLast; anIt++) {
     ObjectPtr anObject = *anIt;
     if (anObject.get() != NULL) {
-      aSelectedPrs.append(ModuleBase_ViewerPrs(anObject, TopoDS_Shape(), NULL));
+      aSelectedPrs.append(std::shared_ptr<ModuleBase_ViewerPrs>(
+               new ModuleBase_ViewerPrs(anObject, GeomShapePtr(), NULL)));
     }
   }
   return aSelectedPrs;
 }
 
 //********************************************************************
-void ModuleBase_ISelection::filterPreselectionOnEqualPoints
-                                              (QList<ModuleBase_ViewerPrs>& theSelected)
+void ModuleBase_ISelection::filterSelectionOnEqualPoints
+                                              (QList<ModuleBase_ViewerPrsPtr>& theSelected)
 {
-  QList<ModuleBase_ViewerPrs> aCandidatesToRemove;
-  QList<ModuleBase_ViewerPrs>::const_iterator anIt = theSelected.begin(),
+  QList<ModuleBase_ViewerPrsPtr> aCandidatesToRemove;
+  QList<ModuleBase_ViewerPrsPtr>::const_iterator anIt = theSelected.begin(),
                                               aLast = theSelected.end();
-  QList<ModuleBase_ViewerPrs>::const_iterator aSubIt;
+  QList<ModuleBase_ViewerPrsPtr>::const_iterator aSubIt;
+
+  std::set<std::shared_ptr<GeomAPI_Vertex> > aVerticesMap;
   for (; anIt != aLast; anIt++) {
-    aSubIt = anIt;
-    aSubIt++;
-    for (; aSubIt != aLast; aSubIt++) {
-      if (isEqualVertices(*anIt, *aSubIt)) {
-        aCandidatesToRemove.append(*aSubIt);
-        break;
+    ModuleBase_ViewerPrsPtr aPrs = *anIt;
+    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();
+      bool aFound = false;
+      for (; anIt != aLast && !aFound; anIt++) {
+        std::shared_ptr<GeomAPI_Vertex> aGeomVertex = *anIt;
+        const TopoDS_Vertex& aVertex = aGeomVertex->impl<TopoDS_Vertex>();
+        gp_Pnt aPoint1 = BRep_Tool::Pnt(aVertex);
+        gp_Pnt aPoint2 = BRep_Tool::Pnt(aPrsVertex);
+
+        std::shared_ptr<GeomAPI_Pnt> aPnt1 = std::shared_ptr<GeomAPI_Pnt>
+                        (new GeomAPI_Pnt(aPoint1.X(), aPoint1.Y(), aPoint1.Z()));
+        std::shared_ptr<GeomAPI_Pnt> aPnt2 = std::shared_ptr<GeomAPI_Pnt>
+                        (new GeomAPI_Pnt(aPoint2.X(), aPoint2.Y(), aPoint2.Z()));
+        aFound = aPnt1->isEqual(aPnt2);
       }
+      if (aFound) {
+        aCandidatesToRemove.append(aPrs);
+        continue;
+      }
+      aVerticesMap.insert(aGeomPrsVertex);
     }
   }
-  QList<ModuleBase_ViewerPrs>::const_iterator aRemIt = aCandidatesToRemove.begin(),
+  QList<ModuleBase_ViewerPrsPtr>::const_iterator aRemIt = aCandidatesToRemove.begin(),
                                               aRemLast = aCandidatesToRemove.end();
   for (; aRemIt != aRemLast; aRemIt++) {
     theSelected.removeAll(*aRemIt);
   }
 }
 
-bool ModuleBase_ISelection::isEqualVertices(const ModuleBase_ViewerPrs thePrs1,
-                                            const ModuleBase_ViewerPrs thePrs2)
+std::shared_ptr<GeomAPI_Vertex> ModuleBase_ISelection::getPresentationVertex(
+                                                         const ModuleBase_ViewerPrsPtr& thePrs)
 {
-  bool isEqual = false;
-  Handle(StdSelect_BRepOwner) anOwner1 = Handle(StdSelect_BRepOwner)::DownCast(thePrs1.owner());
-  Handle(StdSelect_BRepOwner) anOwner2 = Handle(StdSelect_BRepOwner)::DownCast(thePrs2.owner());
-
-  if (!anOwner1.IsNull() && anOwner1->HasShape() &&
-      !anOwner2.IsNull() && anOwner2->HasShape()) {
-    const TopoDS_Shape& aShape1 = anOwner1->Shape();
-    const TopoDS_Shape& aShape2 = anOwner2->Shape();
-    //TopAbs_ShapeEnum aShapeType = aShape.ShapeType();
-    if (aShape1.ShapeType() == TopAbs_VERTEX &&
-        aShape2.ShapeType() == TopAbs_VERTEX) {
-      const TopoDS_Vertex& aVertex1 = TopoDS::Vertex(aShape1);
-      const TopoDS_Vertex& aVertex2 = TopoDS::Vertex(aShape2);
-      if (!aVertex1.IsNull() && !aVertex2.IsNull())  {
-        gp_Pnt aPoint1 = BRep_Tool::Pnt(aVertex1);
-        gp_Pnt aPoint2 = BRep_Tool::Pnt(aVertex2);
-
-        std::shared_ptr<GeomAPI_Pnt> aPnt1 = std::shared_ptr<GeomAPI_Pnt>
-                        (new GeomAPI_Pnt(aPoint1.X(), aPoint1.Y(), aPoint1.Z()));
-        std::shared_ptr<GeomAPI_Pnt> aPnt2 = std::shared_ptr<GeomAPI_Pnt>
-                        (new GeomAPI_Pnt(aPoint2.X(), aPoint2.Y(), aPoint2.Z()));
-        isEqual = aPnt1->isEqual(aPnt2);
+  std::shared_ptr<GeomAPI_Vertex> aGeomVertex;
+  Handle(StdSelect_BRepOwner) anOwner = Handle(StdSelect_BRepOwner)::DownCast(thePrs->owner());
+
+  if (!anOwner.IsNull() && anOwner->HasShape()) {
+    const TopoDS_Shape& aShape = anOwner->Shape();
+    if (aShape.ShapeType() == TopAbs_VERTEX) {
+      const TopoDS_Vertex& aVertex = TopoDS::Vertex(aShape);
+      if (!aVertex.IsNull())  {
+        gp_Pnt aPoint = BRep_Tool::Pnt(aVertex);
+        aGeomVertex = std::shared_ptr<GeomAPI_Vertex>(new GeomAPI_Vertex(aPoint.X(), aPoint.Y(),
+                                                                         aPoint.Z()));
       }
     }
   }
-
-  return isEqual;
+  return aGeomVertex;
 }
+