Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bos #26374 Merge branch 'CR26374'
[modules/shaper.git]
/
src
/
Model
/
Model_Objects.h
diff --git
a/src/Model/Model_Objects.h
b/src/Model/Model_Objects.h
index 64afceda8e6cd82d5b4f15c963c3e03d76288b6c..a598b303347daf3e945572fc6f4554cde083de97 100644
(file)
--- a/
src/Model/Model_Objects.h
+++ b/
src/Model/Model_Objects.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2014-20
17
CEA/DEN, EDF R&D
+// Copyright (C) 2014-20
21
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
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@
-12,10
+12,9
@@
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
//
// 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
//
#ifndef Model_Objects_H_
//
#ifndef Model_Objects_H_
@@
-28,7
+27,6
@@
#include <ModelAPI_Result.h>
#include <ModelAPI_ResultParameter.h>
#include <ModelAPI_Result.h>
#include <ModelAPI_ResultParameter.h>
-#include <TDocStd_Document.hxx>
#include <NCollection_DataMap.hxx>
#include <TDF_Label.hxx>
#include <TDF_LabelList.hxx>
#include <NCollection_DataMap.hxx>
#include <TDF_Label.hxx>
#include <TDF_LabelList.hxx>
@@
-36,10
+34,6
@@
#include <set>
#include <vector>
#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
extern int kUNDEFINED_FEATURE_INDEX;
/**\class Model_Objects
@@
-85,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(
//! \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::
w
string& theName);
//! Returns the result by the result name
//! Returns the result by the result name
- ResultPtr findByName(const std::string theName);
+ ResultPtr findByName(const std::
w
string theName);
//! Returns the object index in the group. Object must be visible. Otherwise returns -1.
//! Returns the object index in the group. Object must be visible. Otherwise returns -1.
@@
-129,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);
/// 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);
/// Creates a part result
std::shared_ptr<ModelAPI_ResultPart> createPart(
const std::shared_ptr<ModelAPI_Data>& theFeatureData, const int theIndex = 0);
@@
-193,7
+188,7
@@
class Model_Objects
DocumentPtr owner() {return myDoc;}
//! Deletes all managed features with emitting of corresponded signal
DocumentPtr owner() {return myDoc;}
//! Deletes all managed features with emitting of corresponded signal
- ~Model_Objects();
+
virtual
~Model_Objects();
protected:
protected:
@@
-229,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,
//! (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,
//! 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,
@@
-292,7
+288,7
@@
class Model_Objects
bool hasCustomName(DataPtr theFeatureData,
ResultPtr theResult,
int theResultIndex,
bool hasCustomName(DataPtr theFeatureData,
ResultPtr theResult,
int theResultIndex,
- std::string& theParentName) const;
+ std::
w
string& theParentName) const;
/// Return object representing a folder or empty pointer
const ObjectPtr& folder(TDF_Label theLabel) const;
/// Return object representing a folder or empty pointer
const ObjectPtr& folder(TDF_Label theLabel) const;