X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesAPI%2FFeaturesAPI_Rotation.cpp;h=1f8f965a0ddca4f1fd47ccd68b77a61ddf825ac3;hb=2ab502106663ac32f9a5d87e4fdc950f5ac6f6b7;hp=ef0c55fdbd7608e0c72fb092d14e28bd57813eb2;hpb=6875c6f5fd925c6a340e92d9cda09bbae9d243ee;p=modules%2Fshaper.git

diff --git a/src/FeaturesAPI/FeaturesAPI_Rotation.cpp b/src/FeaturesAPI/FeaturesAPI_Rotation.cpp
index ef0c55fdb..1f8f965a0 100644
--- a/src/FeaturesAPI/FeaturesAPI_Rotation.cpp
+++ b/src/FeaturesAPI/FeaturesAPI_Rotation.cpp
@@ -1,8 +1,21 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
-
-// File:        FeaturesAPI_Rotation.cpp
-// Created:     07 June 2016
-// Author:      Dmitry Bobylev
+// Copyright (C) 2014-2019  CEA/DEN, EDF R&D
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 #include "FeaturesAPI_Rotation.h"
 
@@ -106,7 +119,7 @@ void FeaturesAPI_Rotation::dump(ModelHighAPI_Dumper& theDumper) const
   if (aCreationMethod == FeaturesPlugin_Rotation::CREATION_METHOD_BY_ANGLE()) {
     AttributeSelectionPtr anAttrAxis = aBase->selection(FeaturesPlugin_Rotation::AXIS_OBJECT_ID());
     AttributeDoublePtr anAttrAngle = aBase->real(FeaturesPlugin_Rotation::ANGLE_ID());
-    theDumper << ", " << anAttrAxis << ", " << anAttrAngle;
+    theDumper << ", axis = " << anAttrAxis << ", angle = " << anAttrAngle;
   } else if (aCreationMethod == FeaturesPlugin_Rotation::CREATION_METHOD_BY_THREE_POINTS()) {
     AttributeSelectionPtr anAttrCenterPoint =
       aBase->selection(FeaturesPlugin_Rotation::CENTER_POINT_ID());
@@ -114,30 +127,58 @@ void FeaturesAPI_Rotation::dump(ModelHighAPI_Dumper& theDumper) const
       aBase->selection(FeaturesPlugin_Rotation::START_POINT_ID());
     AttributeSelectionPtr anAttrEndPoint =
       aBase->selection(FeaturesPlugin_Rotation::END_POINT_ID());
-    theDumper << ", " << anAttrCenterPoint << ", " << anAttrStartPoint << ", " << anAttrEndPoint;
+    theDumper << ", center = " << anAttrCenterPoint
+              << ", start = " << anAttrStartPoint
+              << ", end = " << anAttrEndPoint;
   }
 
+  if (!aBase->data()->version().empty())
+    theDumper << ", keepSubResults = True";
+
   theDumper << ")" << std::endl;
 }
 
 //==================================================================================================
-RotationPtr addRotation(const std::shared_ptr<ModelAPI_Document>& thePart,
-                        const std::list<ModelHighAPI_Selection>& theMainObjects,
-                        const ModelHighAPI_Selection& theAxisObject,
-                        const ModelHighAPI_Double& theAngle)
+RotationPtr addRotation(const std::shared_ptr<ModelAPI_Document>& part,
+                        const std::list<ModelHighAPI_Selection>& objects,
+                        const ModelHighAPI_Selection& axis,
+                        const std::pair<ModelHighAPI_Selection, ModelHighAPI_Double>& angle,
+                        const ModelHighAPI_Selection& center,
+                        const ModelHighAPI_Selection& start,
+                        const ModelHighAPI_Selection& end,
+                        const bool keepSubResults)
 {
-  std::shared_ptr<ModelAPI_Feature> aFeature = thePart->addFeature(FeaturesAPI_Rotation::ID());
-  return RotationPtr(new FeaturesAPI_Rotation(aFeature, theMainObjects, theAxisObject, theAngle));
-}
+  std::shared_ptr<ModelAPI_Feature> aFeature = part->addFeature(FeaturesAPI_Rotation::ID());
+  if (!keepSubResults)
+    aFeature->data()->setVersion("");
+
+  bool byAxis = false;
+  bool byPoints = false;
+  ModelHighAPI_Selection aPoints[3];
+  if (angle.first.variantType() == ModelHighAPI_Selection::VT_Empty) {
+    if (axis.variantType() == ModelHighAPI_Selection::VT_Empty) {
+      byPoints = true;
+      aPoints[0] = center;
+      aPoints[1] = start;
+      aPoints[2] = end;
+    }
+    else
+      byAxis = true;
+  }
+  else {
+    byPoints = true;
+    aPoints[0] = axis;
+    aPoints[1] = angle.first;
+    aPoints[2] = center;
+  }
 
-//==================================================================================================
-RotationPtr addRotation(const std::shared_ptr<ModelAPI_Document>& thePart,
-                        const std::list<ModelHighAPI_Selection>& theMainObjects,
-                        const ModelHighAPI_Selection& theCenterPoint,
-                        const ModelHighAPI_Selection& theStartPoint,
-                        const ModelHighAPI_Selection& theEndPoint)
-{
-  std::shared_ptr<ModelAPI_Feature> aFeature = thePart->addFeature(FeaturesAPI_Rotation::ID());
-  return RotationPtr(new FeaturesAPI_Rotation(aFeature, theMainObjects, theCenterPoint,
-                                              theStartPoint, theEndPoint));
+
+  RotationPtr aRotation;
+  if (byAxis)
+    aRotation.reset(new FeaturesAPI_Rotation(aFeature, objects, axis, angle.second));
+  else if (byPoints) {
+    aRotation.reset(new FeaturesAPI_Rotation(aFeature, objects,
+                                             aPoints[0], aPoints[1], aPoints[2]));
+  }
+  return aRotation;
 }