X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2FFeaturesPlugin_Plugin.cpp;h=4f5d35f36dc2ec2f95526741b5ad2acab4c56a7d;hb=97917d3698f5a2f7fc9596e7c755ff8f6751e373;hp=b9760dc07027ad7c55a7d4a85171ae343ad62659;hpb=f6db3a394a95373c94a9680ac5f963b2928e1c48;p=modules%2Fshaper.git

diff --git a/src/FeaturesPlugin/FeaturesPlugin_Plugin.cpp b/src/FeaturesPlugin/FeaturesPlugin_Plugin.cpp
index b9760dc07..4f5d35f36 100644
--- a/src/FeaturesPlugin/FeaturesPlugin_Plugin.cpp
+++ b/src/FeaturesPlugin/FeaturesPlugin_Plugin.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2017  CEA/DEN, EDF R&D
+// 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
@@ -12,20 +12,24 @@
 //
 // 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
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-// See http://www.salome-platform.org/ or
-// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
 #include <FeaturesPlugin_Plugin.h>
 
-#include <FeaturesPlugin_Boolean.h>
+#include <FeaturesPlugin_BooleanCut.h>
+#include <FeaturesPlugin_BooleanFuse.h>
+#include <FeaturesPlugin_BooleanCommon.h>
+#include <FeaturesPlugin_BooleanSmash.h>
+#include <FeaturesPlugin_BooleanFill.h>
 #include <FeaturesPlugin_Extrusion.h>
 #include <FeaturesPlugin_ExtrusionCut.h>
 #include <FeaturesPlugin_ExtrusionFuse.h>
 #include <FeaturesPlugin_Fillet.h>
 #include <FeaturesPlugin_Intersection.h>
+#include <FeaturesPlugin_Measurement.h>
 #include <FeaturesPlugin_MultiRotation.h>
 #include <FeaturesPlugin_MultiTranslation.h>
 #include <FeaturesPlugin_Partition.h>
@@ -41,6 +45,7 @@
 #include <FeaturesPlugin_Symmetry.h>
 #include <FeaturesPlugin_Translation.h>
 #include <FeaturesPlugin_Union.h>
+#include <FeaturesPlugin_FusionFaces.h>
 #include <FeaturesPlugin_ValidatorTransform.h>
 #include <FeaturesPlugin_Validators.h>
 
@@ -67,6 +72,8 @@ FeaturesPlugin_Plugin::FeaturesPlugin_Plugin()
                               new FeaturesPlugin_ValidatorBaseForGenerationSketchOrSketchObjects);
   aFactory->registerValidator("FeaturesPlugin_ValidatorPipeLocations",
                               new FeaturesPlugin_ValidatorPipeLocations);
+  aFactory->registerValidator("FeaturesPlugin_ValidatorPipeLocationsNumber",
+                              new FeaturesPlugin_ValidatorPipeLocationsNumber);
   aFactory->registerValidator("FeaturesPlugin_ValidatorExtrusionDir",
                               new FeaturesPlugin_ValidatorExtrusionDir);
   aFactory->registerValidator("FeaturesPlugin_ValidatorBooleanSelection",
@@ -87,6 +94,22 @@ FeaturesPlugin_Plugin::FeaturesPlugin_Plugin()
                               new FeaturesPlugin_ValidatorConcealedResult);
   aFactory->registerValidator("FeaturesPlugin_ValidatorFilletSelection",
                               new FeaturesPlugin_ValidatorFilletSelection);
