#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 <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>
+#include <Events_Loop.h>
+#include <ModelAPI_Events.h>
+
#include <set>
const int MOUSE_SENSITIVITY_IN_PIXEL = 10; ///< defines the local context mouse selection sensitivity
//#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)
{
return myResult2AISObjectMap.contains(theObject);
}
-void XGUI_Displayer::display(ObjectPtr theObject, bool theUpdateViewer)
+bool XGUI_Displayer::display(ObjectPtr theObject, bool theUpdateViewer)
{
+ bool aDisplayed = false;
if (isVisible(theObject)) {
- redisplay(theObject, theUpdateViewer);
+#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
+ aDisplayed = redisplay(theObject, theUpdateViewer);
} else {
AISObjectPtr anAIS;
-
GeomPresentablePtr aPrs = std::dynamic_pointer_cast<GeomAPI_IPresentable>(theObject);
bool isShading = false;
if (aPrs.get() != NULL) {
} 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, theUpdateViewer);
+ aDisplayed = display(theObject, anAIS, isShading, theUpdateViewer);
}
+ return aDisplayed;
}
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;
return false;
}
-void XGUI_Displayer::display(ObjectPtr theObject, AISObjectPtr theAIS,
+bool XGUI_Displayer::display(ObjectPtr theObject, AISObjectPtr theAIS,
bool isShading, bool theUpdateViewer)
{
+ bool aDisplayed = false;
+
Handle(AIS_InteractiveContext) aContext = AISContext();
if (aContext.IsNull())
- return;
+ return aDisplayed;
Handle(AIS_InteractiveObject) anAISIO = theAIS->impl<Handle(AIS_InteractiveObject)>();
if (!anAISIO.IsNull()) {
anAISIO->Attributes()->SetFaceBoundaryDraw( Standard_True );
anAISIO->SetDisplayMode(aDispMode);
aContext->Display(anAISIO, aDispMode, 0, false, true, AIS_DS_Displayed);
+ 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) {
+ aContext->SetSelectionSensitivity(anAISIO,
+ myActiveSelectionModes.value(aModeIdx), anAISIO->Width() + 2);
+ }
+ }
+ }
if (theUpdateViewer)
updateViewer();
+
+ return aDisplayed;
}
-void XGUI_Displayer::erase(ObjectPtr theObject, const bool theUpdateViewer)
+bool XGUI_Displayer::erase(ObjectPtr theObject, const bool theUpdateViewer)
{
+ bool aErased = false;
if (!isVisible(theObject))
- return;
+ return aErased;
Handle(AIS_InteractiveContext) aContext = AISContext();
if (aContext.IsNull())
- return;
+ return aErased;
AISObjectPtr anObject = myResult2AISObjectMap[theObject];
if (anObject) {
Handle(AIS_InteractiveObject) anAIS = anObject->impl<Handle(AIS_InteractiveObject)>();
if (!anAIS.IsNull()) {
emit beforeObjectErase(theObject, anObject);
aContext->Remove(anAIS, theUpdateViewer);
+ aErased = true;
}
}
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
+ return aErased;
}
-void XGUI_Displayer::redisplay(ObjectPtr theObject, bool theUpdateViewer)
+bool XGUI_Displayer::redisplay(ObjectPtr theObject, bool theUpdateViewer)
{
+ bool aRedisplayed = false;
if (!isVisible(theObject))
- return;
+ return aRedisplayed;
AISObjectPtr aAISObj = getAISObject(theObject);
Handle(AIS_InteractiveObject) aAISIO = aAISObj->impl<Handle(AIS_InteractiveObject)>();
if (aPrs) {
AISObjectPtr aAIS_Obj = aPrs->getAISObject(aAISObj);
if (!aAIS_Obj) {
- erase(theObject, theUpdateViewer);
- return;
+ aRedisplayed = erase(theObject, theUpdateViewer);
+ return aRedisplayed;
}
if (aAIS_Obj != aAISObj) {
appendResultObject(theObject, aAIS_Obj);
aAISIO = aAIS_Obj->impl<Handle(AIS_InteractiveObject)>();
}
- if (!aAISIO.IsNull()) {
- Handle(AIS_InteractiveContext) aContext = AISContext();
- if (aContext.IsNull())
- return;
+ Handle(AIS_InteractiveContext) aContext = AISContext();
+ if (!aAISIO.IsNull() && !aContext.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
// in the browser is lost
-
// this check is not necessary anymore because the selection store/restore is realized
// before and after the values modification.
// Moreother, this check avoids customize and redisplay presentation if the presentable
std::shared_ptr<GeomAPI_Shape> aShapePtr = ModelAPI_Tools::shape(aResult);
if (aShapePtr.get()) {
const TopoDS_Shape& aOldShape = aShapePrs->Shape();
- isEqualShapes = aOldShape.IsEqual(aShapePtr->impl<TopoDS_Shape>());
+ if (!aOldShape.IsNull())
+ isEqualShapes = aOldShape.IsEqual(aShapePtr->impl<TopoDS_Shape>());
}
}
}
#endif
if (!isEqualShapes || isCustomized) {
aContext->Redisplay(aAISIO, false);
+ aRedisplayed = true;
#ifdef DEBUG_FEATURE_REDISPLAY
qDebug(" Redisplay happens");
#endif
updateViewer();
}
}
+ return aRedisplayed;
+}
+
+void XGUI_Displayer::redisplayObjects()
+{
+ // redisplay objects visualized in the viewer
+ static Events_ID EVENT_DISP = Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY);
+ static const ModelAPI_EventCreator* aECreator = ModelAPI_EventCreator::get();
+ QObjectPtrList aDisplayed = myWorkshop->displayer()->displayedObjects();
+ QObjectPtrList::const_iterator anIt = aDisplayed.begin(), aLast = aDisplayed.end();
+ for (; anIt != aLast; anIt++) {
+ aECreator->sendUpdated(*anIt, EVENT_DISP);
+ }
+ Events_Loop::loop()->flush(EVENT_DISP);
}
void XGUI_Displayer::deactivate(ObjectPtr theObject, const bool theUpdateViewer)
}
}
+void XGUI_Displayer::deactivateObjects(const QObjectPtrList& theObjList,
+ const bool theUpdateViewer)
+{
+ QObjectPtrList::const_iterator anIt = theObjList.begin(), aLast = theObjList.end();
+ for (; anIt != aLast; anIt++) {
+ deactivate(*anIt, false);
+ }
+ if (theUpdateViewer)
+ updateViewer();
+}
+
void XGUI_Displayer::getModesOfActivation(ObjectPtr theObject, QIntList& theModes)
{
if (!isVisible(theObject))
// Convert shape types to selection types
QIntList aModes;
foreach(int aType, theModes) {
- if (aType > TopAbs_SHAPE)
+ if (aType >= TopAbs_SHAPE)
aModes.append(aType);
else
aModes.append(AIS_Shape::SelectionMode((TopAbs_ShapeEnum)aType));
}
}
-void XGUI_Displayer::eraseAll(const bool theUpdateViewer)
+bool XGUI_Displayer::eraseAll(const bool theUpdateViewer)
{
+ bool aErased = false;
Handle(AIS_InteractiveContext) aContext = AISContext();
if (!aContext.IsNull()) {
foreach (ObjectPtr aObj, myResult2AISObjectMap.keys()) {
if (!anIO.IsNull()) {
emit beforeObjectErase(aObj, aAISObj);
aContext->Remove(anIO, false);
+ aErased = true;
}
}
if (theUpdateViewer)
updateViewer();
}
myResult2AISObjectMap.clear();
+#ifdef DEBUG_DISPLAY
+ qDebug("eraseAll");
+ qDebug(getResult2AISObjectMapInfo().c_str());
+#endif
+ return aErased;
}
void XGUI_Displayer::deactivateTrihedron() const
//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);
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;
}
- return aFeature;
+ 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 anObject;
}
bool XGUI_Displayer::enableUpdateViewer(const bool isEnabled)
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 theUpdateViewer)
+bool XGUI_Displayer::displayAIS(AISObjectPtr theAIS, const bool toActivateInSelectionModes,
+ bool theUpdateViewer)
{
+ bool aDisplayed = false;
Handle(AIS_InteractiveContext) aContext = AISContext();
if (aContext.IsNull())
- return;
+ return aDisplayed;
Handle(AIS_InteractiveObject) anAISIO = theAIS->impl<Handle(AIS_InteractiveObject)>();
if (!anAISIO.IsNull()) {
- aContext->Display(anAISIO, theUpdateViewer);
- if (aContext->HasOpenedContext()) {
- if (myActiveSelectionModes.size() == 0)
- activateAIS(anAISIO, 0, theUpdateViewer);
- else {
- foreach(int aMode, myActiveSelectionModes) {
- activateAIS(anAISIO, aMode, theUpdateViewer);
+ aContext->Display(anAISIO, 0/*wireframe*/, 0, theUpdateViewer, true, AIS_DS_Displayed);
+ aDisplayed = true;
+ aContext->Deactivate(anAISIO);
+ 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);
+ }
}
}
}
}
+ return aDisplayed;
}
-void XGUI_Displayer::eraseAIS(AISObjectPtr theAIS, const bool theUpdateViewer)
+bool XGUI_Displayer::eraseAIS(AISObjectPtr theAIS, const bool theUpdateViewer)
{
+ bool aErased = false;
Handle(AIS_InteractiveContext) aContext = AISContext();
if (aContext.IsNull())
- return;
+ return aErased;
Handle(AIS_InteractiveObject) anAISIO = theAIS->impl<Handle(AIS_InteractiveObject)>();
- if (!anAISIO.IsNull()) {
+ if (!anAISIO.IsNull() && aContext->IsDisplayed(anAISIO)) {
aContext->Remove(anAISIO, theUpdateViewer);
+ aErased = true;
}
+ return aErased;
}
return (XGUI_Displayer::DisplayMode) aAISIO->DisplayMode();
}
+void XGUI_Displayer::deactivateSelectionFilters()
+{
+ Handle(AIS_InteractiveContext) aContext = AISContext();
+ if (!myAndFilter.IsNull() && !aContext.IsNull()) {
+ bool aFound = false;
+ const SelectMgr_ListOfFilter& aFilters = aContext->Filters();
+ SelectMgr_ListIteratorOfListOfFilter anIt(aFilters);
+ for (; anIt.More() && !aFound; anIt.Next()) {
+ Handle(SelectMgr_Filter) aFilter = anIt.Value();
+ aFound = aFilter == myAndFilter;
+ }
+ if (aFound) {
+ aContext->RemoveFilter(myAndFilter);
+ myAndFilter.Nullify();
+ }
+ }
+}
+
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();
}
bool isCustomized = aCustomPrs.get() &&
aCustomPrs->customisePresentation(aResult, anAISObj, myCustomPrs);
- myWorkshop->module()->customizeObject(theObject);
return isCustomized;
}
aContent.append(aPtrStr.str().c_str());
}
- return QString("myResult2AISObjectMap: size = %1\n%2").arg(myResult2AISObjectMap.size()).
+ return QString("myResult2AISObjectMap: size = %1\n%2\n").arg(myResult2AISObjectMap.size()).
arg(aContent.join("\n")).toStdString().c_str();
}
