Hide "by general equation" case for plane creation

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

diff --git a/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp b/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
index b981a9064f1c92dd6544abec6ab6582be780e4e0..fcd1e26c235a71ee76ff6f2951e93ec334f0eda0 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
@@ -132,8 +132,8 @@ bool ModuleBase_WidgetShapeSelector::storeValueCustom() const
 }
 
 //********************************************************************
-bool ModuleBase_WidgetShapeSelector::storeAttributeValues(ObjectPtr theSelectedObject,
-                                                          GeomShapePtr theShape)
+bool ModuleBase_WidgetShapeSelector::setObject(ObjectPtr theSelectedObject,
+                                               GeomShapePtr theShape)
 {
   bool isChanged = false;
   FeaturePtr aSelectedFeature = ModelAPI_Feature::feature(theSelectedObject);
@@ -215,9 +215,8 @@ void ModuleBase_WidgetShapeSelector::onSelectionChanged()
   //QObjectPtrList aObjects = myWorkshop->selection()->selectedPresentations();
   QList<ModuleBase_ViewerPrs> aSelected = myWorkshop->selection()->getSelected();
   if (aSelected.size() > 0) {
-    Handle(SelectMgr_EntityOwner) anOwner = aSelected.first().owner();
-    if (isValid(anOwner)) {
-      setSelection(anOwner);
+    if (isValidSelection(aSelected.first())) {
+      setSelectionCustom(aSelected.first());
       // the updateObject method should be called to flush the updated sigal. The workshop listens it,
       // calls validators for the feature and, as a result, updates the Apply button state.
       updateObject(myFeature);
@@ -377,7 +376,7 @@ void ModuleBase_WidgetShapeSelector::storeAttributeValue()
 
   myObject = GeomValidators_Tools::getObject(anAttribute);
   myShape = getShape();
-  myRefAttribute = NULL;
+  myRefAttribute = AttributePtr();
   myIsObject = false;
   AttributeRefAttrPtr aRefAttr = aData->refattr(attributeID());
   if (aRefAttr) {
@@ -392,7 +391,7 @@ void ModuleBase_WidgetShapeSelector::restoreAttributeValue(bool theValid)
   DataPtr aData = myFeature->data();
   AttributePtr anAttribute = myFeature->attribute(attributeID());
 
-  storeAttributeValues(myObject, myShape);
+  setObject(myObject, myShape);
   AttributeRefAttrPtr aRefAttr = aData->refattr(attributeID());
   if (aRefAttr) {
     if (!myIsObject)
@@ -401,23 +400,23 @@ void ModuleBase_WidgetShapeSelector::restoreAttributeValue(bool theValid)
 }
 
 //********************************************************************
-bool ModuleBase_WidgetShapeSelector::setSelection(const Handle_SelectMgr_EntityOwner& theOwner)
+bool ModuleBase_WidgetShapeSelector::setSelectionCustom(const ModuleBase_ViewerPrs& thePrs)
 {
   bool isDone = false;
 
-  ModuleBase_ViewerPrs aPrs;
-  myWorkshop->selection()->fillPresentation(aPrs, theOwner);
-  ObjectPtr aObject = aPrs.object();
+  // It should be checked by corresponded validator
+  ObjectPtr aObject = thePrs.object();
   ObjectPtr aCurrentObject = GeomValidators_Tools::getObject(myFeature->attribute(attributeID()));
+  /*
   if ((!aCurrentObject) && (!aObject))
-    return false;
+    return false;*/
 
+  // It should be checked by corresponded validator
   // Check that the selected object is result (others can not be accepted)
   ResultPtr aRes = std::dynamic_pointer_cast<ModelAPI_Result>(aObject);
   if (!aRes)
     return false;
-
-  if (myFeature) {
+  /*if (myFeature) {
     // We can not select a result of our feature
     const std::list<std::shared_ptr<ModelAPI_Result>>& aResList = myFeature->results();
     std::list<std::shared_ptr<ModelAPI_Result> >::const_iterator aIt;
@@ -426,27 +425,31 @@ bool ModuleBase_WidgetShapeSelector::setSelection(const Handle_SelectMgr_EntityO
         return false;
     }
   }
+  */
+  // It should be checked by corresponded validator
+  /*
   // Check that object belongs to active document or PartSet
   DocumentPtr aDoc = aRes->document();
   SessionPtr aMgr = ModelAPI_Session::get();
   if (!(aDoc == aMgr->activeDocument()) && !(aDoc == aMgr->moduleDocument()))
-    return false;
+    return false;*/
 
+  // It should be checked by corresponded validator
   // Check that the result has a shape
   GeomShapePtr aShape = ModelAPI_Tools::shape(aRes);
   if (!aShape)
     return false;
 
   // Get sub-shapes from local selection
-  if (!aPrs.shape().IsNull()) {
+  if (!thePrs.shape().IsNull()) {
     aShape = std::shared_ptr<GeomAPI_Shape>(new GeomAPI_Shape());
-    aShape->setImpl(new TopoDS_Shape(aPrs.shape()));
+    aShape->setImpl(new TopoDS_Shape(thePrs.shape()));
   }
   // Check that the selection corresponds to selection type
   if (!acceptSubShape(aShape))
     return false;
 
-  storeAttributeValues(aObject, aShape);
+  setObject(aObject, aShape);
   return true;
 }