X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_WidgetShapeSelector.cpp;h=156a563b846ca3e0d6e120afb1a378ce06c78cbb;hb=1e06d55e5ca7dd930512a9ae565497f81ddb6b72;hp=9e391c62e07132e8ea140bee24a1cba52ed7e0a9;hpb=a7f44a41bdf29e7bd978ff3b8c8bd514d1223be7;p=modules%2Fshaper.git

diff --git a/src/PartSet/PartSet_WidgetShapeSelector.cpp b/src/PartSet/PartSet_WidgetShapeSelector.cpp
index 9e391c62e..156a563b8 100644
--- a/src/PartSet/PartSet_WidgetShapeSelector.cpp
+++ b/src/PartSet/PartSet_WidgetShapeSelector.cpp
@@ -1,59 +1,107 @@
-// File:        PartSet_WidgetShapeSelector.cpp
-// Created:     27 Nov 2014
-// Author:      Vitaly Smetannikov
+// Copyright (C) 2014-2020  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
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// 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
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include "PartSet_WidgetShapeSelector.h"
 
+#include "PartSet_CenterPrs.h"
+#include "PartSet_Module.h"
+#include "PartSet_SketcherMgr.h"
+
 #include <ModelAPI_AttributeRefAttr.h>
-#include <PartSet_Tools.h>
+#include <ModelAPI_Session.h>
+#include <ModelAPI_Validator.h>
+
+#include <ModuleBase_Definitions.h>
+#include <ModuleBase_ViewerPrs.h>
+
+#include <Config_WidgetAPI.h>
+
+#include <PartSet_ExternalObjectsMgr.h>
 #include <SketchPlugin_Feature.h>
 
+#include <XGUI_Workshop.h>
+
+#include <XGUI_ModuleConnector.h>
+#include <XGUI_Displayer.h>
+#include <XGUI_SelectionMgr.h>
+#include <XGUI_Selection.h>
+#include <XGUI_Tools.h>
+
+PartSet_WidgetShapeSelector::PartSet_WidgetShapeSelector(QWidget* theParent,
+                                                         ModuleBase_IWorkshop* theWorkshop,
+                                                         const Config_WidgetAPI* theData)
+: ModuleBase_WidgetShapeSelector(theParent, theWorkshop, theData)
+{
+  myUseSketchPlane = theData->getBooleanAttribute("use_sketch_plane", true);
+  myExternalObjectMgr = new PartSet_ExternalObjectsMgr(theData->getProperty("use_external"),
+                                         theData->getProperty("can_create_external"), true);
+}
+
+PartSet_WidgetShapeSelector::~PartSet_WidgetShapeSelector()
+{
+  delete myExternalObjectMgr;
+}
 
-bool PartSet_WidgetShapeSelector::storeValue() const
+//********************************************************************
+void PartSet_WidgetShapeSelector::selectionFilters(QIntList& theModuleSelectionFilters,
+                                                   SelectMgr_ListOfFilter& theSelectionFilters)
 {
-  if (!mySelectedObject)
-    return false;
-
-  FeaturePtr aSelectedFeature = ModelAPI_Feature::feature(mySelectedObject);
-  if (aSelectedFeature == myFeature)  // In order to avoid selection of the same object
-    return false;
-
-  DataPtr aData = myFeature->data();
-  if (myUseSubShapes && myShape) {
-    AttributePtr aAttr = aData->attribute(attributeID());
-    AttributeRefAttrPtr aRefAttr = 
-      std::dynamic_pointer_cast<ModelAPI_AttributeRefAttr>(aAttr);
-    if (aRefAttr) {
-      TopoDS_Shape aShape = myShape->impl<TopoDS_Shape>();
-      AttributePtr aPntAttr = PartSet_Tools::findAttributeBy2dPoint(mySelectedObject, aShape, mySketch);
-      if (mySelectedObject)
-        aRefAttr->setObject(mySelectedObject);
-      if (aPntAttr)
-        aRefAttr->setAttr(aPntAttr);
-
-      updateObject(myFeature);
-      return true;
-    }
+  ModuleBase_WidgetShapeSelector::selectionFilters(theModuleSelectionFilters, theSelectionFilters);
+
+  if (!myUseSketchPlane) {
+    if (theModuleSelectionFilters.contains(SF_SketchPlaneFilter))
+      theModuleSelectionFilters.removeAll(SF_SketchPlaneFilter);
   }
-  return ModuleBase_WidgetShapeSelector::storeValue();
 }
 
-//*********************************************
-bool PartSet_WidgetConstraintShapeSelector::storeValue() const
+//********************************************************************
+bool PartSet_WidgetShapeSelector::isValidSelectionCustom(const ModuleBase_ViewerPrsPtr& thePrs)
 {
-  FeaturePtr aFeature = ModelAPI_Feature::feature(mySelectedObject);
-  if (aFeature) {
-    std::shared_ptr<SketchPlugin_Feature> aSPFeature = 
-            std::dynamic_pointer_cast<SketchPlugin_Feature>(aFeature);
-    if ((!aSPFeature) && (!myShape->isNull())) {
-      ObjectPtr aObj = PartSet_Tools::createFixedObjectByEdge(myShape->impl<TopoDS_Shape>(),
-                                                              mySelectedObject, mySketch);
-      if (aObj) {
-        PartSet_WidgetConstraintShapeSelector* that = (PartSet_WidgetConstraintShapeSelector*) this;
-        that->mySelectedObject = aObj;
-      }
-    }
+  bool aValid = false;
+  if (thePrs.get() && thePrs->interactive().get() &&
+      thePrs->interactive()->IsKind(STANDARD_TYPE(PartSet_CenterPrs)))
+    aValid = true; // we should not check acceptSubShape for such presentation
+  else
+    aValid = ModuleBase_WidgetShapeSelector::isValidSelectionCustom(thePrs);
+
+  if (aValid) {
+    ObjectPtr anObject = myWorkshop->selection()->getResult(thePrs);
+    aValid = myExternalObjectMgr->isValidObject(anObject);
   }
-  return ModuleBase_WidgetShapeSelector::storeValue();
+  return aValid;
+}
+
+void PartSet_WidgetShapeSelector::getGeomSelection(const ModuleBase_ViewerPrsPtr& thePrs,
+                                                   ObjectPtr& theObject,
+                                                   GeomShapePtr& theShape)
+{
+  ModuleBase_WidgetShapeSelector::getGeomSelection(thePrs, theObject, theShape);
+
+  myExternalObjectMgr->getGeomSelection(thePrs, theObject, theShape,
+                                        myWorkshop, sketch(), myIsInValidate);
+}
+
+//********************************************************************
+void PartSet_WidgetShapeSelector::restoreAttributeValue(const AttributePtr& theAttribute,
+                                                        const bool theValid)
+{
+  ModuleBase_WidgetShapeSelector::restoreAttributeValue(theAttribute, theValid);
+  myExternalObjectMgr->removeExternal(sketch(), myFeature, myWorkshop, true);
 }