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
updated copyright message
[modules/shaper.git]
/
src
/
ModelAPI
/
ModelAPI_Object.h
diff --git
a/src/ModelAPI/ModelAPI_Object.h
b/src/ModelAPI/ModelAPI_Object.h
index 1f09fb2becbbd7805c565e2e895bc18a628a21dc..46c3f34f86373d2c2e39a169b6538ae3a842dcab 100644
(file)
--- a/
src/ModelAPI/ModelAPI_Object.h
+++ b/
src/ModelAPI/ModelAPI_Object.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2014-20
17 CEA/DEN, EDF R&D
+// Copyright (C) 2014-20
23 CEA, EDF
//
// 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 ModelAPI_Object_H_
//
#ifndef ModelAPI_Object_H_
@@
-30,7
+29,7
@@
class ModelAPI_Data;
class ModelAPI_Document;
class ModelAPI_Data;
class ModelAPI_Document;
-// sometimes it is useful
l
for debug to see name of each object (bad for memory and performance)
+// sometimes it is useful for debug to see name of each object (bad for memory and performance)
//#define DEBUG_NAMES
/**\class ModelAPI_Object
//#define DEBUG_NAMES
/**\class ModelAPI_Object
@@
-48,7
+47,7
@@
class ModelAPI_Object: public ModelAPI_Entity
std::shared_ptr<ModelAPI_Document> myDoc; ///< document this object belongs to
public:
#ifdef DEBUG_NAMES
std::shared_ptr<ModelAPI_Document> myDoc; ///< document this object belongs to
public:
#ifdef DEBUG_NAMES
- std::string myName; // name of this object
+ std::
w
string myName; // name of this object
#endif
/// By default object is displayed in the object browser.
MODELAPI_EXPORT virtual bool isInHistory();
#endif
/// By default object is displayed in the object browser.
MODELAPI_EXPORT virtual bool isInHistory();
@@
-78,8
+77,9
@@
class ModelAPI_Object: public ModelAPI_Entity
virtual bool isDisabled() = 0;
/// Returns the parameters of color definition in the resources config manager
virtual bool isDisabled() = 0;
/// Returns the parameters of color definition in the resources config manager
- virtual void colorConfigInfo(std::string& theSection, std::string& theName,
- std::string& theDefault) {}
+ virtual void colorConfigInfo(std::string& /*theSection*/,
+ std::string& /*theName*/,
+ std::string& /*theDefault*/) {}
/// Called on change of any argument-attribute of this object
/// \param theID identifier of changed attribute
/// Called on change of any argument-attribute of this object
/// \param theID identifier of changed attribute
@@
-100,6
+100,11
@@
class ModelAPI_Object: public ModelAPI_Entity
/// signal.
MODELAPI_EXPORT virtual void setDisplayed(const bool theDisplay);
/// signal.
MODELAPI_EXPORT virtual void setDisplayed(const bool theDisplay);
+ MODELAPI_EXPORT virtual bool hasTexture()
+ {
+ return false;
+ }
+
protected:
/// This method is called just after creation of the object: it must initialize
/// all fields, normally initialized in the constructor
protected:
/// This method is called just after creation of the object: it must initialize
/// all fields, normally initialized in the constructor
@@
-115,6
+120,7
@@
class ModelAPI_Object: public ModelAPI_Entity
MODELAPI_EXPORT virtual void erase();
friend class Model_Objects;
MODELAPI_EXPORT virtual void erase();
friend class Model_Objects;
+ friend class ModelAPI_Feature;
friend class Model_Document;
};
friend class Model_Document;
};