X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2FFeaturesPlugin_Placement.cpp;h=43b25be205b2270e3e0eec2bb0c5ce5d840f75c8;hb=530f5aff42069e844c4a4ef164088ea23ba0e2dd;hp=a52a2be08bfbc45a5d5953b4fa6e333963d1a647;hpb=af44422560f41f81deca0e0911f4dd9b7c5e2ef5;p=modules%2Fshaper.git

diff --git a/src/FeaturesPlugin/FeaturesPlugin_Placement.cpp b/src/FeaturesPlugin/FeaturesPlugin_Placement.cpp
index a52a2be08..43b25be20 100644
--- a/src/FeaturesPlugin/FeaturesPlugin_Placement.cpp
+++ b/src/FeaturesPlugin/FeaturesPlugin_Placement.cpp
@@ -37,8 +37,8 @@ void FeaturesPlugin_Placement::initAttributes()
   // extrusion works with faces always
   aSelection->setSelectionType("SOLID");
 
-  data()->addAttribute(START_FACE_ID(), ModelAPI_AttributeSelection::typeId());
-  data()->addAttribute(END_FACE_ID(), ModelAPI_AttributeSelection::typeId());
+  data()->addAttribute(START_SHAPE_ID(), ModelAPI_AttributeSelection::typeId());
+  data()->addAttribute(END_SHAPE_ID(), ModelAPI_AttributeSelection::typeId());
   data()->addAttribute(REVERSE_ID(), ModelAPI_AttributeBoolean::typeId());
   data()->addAttribute(CENTERING_ID(), ModelAPI_AttributeBoolean::typeId());
 }
