Merge branch 'master' of ssh://git.salome-platform.org/modules/shaper

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

diff --git a/src/FeaturesPlugin/FeaturesPlugin_Placement.cpp b/src/FeaturesPlugin/FeaturesPlugin_Placement.cpp
index 496abeb0a42122e4f4b061d26e31fcc28d6907a5..0039d750d4ab0d6e7e30a161961d67e15fb3fc7f 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,7 +29,7 @@ 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()));
 
@@ -51,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();
@@ -146,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);
@@ -173,8 +173,9 @@ void FeaturesPlugin_Placement::execute()
       }
 
       //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++;
@@ -185,18 +186,17 @@ 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::string aPlacedName = "Placed";
   std::shared_ptr<GeomAPI_DataMapOfShapeShape> aSubShapes = theTransformAlgo.mapOfSubShapes();
 
-    // put modifed faces in DF
-  std::string aModName = "Modified";
-  theResultBody->loadAndOrientModifiedShapes(&theTransformAlgo,
-                                             theSlaveObject, _FACE,
-                                             _MODIFIEDF_TAG, aModName, *aSubShapes.get());
+  FeaturesPlugin_Tools::storeModifiedShapes(theTransformAlgo, theResultBody,
+                                            theBaseShape, 1, 2, 3, aPlacedName,
+                                            *aSubShapes.get());
 }