Issue #1916: Fatal error when create sketch on body Remove subshapes

[modules/shaper.git] / src / FeaturesPlugin / FeaturesPlugin_Placement.cpp

diff --git a/src/FeaturesPlugin/FeaturesPlugin_Placement.cpp b/src/FeaturesPlugin/FeaturesPlugin_Placement.cpp
index a8e4b4138432ec11bf105c68f40cee609bba59ca..c28d769d0e073a8c88b33b3e2d09bb9e427e4c55 100644 (file)
--- a/src/FeaturesPlugin/FeaturesPlugin_Placement.cpp
+++ b/src/FeaturesPlugin/FeaturesPlugin_Placement.cpp
@@ -20,10 +20,8 @@
 #include <GeomAlgoAPI_Placement.h>
 #include <GeomAlgoAPI_Transform.h>
 
-#define _MODIFIEDF_TAG 1
-#define _MODIFIEDE_TAG 2
-#define _MODIFIEDV_TAG 3
-#define _FACE 4
+#include <FeaturesPlugin_Tools.h>
+
 FeaturesPlugin_Placement::FeaturesPlugin_Placement()
 {
 }
@@ -31,11 +29,9 @@ FeaturesPlugin_Placement::FeaturesPlugin_Placement()
 void FeaturesPlugin_Placement::initAttributes()
 {
 
-  AttributeSelectionListPtr aSelection = 
+  AttributeSelectionListPtr aSelection =
     std::dynamic_pointer_cast<ModelAPI_AttributeSelectionList>(data()->addAttribute(
     OBJECTS_LIST_ID(), ModelAPI_AttributeSelectionList::typeId()));
-  // extrusion works with faces always
-  aSelection->setSelectionType("SOLID");
 
   data()->addAttribute(START_SHAPE_ID(), ModelAPI_AttributeSelection::typeId());
   data()->addAttribute(END_SHAPE_ID(), ModelAPI_AttributeSelection::typeId());
@@ -53,7 +49,8 @@ void FeaturesPlugin_Placement::execute()
     return;
   }
   for(int anObjectsIndex = 0; anObjectsIndex < anObjectsSelList->size(); anObjectsIndex++) {
-    std::shared_ptr<ModelAPI_AttributeSelection> anObjectAttr = anObjectsSelList->value(anObjectsIndex);
+    std::shared_ptr<ModelAPI_AttributeSelection> anObjectAttr =
+      anObjectsSelList->value(anObjectsIndex);
     std::shared_ptr<GeomAPI_Shape> anObject = anObjectAttr->value();
     if(!anObject.get()) { // may be for not-activated parts
       eraseResults();
@@ -70,7 +67,7 @@ void FeaturesPlugin_Placement::execute()
   }
   std::shared_ptr<GeomAPI_Shape> aStartShape = anObjRef->value();
   if(!aStartShape) {
-    static const std::string aSelectionError = "The start shape selection is bad";
+    static const std::string aSelectionError = "Error: The start shape selection is bad.";
     setError(aSelectionError);
     return;
   }
@@ -82,7 +79,7 @@ void FeaturesPlugin_Placement::execute()
     aStartShapeContext = aContextRes->shape();
   }
   if(!aStartShapeContext.get()) {
-    static const std::string aContextError = "The start shape selection context is bad";
+    static const std::string aContextError = "Error: The start shape selection context is bad.";
     setError(aContextError);
     return;
   }
@@ -91,7 +88,7 @@ void FeaturesPlugin_Placement::execute()
   anObjRef = selection(END_SHAPE_ID());
   std::shared_ptr<GeomAPI_Shape> anEndShape = anObjRef->value();
   if(!anEndShape) {
-    static const std::string aSelectionError = "The end shape selection is bad";
+    static const std::string aSelectionError = "Error: The end shape selection is bad.";
     setError(aSelectionError);
     return;
   }
@@ -102,7 +99,7 @@ void FeaturesPlugin_Placement::execute()
     anEndShapeContext = aContextRes->shape();
   }
   if(!anEndShapeContext.get()) {
-    static const std::string aContextError = "The end shape selection context is bad";
+    static const std::string aContextError = "Error: The end shape selection context is bad.";
     setError(aContextError);
     return;
   }
