X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROPy%2FHYDROData_Document.sip;h=6aeddf8904d4232e2341258c9fa69ac951452742;hb=6450e251d00e2beaa02e0de026b0f1af2b948a0e;hp=e3b416f1aa51c2daa00f0cba46fdeb2c89dca6c1;hpb=adc4a589f37f55b01ab917954d195d7c325bdba3;p=modules%2Fhydro.git

diff --git a/src/HYDROPy/HYDROData_Document.sip b/src/HYDROPy/HYDROData_Document.sip
index e3b416f1..6aeddf89 100644
--- a/src/HYDROPy/HYDROData_Document.sip
+++ b/src/HYDROPy/HYDROData_Document.sip
@@ -67,6 +67,11 @@ class HYDROData_Document
         aRes = new HYDROData_Image( *dynamic_cast<HYDROData_Image*>( theObject ) );
         break;
       }
+      case KIND_POLYLINE:
+      {
+        aRes = new HYDROData_Polyline3D( *dynamic_cast<HYDROData_Polyline3D*>( theObject ) );
+        break;
+      }
       case KIND_BATHYMETRY:
       {
         aRes = new HYDROData_Bathymetry( *dynamic_cast<HYDROData_Bathymetry*>( theObject ) );
@@ -77,19 +82,39 @@ class HYDROData_Document
         aRes = new HYDROData_AltitudeObject( *dynamic_cast<HYDROData_AltitudeObject*>( theObject ) );
         break;
       }
-      case KIND_OBSTACLE_ALTITUDE:
+      case KIND_IMMERSIBLE_ZONE:
       {
-        aRes = new HYDROData_ObstacleAltitude( *dynamic_cast<HYDROData_ObstacleAltitude*>( theObject ) );
+        aRes = new HYDROData_ImmersibleZone( *dynamic_cast<HYDROData_ImmersibleZone*>( theObject ) );
         break;
       }
-      case KIND_IMMERSIBLE_ZONE:
+      case KIND_RIVER:
       {
-        aRes = new HYDROData_ImmersibleZone( *dynamic_cast<HYDROData_ImmersibleZone*>( theObject ) );
+        aRes = new HYDROData_River( *dynamic_cast<HYDROData_River*>( theObject ) );
         break;
       }
-      case KIND_POLYLINE:
+      case KIND_STREAM:
       {
-        aRes = new HYDROData_Polyline3D( *dynamic_cast<HYDROData_Polyline3D*>( theObject ) );
+        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:
@@ -112,11 +137,6 @@ class HYDROData_Document
         aRes = new HYDROData_CalculationCase( *dynamic_cast<HYDROData_CalculationCase*>( theObject ) );
         break;
       }
-      case KIND_OBSTACLE:
-      {
-        aRes = new HYDROData_Obstacle( *dynamic_cast<HYDROData_Obstacle*>( theObject ) );
-        break;
-      }
       case KIND_REGION:
       {
         aRes = new HYDROData_Region( *dynamic_cast<HYDROData_Region*>( theObject ) );
@@ -127,19 +147,19 @@ class HYDROData_Document
         aRes = new HYDROData_Zone( *dynamic_cast<HYDROData_Zone*>( theObject ) );
         break;
       }
-      case KIND_DIGUE:
+      case KIND_SHAPES_GROUP:
       {
-        aRes = new HYDROData_Digue( *dynamic_cast<HYDROData_Digue*>( theObject ) );
+        aRes = new HYDROData_ShapesGroup( *dynamic_cast<HYDROData_ShapesGroup*>( theObject ) );
         break;
       }
-      case KIND_CHANNEL:
+      case KIND_SPLITTED_GROUP:
       {
-        aRes = new HYDROData_Channel( *dynamic_cast<HYDROData_Channel*>( theObject ) );
+        aRes = new HYDROData_SplittedShapesGroup( *dynamic_cast<HYDROData_SplittedShapesGroup*>( theObject ) );
         break;
       }
-      case KIND_STREAM:
+      case KIND_OBSTACLE_ALTITUDE:
       {
-        aRes = new HYDROData_Stream( *dynamic_cast<HYDROData_Stream*>( theObject ) );
+        aRes = new HYDROData_ObstacleAltitude( *dynamic_cast<HYDROData_ObstacleAltitude*>( theObject ) );
         break;
       }
     }
@@ -255,6 +275,24 @@ public:
     
   %End
 
+  HYDROData_Entity FindObjectByName( const QString&   theName,
+                                     const ObjectKind theKind = KIND_UNKNOWN ) 
+  [Handle_HYDROData_Entity (const QString&, const ObjectKind)] ;
+  %MethodCode
+
+    Handle(HYDROData_Entity) anObject;
+    Py_BEGIN_ALLOW_THREADS
+    anObject =  sipSelfWasArg ? sipCpp->HYDROData_Document::FindObjectByName( *a0, a1 ) :
+                                sipCpp->FindObjectByName( *a0, a1 );
+    Py_END_ALLOW_THREADS
+
+    sipRes = createPointer( anObject );
+    
+  %End
+
+  HYDROData_SequenceOfObjects FindObjectsByNames( const QStringList& theNames,
+                                                  const ObjectKind   theKind = KIND_UNKNOWN );
+
 protected:
 
   //! Creates new document: private because "Document" method must be used instead of direct creation.