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
Merge branch 'mbs/32757' of https://codev-tuleap.cea.fr/plugins/git/salome/shaper...
[modules/shaper.git]
/
src
/
ModelAPI
/
ModelAPI_Document.h
diff --git
a/src/ModelAPI/ModelAPI_Document.h
b/src/ModelAPI/ModelAPI_Document.h
index 101910fc62aeb06dbfb2dcb5a79363409624c75f..a5ad181f06e2d1387d02f4e10ff4529c6e7b4302 100644
(file)
--- a/
src/ModelAPI/ModelAPI_Document.h
+++ b/
src/ModelAPI/ModelAPI_Document.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2014-20
19
CEA/DEN, EDF R&D
+// Copyright (C) 2014-20
22
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
@@
-81,7
+81,8
@@
public:
//! Moves the feature to make it after the given one in the history.
virtual void moveFeature(std::shared_ptr<ModelAPI_Feature> theMoved,
//! Moves the feature to make it after the given one in the history.
virtual void moveFeature(std::shared_ptr<ModelAPI_Feature> theMoved,
- std::shared_ptr<ModelAPI_Feature> theAfterThis) = 0;
+ std::shared_ptr<ModelAPI_Feature> theAfterThis,
+ const bool theSplit = false) = 0;
///! Returns the id of the document
virtual const int id() const = 0;
///! Returns the id of the document
virtual const int id() const = 0;
@@
-99,7
+100,7
@@
public:
//! \param theName name of the object to search
//! \returns null if such object is not found
virtual std::shared_ptr<ModelAPI_Object> objectByName(const std::string& theGroupID,
//! \param theName name of the object to search
//! \returns null if such object is not found
virtual std::shared_ptr<ModelAPI_Object> objectByName(const std::string& theGroupID,
- const std::string& theName) = 0;
+ const std::
w
string& theName) = 0;
//! Returns the object index in the group. Object must be visible. Otherwise returns -1.
//! \param theObject object of this document
//! Returns the object index in the group. Object must be visible. Otherwise returns -1.
//! \param theObject object of this document
@@
-262,8
+263,13
@@
public:
/// Loads the OCAF document from the file into the current document.
/// All the features are added after the active feature.
/// \param theFileName name of the file to import
/// Loads the OCAF document from the file into the current document.
/// All the features are added after the active feature.
/// \param theFileName name of the file to import
+ /// \param theImported list of features imported from the file
+ /// \param theCheckOnly verify the document does not contain unappropriate features
+ /// (useful for import to PartSet), but do not import it
/// \returns true if file was loaded successfully
/// \returns true if file was loaded successfully
- MODELAPI_EXPORT virtual bool import(const char* theFileName) = 0;
+ MODELAPI_EXPORT virtual bool importPart(const char* theFileName,
+ std::list<std::shared_ptr<ModelAPI_Feature> >& theImported,
+ bool theCheckOnly = false) = 0;
/// Export the list of features to the file
/// \param theFilename path to save the file
/// Export the list of features to the file
/// \param theFilename path to save the file