From 77b44e467b8a8ab3a5b20b8719e593f4f24dc25e Mon Sep 17 00:00:00 2001 From: nds Date: Fri, 12 Feb 2016 14:16:17 +0300 Subject: [PATCH] #1310 Selection by rectangle on compsolid append it twice in multi-selection control --- src/ModuleBase/ModuleBase_ViewerPrs.cpp | 37 ++++++++++++++++++++++++- src/ModuleBase/ModuleBase_ViewerPrs.h | 9 +----- 2 files changed, 37 insertions(+), 9 deletions(-) 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_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 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; } diff --git a/src/ModuleBase/ModuleBase_ViewerPrs.h b/src/ModuleBase/ModuleBase_ViewerPrs.h index 71f2cd627..723a15fb6 100644 --- a/src/ModuleBase/ModuleBase_ViewerPrs.h +++ b/src/ModuleBase/ModuleBase_ViewerPrs.h @@ -101,14 +101,7 @@ class ModuleBase_ViewerPrs /// Returns True if the current object is equal to the given one /// \param thePrs an object to compare - MODULEBASE_EXPORT bool operator==(const ModuleBase_ViewerPrs& thePrs) - { - bool aResult = (myResult.get() == thePrs.object().get()); - bool aOwner = (myOwner.Access() == thePrs.owner().Access()); - bool aShape = myShape.IsEqual(thePrs.shape()) == Standard_True; - bool aIO = (myInteractive == thePrs.interactive()) == Standard_True; - return aResult && aOwner && aShape && aIO; - } + MODULEBASE_EXPORT bool operator==(const ModuleBase_ViewerPrs& thePrs); private: ObjectPtr myResult; /// the feature -- 2.39.2