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 branch 'BR_v14_rc' into BR_quadtree
[modules/hydro.git]
/
src
/
HYDROPy
/
HYDROData_Obstacle.sip
diff --git
a/src/HYDROPy/HYDROData_Obstacle.sip
b/src/HYDROPy/HYDROData_Obstacle.sip
index d7d4211f70eb9d7330e6395581b1789116fa4b7a..f480fc9348bf8b064c8699046bb82eb6bc134592 100644
(file)
--- a/
src/HYDROPy/HYDROData_Obstacle.sip
+++ b/
src/HYDROPy/HYDROData_Obstacle.sip
@@
-1,12
+1,8
@@
-// Copyright (C) 2007-2013 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
-// version 2.1 of the License.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-31,16
+27,6
@@
class HYDROData_Obstacle : public HYDROData_ArtificialObject
%End
public:
%End
public:
- /**
- * Returns the top shape of the object.
- */
-// virtual TopoDS_Shape GetTopShape() const;
-
- /**
- * Returns the 3d shape of the object.
- */
-// virtual TopoDS_Shape GetShape3D() const;
-
/**
* Returns default filling color for new obstacle.
*/
/**
* Returns default filling color for new obstacle.
*/
@@
-51,12
+37,6
@@
public:
*/
static QColor DefaultBorderColor();
*/
static QColor DefaultBorderColor();
-
- /**
- * Sets the 3d shape of the object.
- */
-// virtual void SetShape3D( const TopoDS_Shape& theShape );
-
public:
/**
public:
/**
@@
-72,6
+52,7
@@
public:
*/
bool ImportFromFile( const QString& theFilePath );
*/
bool ImportFromFile( const QString& theFilePath );
+
/**
* Stores the file path of the imported file.
* \param theFilePath file path
/**
* Stores the file path of the imported file.
* \param theFilePath file path
@@
-83,16
+64,35
@@
public:
*/
QString GetFilePath() const;
*/
QString GetFilePath() const;
- /**
+
+public:
+
+ /**
+ * Imports shape from IOR.
+ * \param theIOR the IOR of Geom object
+ * \return \c true if shape has been successfully imported
+ */
+ bool ImportFromGeomIOR( const TCollection_AsciiString& theIOR );
+
+ /**
* Stores the study entry of the imported GEOM object.
* \param theEntry GEOM object entry
*/
* Stores the study entry of the imported GEOM object.
* \param theEntry GEOM object entry
*/
- void SetGeomObjectEntry(
const QString& theEntry
);
+ void SetGeomObjectEntry(
const TCollection_AsciiString& theEntry
);
/**
* Returns the imported GEOM object entry.
*/
/**
* Returns the imported GEOM object entry.
*/
- QString GetGeomObjectEntry() const;
+ TCollection_AsciiString GetGeomObjectEntry() const;
+
+
+public:
+
+ /**
+ * Translate the obstacle to the given distance.
+ */
+ void Translate( const double theDx, const double theDy, const double theDz );
+
protected:
protected: