Revert "Revert "Add a new method for translation : translation by two points.""

[modules/shaper.git] / src / FeaturesAPI / FeaturesAPI_Translation.cpp

diff --git a/src/FeaturesAPI/FeaturesAPI_Translation.cpp b/src/FeaturesAPI/FeaturesAPI_Translation.cpp
index a57e812af39d8136a8196bd0dd6cece544dc04f9..ec05c3cefb2951bc2e311bb1eb53fcec334166d6 100644 (file)
--- a/src/FeaturesAPI/FeaturesAPI_Translation.cpp
+++ b/src/FeaturesAPI/FeaturesAPI_Translation.cpp
@@ -46,6 +46,20 @@ FeaturesAPI_Translation::FeaturesAPI_Translation(
   }
 }
 
+//==================================================================================================
+FeaturesAPI_Translation::FeaturesAPI_Translation(
+  const std::shared_ptr<ModelAPI_Feature>& theFeature,
+  const std::list<ModelHighAPI_Selection>& theMainObjects,
+  const ModelHighAPI_Selection& theStartPoint,
+  const ModelHighAPI_Selection& theEndPoint)
+: ModelHighAPI_Interface(theFeature)
+{
+  if(initialize()) {
+    fillAttribute(theMainObjects, mymainObjects);
+    setPoints(theStartPoint, theEndPoint);
+  }
+}
+
 //==================================================================================================
 FeaturesAPI_Translation::~FeaturesAPI_Translation()
 {
@@ -85,19 +99,30 @@ void FeaturesAPI_Translation::setDimensions(const ModelHighAPI_Double& theDx,
   execute();
 }
 
+//==================================================================================================
+void FeaturesAPI_Translation::setPoints(const ModelHighAPI_Selection& theStartPoint,
+                                        const ModelHighAPI_Selection& theEndPoint)
+{
+  fillAttribute(FeaturesPlugin_Translation::CREATION_METHOD_BY_TWO_POINTS(), mycreationMethod);
+  fillAttribute(theStartPoint, mystartPoint);
+  fillAttribute(theEndPoint, myendPoint);
+
+  execute();
+}
+
 //==================================================================================================
 void FeaturesAPI_Translation::dump(ModelHighAPI_Dumper& theDumper) const
 {
   FeaturePtr aBase = feature();
   const std::string& aDocName = theDumper.name(aBase->document());
-  
+
   AttributeSelectionListPtr anAttrObjects =
     aBase->selectionList(FeaturesPlugin_Translation::OBJECTS_LIST_ID());
   theDumper << aBase << " = model.addTranslation(" << aDocName << ", " << anAttrObjects;
-  
+
   std::string aCreationMethod =
     aBase->string(FeaturesPlugin_Translation::CREATION_METHOD())->value();
-  
+
   if(aCreationMethod == FeaturesPlugin_Translation::CREATION_METHOD_BY_DISTANCE()) {
     AttributeSelectionPtr anAttrAxis =
       aBase->selection(FeaturesPlugin_Translation::AXIS_OBJECT_ID());
@@ -109,6 +134,12 @@ void FeaturesAPI_Translation::dump(ModelHighAPI_Dumper& theDumper) const
     AttributeDoublePtr anAttrDy = aBase->real(FeaturesPlugin_Translation::DY_ID());
     AttributeDoublePtr anAttrDz = aBase->real(FeaturesPlugin_Translation::DZ_ID());
     theDumper << ", " << anAttrDx << ", " << anAttrDy << ", " << anAttrDz;
+  } else if (aCreationMethod == FeaturesPlugin_Translation::CREATION_METHOD_BY_TWO_POINTS()) {
+    AttributeSelectionPtr anAttrStartPoint =
+      aBase->selection(FeaturesPlugin_Translation::START_POINT_ID());
+    AttributeSelectionPtr anAttrEndPoint =
+      aBase->selection(FeaturesPlugin_Translation::END_POINT_ID());
+    theDumper << ", " << anAttrStartPoint << ", " << anAttrEndPoint;
   }
 
    theDumper << ")" << std::endl;
@@ -135,3 +166,14 @@ TranslationPtr addTranslation(const std::shared_ptr<ModelAPI_Document>& thePart,
   std::shared_ptr<ModelAPI_Feature> aFeature = thePart->addFeature(FeaturesAPI_Translation::ID());
   return TranslationPtr(new FeaturesAPI_Translation(aFeature, theMainObjects, theDx, theDy, theDz));
 }
+
+//==================================================================================================
+TranslationPtr addTranslation(const std::shared_ptr<ModelAPI_Document>& thePart,
+                              const std::list<ModelHighAPI_Selection>& theMainObjects,
+                              const ModelHighAPI_Selection& theStartPoint,
+                              const ModelHighAPI_Selection& theEndPoint)
+{
+  std::shared_ptr<ModelAPI_Feature> aFeature = thePart->addFeature(FeaturesAPI_Translation::ID());
+  return TranslationPtr(new FeaturesAPI_Translation(aFeature, theMainObjects,
+                                                    theStartPoint, theEndPoint));
+}