X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FModuleBase%2FModuleBase_ViewerPrs.cpp;h=deb08fd53e92d2ac1d750b7214a2935cacb89ad7;hb=061a63480f6840b6d945f7744b3b972e2d4cb25d;hp=c515e2b4bf0acca26805d51b1063f2a116212c2e;hpb=1a0d48211014d96db9125fe973eacbae895c4490;p=modules%2Fshaper.git

diff --git a/src/ModuleBase/ModuleBase_ViewerPrs.cpp b/src/ModuleBase/ModuleBase_ViewerPrs.cpp
index c515e2b4b..deb08fd53 100644
--- a/src/ModuleBase/ModuleBase_ViewerPrs.cpp
+++ b/src/ModuleBase/ModuleBase_ViewerPrs.cpp
@@ -6,6 +6,8 @@
 
 #include "ModuleBase_ViewerPrs.h"
 
+#include <ModuleBase_ResultPrs.h>
+
 ModuleBase_ViewerPrs::ModuleBase_ViewerPrs()
 {
 
@@ -18,10 +20,43 @@ ModuleBase_ViewerPrs::ModuleBase_ViewerPrs(ObjectPtr theResult,
   myShape(theShape),
   myOwner(theOwner)
 {
-
 }
 
 ModuleBase_ViewerPrs::~ModuleBase_ViewerPrs()
 {
+}
 
+bool ModuleBase_ViewerPrs::operator==(const ModuleBase_ViewerPrs& thePrs)
+{
+  bool isEqualResult = (myResult.get() == thePrs.object().get());
+  bool isEqualShape = myShape.IsEqual(thePrs.shape()) == Standard_True;
+  bool isEqualIO = (myInteractive == thePrs.interactive()) == Standard_True;
+
+  bool isEqualOwner = (myOwner.Access() == thePrs.owner().Access());
+  if (isEqualResult && isEqualShape && isEqualIO &&
+      !isEqualOwner) { /// owners are different
+    // as we might loading object with the same shape in different modes like
+    // "objects" and "other", it is possible that two owners are created linked
+    // to one shape. We should accept such ViewerPrs as equal to current in order
+    // to do not use the same <result, shape> twice
+    Handle(StdSelect_BRepOwner) anOwner1 = Handle(StdSelect_BRepOwner)::DownCast(myOwner);
+    Handle(StdSelect_BRepOwner) anOwner2 = Handle(StdSelect_BRepOwner)::DownCast(thePrs.owner());
+    if (!anOwner1.IsNull() && !anOwner2.IsNull())
+      isEqualOwner = anOwner1->Shape() == anOwner2->Shape();
+  }
+
+  if (isEqualResult && isEqualShape &&
+      !isEqualIO) { /// AIS are different
+    // check that the owner is a fictive owner for compsolid object, created in the
+    // ComputeSelection of ModuleBase_ResultPrs. A new owner is created there for each subsolid
+    // and set in the sub-solid AIS. ViewerPrs of these fictive owners are accepted as equal
+    // as they use the same shape and result(of compsolid)
+    Handle(ModuleBase_BRepOwner) aCSolidOwner1 = Handle(ModuleBase_BRepOwner)::DownCast(myOwner);
+    Handle(ModuleBase_BRepOwner) aCSolidOwner2 = Handle(ModuleBase_BRepOwner)::DownCast(thePrs.owner());
+    isEqualIO = !aCSolidOwner1.IsNull() && !aCSolidOwner2.IsNull();
+    if (!aCSolidOwner1.IsNull() && !aCSolidOwner1.IsNull())
+      isEqualOwner = aCSolidOwner1->Shape() == aCSolidOwner1->Shape();
+  }
+
+  return isEqualResult && isEqualShape && isEqualOwner && isEqualIO;
 }