X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_Displayer.cpp;h=cb2503f0486e7522f106b6eab129bbf0db0a0004;hb=9129370ff85bfb4c0c37d9f32f9d107041ec2fe8;hp=57cb4980184dcd53395de57db0d13164a03e1cc5;hpb=60855dd590f9054e50dd1bd36aa0b984ee97b02a;p=modules%2Fshaper.git diff --git a/src/XGUI/XGUI_Displayer.cpp b/src/XGUI/XGUI_Displayer.cpp index 57cb49801..cb2503f04 100644 --- a/src/XGUI/XGUI_Displayer.cpp +++ b/src/XGUI/XGUI_Displayer.cpp @@ -18,8 +18,11 @@ #include #include #include +#include #include +#include +#include #include #include @@ -35,6 +38,10 @@ #include #include #include +#include +#include + +#include #include #include @@ -43,9 +50,16 @@ 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 + //#define DEBUG_DISPLAY -//#define DEBUG_ACTIVATE +//#define DEBUG_FEATURE_REDISPLAY +//#define DEBUG_SELECTION_FILTERS +//#define DEBUG_COMPOSILID_DISPLAY // Workaround for bug #25637 void displayedObjects(const Handle(AIS_InteractiveContext)& theAIS, AIS_ListOfInteractive& theList) { @@ -68,6 +82,15 @@ void displayedObjects(const Handle(AIS_InteractiveContext)& theAIS, AIS_ListOfIn } } +QString qIntListInfo(const QIntList& theValues, const QString& theSeparator = QString(", ")) +{ + QStringList anInfo; + QIntList::const_iterator anIt = theValues.begin(), aLast = theValues.end(); + for (; anIt != aLast; anIt++) { + anInfo.append(QString::number(*anIt)); + } + return anInfo.join(theSeparator); +} XGUI_Displayer::XGUI_Displayer(XGUI_Workshop* theWorkshop) : myWorkshop(theWorkshop) @@ -85,19 +108,24 @@ bool XGUI_Displayer::isVisible(ObjectPtr theObject) const return myResult2AISObjectMap.contains(theObject); } -void XGUI_Displayer::display(ObjectPtr theObject, bool isUpdateViewer) +void XGUI_Displayer::display(ObjectPtr theObject, bool theUpdateViewer) { if (isVisible(theObject)) { - redisplay(theObject, isUpdateViewer); - } else { -#ifdef DEBUG_DISPLAY - FeaturePtr aFeature = ModelAPI_Feature::feature(theObject); - if (aFeature.get() != NULL) { - qDebug(QString("display feature: %1, displayed: %2"). - arg(aFeature->data()->name().c_str()). - arg(displayedObjects().size()).toStdString().c_str()); +#ifdef DEBUG_COMPOSILID_DISPLAY + ResultCompSolidPtr aCompsolidResult = std::dynamic_pointer_cast(theObject); + if (aCompsolidResult.get()) { + for(int i = 0; i < aCompsolidResult->numberOfSubs(); i++) { + ResultPtr aSubResult = aCompsolidResult->subResult(i); + if (aSubResult.get()) + redisplay(aSubResult, false); + } + if (theUpdateViewer) + updateViewer(); } + else #endif + redisplay(theObject, theUpdateViewer); + } else { AISObjectPtr anAIS; GeomPresentablePtr aPrs = std::dynamic_pointer_cast(theObject); @@ -107,6 +135,19 @@ void XGUI_Displayer::display(ObjectPtr theObject, bool isUpdateViewer) } else { ResultPtr aResult = std::dynamic_pointer_cast(theObject); if (aResult.get() != NULL) { +#ifdef DEBUG_COMPOSILID_DISPLAY + ResultCompSolidPtr aCompsolidResult = std::dynamic_pointer_cast(theObject); + if (aCompsolidResult.get()) { + for(int i = 0; i < aCompsolidResult->numberOfSubs(); i++) { + ResultPtr aSubResult = aCompsolidResult->subResult(i); + if (aSubResult.get()) + display(aSubResult, false); + } + if (theUpdateViewer) + updateViewer(); + } + else { +#endif std::shared_ptr aShapePtr = ModelAPI_Tools::shape(aResult); if (aShapePtr.get() != NULL) { anAIS = AISObjectPtr(new GeomAPI_AISObject()); @@ -114,10 +155,13 @@ void XGUI_Displayer::display(ObjectPtr theObject, bool isUpdateViewer) //anAIS->createShape(aShapePtr); isShading = true; } +#ifdef DEBUG_COMPOSILID_DISPLAY + } // close else +#endif } } if (anAIS) - display(theObject, anAIS, isShading, isUpdateViewer); + display(theObject, anAIS, isShading, theUpdateViewer); } } @@ -126,6 +170,8 @@ bool canBeShaded(Handle(AIS_InteractiveObject) theAIS) Handle(AIS_Shape) aShapePrs = Handle(AIS_Shape)::DownCast(theAIS); if (!aShapePrs.IsNull()) { TopoDS_Shape aShape = aShapePrs->Shape(); + if (aShape.IsNull()) + return false; TopAbs_ShapeEnum aType = aShape.ShapeType(); if ((aType == TopAbs_VERTEX) || (aType == TopAbs_EDGE) || (aType == TopAbs_WIRE)) return false; @@ -141,7 +187,7 @@ bool canBeShaded(Handle(AIS_InteractiveObject) theAIS) } void XGUI_Displayer::display(ObjectPtr theObject, AISObjectPtr theAIS, - bool isShading, bool isUpdateViewer) + bool isShading, bool theUpdateViewer) { Handle(AIS_InteractiveContext) aContext = AISContext(); if (aContext.IsNull()) @@ -149,37 +195,24 @@ void XGUI_Displayer::display(ObjectPtr theObject, AISObjectPtr theAIS, Handle(AIS_InteractiveObject) anAISIO = theAIS->impl(); if (!anAISIO.IsNull()) { - myResult2AISObjectMap[theObject] = theAIS; - bool aCanBeShaded = ::canBeShaded(anAISIO); - // In order to avoid extra closing/opening context - SelectMgr_IndexedMapOfOwner aSelectedOwners; - if (aCanBeShaded) { - myWorkshop->selector()->selection()->selectedOwners(aSelectedOwners); - closeLocalContexts(false); - } - aContext->Display(anAISIO, false); - aContext->SetDisplayMode(anAISIO, isShading? Shading : Wireframe, false); - if (isShading) - anAISIO->Attributes()->SetFaceBoundaryDraw( Standard_True ); - emit objectDisplayed(theObject, theAIS); + appendResultObject(theObject, theAIS); bool isCustomized = customizeObject(theObject); - if (isCustomized) - aContext->Redisplay(anAISIO, false); - if (aCanBeShaded) { - openLocalContext(); - activateObjects(myActiveSelectionModes); - myWorkshop->selector()->setSelectedOwners(aSelectedOwners, false); - } - else - activate(anAISIO, myActiveSelectionModes); - } - if (isUpdateViewer) + int aDispMode = isShading? Shading : Wireframe; + if (isShading) + anAISIO->Attributes()->SetFaceBoundaryDraw( Standard_True ); + anAISIO->SetDisplayMode(aDispMode); + aContext->Display(anAISIO, aDispMode, 0, false, true, AIS_DS_Displayed); + + emit objectDisplayed(theObject, theAIS); + activate(anAISIO, myActiveSelectionModes, theUpdateViewer); + } + if (theUpdateViewer) updateViewer(); } -void XGUI_Displayer::erase(ObjectPtr theObject, const bool isUpdateViewer) +void XGUI_Displayer::erase(ObjectPtr theObject, const bool theUpdateViewer) { if (!isVisible(theObject)) return; @@ -192,13 +225,20 @@ void XGUI_Displayer::erase(ObjectPtr theObject, const bool isUpdateViewer) Handle(AIS_InteractiveObject) anAIS = anObject->impl(); if (!anAIS.IsNull()) { emit beforeObjectErase(theObject, anObject); - aContext->Remove(anAIS, isUpdateViewer); + aContext->Remove(anAIS, theUpdateViewer); } } myResult2AISObjectMap.remove(theObject); + +#ifdef DEBUG_DISPLAY + std::ostringstream aPtrStr; + aPtrStr << theObject.get(); + qDebug(QString("erase object: %1").arg(aPtrStr.str().c_str()).toStdString().c_str()); + qDebug(getResult2AISObjectMapInfo().c_str()); +#endif } -void XGUI_Displayer::redisplay(ObjectPtr theObject, bool isUpdateViewer) +void XGUI_Displayer::redisplay(ObjectPtr theObject, bool theUpdateViewer) { if (!isVisible(theObject)) return; @@ -210,11 +250,11 @@ void XGUI_Displayer::redisplay(ObjectPtr theObject, bool isUpdateViewer) if (aPrs) { AISObjectPtr aAIS_Obj = aPrs->getAISObject(aAISObj); if (!aAIS_Obj) { - erase(theObject, isUpdateViewer); + erase(theObject, theUpdateViewer); return; } if (aAIS_Obj != aAISObj) { - myResult2AISObjectMap[theObject] = aAIS_Obj; + appendResultObject(theObject, aAIS_Obj); } aAISIO = aAIS_Obj->impl(); } @@ -238,60 +278,38 @@ void XGUI_Displayer::redisplay(ObjectPtr theObject, bool isUpdateViewer) if (!aShapePrs.IsNull()) { std::shared_ptr aShapePtr = ModelAPI_Tools::shape(aResult); if (aShapePtr.get()) { - const TopoDS_Shape& aShape = aShapePrs->Shape(); - std::shared_ptr anAISShapePtr(new GeomAPI_Shape()); - anAISShapePtr->setImpl(new TopoDS_Shape(aShape)); - - isEqualShapes = aShapePtr->isEqual(anAISShapePtr); + const TopoDS_Shape& aOldShape = aShapePrs->Shape(); + if (!aOldShape.IsNull()) + isEqualShapes = aOldShape.IsEqual(aShapePtr->impl()); } } } // Customization of presentation 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()); + #endif if (!isEqualShapes || isCustomized) { aContext->Redisplay(aAISIO, false); - if (isUpdateViewer) + #ifdef DEBUG_FEATURE_REDISPLAY + qDebug(" Redisplay happens"); + #endif + if (theUpdateViewer) updateViewer(); } } } -void XGUI_Displayer::deactivate(ObjectPtr theObject) -{ - if (isVisible(theObject)) { - Handle(AIS_InteractiveContext) aContext = AISContext(); - if (aContext.IsNull()) - return; - - AISObjectPtr anObj = myResult2AISObjectMap[theObject]; - Handle(AIS_InteractiveObject) anAIS = anObj->impl(); - aContext->Deactivate(anAIS); - } -} - -/*void XGUI_Displayer::activate(ObjectPtr theFeature) -{ - activate(theFeature, myActiveSelectionModes); -} - -void XGUI_Displayer::activate(ObjectPtr theObject, const QIntList& theModes) +void XGUI_Displayer::deactivate(ObjectPtr theObject, const bool theUpdateViewer) { -#ifdef DEBUG_ACTIVATE - FeaturePtr aFeature = ModelAPI_Feature::feature(theObject); - - if (aFeature.get() != NULL) { - QIntList aModes; - getModesOfActivation(theObject, aModes); - - - qDebug(QString("activate feature: %1, theModes: %2, myActiveSelectionModes: %3, getModesOf: %4"). - arg(aFeature->data()->name().c_str()). - arg(theModes.size()). - arg(myActiveSelectionModes.size()). - arg(aModes.size()).toStdString().c_str()); - } +#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 - if (isVisible(theObject)) { Handle(AIS_InteractiveContext) aContext = AISContext(); if (aContext.IsNull()) @@ -300,9 +318,13 @@ void XGUI_Displayer::activate(ObjectPtr theObject, const QIntList& theModes) AISObjectPtr anObj = myResult2AISObjectMap[theObject]; Handle(AIS_InteractiveObject) anAIS = anObj->impl(); - activate(anAIS, theModes); + 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::getModesOfActivation(ObjectPtr theObject, QIntList& theModes) { @@ -326,17 +348,35 @@ void XGUI_Displayer::getModesOfActivation(ObjectPtr theObject, QIntList& theMode } } -void XGUI_Displayer::activateObjects(const QIntList& theModes) +void XGUI_Displayer::activateObjects(const QIntList& theModes, const QObjectPtrList& theObjList, + const bool theUpdateViewer) { -#ifdef DEBUG_ACTIVATE - qDebug(QString("activate all features: theModes: %2, myActiveSelectionModes: %3"). - arg(theModes.size()). - arg(myActiveSelectionModes.size()). + // Convert shape types to selection types + QIntList aModes; + foreach(int aType, theModes) { + if (aType > TopAbs_SHAPE) + aModes.append(aType); + else + aModes.append(AIS_Shape::SelectionMode((TopAbs_ShapeEnum)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: aModes[%1] = %2, myActiveSelectionModes[%3] = %4, objects = %5"). + arg(aModes.size()).arg(qIntListInfo(aModes)). + arg(myActiveSelectionModes.size()).arg(qIntListInfo(myActiveSelectionModes)). + arg(anInfoStr). toStdString().c_str()); #endif // In order to avoid doblications of selection modes QIntList aNewModes; - foreach (int aMode, theModes) { + foreach (int aMode, aModes) { if (!aNewModes.contains(aMode)) aNewModes.append(aMode); } @@ -351,38 +391,24 @@ void XGUI_Displayer::activateObjects(const QIntList& theModes) //aContext->UseDisplayedObjects(); //myUseExternalObjects = true; - AIS_ListOfInteractive aPrsList; - ::displayedObjects(aContext, aPrsList); - - Handle(AIS_Trihedron) aTrihedron; - AIS_ListIteratorOfListOfInteractive aLIt(aPrsList); Handle(AIS_InteractiveObject) anAISIO; - for(aLIt.Initialize(aPrsList); aLIt.More(); aLIt.Next()){ - anAISIO = aLIt.Value(); - activate(anAISIO, myActiveSelectionModes); - } -} - - -void XGUI_Displayer::deactivateObjects() -{ - myActiveSelectionModes.clear(); - Handle(AIS_InteractiveContext) aContext = AISContext(); - // Open local context if there is no one - if (!aContext->HasOpenedContext()) - return; - - //aContext->NotUseDisplayedObjects(); AIS_ListOfInteractive aPrsList; - ::displayedObjects(aContext, aPrsList); + if (theObjList.isEmpty()) + return; + else { + foreach(ObjectPtr aObj, theObjList) { + if (myResult2AISObjectMap.contains(aObj)) + aPrsList.Append(myResult2AISObjectMap[aObj]->impl()); + } + } - AIS_ListIteratorOfListOfInteractive aLIt; - //Handle(AIS_Trihedron) aTrihedron; - Handle(AIS_InteractiveObject) anAISIO; + AIS_ListIteratorOfListOfInteractive aLIt(aPrsList); for(aLIt.Initialize(aPrsList); aLIt.More(); aLIt.Next()){ anAISIO = aLIt.Value(); - aContext->Deactivate(anAISIO); + activate(anAISIO, myActiveSelectionModes, false); } + if (theUpdateViewer) + updateViewer(); } bool XGUI_Displayer::isActive(ObjectPtr theObject) const @@ -400,8 +426,7 @@ bool XGUI_Displayer::isActive(ObjectPtr theObject) const aContext->ActivatedModes(anAIS, aModes); return aModes.Extent() > 0; } - -void XGUI_Displayer::setSelected(const QObjectPtrList& theResults, const bool isUpdateViewer) +void XGUI_Displayer::setSelected(const QList& theValues, bool theUpdateViewer) { Handle(AIS_InteractiveContext) aContext = AISContext(); if (aContext.IsNull()) @@ -409,19 +434,34 @@ void XGUI_Displayer::setSelected(const QObjectPtrList& theResults, const bool is if (aContext->HasOpenedContext()) { aContext->UnhilightSelected(); aContext->ClearSelected(); - foreach(ObjectPtr aResult, theResults) { - if (isVisible(aResult)) { - AISObjectPtr anObj = myResult2AISObjectMap[aResult]; - Handle(AIS_InteractiveObject) anAIS = anObj->impl(); - if (!anAIS.IsNull()) - aContext->SetSelected(anAIS, false); + foreach (ModuleBase_ViewerPrs aPrs, theValues) { + const TopoDS_Shape& aShape = aPrs.shape(); + if (!aShape.IsNull()) { + aContext->AddOrRemoveSelected(aShape, false); + } 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); + } + } } } } else { aContext->UnhilightCurrents(); aContext->ClearCurrents(); - foreach(ObjectPtr aResult, theResults) { - if (isVisible(aResult)) { + foreach (ModuleBase_ViewerPrs aPrs, theValues) { + 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()) @@ -429,11 +469,10 @@ void XGUI_Displayer::setSelected(const QObjectPtrList& theResults, const bool is } } } - if (isUpdateViewer) + if (theUpdateViewer) updateViewer(); } - void XGUI_Displayer::clearSelected() { Handle(AIS_InteractiveContext) aContext = AISContext(); @@ -443,7 +482,7 @@ void XGUI_Displayer::clearSelected() } } -void XGUI_Displayer::eraseAll(const bool isUpdateViewer) +void XGUI_Displayer::eraseAll(const bool theUpdateViewer) { Handle(AIS_InteractiveContext) aContext = AISContext(); if (!aContext.IsNull()) { @@ -456,10 +495,29 @@ void XGUI_Displayer::eraseAll(const bool isUpdateViewer) aContext->Remove(anIO, false); } } - if (isUpdateViewer) + if (theUpdateViewer) updateViewer(); } myResult2AISObjectMap.clear(); +#ifdef DEBUG_DISPLAY + qDebug("eraseAll"); + qDebug(getResult2AISObjectMapInfo().c_str()); +#endif +} + +void XGUI_Displayer::deactivateTrihedron() const +{ + Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext(); + + AIS_ListOfInteractive aList; + aContext->DisplayedObjects(aList, true); + AIS_ListIteratorOfListOfInteractive aIt; + for (aIt.Initialize(aList); aIt.More(); aIt.Next()) { + Handle(AIS_Trihedron) aTrihedron = Handle(AIS_Trihedron)::DownCast(aIt.Value()); + if (!aTrihedron.IsNull()) { + aContext->Deactivate(aTrihedron); + } + } } void XGUI_Displayer::openLocalContext() @@ -484,6 +542,7 @@ void XGUI_Displayer::openLocalContext() //aContext->ClearCurrents(); aContext->OpenLocalContext(); + deactivateTrihedron(); //aContext->NotUseDisplayedObjects(); //myUseExternalObjects = false; @@ -500,7 +559,7 @@ void XGUI_Displayer::openLocalContext() } } -void XGUI_Displayer::closeLocalContexts(const bool isUpdateViewer) +void XGUI_Displayer::closeLocalContexts(const bool theUpdateViewer) { Handle(AIS_InteractiveContext) aContext = AISContext(); if ( (!aContext.IsNull()) && (aContext->HasOpenedContext()) ) { @@ -534,7 +593,7 @@ void XGUI_Displayer::closeLocalContexts(const bool isUpdateViewer) aContext->AddFilter(aFilter); } - if (isUpdateViewer) + if (theUpdateViewer) updateViewer(); //myUseExternalObjects = false; @@ -563,14 +622,23 @@ ObjectPtr XGUI_Displayer::getObject(const AISObjectPtr& theIO) const ObjectPtr XGUI_Displayer::getObject(const Handle(AIS_InteractiveObject)& theIO) const { - ObjectPtr aFeature; + ObjectPtr anObject; foreach (ObjectPtr anObj, myResult2AISObjectMap.keys()) { AISObjectPtr aAIS = myResult2AISObjectMap[anObj]; Handle(AIS_InteractiveObject) anAIS = aAIS->impl(); if (anAIS == theIO) - return anObj; + anObject = anObj; + if (anObject.get()) + break; } - return aFeature; + if (!anObject.get()) { + std::shared_ptr anAISObj = AISObjectPtr(new GeomAPI_AISObject()); + if (!theIO.IsNull()) { + anAISObj->setImpl(new Handle(AIS_InteractiveObject)(theIO)); + } + anObject = myWorkshop->module()->findPresentedObject(anAISObj); + } + return anObject; } bool XGUI_Displayer::enableUpdateViewer(const bool isEnabled) @@ -582,11 +650,41 @@ bool XGUI_Displayer::enableUpdateViewer(const bool isEnabled) return aWasEnabled; } -void XGUI_Displayer::updateViewer() +void XGUI_Displayer::updateViewer() const { Handle(AIS_InteractiveContext) aContext = AISContext(); - if (!aContext.IsNull() && myEnableUpdateViewer) + if (!aContext.IsNull() && myEnableUpdateViewer) { + myWorkshop->viewer()->Zfitall(); aContext->UpdateCurrentViewer(); + } +} + +void XGUI_Displayer::activateAIS(const Handle(AIS_InteractiveObject)& theIO, + const int theMode, const bool theUpdateViewer) const +{ + Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext(); + aContext->Activate(theIO, theMode, theUpdateViewer); + +#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 +} + +void XGUI_Displayer::deactivateAIS(const Handle(AIS_InteractiveObject)& theIO, const int theMode) const +{ + Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext(); + 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 @@ -594,6 +692,9 @@ Handle(AIS_InteractiveContext) XGUI_Displayer::AISContext() const Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext(); if ((!aContext.IsNull()) && (!aContext->HasOpenedContext())) { aContext->OpenLocalContext(); + deactivateTrihedron(); + aContext->DefaultDrawer()->VIsoAspect()->SetNumber(0); + aContext->DefaultDrawer()->UIsoAspect()->SetNumber(0); } return aContext; } @@ -608,41 +709,39 @@ Handle(SelectMgr_AndFilter) XGUI_Displayer::GetFilter() return myAndFilter; } -void XGUI_Displayer::displayAIS(AISObjectPtr theAIS, bool isUpdate) +void XGUI_Displayer::displayAIS(AISObjectPtr theAIS, bool theUpdateViewer) { Handle(AIS_InteractiveContext) aContext = AISContext(); if (aContext.IsNull()) return; Handle(AIS_InteractiveObject) anAISIO = theAIS->impl(); if (!anAISIO.IsNull()) { - aContext->Display(anAISIO, isUpdate); + aContext->Display(anAISIO, theUpdateViewer); if (aContext->HasOpenedContext()) { - //if (myUseExternalObjects) { - if (myActiveSelectionModes.size() == 0) - aContext->Activate(anAISIO); - else { - foreach(int aMode, myActiveSelectionModes) { - aContext->Activate(anAISIO, aMode); - } + if (myActiveSelectionModes.size() == 0) + activateAIS(anAISIO, 0, theUpdateViewer); + else { + foreach(int aMode, myActiveSelectionModes) { + activateAIS(anAISIO, aMode, theUpdateViewer); } - //} + } } } } -void XGUI_Displayer::eraseAIS(AISObjectPtr theAIS, const bool isUpdate) +void XGUI_Displayer::eraseAIS(AISObjectPtr theAIS, const bool theUpdateViewer) { Handle(AIS_InteractiveContext) aContext = AISContext(); if (aContext.IsNull()) return; Handle(AIS_InteractiveObject) anAISIO = theAIS->impl(); if (!anAISIO.IsNull()) { - aContext->Remove(anAISIO, isUpdate); + aContext->Remove(anAISIO, theUpdateViewer); } } -void XGUI_Displayer::setDisplayMode(ObjectPtr theObject, DisplayMode theMode, bool toUpdate) +void XGUI_Displayer::setDisplayMode(ObjectPtr theObject, DisplayMode theMode, bool theUpdateViewer) { if (theMode == NoMode) return; @@ -656,20 +755,9 @@ void XGUI_Displayer::setDisplayMode(ObjectPtr theObject, DisplayMode theMode, bo return; Handle(AIS_InteractiveObject) aAISIO = aAISObj->impl(); - bool aCanBeShaded = ::canBeShaded(aAISIO); - // In order to avoid extra closing/opening context - SelectMgr_IndexedMapOfOwner aSelectedOwners; - if (aCanBeShaded) { - myWorkshop->selector()->selection()->selectedOwners(aSelectedOwners); - closeLocalContexts(false); - } aContext->SetDisplayMode(aAISIO, theMode, false); - if (aCanBeShaded) { - openLocalContext(); - activateObjects(myActiveSelectionModes); - myWorkshop->selector()->setSelectedOwners(aSelectedOwners, false); - } - if (toUpdate) + // Redisplay in order to update new mode because it could be not computed before + if (theUpdateViewer) updateViewer(); } @@ -690,15 +778,15 @@ XGUI_Displayer::DisplayMode XGUI_Displayer::displayMode(ObjectPtr theObject) con void XGUI_Displayer::addSelectionFilter(const Handle(SelectMgr_Filter)& theFilter) { Handle(AIS_InteractiveContext) aContext = AISContext(); - if (aContext.IsNull()) + if (aContext.IsNull() || hasSelectionFilter(theFilter)) return; - const SelectMgr_ListOfFilter& aFilters = aContext->Filters(); - SelectMgr_ListIteratorOfListOfFilter aIt(aFilters); - for (; aIt.More(); aIt.Next()) { - if (theFilter.Access() == aIt.Value().Access()) - return; - } - GetFilter()->Add(theFilter); + + Handle(SelectMgr_CompositionFilter) aCompFilter = GetFilter(); + aCompFilter->Add(theFilter); +#ifdef DEBUG_SELECTION_FILTERS + int aCount = GetFilter()->StoredFilters().Extent(); + qDebug(QString("addSelectionFilter: filters.count() = %1").arg(aCount).toStdString().c_str()); +#endif } void XGUI_Displayer::removeSelectionFilter(const Handle(SelectMgr_Filter)& theFilter) @@ -709,6 +797,32 @@ void XGUI_Displayer::removeSelectionFilter(const Handle(SelectMgr_Filter)& theFi Handle(SelectMgr_AndFilter) aCompositeFilter = GetFilter(); if (aCompositeFilter->IsIn(theFilter)) aCompositeFilter->Remove(theFilter); +#ifdef DEBUG_SELECTION_FILTERS + int aCount = GetFilter()->StoredFilters().Extent(); + qDebug(QString("removeSelectionFilter: filters.count() = %1").arg(aCount).toStdString().c_str()); +#endif +} + +bool XGUI_Displayer::hasSelectionFilter(const Handle(SelectMgr_Filter)& theFilter) +{ + bool aFilterFound = false; + + Handle(AIS_InteractiveContext) aContext = AISContext(); + if (aContext.IsNull()) + return aFilterFound; + const SelectMgr_ListOfFilter& aFilters = aContext->Filters(); + SelectMgr_ListIteratorOfListOfFilter aIt(aFilters); + for (; aIt.More() && !aFilterFound; aIt.Next()) { + if (theFilter.Access() == aIt.Value().Access()) + aFilterFound = true; + } + Handle(SelectMgr_CompositionFilter) aCompFilter = GetFilter(); + const SelectMgr_ListOfFilter& aStoredFilters = aCompFilter->StoredFilters(); + for (aIt.Initialize(aStoredFilters); aIt.More() && !aFilterFound; aIt.Next()) { + if (theFilter.Access() == aIt.Value().Access()) + aFilterFound = true; + } + return aFilterFound; } void XGUI_Displayer::removeFilters() @@ -747,26 +861,64 @@ bool XGUI_Displayer::canBeShaded(ObjectPtr theObject) const } void XGUI_Displayer::activate(const Handle(AIS_InteractiveObject)& theIO, - const QIntList& theModes) const + const QIntList& theModes, + const bool theUpdateViewer) const { Handle(AIS_InteractiveContext) aContext = AISContext(); if (aContext.IsNull() || theIO.IsNull()) return; - aContext->Load(theIO, -1, true); - aContext->Deactivate(theIO); + // 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(); + 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) + aContext->LocalContext()->ClearOutdatedSelection(theIO, true); + if (theUpdateViewer) + updateViewer(); + } + + // 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 = Handle(AIS_Trihedron)::DownCast(theIO); - //Deactivate trihedron which can be activated in local selector if (aTrihedron.IsNull()) { - //aContext->Load(anAISIO, -1, true); - // In order to clear active modes list + //aContext->Load(anAISIO, -1, true); + // In order to clear active modes list if (theModes.size() == 0) { //aContext->Load(anAISIO, 0, true); - aContext->Activate(theIO); + activateAIS(theIO, 0, theUpdateViewer); } else { foreach(int aMode, theModes) { //aContext->Load(anAISIO, aMode, true); - aContext->Activate(theIO, aMode); + if (!aModesActivatedForIO.contains(aMode)) { + activateAIS(theIO, aMode, theUpdateViewer); + } } } } @@ -787,17 +939,19 @@ bool XGUI_Displayer::customizeObject(ObjectPtr theObject) aCustomPrs = aCustPrs; } if (aCustomPrs.get() == NULL) { - // we ignore presentable not customized objects GeomPresentablePtr aPrs = std::dynamic_pointer_cast(theObject); - if (aPrs.get() != NULL) - return false; - aCustomPrs = myCustomPrs; + // we ignore presentable not customized objects + if (aPrs.get() == NULL) + aCustomPrs = myCustomPrs; } - return aCustomPrs->customisePresentation(aResult, anAISObj, myCustomPrs); + bool isCustomized = aCustomPrs.get() && + aCustomPrs->customisePresentation(aResult, anAISObj, myCustomPrs); + myWorkshop->module()->customizeObject(theObject); + return isCustomized; } -QColor XGUI_Displayer::setObjectColor(ObjectPtr theObject, const QColor& theColor, bool toUpdate) +QColor XGUI_Displayer::setObjectColor(ObjectPtr theObject, const QColor& theColor, bool theUpdateViewer) { if (!isVisible(theObject)) return Qt::black; @@ -806,7 +960,35 @@ QColor XGUI_Displayer::setObjectColor(ObjectPtr theObject, const QColor& theColo int aR, aG, aB; anAISObj->getColor(aR, aG, aB); anAISObj->setColor(theColor.red(), theColor.green(), theColor.blue()); - if (toUpdate) + if (theUpdateViewer) updateViewer(); return QColor(aR, aG, aB); } + +void XGUI_Displayer::appendResultObject(ObjectPtr theObject, AISObjectPtr theAIS) +{ + myResult2AISObjectMap[theObject] = theAIS; + +#ifdef DEBUG_DISPLAY + std::ostringstream aPtrStr; + aPtrStr << theObject.get(); + qDebug(QString("display object: %1").arg(aPtrStr.str().c_str()).toStdString().c_str()); + qDebug(getResult2AISObjectMapInfo().c_str()); +#endif +} + +std::string XGUI_Displayer::getResult2AISObjectMapInfo() const +{ + QStringList aContent; + foreach (ObjectPtr aObj, myResult2AISObjectMap.keys()) { + AISObjectPtr aAISObj = myResult2AISObjectMap[aObj]; + 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").arg(myResult2AISObjectMap.size()). + arg(aContent.join("\n")).toStdString().c_str(); +}