Merge with version on tag OCC-V2_1_0d

diff --git a/doc/salome/tui/MED/HTML/MED.html b/doc/salome/tui/MED/HTML/MED.html
index b8f484aded3b0d24cae2817f3d5dfdfb99eab310..8b1abaeb1fa3f202a2805e32423267ab38389f04 100644 (file)
--- a/doc/salome/tui/MED/HTML/MED.html
+++ b/doc/salome/tui/MED/HTML/MED.html
@@ -19,8 +19,16 @@
 <td bgcolor= "lightgreen"><div align="center"><b>return_value = getMeshDimension (  )</b></div></td>
 </tr>
 <tr>
-<td bgcolor= "lightgreen"><div align="center"><b>string  getCoordinateSystem (  )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = getCoordinateSystem (  )</b></div></td>
+<td bgcolor= "lightgreen"><div align="center"><b>boolean  getIsAGrid (  )</b></div></td>
+<td bgcolor= "lightgreen"><div align="center"><b>return_value = getIsAGrid (  )</b></div></td>
+</tr>
+<tr>
+<td bgcolor= "lightgreen"><div align="center"><b>boolean  existConnectivity ( in medConnectivity mode, in medEntityMesh entity )</b></div></td>
+<td bgcolor= "lightgreen"><div align="center"><b>return_value = existConnectivity ( mode, entity )</b></div></td>
+</tr>
+<tr>
+<td bgcolor= "lightgreen"><div align="center"><b>string  getCoordinatesSystem (  )</b></div></td>
+<td bgcolor= "lightgreen"><div align="center"><b>return_value = getCoordinatesSystem (  )</b></div></td>
 </tr>
 <tr>
 <td bgcolor= "lightgreen"><div align="center"><b>long  getNumberOfNodes (  )</b></div></td>
@@ -31,6 +39,10 @@
 <td bgcolor= "lightgreen"><div align="center"><b>return_value = getCoordinates ( typeSwitch )</b></div></td>
 </tr>
 <tr>
+<td bgcolor= "lightgreen"><div align="center"><b>double  getCoordinate ( in long Number, in long Axis )</b></div></td>
+<td bgcolor= "lightgreen"><div align="center"><b>return_value = getCoordinate ( Number, Axis )</b></div></td>
+</tr>
+<tr>
 <td bgcolor= "lightgreen"><div align="center"><b>string_array  getCoordinatesNames (  )</b></div></td>
 <td bgcolor= "lightgreen"><div align="center"><b>return_value = getCoordinatesNames (  )</b></div></td>
 </tr>
@@ -39,6 +51,22 @@
 <td bgcolor= "lightgreen"><div align="center"><b>return_value = getCoordinatesUnits (  )</b></div></td>
 </tr>
 <tr>
+<td bgcolor= "lightgreen"><div align="center"><b>SUPPORT  getBoundaryElements ( in medEntityMesh Entity )</b></div></td>
+<td bgcolor= "lightgreen"><div align="center"><b>return_value = getBoundaryElements ( Entity )</b></div></td>
+</tr>
+<tr>
+<td bgcolor= "lightgreen"><div align="center"><b>SUPPORT  getSkin ( in SUPPORT mySupport3D )</b></div></td>
+<td bgcolor= "lightgreen"><div align="center"><b>return_value = getSkin ( mySupport3D )</b></div></td>
+</tr>
+<tr>
+<td bgcolor= "lightgreen"><div align="center"><b>long_array  getGlobalNumberingIndex ( in medEntityMesh entity )</b></div></td>
+<td bgcolor= "lightgreen"><div align="center"><b>return_value = getGlobalNumberingIndex ( entity )</b></div></td>
+</tr>
+<tr>
+<td bgcolor= "lightgreen"><div align="center"><b>coordinateInfos  getCoordGlobal (  )</b></div></td>
+<td bgcolor= "lightgreen"><div align="center"><b>return_value = getCoordGlobal (  )</b></div></td>
+</tr>
+<tr>
 <td bgcolor= "lightgreen"><div align="center"><b>long  getNumberOfTypes ( in medEntityMesh entity )</b></div></td>
 <td bgcolor= "lightgreen"><div align="center"><b>return_value = getNumberOfTypes ( entity )</b></div></td>
 </tr>
@@ -63,6 +91,10 @@
 <td bgcolor= "lightgreen"><div align="center"><b>return_value = getElementNumber ( mode, entity, type, connectivity )</b></div></td>
 </tr>
 <tr>
