Issue #1941 Split auxiliary line.

[modules/shaper.git] / src / PartSet / PartSet_WidgetMultiSelector.cpp

diff --git a/src/PartSet/PartSet_WidgetMultiSelector.cpp b/src/PartSet/PartSet_WidgetMultiSelector.cpp
index bfa7a8d30d2b9ce3cc78e61832bb6fba374d14e3..322864def53255c89d57168cd4e65cf3358f7c6f 100755 (executable)
--- a/src/PartSet/PartSet_WidgetMultiSelector.cpp
+++ b/src/PartSet/PartSet_WidgetMultiSelector.cpp
@@ -16,6 +16,7 @@
 #include <ModuleBase_Tools.h>
 #include <ModuleBase_IWorkshop.h>
 #include <ModuleBase_ISelection.h>
+#include <ModuleBase_ViewerPrs.h>
 
 #include <Config_WidgetAPI.h>
 
@@ -34,7 +35,8 @@ PartSet_WidgetMultiSelector::PartSet_WidgetMultiSelector(QWidget* theParent,
                                                          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()
@@ -43,7 +45,7 @@ PartSet_WidgetMultiSelector::~PartSet_WidgetMultiSelector()
 }
 
 //********************************************************************
-bool PartSet_WidgetMultiSelector::isValidSelectionCustom(const ModuleBase_ViewerPrs& thePrs)
+bool PartSet_WidgetMultiSelector::isValidSelectionCustom(const ModuleBase_ViewerPrsPtr& thePrs)
 {
   bool aValid = ModuleBase_WidgetMultiSelector::isValidSelectionCustom(thePrs);
   if (aValid) {
@@ -54,32 +56,48 @@ bool PartSet_WidgetMultiSelector::isValidSelectionCustom(const ModuleBase_Viewer
 }
 
 //********************************************************************
-void PartSet_WidgetMultiSelector::restoreAttributeValue(const bool theValid)
+void PartSet_WidgetMultiSelector::restoreAttributeValue(const AttributePtr& theAttribute,
+                                                        const bool theValid)
 {
-  ModuleBase_WidgetMultiSelector::restoreAttributeValue(theValid);
+  ModuleBase_WidgetMultiSelector::restoreAttributeValue(theAttribute, theValid);
 
   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
   // TODO: unite with the same functionality in PartSet_WidgetShapeSelector
-  if (aSPFeature.get() == NULL && myExternalObjectMgr->useExternal()) {
-    GeomShapePtr aShape = theShape;
-    if (!aShape.get()) {
-      ResultPtr aResult = myWorkshop->selection()->getResult(thePrs);
-      if (aResult.get())
-        aShape = aResult->shape();
+  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;
+      }
     }
-    if (aShape.get() != NULL && !aShape->isNull())
-      theObject = myExternalObjectMgr->externalObject(theObject, aShape, sketch(), myIsInValidate);
+    /// 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;
   }
 }