updated copyright message

[modules/shaper.git] / src / Model / Model_Objects.h

diff --git a/src/Model/Model_Objects.h b/src/Model/Model_Objects.h
index e44023208fb1ee7df2c9075a6e815ad10e1cda06..627d3900ee668405a94754a3d260cccf74c7f66b 100644 (file)
--- a/src/Model/Model_Objects.h
+++ b/src/Model/Model_Objects.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2020  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2023  CEA, EDF
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -27,7 +27,6 @@
 #include <ModelAPI_Result.h>
 #include <ModelAPI_ResultParameter.h>
 
-#include <TDocStd_Document.hxx>
 #include <NCollection_DataMap.hxx>
 #include <TDF_Label.hxx>
 #include <TDF_LabelList.hxx>
@@ -35,10 +34,6 @@
 #include <set>
 #include <vector>
 
-// for TDF_Label map usage
-static Standard_Integer HashCode(const TDF_Label& theLab, const Standard_Integer theUpper);
-static Standard_Boolean IsEqual(const TDF_Label& theLab1, const TDF_Label& theLab2);
-
 extern int kUNDEFINED_FEATURE_INDEX;
 
 /**\class Model_Objects
@@ -84,10 +79,10 @@ class Model_Objects
   //! \param theName name of the object to search
   //! \returns null if such object is not found
   std::shared_ptr<ModelAPI_Object> objectByName(
-    const std::string& theGroupID, const std::string& theName);
+    const std::string& theGroupID, const std::wstring& theName);
 
   //! Returns the result by the result name
-  ResultPtr findByName(const std::string theName);
+  ResultPtr findByName(const std::wstring theName);
 
 
   //! Returns the object index in the group. Object must be visible. Otherwise returns -1.
@@ -128,7 +123,8 @@ class Model_Objects
       const std::shared_ptr<ModelAPI_Data>& theFeatureData, const int theIndex = 0);
   /// Creates a body result
   std::shared_ptr<ModelAPI_ResultBody> createBody(
-      const std::shared_ptr<ModelAPI_Data>& theFeatureData, const int theIndex = 0);
+      const std::shared_ptr<ModelAPI_Data>& theFeatureData, const int theIndex = 0,
+      const std::wstring& theNameShape = L"");
   /// Creates a part result
   std::shared_ptr<ModelAPI_ResultPart> createPart(
       const std::shared_ptr<ModelAPI_Data>& theFeatureData, const int theIndex = 0);
@@ -192,7 +188,7 @@ class Model_Objects
   DocumentPtr owner() {return myDoc;}
 
   //! Deletes all managed features with emitting of corresponded signal
-  ~Model_Objects();
+  virtual ~Model_Objects();
 
  protected:
 
@@ -228,7 +224,8 @@ class Model_Objects
   //! (attaches 'data' of result to tree)
   void storeResult(std::shared_ptr<ModelAPI_Data> theFeatureData,
                    std::shared_ptr<ModelAPI_Result> theResult,
-                   const int theResultIndex = 0);
+                   const int theResultIndex = 0,
+                   const std::wstring& theNameShape = L"");
 
   //! returns the label of result by index; creates this label if it was not created before
   TDF_Label resultLabel(const std::shared_ptr<ModelAPI_Data>& theFeatureData,
@@ -291,7 +288,7 @@ class Model_Objects
   bool hasCustomName(DataPtr theFeatureData,
                      ResultPtr theResult,
                      int theResultIndex,
-                     std::string& theParentName) const;
+                     std::wstring& theParentName) const;
 
   /// Return object representing a folder or empty pointer
   const ObjectPtr& folder(TDF_Label theLabel) const;