X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2FFeaturesPlugin_MultiTranslation.cpp;h=7be4cccf21a7992e8fda6ea7938cb3242ab1a8d8;hb=21a0c85b52bb93f94680e2342370764e6510e387;hp=5ef6bba7139ce4c5221e6f99f0ca4bbe7268af8e;hpb=671694a86b66efcc54948341cf06d717d782c581;p=modules%2Fshaper.git

diff --git a/src/FeaturesPlugin/FeaturesPlugin_MultiTranslation.cpp b/src/FeaturesPlugin/FeaturesPlugin_MultiTranslation.cpp
index 5ef6bba71..7be4cccf2 100644
--- a/src/FeaturesPlugin/FeaturesPlugin_MultiTranslation.cpp
+++ b/src/FeaturesPlugin/FeaturesPlugin_MultiTranslation.cpp
@@ -11,12 +11,14 @@
 #include <GeomAPI_Ax1.h>
 #include <GeomAPI_Edge.h>
 #include <GeomAPI_Lin.h>
+#include <GeomAPI_Trsf.h>
 
 #include <ModelAPI_AttributeDouble.h>
 #include <ModelAPI_AttributeInteger.h>
 #include <ModelAPI_AttributeSelectionList.h>
 #include <ModelAPI_AttributeString.h>
 #include <ModelAPI_ResultBody.h>
+#include <ModelAPI_ResultPart.h>
 
 #include <math.h>
 
@@ -107,52 +109,74 @@ void FeaturesPlugin_MultiTranslation::performOneDirection()
   int nbCopies =
     integer(FeaturesPlugin_MultiTranslation::NB_COPIES_FIRST_DIR_ID())->value();
 
