X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROPy%2FHYDROData_Document.sip;h=5b2e2e19bbee48164bed296a7f38840d6d88f159;hb=f58865bdfb548ebba53ecb264f17ef357fa4c409;hp=a53cada0558e1f1b900d7985d73a6702439293d2;hpb=3cff85424556651afcab2e7fa5081531d748b7cc;p=modules%2Fhydro.git

diff --git a/src/HYDROPy/HYDROData_Document.sip b/src/HYDROPy/HYDROData_Document.sip
index a53cada0..5b2e2e19 100644
--- a/src/HYDROPy/HYDROData_Document.sip
+++ b/src/HYDROPy/HYDROData_Document.sip
@@ -25,9 +25,9 @@
 %End
 
 %ModuleHeaderCode
-HYDROData_Object* copyObject( HYDROData_Object* theObject );
-Handle(HYDROData_Object) createHandle( HYDROData_Object* theObject );
-HYDROData_Object* createPointer( const Handle(HYDROData_Object)& theObject );
+HYDROData_Entity* copyObject( HYDROData_Entity* theObject );
+Handle(HYDROData_Entity) createHandle( HYDROData_Entity* theObject );
+HYDROData_Entity* createPointer( const Handle(HYDROData_Entity)& theObject );
 %End
 
 enum Data_DocError {
@@ -39,7 +39,7 @@ enum Data_DocError {
   DocError_UnknownProblem ///< problem has unknown nature
 };
 
-class HYDROData_Document
+class HYDROData_Document 
 {
 %TypeHeaderCode
 #include <HYDROData_Document.h>
@@ -54,9 +54,9 @@ class HYDROData_Document
 
 %TypeCode
 
-  HYDROData_Object* copyObject( HYDROData_Object* theObject )
+  HYDROData_Entity* copyObject( HYDROData_Entity* theObject )
   {
-    HYDROData_Object* aRes = NULL;
+    HYDROData_Entity* aRes = NULL;
     if ( theObject == NULL )
       return aRes;
 
@@ -69,7 +69,7 @@ class HYDROData_Document
       }
       case KIND_POLYLINE:
       {
-        aRes = new HYDROData_Polyline( *dynamic_cast<HYDROData_Polyline*>( theObject ) );
+        aRes = new HYDROData_Polyline3D( *dynamic_cast<HYDROData_Polyline3D*>( theObject ) );
         break;
       }
       case KIND_BATHYMETRY:
@@ -77,9 +77,69 @@ class HYDROData_Document
         aRes = new HYDROData_Bathymetry( *dynamic_cast<HYDROData_Bathymetry*>( theObject ) );
         break;
       }
+      case KIND_ALTITUDE:
+      {
+        aRes = new HYDROData_AltitudeObject( *dynamic_cast<HYDROData_AltitudeObject*>( theObject ) );
+        break;
+      }
+      case KIND_IMMERSIBLE_ZONE:
+      {
+        aRes = new HYDROData_ImmersibleZone( *dynamic_cast<HYDROData_ImmersibleZone*>( theObject ) );
+        break;
+      }
+      case KIND_RIVER:
+      {
+        aRes = new HYDROData_River( *dynamic_cast<HYDROData_River*>( theObject ) );
+        break;
+      }
+      case KIND_STREAM:
+      {
+        aRes = new HYDROData_Stream( *dynamic_cast<HYDROData_Stream*>( theObject ) );
+        break;
+      }
+      case KIND_CONFLUENCE:
+      {
+        aRes = new HYDROData_Confluence( *dynamic_cast<HYDROData_Confluence*>( theObject ) );
+        break;
+      }
+      case KIND_CHANNEL:
+      {
+        aRes = new HYDROData_Channel( *dynamic_cast<HYDROData_Channel*>( theObject ) );
+        break;
+      }
+      case KIND_OBSTACLE:
+      {
+        aRes = new HYDROData_Obstacle( *dynamic_cast<HYDROData_Obstacle*>( theObject ) );
+        break;
+      }
+      case KIND_DIGUE:
+      {
+        aRes = new HYDROData_Digue( *dynamic_cast<HYDROData_Digue*>( theObject ) );
+        break;
+      }
+      case KIND_PROFILE:
+      {
+        aRes = new HYDROData_Profile( *dynamic_cast<HYDROData_Profile*>( theObject ) );
+        break;
+      }
+      case KIND_PROFILEUZ:
+      {
+        aRes = new HYDROData_ProfileUZ( *dynamic_cast<HYDROData_ProfileUZ*>( theObject ) );
+        break;
+      }
+      case KIND_POLYLINEXY:
+      {
+        aRes = new HYDROData_PolylineXY( *dynamic_cast<HYDROData_PolylineXY*>( theObject ) );
+        break;
+      }
       case KIND_CALCULATION:
       {
-        aRes = new HYDROData_Calculation( *dynamic_cast<HYDROData_Calculation*>( theObject ) );
+        aRes = new HYDROData_CalculationCase( *dynamic_cast<HYDROData_CalculationCase*>( theObject ) );
+        break;
+      }
+      case KIND_REGION:
+      {
+        aRes = new HYDROData_Region( *dynamic_cast<HYDROData_Region*>( theObject ) );
         break;
       }
       case KIND_ZONE:
@@ -87,20 +147,35 @@ class HYDROData_Document
         aRes = new HYDROData_Zone( *dynamic_cast<HYDROData_Zone*>( theObject ) );
         break;
       }