+<td bgcolor= "lightgreen"><div align="center"><b>medGeometryElement  getElementType ( in medEntityMesh entity, in long number )</b></div></td>
+<td bgcolor= "lightgreen"><div align="center"><b>return_value = getElementType ( entity, number )</b></div></td>
+</tr>
+<tr>
 <td bgcolor= "lightgreen"><div align="center"><b>long_array  getReverseConnectivity ( in medConnectivity mode )</b></div></td>
 <td bgcolor= "lightgreen"><div align="center"><b>return_value = getReverseConnectivity ( mode )</b></div></td>
 </tr>
@@ -71,6 +103,10 @@
 <td bgcolor= "lightgreen"><div align="center"><b>return_value = getReverseConnectivityIndex ( mode )</b></div></td>
 </tr>
 <tr>
+<td bgcolor= "lightgreen"><div align="center"><b>connectivityInfos  getConnectGlobal ( in medEntityMesh entity )</b></div></td>
+<td bgcolor= "lightgreen"><div align="center"><b>return_value = getConnectGlobal ( entity )</b></div></td>
+</tr>
+<tr>
 <td bgcolor= "lightgreen"><div align="center"><b>long  getNumberOfFamilies ( in medEntityMesh entity )</b></div></td>
 <td bgcolor= "lightgreen"><div align="center"><b>return_value = getNumberOfFamilies ( entity )</b></div></td>
 </tr>
@@ -138,6 +174,10 @@
 <td bgcolor= "lightgreen"><div align="center"><b>long  getCorbaIndex (  )</b></div></td>
 <td bgcolor= "lightgreen"><div align="center"><b>return_value = getCorbaIndex (  )</b></div></td>
 </tr>
+<tr>
+<td bgcolor= "lightgreen"><div align="center"><b>meshInfos  getMeshGlobal (  )</b></div></td>
+<td bgcolor= "lightgreen"><div align="center"><b>return_value = getMeshGlobal (  )</b></div></td>
+</tr>
 </table><br>
 <table width="100%" BORDER>
 <tr bgcolor="#FFFFCC">
@@ -171,6 +211,10 @@
 <td bgcolor= "lightgreen"><div align="center"><b>return_value = getNumberOfElements ( geomElement )</b></div></td>
 </tr>
 <tr>
+<td bgcolor= "lightgreen"><div align="center"><b>long  getNumberOfTypes (  )</b></div></td>
+<td bgcolor= "lightgreen"><div align="center"><b>return_value = getNumberOfTypes (  )</b></div></td>
+</tr>
+<tr>
 <td bgcolor= "lightgreen"><div align="center"><b>medGeometryElement_array  getTypes (  )</b></div></td>
 <td bgcolor= "lightgreen"><div align="center"><b>return_value = getTypes (  )</b></div></td>
 </tr>
@@ -183,13 +227,25 @@
 <td bgcolor= "lightgreen"><div align="center"><b>return_value = getNumberIndex (  )</b></div></td>
 </tr>
 <tr>
-<td bgcolor= "lightgreen"><div align="center"><b>long  getNumberOfGaussPoints ( in medGeometryElement geomElement )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = getNumberOfGaussPoints ( geomElement )</b></div></td>
+<td bgcolor= "lightgreen"><div align="center"><b>long  getNumberOfGaussPoint ( in medGeometryElement geomElement )</b></div></td>
+<td bgcolor= "lightgreen"><div align="center"><b>return_value = getNumberOfGaussPoint ( geomElement )</b></div></td>
+</tr>
+<tr>
+<td bgcolor= "lightgreen"><div align="center"><b>long_array  getNumbersOfGaussPoint (  )</b></div></td>
+<td bgcolor= "lightgreen"><div align="center"><b>return_value = getNumbersOfGaussPoint (  )</b></div></td>
+</tr>
+<tr>
+<td bgcolor= "lightgreen"><div align="center"><b>void getBoundaryElements (  )</b></div></td>
+<td bgcolor= "lightgreen"><div align="center"><b>getBoundaryElements (  )</b></div></td>
 </tr>
 <tr>
 <td bgcolor= "lightgreen"><div align="center"><b>long  getCorbaIndex (  )</b></div></td>
 <td bgcolor= "lightgreen"><div align="center"><b>return_value = getCorbaIndex (  )</b></div></td>
 </tr>
