Merge branch 'V9_7_BR'

[modules/shaper.git] / src / PrimitivesPlugin / PrimitivesPlugin_Box.h

diff --git a/src/PrimitivesPlugin/PrimitivesPlugin_Box.h b/src/PrimitivesPlugin/PrimitivesPlugin_Box.h
index 7672d2fb8413fc3c9e2c0055055a419316cad58d..252cf52f3b17e6709708c995ddc1a9c8513e4eef 100644 (file)
--- a/src/PrimitivesPlugin/PrimitivesPlugin_Box.h
+++ b/src/PrimitivesPlugin/PrimitivesPlugin_Box.h
@@ -1,8 +1,21 @@
-// Copyright (C) 2014-2016 CEA/DEN, EDF R&D
-
-// File:        PrimitivesPlugin_Box.h
-// Created:     10 Mar 2016
-// Author:      Clarisse Genrault (CEA)
+// Copyright (C) 2014-2021  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
+//
 
 #ifndef PrimitivesPlugin_Box_H_
 #define PrimitivesPlugin_Box_H_
@@ -10,7 +23,6 @@
 #include <PrimitivesPlugin.h>
 #include <ModelAPI_Feature.h>
 #include <GeomAlgoAPI_Box.h>
-#include <GeomAlgoAPI_BoxPoints.h>
 
 class GeomAPI_Shape;
 class ModelAPI_ResultBody;
@@ -33,46 +45,60 @@ class PrimitivesPlugin_Box : public ModelAPI_Feature
     return MY_BOX_ID;
   }
 
-  /// attribute name for creation method
-  inline static const std::string& METHOD()
+  /// Attribute name for creation method
+  inline static const std::string& CREATION_METHOD()
   {
-    static const std::string METHOD_ATTR("CreationMethod");
-    return METHOD_ATTR;
+    static const std::string MY_CREATION_METHOD_ID("CreationMethod");
+    return MY_CREATION_METHOD_ID;
   }
 
-  /// attribute name of first point
-  inline static const std::string& POINT_FIRST()
+  /// Attribute name for creation method
+  inline static const std::string& CREATION_METHOD_BY_DIMENSIONS()
   {
-    static const std::string MY_POINT_FIRST("FirstPoint");
-    return MY_POINT_FIRST;
+    static const std::string MY_CREATION_METHOD_ID("BoxByDimensions");
+    return MY_CREATION_METHOD_ID;
   }
 
-  /// attribute name of second point
-  inline static const std::string& POINT_SECOND()
+  /// Attribute name for creation method
+  inline static const std::string& CREATION_METHOD_BY_TWO_POINTS()
   {
-    static const std::string MY_POINT_SECOND("SecondPoint");
-    return MY_POINT_SECOND;
+    static const std::string MY_CREATION_METHOD_ID("BoxByTwoPoints");
+    return MY_CREATION_METHOD_ID;
   }
 
-  /// attribute first coordinate
-  inline static const std::string& DX()
+  /// Attribute name of first point
+  inline static const std::string& POINT_FIRST_ID()
   {
-    static const std::string MY_DX("dx");
-    return MY_DX;
+    static const std::string MY_POINT_FIRST_ID("FirstPoint");
+    return MY_POINT_FIRST_ID;
   }
 
-  /// attribute second coordinate
-  inline static const std::string& DY()
+  /// Attribute name of second point
+  inline static const std::string& POINT_SECOND_ID()
   {
-    static const std::string MY_DY("dy");
-    return MY_DY;
+    static const std::string MY_POINT_SECOND_ID("SecondPoint");
+    return MY_POINT_SECOND_ID;
   }
 
-  /// attribute third coordinate
-  inline static const std::string& DZ()
+  /// Attribute first coordinate
+  inline static const std::string& DX_ID()
   {
-    static const std::string MY_DZ("dz");
-    return MY_DZ;
+    static const std::string MY_DX_ID("dx");
+    return MY_DX_ID;
+  }
+
+  /// Attribute second coordinate
+  inline static const std::string& DY_ID()
+  {
+    static const std::string MY_DY_ID("dy");
+    return MY_DY_ID;
+  }
+
+  /// Attribute third coordinate
+  inline static const std::string& DZ_ID()
+  {
+    static const std::string MY_DZ_ID("dz");
+    return MY_DZ_ID;
   }
 
   /// Returns the kind of a feature
@@ -87,7 +113,7 @@ class PrimitivesPlugin_Box : public ModelAPI_Feature
 
   /// Request for initialization of data model of the feature: adding all attributes
   PRIMITIVESPLUGIN_EXPORT virtual void initAttributes();
-  
+
   /// Use plugin manager for features creation
   PrimitivesPlugin_Box();
 
@@ -98,7 +124,7 @@ class PrimitivesPlugin_Box : public ModelAPI_Feature
 
   ///Perform the creation of the box using two points defining a diagonal
   void createBoxByTwoPoints();
-  
+
   ///Perform the creation of the box using three cordinates
   void createBoxByDimensions();