Merge 'master' branch into 'V9_dev' branch.

diff --cc doc/dev/sphinx/fr/medcalc-develguide.rst
Simple merge

diff --cc doc/dev/sphinx/fr/medop-prototype-develguide.rst
Simple merge

diff --cc doc/dev/sphinx/medop-prototype-develguide.rst
Simple merge

diff --cc doc/tut/medcoupling/testmed_lena.py
index 4054e08f5e8b673f1b247607cbfdc937a6a06ef5,3b281aa532500eb515d0dbe2f570e947006a3cc4..3849d0f8217ab6e5b9f3f4aba0db79f37309c4a6
--- 1/doc/tut/medcoupling/testmed_lena.py
--- 2/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 e2d202cab1e91a202c3909bcf130bc727336073a,d0c3124e6001409d133494df0c7735194d18ff94..9801976d9a2f171a97dff7f6cebc4ed91d3bfa0a
--- 1/doc/tut/medcoupling/testmed_simple.py
--- 2/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 c09a6b1656233f0396f25346a3ba83f771ab3450,55708e30740eb6d039bbd0bddf3cb893169cafa3..c93ef1337f42ce8e7b2ab5098893da9a7cfe3e5a
--- 1/doc/tut/medcoupling/testpil.py
--- 2/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/gui/WorkspaceController.hxx
Simple merge

diff --cc src/MEDCalc/tui/medimages.py
index 96a8892a25d06748d0394b0d1fc736e55d403d39,8a09f06b29fc4d0fb86139fb70622ef50dc57f8a..ce152d5a3e7515442b7a4f410a06e6fba30fe157
--- 1/src/MEDCalc/tui/medimages.py
--- 2/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();

diff --cc src/MEDCalculator/Swig/MEDCalculator.i
Simple merge

diff --cc src/MEDCouplingCorba_Swig/Client/MEDCouplingClient.i
Simple merge