Salome HOME
Merge branch 'V7_dev'
authorvsr <vsr@opencascade.com>
Fri, 25 Mar 2016 11:11:44 +0000 (14:11 +0300)
committervsr <vsr@opencascade.com>
Fri, 25 Mar 2016 11:47:14 +0000 (14:47 +0300)
commit0d0b1478f016ab0c9cf4a95ba79e0c7455cf2137
tree37b5d3b56734e067af60426094b6f79f494905c9
parent8258afd8d267f85217a3153bbcfedc05efbaca4e
parent682bfb07cec46a60ed230d40826088957500a22b
Merge branch 'V7_dev'
143 files changed:
CMakeLists.txt
doc/dev/sphinx/conf.py.in
doc/tut/addfields/addition.py
doc/tut/addfields/operations.py
doc/tut/medcoupling/partition.py
doc/tut/mergefields/splitdemo/splitdemo.py
doc/tut/mergefields/splitdemo/splitdemo_partiel.py
doc/tut/projection/demomed/demo_createsource.py
doc/tut/projection/demomed/demo_loadsource.py
doc/tut/projection/demovtu/projection.py
src/MEDCalc/cmp/MEDCalculator_i.cxx
src/MEDCalc/cmp/MEDDataManager_i.cxx
src/MEDCalc/cmp/MEDDataManager_i.hxx
src/MEDCalc/cmp/MEDPresentationContour.cxx
src/MEDCalc/cmp/MEDPresentationContour.hxx
src/MEDCalc/cmp/MEDPresentationDeflectionShape.cxx
src/MEDCalc/cmp/MEDPresentationDeflectionShape.hxx
src/MEDCalc/cmp/MEDPresentationException.hxx
src/MEDCalc/cmp/MEDPresentationPointSprite.cxx
src/MEDCalc/cmp/MEDPresentationPointSprite.hxx
src/MEDCalc/cmp/MEDPresentationScalarMap.cxx
src/MEDCalc/cmp/MEDPresentationScalarMap.hxx
src/MEDCalc/cmp/MEDPresentationSlices.cxx
src/MEDCalc/cmp/MEDPresentationSlices.hxx
src/MEDCalc/cmp/MEDPresentationVectorField.cxx
src/MEDCalc/cmp/MEDPresentationVectorField.hxx
src/MEDCalc/gui/dialogs/DlgInterpolateField.cxx
src/MEDCalc/gui/dialogs/WidgetPresentationParameters.cxx
src/MEDCalc/gui/dialogs/WidgetPresentationParameters.hxx
src/MEDCalc/tui/__init__.py
src/MEDCalculator/MEDCalculatorBrowserField.cxx
src/MEDCalculator/MEDCalculatorBrowserField.hxx
src/MEDCalculator/MEDCalculatorBrowserLiteStruct.cxx
src/MEDCalculator/MEDCalculatorBrowserLiteStruct.hxx
src/MEDCalculator/MEDCalculatorBrowserMesh.cxx
src/MEDCalculator/MEDCalculatorBrowserMesh.hxx
src/MEDCalculator/MEDCalculatorBrowserStep.cxx
src/MEDCalculator/MEDCalculatorBrowserStep.hxx
src/MEDCalculator/MEDCalculatorDBField.cxx
src/MEDCalculator/MEDCalculatorDBField.hxx
src/MEDCalculator/MEDCalculatorDBRangeSelection.cxx
src/MEDCalculator/MEDCalculatorDBRangeSelection.hxx
src/MEDCalculator/MEDCalculatorDBSliceField.cxx
src/MEDCalculator/MEDCalculatorDBSliceField.hxx
src/MEDCalculator/Swig/MEDCalculator.i
src/MEDCalculator/Swig/MEDCalculatorTypemaps.i
src/MEDCalculator/Swig/SPythonInterpreter.cxx
src/MEDCalculator/Swig/SPythonInterpreter.hxx
src/MEDCalculator/Swig/SPythonParser.cxx
src/MEDCalculator/Swig/SPythonParser.hxx
src/MEDCalculator/Swig/spython.cxx
src/MEDCalculator/Test/MEDCalculatorBasicsTest.cxx
src/MEDCalculator/Test/MEDCalculatorBasicsTest.hxx
src/MEDCalculator/Test/TestMEDCalculator.cxx
src/MEDCouplingCorba/Client/DataArrayDoubleClient.cxx
src/MEDCouplingCorba/Client/DataArrayDoubleClient.hxx
src/MEDCouplingCorba/Client/DataArrayIntClient.cxx
src/MEDCouplingCorba/Client/DataArrayIntClient.hxx
src/MEDCouplingCorba/Client/MEDCoupling1DGTUMeshClient.cxx
src/MEDCouplingCorba/Client/MEDCoupling1DGTUMeshClient.hxx
src/MEDCouplingCorba/Client/MEDCoupling1SGTUMeshClient.cxx
src/MEDCouplingCorba/Client/MEDCoupling1SGTUMeshClient.hxx
src/MEDCouplingCorba/Client/MEDCouplingCMeshClient.cxx
src/MEDCouplingCorba/Client/MEDCouplingCMeshClient.hxx
src/MEDCouplingCorba/Client/MEDCouplingCurveLinearMeshClient.cxx
src/MEDCouplingCorba/Client/MEDCouplingCurveLinearMeshClient.hxx
src/MEDCouplingCorba/Client/MEDCouplingExtrudedMeshClient.cxx
src/MEDCouplingCorba/Client/MEDCouplingExtrudedMeshClient.hxx
src/MEDCouplingCorba/Client/MEDCouplingFieldDoubleClient.cxx
src/MEDCouplingCorba/Client/MEDCouplingFieldDoubleClient.hxx
src/MEDCouplingCorba/Client/MEDCouplingFieldOverTimeClient.cxx
src/MEDCouplingCorba/Client/MEDCouplingFieldOverTimeClient.hxx
src/MEDCouplingCorba/Client/MEDCouplingFieldTemplateClient.cxx
src/MEDCouplingCorba/Client/MEDCouplingFieldTemplateClient.hxx
src/MEDCouplingCorba/Client/MEDCouplingIMeshClient.cxx
src/MEDCouplingCorba/Client/MEDCouplingIMeshClient.hxx
src/MEDCouplingCorba/Client/MEDCouplingMeshClient.cxx
src/MEDCouplingCorba/Client/MEDCouplingMeshClient.hxx
src/MEDCouplingCorba/Client/MEDCouplingMultiFieldsClient.cxx
src/MEDCouplingCorba/Client/MEDCouplingMultiFieldsClient.hxx
src/MEDCouplingCorba/Client/MEDCouplingUMeshClient.cxx
src/MEDCouplingCorba/Client/MEDCouplingUMeshClient.hxx
src/MEDCouplingCorba/DataArrayDoubleServant.cxx
src/MEDCouplingCorba/DataArrayDoubleServant.hxx
src/MEDCouplingCorba/DataArrayIntServant.cxx
src/MEDCouplingCorba/DataArrayIntServant.hxx
src/MEDCouplingCorba/DataArrayServant.cxx
src/MEDCouplingCorba/DataArrayServant.hxx
src/MEDCouplingCorba/MEDCoupling1DGTUMeshServant.cxx
src/MEDCouplingCorba/MEDCoupling1DGTUMeshServant.hxx
src/MEDCouplingCorba/MEDCoupling1GTUMeshServant.cxx
src/MEDCouplingCorba/MEDCoupling1GTUMeshServant.hxx
src/MEDCouplingCorba/MEDCoupling1SGTUMeshServant.cxx
src/MEDCouplingCorba/MEDCoupling1SGTUMeshServant.hxx
src/MEDCouplingCorba/MEDCouplingCMeshServant.cxx
src/MEDCouplingCorba/MEDCouplingCMeshServant.hxx
src/MEDCouplingCorba/MEDCouplingCurveLinearMeshServant.cxx
src/MEDCouplingCorba/MEDCouplingCurveLinearMeshServant.hxx
src/MEDCouplingCorba/MEDCouplingExtrudedMeshServant.cxx
src/MEDCouplingCorba/MEDCouplingExtrudedMeshServant.hxx
src/MEDCouplingCorba/MEDCouplingFieldDoubleServant.cxx
src/MEDCouplingCorba/MEDCouplingFieldDoubleServant.hxx
src/MEDCouplingCorba/MEDCouplingFieldOverTimeServant.cxx
src/MEDCouplingCorba/MEDCouplingFieldOverTimeServant.hxx
src/MEDCouplingCorba/MEDCouplingFieldServant.cxx
src/MEDCouplingCorba/MEDCouplingFieldServant.hxx
src/MEDCouplingCorba/MEDCouplingFieldTemplateServant.cxx
src/MEDCouplingCorba/MEDCouplingFieldTemplateServant.hxx
src/MEDCouplingCorba/MEDCouplingIMeshServant.cxx
src/MEDCouplingCorba/MEDCouplingIMeshServant.hxx
src/MEDCouplingCorba/MEDCouplingMeshServant.cxx
src/MEDCouplingCorba/MEDCouplingMeshServant.hxx
src/MEDCouplingCorba/MEDCouplingMultiFieldsServant.cxx
src/MEDCouplingCorba/MEDCouplingMultiFieldsServant.hxx
src/MEDCouplingCorba/MEDCouplingPointSetServant.cxx
src/MEDCouplingCorba/MEDCouplingPointSetServant.hxx
src/MEDCouplingCorba/MEDCouplingRefCountServant.cxx
src/MEDCouplingCorba/MEDCouplingRefCountServant.hxx
src/MEDCouplingCorba/MEDCouplingStructuredMeshServant.cxx
src/MEDCouplingCorba/MEDCouplingStructuredMeshServant.hxx
src/MEDCouplingCorba/MEDCouplingUMeshServant.cxx
src/MEDCouplingCorba/MEDCouplingUMeshServant.hxx
src/MEDCouplingCorba/Test/MEDCouplingMeshFieldFactoryComponent.cxx
src/MEDCouplingCorba/Test/MEDCouplingMeshFieldFactoryComponent.hxx
src/MEDCouplingCorba/Test/MEDCouplingMeshFieldFactoryComponentClt.cxx
src/MEDCouplingCorba/Test/MEDCouplingMeshFieldFactoryComponentClt.hxx
src/MEDCouplingCorba/Test/MEDCouplingMeshFieldFactoryComponentServ.cxx
src/MEDCouplingCorba/Test/MEDCouplingMeshFieldFactoryComponentServ.hxx
src/MEDCouplingCorba/Test/TestMEDCouplingCorbaClt.cxx
src/MEDCouplingCorba/Test/TestMEDCouplingCorbaServ.cxx
src/MEDCouplingCorba_Swig/Client/MEDCouplingClient.i
src/MEDCouplingCorba_Swig/MEDCouplingCorba.i
src/MEDCouplingCorba_Swig/MEDCouplingCorbaSwigTest.py
src/MEDGUI/CMakeLists.txt
src/MEDGUI/MEDGUISelectComponents.cxx
src/ParaMEDCouplingCorba/ParaMEDCouplingFieldDoubleServant.cxx
src/ParaMEDCouplingCorba/ParaMEDCouplingFieldDoubleServant.hxx
src/ParaMEDCouplingCorba/ParaMEDCouplingUMeshServant.cxx
src/ParaMEDCouplingCorba/ParaMEDCouplingUMeshServant.hxx
src/ParaMEDMEMComponent/MPIMEDCouplingFieldDoubleServant.cxx
src/ParaMEDMEMComponent/MPIMEDCouplingFieldDoubleServant.hxx
src/ParaMEDMEMComponent/ParaMEDMEMComponent_i.cxx
src/ParaMEDMEMComponent/ParaMEDMEMComponent_i.hxx