@@ -55,66 +55,88 @@ void FeaturesPlugin_Placement::execute()
   for(int anObjectsIndex = 0; anObjectsIndex < anObjectsSelList->size(); anObjectsIndex++) {
     std::shared_ptr<ModelAPI_AttributeSelection> anObjectAttr = anObjectsSelList->value(anObjectsIndex);
     std::shared_ptr<GeomAPI_Shape> anObject = anObjectAttr->value();
-    if(!anObject.get()) {
+    if(!anObject.get()) { // may be for not-activated parts
+      eraseResults();
       return;
     }
     anObjects.push_back(anObject);
     aContextes.push_back(anObjectAttr->context());
   }
 
-  // Verify the start face
-  AttributeSelectionPtr anObjRef = selection(START_FACE_ID());
+  // Verify the start shape
+  AttributeSelectionPtr anObjRef = selection(START_SHAPE_ID());
   if(!anObjRef) {
     return;
   }
-  std::shared_ptr<GeomAPI_Shape> aStartFace = anObjRef->value();
-  if(!aStartFace || !GeomAPI_Face(aStartFace).isPlanar()) {
-    static const std::string aSelectionError = "The start face selection is bad";
+  std::shared_ptr<GeomAPI_Shape> aStartShape = anObjRef->value();
+  if(!aStartShape) {
+    static const std::string aSelectionError = "Error: The start shape selection is bad.";
     setError(aSelectionError);
     return;
   }
 
 
-  std::shared_ptr<GeomAPI_Shape> aStartShape;
+  std::shared_ptr<GeomAPI_Shape> aStartShapeContext;
   ResultPtr aContextRes = anObjRef->context();
   if (aContextRes.get()) {
-    aStartShape = aContextRes->shape();
+    aStartShapeContext = aContextRes->shape();
   }
-  if(!aStartShape.get()) {
-    static const std::string aContextError = "The start face selection context is bad";
+  if(!aStartShapeContext.get()) {
+    static const std::string aContextError = "Error: The start shape selection context is bad.";
     setError(aContextError);
     return;
   }
 
-  // Verify the end face
-  anObjRef = selection(END_FACE_ID());
-  std::shared_ptr<GeomAPI_Shape> anEndFace = anObjRef->value();
-  if(!anEndFace || !GeomAPI_Face(anEndFace).isPlanar()) {
-    static const std::string aSelectionError = "The end face selection is bad";
+  // Verify the end shape
+  anObjRef = selection(END_SHAPE_ID());
+  std::shared_ptr<GeomAPI_Shape> anEndShape = anObjRef->value();
+  if(!anEndShape) {
+    static const std::string aSelectionError = "Error: The end shape selection is bad.";
     setError(aSelectionError);
     return;
   }
 
-  std::shared_ptr<GeomAPI_Shape> anEndShape;
+  std::shared_ptr<GeomAPI_Shape> anEndShapeContext;
   aContextRes = anObjRef->context();
   if(aContextRes.get()) {
-    anEndShape = aContextRes->shape();
+    anEndShapeContext = aContextRes->shape();
   }
-  if(!anEndShape.get()) {
-    static const std::string aContextError = "The end face selection context is bad";
+  if(!anEndShapeContext.get()) {
+    static const std::string aContextError = "Error: The end shape selection context is bad.";
     setError(aContextError);
     return;
   }
 
+  // Verify planarity of faces and linearity of edges
+  std::shared_ptr<GeomAPI_Shape> aShapes[2] = {aStartShape, anEndShape};
+  for (int i = 0; i < 2; i++) {
+    if (aShapes[i]->isFace()) {
+      std::shared_ptr<GeomAPI_Face> aFace(new GeomAPI_Face(aShapes[i]));
+      if (!aFace->isPlanar()) {
+        static const std::string aPlanarityError = "Error: One of selected faces is not planar.";
+        setError(aPlanarityError);
+        return;
+      }
+    }
+    else if (aShapes[i]->isEdge()) {
+      std::shared_ptr<GeomAPI_Edge> anEdge(new GeomAPI_Edge(aShapes[i]));
+      if (!anEdge->isLine()) {
+        static const std::string aLinearityError = "Error: One of selected endges is not linear.";
+        setError(aLinearityError);
+        return;
+      }
+    }
+  }
+
   // Flags of the Placement
   bool isReverse = boolean(REVERSE_ID())->value();
   bool isCentering = boolean(CENTERING_ID())->value();
 
   // Getting transformation.
   GeomAlgoAPI_Placement aPlacementAlgo(
-    aStartShape, anEndShape, aStartFace, anEndFace, isReverse, isCentering, true);
+    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;
   }
@@ -137,17 +159,17 @@ 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;
       }
@@ -169,15 +191,14 @@ void FeaturesPlugin_Placement::LoadNamingDS(GeomAlgoAPI_Transform& theTransformA
                                             std::shared_ptr<ModelAPI_ResultBody> theResultBody,
                                             std::shared_ptr<GeomAPI_Shape> theSlaveObject)
 {
-  ModelAPI_BodyBuilder* aResultBuilder = theResultBody->getBodyBuilder();
   //load result
-  aResultBuilder->storeModified(theSlaveObject, theTransformAlgo.shape()); // the initial Slave, the resulting Slave
+  theResultBody->storeModified(theSlaveObject, theTransformAlgo.shape()); // the initial Slave, the resulting Slave
 
-  std::shared_ptr<GeomAPI_DataMapOfShapeShape> aSubShapes = theTransformAlgo.mapOfShapes();
+  std::shared_ptr<GeomAPI_DataMapOfShapeShape> aSubShapes = theTransformAlgo.mapOfSubShapes();
 
     // put modifed faces in DF
   std::string aModName = "Modified";
-  aResultBuilder->loadAndOrientModifiedShapes(theTransformAlgo.makeShape().get(),
-                                              theSlaveObject, _FACE,
-                                              _MODIFIEDF_TAG, aModName, *aSubShapes.get());
+  theResultBody->loadAndOrientModifiedShapes(&theTransformAlgo,
+                                             theSlaveObject, _FACE,
+                                             _MODIFIEDF_TAG, aModName, *aSubShapes.get());
 }