+<tr>
+<td bgcolor= "lightgreen"><div align="center"><b>supportInfos  getSupportGlobal (  )</b></div></td>
+<td bgcolor= "lightgreen"><div align="center"><b>return_value = getSupportGlobal (  )</b></div></td>
+</tr>
 </table><br>
 <table width="100%" BORDER>
 <tr bgcolor="#FFFFCC">
@@ -230,6 +286,18 @@
 <td bgcolor= "lightgreen"><div align="center"><b>string  getAttributeDescription ( in long i )</b></div></td>
 <td bgcolor= "lightgreen"><div align="center"><b>return_value = getAttributeDescription ( i )</b></div></td>
 </tr>
+<tr>
+<td bgcolor= "lightgreen"><div align="center"><b>long  getNumberOfGroups (  )</b></div></td>
+<td bgcolor= "lightgreen"><div align="center"><b>return_value = getNumberOfGroups (  )</b></div></td>
+</tr>
+<tr>
+<td bgcolor= "lightgreen"><div align="center"><b>string_array  getGroupsNames (  )</b></div></td>
+<td bgcolor= "lightgreen"><div align="center"><b>return_value = getGroupsNames (  )</b></div></td>
+</tr>
+<tr>
+<td bgcolor= "lightgreen"><div align="center"><b>string  getGroupName ( in long i )</b></div></td>
+<td bgcolor= "lightgreen"><div align="center"><b>return_value = getGroupName ( i )</b></div></td>
+</tr>
 </table><br>
 <table width="100%" BORDER>
 <tr bgcolor="#FFFFCC">
@@ -383,6 +451,18 @@
 <td bgcolor= "lightgreen"><div align="center"><b>return_value = getMesh ( fieldPtr )</b></div></td>
 </tr>
 <tr>
+<td bgcolor= "lightgreen"><div align="center"><b>long  getFieldNumberOfIteration ( in string fieldName )</b></div></td>
+<td bgcolor= "lightgreen"><div align="center"><b>return_value = getFieldNumberOfIteration ( fieldName )</b></div></td>
+</tr>
+<tr>
+<td bgcolor= "lightgreen"><div align="center"><b>long_array  getFieldIteration ( in string fieldName, in long i )</b></div></td>
+<td bgcolor= "lightgreen"><div align="center"><b>return_value = getFieldIteration ( fieldName, i )</b></div></td>
+</tr>
+<tr>
+<td bgcolor= "lightgreen"><div align="center"><b>long_array  getFieldIterations ( in string fieldName )</b></div></td>
+<td bgcolor= "lightgreen"><div align="center"><b>return_value = getFieldIterations ( fieldName )</b></div></td>
+</tr>
+<tr>
 <td bgcolor= "lightgreen"><div align="center"><b>FIELD  getField ( in string fieldName, in long pasTemps, in long numOrdre )</b></div></td>
 <td bgcolor= "lightgreen"><div align="center"><b>return_value = getField ( fieldName, pasTemps, numOrdre )</b></div></td>
 </tr>

diff --git a/doc/salome/tui/MED/doxyfile b/doc/salome/tui/MED/doxyfile
index cb8f40fbd53afc936449cddeeb9b8bf3a60a9b83..1bba3b632ccff05dc5cb7760728b22d6be60c912 100755 (executable)
--- a/doc/salome/tui/MED/doxyfile
+++ b/doc/salome/tui/MED/doxyfile
@@ -3,7 +3,7 @@
 #---------------------------------------------------------------------------
 # General configuration options
 #---------------------------------------------------------------------------
-PROJECT_NAME           = "SALOME - MED - v.2.0.0"
+PROJECT_NAME           = "SALOME - MED - v.2.1.0"
 PROJECT_NUMBER         = id#1.1
 OUTPUT_DIRECTORY       = ../
 OUTPUT_LANGUAGE        = English

diff --git a/doc/salome/tui/MED/sources/static/tree.js b/doc/salome/tui/MED/sources/static/tree.js
index 106210c3554afd8bbbdde6b028a6f818a1f4d2cb..d410052c45e8d38984fb7644d176ae759ce395dc 100755 (executable)
--- a/doc/salome/tui/MED/sources/static/tree.js
+++ b/doc/salome/tui/MED/sources/static/tree.js
@@ -1,4 +1,4 @@
-foldersTree = gFld("<b>SALOME v.2.0.0 </b>", "", "")
+foldersTree = gFld("<b>SALOME v.2.1.0 </b>", "", "")
      insDoc(foldersTree, gLnk("Main Page", "", "main.html"))
 
 aux1 = insFld(foldersTree, gFld("TUI Reference Guide", ""))