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
Bug #478: unresolved conflicts appear again when Edit calculation case in Manual...
[modules/hydro.git]
/
src
/
HYDROPy
/
HYDROData_ArtificialObject.sip
diff --git
a/src/HYDROPy/HYDROData_ArtificialObject.sip
b/src/HYDROPy/HYDROData_ArtificialObject.sip
index 084f730c37570a1b3cd595560f70af74be888f5e..657e3c36204c897b49f01cb7437e9199bdc4e3ec 100644
(file)
--- a/
src/HYDROPy/HYDROData_ArtificialObject.sip
+++ b/
src/HYDROPy/HYDROData_ArtificialObject.sip
@@
-25,7
+25,7
@@
#include <HYDROData_ArtificialObject.h>
%End
#include <HYDROData_ArtificialObject.h>
%End
-class HYDROData_ArtificialObject : HYDROData_Object /Abstract/
+class HYDROData_ArtificialObject :
public
HYDROData_Object /Abstract/
{
%TypeHeaderCode
#include <HYDROData_ArtificialObject.h>
{
%TypeHeaderCode
#include <HYDROData_ArtificialObject.h>
@@
-39,11
+39,13
@@
class HYDROData_ArtificialObject : HYDROData_Object /Abstract/
sipClass = sipClass_HYDROData_Obstacle;
break;
sipClass = sipClass_HYDROData_Obstacle;
break;
+ case KIND_DIGUE:
+ sipClass = sipClass_HYDROData_Digue;
+ break;
+
case KIND_CHANNEL:
case KIND_CHANNEL:
- {
sipClass = sipClass_HYDROData_Channel;
break;
sipClass = sipClass_HYDROData_Channel;
break;
- }
case KIND_UNKNOWN:
sipClass = sipClass_HYDROData_ArtificialObject;
case KIND_UNKNOWN:
sipClass = sipClass_HYDROData_ArtificialObject;