#include "XGUI_Displayer.h"
#include "XGUI_PropertyPanel.h"
+#include <ModuleBase_IModule.h>
+
#include <AIS_Shape.hxx>
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
}
+QObjectPtrList XGUI_ModuleConnector::activeObjects(const QObjectPtrList& theObjList) const
+{
+ QObjectPtrList aActiveOPbjects;
+ ModuleBase_IModule* aModule = myWorkshop->module();
+ // Activate objects only which can be activated
+ foreach (ObjectPtr aObj, theObjList) {
+ if (aModule->canActivateSelection(aObj))
+ aActiveOPbjects.append(aObj);
+ }
+ return aActiveOPbjects;
+}
+
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);
- //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;
- aDisp->activateObjects(aModes);
- // The document limitation selection has to be only during operation
- //aDisp->removeSelectionFilter(myDocumentShapeFilter);
- //aDisp->closeLocalContexts(false);
+ module()->activeSelectionModes(aModes);
+ aDisp->activateObjects(aModes, activeObjects(aDisp->displayedObjects()));
}
AISObjectPtr XGUI_ModuleConnector::findPresentation(const ObjectPtr& theObject) const
return aDisp->getObject(theAIS);
}
-void XGUI_ModuleConnector::setSelected(const QObjectPtrList& theFeatures)
+void XGUI_ModuleConnector::setSelected(const QList<ModuleBase_ViewerPrs>& theValues)
{
XGUI_Displayer* aDisp = myWorkshop->displayer();
- if (theFeatures.isEmpty()) {
+ if (theValues.isEmpty()) {
myWorkshop->selector()->clearSelection();
} else {
- aDisp->setSelected(theFeatures);
+ aDisp->setSelected(theValues);
}
}