Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/BR_DEMO' into BR_2017
[modules/hydro.git]
/
src
/
HYDROData
/
HYDROData_Region.h
diff --git
a/src/HYDROData/HYDROData_Region.h
b/src/HYDROData/HYDROData_Region.h
index 6823cbda658d33d89f2fd78717f2b03279aabee7..205e546ef97bfdf1f214a25c0e5209b2f5be87c1 100644
(file)
--- a/
src/HYDROData/HYDROData_Region.h
+++ b/
src/HYDROData/HYDROData_Region.h
@@
-1,8
+1,4
@@
-// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// Copyright (C) 2014-2015 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
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
@@
-26,10
+22,8
@@
#include "HYDROData_ShapesGroup.h"
#include "HYDROData_ShapesGroup.h"
-DEFINE_STANDARD_HANDLE(HYDROData_Region, HYDROData_Entity)
-
-class Handle(HYDROData_Zone);
-class Handle(HYDROData_Document);
+class HYDROData_Zone;
+class HYDROData_Document;
class TopoDS_Shape;
class TopoDS_Face;
class QStringList;
class TopoDS_Shape;
class TopoDS_Face;
class QStringList;
@@
-39,9
+33,7
@@
class QStringList;
*/
class HYDROData_Region : public HYDROData_Entity
{
*/
class HYDROData_Region : public HYDROData_Entity
{
-
protected:
protected:
-
/**
* Enumeration of tags corresponding to the persistent object parameters.
*/
/**
* Enumeration of tags corresponding to the persistent object parameters.
*/
@@
-53,7
+45,7
@@
protected:
};
public:
};
public:
- DEFINE_STANDARD_RTTI
(HYDROData_Region
);
+ DEFINE_STANDARD_RTTI
EXT(HYDROData_Region, HYDROData_Entity
);
/**
* Returns the kind of this object. Must be redefined in all objects of known type.
/**
* Returns the kind of this object. Must be redefined in all objects of known type.
@@
-63,7
+55,9
@@
public:
/**
* Dump object to Python script representation.
*/
/**
* Dump object to Python script representation.
*/
- HYDRODATA_EXPORT virtual QStringList DumpToPython( MapOfTreatedObjects& theTreatedObjects ) const;
+ HYDRODATA_EXPORT virtual QStringList DumpToPython( const QString& thePyScriptPath,
+ MapOfTreatedObjects& theTreatedObjects,
+ QString defRegName = QString()) const;
/**
* Returns flag indicating that object is updateble or not.
/**
* Returns flag indicating that object is updateble or not.
@@
-116,7
+110,10
@@
public:
* - a shell if the zones faces can't be united into one face
* \return shape as TopoDS_Shape
*/
* - a shell if the zones faces can't be united into one face
* \return shape as TopoDS_Shape
*/
- HYDRODATA_EXPORT virtual TopoDS_Shape GetShape( HYDROData_ShapesGroup::SeqOfGroupsDefs* theSeqOfGroups = 0 ) const;
+ HYDRODATA_EXPORT virtual TopoDS_Shape GetShape( HYDROData_ShapesGroup::SeqOfGroupsDefs* theSeqOfGroups = 0,
+ const TopTools_SequenceOfShape* IntSh = NULL ) const;
+
+ HYDRODATA_EXPORT bool IsSubmersible() const;
protected:
protected: