From: rnv <rnv@opencascade.com>
Date: Wed, 17 Jan 2018 13:11:21 +0000 (+0300)
Subject: Merge 'master' branch into 'V9_dev' branch.
X-Git-Tag: V9_0_0^0
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2FV9_dev;p=modules%2Fmed.git

Merge 'master' branch into 'V9_dev' branch.
---

368e03e3d53f49b9b6ca36f8299d75f448207a16
diff --cc doc/tut/medcoupling/testmed_lena.py
index 4054e08f5,3b281aa53..3849d0f82
--- a/doc/tut/medcoupling/testmed_lena.py
+++ b/doc/tut/medcoupling/testmed_lena.py
@@@ -97,10 -95,10 +97,10 @@@ coordsY=MC.DataArrayDouble.New(
  coordsY.setValues(arrY,nbNodesY,1)
  
  cmesh.setCoords(coordsX,coordsY)
 -print "Imagem mesh dimension: %d"%cmesh.getSpaceDimension()
 +print("Imagem mesh dimension: %d"%cmesh.getSpaceDimension())
  
  # WARN: In the current state of development of MEDLoader, only
- # unstructured meshes are supported for writting function in med
+ # unstructured meshes are supported for writing function in med
  # files. We just have to convert the cartesian mesh in an unstructured
  # mesh before creating the field.
  umesh=cmesh.buildUnstructured();
diff --cc doc/tut/medcoupling/testmed_simple.py
index e2d202cab,d0c3124e6..9801976d9
--- a/doc/tut/medcoupling/testmed_simple.py
+++ b/doc/tut/medcoupling/testmed_simple.py
@@@ -65,11 -66,11 +65,11 @@@ coordsY=MC.DataArrayDouble.New(
  coordsY.setValues(arrY,sizeY,1)
  
  cmesh.setCoords(coordsX,coordsY)
 -print cmesh.getSpaceDimension()
 -#print cmesh
 +print(cmesh.getSpaceDimension())
 +# print(cmesh)
  
  # WARN: In the current state of development of MEDLoader, only
- # unstructured meshes are supported for writting function in med
+ # unstructured meshes are supported for writing function in med
  # files. We just have to convert the cartesian mesh in an unstructured
  # mesh before creating the field.
  umesh=cmesh.buildUnstructured();
diff --cc doc/tut/medcoupling/testpil.py
index c09a6b165,55708e307..c93ef1337
--- a/doc/tut/medcoupling/testpil.py
+++ b/doc/tut/medcoupling/testpil.py
@@@ -93,10 -93,10 +93,10 @@@ def createMesh(meshname, sizeX, sizeY)
      coordsY.setValues(arrY,nbNodesY,1)
      
      cmesh.setCoords(coordsX,coordsY)
 -    print "Imagem mesh dimension: %d"%cmesh.getSpaceDimension()
 +    print("Imagem mesh dimension: %d"%cmesh.getSpaceDimension())
      
      # WARN: In the current state of development of MEDLoader, only
-     # unstructured meshes are supported for writting function in med
+     # unstructured meshes are supported for writing function in med
      # files. We just have to convert the cartesian mesh in an unstructured
      # mesh before creating the field.
      umesh=cmesh.buildUnstructured();
diff --cc src/MEDCalc/tui/medimages.py
index 96a8892a2,8a09f06b2..ce152d5a3
--- a/src/MEDCalc/tui/medimages.py
+++ b/src/MEDCalc/tui/medimages.py
@@@ -83,10 -83,10 +83,10 @@@ class FieldBuilder
          coordsY.setValues(arrY,nbNodesY,1)
  
          cmesh.setCoords(coordsX,coordsY)
 -        print "Imagem mesh dimension: %d"%cmesh.getSpaceDimension()
 +        print("Imagem mesh dimension: %d"%cmesh.getSpaceDimension())
  
          # WARN: In the current state of development of MEDLoader, only
-         # unstructured meshes are supported for writting function in med
+         # unstructured meshes are supported for writing function in med
          # files. We just have to convert the cartesian mesh in an unstructured
          # mesh before creating the field.
          umesh=cmesh.buildUnstructured();