X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_WidgetMultiSelector.cpp;h=322864def53255c89d57168cd4e65cf3358f7c6f;hb=32208dedf0b2b5bd50b5b86c464f37a8e0eb07d0;hp=19e6cc379f0a0463d6a9f79167b65f0f63622b28;hpb=712106d47166b3e14b11494b07d112fd35d4e65a;p=modules%2Fshaper.git

diff --git a/src/PartSet/PartSet_WidgetMultiSelector.cpp b/src/PartSet/PartSet_WidgetMultiSelector.cpp
old mode 100644
new mode 100755
index 19e6cc379..322864def
--- a/src/PartSet/PartSet_WidgetMultiSelector.cpp
+++ b/src/PartSet/PartSet_WidgetMultiSelector.cpp
@@ -7,6 +7,8 @@
 #include "PartSet_WidgetMultiSelector.h"
 
 #include <ModelAPI_AttributeRefAttr.h>
+#include <ModelAPI_AttributeSelectionList.h>
+#include <ModelAPI_AttributeRefList.h>
 #include <ModelAPI_Session.h>
 #include <ModelAPI_Validator.h>
 
@@ -14,6 +16,7 @@
 #include <ModuleBase_Tools.h>
 #include <ModuleBase_IWorkshop.h>
 #include <ModuleBase_ISelection.h>
+#include <ModuleBase_ViewerPrs.h>
 
 #include <Config_WidgetAPI.h>
 
@@ -29,11 +32,11 @@
 
 PartSet_WidgetMultiSelector::PartSet_WidgetMultiSelector(QWidget* theParent,
                                                          ModuleBase_IWorkshop* theWorkshop,
-                                                         const Config_WidgetAPI* theData,
-                                                         const std::string& theParentId)
-: ModuleBase_WidgetMultiSelector(theParent, theWorkshop, theData, theParentId)
+                                                         const Config_WidgetAPI* theData)
+: ModuleBase_WidgetMultiSelector(theParent, theWorkshop, theData)
 {
-  myExternalObjectMgr = new PartSet_ExternalObjectsMgr(theData->getProperty("use_external"), false);
+  myExternalObjectMgr = new PartSet_ExternalObjectsMgr(theData->getProperty("use_external"),
+                                        theData->getProperty("can_create_external"), false);
 }
 
 PartSet_WidgetMultiSelector::~PartSet_WidgetMultiSelector()
@@ -42,27 +45,7 @@ PartSet_WidgetMultiSelector::~PartSet_WidgetMultiSelector()
 }
 
 //********************************************************************
-void PartSet_WidgetMultiSelector::onSelectionChanged()
-{
-  ModuleBase_WidgetMultiSelector::onSelectionChanged();
-  // TODO(nds): unite with externalObject(), remove parameters
-  //myFeature->execute();
-
-  DataPtr aData = myFeature->data();
-  AttributeSelectionListPtr aSelectionListAttr = 
-    std::dynamic_pointer_cast<ModelAPI_AttributeSelectionList>(aData->attribute(attributeID()));
-
-  QObjectPtrList aListOfAttributeObjects;
-  for (int i = 0; i < aSelectionListAttr->size(); i++) {
-    AttributeSelectionPtr anAttr = aSelectionListAttr->value(i);
-    aListOfAttributeObjects.append(anAttr->context());
-  }
-
-  myExternalObjectMgr->removeUnusedExternalObjects(aListOfAttributeObjects, sketch(), myFeature);
-}
-
-//********************************************************************
-bool PartSet_WidgetMultiSelector::isValidSelectionCustom(const ModuleBase_ViewerPrs& thePrs)
+bool PartSet_WidgetMultiSelector::isValidSelectionCustom(const ModuleBase_ViewerPrsPtr& thePrs)
 {
   bool aValid = ModuleBase_WidgetMultiSelector::isValidSelectionCustom(thePrs);
   if (aValid) {
@@ -73,37 +56,48 @@ bool PartSet_WidgetMultiSelector::isValidSelectionCustom(const ModuleBase_Viewer
 }
 
 //********************************************************************
-void PartSet_WidgetMultiSelector::storeAttributeValue()
-{
-  myIsInVaildate = true;
-  ModuleBase_WidgetMultiSelector::storeAttributeValue();
-
-}
-
-//********************************************************************
-void PartSet_WidgetMultiSelector::restoreAttributeValue(const bool theValid)
+void PartSet_WidgetMultiSelector::restoreAttributeValue(const AttributePtr& theAttribute,
+                                                        const bool theValid)
 {
-  myIsInVaildate = false;
-  ModuleBase_WidgetMultiSelector::restoreAttributeValue(theValid);
+  ModuleBase_WidgetMultiSelector::restoreAttributeValue(theAttribute, theValid);
 
-  myExternalObjectMgr->removeExternalValidated(sketch(), myFeature);
+  myExternalObjectMgr->removeExternal(sketch(), myFeature, myWorkshop, true);
 }
 
-void PartSet_WidgetMultiSelector::getGeomSelection(const ModuleBase_ViewerPrs& thePrs,
+void PartSet_WidgetMultiSelector::getGeomSelection(const ModuleBase_ViewerPrsPtr& thePrs,
                                                    ObjectPtr& theObject,
                                                    GeomShapePtr& theShape)
 {
   ModuleBase_WidgetMultiSelector::getGeomSelection(thePrs, theObject, theShape);
 
   FeaturePtr aSelectedFeature = ModelAPI_Feature::feature(theObject);
-  std::shared_ptr<SketchPlugin_Feature> aSPFeature = 
+  std::shared_ptr<SketchPlugin_Feature> aSPFeature =
           std::dynamic_pointer_cast<SketchPlugin_Feature>(aSelectedFeature);
   // there is no a sketch feature is selected, but the shape exists, try to create an exernal object
-  if (aSPFeature.get() == NULL && theShape.get() != NULL && !theShape->isNull() &&
-      myExternalObjectMgr->useExternal()) {
-    if (myIsInVaildate)
-      theObject = myExternalObjectMgr->externalObjectValidated(theObject, theShape, sketch());
-    else
-      theObject = myExternalObjectMgr->externalObject(theObject, theShape, sketch());
+  // TODO: unite with the same functionality in PartSet_WidgetShapeSelector
+  if (aSPFeature.get() == NULL) {
+    ObjectPtr anExternalObject = ObjectPtr();
+    GeomShapePtr anExternalShape = GeomShapePtr();
+    if (myExternalObjectMgr->useExternal()) {
+      if (myExternalObjectMgr->canCreateExternal()) {
+        GeomShapePtr aShape = theShape;
+        if (!aShape.get()) {
+          ResultPtr aResult = myWorkshop->selection()->getResult(thePrs);
+          if (aResult.get())
+            aShape = aResult->shape();
+        }
+        if (aShape.get() != NULL && !aShape->isNull())
+          anExternalObject =
+            myExternalObjectMgr->externalObject(theObject, aShape, sketch(), myIsInValidate);
+      }
+      else {
+        anExternalObject = theObject;
+        anExternalShape = theShape;
+      }
+    }
+    /// the object is null if the selected feature is "external"(not sketch entity feature of the
+    /// current sketch) and it is not created by object manager
+    theObject = anExternalObject;
+    theShape = anExternalShape;
   }
 }