+  aFactory->registerValidator("FeaturesPlugin_ValidatorCircular",
+                              new FeaturesPlugin_ValidatorCircular);
+  aFactory->registerValidator("FeaturesPlugin_ValidatorBooleanArguments",
+                              new FeaturesPlugin_ValidatorBooleanArguments);
+  aFactory->registerValidator("FeaturesPlugin_ValidatorBooleanSmashSelection",
+                              new FeaturesPlugin_ValidatorBooleanSmashSelection);
+  aFactory->registerValidator("FeaturesPlugin_IntersectionSelection",
+                              new FeaturesPlugin_IntersectionSelection);
+  aFactory->registerValidator("FeaturesPlugin_ValidatorBooleanFuseSelection",
+                              new FeaturesPlugin_ValidatorBooleanFuseSelection);
+  aFactory->registerValidator("FeaturesPlugin_ValidatorBooleanFuseArguments",
+                              new FeaturesPlugin_ValidatorBooleanFuseArguments);
+  aFactory->registerValidator("FeaturesPlugin_ValidatorBooleanCommonSelection",
+                              new FeaturesPlugin_ValidatorBooleanCommonSelection);
+  aFactory->registerValidator("FeaturesPlugin_ValidatorBooleanCommonArguments",
+                              new FeaturesPlugin_ValidatorBooleanCommonArguments);
 
   // register this plugin
   ModelAPI_Session::get()->registerPlugin(this);
@@ -102,8 +125,16 @@ FeaturePtr FeaturesPlugin_Plugin::createFeature(std::string theFeatureID)
     return FeaturePtr(new FeaturesPlugin_Rotation);
   } else if (theFeatureID == FeaturesPlugin_Translation::ID()) {
     return FeaturePtr(new FeaturesPlugin_Translation);
-  } else if (theFeatureID == FeaturesPlugin_Boolean::ID()) {
-    return FeaturePtr(new FeaturesPlugin_Boolean);
+  } else if (theFeatureID == FeaturesPlugin_BooleanCut::ID()) {
+    return FeaturePtr(new FeaturesPlugin_BooleanCut);
+  } else if (theFeatureID == FeaturesPlugin_BooleanFuse::ID()) {
+    return FeaturePtr(new FeaturesPlugin_BooleanFuse);
+  } else if (theFeatureID == FeaturesPlugin_BooleanCommon::ID()) {
+    return FeaturePtr(new FeaturesPlugin_BooleanCommon);
+  } else if (theFeatureID == FeaturesPlugin_BooleanSmash::ID()) {
+    return FeaturePtr(new FeaturesPlugin_BooleanSmash);
+  } else if (theFeatureID == FeaturesPlugin_BooleanFill::ID()) {
+    return FeaturePtr(new FeaturesPlugin_BooleanFill);
   } else if (theFeatureID == FeaturesPlugin_Intersection::ID()) {
     return FeaturePtr(new FeaturesPlugin_Intersection);
   } else if (theFeatureID == FeaturesPlugin_Partition::ID()) {
@@ -126,6 +157,8 @@ FeaturePtr FeaturesPlugin_Plugin::createFeature(std::string theFeatureID)
     return FeaturePtr(new FeaturesPlugin_RemoveSubShapes);
   } else if (theFeatureID == FeaturesPlugin_Union::ID()) {
     return FeaturePtr(new FeaturesPlugin_Union);
+  } else if (theFeatureID == FeaturesPlugin_FusionFaces::ID()) {
+    return FeaturePtr(new FeaturesPlugin_FusionFaces);
   } else if (theFeatureID == FeaturesPlugin_Symmetry::ID()) {
     return FeaturePtr(new FeaturesPlugin_Symmetry);
   } else if (theFeatureID == FeaturesPlugin_Scale::ID()) {
@@ -136,6 +169,8 @@ FeaturePtr FeaturesPlugin_Plugin::createFeature(std::string theFeatureID)
     return FeaturePtr(new FeaturesPlugin_MultiRotation);
   } else if (theFeatureID == FeaturesPlugin_Fillet::ID()) {
     return FeaturePtr(new FeaturesPlugin_Fillet);
+  } else if (theFeatureID == FeaturesPlugin_Measurement::ID()) {
+    return FeaturePtr(new FeaturesPlugin_Measurement);
   }
 
   // feature of such kind is not found