X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_Displayer.cpp;h=202afd6b2c7d6253e1a0075e0ec7f1825162bd37;hb=b91d2ac3b9986005d94823a3c502c8a7ff5ec7db;hp=2b3b043e43e6ea506b533149e2a585c6befcd0ec;hpb=36358763f1b843f3d5cfc49b9bd56a9a9b0b7771;p=modules%2Fshaper.git diff --git a/src/XGUI/XGUI_Displayer.cpp b/src/XGUI/XGUI_Displayer.cpp index 2b3b043e4..202afd6b2 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,83 +37,78 @@ #include #include #include -#include +#include +#include +#include +#include #include #include -#include #include +#include #include #include #include +#include +#include + +#include #include -#include #include #include #include #include #include #include +#ifdef BEFORE_TRIHEDRON_PATCH #include #include #include +#endif #include -#include -#include -#include #include #include +#include +#include #include +#include #include #include #include +#ifdef TINSPECTOR +#include +#endif + #include #include #include -const int MOUSE_SENSITIVITY_IN_PIXEL = 10; ///< defines the local context mouse selection sensitivity - -//#define DEBUG_ACTIVATE_OBJECTS -//#define DEBUG_DEACTIVATE -//#define DEBUG_ACTIVATE_AIS -//#define DEBUG_DEACTIVATE_AIS +/// defines the local context mouse selection sensitivity +const int MOUSE_SENSITIVITY_IN_PIXEL = 10; //#define DEBUG_DISPLAY //#define DEBUG_FEATURE_REDISPLAY //#define DEBUG_SELECTION_FILTERS //#define DEBUG_COMPOSILID_DISPLAY -// Workaround for bug #25637 //#define DEBUG_OCCT_SHAPE_SELECTION -#define WORKAROUND_UNTIL_27523_IS_FIXED +#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 theAIS->DisplayedObjects(theList, true); - if (theAIS->HasOpenedContext()) { - // get from local context - const Handle(AIS_LocalContext)& aLC = theAIS->LocalContext(); - TColStd_MapOfTransient aMap; - int NbDisp = aLC->DisplayedObjects(aMap); - TColStd_MapIteratorOfMapOfTransient aIt(aMap); - - Handle(AIS_InteractiveObject) curIO; - Handle(Standard_Transient) Tr; - for(; aIt.More(); aIt.Next()){ - Tr = aIt.Key(); - curIO = *((Handle(AIS_InteractiveObject)*) &Tr); - theList.Append(curIO); - } - } } QString qIntListInfo(const QIntList& theValues, const QString& theSeparator = QString(", ")) @@ -109,28 +121,33 @@ QString qIntListInfo(const QIntList& theValues, const QString& theSeparator = QS return anInfo.join(theSeparator); } +//************************************************************** XGUI_Displayer::XGUI_Displayer(XGUI_Workshop* theWorkshop) - : myWorkshop(theWorkshop), myNeedUpdate(false), - myIsTrihedronActive(true), myViewerBlockedRecursiveCount(0) +: 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; if (isVisible(theObject)) { #ifdef DEBUG_COMPOSILID_DISPLAY - ResultCompSolidPtr aCompsolidResult = std::dynamic_pointer_cast(theObject); + ResultCompSolidPtr aCompsolidResult = + std::dynamic_pointer_cast(theObject); if (aCompsolidResult.get()) { for(int i = 0; i < aCompsolidResult->numberOfSubs(); i++) { ResultPtr aSubResult = aCompsolidResult->subResult(i); @@ -148,12 +165,30 @@ 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()) { + // correct deviation coefficient for + /*Handle(AIS_InteractiveObject) anAISPrs = anAIS->impl(); + if (!anAISPrs.IsNull()) { + Handle(AIS_Shape) aShapePrs = Handle(AIS_Shape)::DownCast(anAISPrs); + if (!aShapePrs.IsNull()) { + TopoDS_Shape aShape = aShapePrs->Shape(); + if (!aShape.IsNull()) + //ModuleBase_Tools::setDefaultDeviationCoefficient(aShape, anAISPrs->Attributes()); + } + }*/ + //} } else { ResultPtr aResult = std::dynamic_pointer_cast(theObject); if (aResult.get() != NULL) { #ifdef DEBUG_COMPOSILID_DISPLAY - ResultCompSolidPtr aCompsolidResult = std::dynamic_pointer_cast(theObject); + ResultCompSolidPtr aCompsolidResult = + std::dynamic_pointer_cast(theObject); if (aCompsolidResult.get()) { for(int i = 0; i < aCompsolidResult->numberOfSubs(); i++) { ResultPtr aSubResult = aCompsolidResult->subResult(i); @@ -168,9 +203,15 @@ bool XGUI_Displayer::display(ObjectPtr theObject, bool theUpdateViewer) std::shared_ptr aShapePtr = ModelAPI_Tools::shape(aResult); if (aShapePtr.get() != NULL) { anAIS = AISObjectPtr(new GeomAPI_AISObject()); - Handle(AIS_InteractiveObject) anAISPrs = myWorkshop->module()->createPresentation(aResult); + Handle(AIS_InteractiveObject) anAISPrs = + myWorkshop->module()->createPresentation(aResult); if (anAISPrs.IsNull()) anAISPrs = new ModuleBase_ResultPrs(aResult); + else { + Handle(AIS_Shape) aShapePrs = Handle(AIS_Shape)::DownCast(anAISPrs); + if (!aShapePrs.IsNull()) + ModuleBase_Tools::setPointBallHighlighting((AIS_Shape*) aShapePrs.get()); + } anAIS->setImpl(new Handle(AIS_InteractiveObject)(anAISPrs)); //anAIS->createShape(aShapePtr); isShading = true; @@ -186,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); @@ -204,7 +246,8 @@ bool canBeShaded(Handle(AIS_InteractiveObject) theAIS, ModuleBase_IModule* theMo return false; } -bool XGUI_Displayer::display(ObjectPtr theObject, AISObjectPtr theAIS, +//************************************************************** +bool XGUI_Displayer::display(ObjectPtr theObject, AISObjectPtr theAIS, bool isShading, bool theUpdateViewer) { bool aDisplayed = false; @@ -223,27 +266,22 @@ bool XGUI_Displayer::display(ObjectPtr theObject, AISObjectPtr theAIS, if (isShading) anAISIO->Attributes()->SetFaceBoundaryDraw( Standard_True ); anAISIO->SetDisplayMode(aDispMode); - aContext->Display(anAISIO, aDispMode, 0, false, true, AIS_DS_Displayed); + aContext->Display(anAISIO, aDispMode, 0, false, true, AIS_DS_Displayed); + #ifdef TINSPECTOR + if (getCallBack()) getCallBack()->Display(anAISIO); + #endif aDisplayed = true; emit objectDisplayed(theObject, theAIS); - activate(anAISIO, myActiveSelectionModes, theUpdateViewer); - // the fix from VPA for more suitable selection of sketcher lines - if(anAISIO->Width() > 1) { - for(int aModeIdx = 0; aModeIdx < myActiveSelectionModes.length(); ++aModeIdx) { - int aMode = myActiveSelectionModes.value(aModeIdx); - double aPrecision = (aMode == getSelectionMode(TopAbs_VERTEX))? 20 : - (anAISIO->Width() + 2); - aContext->SetSelectionSensitivity(anAISIO, aMode, aPrecision); - } - } - } + selectionActivate()->activate(anAISIO, theUpdateViewer); + } if (theUpdateViewer) updateViewer(); return aDisplayed; } +//************************************************************** bool XGUI_Displayer::erase(ObjectPtr theObject, const bool theUpdateViewer) { bool aErased = false; @@ -254,12 +292,15 @@ 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()) { emit beforeObjectErase(theObject, anObject); aContext->Remove(anAIS, false/*update viewer*/); + #ifdef TINSPECTOR + if (getCallBack()) getCallBack()->Remove(anAIS); + #endif aErased = true; } } @@ -278,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; @@ -289,12 +331,18 @@ 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); return aRedisplayed; } if (aAIS_Obj != aAISObj) { + erase(theObject, theUpdateViewer); appendResultObject(theObject, aAIS_Obj); } aAISIO = aAIS_Obj->impl(); @@ -303,7 +351,7 @@ bool XGUI_Displayer::redisplay(ObjectPtr theObject, bool theUpdateViewer) Handle(AIS_InteractiveContext) aContext = AISContext(); if (!aContext.IsNull() && !aAISIO.IsNull()) { // Check that the visualized shape is the same and the redisplay is not necessary - // Redisplay of AIS object leads to this object selection compute and the selection + // Redisplay of AIS object leads to this object selection compute and the selection // in the browser is lost // this check is not necessary anymore because the selection store/restore is realized // before and after the values modification. @@ -326,7 +374,8 @@ bool XGUI_Displayer::redisplay(ObjectPtr theObject, bool theUpdateViewer) bool isCustomized = customizeObject(theObject); #ifdef DEBUG_FEATURE_REDISPLAY qDebug(QString("Redisplay: %1, isEqualShapes=%2, isCustomized=%3"). - arg(!isEqualShapes || isCustomized).arg(isEqualShapes).arg(isCustomized).toStdString().c_str()); + arg(!isEqualShapes || isCustomized).arg(isEqualShapes) + .arg(isCustomized).toStdString().c_str()); #endif if (!isEqualShapes || isCustomized) { /// if shapes are equal and presentation are customized, selection should be restored @@ -334,17 +383,17 @@ bool XGUI_Displayer::redisplay(ObjectPtr theObject, bool theUpdateViewer) if (aNeedToRestoreSelection) myWorkshop->module()->storeSelection(); -#ifdef WORKAROUND_UNTIL_27523_IS_FIXED - if (!myActiveSelectionModes.contains(0)) - aContext->Activate(aAISIO, 0); +#ifdef CLEAR_OUTDATED_SELECTION_BEFORE_REDISPLAY + myWorkshop->selector()->deselectPresentation(aAISIO); #endif + if (aContext->IsDisplayed(aAISIO)) + aContext->Redisplay(aAISIO, false); + else + aContext->Display(aAISIO, false); - aContext->Redisplay(aAISIO, false); - -#ifdef WORKAROUND_UNTIL_27523_IS_FIXED - if (!myActiveSelectionModes.contains(0)) - aContext->Deactivate(aAISIO, 0); -#endif + #ifdef TINSPECTOR + if (getCallBack()) getCallBack()->Redisplay(aAISIO); + #endif if (aNeedToRestoreSelection) myWorkshop->module()->restoreSelection(); @@ -360,6 +409,7 @@ bool XGUI_Displayer::redisplay(ObjectPtr theObject, bool theUpdateViewer) return aRedisplayed; } +//************************************************************** void XGUI_Displayer::redisplayObjects() { // redisplay objects visualized in the viewer @@ -373,28 +423,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) - aContext->LocalContext()->ClearOutdatedSelection(anAIS, true); - if (theUpdateViewer) - updateViewer(); - } -} - +//************************************************************** void XGUI_Displayer::deactivateObjects(const QObjectPtrList& theObjList, const bool theUpdateViewer) { @@ -404,38 +433,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; @@ -443,13 +448,15 @@ bool XGUI_Displayer::isVisible(XGUI_Displayer* theDisplayer, const ObjectPtr& th ResultPtr aResult = std::dynamic_pointer_cast(theObject); if (aPrs.get() || aResult.get()) { aVisible = theDisplayer->isVisible(theObject); - // compsolid is not visualized in the viewer, but should have presentation when all sub solids are + // 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++) { + int aNumberOfSubs = aCompsolidResult->numberOfSubs(); + bool anAllSubsVisible = aNumberOfSubs > 0; + for(int i = 0; i < aNumberOfSubs && anAllSubsVisible; i++) { anAllSubsVisible = theDisplayer->isVisible(aCompsolidResult->subResult(i)); } aVisible = anAllSubsVisible; @@ -461,7 +468,8 @@ bool XGUI_Displayer::isVisible(XGUI_Displayer* theDisplayer, const ObjectPtr& th if (!aVisible) { // check if all results of the feature are visible FeaturePtr aFeature = ModelAPI_Feature::feature(theObject); - std::list aResults = aFeature->results(); + std::list aResults; + ModelAPI_Tools::allResults(aFeature, aResults); std::list::const_iterator aIt; aVisible = !aResults.empty(); for (aIt = aResults.begin(); aIt != aResults.end(); ++aIt) { @@ -471,205 +479,103 @@ 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() || !aContext->HasOpenedContext()) - 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; - } - if (!aTrihedron.IsNull()) { - foreach(int aMode, myActiveSelectionModes) - aContext->SetSelectionSensitivity(aTrihedron, aMode, 20); - } - // VSV It seems that there is no necessity to update viewer on activation - //if (theUpdateViewer && isActivationChanged) - // updateViewer(); -} - -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); - return aModes.Extent() > 0; -} -void XGUI_Displayer::setSelected(const QList& theValues, bool theUpdateViewer) +//************************************************************** +void XGUI_Displayer::setSelected(const QList& theValues, + bool theUpdateViewer) { Handle(AIS_InteractiveContext) aContext = AISContext(); if (aContext.IsNull()) return; - if (aContext->HasOpenedContext()) { - aContext->UnhilightSelected(false); - aContext->ClearSelected(false); - NCollection_Map aShapesToBeSelected; - - foreach (ModuleBase_ViewerPrsPtr aPrs, theValues) { - const GeomShapePtr& aGeomShape = aPrs->shape(); - if (aGeomShape.get() && !aGeomShape->isNull()) { - const TopoDS_Shape& aShape = aGeomShape->impl(); + aContext->UnhilightSelected(false); + aContext->ClearSelected(false); + #ifdef TINSPECTOR + if (getCallBack()) getCallBack()->ClearSelected(); + #endif + NCollection_DataMap> + aShapesToBeSelected; + + foreach (ModuleBase_ViewerPrsPtr aPrs, theValues) { + const GeomShapePtr& aGeomShape = aPrs->shape(); + if (aGeomShape.get() && !aGeomShape->isNull()) { + const TopoDS_Shape& aShape = aGeomShape->impl(); #ifdef DEBUG_OCCT_SHAPE_SELECTION - aContext->AddOrRemoveSelected(aShape, false); + // problem 1: performance + // 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 TINSPECTOR + if (getCallBack()) getCallBack()->AddOrRemoveSelected(aShape); + #endif #else - aShapesToBeSelected.Add(aShape); + NCollection_Map aPresentations; + if (aShapesToBeSelected.IsBound(aShape)) + aPresentations = aShapesToBeSelected.Find(aShape); + ObjectPtr anObject = aPrs->object(); + getPresentations(anObject, aPresentations); + + aShapesToBeSelected.Bind(aShape, aPresentations); #endif - } else { - ObjectPtr anObject = aPrs->object(); - ResultPtr aResult = std::dynamic_pointer_cast(anObject); - if (aResult.get() && isVisible(aResult)) { - AISObjectPtr anObj = myResult2AISObjectMap[aResult]; - Handle(AIS_InteractiveObject) anAIS = anObj->impl(); - if (!anAIS.IsNull()) { - // The methods are replaced in order to provide multi-selection, e.g. restore selection - // by activating multi selector widget. It also gives an advantage that the multi - // selection in OB gives multi-selection in the viewer - //aContext->SetSelected(anAIS, false); - // The selection in the context was cleared, so the method sets the objects are selected - aContext->AddOrRemoveSelected(anAIS, false); - } - } - } - } - if (!aShapesToBeSelected.IsEmpty()) - XGUI_Displayer::AddOrRemoveSelectedShapes(aContext, aShapesToBeSelected); - } else { - aContext->UnhilightCurrents(false); - aContext->ClearCurrents(false); - foreach (ModuleBase_ViewerPrsPtr aPrs, theValues) { + } else { 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()) - aContext->SetCurrentObject(anAIS, false); + if (!anAIS.IsNull()) { + // The methods are replaced in order to provide multi-selection, e.g. restore selection + // by activating multi selector widget. It also gives an advantage that the multi + // selection in OB gives multi-selection in the viewer + //aContext->SetSelected(anAIS, false); + // The selection in the context was cleared, so the method sets the objects are selected + aContext->AddOrRemoveSelected(anAIS, false); + #ifdef TINSPECTOR + if (getCallBack()) getCallBack()->AddOrRemoveSelected(anAIS); + #endif + } } } } + if (!aShapesToBeSelected.IsEmpty()) + XGUI_Displayer::AddOrRemoveSelectedShapes(aContext, aShapesToBeSelected); + if (theUpdateViewer) updateViewer(); } -void XGUI_Displayer::clearSelected() +//************************************************************** +void XGUI_Displayer::clearSelected(const bool theUpdateViewer) { Handle(AIS_InteractiveContext) aContext = AISContext(); if (!aContext.IsNull()) { - aContext->UnhilightCurrents(false); - aContext->ClearSelected(); + aContext->UnhilightSelected(false);//UnhilightCurrents(false); + aContext->ClearSelected(theUpdateViewer); + #ifdef TINSPECTOR + if (getCallBack()) getCallBack()->ClearSelected(); + #endif } } +//************************************************************** 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()) { emit beforeObjectErase(aObj, aAISObj); aContext->Remove(anIO, false/*update viewer*/); + #ifdef TINSPECTOR + if (getCallBack()) getCallBack()->Remove(anIO); + #endif aErased = true; } } @@ -684,161 +590,44 @@ bool XGUI_Displayer::eraseAll(const bool theUpdateViewer) return aErased; } -void deactivateObject(Handle(AIS_InteractiveContext) theContext, - Handle(AIS_InteractiveObject) theObject, - const bool theClear = true) -{ - if (!theObject.IsNull()) { - theContext->Deactivate(theObject); - //if (theClear) { - //theObject->ClearSelected(); - // theContext->LocalContext()->ClearOutdatedSelection(theObject, true); - //} - } -} - -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); - - /// #1136 hidden axis are selected in sketch - /// workaround for Cascade: there is a crash in AIS_LocalContext::ClearOutdatedSelection - /// for Position AIS object in SelectionModes. - deactivateObject(aContext, aTrie->XAxis()); - deactivateObject(aContext, aTrie->YAxis()); - deactivateObject(aContext, aTrie->Axis()); - deactivateObject(aContext, aTrie->Position()); - - deactivateObject(aContext, aTrie->XYPlane()); - deactivateObject(aContext, aTrie->XZPlane()); - deactivateObject(aContext, aTrie->YZPlane()); - - 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()) { @@ -849,6 +638,7 @@ ObjectPtr XGUI_Displayer::getObject(const Handle(AIS_InteractiveObject)& theIO) return anObject; } +//************************************************************** bool XGUI_Displayer::enableUpdateViewer(const bool isEnabled) { bool aWasEnabled = isUpdateEnabled(); @@ -857,6 +647,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; @@ -864,73 +658,47 @@ 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(); + //myWorkshop->viewer()->Zfitall(); aContext->UpdateCurrentViewer(); } else { myNeedUpdate = true; } } -void XGUI_Displayer::activateAIS(const Handle(AIS_InteractiveObject)& theIO, - const int theMode, const bool theUpdateViewer) const -{ - Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext(); - 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 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); - else - aContext->Deactivate(theIO, theMode); - -#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() && !aContext->HasOpenedContext()) { - aContext->OpenLocalContext(); - if (!isTrihedronActive()) - deactivateTrihedron(true); + if (!aContext.IsNull() && myIsFirstAISContextUse/*&& !aContext->HasOpenedContext()*/) { + XGUI_Displayer* aDisplayer = (XGUI_Displayer*)this; + aDisplayer->myIsFirstAISContextUse = false; + 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(); @@ -941,34 +709,37 @@ 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 aDisplayed = true; aContext->Deactivate(anAISIO); + #ifdef TINSPECTOR + if (getCallBack()) getCallBack()->Deactivate(anAISIO); + #endif aContext->Load(anAISIO); - if (toActivateInSelectionModes) { - if (aContext->HasOpenedContext()) { - if (myActiveSelectionModes.size() == 0) - activateAIS(anAISIO, 0, theUpdateViewer); - else { - foreach(int aMode, myActiveSelectionModes) { - activateAIS(anAISIO, aMode, theUpdateViewer); - } - } - } - } + #ifdef TINSPECTOR + if (getCallBack()) getCallBack()->Load(anAISIO); + #endif + if (toActivateInSelectionModes) + myWorkshop->selectionActivate()->activateOnDisplay(anAISIO, theUpdateViewer); + if (theUpdateViewer) updateViewer(); } return aDisplayed; } +//************************************************************** bool XGUI_Displayer::eraseAIS(AISObjectPtr theAIS, const bool theUpdateViewer) { bool aErased = false; @@ -977,6 +748,9 @@ 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 TINSPECTOR + if (getCallBack()) getCallBack()->Remove(anAISIO); + #endif aErased = true; } } @@ -985,7 +759,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) @@ -1006,6 +780,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(); @@ -1020,7 +795,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()) { @@ -1039,6 +815,7 @@ void XGUI_Displayer::deactivateSelectionFilters() } } +//************************************************************** void XGUI_Displayer::addSelectionFilter(const Handle(SelectMgr_Filter)& theFilter) { Handle(AIS_InteractiveContext) aContext = AISContext(); @@ -1055,6 +832,7 @@ void XGUI_Displayer::addSelectionFilter(const Handle(SelectMgr_Filter)& theFilte } } +//************************************************************** void XGUI_Displayer::removeSelectionFilter(const Handle(SelectMgr_Filter)& theFilter) { Handle(AIS_InteractiveContext) aContext = AISContext(); @@ -1066,11 +844,13 @@ void XGUI_Displayer::removeSelectionFilter(const Handle(SelectMgr_Filter)& theFi aCompositeFilter->Remove(theFilter); #ifdef DEBUG_SELECTION_FILTERS int aCount = aCompositeFilter->StoredFilters().Extent(); - qDebug(QString("removeSelectionFilter: filters.count() = %1").arg(aCount).toStdString().c_str()); + qDebug(QString("removeSelectionFilter: filters.count() = %1") + .arg(aCount).toStdString().c_str()); #endif } } +//************************************************************** bool XGUI_Displayer::hasSelectionFilter(const Handle(SelectMgr_Filter)& theFilter) { bool aFilterFound = false; @@ -1081,20 +861,21 @@ bool XGUI_Displayer::hasSelectionFilter(const Handle(SelectMgr_Filter)& theFilte const SelectMgr_ListOfFilter& aFilters = aContext->Filters(); SelectMgr_ListIteratorOfListOfFilter aIt(aFilters); for (; aIt.More() && !aFilterFound; aIt.Next()) { - if (theFilter.Access() == aIt.Value().Access()) + if (theFilter.get() == aIt.Value().get()) aFilterFound = true; } Handle(SelectMgr_CompositionFilter) aCompositeFilter = GetFilter(); if (!aCompositeFilter.IsNull()) { const SelectMgr_ListOfFilter& aStoredFilters = aCompositeFilter->StoredFilters(); for (aIt.Initialize(aStoredFilters); aIt.More() && !aFilterFound; aIt.Next()) { - if (theFilter.Access() == aIt.Value().Access()) + if (theFilter.get() == aIt.Value().get()) aFilterFound = true; } } return aFilterFound; } +//************************************************************** void XGUI_Displayer::removeFilters() { Handle(AIS_InteractiveContext) aContext = AISContext(); @@ -1106,9 +887,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); @@ -1120,8 +906,9 @@ void XGUI_Displayer::showOnly(const QObjectPtrList& theList) updateViewer(); } +//************************************************************** bool XGUI_Displayer::canBeShaded(ObjectPtr theObject) const -{ +{ if (!isVisible(theObject)) return false; @@ -1133,76 +920,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); - TColStd_ListIteratorOfListOfInteger itr( aTColModes ); - QIntList aModesActivatedForIO; - bool isDeactivated = false; - for (; itr.More(); itr.Next() ) { - Standard_Integer aMode = itr.Value(); - 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(); - aContext->LocalContext()->ClearOutdatedSelection(theIO, true); - // For performance issues - //if (theUpdateViewer) - // updateViewer(); - isActivationChanged = true; - } - - // loading the interactive object allowing the decomposition - if (aTColModes.IsEmpty()) { - aContext->Load(theIO, -1, true); - } - - // 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); @@ -1225,11 +943,20 @@ 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; } - -QColor XGUI_Displayer::setObjectColor(ObjectPtr theObject, const QColor& theColor, bool theUpdateViewer) +//************************************************************** +QColor XGUI_Displayer::setObjectColor(ObjectPtr theObject, + const QColor& theColor, + bool theUpdateViewer) { if (!isVisible(theObject)) return Qt::black; @@ -1243,9 +970,14 @@ QColor XGUI_Displayer::setObjectColor(ObjectPtr theObject, const QColor& theColo 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; @@ -1255,30 +987,76 @@ void XGUI_Displayer::appendResultObject(ObjectPtr theObject, AISObjectPtr theAIS #endif } +#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() << ":"; aPtrStr << "[" << ModuleBase_Tools::objectInfo(aObj).toStdString().c_str() << "]"; - + aContent.append(aPtrStr.str().c_str()); } return QString("myResult2AISObjectMap: size = %1\n%2\n").arg(myResult2AISObjectMap.size()). arg(aContent.join("\n")).toStdString().c_str(); } +#endif -void XGUI_Displayer::activateTrihedron(bool theIsActive) -{ - myIsTrihedronActive = theIsActive; - if (!myIsTrihedronActive) { - deactivateTrihedron(true); +//************************************************************** +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)) + thePresentations.Add(anAIS); + } + } + else { + FeaturePtr aFeature = std::dynamic_pointer_cast(theObject); + // find presentation of the feature + AISObjectPtr aAISObj = getAISObject(aFeature); + if (aAISObj.get() != NULL) { + Handle(AIS_InteractiveObject) anAIS = aAISObj->impl(); + if (!anAIS.IsNull() && !thePresentations.Contains(anAIS)) + thePresentations.Add(anAIS); + } + // find presentations of the feature results + std::list aResults; + ModelAPI_Tools::allResults(aFeature, aResults); + std::list::const_iterator anIt = aResults.begin(), aLast = aResults.end(); + for (; anIt != aLast; ++anIt) { + AISObjectPtr aAISObj = getAISObject(*anIt); + if (aAISObj.get() != NULL) { + Handle(AIS_InteractiveObject) anAIS = aAISObj->impl(); + if (!anAIS.IsNull() && !thePresentations.Contains(anAIS)) + thePresentations.Add(anAIS); + } + } } } +//************************************************************** void XGUI_Displayer::displayTrihedron(bool theToDisplay) const { Handle(AIS_InteractiveContext) aContext = AISContext(); @@ -1287,6 +1065,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, @@ -1295,55 +1074,146 @@ void XGUI_Displayer::displayTrihedron(bool theToDisplay) const Standard_True /* update viewer*/, Standard_False /* allow decomposition */, AIS_DS_Displayed /* xdisplay status */); + #ifdef TINSPECTOR + 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); - //aContext->LocalContext()->ClearOutdatedSelection(aTrihedron, true); - // the selection from the previous activation modes should be cleared manually (#26172) + aSelectionActive->deactivateTrihedron(false); - aContext->Erase(aTrihedron); + aContext->Erase(aTrihedron, Standard_True); + #ifdef TINSPECTOR + if (getCallBack()) getCallBack()->Remove(aTrihedron); + #endif } 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_Map& theShapesToBeSelected) + const NCollection_DataMap>& theShapesToBeSelected) { - Handle(AIS_LocalContext) aLContext = theContext->LocalContext(); - TCollection_AsciiString aSelectionName = aLContext->SelectionName(); - aLContext->UnhilightPicked(Standard_False); - - NCollection_Map aShapesSelected; + NCollection_Map aCompsolidPresentations; + NCollection_Map aSelectedPresentations; NCollection_List anActiveOwners; - aLContext->MainSelector()->ActiveOwners(anActiveOwners); + theContext->MainSelector()->ActiveOwners(anActiveOwners); NCollection_List::Iterator anOwnersIt (anActiveOwners); Handle(SelectMgr_EntityOwner) anOwner; + + /// It is very important to check that the owner is processed only once and has a map of + /// processed owners because SetSelected works as a switch. + /// 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 for (; anOwnersIt.More(); anOwnersIt.Next()) { anOwner = Handle(SelectMgr_EntityOwner)::DownCast (anOwnersIt.Value()); + if (aSelectedIds.contains((size_t)anOwner.get())) + continue; + aSelectedIds.append((size_t)anOwner.get()); + Handle(StdSelect_BRepOwner) BROwnr = Handle(StdSelect_BRepOwner)::DownCast(anOwner); - if (!BROwnr.IsNull() && BROwnr->HasShape() && theShapesToBeSelected.Contains(BROwnr->Shape())) { - if (aShapesSelected.Contains(BROwnr->Shape())) + if (!BROwnr.IsNull() && BROwnr->HasShape()) { + const TopoDS_Shape& aShape = BROwnr->Shape(); + if (aShape.IsNull()) continue; - AIS_Selection::Selection(aSelectionName.ToCString())->Select(anOwner); - anOwner->SetSelected (Standard_True); - aShapesSelected.Add(BROwnr->Shape()); + + 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); + } +} + +//************************************************************** +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(); } - aLContext->HilightPicked(Standard_False); + return 1; }