X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=resources%2FGEOMCatalog.xml.in;h=b11b46048154173770f12b2c3e083fbe0672bc20;hb=fdcbb781324c4683d071f8a2546aa12bd63199e7;hp=bb07e4de7bc0efa9f4374a75348db0da0a32c8e3;hpb=aeddae77192d933be1aee8855d8f7c525878cad9;p=modules%2Fgeom.git

diff --git a/resources/GEOMCatalog.xml.in b/resources/GEOMCatalog.xml.in
index bb07e4de7..b11b46048 100644
--- a/resources/GEOMCatalog.xml.in
+++ b/resources/GEOMCatalog.xml.in
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='us-ascii' ?>
 <!--
-  Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+  Copyright (C) 2007-2015  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
@@ -33,6 +33,7 @@
   <!-- Geom data types  -->
   <type-list>
     <!-- From GEOM_Gen.idl -->
+    <objref name="CORBA/Object" id="" />
     <objref name="GEOM/GEOM_Gen" id="IDL:GEOM/GEOM_Gen:1.0" />
     <objref name="GEOM/GEOM_BaseObject" id="IDL:GEOM/GEOM_BaseObject:1.0" />
     <objref name="GEOM/GEOM_Object" id="IDL:GEOM/GEOM_Object:1.0">
@@ -135,7 +136,7 @@
       <member name="error" type="GEOM/ShapeErrorType" />
       <member name="incriminated" type="GEOM/ListOfLong" />
     </struct>
-    <sequence name="GEOM/ShapeError"  content="GEOM/ShapeErrors" />
+    <sequence name="GEOM/ShapeErrors"  content="GEOM/ShapeError" />
 
     <!-- From GEOM_Superv.idl -->
     <objref name="GEOM/GEOM_Superv"  id="IDL:GEOM/GEOM_Superv:1.0" />
@@ -875,7 +876,7 @@
               </inParameter>
               <inParameter>
                 <inParameter-name>theObject</inParameter-name>
-                <inParameter-type>Object</inParameter-type>
+                <inParameter-type>CORBA/Object</inParameter-type>
                 <inParameter-comment>unknown</inParameter-comment>
               </inParameter>
             </inParameter-list>
@@ -4283,6 +4284,28 @@
             </outParameter-list>
             <DataStream-list></DataStream-list>
           </component-service>
+          <component-service>
+            <service-name>MakeFaceWithConstraints</service-name>
+            <service-author>SALOME team</service-author>
+            <service-version>@SALOMEGEOM_VERSION@</service-version>
+            <service-comment>unknown</service-comment>
+            <service-by-default>0</service-by-default>
+            <inParameter-list>
+              <inParameter>
+                <inParameter-name>theConstraints</inParameter-name>
+                <inParameter-type>GEOM/GEOM_List</inParameter-type>
+                <inParameter-comment>unknown</inParameter-comment>
+              </inParameter>
+            </inParameter-list>
+            <outParameter-list>
+              <outParameter>
+                <outParameter-name>return</outParameter-name>
+                <outParameter-type>GEOM/GEOM_Object</outParameter-type>
+                <outParameter-comment>unknown</outParameter-comment>
+              </outParameter>
+            </outParameter-list>
+            <DataStream-list></DataStream-list>
+          </component-service>
           <component-service>
             <service-name>MakeSolidShell</service-name>
             <service-author>SALOME team</service-author>
@@ -4327,6 +4350,33 @@
             </outParameter-list>
             <DataStream-list></DataStream-list>
           </component-service>
+          <component-service>
+            <service-name>MakeSolidFromConnectedFaces</service-name>
+            <service-author>SALOME team</service-author>
+            <service-version>@SALOMEGEOM_VERSION@</service-version>
+            <service-comment>unknown</service-comment>
+            <service-by-default>0</service-by-default>
+            <inParameter-list>
+              <inParameter>
+                <inParameter-name>theFacesOrShells</inParameter-name>
+                <inParameter-type>GEOM/GEOM_List</inParameter-type>
+                <inParameter-comment>unknown</inParameter-comment>
+              </inParameter>
+              <inParameter>
+                <inParameter-name>isIntersect</inParameter-name>
+                <inParameter-type>boolean</inParameter-type>
+                <inParameter-comment>unknown</inParameter-comment>
+              </inParameter>
+            </inParameter-list>
+            <outParameter-list>
+              <outParameter>
+                <outParameter-name>return</outParameter-name>
+                <outParameter-type>GEOM/GEOM_Object</outParameter-type>
+                <outParameter-comment>unknown</outParameter-comment>
+              </outParameter>
+            </outParameter-list>
+            <DataStream-list></DataStream-list>
+          </component-service>
           <component-service>
             <service-name>MakeCompound</service-name>
             <service-author>SALOME team</service-author>