Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

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

diff --git a/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp b/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
index 36bbd0314e502d8324f1570127ec203f2367b36a..a88479bc5e845eeb14b88d52b7efc8d7ed8e939f 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
@@ -158,9 +158,9 @@ bool ModuleBase_WidgetShapeSelector::setObject(ObjectPtr theSelectedObject,
       }
     } else {
       AttributeSelectionPtr aSelectAttr = aData->selection(attributeID());
-      ResultPtr aBody = std::dynamic_pointer_cast<ModelAPI_Result>(theSelectedObject);
-      if (aSelectAttr && aBody && (theShape.get() != NULL)) {
-        aSelectAttr->setValue(aBody, theShape);
+      ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(theSelectedObject);
+      if (aSelectAttr) {
+        aSelectAttr->setValue(aResult, theShape);
         isChanged = true;
       }
     }
@@ -212,23 +212,26 @@ void ModuleBase_WidgetShapeSelector::onSelectionChanged()
   // In order to make reselection possible
   // TODO: check with MPV clearAttribute();
 
-  //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);
-      // 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);
-      //if (theObj) {
-        //  raisePanel();
-      //} 
-      //updateSelectionName();
-      //emit valuesChanged();
-      emit focusOutWidget(this);
-    }
+  QList<ModuleBase_ViewerPrs> aSelectedPrs = getSelectedEntitiesOrObjects(myWorkshop->selection());
+  if (aSelectedPrs.empty())
+    return;
+  ModuleBase_ViewerPrs aPrs = aSelectedPrs.first();
+  if (aPrs.isEmpty() || !isValidSelection(aPrs))
+    return;
+
+  if (!aPrs.isEmpty() && isValidSelection(aPrs)) {
+    setSelectionCustom(aPrs);
+    // 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);
+    //if (theObj) {
+      //  raisePanel();
+    //} 
+    //updateSelectionName();
+    //emit valuesChanged();
+    emit focusOutWidget(this);
   }
+
 }
 
 //********************************************************************
@@ -377,7 +380,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) {
@@ -401,14 +404,12 @@ 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);
   // It should be checked by corresponded validator
-  ObjectPtr aObject = aPrs.object();
+  ObjectPtr aObject = thePrs.object();
   ObjectPtr aCurrentObject = GeomValidators_Tools::getObject(myFeature->attribute(attributeID()));
   /*
   if ((!aCurrentObject) && (!aObject))
@@ -444,9 +445,9 @@ bool ModuleBase_WidgetShapeSelector::setSelection(const Handle_SelectMgr_EntityO
     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))