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

[modules/shaper.git] / src / ModuleBase / ModuleBase_WidgetSelector.cpp

diff --git a/src/ModuleBase/ModuleBase_WidgetSelector.cpp b/src/ModuleBase/ModuleBase_WidgetSelector.cpp
index bb4bbc4a110d0ce01d5f04feb28cb47c018878c3..ec0e2bf6a3f56a8b4c3ff6765f844536224b6ebe 100755 (executable)
--- a/src/ModuleBase/ModuleBase_WidgetSelector.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetSelector.cpp
@@ -20,29 +20,36 @@
 
 #include <ModuleBase_WidgetSelector.h>
 
+#include <ModuleBase_Events.h>
+#include <ModuleBase_IModule.h>
 #include <ModuleBase_ISelection.h>
+#include <ModuleBase_ISelectionActivate.h>
 #include <ModuleBase_IWorkshop.h>
-#include <ModuleBase_Tools.h>
 #include <ModuleBase_Operation.h>
 #include <ModuleBase_OperationDescription.h>
-#include <ModuleBase_WidgetFactory.h>
-#include <ModuleBase_IModule.h>
 #include <ModuleBase_ResultPrs.h>
+#include <ModuleBase_Tools.h>
 #include <ModuleBase_ViewerPrs.h>
-#include <ModuleBase_Events.h>
+#include <ModuleBase_WidgetFactory.h>
 
-#include <ModelAPI_ResultConstruction.h>
-#include <ModelAPI_Events.h>
 #include <ModelAPI_AttributeSelection.h>
 #include <ModelAPI_AttributeSelectionList.h>
+#include <ModelAPI_Events.h>
+#include <ModelAPI_ResultConstruction.h>
+
+#include <Config_WidgetAPI.h>
 
 #include <TopoDS_Iterator.hxx>
 
 ModuleBase_WidgetSelector::ModuleBase_WidgetSelector(QWidget* theParent,
                                                      ModuleBase_IWorkshop* theWorkshop,
                                                      const Config_WidgetAPI* theData)
-: ModuleBase_WidgetValidated(theParent, theWorkshop, theData)
+: ModuleBase_WidgetValidated(theParent, theWorkshop, theData),
+myIsPointsFiltering(true)
 {
+  QString aFiltering = QString::fromStdString(theData->getProperty("filter_points"));
+  if (aFiltering.toLower() == "false")
+    myIsPointsFiltering = false;
 }
 
 //********************************************************************
@@ -57,18 +64,23 @@ void ModuleBase_WidgetSelector::getGeomSelection(const ModuleBase_ViewerPrsPtr&
 {
   ModuleBase_ISelection* aSelection = myWorkshop->selection();
   theObject = aSelection->getResult(thePrs);
+  if (!theObject.get())
+    theObject = thePrs->object();
   theShape = aSelection->getShape(thePrs);
 }
 
 //********************************************************************
-void ModuleBase_WidgetSelector::onSelectionChanged()
+bool ModuleBase_WidgetSelector::processSelection()
 {
   QList<ModuleBase_ViewerPrsPtr> aSelected = getFilteredSelected();
   // equal vertices should not be used here
-  ModuleBase_ISelection::filterSelectionOnEqualPoints(aSelected);
+  if (myIsPointsFiltering)
+    ModuleBase_ISelection::filterSelectionOnEqualPoints(aSelected);
 
   bool isDone = setSelection(aSelected, true/*false*/);
   updateOnSelectionChanged(isDone);
+
+  return isDone;
 }
 
 //********************************************************************
@@ -123,7 +135,9 @@ bool ModuleBase_WidgetSelector::acceptSubShape(const GeomShapePtr& theShape,
     return aValid;
   }
   // when the SHAPE type is provided by XML as Object, the whole result shape should be selected.
-  if (!aShape.get() && aShapeTypes.contains(ModuleBase_ResultPrs::Sel_Result)) {
+  //if (!aShape.get() && aShapeTypes.contains(ModuleBase_ResultPrs::Sel_Result)) {
+  // In case of selection of a feature aShape could be not NULL, but result has to be selected
+  if (aShapeTypes.contains(ModuleBase_ResultPrs::Sel_Result)) {
     aValid = true;
     return aValid;
   }
@@ -162,26 +176,27 @@ bool ModuleBase_WidgetSelector::acceptSubShape(const GeomShapePtr& theShape,
 }
 
 //********************************************************************
-bool ModuleBase_WidgetSelector::activateSelectionAndFilters(bool toActivate)
+void ModuleBase_WidgetSelector::selectionModes(int& theModuleSelectionModes, QIntList& theModes)
+{
+  theModuleSelectionModes = -1;
+  theModes.append(getShapeTypes());
+}
+
+//********************************************************************
+void ModuleBase_WidgetSelector::updateSelectionModesAndFilters(bool toActivate)
 {
   updateSelectionName();
 
-  if (toActivate) {
-    myWorkshop->activateSubShapesSelection(getShapeTypes());
-  } else {
-    myWorkshop->deactivateSubShapesSelection();
-  }
-  return activateFilters(toActivate);
+  myWorkshop->selectionActivate()->updateSelectionFilters();
+  myWorkshop->selectionActivate()->updateSelectionModes();
+
+  if (!toActivate)
+    clearValidatedCash();
 }
 
 //********************************************************************
 void ModuleBase_WidgetSelector::activateCustom()
 {
-  connect(myWorkshop, SIGNAL(selectionChanged()), this,
-          SLOT(onSelectionChanged()), Qt::UniqueConnection);
-
-  activateSelectionAndFilters(true);
-
   // Restore selection in the viewer by the attribute selection list
   // it should be postponed to have current widget as active to validate restored selection
   static Events_ID anEvent = Events_Loop::eventByName(EVENT_UPDATE_BY_WIDGET_SELECTION);
@@ -219,10 +234,7 @@ bool ModuleBase_WidgetSelector::setSelectionCustom(const ModuleBase_ViewerPrsPtr
 //********************************************************************
 void ModuleBase_WidgetSelector::deactivate()
 {
-  ModuleBase_ModelWidget::deactivate();
-  disconnect(myWorkshop, SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged()));
-  activateSelectionAndFilters(false);
-
+  ModuleBase_WidgetValidated::deactivate();
   /// clear temporary cash
   AttributePtr anAttribute = attribute();
   if (!anAttribute.get())
@@ -239,28 +251,3 @@ void ModuleBase_WidgetSelector::deactivate()
     aSelectAttr->removeTemporaryValues();
   }
 }
-
-//********************************************************************
-std::string ModuleBase_WidgetSelector::generateName(const AttributePtr& theAttribute,
-                                                    ModuleBase_IWorkshop* theWorkshop)
-{
-  std::string aName;
-  if (theAttribute.get() != NULL) {
-    ModuleBase_Operation* anOperation = theWorkshop->currentOperation();
-
-    FeaturePtr aFeature = ModelAPI_Feature::feature(theAttribute->owner());
-    if (aFeature.get()) {
-      std::string aXmlCfg, aDescription;
-      theWorkshop->module()->getXMLRepresentation(aFeature->getKind(), aXmlCfg, aDescription);
-
-      ModuleBase_WidgetFactory aFactory(aXmlCfg, theWorkshop);
-      std::string anAttributeTitle;
-      aFactory.getAttributeTitle(theAttribute->id(), anAttributeTitle);
-
-      std::stringstream aStreamName;
-      aStreamName << theAttribute->owner()->data()->name() << "/"<< anAttributeTitle.c_str();
-      aName = aStreamName.str();
-    }
-  }
-  return aName;
-}