X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_ModuleConnector.cpp;h=700b25bc725560ac7eb5c0dcaafe3cdbd88b044b;hb=8f09d362a50ccbc085841c24af2e755121e458ba;hp=e92c772c6ac88a81ed27aa25daa382791d3721ba;hpb=b41cff0a399dc4d129b61e5e52f6b08e8681e5eb;p=modules%2Fshaper.git diff --git a/src/XGUI/XGUI_ModuleConnector.cpp b/src/XGUI/XGUI_ModuleConnector.cpp index e92c772c6..700b25bc7 100644 --- a/src/XGUI/XGUI_ModuleConnector.cpp +++ b/src/XGUI/XGUI_ModuleConnector.cpp @@ -26,13 +26,10 @@ XGUI_ModuleConnector::XGUI_ModuleConnector(XGUI_Workshop* theWorkshop) connect(aSelector, SIGNAL(selectionChanged()), this, SIGNAL(selectionChanged())); XGUI_OperationMgr* anOperationMgr = myWorkshop->operationMgr(); - - //myDocumentShapeFilter = new ModuleBase_ShapeDocumentFilter(this); } XGUI_ModuleConnector::~XGUI_ModuleConnector() { - //myDocumentShapeFilter.Nullify(); } ModuleBase_ISelection* XGUI_ModuleConnector::selection() const @@ -76,39 +73,21 @@ QObjectPtrList XGUI_ModuleConnector::activeObjects(const QObjectPtrList& theObjL void XGUI_ModuleConnector::activateSubShapesSelection(const QIntList& theTypes) { XGUI_Displayer* aDisp = myWorkshop->displayer(); - // Close context if it was opened in order to clear stsndard selection modes - //aDisp->closeLocalContexts(false); - //aDisp->openLocalContext(); - // Convert shape types to selection types - QIntList aModes; - foreach(int aType, theTypes) { - if (aType > TopAbs_SHAPE) - aModes.append(aType); - else - aModes.append(AIS_Shape::SelectionMode((TopAbs_ShapeEnum)aType)); - } - aDisp->activateObjects(aModes, activeObjects(aDisp->displayedObjects())); - //TODO: We have to open Local context because at neutral point filters don't work (bug 25340) - //aDisp->addSelectionFilter(myDocumentShapeFilter); + aDisp->activateObjects(theTypes, activeObjects(aDisp->displayedObjects())); } void XGUI_ModuleConnector::deactivateSubShapesSelection() { - XGUI_Displayer* aDisp = myWorkshop->displayer(); // Clear selection modes + activateModuleSelectionModes(); +} + +void XGUI_ModuleConnector::activateModuleSelectionModes() +{ + XGUI_Displayer* aDisp = myWorkshop->displayer(); QIntList aModes; - // TODO: check on OCC6.9.0 - // the module current active modes should not be deactivated in order to save the objects selected - // the deactivate object in the mode of selection leads to the object is deselected in the viewer. - // But, in OCC6.8.0 this deselection does not happened automatically. It is necessary to call - // ClearOutdatedSelection, but this method has an error in the realization, which should be fixed in - // the OCC6.9.0 release. Moreother, it is possible that ClearOutdatedSelection will be called inside - // Deactivate method of AIS_InteractiveContext. In this case, we need not call it. module()->activeSelectionModes(aModes); aDisp->activateObjects(aModes, activeObjects(aDisp->displayedObjects())); - // The document limitation selection has to be only during operation - //aDisp->removeSelectionFilter(myDocumentShapeFilter); - //aDisp->closeLocalContexts(false); } AISObjectPtr XGUI_ModuleConnector::findPresentation(const ObjectPtr& theObject) const @@ -120,7 +99,8 @@ AISObjectPtr XGUI_ModuleConnector::findPresentation(const ObjectPtr& theObject) ObjectPtr XGUI_ModuleConnector::findPresentedObject(const AISObjectPtr& theAIS) const { XGUI_Displayer* aDisp = myWorkshop->displayer(); - return aDisp->getObject(theAIS); + ObjectPtr anObject = aDisp->getObject(theAIS); + return anObject; } void XGUI_ModuleConnector::setSelected(const QList& theValues)