Fix for the issue #2753 : error when dump/load script

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

diff --git a/src/XGUI/XGUI_SelectionActivate.cpp b/src/XGUI/XGUI_SelectionActivate.cpp
index 13a67569d46e704b05152135725db7f48069bdfb..3c6fc2f7191ea1a578c8113b588cb4374cbb7ec1 100644 (file)
--- a/src/XGUI/XGUI_SelectionActivate.cpp
+++ b/src/XGUI/XGUI_SelectionActivate.cpp
@@ -49,6 +49,10 @@
 //#define DEBUG_ACTIVATE_AIS
 //#define DEBUG_DEACTIVATE_AIS
 
+#ifdef TINSPECTOR
+#include <inspector/VInspectorAPI_CallBack.hxx>
+#endif
+
 #define CLEAR_OUTDATED_SELECTION_BEFORE_REDISPLAY
 
 //**************************************************************
@@ -89,7 +93,7 @@ void XGUI_SelectionActivate::updateSelectionModes()
     break;
     case FacesPanel: {
       XGUI_Tools::workshop(myWorkshop)->facesPanel()->selectionModes(aModes);
-      myWorkshop->module()->customSubShapesSelectionModes(aModes); // avoid wire selection
+      myWorkshop->module()->moduleSelectionModes(-1/*all modes*/, aModes);
     }
     break;
     default: break;
@@ -102,17 +106,24 @@ void XGUI_SelectionActivate::updateSelectionFilters()
 {
   SelectMgr_ListOfFilter aSelectionFilters;
   switch (activeSelectionPlace()) {
-  case Workshop:
-    XGUI_Tools::workshop(myWorkshop)->selectionFilters(aSelectionFilters);
+    case Workshop: {
+      QIntList aModuleSelectionFilters = myWorkshop->module()->selectionFilters();
+      myWorkshop->module()->moduleSelectionFilters(aModuleSelectionFilters, aSelectionFilters);
+    }
     break;
     case PropertyPanel: {
+      QIntList aModuleSelectionFilters = myWorkshop->module()->selectionFilters();
+
       ModuleBase_ModelWidget* anActiveWidget = myWorkshop->module()->activeWidget();
-      getSelectionFilters(anActiveWidget, aSelectionFilters);
+      if (anActiveWidget)
+        anActiveWidget->selectionFilters(aModuleSelectionFilters, aSelectionFilters);
+      myWorkshop->module()->moduleSelectionFilters(aModuleSelectionFilters, aSelectionFilters);
     }
     break;
     case FacesPanel: {
-      //XGUI_Tools::workshop(myWorkshop)->selectionFilters(aSelectionFilters);
       XGUI_Tools::workshop(myWorkshop)->facesPanel()->selectionFilters(aSelectionFilters);
+      //QIntList aModuleSelectionFilters = myWorkshop->module()->selectionFilters();
+      //myWorkshop->module()->moduleSelectionFilters(aModuleSelectionFilters, aSelectionFilters);
     }
     break;
     default: break;
@@ -120,20 +131,6 @@ void XGUI_SelectionActivate::updateSelectionFilters()
   activateSelectionFilters(aSelectionFilters);
 }
 
-//**************************************************************
-void XGUI_SelectionActivate::activateSelectionAndFilters(ModuleBase_ModelWidget* theWidget)
-{
-  // activate selection modes
-  QIntList aModes;
-  getSelectionModes(theWidget, aModes);
-  activateObjects(aModes, getDisplayer()->displayedObjects(), true);
-
-  // activate selection filters
-  SelectMgr_ListOfFilter aSelectionFilters;
-  getSelectionFilters(theWidget, aSelectionFilters);
-  activateSelectionFilters(aSelectionFilters);
-}
-
 //**************************************************************
 void XGUI_SelectionActivate::activateSelectionFilters
   (const SelectMgr_ListOfFilter& theSelectionFilters)
@@ -157,23 +154,9 @@ void XGUI_SelectionActivate::getSelectionModes(ModuleBase_ModelWidget* theWidget
   if (!theWidget)
     return;
 
-  bool isAdditional = false;
-  theWidget->selectionModes(theModes, isAdditional);
-  if (isAdditional) {
-    myWorkshop->module()->customSubShapesSelectionModes(theModes);
-    //theModes.append(XGUI_Tools::workshop(myWorkshop)->viewerSelectionModes());
-    //myWorkshop->module()->activeSelectionModes(theModes);
-  }
-}
-
-//**************************************************************
-void XGUI_SelectionActivate::getSelectionFilters(ModuleBase_ModelWidget* theWidget,
-                                                 SelectMgr_ListOfFilter& theSelectionFilters)
-{
-  XGUI_Tools::workshop(myWorkshop)->selectionFilters(theSelectionFilters);
-
-  if (theWidget)
-    theWidget->selectionFilters(theSelectionFilters);
+  int aModuleSelectionModes = -1;
+  theWidget->selectionModes(aModuleSelectionModes, theModes);
+  myWorkshop->module()->moduleSelectionModes(aModuleSelectionModes, theModes);
 }
 
 //**************************************************************
@@ -354,11 +337,19 @@ void XGUI_SelectionActivate::activateAIS(const Handle(AIS_InteractiveObject)& th
   }
   if (!aContext.IsNull()) {
     if (myWorkshop->module()) {
-      int aMode = (theMode > 8)? theMode : AIS_Shape::SelectionType(theMode);
+      // the code is obsolete, used in additional check before activate, it was removed
+      //int aMode = (theMode > 8)? theMode : AIS_Shape::SelectionType(theMode);
       aContext->Activate(theIO, theMode, false);
-    } else
+#ifdef TINSPECTOR
+      if (getDisplayer()->getCallBack()) getDisplayer()->getCallBack()->Activate(theIO, theMode);
+#endif
+    }
+    else {
       aContext->Activate(theIO, theMode, false);
-
+#ifdef TINSPECTOR
+      if (getDisplayer()->getCallBack()) getDisplayer()->getCallBack()->Activate(theIO, theMode);
+#endif
+    }
     // the fix from VPA for more suitable selection of sketcher lines
     if (theIO->Width() > 1) {
       double aPrecision = theIO->Width() + 2;