@@ -113,7 +110,7 @@ void FeaturesPlugin_Placement::execute()
     if (aShapes[i]->isFace()) {
       std::shared_ptr<GeomAPI_Face> aFace(new GeomAPI_Face(aShapes[i]));
       if (!aFace->isPlanar()) {
-        static const std::string aPlanarityError = "One of selected faces is not planar";
+        static const std::string aPlanarityError = "Error: One of selected faces is not planar.";
         setError(aPlanarityError);
         return;
       }
@@ -121,7 +118,7 @@ void FeaturesPlugin_Placement::execute()
     else if (aShapes[i]->isEdge()) {
       std::shared_ptr<GeomAPI_Edge> anEdge(new GeomAPI_Edge(aShapes[i]));
       if (!anEdge->isLine()) {
-        static const std::string aLinearityError = "One of selected endges is not linear";
+        static const std::string aLinearityError = "Error: One of selected endges is not linear.";
         setError(aLinearityError);
         return;
       }
@@ -136,7 +133,7 @@ void FeaturesPlugin_Placement::execute()
   GeomAlgoAPI_Placement aPlacementAlgo(
     aStartShapeContext, anEndShapeContext, aStartShape, anEndShape, isReverse, isCentering, true);
   if(!aPlacementAlgo.isDone()) {
-    static const std::string aFeatureError = "Placement algorithm failed";
+    static const std::string aFeatureError = "Error: Placement algorithm failed.";
     setError(aFeatureError);
     return;
   }
@@ -148,7 +145,8 @@ void FeaturesPlugin_Placement::execute()
   for(ListOfShape::iterator anObjectsIt = anObjects.begin(); anObjectsIt != anObjects.end();
       anObjectsIt++, aContext++) {
 
-    if ((*aContext)->groupName() == ModelAPI_ResultPart::group()) { // for part results just set transformation
+    // for part results just set transformation
+    if ((*aContext)->groupName() == ModelAPI_ResultPart::group()) {
       ResultPartPtr anOrigin = std::dynamic_pointer_cast<ModelAPI_ResultPart>(*aContext);
       ResultPartPtr aResultPart = document()->copyPart(anOrigin, data(), aResultIndex);
       aResultPart->setTrsf(aContextRes, aTrsf);
@@ -159,24 +157,25 @@ void FeaturesPlugin_Placement::execute()
 
       // Checking that the algorithm worked properly.
       if(!aTransformAlgo.isDone()) {
-        static const std::string aFeatureError = "Transform algorithm failed";
+        static const std::string aFeatureError = "Error: Transform algorithm failed.";
         setError(aFeatureError);
         break;
       }
       if(aTransformAlgo.shape()->isNull()) {
-        static const std::string aShapeError = "Resulting shape is Null";
+        static const std::string aShapeError = "Error: Resulting shape is Null.";
         setError(aShapeError);
         break;
       }
       if(!aTransformAlgo.isValid()) {
-        std::string aFeatureError = "Warning: resulting shape is not valid";
+        std::string aFeatureError = "Error: Resulting shape is not valid.";
         setError(aFeatureError);
         break;
       }
 
       //LoadNamingDS
-      std::shared_ptr<ModelAPI_ResultBody> aResultBody = document()->createBody(data(), aResultIndex);
-      LoadNamingDS(aTransformAlgo, aResultBody, aBaseShape);
+      std::shared_ptr<ModelAPI_ResultBody> aResultBody =
+        document()->createBody(data(), aResultIndex);
+      loadNamingDS(aTransformAlgo, aResultBody, aBaseShape);
       setResult(aResultBody, aResultIndex);
     }
     aResultIndex++;
@@ -187,18 +186,18 @@ void FeaturesPlugin_Placement::execute()
 }
 
 //============================================================================
-void FeaturesPlugin_Placement::LoadNamingDS(GeomAlgoAPI_Transform& theTransformAlgo,
+void FeaturesPlugin_Placement::loadNamingDS(GeomAlgoAPI_Transform& theTransformAlgo,
                                             std::shared_ptr<ModelAPI_ResultBody> theResultBody,
-                                            std::shared_ptr<GeomAPI_Shape> theSlaveObject)
+                                            std::shared_ptr<GeomAPI_Shape> theBaseShape)
 {
   //load result
-  theResultBody->storeModified(theSlaveObject, theTransformAlgo.shape()); // the initial Slave, the resulting Slave
+  theResultBody->storeModified(theBaseShape, theTransformAlgo.shape());
 
-  std::shared_ptr<GeomAPI_DataMapOfShapeShape> aSubShapes = theTransformAlgo.mapOfShapes();
+  int aPlacedTag = 1;
+  std::string aPlacedName = "Placed";
+  std::shared_ptr<GeomAPI_DataMapOfShapeShape> aSubShapes = theTransformAlgo.mapOfSubShapes();
 
-    // put modifed faces in DF
-  std::string aModName = "Modified";
-  theResultBody->loadAndOrientModifiedShapes(theTransformAlgo.makeShape().get(),
-                                              theSlaveObject, _FACE,
-                                              _MODIFIEDF_TAG, aModName, *aSubShapes.get());
+  FeaturesPlugin_Tools::storeModifiedShapes(theTransformAlgo, theResultBody,
+                                            theBaseShape, aPlacedTag, aPlacedName,
+                                            *aSubShapes.get());
 }