From: eap Date: Wed, 26 Jun 2013 13:10:04 +0000 (+0000) Subject: CoTech decision: move MEDWrapper from MED to SMESH X-Git-Tag: V7_3_0a1~13 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2FBR_new_bop4;p=samples%2Fsierpinsky.git CoTech decision: move MEDWrapper from MED to SMESH --- diff --git a/Makefile.am b/Makefile.am index 7184687..882c207 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,7 +28,7 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am ACLOCAL_AMFLAGS = -I adm_local/unix/config_files \ -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \ -I ${GUI_ROOT_DIR}/adm_local/unix/config_files \ - -I ${MED_ROOT_DIR}/adm_local/unix/config_files \ + -I ${SMESH_ROOT_DIR}/adm_local/unix/config_files \ -I ${VISU_ROOT_DIR}/adm_local/unix/config_files \ -I ${RANDOMIZER_ROOT_DIR}/adm_local/unix/config_files diff --git a/README b/README index 64c0a2d..e0654a6 100755 --- a/README +++ b/README @@ -81,7 +81,7 @@ To launch SALOME application the following steps should be performed: 4.4. launch SALOME: - ${KERNEL_ROOT_DIR}/bin/salome/runSalome --modules=MED,VISU,RANDOMIZER,SIERPINSKY + ${KERNEL_ROOT_DIR}/bin/salome/runSalome --modules=SMESH,VISU,RANDOMIZER,SIERPINSKY ======================================================= 5. Functionality. diff --git a/build_configure b/build_configure index 36c2605..897ae6c 100755 --- a/build_configure +++ b/build_configure @@ -44,10 +44,10 @@ if test ! -d "${GUI_ROOT_DIR}"; then fi ######################################################################## -# Test if the MED_ROOT_DIR is set correctly +# Test if the SMESH_ROOT_DIR is set correctly -if test ! -d "${MED_ROOT_DIR}"; then - echo "failed : MED_ROOT_DIR variable is not correct !" +if test ! -d "${SMESH_ROOT_DIR}"; then + echo "failed : SMESH_ROOT_DIR variable is not correct !" exit fi @@ -77,7 +77,7 @@ if test -d "${VISU_ROOT_DIR}"; then aclocal -I adm_local/unix/config_files \ -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \ -I ${GUI_ROOT_DIR}/adm_local/unix/config_files \ - -I ${MED_ROOT_DIR}/adm_local/unix/config_files \ + -I ${SMESH_ROOT_DIR}/adm_local/unix/config_files \ -I ${VISU_ROOT_DIR}/adm_local/unix/config_files \ -I ${RANDOMIZER_ROOT_DIR}/adm_local/unix/config_files || exit 1 else @@ -85,7 +85,7 @@ else aclocal -I adm_local/unix/config_files \ -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \ -I ${GUI_ROOT_DIR}/adm_local/unix/config_files \ - -I ${MED_ROOT_DIR}/adm_local/unix/config_files \ + -I ${SMESH_ROOT_DIR}/adm_local/unix/config_files \ -I ${RANDOMIZER_ROOT_DIR}/adm_local/unix/config_files || exit 1 fi diff --git a/configure.ac b/configure.ac index 88be1a7..a76def3 100644 --- a/configure.ac +++ b/configure.ac @@ -257,14 +257,6 @@ echo CHECK_BOOST -echo -echo --------------------------------------------- -echo testing MED3 -echo --------------------------------------------- -echo - -CHECK_MED3 - echo echo --------------------------------------------- echo Testing OpenCascade @@ -319,11 +311,11 @@ CHECK_KERNEL echo echo --------------------------------------------- -echo Testing Med +echo Testing SMESH echo --------------------------------------------- echo -CHECK_MED +CHECK_SMESH echo echo --------------------------------------------- @@ -351,7 +343,7 @@ echo echo Configure variables="cc_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok -OpenGL_ok qt_ok vtk_ok hdf5_ok med3_ok omniORB_ok occ_ok doxygen_ok graphviz_ok gd_ok Kernel_ok Med_ok Visu_ok Randomizer_ok" +OpenGL_ok qt_ok vtk_ok hdf5_ok omniORB_ok occ_ok doxygen_ok graphviz_ok gd_ok Kernel_ok SMesh_ok Visu_ok Randomizer_ok" for var in $variables do diff --git a/src/Sierpinsky/Makefile.am b/src/Sierpinsky/Makefile.am index dc8aa56..158cac4 100644 --- a/src/Sierpinsky/Makefile.am +++ b/src/Sierpinsky/Makefile.am @@ -39,7 +39,7 @@ libSIERPINSKYEngine_la_CPPFLAGS = \ $(CORBA_CXXFLAGS) \ $(CORBA_INCLUDES) \ $(KERNEL_CXXFLAGS) \ - $(MED_CXXFLAGS) \ + $(SMESH_CXXFLAGS) \ $(HDF5_INCLUDES) \ $(BOOST_CPPFLAGS) \ -I$(top_builddir)/idl \ @@ -57,6 +57,5 @@ libSIERPINSKYEngine_la_LDFLAGS = \ -lSALOMELocalTrace \ -lgd \ -lSalomeIDLKernel \ - $(MED_LDFLAGS) \ - -lSalomeIDLMED \ + $(SMESH_LDFLAGS) \ -lMEDWrapper diff --git a/src/Sierpinsky/SIERPINSKY_Gen_i.cxx b/src/Sierpinsky/SIERPINSKY_Gen_i.cxx index 81b0277..41ea3cd 100644 --- a/src/Sierpinsky/SIERPINSKY_Gen_i.cxx +++ b/src/Sierpinsky/SIERPINSKY_Gen_i.cxx @@ -37,10 +37,10 @@ using namespace MED; extern "C" { PortableServer::ObjectId * SIERPINSKYEngine_factory( CORBA::ORB_ptr orb, - PortableServer::POA_ptr poa, - PortableServer::ObjectId* contId, - const char* instanceName, - const char* interfaceName ) + PortableServer::POA_ptr poa, + PortableServer::ObjectId* contId, + const char* instanceName, + const char* interfaceName ) { SIERPINSKY_Gen_i* anEngine = new SIERPINSKY_Gen_i( orb, poa, contId, instanceName, interfaceName ); return anEngine->getId() ; @@ -58,10 +58,10 @@ SIERPINSKY_Gen_i::SIERPINSKY_Gen_i() * Constructor */ SIERPINSKY_Gen_i::SIERPINSKY_Gen_i( CORBA::ORB_ptr orb, - PortableServer::POA_ptr poa, - PortableServer::ObjectId* contId, - const char* instanceName, - const char* interfaceName ) + PortableServer::POA_ptr poa, + PortableServer::ObjectId* contId, + const char* instanceName, + const char* interfaceName ) : Engines_Component_i( orb, poa, contId, instanceName, interfaceName ) { // activate servant @@ -83,8 +83,8 @@ SIERPINSKY_Gen_i::~SIERPINSKY_Gen_i() * Initializes engine with three reference points */ void SIERPINSKY_Gen_i::Init( CORBA::Double theX1, CORBA::Double theY1, - CORBA::Double theX2, CORBA::Double theY2, - CORBA::Double theX3, CORBA::Double theY3 ) + CORBA::Double theX2, CORBA::Double theY2, + CORBA::Double theX3, CORBA::Double theY3 ) { myRefPoints[0] = MyPoint( theX1, theY1 ); myRefPoints[1] = MyPoint( theX2, theY2 ); @@ -107,8 +107,8 @@ void SIERPINSKY_Gen_i::Reset() * Generates next iteration point */ void SIERPINSKY_Gen_i::NextPoint( CORBA::Double theX, CORBA::Double theY, - CORBA::Long theIter, - CORBA::Double& theNextX, CORBA::Double& theNextY ) + CORBA::Long theIter, + CORBA::Double& theNextX, CORBA::Double& theNextY ) { double x = theIter < 1 || theIter > 3 ? theX : ( theX + myRefPoints[ theIter-1 ].myX ) / 2; double y = theIter < 1 || theIter > 3 ? theY : ( theY + myRefPoints[ theIter-1 ].myY ) / 2; diff --git a/src/SierpinskyGUI/Makefile.am b/src/SierpinskyGUI/Makefile.am index ee56ebb..0758b9b 100644 --- a/src/SierpinskyGUI/Makefile.am +++ b/src/SierpinskyGUI/Makefile.am @@ -55,7 +55,7 @@ libSIERPINSKY_la_CPPFLAGS = \ $(CAS_CPPFLAGS) \ $(VTK_INCLUDES) \ $(KERNEL_CXXFLAGS) \ - $(MED_CXXFLAGS) \ + $(SMESH_CXXFLAGS) \ $(RANDOMIZER_CXXFLAGS) \ $(GUI_CXXFLAGS) \ $(BOOST_CPPFLAGS) \