// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
//
-#include <XGUI_ActiveControlMgr.h>
-#include <XGUI_ActiveControlSelector.h>
+#include "XGUI_ActiveControlMgr.h"
+#include "XGUI_ActiveControlSelector.h"
+#include "XGUI_SelectionActivate.h"
+#include "XGUI_SelectionMgr.h"
+#include "XGUI_Tools.h"
+#include "XGUI_Workshop.h"
#include <ModuleBase_IModule.h>
#include <ModuleBase_IWorkshop.h>
+//#define DEBUG_ACTIVE_SELECTOR
+
+#ifdef DEBUG_ACTIVE_SELECTOR
+void debugInfo(const QString& theMessage, XGUI_ActiveControlSelector* theSelector)
+{
+ std::cout << theMessage.toStdString().c_str() << ", active: "
+ << (theSelector ? theSelector->getType().toStdString().c_str() : "NULL") << std::endl;
+}
+#endif
+
//********************************************************************
XGUI_ActiveControlMgr::XGUI_ActiveControlMgr(ModuleBase_IWorkshop* theWorkshop)
-: myWorkshop(theWorkshop), myActiveSelector(0)
+: myWorkshop(theWorkshop), myActiveSelector(0), myIsBlocked(false)
{
connect(myWorkshop, SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged()));
}
if (!aSelector || aSelector == myActiveSelector)
return;
- if (myActiveSelector)
+ if (myIsBlocked) // we've come here from the same method
+ return;
+ myIsBlocked = true;
+ if (myActiveSelector) {
myActiveSelector->setActive(false);
-
+ }
activateSelector(aSelector);
+ XGUI_Tools::workshop(myWorkshop)->selectionActivate()->updateSelectionModes();
+ XGUI_Tools::workshop(myWorkshop)->selectionActivate()->updateSelectionFilters();
+
+#ifdef DEBUG_ACTIVE_SELECTOR
+ debugInfo("onSelectorActivated", myActiveSelector);
+#endif
+ myIsBlocked = false;
}
//********************************************************************
void XGUI_ActiveControlMgr::onSelectorDeactivated()
{
XGUI_ActiveControlSelector* aSelector = qobject_cast<XGUI_ActiveControlSelector*>(sender());
- if (!aSelector)
+ if (!aSelector || aSelector != myActiveSelector || !myActiveSelector)
return;
- myActiveSelector = NULL;
+ if (myIsBlocked) // we've come here from the same method
+ return;
+ myIsBlocked = true;
- aSelector->setActive(false);
- myWorkshop->module()->updateActiveSelectionFilters();
+ myActiveSelector->setActive(false);
+ activateSelector(NULL);
XGUI_ActiveControlSelector* aSelectorToBeActivated = 0;
for (int i = 0, aCount = mySelectors.count(); i < aCount; i++)
}
if (aSelectorToBeActivated)
activateSelector(aSelectorToBeActivated);
+
+ XGUI_Tools::workshop(myWorkshop)->selectionActivate()->updateSelectionModes();
+ XGUI_Tools::workshop(myWorkshop)->selectionActivate()->updateSelectionFilters();
+#ifdef DEBUG_ACTIVE_SELECTOR
+ debugInfo("onSelectorDeactivated", myActiveSelector);
+#endif
+ myIsBlocked = false;
}
//********************************************************************
return;
myActiveSelector->processSelection();
+#ifdef DEBUG_ACTIVE_SELECTOR
+ debugInfo("onSelectionChanged", myActiveSelector);
+#endif
}
//********************************************************************
void XGUI_ActiveControlMgr::activateSelector(XGUI_ActiveControlSelector* theSelector)
{
myActiveSelector = theSelector;
- theSelector->setActive(true);
-
- myWorkshop->module()->updateActiveSelectionFilters();
+ if (myActiveSelector)
+ myActiveSelector->setActive(true);
}