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
Correction for hydro_test
[modules/hydro.git]
/
src
/
HYDROPy
/
HYDROData_ArtificialObject.sip
diff --git
a/src/HYDROPy/HYDROData_ArtificialObject.sip
b/src/HYDROPy/HYDROData_ArtificialObject.sip
index dc301f893749318b2605a00d51230edaea0f7549..0720b6c32ca06d90bf4836a8bab71bee00bed1b6 100644
(file)
--- a/
src/HYDROPy/HYDROData_ArtificialObject.sip
+++ b/
src/HYDROPy/HYDROData_ArtificialObject.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
@@
-20,12
+16,11
@@
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
-
%ExportedHeaderCode
#include <HYDROData_ArtificialObject.h>
%End
%ExportedHeaderCode
#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>
@@
-35,6
+30,18
@@
class HYDROData_ArtificialObject : HYDROData_Object /Abstract/
// HYDROData_ArtificialObject sub-classes provide a unique kind ID.
switch ( sipCpp->GetKind() )
{
// HYDROData_ArtificialObject sub-classes provide a unique kind ID.
switch ( sipCpp->GetKind() )
{
+ case KIND_OBSTACLE:
+ sipClass = sipClass_HYDROData_Obstacle;
+ break;
+
+ case KIND_DIGUE:
+ sipClass = sipClass_HYDROData_Digue;
+ break;
+
+ case KIND_CHANNEL:
+ sipClass = sipClass_HYDROData_Channel;
+ break;
+
case KIND_UNKNOWN:
sipClass = sipClass_HYDROData_ArtificialObject;
break;
case KIND_UNKNOWN:
sipClass = sipClass_HYDROData_ArtificialObject;
break;
@@
-45,20
+52,7
@@
class HYDROData_ArtificialObject : HYDROData_Object /Abstract/
}
%End
}
%End
-public:
-
-
protected:
protected:
-
- /**
- * Creates new object in the internal data structure. Use higher level objects
- * to create objects with real content.
- */
HYDROData_ArtificialObject();
HYDROData_ArtificialObject();
-
- /**
- * Destructs properties of the object and object itself, removes it from the document.
- */
virtual ~HYDROData_ArtificialObject();
virtual ~HYDROData_ArtificialObject();
-
};
};