+  if (nbCopies <=0) {
+    std::string aFeatureError = "Multitranslation builder ";
+    aFeatureError+=":: the number of copies for the first direction is null or negative.";
+    setError(aFeatureError);
+    return;
+  }
+
   // Moving each object.
   int aResultIndex = 0;
   std::list<ResultPtr>::iterator aContext = aContextes.begin();
   for(ListOfShape::iterator anObjectsIt = anObjects.begin(); anObjectsIt != anObjects.end();
         anObjectsIt++, aContext++) {
     std::shared_ptr<GeomAPI_Shape> aBaseShape = *anObjectsIt;
+    bool isPart = (*aContext)->groupName() == ModelAPI_ResultPart::group();
+
+    // Setting result.
+    if (isPart) {
+      ResultPartPtr anOrigin = std::dynamic_pointer_cast<ModelAPI_ResultPart>(*aContext);
+      std::shared_ptr<GeomAPI_Trsf> aTrsf(new GeomAPI_Trsf());
+      for (int i=0; i<nbCopies; i++) {
+        aTrsf->setTranslation(anAxis, i*aStep);
+        ResultPartPtr aResultPart = document()->copyPart(anOrigin, data(), aResultIndex);
+        aResultPart->setTrsf(*aContext, aTrsf);
+        setResult(aResultPart, aResultIndex);
+        aResultIndex++;
+      }
+    } else {
+      ListOfShape aListOfShape;
+      std::list<std::shared_ptr<GeomAlgoAPI_Translation> > aListOfTranslationAlgo;
 
-    ListOfShape aListOfShape;
-    std::list<std::shared_ptr<GeomAlgoAPI_Translation> > aListOfTranslationAlgo;
-
-    for (int i=0; i<nbCopies; i++) {
-      std::shared_ptr<GeomAlgoAPI_Translation> aTranslationAlgo(
-        new GeomAlgoAPI_Translation(aBaseShape, anAxis, i*aStep));
+      for (int i=0; i<nbCopies; i++) {
+        std::shared_ptr<GeomAlgoAPI_Translation> aTranslationAlgo(
+          new GeomAlgoAPI_Translation(aBaseShape, anAxis, i*aStep));
 
-      if (!aTranslationAlgo->check()) {
-        setError(aTranslationAlgo->getError());
-        break;
-      }
+        if (!aTranslationAlgo->check()) {
+          setError(aTranslationAlgo->getError());
+          break;
+        }
 
-      aTranslationAlgo->build();
+        aTranslationAlgo->build();
 
-      // Checking that the algorithm worked properly.
-      if (!aTranslationAlgo->isDone()) {
-        static const std::string aFeatureError = "Error : Multitranslation algorithm failed.";
-        setError(aFeatureError);
-        break;
-      }
-      if (aTranslationAlgo->shape()->isNull()) {
-        static const std::string aShapeError = "Error : Resulting shape is null.";
-        setError(aShapeError);
-        break;
-      }
-      if (!aTranslationAlgo->isValid()) {
-        static const std::string aFeatureError = "Error : Resulting shape in not valid.";
-        setError(aFeatureError);
-        break;
+        // Checking that the algorithm worked properly.
+        if (!aTranslationAlgo->isDone()) {
+          static const std::string aFeatureError = "Error : Multitranslation algorithm failed.";
+          setError(aFeatureError);
+          break;
+        }
+        if (aTranslationAlgo->shape()->isNull()) {
+          static const std::string aShapeError = "Error : Resulting shape is null.";
+          setError(aShapeError);
+          break;
+        }
+        if (!aTranslationAlgo->isValid()) {
+          static const std::string aFeatureError = "Error : Resulting shape in not valid.";
+          setError(aFeatureError);
+          break;
+        }
+        aListOfShape.push_back(aTranslationAlgo->shape());
+        aListOfTranslationAlgo.push_back(aTranslationAlgo);
       }
-      aListOfShape.push_back(aTranslationAlgo->shape());
-      aListOfTranslationAlgo.push_back(aTranslationAlgo);
-    }
-    std::shared_ptr<GeomAPI_Shape> aCompound = GeomAlgoAPI_CompoundBuilder::compound(aListOfShape);
-    ResultBodyPtr aResultBody = document()->createBody(data(), aResultIndex);
-    aResultBody->storeModified(aBaseShape, aCompound);
-    loadNamingDS(aListOfTranslationAlgo, aResultBody, aBaseShape);
+      std::shared_ptr<GeomAPI_Shape> aCompound =
+        GeomAlgoAPI_CompoundBuilder::compound(aListOfShape);
+      ResultBodyPtr aResultBody = document()->createBody(data(), aResultIndex);
+      aResultBody->storeModified(aBaseShape, aCompound);
+      loadNamingDS(aListOfTranslationAlgo, aResultBody, aBaseShape);
 
-    setResult(aResultBody, aResultIndex);
+      setResult(aResultBody, aResultIndex);
+    }
     aResultIndex++;
   }
 
@@ -221,6 +245,20 @@ void FeaturesPlugin_MultiTranslation::performTwoDirection()
   int aSecondNbCopies =
     integer(FeaturesPlugin_MultiTranslation::NB_COPIES_SECOND_DIR_ID())->value();
 
+  if (aFirstNbCopies <=0) {
+    std::string aFeatureError = "Multitranslation builder ";
+    aFeatureError+=":: the number of copies for the first direction is null or negative.";
+    setError(aFeatureError);
+    return;
+  }
+
+  if (aSecondNbCopies <=0) {
+    std::string aFeatureError = "Multitranslation builder ";
+    aFeatureError+=":: the number of copies for the second direction is null or negative.";
+    setError(aFeatureError);
+    return;
+  }
+
   // Coord aFirstAxis
   double x1 = aFirstAxis->dir()->x();
   double y1 = aFirstAxis->dir()->y();
@@ -239,50 +277,70 @@ void FeaturesPlugin_MultiTranslation::performTwoDirection()
   for(ListOfShape::iterator anObjectsIt = anObjects.begin(); anObjectsIt != anObjects.end();
         anObjectsIt++, aContext++) {
     std::shared_ptr<GeomAPI_Shape> aBaseShape = *anObjectsIt;
-
-    ListOfShape aListOfShape;
-    std::list<std::shared_ptr<GeomAlgoAPI_Translation> > aListOfTranslationAlgo;
-
-    for (int j=0; j<aSecondNbCopies; j++) {
-      for (int i=0; i<aFirstNbCopies; i++) {
-        double dx = i*aFirstStep*x1/norm1+j*aSecondStep*x2/norm2;
-        double dy = i*aFirstStep*y1/norm1+j*aSecondStep*y2/norm2;
-        double dz = i*aFirstStep*z1/norm1+j*aSecondStep*z2/norm2;
-        std::shared_ptr<GeomAlgoAPI_Translation> aTranslationAlgo(
-          new GeomAlgoAPI_Translation(aBaseShape, dx, dy, dz));
-
-        if (!aTranslationAlgo->check()) {
-          setError(aTranslationAlgo->getError());
-          break;
-        }
-
-        aTranslationAlgo->build();
-
-        // Checking that the algorithm worked properly.
-        if (!aTranslationAlgo->isDone()) {
-          static const std::string aFeatureError = "Error : Multitranslation algorithm failed.";
-          setError(aFeatureError);
-          break;
+    bool isPart = (*aContext)->groupName() == ModelAPI_ResultPart::group();
+
+    // Setting result.
+    if (isPart) {
+      ResultPartPtr anOrigin = std::dynamic_pointer_cast<ModelAPI_ResultPart>(*aContext);
+      std::shared_ptr<GeomAPI_Trsf> aTrsf(new GeomAPI_Trsf());
+      for (int j=0; j<aSecondNbCopies; j++) {
+        for (int i=0; i<aFirstNbCopies; i++) {
+          double dx = i*aFirstStep*x1/norm1+j*aSecondStep*x2/norm2;
+          double dy = i*aFirstStep*y1/norm1+j*aSecondStep*y2/norm2;
+          double dz = i*aFirstStep*z1/norm1+j*aSecondStep*z2/norm2;
+          aTrsf->setTranslation(dx, dy, dz);
+          ResultPartPtr aResultPart = document()->copyPart(anOrigin, data(), aResultIndex);
+          aResultPart->setTrsf(*aContext, aTrsf);
+          setResult(aResultPart, aResultIndex);
+          aResultIndex++;
         }
-        if (aTranslationAlgo->shape()->isNull()) {
-          static const std::string aShapeError = "Error : Resulting shape is null.";
-          setError(aShapeError);
-          break;
-        }
-        if (!aTranslationAlgo->isValid()) {
-          static const std::string aFeatureError = "Error : Resulting shape in not valid.";
-          setError(aFeatureError);
-          break;
+      }
+    } else {
+      ListOfShape aListOfShape;
+      std::list<std::shared_ptr<GeomAlgoAPI_Translation> > aListOfTranslationAlgo;
+
+      for (int j=0; j<aSecondNbCopies; j++) {
+        for (int i=0; i<aFirstNbCopies; i++) {
+          double dx = i*aFirstStep*x1/norm1+j*aSecondStep*x2/norm2;
+          double dy = i*aFirstStep*y1/norm1+j*aSecondStep*y2/norm2;
+          double dz = i*aFirstStep*z1/norm1+j*aSecondStep*z2/norm2;
+          std::shared_ptr<GeomAlgoAPI_Translation> aTranslationAlgo(
+            new GeomAlgoAPI_Translation(aBaseShape, dx, dy, dz));
+
+          if (!aTranslationAlgo->check()) {
+            setError(aTranslationAlgo->getError());
+            break;
+          }
+
+          aTranslationAlgo->build();
+
+          // Checking that the algorithm worked properly.
+          if (!aTranslationAlgo->isDone()) {
+            static const std::string aFeatureError = "Error : Multitranslation algorithm failed.";
+            setError(aFeatureError);
+            break;
+          }
+          if (aTranslationAlgo->shape()->isNull()) {
+            static const std::string aShapeError = "Error : Resulting shape is null.";
+            setError(aShapeError);
+            break;
+          }
+          if (!aTranslationAlgo->isValid()) {
+            static const std::string aFeatureError = "Error : Resulting shape in not valid.";
+            setError(aFeatureError);
+           break;
+          }
+          aListOfShape.push_back(aTranslationAlgo->shape());
+          aListOfTranslationAlgo.push_back(aTranslationAlgo);
         }
-        aListOfShape.push_back(aTranslationAlgo->shape());
-        aListOfTranslationAlgo.push_back(aTranslationAlgo);
       }
+      std::shared_ptr<GeomAPI_Shape> aCompound =
+        GeomAlgoAPI_CompoundBuilder::compound(aListOfShape);
+      ResultBodyPtr aResultBody = document()->createBody(data(), aResultIndex);
+      aResultBody->storeModified(aBaseShape, aCompound);
+      loadNamingDS(aListOfTranslationAlgo, aResultBody, aBaseShape);
+      setResult(aResultBody, aResultIndex);
     }
-    std::shared_ptr<GeomAPI_Shape> aCompound = GeomAlgoAPI_CompoundBuilder::compound(aListOfShape);
-    ResultBodyPtr aResultBody = document()->createBody(data(), aResultIndex);
-    aResultBody->storeModified(aBaseShape, aCompound);
-    loadNamingDS(aListOfTranslationAlgo, aResultBody, aBaseShape);
-    setResult(aResultBody, aResultIndex);
     aResultIndex++;
   }