Merge branch 'cadbld'

[modules/shaper.git] / src / FeaturesPlugin / FeaturesPlugin_Tools.h

diff --git a/src/FeaturesPlugin/FeaturesPlugin_Tools.h b/src/FeaturesPlugin/FeaturesPlugin_Tools.h
index 36ad73bdd053cbbdaf17b54bae6ae975ef5c01b0..306d00db8ecffe30164b59c82e30a07dff39f118 100644 (file)
--- a/src/FeaturesPlugin/FeaturesPlugin_Tools.h
+++ b/src/FeaturesPlugin/FeaturesPlugin_Tools.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2019  CEA/DEN, EDF R&D
+// 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
@@ -21,47 +21,26 @@
 #define FeaturesPlugin_Tools_H_
 
 #include <GeomAlgoAPI_MakeShape.h>
+#include <GeomAPI_ShapeHierarchy.h>
 #include <ModelAPI_ResultBody.h>
 
 #include <vector>
 
 class FeaturesPlugin_Tools {
 public:
-  struct ResultBaseAlgo {
-    ResultBodyPtr resultBody;
-    GeomShapePtr baseShape;
-    GeomMakeShapePtr makeShape;
-  };
-
-public:
-  static void loadModifiedShapes(ResultBodyPtr theResultBody,
-                                 const ListOfShape& theBaseShapes,
-                                 const ListOfShape& theTools,
-                                 const GeomMakeShapePtr& theMakeShape,
-                                 const GeomShapePtr theResultShape,
-                                 const std::string& theNamePrefix = "");
-
-  static void loadModifiedShapes(ResultBodyPtr theResultBody,
-                                 const GeomShapePtr& theBaseShape,
-                                 const GeomMakeShapePtr& theMakeShape,
-                                 const std::string theName);
-  /// Stores deleted shapes.
-  static void loadDeletedShapes(ResultBodyPtr theResultBody,
-                                const GeomShapePtr theBaseShape,
-                                const ListOfShape& theTools,
-                                const GeomMakeShapePtr& theMakeShape,
-                                const GeomShapePtr theResultShapesCompound);
-
-  /// Stores deleted shapes.
-  static void loadDeletedShapes(std::vector<ResultBaseAlgo>& theResultBaseAlgoList,
-                                const ListOfShape& theTools,
-                                const GeomShapePtr theResultShapesCompound);
-
   /// Obtain shapes from the selection list attribute.
   static bool getShape(const std::shared_ptr<ModelAPI_AttributeSelectionList> theSelectionList,
                        const bool theShareTopology,
                        ListOfShape& theShapesList,
                        std::string& theError);
+
+  /// Collect shapes from the attribute and fill the hierarchy or a list of parts
+  static bool shapesFromSelectionList(
+      const std::shared_ptr<ModelAPI_AttributeSelectionList> theSelectionList,
+      const bool theStoreFullHierarchy,
+      GeomAPI_ShapeHierarchy& theHierarchy,
+      std::list<ResultPtr>& theParts,
+      ResultPtr& theTextureSource);
 };
 
 #endif /* FeaturesPlugin_Tools_H_ */