#include <ModelAPI_Object.h>
#include <ModelAPI_Tools.h>
#include <ModelAPI_AttributeIntArray.h>
+#include <ModelAPI_ResultCompSolid.h>
#include <ModuleBase_ResultPrs.h>
+#include <ModuleBase_Tools.h>
+#include <ModuleBase_IModule.h>
#include <GeomAPI_Shape.h>
#include <GeomAPI_IPresentable.h>
#include <TColStd_ListIteratorOfListOfInteger.hxx>
#include <SelectMgr_ListOfFilter.hxx>
#include <SelectMgr_ListIteratorOfListOfFilter.hxx>
+#include <Prs3d_Drawer.hxx>
+#include <Prs3d_IsoAspect.hxx>
+
+#include <StdSelect_ViewerSelector3d.hxx>
#include <TColStd_MapOfTransient.hxx>
#include <TColStd_MapIteratorOfMapOfTransient.hxx>
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)
{
}
}
+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)
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<ModelAPI_ResultCompSolid>(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<GeomAPI_IPresentable>(theObject);
} else {
ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(theObject);
if (aResult.get() != NULL) {
+#ifdef DEBUG_COMPOSILID_DISPLAY
+ ResultCompSolidPtr aCompsolidResult = std::dynamic_pointer_cast<ModelAPI_ResultCompSolid>(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<GeomAPI_Shape> aShapePtr = ModelAPI_Tools::shape(aResult);
if (aShapePtr.get() != NULL) {
anAIS = AISObjectPtr(new GeomAPI_AISObject());
//anAIS->createShape(aShapePtr);
isShading = true;
}
+#ifdef DEBUG_COMPOSILID_DISPLAY
+ } // close else
+#endif
}
}
if (anAIS)
- display(theObject, anAIS, isShading, isUpdateViewer);
+ display(theObject, anAIS, isShading, theUpdateViewer);
}
}
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;
}
void XGUI_Displayer::display(ObjectPtr theObject, AISObjectPtr theAIS,
- bool isShading, bool isUpdateViewer)
+ bool isShading, bool theUpdateViewer)
{
Handle(AIS_InteractiveContext) aContext = AISContext();
if (aContext.IsNull())
Handle(AIS_InteractiveObject) anAISIO = theAIS->impl<Handle(AIS_InteractiveObject)>();
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;
Handle(AIS_InteractiveObject) anAIS = anObject->impl<Handle(AIS_InteractiveObject)>();
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;
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<Handle(AIS_InteractiveObject)>();
}
if (!aShapePrs.IsNull()) {
std::shared_ptr<GeomAPI_Shape> aShapePtr = ModelAPI_Tools::shape(aResult);
if (aShapePtr.get()) {
- const TopoDS_Shape& aShape = aShapePrs->Shape();
- std::shared_ptr<GeomAPI_Shape> 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<TopoDS_Shape>());
}
}
}
// 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());
+ 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);
#ifdef DEBUG_FEATURE_REDISPLAY
- //qDebug(" Redisplay happens");
+ qDebug(" Redisplay happens");
#endif
- if (isUpdateViewer)
+ 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<Handle(AIS_InteractiveObject)>();
- aContext->Deactivate(anAIS);
- }
-}
-
-/*void XGUI_Displayer::activate(ObjectPtr theFeature)
+void XGUI_Displayer::deactivate(ObjectPtr theObject, const bool theUpdateViewer)
{
- activate(theFeature, myActiveSelectionModes);
-}
-
-void XGUI_Displayer::activate(ObjectPtr theObject, const QIntList& theModes)
-{
-#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())
AISObjectPtr anObj = myResult2AISObjectMap[theObject];
Handle(AIS_InteractiveObject) anAIS = anObj->impl<Handle(AIS_InteractiveObject)>();
- 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)
{
}
}
-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);
}
//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<Handle(AIS_InteractiveObject)>());
+ }
+ }
- 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
aContext->ActivatedModes(anAIS, aModes);
return aModes.Extent() > 0;
}
-
-void XGUI_Displayer::setSelected(const QObjectPtrList& theResults, const bool isUpdateViewer)
+void XGUI_Displayer::setSelected(const QList<ModuleBase_ViewerPrs>& theValues, bool theUpdateViewer)
{
Handle(AIS_InteractiveContext) aContext = AISContext();
if (aContext.IsNull())
if (aContext->HasOpenedContext()) {
aContext->UnhilightSelected();
aContext->ClearSelected();
- foreach(ObjectPtr aResult, theResults) {
- if (isVisible(aResult)) {
- AISObjectPtr anObj = myResult2AISObjectMap[aResult];
- Handle(AIS_InteractiveObject) anAIS = anObj->impl<Handle(AIS_InteractiveObject)>();
- 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<ModelAPI_Result>(anObject);
+ if (aResult.get() && isVisible(aResult)) {
+ AISObjectPtr anObj = myResult2AISObjectMap[aResult];
+ Handle(AIS_InteractiveObject) anAIS = anObj->impl<Handle(AIS_InteractiveObject)>();
+ 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<ModelAPI_Result>(anObject);
+ if (aResult.get() && isVisible(aResult)) {
AISObjectPtr anObj = myResult2AISObjectMap[aResult];
Handle(AIS_InteractiveObject) anAIS = anObj->impl<Handle(AIS_InteractiveObject)>();
if (!anAIS.IsNull())
}
}
}
- if (isUpdateViewer)
+ if (theUpdateViewer)
updateViewer();
}
-
void XGUI_Displayer::clearSelected()
{
Handle(AIS_InteractiveContext) aContext = AISContext();
}
}
-void XGUI_Displayer::eraseAll(const bool isUpdateViewer)
+void XGUI_Displayer::eraseAll(const bool theUpdateViewer)
{
Handle(AIS_InteractiveContext) aContext = AISContext();
if (!aContext.IsNull()) {
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()
//aContext->ClearCurrents();
aContext->OpenLocalContext();
+ deactivateTrihedron();
//aContext->NotUseDisplayedObjects();
//myUseExternalObjects = false;
}
}
-void XGUI_Displayer::closeLocalContexts(const bool isUpdateViewer)
+void XGUI_Displayer::closeLocalContexts(const bool theUpdateViewer)
{
Handle(AIS_InteractiveContext) aContext = AISContext();
if ( (!aContext.IsNull()) && (aContext->HasOpenedContext()) ) {
//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;
+ /*Handle(AIS_InteractiveObject) aAISIO;
foreach (AISObjectPtr aAIS, myResult2AISObjectMap) {
aAISIO = aAIS->impl<Handle(AIS_InteractiveObject)>();
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);
aContext->AddFilter(aFilter);
}
- if (isUpdateViewer)
+ if (theUpdateViewer)
updateViewer();
//myUseExternalObjects = false;
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<Handle(AIS_InteractiveObject)>();
if (anAIS == theIO)
- return anObj;
+ anObject = anObj;
+ if (anObject.get())
+ break;
+ }
+ if (!anObject.get()) {
+ std::shared_ptr<GeomAPI_AISObject> anAISObj = AISObjectPtr(new GeomAPI_AISObject());
+ if (!theIO.IsNull()) {
+ anAISObj->setImpl(new Handle(AIS_InteractiveObject)(theIO));
+ }
+ anObject = myWorkshop->module()->findPresentedObject(anAISObj);
}
- return aFeature;
+ return anObject;
}
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
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;
}
return myAndFilter;
}
-void XGUI_Displayer::displayAIS(AISObjectPtr theAIS, bool isUpdate)
+void XGUI_Displayer::displayAIS(AISObjectPtr theAIS, const bool toActivateInSelectionModes,
+ bool theUpdateViewer)
{
Handle(AIS_InteractiveContext) aContext = AISContext();
if (aContext.IsNull())
return;
Handle(AIS_InteractiveObject) anAISIO = theAIS->impl<Handle(AIS_InteractiveObject)>();
if (!anAISIO.IsNull()) {
- aContext->Display(anAISIO, isUpdate);
- if (aContext->HasOpenedContext()) {
- //if (myUseExternalObjects) {
+ aContext->Display(anAISIO, 0/*wireframe*/, 0, theUpdateViewer, true, AIS_DS_Displayed);
+ aContext->Deactivate(anAISIO);
+ aContext->Load(anAISIO);
+ if (toActivateInSelectionModes) {
+ if (aContext->HasOpenedContext()) {
if (myActiveSelectionModes.size() == 0)
- aContext->Activate(anAISIO);
+ activateAIS(anAISIO, 0, theUpdateViewer);
else {
foreach(int aMode, myActiveSelectionModes) {
- aContext->Activate(anAISIO, aMode);
+ 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<Handle(AIS_InteractiveObject)>();
- if (!anAISIO.IsNull()) {
- aContext->Remove(anAISIO, isUpdate);
+ if (!anAISIO.IsNull() && aContext->IsDisplayed(anAISIO)) {
+ 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;
return;
Handle(AIS_InteractiveObject) aAISIO = aAISObj->impl<Handle(AIS_InteractiveObject)>();
- 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();
}
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;
- }
+
Handle(SelectMgr_CompositionFilter) aCompFilter = GetFilter();
- const SelectMgr_ListOfFilter& aStoredFilters = aCompFilter->StoredFilters();
- for (aIt.Initialize(aStoredFilters); aIt.More(); aIt.Next()) {
- if (theFilter.Access() == aIt.Value().Access())
- return;
- }
aCompFilter->Add(theFilter);
#ifdef DEBUG_SELECTION_FILTERS
int aCount = GetFilter()->StoredFilters().Extent();
#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()
{
Handle(AIS_InteractiveContext) aContext = AISContext();
}
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())
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)) {
-#ifdef DEBUG_ACTIVATE
- qDebug(QString("deactivate: %1").arg(aMode).toStdString().c_str());
-#endif
- aContext->Deactivate(theIO, aMode);
+ deactivateAIS(theIO, aMode);
+ isDeactivated = true;
}
else {
aModesActivatedForIO.append(aMode);
-#ifdef DEBUG_ACTIVATE
- qDebug(QString(" active: %1").arg(aMode).toStdString().c_str());
-#endif
}
}
+ 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())
+ 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);
-#ifdef DEBUG_ACTIVATE
- qDebug("activate in all modes");
-#endif
+ activateAIS(theIO, 0, theUpdateViewer);
} else {
foreach(int aMode, theModes) {
//aContext->Load(anAISIO, aMode, true);
if (!aModesActivatedForIO.contains(aMode)) {
- aContext->Activate(theIO, aMode);
-#ifdef DEBUG_ACTIVATE
- qDebug(QString("activate: %1").arg(aMode).toStdString().c_str());
-#endif
+ activateAIS(theIO, aMode, theUpdateViewer);
}
}
}
aCustomPrs = aCustPrs;
}
if (aCustomPrs.get() == NULL) {
- // we ignore presentable not customized objects
GeomPresentablePtr aPrs = std::dynamic_pointer_cast<GeomAPI_IPresentable>(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;
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\n").arg(myResult2AISObjectMap.size()).
+ arg(aContent.join("\n")).toStdString().c_str();
+}
