updated copyright message

[modules/shaper.git] / src / XGUI / XGUI_ActiveControlMgr.cpp

diff --git a/src/XGUI/XGUI_ActiveControlMgr.cpp b/src/XGUI/XGUI_ActiveControlMgr.cpp
index 73b7ac61022dac09b4890fac3a285fa64530181d..ba68062816d961a4d13595fe83f687f94f12d048 100644 (file)
--- a/src/XGUI/XGUI_ActiveControlMgr.cpp
+++ b/src/XGUI/XGUI_ActiveControlMgr.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2017  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2023  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -12,15 +12,15 @@
 //
 // You should have received a copy of the GNU Lesser General Public
 // License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-// See http://www.salome-platform.org/ or
-// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
 #include "XGUI_ActiveControlMgr.h"
 #include "XGUI_ActiveControlSelector.h"
 #include "XGUI_SelectionActivate.h"
+#include "XGUI_SelectionMgr.h"
 #include "XGUI_Tools.h"
 #include "XGUI_Workshop.h"
 
@@ -33,13 +33,13 @@
 void debugInfo(const QString& theMessage, XGUI_ActiveControlSelector* theSelector)
 {
   std::cout << theMessage.toStdString().c_str() << ", active: "
-    << theSelector ? theSelector->getType().toStdString().c_str() : "NULL" << std::endl;
+    << (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()));
 }
@@ -55,7 +55,7 @@ void XGUI_ActiveControlMgr::addSelector(XGUI_ActiveControlSelector* theSelector)
 //********************************************************************
 XGUI_ActiveControlSelector* XGUI_ActiveControlMgr::getSelector(const QString& theType)
 {
-  XGUI_ActiveControlSelector* aSelector;
+  XGUI_ActiveControlSelector* aSelector = 0;
   for (int i = 0, aCount = mySelectors.count(); i < aCount; i++)
   {
     if (mySelectors[i]->getType() != theType)
@@ -73,9 +73,12 @@ void XGUI_ActiveControlMgr::onSelectorActivated()
   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();
@@ -83,22 +86,32 @@ void XGUI_ActiveControlMgr::onSelectorActivated()
 #ifdef DEBUG_ACTIVE_SELECTOR
   debugInfo("onSelectorActivated", myActiveSelector);
 #endif
+  myIsBlocked = false;
 }
 
 //********************************************************************
 void XGUI_ActiveControlMgr::onSelectorDeactivated()
 {
   XGUI_ActiveControlSelector* aSelector = qobject_cast<XGUI_ActiveControlSelector*>(sender());
-  if (!aSelector || aSelector != myActiveSelector || !myActiveSelector)
+  deactivateSelector(aSelector);
+}
+
+//********************************************************************
+void XGUI_ActiveControlMgr::deactivateSelector(XGUI_ActiveControlSelector* theSelector)
+{
+  if (!theSelector || theSelector != myActiveSelector || !myActiveSelector)
+    return;
+
+  if (myIsBlocked) // we've come here from the same method
     return;
+  myIsBlocked = true;
 
   myActiveSelector->setActive(false);
   activateSelector(NULL);
 
   XGUI_ActiveControlSelector* aSelectorToBeActivated = 0;
-  for (int i = 0, aCount = mySelectors.count(); i < aCount; i++)
-  {
-    if (!mySelectors[i]->needToBeActiated())
+  for (int i = 0, aCount = mySelectors.count(); i < aCount; i++) {
+    if (!mySelectors[i]->needToBeActivated())
       continue;
     aSelectorToBeActivated = mySelectors[i];
     break;
@@ -111,6 +124,7 @@ void XGUI_ActiveControlMgr::onSelectorDeactivated()
 #ifdef DEBUG_ACTIVE_SELECTOR
   debugInfo("onSelectorDeactivated", myActiveSelector);
 #endif
+  myIsBlocked = false;
 }
 
 //********************************************************************