+      case KIND_SHAPES_GROUP:
+      {
+        aRes = new HYDROData_ShapesGroup( *dynamic_cast<HYDROData_ShapesGroup*>( theObject ) );
+        break;
+      }
+      case KIND_SPLITTED_GROUP:
+      {
+        aRes = new HYDROData_SplittedShapesGroup( *dynamic_cast<HYDROData_SplittedShapesGroup*>( theObject ) );
+        break;
+      }
+      case KIND_OBSTACLE_ALTITUDE:
+      {
+        aRes = new HYDROData_ObstacleAltitude( *dynamic_cast<HYDROData_ObstacleAltitude*>( theObject ) );
+        break;
+      }
     }
     
     return aRes;
   }
   
-  Handle(HYDROData_Object) createHandle( HYDROData_Object* theObject )
+  Handle(HYDROData_Entity) createHandle( HYDROData_Entity* theObject )
   {
-    Handle(HYDROData_Object) aRes = copyObject( theObject );
+    Handle(HYDROData_Entity) aRes = copyObject( theObject );
     return aRes;
   }
   
-  HYDROData_Object* createPointer( const Handle(HYDROData_Object)& theObject )
+  HYDROData_Entity* createPointer( const Handle(HYDROData_Entity)& theObject )
   {
-    HYDROData_Object* aRes = NULL;
+    HYDROData_Entity* aRes = NULL;
     
     if ( !theObject.IsNull() )
       aRes = copyObject( theObject.operator->() );
@@ -187,10 +262,10 @@ public:
   //! Creates and locates in the document a new object
   //! \param theKind kind of the created object, can not be UNKNOWN
   //! \returns the created object
-  HYDROData_Object CreateObject( const ObjectKind theKind ) [Handle_HYDROData_Object (const ObjectKind)] ;
+  HYDROData_Entity CreateObject( const ObjectKind theKind ) [Handle_HYDROData_Entity (const ObjectKind)] ;
   %MethodCode
 
-    Handle(HYDROData_Object) anObject;
+    Handle(HYDROData_Entity) anObject;
     Py_BEGIN_ALLOW_THREADS
     anObject =  sipSelfWasArg ? sipCpp->HYDROData_Document::CreateObject( a0 ) :
                                 sipCpp->CreateObject( a0 );