X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_Displayer.cpp;h=f0ac7b3b355543ec2d90bf2be69e3955557d619f;hb=b73fb7468bea81901dbeed8e229d742f788ec282;hp=dafd6dd98246261e97fd705e1bee84c3c9d399e4;hpb=1de75803e9baf3de59fa755f9eccb6ef60bb64e4;p=modules%2Fshaper.git diff --git a/src/XGUI/XGUI_Displayer.cpp b/src/XGUI/XGUI_Displayer.cpp index dafd6dd98..f0ac7b3b3 100644 --- a/src/XGUI/XGUI_Displayer.cpp +++ b/src/XGUI/XGUI_Displayer.cpp @@ -1,15 +1,32 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D --> - -// File: XGUI_Displayer.cpp -// Created: 20 Apr 2014 -// Author: Natalia ERMOLAEVA +// Copyright (C) 2014-2017 CEA/DEN, EDF R&D +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// 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 +// +// See http://www.salome-platform.org/ or +// email : webmaster.salome@opencascade.com +// #include "XGUI_Displayer.h" -#include "XGUI_Workshop.h" -#include "XGUI_ViewerProxy.h" -#include "XGUI_SelectionMgr.h" -#include "XGUI_Selection.h" + #include "XGUI_CustomPrs.h" +#include "XGUI_FacesPanel.h" +#include "XGUI_Selection.h" +#include "XGUI_SelectionActivate.h" +#include "XGUI_SelectionMgr.h" +#include "XGUI_ViewerProxy.h" +#include "XGUI_Workshop.h" #ifndef HAVE_SALOME #include @@ -20,17 +37,21 @@ #include #include #include -#include +#include +#include +#include +#include #include #include -#include #include -#include +#include #include #include #include +#include +#include #include @@ -47,12 +68,12 @@ #include #endif #include -#include -#include -#include #include #include +#include +#include #include +#include #include @@ -60,7 +81,7 @@ #include #ifdef TINSPECTOR -#include +#include #endif #include @@ -71,11 +92,6 @@ /// defines the local context mouse selection sensitivity const int MOUSE_SENSITIVITY_IN_PIXEL = 10; -//#define DEBUG_ACTIVATE_OBJECTS -//#define DEBUG_DEACTIVATE -//#define DEBUG_ACTIVATE_AIS -//#define DEBUG_DEACTIVATE_AIS - //#define DEBUG_DISPLAY //#define DEBUG_FEATURE_REDISPLAY //#define DEBUG_SELECTION_FILTERS @@ -86,6 +102,9 @@ const int MOUSE_SENSITIVITY_IN_PIXEL = 10; #define CLEAR_OUTDATED_SELECTION_BEFORE_REDISPLAY +//#define DEBUG_VIEWER_BLOCKED_COUNT + +//************************************************************** void displayedObjects(const Handle(AIS_InteractiveContext)& theAIS, AIS_ListOfInteractive& theList) { // Get from null point @@ -102,44 +121,26 @@ QString qIntListInfo(const QIntList& theValues, const QString& theSeparator = QS return anInfo.join(theSeparator); } -void deselectPresentation(const Handle(AIS_InteractiveObject) theObject, - const Handle(AIS_InteractiveContext)& theContext) -{ - NCollection_List aResultOwners; - - for (theContext->InitSelected(); theContext->MoreSelected(); theContext->NextSelected()) { - Handle(SelectMgr_EntityOwner) anOwner = theContext->SelectedOwner(); - if (anOwner.IsNull()) // TODO: check why it is possible - continue; - if (anOwner->Selectable() == theObject && anOwner->IsSelected()) - aResultOwners.Append(anOwner); - } - NCollection_List::Iterator anOwnersIt (aResultOwners); - Handle(SelectMgr_EntityOwner) anOwner; - for (; anOwnersIt.More(); anOwnersIt.Next()) { - anOwner = Handle(SelectMgr_EntityOwner)::DownCast(anOwnersIt.Value()); - if (!anOwner.IsNull()) - theContext->AddOrRemoveSelected(anOwner, false); - } -} - +//************************************************************** XGUI_Displayer::XGUI_Displayer(XGUI_Workshop* theWorkshop) - : myWorkshop(theWorkshop), myNeedUpdate(false), - myIsTrihedronActive(true), myViewerBlockedRecursiveCount(0), - myIsFirstAISContextUse(true) +: myWorkshop(theWorkshop), myNeedUpdate(false), + myViewerBlockedRecursiveCount(0), myIsFirstAISContextUse(true) { myCustomPrs = std::shared_ptr(new XGUI_CustomPrs(theWorkshop)); } +//************************************************************** XGUI_Displayer::~XGUI_Displayer() { } +//************************************************************** bool XGUI_Displayer::isVisible(ObjectPtr theObject) const { return myResult2AISObjectMap.contains(theObject); } +//************************************************************** bool XGUI_Displayer::display(ObjectPtr theObject, bool theUpdateViewer) { bool aDisplayed = false; @@ -164,8 +165,13 @@ bool XGUI_Displayer::display(ObjectPtr theObject, bool theUpdateViewer) GeomPresentablePtr aPrs = std::dynamic_pointer_cast(theObject); bool isShading = false; if (aPrs.get() != NULL) { + GeomScreenParamsPtr aScreen = std::dynamic_pointer_cast(theObject); + if (aScreen.get()) { + aScreen->setScreenPlane(getScreenPlane()); + aScreen->setViewScale(getViewScale()); + } anAIS = aPrs->getAISObject(anAIS); - if (anAIS.get()) { + //if (anAIS.get()) { // correct deviation coefficient for /*Handle(AIS_InteractiveObject) anAISPrs = anAIS->impl(); if (!anAISPrs.IsNull()) { @@ -176,7 +182,7 @@ bool XGUI_Displayer::display(ObjectPtr theObject, bool theUpdateViewer) //ModuleBase_Tools::setDefaultDeviationCoefficient(aShape, anAISPrs->Attributes()); } }*/ - } + //} } else { ResultPtr aResult = std::dynamic_pointer_cast(theObject); if (aResult.get() != NULL) { @@ -221,6 +227,7 @@ bool XGUI_Displayer::display(ObjectPtr theObject, bool theUpdateViewer) return aDisplayed; } +//************************************************************** bool canBeShaded(Handle(AIS_InteractiveObject) theAIS, ModuleBase_IModule* theModule) { Handle(AIS_Shape) aShapePrs = Handle(AIS_Shape)::DownCast(theAIS); @@ -239,6 +246,7 @@ bool canBeShaded(Handle(AIS_InteractiveObject) theAIS, ModuleBase_IModule* theMo return false; } +//************************************************************** bool XGUI_Displayer::display(ObjectPtr theObject, AISObjectPtr theAIS, bool isShading, bool theUpdateViewer) { @@ -265,7 +273,7 @@ bool XGUI_Displayer::display(ObjectPtr theObject, AISObjectPtr theAIS, aDisplayed = true; emit objectDisplayed(theObject, theAIS); - activate(anAISIO, myActiveSelectionModes, theUpdateViewer); + selectionActivate()->activate(anAISIO, theUpdateViewer); } if (theUpdateViewer) updateViewer(); @@ -273,6 +281,7 @@ bool XGUI_Displayer::display(ObjectPtr theObject, AISObjectPtr theAIS, return aDisplayed; } +//************************************************************** bool XGUI_Displayer::erase(ObjectPtr theObject, const bool theUpdateViewer) { bool aErased = false; @@ -283,7 +292,7 @@ bool XGUI_Displayer::erase(ObjectPtr theObject, const bool theUpdateViewer) if (aContext.IsNull()) return aErased; - AISObjectPtr anObject = myResult2AISObjectMap[theObject]; + AISObjectPtr anObject = myResult2AISObjectMap.value(theObject); if (anObject) { Handle(AIS_InteractiveObject) anAIS = anObject->impl(); if (!anAIS.IsNull()) { @@ -310,6 +319,7 @@ bool XGUI_Displayer::erase(ObjectPtr theObject, const bool theUpdateViewer) return aErased; } +//************************************************************** bool XGUI_Displayer::redisplay(ObjectPtr theObject, bool theUpdateViewer) { bool aRedisplayed = false; @@ -321,6 +331,11 @@ bool XGUI_Displayer::redisplay(ObjectPtr theObject, bool theUpdateViewer) GeomPresentablePtr aPrs = std::dynamic_pointer_cast(theObject); if (aPrs) { + GeomScreenParamsPtr aScreen = std::dynamic_pointer_cast(theObject); + if (aScreen.get()) { + aScreen->setScreenPlane(getScreenPlane()); + aScreen->setViewScale(getViewScale()); + } AISObjectPtr aAIS_Obj = aPrs->getAISObject(aAISObj); if (!aAIS_Obj) { aRedisplayed = erase(theObject, theUpdateViewer); @@ -368,7 +383,7 @@ bool XGUI_Displayer::redisplay(ObjectPtr theObject, bool theUpdateViewer) myWorkshop->module()->storeSelection(); #ifdef CLEAR_OUTDATED_SELECTION_BEFORE_REDISPLAY - deselectPresentation(aAISIO, aContext); + myWorkshop->selector()->deselectPresentation(aAISIO); #endif aContext->Redisplay(aAISIO, false); @@ -390,6 +405,7 @@ bool XGUI_Displayer::redisplay(ObjectPtr theObject, bool theUpdateViewer) return aRedisplayed; } +//************************************************************** void XGUI_Displayer::redisplayObjects() { // redisplay objects visualized in the viewer @@ -403,30 +419,7 @@ void XGUI_Displayer::redisplayObjects() Events_Loop::loop()->flush(EVENT_DISP); } -void XGUI_Displayer::deactivate(ObjectPtr theObject, const bool theUpdateViewer) -{ -#ifdef DEBUG_DEACTIVATE - QString anInfoStr = ModuleBase_Tools::objectInfo(theObject); - qDebug(QString("deactivate: myActiveSelectionModes[%1]: %2, objects = "). - arg(myActiveSelectionModes.size()).arg(qIntListInfo(myActiveSelectionModes)). - arg(anInfoStr). - toStdString().c_str()); -#endif - Handle(AIS_InteractiveContext) aContext = AISContext(); - if (!aContext.IsNull() && isVisible(theObject)) { - AISObjectPtr anObj = myResult2AISObjectMap[theObject]; - Handle(AIS_InteractiveObject) anAIS = anObj->impl(); - - deactivateAIS(anAIS); - // the selection from the previous activation modes should be cleared manually (#26172) -#ifndef CLEAR_OUTDATED_SELECTION_BEFORE_REDISPLAY - deselectPresentation(anAIS, aContext); -#endif - if (theUpdateViewer) - updateViewer(); - } -} - +//************************************************************** void XGUI_Displayer::deactivateObjects(const QObjectPtrList& theObjList, const bool theUpdateViewer) { @@ -436,38 +429,14 @@ void XGUI_Displayer::deactivateObjects(const QObjectPtrList& theObjList, QObjectPtrList::const_iterator anIt = theObjList.begin(), aLast = theObjList.end(); for (; anIt != aLast; anIt++) { - deactivate(*anIt, false); + selectionActivate()->deactivate(*anIt, false); } //VSV It seems that there is no necessity to update viewer on deactivation //if (theUpdateViewer) // updateViewer(); } -void XGUI_Displayer::getModesOfActivation(ObjectPtr theObject, QIntList& theModes) -{ - Handle(AIS_InteractiveContext) aContext = AISContext(); - if (aContext.IsNull() || !isVisible(theObject)) - return; - - AISObjectPtr aAISObj = getAISObject(theObject); - - if (aAISObj.get() != NULL) { - Handle(AIS_InteractiveObject) anAISIO = aAISObj->impl(); - TColStd_ListOfInteger aTColModes; - aContext->ActivatedModes(anAISIO, aTColModes); - TColStd_ListIteratorOfListOfInteger itr( aTColModes ); - for (; itr.More(); itr.Next() ) { - theModes.append(itr.Value()); - } - } -} - -int XGUI_Displayer::getSelectionMode(int theShapeType) -{ - return (theShapeType > TopAbs_SHAPE) ? theShapeType : - AIS_Shape::SelectionMode((TopAbs_ShapeEnum)theShapeType); -} - +//************************************************************** bool XGUI_Displayer::isVisible(XGUI_Displayer* theDisplayer, const ObjectPtr& theObject) { bool aVisible = false; @@ -478,9 +447,8 @@ bool XGUI_Displayer::isVisible(XGUI_Displayer* theDisplayer, const ObjectPtr& th // compsolid is not visualized in the viewer, // but should have presentation when all sub solids are // visible. It is useful for highlight presentation where compsolid shape is selectable - if (!aVisible && aResult.get() && aResult->groupName() == ModelAPI_ResultCompSolid::group()) { - ResultCompSolidPtr aCompsolidResult = - std::dynamic_pointer_cast(aResult); + if (!aVisible && aResult.get() && aResult->groupName() == ModelAPI_ResultBody::group()) { + ResultBodyPtr aCompsolidResult = std::dynamic_pointer_cast(aResult); if (aCompsolidResult.get() != NULL) { // change colors for all sub-solids bool anAllSubsVisible = aCompsolidResult->numberOfSubs() > 0; for(int i = 0; i < aCompsolidResult->numberOfSubs() && anAllSubsVisible; i++) { @@ -506,127 +474,7 @@ bool XGUI_Displayer::isVisible(XGUI_Displayer* theDisplayer, const ObjectPtr& th return aVisible; } -#ifdef DEBUG_ACTIVATE_OBJECTS -QString getModeInfo(const int theMode) -{ - QString anInfo = "Undefined"; - switch(theMode) { - case 0: anInfo = "SHAPE(0)"; break; - case 1: anInfo = "VERTEX(1)"; break; - case 2: anInfo = "EDGE(2)"; break; - case 3: anInfo = "WIRE(3)"; break; - case 4: anInfo = "FACE(4)"; break; - case 5: anInfo = "SHELL(5)"; break; - case 6: anInfo = "SOLID(6)"; break; - case 7: anInfo = "COMPSOLID(7)"; break; - case 8: anInfo = "COMPOUND(8)"; break; - case 100: anInfo = "Sel_Mode_First(100)"; break; //SketcherPrs_Tools - case 101: anInfo = "Sel_Constraint(101)"; break; - case 102: anInfo = "Sel_Dimension_All(102)"; break; - case 103: anInfo = "Sel_Dimension_Line(103)"; break; - case 104: anInfo = "Sel_Dimension_Text(104)"; break; - default: break; - } - return anInfo; -} - -QString getModesInfo(const QIntList& theModes) -{ - QStringList aModesInfo; - for (int i = 0, aSize = theModes.size(); i < aSize; i++) - aModesInfo.append(getModeInfo(theModes[i])); - return QString("[%1] = %2").arg(aModesInfo.size()).arg(aModesInfo.join(", ")); -} -#endif - -void XGUI_Displayer::activateObjects(const QIntList& theModes, const QObjectPtrList& theObjList, - const bool theUpdateViewer) -{ - // Convert shape types to selection types - QIntList aModes; - foreach(int aType, theModes) { - aModes.append(getSelectionMode(aType)); - } - -#ifdef DEBUG_ACTIVATE_OBJECTS - QStringList anInfo; - QObjectPtrList::const_iterator anIt = theObjList.begin(), aLast = theObjList.end(); - for (; anIt != aLast; ++anIt) { - anInfo.append(ModuleBase_Tools::objectInfo((*anIt))); - } - QString anInfoStr = anInfo.join(", "); - - qDebug(QString("activateObjects: new modes%1, active modes%2, objects[%3] = %4"). - arg(getModesInfo(aModes)). - arg(getModesInfo(myActiveSelectionModes)). - arg(theObjList.size()). - arg(anInfoStr). - toStdString().c_str()); -#endif - // In order to avoid doblications of selection modes - QIntList aNewModes; - foreach (int aMode, aModes) { - if (!aNewModes.contains(aMode)) - aNewModes.append(aMode); - } - myActiveSelectionModes = aNewModes; - Handle(AIS_InteractiveContext) aContext = AISContext(); - // Open local context if there is no one - if (aContext.IsNull()) - return; - - //aContext->UseDisplayedObjects(); - //myUseExternalObjects = true; - - Handle(AIS_InteractiveObject) anAISIO; - AIS_ListOfInteractive aPrsList; - //if (aObjList.isEmpty()) - // return; - //else { - foreach(ObjectPtr aObj, theObjList) { - if (myResult2AISObjectMap.contains(aObj)) - aPrsList.Append(myResult2AISObjectMap[aObj]->impl()); - } - //} - - // Add trihedron because it has to partisipate in selection - Handle(AIS_InteractiveObject) aTrihedron; - if (isTrihedronActive()) { - aTrihedron = getTrihedron(); - if (!aTrihedron.IsNull() && aContext->IsDisplayed(aTrihedron)) - aPrsList.Append(aTrihedron); - } - if (aPrsList.Extent() == 0) - return; - - AIS_ListIteratorOfListOfInteractive aLIt(aPrsList); - bool isActivationChanged = false; - for(aLIt.Initialize(aPrsList); aLIt.More(); aLIt.Next()){ - anAISIO = aLIt.Value(); - if (activate(anAISIO, myActiveSelectionModes, false)) - isActivationChanged = true; - } -} - -bool XGUI_Displayer::isActive(ObjectPtr theObject) const -{ - Handle(AIS_InteractiveContext) aContext = AISContext(); - if (aContext.IsNull() || !isVisible(theObject)) - return false; - - AISObjectPtr anObj = myResult2AISObjectMap[theObject]; - Handle(AIS_InteractiveObject) anAIS = anObj->impl(); - - TColStd_ListOfInteger aModes; - aContext->ActivatedModes(anAIS, aModes); - #ifdef TINSPECTOR - if (getCallBack()) getCallBack()->ActivatedModes(anAIS, aModes); - #endif - - return aModes.Extent() > 0; -} - - +//************************************************************** void XGUI_Displayer::setSelected(const QList& theValues, bool theUpdateViewer) { @@ -666,7 +514,7 @@ void XGUI_Displayer::setSelected(const QList& theValue ObjectPtr anObject = aPrs->object(); ResultPtr aResult = std::dynamic_pointer_cast(anObject); if (aResult.get() && isVisible(aResult)) { - AISObjectPtr anObj = myResult2AISObjectMap[aResult]; + AISObjectPtr anObj = myResult2AISObjectMap.value(aResult); Handle(AIS_InteractiveObject) anAIS = anObj->impl(); if (!anAIS.IsNull()) { // The methods are replaced in order to provide multi-selection, e.g. restore selection @@ -689,6 +537,7 @@ void XGUI_Displayer::setSelected(const QList& theValue updateViewer(); } +//************************************************************** void XGUI_Displayer::clearSelected(const bool theUpdateViewer) { Handle(AIS_InteractiveContext) aContext = AISContext(); @@ -701,13 +550,19 @@ void XGUI_Displayer::clearSelected(const bool theUpdateViewer) } } +//************************************************************** bool XGUI_Displayer::eraseAll(const bool theUpdateViewer) { bool aErased = false; Handle(AIS_InteractiveContext) aContext = AISContext(); if (!aContext.IsNull()) { - foreach (ObjectPtr aObj, myResult2AISObjectMap.keys()) { +#ifdef OPTIMIZE_PRS + foreach(ObjectPtr aObj, myResult2AISObjectMap.objects()) { + AISObjectPtr aAISObj = myResult2AISObjectMap.value(aObj); +#else + foreach(ObjectPtr aObj, myResult2AISObjectMap.keys()) { AISObjectPtr aAISObj = myResult2AISObjectMap[aObj]; +#endif // erase an object Handle(AIS_InteractiveObject) anIO = aAISObj->impl(); if (!anIO.IsNull()) { @@ -730,194 +585,44 @@ bool XGUI_Displayer::eraseAll(const bool theUpdateViewer) return aErased; } -void deactivateObject(Handle(AIS_InteractiveContext) theContext, - Handle(AIS_InteractiveObject) theObject -#ifdef TINSPECTOR - , Handle(VInspectorAPI_CallBack) theCallBack -#endif - ) -{ - if (!theObject.IsNull()) { - theContext->Deactivate(theObject); - #ifdef TINSPECTOR - if (theCallBack) theCallBack->Deactivate(theObject); - #endif - } -} - -void XGUI_Displayer::deactivateTrihedron(const bool theUpdateViewer) const -{ - Handle(AIS_InteractiveObject) aTrihedron = getTrihedron(); - Handle(AIS_InteractiveContext) aContext = AISContext(); - if (!aTrihedron.IsNull() && aContext->IsDisplayed(aTrihedron)) { - Handle(AIS_Trihedron) aTrie = Handle(AIS_Trihedron)::DownCast(aTrihedron); - deactivateObject(aContext, aTrie - #ifdef TINSPECTOR - , getCallBack() - #endif - ); - - /// #1136 hidden axis are selected in sketch -#ifdef BEFORE_TRIHEDRON_PATCH - deactivateObject(aContext, aTrie->XAxis() - #ifdef TINSPECTOR - , getCallBack() - #endif - ); - deactivateObject(aContext, aTrie->YAxis() - #ifdef TINSPECTOR - , getCallBack() - #endif - ); - deactivateObject(aContext, aTrie->Axis() - #ifdef TINSPECTOR - , getCallBack() - #endif - ); - deactivateObject(aContext, aTrie->Position() - #ifdef TINSPECTOR - , getCallBack() - #endif - ); - - deactivateObject(aContext, aTrie->XYPlane() - #ifdef TINSPECTOR - , getCallBack() - #endif - ); - deactivateObject(aContext, aTrie->XZPlane() - #ifdef TINSPECTOR - , getCallBack() - #endif - ); - deactivateObject(aContext, aTrie->YZPlane() - #ifdef TINSPECTOR - , getCallBack() - #endif - ); -#endif - if (theUpdateViewer) - updateViewer(); - } -} - -Handle(AIS_InteractiveObject) XGUI_Displayer::getTrihedron() const -{ - return myWorkshop->viewer()->trihedron(); -} - -/*void XGUI_Displayer::openLocalContext() -{ - Handle(AIS_InteractiveContext) aContext = AISContext(); - // Open local context if there is no one - if (!aContext.IsNull() && !aContext->HasOpenedContext()) { - // Preserve selected objects - //AIS_ListOfInteractive aAisList; - //for (aContext->InitCurrent(); aContext->MoreCurrent(); aContext->NextCurrent()) - // aAisList.Append(aContext->Current()); - - // get the filters from the global context and append them to the local context - // a list of filters in the global context is not cleared and should be cleared here - SelectMgr_ListOfFilter aFilters; - aFilters.Assign(aContext->Filters()); - // it is important to remove the filters in the global context, because there is a code - // in the closeLocalContex, which restore the global context filters - aContext->RemoveFilters(); - - //aContext->ClearCurrents(); - aContext->OpenLocalContext(); - //deactivateTrihedron(); - //aContext->NotUseDisplayedObjects(); - - //myUseExternalObjects = false; - - SelectMgr_ListIteratorOfListOfFilter aIt(aFilters); - for (;aIt.More(); aIt.Next()) { - aContext->AddFilter(aIt.Value()); - } - // Restore selection - //AIS_ListIteratorOfListOfInteractive aIt2(aAisList); - //for(; aIt2.More(); aIt2.Next()) { - // aContext->SetSelected(aIt2.Value(), false); - //} - } -}*/ - -/*void XGUI_Displayer::closeLocalContexts(const bool theUpdateViewer) -{ - Handle(AIS_InteractiveContext) aContext = AISContext(); - if (!aContext.IsNull() && aContext->HasOpenedContext()) { - // Preserve selected objects - //AIS_ListOfInteractive aAisList; - //for (aContext->InitSelected(); aContext->MoreSelected(); aContext->NextSelected()) - // aAisList.Append(aContext->SelectedInteractive()); - - // get the filters from the local context and append them to the global context - // a list of filters in the local context is cleared - SelectMgr_ListOfFilter aFilters; - aFilters.Assign(aContext->Filters()); - - //aContext->ClearSelected(); - aContext->CloseAllContexts(false); - - // From the moment when the AIS_DS_Displayed flag is used in the Display of AIS object, - // this code is obsolete. It is temporaty commented and should be removed after - // the test campaign. - // Redisplay all object if they were displayed in localContext - /*Handle(AIS_InteractiveObject) aAISIO; - foreach (AISObjectPtr aAIS, myResult2AISObjectMap) { - aAISIO = aAIS->impl(); - if (aContext->DisplayStatus(aAISIO) != AIS_DS_Displayed) { - aContext->Display(aAISIO, false); - aContext->SetDisplayMode(aAISIO, Shading, false); - } - }*+/ - - // Append the filters from the local selection in the global selection context - SelectMgr_ListIteratorOfListOfFilter aIt(aFilters); - for (;aIt.More(); aIt.Next()) { - Handle(SelectMgr_Filter) aFilter = aIt.Value(); - aContext->AddFilter(aFilter); - } - - if (theUpdateViewer) - updateViewer(); - //myUseExternalObjects = false; - - // Restore selection - //AIS_ListIteratorOfListOfInteractive aIt2(aAisList); - //for(; aIt2.More(); aIt2.Next()) { - // if (aContext->IsDisplayed(aIt2.Value())) - // aContext->SetCurrentObject(aIt2.Value(), false); - //} - } -}*/ +//************************************************************** AISObjectPtr XGUI_Displayer::getAISObject(ObjectPtr theObject) const { +#ifdef OPTIMIZE_PRS + return myResult2AISObjectMap.value(theObject); +#else AISObjectPtr anIO; if (myResult2AISObjectMap.contains(theObject)) anIO = myResult2AISObjectMap[theObject]; return anIO; +#endif } +//************************************************************** ObjectPtr XGUI_Displayer::getObject(const AISObjectPtr& theIO) const { Handle(AIS_InteractiveObject) aRefAIS = theIO->impl(); return getObject(aRefAIS); } +//************************************************************** ObjectPtr XGUI_Displayer::getObject(const Handle(AIS_InteractiveObject)& theIO) const { +#ifdef OPTIMIZE_PRS + ObjectPtr anObject = myResult2AISObjectMap.value(theIO); +#else ObjectPtr anObject; - foreach (ObjectPtr anObj, myResult2AISObjectMap.keys()) { - AISObjectPtr aAIS = myResult2AISObjectMap[anObj]; + ResultToAISMap::const_iterator aMapIter = myResult2AISObjectMap.cbegin(); + for (; aMapIter != myResult2AISObjectMap.cend(); aMapIter++) { + const AISObjectPtr& aAIS = aMapIter.value(); Handle(AIS_InteractiveObject) anAIS = aAIS->impl(); if (anAIS == theIO) - anObject = anObj; + anObject = aMapIter.key(); if (anObject.get()) break; } +#endif if (!anObject.get()) { std::shared_ptr anAISObj = AISObjectPtr(new GeomAPI_AISObject()); if (!theIO.IsNull()) { @@ -928,6 +633,7 @@ ObjectPtr XGUI_Displayer::getObject(const Handle(AIS_InteractiveObject)& theIO) return anObject; } +//************************************************************** bool XGUI_Displayer::enableUpdateViewer(const bool isEnabled) { bool aWasEnabled = isUpdateEnabled(); @@ -936,6 +642,10 @@ bool XGUI_Displayer::enableUpdateViewer(const bool isEnabled) else myViewerBlockedRecursiveCount++; +#ifdef DEBUG_VIEWER_BLOCKED_COUNT + std::cout << "myViewerBlockedRecursiveCount = " << myViewerBlockedRecursiveCount << std::endl; +#endif + if (myNeedUpdate && isUpdateEnabled()) { updateViewer(); myNeedUpdate = false; @@ -943,14 +653,22 @@ bool XGUI_Displayer::enableUpdateViewer(const bool isEnabled) return aWasEnabled; } +//************************************************************** bool XGUI_Displayer::isUpdateEnabled() const { return myViewerBlockedRecursiveCount == 0; } +//************************************************************** void XGUI_Displayer::updateViewer() const { Handle(AIS_InteractiveContext) aContext = AISContext(); + +#ifdef DEBUG_VIEWER_BLOCKED_COUNT + std::cout << "updateViewer: " << (myViewerBlockedRecursiveCount == 0 ? " done" : " later") + << std::endl; +#endif + if (!aContext.IsNull() && isUpdateEnabled()) { //myWorkshop->viewer()->Zfitall(); aContext->UpdateCurrentViewer(); @@ -959,93 +677,23 @@ void XGUI_Displayer::updateViewer() const } } -void XGUI_Displayer::activateAIS(const Handle(AIS_InteractiveObject)& theIO, - const int theMode, const bool theUpdateViewer) const -{ - Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext(); - if (!theIO.IsNull() && theIO == getTrihedron()) { - if (theMode != AIS_Shape::SelectionType(TopAbs_EDGE) && - theMode != AIS_Shape::SelectionType(TopAbs_VERTEX)) - return; - } - if (!aContext.IsNull()) { - if (myWorkshop->module()) { - int aMode = (theMode > 8)? theMode : AIS_Shape::SelectionType(theMode); - aContext->Activate(theIO, theMode, false); - } else - aContext->Activate(theIO, theMode, false); - #ifdef TINSPECTOR - if (getCallBack()) getCallBack()->Activate(theIO, theMode); - #endif - - // the fix from VPA for more suitable selection of sketcher lines - if (theIO->Width() > 1) { - double aPrecision = theIO->Width() + 2; - if (theMode == getSelectionMode(TopAbs_VERTEX)) - aPrecision = ModuleBase_Preferences::resourceMgr()->doubleValue("Viewer", - "point-selection-sensitivity", - 12); - else if ((theMode == getSelectionMode(TopAbs_EDGE)) || - (theMode == getSelectionMode(TopAbs_WIRE))) - aPrecision = theIO->Width() + - ModuleBase_Preferences::resourceMgr()->doubleValue("Viewer", - "edge-selection-sensitivity", 2); - aContext->SetSelectionSensitivity(theIO, theMode, aPrecision); - } - -#ifdef DEBUG_ACTIVATE_AIS - ObjectPtr anObject = getObject(theIO); - anInfo.append(ModuleBase_Tools::objectInfo((*anIt))); - qDebug(QString("activateAIS: theMode = %1, object = %2").arg(theMode) - .arg(anInfo).toStdString().c_str()); -#endif - if (theUpdateViewer) - updateViewer(); - } -} - -void XGUI_Displayer::deactivateAIS(const Handle(AIS_InteractiveObject)& theIO, - const int theMode) const -{ - Handle(AIS_InteractiveContext) aContext = AISContext(); - if (!aContext.IsNull()) { - if (theMode == -1) { - aContext->Deactivate(theIO); - #ifdef TINSPECTOR - if (getCallBack()) getCallBack()->Deactivate(theIO); - #endif - } - else { - aContext->Deactivate(theIO, theMode); - #ifdef TINSPECTOR - if (getCallBack()) getCallBack()->Deactivate(theIO, theMode); - #endif - } - -#ifdef DEBUG_DEACTIVATE_AIS - ObjectPtr anObject = getObject(theIO); - anInfo.append(ModuleBase_Tools::objectInfo((*anIt))); - qDebug(QString("deactivateAIS: theMode = %1, object = %2").arg(theMode) - .arg(anInfo).toStdString().c_str()); -#endif - } -} - +//************************************************************** Handle(AIS_InteractiveContext) XGUI_Displayer::AISContext() const { Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext(); if (!aContext.IsNull() && myIsFirstAISContextUse/*&& !aContext->HasOpenedContext()*/) { XGUI_Displayer* aDisplayer = (XGUI_Displayer*)this; aDisplayer->myIsFirstAISContextUse = false; - //aContext->OpenLocalContext(); - if (!isTrihedronActive()) - deactivateTrihedron(true); + if (!myWorkshop->selectionActivate()->isTrihedronActive()) + selectionActivate()->deactivateTrihedron(true); aContext->DefaultDrawer()->VIsoAspect()->SetNumber(0); aContext->DefaultDrawer()->UIsoAspect()->SetNumber(0); + ModuleBase_IViewer::DefaultHighlightDrawer = aContext->HighlightStyle(); } return aContext; } +//************************************************************** Handle(SelectMgr_AndFilter) XGUI_Displayer::GetFilter() { Handle(AIS_InteractiveContext) aContext = AISContext(); @@ -1056,14 +704,15 @@ Handle(SelectMgr_AndFilter) XGUI_Displayer::GetFilter() return myAndFilter; } +//************************************************************** bool XGUI_Displayer::displayAIS(AISObjectPtr theAIS, const bool toActivateInSelectionModes, - bool theUpdateViewer) + const Standard_Integer theDisplayMode, bool theUpdateViewer) { bool aDisplayed = false; Handle(AIS_InteractiveContext) aContext = AISContext(); Handle(AIS_InteractiveObject) anAISIO = theAIS->impl(); if (!aContext.IsNull() && !anAISIO.IsNull()) { - aContext->Display(anAISIO, 0/*wireframe*/, 0, false/*update viewer*/, true, AIS_DS_Displayed); + aContext->Display(anAISIO, theDisplayMode, 0, false/*update viewer*/, true, AIS_DS_Displayed); #ifdef TINSPECTOR if (getCallBack()) getCallBack()->Display(anAISIO); #endif @@ -1076,21 +725,16 @@ bool XGUI_Displayer::displayAIS(AISObjectPtr theAIS, const bool toActivateInSele #ifdef TINSPECTOR if (getCallBack()) getCallBack()->Load(anAISIO); #endif - if (toActivateInSelectionModes) { - if (myActiveSelectionModes.size() == 0) - activateAIS(anAISIO, 0, theUpdateViewer); - else { - foreach(int aMode, myActiveSelectionModes) { - activateAIS(anAISIO, aMode, theUpdateViewer); - } - } - } + if (toActivateInSelectionModes) + myWorkshop->selectionActivate()->activateOnDisplay(anAISIO, theUpdateViewer); + if (theUpdateViewer) updateViewer(); } return aDisplayed; } +//************************************************************** bool XGUI_Displayer::eraseAIS(AISObjectPtr theAIS, const bool theUpdateViewer) { bool aErased = false; @@ -1110,7 +754,7 @@ bool XGUI_Displayer::eraseAIS(AISObjectPtr theAIS, const bool theUpdateViewer) return aErased; } - +//************************************************************** void XGUI_Displayer::setDisplayMode(ObjectPtr theObject, DisplayMode theMode, bool theUpdateViewer) { if (theMode == NoMode) @@ -1131,6 +775,7 @@ void XGUI_Displayer::setDisplayMode(ObjectPtr theObject, DisplayMode theMode, bo updateViewer(); } +//************************************************************** XGUI_Displayer::DisplayMode XGUI_Displayer::displayMode(ObjectPtr theObject) const { Handle(AIS_InteractiveContext) aContext = AISContext(); @@ -1145,7 +790,8 @@ XGUI_Displayer::DisplayMode XGUI_Displayer::displayMode(ObjectPtr theObject) con return (XGUI_Displayer::DisplayMode) aAISIO->DisplayMode(); } -void XGUI_Displayer::deactivateSelectionFilters() +//************************************************************** +void XGUI_Displayer::deactivateSelectionFilters(const bool theAddFilterOnly) { Handle(AIS_InteractiveContext) aContext = AISContext(); if (!myAndFilter.IsNull()) { @@ -1164,6 +810,7 @@ void XGUI_Displayer::deactivateSelectionFilters() } } +//************************************************************** void XGUI_Displayer::addSelectionFilter(const Handle(SelectMgr_Filter)& theFilter) { Handle(AIS_InteractiveContext) aContext = AISContext(); @@ -1180,6 +827,7 @@ void XGUI_Displayer::addSelectionFilter(const Handle(SelectMgr_Filter)& theFilte } } +//************************************************************** void XGUI_Displayer::removeSelectionFilter(const Handle(SelectMgr_Filter)& theFilter) { Handle(AIS_InteractiveContext) aContext = AISContext(); @@ -1197,6 +845,7 @@ void XGUI_Displayer::removeSelectionFilter(const Handle(SelectMgr_Filter)& theFi } } +//************************************************************** bool XGUI_Displayer::hasSelectionFilter(const Handle(SelectMgr_Filter)& theFilter) { bool aFilterFound = false; @@ -1221,6 +870,7 @@ bool XGUI_Displayer::hasSelectionFilter(const Handle(SelectMgr_Filter)& theFilte return aFilterFound; } +//************************************************************** void XGUI_Displayer::removeFilters() { Handle(AIS_InteractiveContext) aContext = AISContext(); @@ -1232,9 +882,14 @@ void XGUI_Displayer::removeFilters() aCompositeFilter->Clear(); } +//************************************************************** void XGUI_Displayer::showOnly(const QObjectPtrList& theList) { +#ifdef OPTIMIZE_PRS + QObjectPtrList aDispList = myResult2AISObjectMap.objects(); +#else QObjectPtrList aDispList = myResult2AISObjectMap.keys(); +#endif foreach(ObjectPtr aObj, aDispList) { if (!theList.contains(aObj)) erase(aObj, false); @@ -1246,6 +901,7 @@ void XGUI_Displayer::showOnly(const QObjectPtrList& theList) updateViewer(); } +//************************************************************** bool XGUI_Displayer::canBeShaded(ObjectPtr theObject) const { if (!isVisible(theObject)) @@ -1259,98 +915,7 @@ bool XGUI_Displayer::canBeShaded(ObjectPtr theObject) const return ::canBeShaded(anAIS, myWorkshop->module()); } -bool XGUI_Displayer::activate(const Handle(AIS_InteractiveObject)& theIO, - const QIntList& theModes, - const bool theUpdateViewer) const -{ - Handle(AIS_InteractiveContext) aContext = AISContext(); - if (aContext.IsNull() || theIO.IsNull()) - return false; - - bool isActivationChanged = false; - // deactivate object in all modes, which are not in the list of activation - // It seems that after the IO deactivation the selected state of the IO's owners - // is modified in OCC(version: 6.8.0) and the selection of the object later is lost. - // By this reason, the number of the IO deactivate is decreased and the object is deactivated - // only if there is a difference in the current modes and the parameters modes. - // If the selection problem happens again, it is possible to write a test scenario and create - // a bug. The bug steps are the following: - // Create two IO, activate them in 5 modes, select the first IO, deactivate 3 modes for both, - // with clicked SHIFT select the second object. - // The result is the selection of the first IO is lost. - TColStd_ListOfInteger aTColModes; - aContext->ActivatedModes(theIO, aTColModes); - #ifdef TINSPECTOR - if (getCallBack()) getCallBack()->ActivatedModes(theIO, aTColModes); - #endif - TColStd_ListIteratorOfListOfInteger itr( aTColModes ); - QIntList aModesActivatedForIO; - bool isDeactivated = false; - bool aHasValidMode = false; - for (; itr.More(); itr.Next() ) { - Standard_Integer aMode = itr.Value(); - aHasValidMode = aHasValidMode || aMode != -1; - int aShapeMode = (aMode > 8)? aMode : AIS_Shape::SelectionType(aMode); - if (!theModes.contains(aMode)) { - deactivateAIS(theIO, aMode); - isDeactivated = true; - } - else { - aModesActivatedForIO.append(aMode); - } - } - if (isDeactivated) { - // the selection from the previous activation modes should be cleared manually (#26172) - //theIO->ClearSelected(); - //#ifdef TINSPECTOR - //if (getCallBack()) getCallBack()->ClearSelected(theIO); - //#endif -#ifndef CLEAR_OUTDATED_SELECTION_BEFORE_REDISPLAY - deselectPresentation(theIO, aContext); -#endif - // For performance issues - //if (theUpdateViewer) - // updateViewer(); - isActivationChanged = true; - } - - // loading the interactive object allowing the decomposition - if (aTColModes.IsEmpty() || !aHasValidMode) { - aContext->Load(theIO, -1, true); - Handle(AIS_Trihedron) aTrihedron = Handle(AIS_Trihedron)::DownCast(theIO); - if (!aTrihedron.IsNull()) { - // Workaround for Trihedron. It should be loaded using the next Load method to - // add this object to myGlobal map of selection manager - // it is important to activate trihedron in two selection modes: edges and vertices - aContext->SelectionManager()->Load(theIO); - } - - #ifdef TINSPECTOR - if (getCallBack()) getCallBack()->Load(theIO); - #endif - } - - // trihedron AIS check should be after the AIS loading. - // If it is not loaded, it is steel selectable in the viewer. - Handle(AIS_Trihedron) aTrihedron; - if (!isTrihedronActive()) - aTrihedron = Handle(AIS_Trihedron)::DownCast(theIO); - if (aTrihedron.IsNull()) { - // In order to clear active modes list - if (theModes.size() == 0) { - activateAIS(theIO, 0, theUpdateViewer); - } else { - foreach(int aMode, theModes) { - if (!aModesActivatedForIO.contains(aMode)) { - activateAIS(theIO, aMode, theUpdateViewer); - isActivationChanged = true; - } - } - } - } - return isActivationChanged; -} - +//************************************************************** bool XGUI_Displayer::customizeObject(ObjectPtr theObject) { AISObjectPtr anAISObj = getAISObject(theObject); @@ -1375,10 +940,15 @@ bool XGUI_Displayer::customizeObject(ObjectPtr theObject) aCustomPrs->customisePresentation(aResult, anAISObj, myCustomPrs); isCustomized = myWorkshop->module()->afterCustomisePresentation(aResult, anAISObj, myCustomPrs) || isCustomized; + + // update presentation state if faces panel is active + if (anAISObj.get() && myWorkshop->facesPanel()) + isCustomized = myWorkshop->facesPanel()->customizeObject(theObject, anAISObj) || isCustomized; + return isCustomized; } - +//************************************************************** QColor XGUI_Displayer::setObjectColor(ObjectPtr theObject, const QColor& theColor, bool theUpdateViewer) @@ -1395,9 +965,14 @@ QColor XGUI_Displayer::setObjectColor(ObjectPtr theObject, return QColor(aR, aG, aB); } +//************************************************************** void XGUI_Displayer::appendResultObject(ObjectPtr theObject, AISObjectPtr theAIS) { +#ifdef OPTIMIZE_PRS + myResult2AISObjectMap.add(theObject, theAIS); +#else myResult2AISObjectMap[theObject] = theAIS; +#endif #ifdef DEBUG_DISPLAY std::ostringstream aPtrStr; @@ -1408,11 +983,17 @@ void XGUI_Displayer::appendResultObject(ObjectPtr theObject, AISObjectPtr theAIS } #ifdef _DEBUG +//************************************************************** std::string XGUI_Displayer::getResult2AISObjectMapInfo() const { QStringList aContent; - foreach (ObjectPtr aObj, myResult2AISObjectMap.keys()) { +#ifdef OPTIMIZE_PRS + foreach(ObjectPtr aObj, myResult2AISObjectMap.objects()) { + AISObjectPtr aAISObj = myResult2AISObjectMap.value(aObj); +#else + foreach(ObjectPtr aObj, myResult2AISObjectMap.keys()) { AISObjectPtr aAISObj = myResult2AISObjectMap[aObj]; +#endif std::ostringstream aPtrStr; aPtrStr << "aObj = " << aObj.get() << ":"; aPtrStr << "anAIS = " << aAISObj.get() << ":"; @@ -1425,12 +1006,21 @@ std::string XGUI_Displayer::getResult2AISObjectMapInfo() const } #endif +//************************************************************** void XGUI_Displayer::getPresentations(const ObjectPtr& theObject, NCollection_Map& thePresentations) { ResultPtr aResult = std::dynamic_pointer_cast(theObject); if (aResult.get()) { AISObjectPtr aAISObj = getAISObject(aResult); + if (aAISObj.get() == NULL) { + // if result is a result of a composite feature, it is visualized by visualization of + // composite children, so we should get one of this presentations + ResultBodyPtr aCompSolid = std::dynamic_pointer_cast(aResult); + if (aCompSolid.get() && aCompSolid->numberOfSubs() > 0) { + aAISObj = getAISObject(aCompSolid->subResult(0)); + } + } if (aAISObj.get() != NULL) { Handle(AIS_InteractiveObject) anAIS = aAISObj->impl(); if (!anAIS.IsNull() && !thePresentations.Contains(anAIS)) @@ -1461,14 +1051,7 @@ void XGUI_Displayer::getPresentations(const ObjectPtr& theObject, } } -void XGUI_Displayer::activateTrihedron(bool theIsActive) -{ - myIsTrihedronActive = theIsActive; - if (!myIsTrihedronActive) { - deactivateTrihedron(true); - } -} - +//************************************************************** void XGUI_Displayer::displayTrihedron(bool theToDisplay) const { Handle(AIS_InteractiveContext) aContext = AISContext(); @@ -1477,6 +1060,7 @@ void XGUI_Displayer::displayTrihedron(bool theToDisplay) const Handle(AIS_Trihedron) aTrihedron = myWorkshop->viewer()->trihedron(); + XGUI_SelectionActivate* aSelectionActive = selectionActivate(); if (theToDisplay) { if (!aContext->IsDisplayed(aTrihedron)) aContext->Display(aTrihedron, @@ -1489,14 +1073,14 @@ void XGUI_Displayer::displayTrihedron(bool theToDisplay) const if (getCallBack()) getCallBack()->Display(aTrihedron); #endif - if (!isTrihedronActive()) - deactivateTrihedron(false); + if (!aSelectionActive->isTrihedronActive()) + aSelectionActive->deactivateTrihedron(false); else - activate(aTrihedron, myActiveSelectionModes, false); + aSelectionActive->activate(aTrihedron, false); } else { - deactivateTrihedron(false); + aSelectionActive->deactivateTrihedron(false); - aContext->Erase(aTrihedron); + aContext->Erase(aTrihedron, Standard_True); #ifdef TINSPECTOR if (getCallBack()) getCallBack()->Remove(aTrihedron); #endif @@ -1505,20 +1089,14 @@ void XGUI_Displayer::displayTrihedron(bool theToDisplay) const updateViewer(); } -QIntList XGUI_Displayer::activeSelectionModes() const -{ - QIntList aModes; - foreach (int aMode, myActiveSelectionModes) { - // aMode < 9 is a Shape Enum values - aModes << ((aMode < 9)? AIS_Shape::SelectionType(aMode) : aMode); - } - return aModes; -} - +//************************************************************** void XGUI_Displayer::AddOrRemoveSelectedShapes(Handle(AIS_InteractiveContext) theContext, const NCollection_DataMap>& theShapesToBeSelected) { + NCollection_Map aCompsolidPresentations; + NCollection_Map aSelectedPresentations; + NCollection_List anActiveOwners; theContext->MainSelector()->ActiveOwners(anActiveOwners); NCollection_List::Iterator anOwnersIt (anActiveOwners); @@ -1529,12 +1107,12 @@ void XGUI_Displayer::AddOrRemoveSelectedShapes(Handle(AIS_InteractiveContext) th /// If count of calls setSelectec is even, the object stays in the previous state /// (selected, deselected) /// OCCT: to write about the problem that active owners method returns one owner several times - QList aSelectedIds; // Remember of selected address in order to avoid duplicates + QList aSelectedIds; // Remember of selected address in order to avoid duplicates for (; anOwnersIt.More(); anOwnersIt.Next()) { anOwner = Handle(SelectMgr_EntityOwner)::DownCast (anOwnersIt.Value()); - if (aSelectedIds.contains((long)anOwner.get())) + if (aSelectedIds.contains((size_t)anOwner.get())) continue; - aSelectedIds.append((long)anOwner.get()); + aSelectedIds.append((size_t)anOwner.get()); Handle(StdSelect_BRepOwner) BROwnr = Handle(StdSelect_BRepOwner)::DownCast(anOwner); if (!BROwnr.IsNull() && BROwnr->HasShape()) { @@ -1542,26 +1120,95 @@ void XGUI_Displayer::AddOrRemoveSelectedShapes(Handle(AIS_InteractiveContext) th if (aShape.IsNull()) continue; + Handle(ModuleBase_BRepOwner) aCustomOwner = Handle(ModuleBase_BRepOwner)::DownCast(anOwner); + NCollection_DataMap > ::Iterator aShapeIt(theShapesToBeSelected); for (; aShapeIt.More(); aShapeIt.Next()) { - if (aShapeIt.Key().IsSame(aShape)) { - const TopoDS_Shape& aParameterShape = aShapeIt.Key(); - // isSame should be used here as it does not check orientation of shapes - // despite on isEqual of shapes or IsBound for shape in QMap. Orientation is - // different for Edges shapes in model shape and owner even if this is the same shape - if (aParameterShape.IsSame(aShape)) { - Handle(AIS_InteractiveObject) anOwnerPresentation = - Handle(AIS_InteractiveObject)::DownCast(anOwner->Selectable()); - NCollection_Map aPresentations = - theShapesToBeSelected.Find(aParameterShape); - if (aPresentations.Contains(anOwnerPresentation)) { - theContext->AddOrRemoveSelected(anOwner); - anOwner->SetSelected (Standard_True); - } + const TopoDS_Shape& aParameterShape = aShapeIt.Key(); + // isSame should be used here as it does not check orientation of shapes + // despite on isEqual of shapes or IsBound for shape in QMap. Orientation is + // different for Edges shapes in model shape and owner even if this is the same shape + if (aParameterShape.IsSame(aShape)) { + Handle(AIS_InteractiveObject) anOwnerPresentation = + Handle(AIS_InteractiveObject)::DownCast(anOwner->Selectable()); + NCollection_Map aPresentations = + theShapesToBeSelected.Find(aParameterShape); + if (aPresentations.Contains(anOwnerPresentation)) { + theContext->AddOrRemoveSelected(anOwner, Standard_False); + anOwner->SetSelected (Standard_True); + // collect selected presentations to do not select them if compsolid is selected + if (!aSelectedPresentations.Contains(anOwnerPresentation)) + aSelectedPresentations.Add(anOwnerPresentation); } } + else if (!aCustomOwner.IsNull()) { // CompSolid processing #2219 + // shape of owner is compound, but shape to be selected is compsolid, so + // we need to compare shape to AIS presentation of owner(rule of the owner creation) + Handle(AIS_Shape) anOwnerPresentation = + Handle(AIS_Shape)::DownCast(anOwner->Selectable()); + const TopoDS_Shape& aPresentationShape = anOwnerPresentation->Shape(); + if (aParameterShape.IsSame(anOwnerPresentation->Shape()) && + !aCompsolidPresentations.Contains(anOwnerPresentation)) + aCompsolidPresentations.Add(anOwnerPresentation); + } } } } + // select CompSolid presentations if their owners was not selected yet + NCollection_Map::Iterator anIt (aCompsolidPresentations); + for (; anIt.More(); anIt.Next()) { + if (aSelectedPresentations.Contains(anIt.Value())) + continue; + theContext->AddOrRemoveSelected(anIt.Value(), Standard_False); + } +} + +//************************************************************** +XGUI_SelectionActivate* XGUI_Displayer::selectionActivate() const +{ + return myWorkshop->selectionActivate(); +} + +//************************************************************** +GeomPlanePtr XGUI_Displayer::getScreenPlane() const +{ + GeomPlanePtr aResult; + Handle(AIS_InteractiveContext) aContext = AISContext(); + if (!aContext.IsNull()) { + Handle(V3d_Viewer) aViewer = aContext->CurrentViewer(); + Handle(V3d_View) aView; + for (aViewer->InitActiveViews(); aViewer->MoreActiveViews(); aViewer->NextActiveViews()) { + aView = aViewer->ActiveView(); + break; + } + if (!aView.IsNull()) { + double aEyeX, aEyeY, aEyeZ; + aView->Eye(aEyeX, aEyeY, aEyeZ); + + double aProjX, aProjY, aProjZ; + aView->Proj(aProjX, aProjY, aProjZ); + + GeomPointPtr aPnt = GeomPointPtr(new GeomAPI_Pnt(aEyeX, aEyeY, aEyeZ)); + GeomDirPtr aDir = GeomDirPtr(new GeomAPI_Dir(aProjX, aProjY, aProjZ)); + + aResult = GeomPlanePtr(new GeomAPI_Pln(aPnt, aDir)); + } + } + return aResult; +} + +double XGUI_Displayer::getViewScale() const +{ + Handle(AIS_InteractiveContext) aContext = AISContext(); + if (!aContext.IsNull()) { + Handle(V3d_Viewer) aViewer = aContext->CurrentViewer(); + Handle(V3d_View) aView; + for (aViewer->InitActiveViews(); aViewer->MoreActiveViews(); aViewer->NextActiveViews()) { + aView = aViewer->ActiveView(); + break; + } + return aView->Camera()->Scale(); + } + return 1; }