//#define DEBUG_DISPLAY
//#define DEBUG_ACTIVATE
+//#define DEBUG_FEATURE_REDISPLAY
+//#define DEBUG_SELECTION_FILTERS
+//#define DEBUG_USE_CLEAR_OUTDATED_SELECTION
// Workaround for bug #25637
void displayedObjects(const Handle(AIS_InteractiveContext)& theAIS, AIS_ListOfInteractive& theList)
GeomPresentablePtr aPrs = std::dynamic_pointer_cast<GeomAPI_IPresentable>(theObject);
bool isShading = false;
if (aPrs.get() != NULL) {
- anAIS = aPrs->getAISObject(AISObjectPtr());
+ anAIS = aPrs->getAISObject(anAIS);
} else {
ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(theObject);
if (aResult.get() != NULL) {
closeLocalContexts(false);
}
aContext->Display(anAISIO, false);
-
aContext->SetDisplayMode(anAISIO, isShading? Shading : Wireframe, false);
+ if (isShading)
+ anAISIO->Attributes()->SetFaceBoundaryDraw( Standard_True );
+ emit objectDisplayed(theObject, theAIS);
bool isCustomized = customizeObject(theObject);
if (isCustomized)
if (anObject) {
Handle(AIS_InteractiveObject) anAIS = anObject->impl<Handle(AIS_InteractiveObject)>();
if (!anAIS.IsNull()) {
+ emit beforeObjectErase(theObject, anObject);
aContext->Remove(anAIS, isUpdateViewer);
}
}
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();
+ 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());
+ #endif
if (!isEqualShapes || isCustomized) {
aContext->Redisplay(aAISIO, false);
+ #ifdef DEBUG_FEATURE_REDISPLAY
+ //qDebug(" Redisplay happens");
+ #endif
if (isUpdateViewer)
updateViewer();
}
AISObjectPtr anObj = myResult2AISObjectMap[theObject];
Handle(AIS_InteractiveObject) anAIS = anObj->impl<Handle(AIS_InteractiveObject)>();
aContext->Deactivate(anAIS);
+#ifdef DEBUG_USE_CLEAR_OUTDATED_SELECTION
+ aContext->LocalContext()->ClearOutdatedSelection(anAIS, true);
+ updateViewer();
+#endif
}
}
for(aLIt.Initialize(aPrsList); aLIt.More(); aLIt.Next()){
anAISIO = aLIt.Value();
aContext->Deactivate(anAISIO);
+#ifdef DEBUG_USE_CLEAR_OUTDATED_SELECTION
+ aContext->LocalContext()->ClearOutdatedSelection(anAISIO, true);
+ updateViewer();
+#endif
}
}
if (isVisible(aResult)) {
AISObjectPtr anObj = myResult2AISObjectMap[aResult];
Handle(AIS_InteractiveObject) anAIS = anObj->impl<Handle(AIS_InteractiveObject)>();
- if (!anAIS.IsNull())
- aContext->SetSelected(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);
+ }
}
}
} else {
updateViewer();
}
+void XGUI_Displayer::setSelected(const QList<ModuleBase_ViewerPrs>& theValues, bool isUpdateViewer)
+{
+ Handle(AIS_InteractiveContext) aContext = AISContext();
+ if (aContext.IsNull())
+ return;
+ if (aContext->HasOpenedContext()) {
+ aContext->UnhilightSelected();
+ aContext->ClearSelected();
+ //if (aSelected.size() > 0) {
+ foreach (ModuleBase_ViewerPrs aPrs, theValues) {
+ // if (isValidSelection(aPrs)) {
+ //foreach(ObjectPtr aResult, theResults) {
+ 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()) {
+ const TopoDS_Shape& aShape = aPrs.shape();
+ if (!aShape.IsNull()) {
+ aContext->AddOrRemoveSelected(aShape, false);
+ }
+ else {
+ // 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) {
+ 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())
+ aContext->SetCurrentObject(anAIS, false);
+ }
+ }
+ }
+ if (isUpdateViewer)
+ updateViewer();
+}
void XGUI_Displayer::clearSelected()
{
{
Handle(AIS_InteractiveContext) aContext = AISContext();
if (!aContext.IsNull()) {
- foreach (AISObjectPtr aAISObj, myResult2AISObjectMap) {
- // erase an object
- Handle(AIS_InteractiveObject) anIO = aAISObj->impl<Handle(AIS_InteractiveObject)>();
- if (!anIO.IsNull())
- aContext->Remove(anIO, false);
- }
- if (isUpdateViewer)
- updateViewer();
+ foreach (ObjectPtr aObj, myResult2AISObjectMap.keys()) {
+ AISObjectPtr aAISObj = myResult2AISObjectMap[aObj];
+ // erase an object
+ Handle(AIS_InteractiveObject) anIO = aAISObj->impl<Handle(AIS_InteractiveObject)>();
+ if (!anIO.IsNull()) {
+ emit beforeObjectErase(aObj, aAISObj);
+ aContext->Remove(anIO, false);
+ }
+ }
+ if (isUpdateViewer)
+ updateViewer();
}
myResult2AISObjectMap.clear();
}
return aWasEnabled;
}
-void XGUI_Displayer::updateViewer()
+void XGUI_Displayer::updateViewer() const
{
Handle(AIS_InteractiveContext) aContext = AISContext();
if (!aContext.IsNull() && myEnableUpdateViewer)
closeLocalContexts(false);
}
aContext->SetDisplayMode(aAISIO, theMode, false);
+ // Redisplay in order to update new mode because it could be not computed before
+ aContext->Redisplay(aAISIO, false);
if (aCanBeShaded) {
openLocalContext();
activateObjects(myActiveSelectionModes);
if (theFilter.Access() == aIt.Value().Access())
return;
}
- GetFilter()->Add(theFilter);
+ 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();
+ qDebug(QString("addSelectionFilter: filters.count() = %1").arg(aCount).toStdString().c_str());
+#endif
}
void XGUI_Displayer::removeSelectionFilter(const Handle(SelectMgr_Filter)& theFilter)
Handle(AIS_InteractiveContext) aContext = AISContext();
if (aContext.IsNull())
return;
- GetFilter()->Remove(theFilter);
+ 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
}
void XGUI_Displayer::removeFilters()
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)) {
+#ifdef DEBUG_ACTIVATE
+ qDebug(QString("deactivate: %1").arg(aMode).toStdString().c_str());
+#endif
+ aContext->Deactivate(theIO, aMode);
+ //isDeactivated = true;
+ }
+ else {
+ aModesActivatedForIO.append(aMode);
+#ifdef DEBUG_ACTIVATE
+ qDebug(QString(" active: %1").arg(aMode).toStdString().c_str());
+#endif
+ }
+ }
+#ifdef DEBUG_USE_CLEAR_OUTDATED_SELECTION
+ if (isDeactivated) {
+ aContext->LocalContext()->ClearOutdatedSelection(theIO, true);
+ updateViewer();
+ }
+#endif
+ // loading the interactive object allowing the decomposition
+ if (aTColModes.IsEmpty())
+ aContext->Load(theIO, -1, true);
+
Handle(AIS_Trihedron) aTrihedron = Handle(AIS_Trihedron)::DownCast(theIO);
//Deactivate trihedron which can be activated in local selector
if (aTrihedron.IsNull()) {
if (theModes.size() == 0) {
//aContext->Load(anAISIO, 0, true);
aContext->Activate(theIO);
+#ifdef DEBUG_ACTIVATE
+ qDebug("activate in all modes");
+#endif
} else {
foreach(int aMode, theModes) {
//aContext->Load(anAISIO, aMode, true);
- aContext->Activate(theIO, aMode);
+ if (!aModesActivatedForIO.contains(aMode)) {
+ aContext->Activate(theIO, aMode);
+#ifdef DEBUG_ACTIVATE
+ qDebug(QString("activate: %1").arg(aMode).toStdString().c_str());
+#endif
+ }
}
}
}
}
return aCustomPrs->customisePresentation(aResult, anAISObj, myCustomPrs);
}
+
+
+QColor XGUI_Displayer::setObjectColor(ObjectPtr theObject, const QColor& theColor, bool toUpdate)
+{
+ if (!isVisible(theObject))
+ return Qt::black;
+
+ AISObjectPtr anAISObj = getAISObject(theObject);
+ int aR, aG, aB;
+ anAISObj->getColor(aR, aG, aB);
+ anAISObj->setColor(theColor.red(), theColor.green(), theColor.blue());
+ if (toUpdate)
+ updateViewer();
+ return QColor(aR, aG, aB);
+}
