X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_Displayer.cpp;h=2652ae0ed1753caa9e7f863862942f59b2ba4247;hb=00a3c1675ca0ead43040cafa3a99f984e1d8177b;hp=9b82aec92f5af4307327ce252ea2449b7c24591f;hpb=0f22bfc2773dcbb793c2c9c6562d25e114250617;p=modules%2Fshaper.git diff --git a/src/XGUI/XGUI_Displayer.cpp b/src/XGUI/XGUI_Displayer.cpp index 9b82aec92..2652ae0ed 100644 --- a/src/XGUI/XGUI_Displayer.cpp +++ b/src/XGUI/XGUI_Displayer.cpp @@ -1,27 +1,35 @@ -// 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_CustomPrs.h" #include "XGUI_Displayer.h" -#include "XGUI_Workshop.h" -#include "XGUI_ViewerProxy.h" -#include "XGUI_SelectionMgr.h" +#include "XGUI_FacesPanel.h" #include "XGUI_Selection.h" -#include "XGUI_CustomPrs.h" +#include "XGUI_SelectionMgr.h" +#include "XGUI_ViewerProxy.h" +#include "XGUI_Workshop.h" #ifndef HAVE_SALOME #include #endif -#ifdef VINSPECTOR -#include -#include -#include -static bool VInspector_FirstCall = true; -#endif - #include #include #include @@ -29,11 +37,12 @@ static bool VInspector_FirstCall = true; #include #include +#include +#include +#include #include #include -#include #include -#include #include #include @@ -48,9 +57,11 @@ static bool VInspector_FirstCall = true; #include #include #include +#ifdef BEFORE_TRIHEDRON_PATCH #include #include #include +#endif #include #include #include @@ -64,8 +75,8 @@ static bool VInspector_FirstCall = true; #include #include -#ifdef VINSPECTOR -#include +#ifdef TINSPECTOR +#include #endif #include @@ -89,7 +100,7 @@ const int MOUSE_SENSITIVITY_IN_PIXEL = 10; //#define DEBUG_OCCT_SHAPE_SELECTION -//#define DEBUG_OCCT_26172 +#define CLEAR_OUTDATED_SELECTION_BEFORE_REDISPLAY void displayedObjects(const Handle(AIS_InteractiveContext)& theAIS, AIS_ListOfInteractive& theList) { @@ -107,14 +118,32 @@ 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) { - #ifdef VINSPECTOR - myCommunicator = 0; - #endif myCustomPrs = std::shared_ptr(new XGUI_CustomPrs(theWorkshop)); } @@ -246,7 +275,7 @@ bool XGUI_Displayer::display(ObjectPtr theObject, AISObjectPtr theAIS, anAISIO->Attributes()->SetFaceBoundaryDraw( Standard_True ); anAISIO->SetDisplayMode(aDispMode); aContext->Display(anAISIO, aDispMode, 0, false, true, AIS_DS_Displayed); - #ifdef VINSPECTOR + #ifdef TINSPECTOR if (getCallBack()) getCallBack()->Display(anAISIO); #endif aDisplayed = true; @@ -276,7 +305,7 @@ bool XGUI_Displayer::erase(ObjectPtr theObject, const bool theUpdateViewer) if (!anAIS.IsNull()) { emit beforeObjectErase(theObject, anObject); aContext->Remove(anAIS, false/*update viewer*/); - #ifdef VINSPECTOR + #ifdef TINSPECTOR if (getCallBack()) getCallBack()->Remove(anAIS); #endif aErased = true; @@ -354,9 +383,12 @@ bool XGUI_Displayer::redisplay(ObjectPtr theObject, bool theUpdateViewer) if (aNeedToRestoreSelection) myWorkshop->module()->storeSelection(); +#ifdef CLEAR_OUTDATED_SELECTION_BEFORE_REDISPLAY + deselectPresentation(aAISIO, aContext); +#endif aContext->Redisplay(aAISIO, false); - #ifdef VINSPECTOR + #ifdef TINSPECTOR if (getCallBack()) getCallBack()->Redisplay(aAISIO); #endif @@ -402,6 +434,10 @@ void XGUI_Displayer::deactivate(ObjectPtr theObject, const bool theUpdateViewer) 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(); } @@ -599,7 +635,7 @@ bool XGUI_Displayer::isActive(ObjectPtr theObject) const TColStd_ListOfInteger aModes; aContext->ActivatedModes(anAIS, aModes); - #ifdef VINSPECTOR + #ifdef TINSPECTOR if (getCallBack()) getCallBack()->ActivatedModes(anAIS, aModes); #endif @@ -615,7 +651,7 @@ void XGUI_Displayer::setSelected(const QList& theValue return; aContext->UnhilightSelected(false); aContext->ClearSelected(false); - #ifdef VINSPECTOR + #ifdef TINSPECTOR if (getCallBack()) getCallBack()->ClearSelected(); #endif NCollection_DataMap> @@ -630,7 +666,7 @@ void XGUI_Displayer::setSelected(const QList& theValue // problem 2: IO is not specified, so the first found owner is selected, as a result // it might belong to another result aContext->AddOrRemoveSelected(aShape, false); - #ifdef VINSPECTOR + #ifdef TINSPECTOR if (getCallBack()) getCallBack()->AddOrRemoveSelected(aShape); #endif #else @@ -655,7 +691,7 @@ void XGUI_Displayer::setSelected(const QList& theValue //aContext->SetSelected(anAIS, false); // The selection in the context was cleared, so the method sets the objects are selected aContext->AddOrRemoveSelected(anAIS, false); - #ifdef VINSPECTOR + #ifdef TINSPECTOR if (getCallBack()) getCallBack()->AddOrRemoveSelected(anAIS); #endif } @@ -673,9 +709,9 @@ void XGUI_Displayer::clearSelected(const bool theUpdateViewer) { Handle(AIS_InteractiveContext) aContext = AISContext(); if (!aContext.IsNull()) { - aContext->UnhilightCurrents(false); + aContext->UnhilightSelected(false);//UnhilightCurrents(false); aContext->ClearSelected(theUpdateViewer); - #ifdef VINSPECTOR + #ifdef TINSPECTOR if (getCallBack()) getCallBack()->ClearSelected(); #endif } @@ -693,7 +729,7 @@ bool XGUI_Displayer::eraseAll(const bool theUpdateViewer) if (!anIO.IsNull()) { emit beforeObjectErase(aObj, aAISObj); aContext->Remove(anIO, false/*update viewer*/); - #ifdef VINSPECTOR + #ifdef TINSPECTOR if (getCallBack()) getCallBack()->Remove(anIO); #endif aErased = true; @@ -712,14 +748,14 @@ bool XGUI_Displayer::eraseAll(const bool theUpdateViewer) void deactivateObject(Handle(AIS_InteractiveContext) theContext, Handle(AIS_InteractiveObject) theObject -#ifdef VINSPECTOR - , VInspectorAPI_CallBack* theCallBack +#ifdef TINSPECTOR + , Handle(VInspectorAPI_CallBack) theCallBack #endif ) { if (!theObject.IsNull()) { theContext->Deactivate(theObject); - #ifdef VINSPECTOR + #ifdef TINSPECTOR if (theCallBack) theCallBack->Deactivate(theObject); #endif } @@ -732,49 +768,50 @@ void XGUI_Displayer::deactivateTrihedron(const bool theUpdateViewer) const if (!aTrihedron.IsNull() && aContext->IsDisplayed(aTrihedron)) { Handle(AIS_Trihedron) aTrie = Handle(AIS_Trihedron)::DownCast(aTrihedron); deactivateObject(aContext, aTrie - #ifdef VINSPECTOR + #ifdef TINSPECTOR , getCallBack() #endif ); /// #1136 hidden axis are selected in sketch +#ifdef BEFORE_TRIHEDRON_PATCH deactivateObject(aContext, aTrie->XAxis() - #ifdef VINSPECTOR + #ifdef TINSPECTOR , getCallBack() #endif ); deactivateObject(aContext, aTrie->YAxis() - #ifdef VINSPECTOR + #ifdef TINSPECTOR , getCallBack() #endif ); deactivateObject(aContext, aTrie->Axis() - #ifdef VINSPECTOR + #ifdef TINSPECTOR , getCallBack() #endif ); deactivateObject(aContext, aTrie->Position() - #ifdef VINSPECTOR + #ifdef TINSPECTOR , getCallBack() #endif ); deactivateObject(aContext, aTrie->XYPlane() - #ifdef VINSPECTOR + #ifdef TINSPECTOR , getCallBack() #endif ); deactivateObject(aContext, aTrie->XZPlane() - #ifdef VINSPECTOR + #ifdef TINSPECTOR , getCallBack() #endif ); deactivateObject(aContext, aTrie->YZPlane() - #ifdef VINSPECTOR + #ifdef TINSPECTOR , getCallBack() #endif ); - +#endif if (theUpdateViewer) updateViewer(); } @@ -931,7 +968,7 @@ void XGUI_Displayer::updateViewer() const { Handle(AIS_InteractiveContext) aContext = AISContext(); if (!aContext.IsNull() && isUpdateEnabled()) { - myWorkshop->viewer()->Zfitall(); + //myWorkshop->viewer()->Zfitall(); aContext->UpdateCurrentViewer(); } else { myNeedUpdate = true; @@ -953,7 +990,7 @@ void XGUI_Displayer::activateAIS(const Handle(AIS_InteractiveObject)& theIO, aContext->Activate(theIO, theMode, false); } else aContext->Activate(theIO, theMode, false); - #ifdef VINSPECTOR + #ifdef TINSPECTOR if (getCallBack()) getCallBack()->Activate(theIO, theMode); #endif @@ -990,13 +1027,13 @@ void XGUI_Displayer::deactivateAIS(const Handle(AIS_InteractiveObject)& theIO, if (!aContext.IsNull()) { if (theMode == -1) { aContext->Deactivate(theIO); - #ifdef VINSPECTOR + #ifdef TINSPECTOR if (getCallBack()) getCallBack()->Deactivate(theIO); #endif } else { aContext->Deactivate(theIO, theMode); - #ifdef VINSPECTOR + #ifdef TINSPECTOR if (getCallBack()) getCallBack()->Deactivate(theIO, theMode); #endif } @@ -1014,20 +1051,6 @@ Handle(AIS_InteractiveContext) XGUI_Displayer::AISContext() const { Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext(); if (!aContext.IsNull() && myIsFirstAISContextUse/*&& !aContext->HasOpenedContext()*/) { -#ifdef VINSPECTOR - if (VInspector_FirstCall) { - XGUI_Displayer* aDisplayer = (XGUI_Displayer*)this; - VInspectorAPI_Communicator* aCommunicator = VInspectorAPI_PluginMgr::activateVInspector( - "VInspector.dll", aContext); - aDisplayer->setCommunicator(aCommunicator); - #ifndef HAVE_SALOME - AppElements_Viewer* aViewer = myWorkshop->mainWindow()->viewer(); - if (aViewer) - aViewer->setCallBack(aCommunicator->getCallBack()); - #endif - VInspector_FirstCall = false; - } -#endif XGUI_Displayer* aDisplayer = (XGUI_Displayer*)this; aDisplayer->myIsFirstAISContextUse = false; //aContext->OpenLocalContext(); @@ -1050,23 +1073,23 @@ Handle(SelectMgr_AndFilter) XGUI_Displayer::GetFilter() } 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); - #ifdef VINSPECTOR + aContext->Display(anAISIO, theDisplayMode, 0, false/*update viewer*/, true, AIS_DS_Displayed); + #ifdef TINSPECTOR if (getCallBack()) getCallBack()->Display(anAISIO); #endif aDisplayed = true; aContext->Deactivate(anAISIO); - #ifdef VINSPECTOR + #ifdef TINSPECTOR if (getCallBack()) getCallBack()->Deactivate(anAISIO); #endif aContext->Load(anAISIO); - #ifdef VINSPECTOR + #ifdef TINSPECTOR if (getCallBack()) getCallBack()->Load(anAISIO); #endif if (toActivateInSelectionModes) { @@ -1092,7 +1115,7 @@ bool XGUI_Displayer::eraseAIS(AISObjectPtr theAIS, const bool theUpdateViewer) Handle(AIS_InteractiveObject) anAISIO = theAIS->impl(); if (!anAISIO.IsNull() && aContext->IsDisplayed(anAISIO)) { aContext->Remove(anAISIO, false/*update viewer*/); - #ifdef VINSPECTOR + #ifdef TINSPECTOR if (getCallBack()) getCallBack()->Remove(anAISIO); #endif aErased = true; @@ -1273,7 +1296,7 @@ bool XGUI_Displayer::activate(const Handle(AIS_InteractiveObject)& theIO, // The result is the selection of the first IO is lost. TColStd_ListOfInteger aTColModes; aContext->ActivatedModes(theIO, aTColModes); - #ifdef VINSPECTOR + #ifdef TINSPECTOR if (getCallBack()) getCallBack()->ActivatedModes(theIO, aTColModes); #endif TColStd_ListIteratorOfListOfInteger itr( aTColModes ); @@ -1293,12 +1316,13 @@ bool XGUI_Displayer::activate(const Handle(AIS_InteractiveObject)& theIO, } } if (isDeactivated) { -#ifdef DEBUG_OCCT_26172 // the selection from the previous activation modes should be cleared manually (#26172) - theIO->ClearSelected(); - #ifdef VINSPECTOR - if (getCallBack()) getCallBack()->ClearSelected(theIO); - #endif + //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) @@ -1309,7 +1333,15 @@ bool XGUI_Displayer::activate(const Handle(AIS_InteractiveObject)& theIO, // loading the interactive object allowing the decomposition if (aTColModes.IsEmpty() || !aHasValidMode) { aContext->Load(theIO, -1, true); - #ifdef VINSPECTOR + 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 } @@ -1357,6 +1389,13 @@ bool XGUI_Displayer::customizeObject(ObjectPtr theObject) } bool isCustomized = aCustomPrs.get() && 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; } @@ -1413,6 +1452,14 @@ void XGUI_Displayer::getPresentations(const ObjectPtr& theObject, 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 + ResultCompSolidPtr 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)) @@ -1467,7 +1514,7 @@ void XGUI_Displayer::displayTrihedron(bool theToDisplay) const Standard_True /* update viewer*/, Standard_False /* allow decomposition */, AIS_DS_Displayed /* xdisplay status */); - #ifdef VINSPECTOR + #ifdef TINSPECTOR if (getCallBack()) getCallBack()->Display(aTrihedron); #endif @@ -1478,8 +1525,8 @@ void XGUI_Displayer::displayTrihedron(bool theToDisplay) const } else { deactivateTrihedron(false); - aContext->Erase(aTrihedron); - #ifdef VINSPECTOR + aContext->Erase(aTrihedron, Standard_True); + #ifdef TINSPECTOR if (getCallBack()) getCallBack()->Remove(aTrihedron); #endif } @@ -1497,28 +1544,13 @@ QIntList XGUI_Displayer::activeSelectionModes() const return aModes; } -#ifdef VINSPECTOR -void XGUI_Displayer::setCommunicator(VInspectorAPI_Communicator* theCommunicator) -{ - myCommunicator = theCommunicator; -} - -void XGUI_Displayer::setVInspectorVisible(const bool theVisible) -{ - if (myCommunicator) - myCommunicator->setVisible(true); -} - -VInspectorAPI_CallBack* XGUI_Displayer::getCallBack() const -{ - return myCommunicator ? myCommunicator->getCallBack() : NULL; -} -#endif - 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); @@ -1539,16 +1571,49 @@ void XGUI_Displayer::AddOrRemoveSelectedShapes(Handle(AIS_InteractiveContext) th Handle(StdSelect_BRepOwner) BROwnr = Handle(StdSelect_BRepOwner)::DownCast(anOwner); if (!BROwnr.IsNull() && BROwnr->HasShape()) { const TopoDS_Shape& aShape = BROwnr->Shape(); - if (!aShape.IsNull() && theShapesToBeSelected.IsBound(aShape)) { - Handle(AIS_InteractiveObject) anOwnerPresentation = - Handle(AIS_InteractiveObject)::DownCast(anOwner->Selectable()); - NCollection_Map aPresentations = - theShapesToBeSelected.Find(aShape); - if (aPresentations.Contains(anOwnerPresentation)) { - theContext->AddOrRemoveSelected(anOwner); - anOwner->SetSelected (Standard_True); + if (aShape.IsNull()) + continue; + + Handle(ModuleBase_BRepOwner) aCustomOwner = Handle(ModuleBase_BRepOwner)::DownCast(anOwner); + + NCollection_DataMap > + ::Iterator aShapeIt(theShapesToBeSelected); + for (; aShapeIt.More(); aShapeIt.Next()) { + 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); + } }