From ea831d2f526877c758e3706d0243386d029b2ece Mon Sep 17 00:00:00 2001 From: Yoann Audouin Date: Thu, 24 Feb 2022 15:49:53 +0100 Subject: [PATCH] Moving example from SMESH_SWIG into doc/salome/examples and adding them to salome test --- doc/salome/examples/CMakeLists.txt | 2 +- .../examples/CTestTestfileInstall.cmake | 2 +- .../salome/examples}/PAL_MESH_041_mesh.py | 0 .../salome/examples}/PAL_MESH_043_2D.py | 0 .../salome/examples}/PAL_MESH_043_3D.py | 0 .../salome/examples}/SMESH_AdvancedEditor.py | 0 .../salome/examples}/SMESH_BelongToGeom.py | 0 .../salome/examples}/SMESH_BuildCompound.py | 0 .../salome/examples}/SMESH_GroupFromGeom.py | 0 .../salome/examples}/SMESH_GroupFromGeom2.py | 0 .../examples}/SMESH_GroupLyingOnGeom.py | 0 .../salome/examples}/SMESH_Nut.py | 0 .../examples}/SMESH_Partition1_tetra.py | 0 .../salome/examples}/SMESH_Sphere.py | 0 .../salome/examples}/SMESH_blocks.py | 0 .../salome/examples}/SMESH_box.py | 0 .../salome/examples}/SMESH_box2_tetra.py | 0 .../salome/examples}/SMESH_box3_tetra.py | 0 .../salome/examples}/SMESH_box_tetra.py | 0 .../salome/examples}/SMESH_controls.py | 0 .../salome/examples}/SMESH_demo_hexa2_upd.py | 0 .../salome/examples}/SMESH_fixation.py | 0 .../salome/examples}/SMESH_fixation_hexa.py | 0 .../salome/examples}/SMESH_fixation_netgen.py | 0 .../salome/examples}/SMESH_fixation_tetra.py | 0 .../salome/examples}/SMESH_flight_skin.py | 0 .../salome/examples}/SMESH_freebord.py | 0 .../salome/examples}/SMESH_hexaedre.py | 0 .../salome/examples}/SMESH_mechanic.py | 0 .../salome/examples}/SMESH_mechanic_editor.py | 0 .../salome/examples}/SMESH_mechanic_netgen.py | 0 .../salome/examples}/SMESH_mechanic_tetra.py | 0 .../salome/examples}/SMESH_reg.py | 0 .../salome/examples}/SMESH_test.py | 0 .../salome/examples}/SMESH_test0.py | 0 .../salome/examples}/SMESH_test1.py | 0 .../examples}/SMESH_test1_AndDisplay.py | 0 .../salome/examples}/SMESH_test2.py | 0 .../salome/examples}/SMESH_test3.py | 0 .../salome/examples}/SMESH_test4.py | 0 .../salome/examples}/SMESH_test5.py | 0 .../salome/examples}/YACS_geomesh0.py | 0 .../salome/examples}/ex01_cube2build.py | 0 .../salome/examples}/ex02_cube2primitive.py | 0 .../salome/examples}/ex03_cube2partition.py | 0 .../salome/examples}/ex04_cube5tetraHexa.py | 0 .../salome/examples}/ex05_hole1build.py | 0 .../salome/examples}/ex06_hole1boolean.py | 0 .../salome/examples}/ex07_hole1partition.py | 0 .../salome/examples}/ex08_hole2build.py | 0 .../salome/examples}/ex09_grid4build.py | 0 .../salome/examples}/ex10_grid4geometry.py | 0 .../salome/examples}/ex11_grid3partition.py | 0 .../salome/examples}/ex12_grid17partition.py | 0 .../salome/examples}/ex13_hole1partial.py | 0 .../salome/examples}/ex14_cyl1holed.py | 0 .../salome/examples}/ex15_cyl2geometry.py | 0 .../examples}/ex16_cyl2complementary.py | 0 .../salome/examples}/ex17_dome1.py | 0 .../salome/examples}/ex18_dome2.py | 0 .../salome/examples}/ex19_sphereINcube.py | 0 .../salome/examples}/ex21_lamp.py | 0 .../salome/examples}/ex24_cylinder.py | 0 .../salome/examples}/ex29_refine.py | 0 .../salome/examples}/ex30_groupsOp.py | 0 .../salome/examples}/ex30_tepal.py | 0 .../salome/examples}/ex31_dimGroup.py | 0 .../salome/examples}/smesh_selection.py | 0 doc/salome/examples/tests.set | 71 +++++++++++++++++- src/SMESH_SWIG/CMakeLists.txt | 72 +------------------ src/SMESH_SWIG/ex00_all.py | 46 ------------ 71 files changed, 73 insertions(+), 120 deletions(-) rename {src/SMESH_SWIG => doc/salome/examples}/PAL_MESH_041_mesh.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/PAL_MESH_043_2D.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/PAL_MESH_043_3D.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/SMESH_AdvancedEditor.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/SMESH_BelongToGeom.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/SMESH_BuildCompound.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/SMESH_GroupFromGeom.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/SMESH_GroupFromGeom2.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/SMESH_GroupLyingOnGeom.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/SMESH_Nut.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/SMESH_Partition1_tetra.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/SMESH_Sphere.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/SMESH_blocks.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/SMESH_box.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/SMESH_box2_tetra.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/SMESH_box3_tetra.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/SMESH_box_tetra.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/SMESH_controls.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/SMESH_demo_hexa2_upd.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/SMESH_fixation.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/SMESH_fixation_hexa.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/SMESH_fixation_netgen.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/SMESH_fixation_tetra.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/SMESH_flight_skin.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/SMESH_freebord.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/SMESH_hexaedre.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/SMESH_mechanic.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/SMESH_mechanic_editor.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/SMESH_mechanic_netgen.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/SMESH_mechanic_tetra.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/SMESH_reg.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/SMESH_test.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/SMESH_test0.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/SMESH_test1.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/SMESH_test1_AndDisplay.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/SMESH_test2.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/SMESH_test3.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/SMESH_test4.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/SMESH_test5.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/YACS_geomesh0.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/ex01_cube2build.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/ex02_cube2primitive.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/ex03_cube2partition.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/ex04_cube5tetraHexa.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/ex05_hole1build.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/ex06_hole1boolean.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/ex07_hole1partition.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/ex08_hole2build.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/ex09_grid4build.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/ex10_grid4geometry.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/ex11_grid3partition.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/ex12_grid17partition.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/ex13_hole1partial.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/ex14_cyl1holed.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/ex15_cyl2geometry.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/ex16_cyl2complementary.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/ex17_dome1.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/ex18_dome2.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/ex19_sphereINcube.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/ex21_lamp.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/ex24_cylinder.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/ex29_refine.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/ex30_groupsOp.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/ex30_tepal.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/ex31_dimGroup.py (100%) rename {src/SMESH_SWIG => doc/salome/examples}/smesh_selection.py (100%) delete mode 100644 src/SMESH_SWIG/ex00_all.py diff --git a/doc/salome/examples/CMakeLists.txt b/doc/salome/examples/CMakeLists.txt index 59575ec1e..2a2493ac2 100644 --- a/doc/salome/examples/CMakeLists.txt +++ b/doc/salome/examples/CMakeLists.txt @@ -43,7 +43,7 @@ SALOME_INSTALL_SCRIPTS("${EXAMPLES_TESTS}" ${SALOME_INSTALL_DOC}/examples/SMESH) # Application tests -INSTALL(FILES ${GOOD_TESTS} ${BAD_TESTS} ${SESSION_FREE_TESTS} DESTINATION ${TEST_INSTALL_DIRECTORY}) +INSTALL(FILES ${GOOD_TESTS} ${BAD_TESTS} ${SESSION_FREE_TESTS} ${SWIG_TESTS} DESTINATION ${TEST_INSTALL_DIRECTORY}) INSTALL(FILES Mesh_tri.med test_homard_adapt.med tutorial_4.00.med tutorial_4.xao tutorial_5.00.med tutorial_5.fr.med DESTINATION ${TEST_INSTALL_DIRECTORY}) INSTALL(FILES tests.set DESTINATION ${TEST_INSTALL_DIRECTORY}) INSTALL(DIRECTORY MGAdapt_med_files DESTINATION ${TEST_INSTALL_DIRECTORY}) diff --git a/doc/salome/examples/CTestTestfileInstall.cmake b/doc/salome/examples/CTestTestfileInstall.cmake index b32790848..6bb28482a 100644 --- a/doc/salome/examples/CTestTestfileInstall.cmake +++ b/doc/salome/examples/CTestTestfileInstall.cmake @@ -24,7 +24,7 @@ SET(TIMEOUT 300) INCLUDE(tests.set) -FOREACH(tfile ${GOOD_TESTS} ${BAD_TESTS}) +FOREACH(tfile ${GOOD_TESTS} ${BAD_TESTS} ${SWIG_TESTS}) GET_FILENAME_COMPONENT(BASE_NAME ${tfile} NAME_WE) SET(TEST_NAME SMESH_${BASE_NAME}) ADD_TEST(${TEST_NAME} python ${PYTHON_TEST_DRIVER} ${TIMEOUT} ${tfile}) diff --git a/src/SMESH_SWIG/PAL_MESH_041_mesh.py b/doc/salome/examples/PAL_MESH_041_mesh.py similarity index 100% rename from src/SMESH_SWIG/PAL_MESH_041_mesh.py rename to doc/salome/examples/PAL_MESH_041_mesh.py diff --git a/src/SMESH_SWIG/PAL_MESH_043_2D.py b/doc/salome/examples/PAL_MESH_043_2D.py similarity index 100% rename from src/SMESH_SWIG/PAL_MESH_043_2D.py rename to doc/salome/examples/PAL_MESH_043_2D.py diff --git a/src/SMESH_SWIG/PAL_MESH_043_3D.py b/doc/salome/examples/PAL_MESH_043_3D.py similarity index 100% rename from src/SMESH_SWIG/PAL_MESH_043_3D.py rename to doc/salome/examples/PAL_MESH_043_3D.py diff --git a/src/SMESH_SWIG/SMESH_AdvancedEditor.py b/doc/salome/examples/SMESH_AdvancedEditor.py similarity index 100% rename from src/SMESH_SWIG/SMESH_AdvancedEditor.py rename to doc/salome/examples/SMESH_AdvancedEditor.py diff --git a/src/SMESH_SWIG/SMESH_BelongToGeom.py b/doc/salome/examples/SMESH_BelongToGeom.py similarity index 100% rename from src/SMESH_SWIG/SMESH_BelongToGeom.py rename to doc/salome/examples/SMESH_BelongToGeom.py diff --git a/src/SMESH_SWIG/SMESH_BuildCompound.py b/doc/salome/examples/SMESH_BuildCompound.py similarity index 100% rename from src/SMESH_SWIG/SMESH_BuildCompound.py rename to doc/salome/examples/SMESH_BuildCompound.py diff --git a/src/SMESH_SWIG/SMESH_GroupFromGeom.py b/doc/salome/examples/SMESH_GroupFromGeom.py similarity index 100% rename from src/SMESH_SWIG/SMESH_GroupFromGeom.py rename to doc/salome/examples/SMESH_GroupFromGeom.py diff --git a/src/SMESH_SWIG/SMESH_GroupFromGeom2.py b/doc/salome/examples/SMESH_GroupFromGeom2.py similarity index 100% rename from src/SMESH_SWIG/SMESH_GroupFromGeom2.py rename to doc/salome/examples/SMESH_GroupFromGeom2.py diff --git a/src/SMESH_SWIG/SMESH_GroupLyingOnGeom.py b/doc/salome/examples/SMESH_GroupLyingOnGeom.py similarity index 100% rename from src/SMESH_SWIG/SMESH_GroupLyingOnGeom.py rename to doc/salome/examples/SMESH_GroupLyingOnGeom.py diff --git a/src/SMESH_SWIG/SMESH_Nut.py b/doc/salome/examples/SMESH_Nut.py similarity index 100% rename from src/SMESH_SWIG/SMESH_Nut.py rename to doc/salome/examples/SMESH_Nut.py diff --git a/src/SMESH_SWIG/SMESH_Partition1_tetra.py b/doc/salome/examples/SMESH_Partition1_tetra.py similarity index 100% rename from src/SMESH_SWIG/SMESH_Partition1_tetra.py rename to doc/salome/examples/SMESH_Partition1_tetra.py diff --git a/src/SMESH_SWIG/SMESH_Sphere.py b/doc/salome/examples/SMESH_Sphere.py similarity index 100% rename from src/SMESH_SWIG/SMESH_Sphere.py rename to doc/salome/examples/SMESH_Sphere.py diff --git a/src/SMESH_SWIG/SMESH_blocks.py b/doc/salome/examples/SMESH_blocks.py similarity index 100% rename from src/SMESH_SWIG/SMESH_blocks.py rename to doc/salome/examples/SMESH_blocks.py diff --git a/src/SMESH_SWIG/SMESH_box.py b/doc/salome/examples/SMESH_box.py similarity index 100% rename from src/SMESH_SWIG/SMESH_box.py rename to doc/salome/examples/SMESH_box.py diff --git a/src/SMESH_SWIG/SMESH_box2_tetra.py b/doc/salome/examples/SMESH_box2_tetra.py similarity index 100% rename from src/SMESH_SWIG/SMESH_box2_tetra.py rename to doc/salome/examples/SMESH_box2_tetra.py diff --git a/src/SMESH_SWIG/SMESH_box3_tetra.py b/doc/salome/examples/SMESH_box3_tetra.py similarity index 100% rename from src/SMESH_SWIG/SMESH_box3_tetra.py rename to doc/salome/examples/SMESH_box3_tetra.py diff --git a/src/SMESH_SWIG/SMESH_box_tetra.py b/doc/salome/examples/SMESH_box_tetra.py similarity index 100% rename from src/SMESH_SWIG/SMESH_box_tetra.py rename to doc/salome/examples/SMESH_box_tetra.py diff --git a/src/SMESH_SWIG/SMESH_controls.py b/doc/salome/examples/SMESH_controls.py similarity index 100% rename from src/SMESH_SWIG/SMESH_controls.py rename to doc/salome/examples/SMESH_controls.py diff --git a/src/SMESH_SWIG/SMESH_demo_hexa2_upd.py b/doc/salome/examples/SMESH_demo_hexa2_upd.py similarity index 100% rename from src/SMESH_SWIG/SMESH_demo_hexa2_upd.py rename to doc/salome/examples/SMESH_demo_hexa2_upd.py diff --git a/src/SMESH_SWIG/SMESH_fixation.py b/doc/salome/examples/SMESH_fixation.py similarity index 100% rename from src/SMESH_SWIG/SMESH_fixation.py rename to doc/salome/examples/SMESH_fixation.py diff --git a/src/SMESH_SWIG/SMESH_fixation_hexa.py b/doc/salome/examples/SMESH_fixation_hexa.py similarity index 100% rename from src/SMESH_SWIG/SMESH_fixation_hexa.py rename to doc/salome/examples/SMESH_fixation_hexa.py diff --git a/src/SMESH_SWIG/SMESH_fixation_netgen.py b/doc/salome/examples/SMESH_fixation_netgen.py similarity index 100% rename from src/SMESH_SWIG/SMESH_fixation_netgen.py rename to doc/salome/examples/SMESH_fixation_netgen.py diff --git a/src/SMESH_SWIG/SMESH_fixation_tetra.py b/doc/salome/examples/SMESH_fixation_tetra.py similarity index 100% rename from src/SMESH_SWIG/SMESH_fixation_tetra.py rename to doc/salome/examples/SMESH_fixation_tetra.py diff --git a/src/SMESH_SWIG/SMESH_flight_skin.py b/doc/salome/examples/SMESH_flight_skin.py similarity index 100% rename from src/SMESH_SWIG/SMESH_flight_skin.py rename to doc/salome/examples/SMESH_flight_skin.py diff --git a/src/SMESH_SWIG/SMESH_freebord.py b/doc/salome/examples/SMESH_freebord.py similarity index 100% rename from src/SMESH_SWIG/SMESH_freebord.py rename to doc/salome/examples/SMESH_freebord.py diff --git a/src/SMESH_SWIG/SMESH_hexaedre.py b/doc/salome/examples/SMESH_hexaedre.py similarity index 100% rename from src/SMESH_SWIG/SMESH_hexaedre.py rename to doc/salome/examples/SMESH_hexaedre.py diff --git a/src/SMESH_SWIG/SMESH_mechanic.py b/doc/salome/examples/SMESH_mechanic.py similarity index 100% rename from src/SMESH_SWIG/SMESH_mechanic.py rename to doc/salome/examples/SMESH_mechanic.py diff --git a/src/SMESH_SWIG/SMESH_mechanic_editor.py b/doc/salome/examples/SMESH_mechanic_editor.py similarity index 100% rename from src/SMESH_SWIG/SMESH_mechanic_editor.py rename to doc/salome/examples/SMESH_mechanic_editor.py diff --git a/src/SMESH_SWIG/SMESH_mechanic_netgen.py b/doc/salome/examples/SMESH_mechanic_netgen.py similarity index 100% rename from src/SMESH_SWIG/SMESH_mechanic_netgen.py rename to doc/salome/examples/SMESH_mechanic_netgen.py diff --git a/src/SMESH_SWIG/SMESH_mechanic_tetra.py b/doc/salome/examples/SMESH_mechanic_tetra.py similarity index 100% rename from src/SMESH_SWIG/SMESH_mechanic_tetra.py rename to doc/salome/examples/SMESH_mechanic_tetra.py diff --git a/src/SMESH_SWIG/SMESH_reg.py b/doc/salome/examples/SMESH_reg.py similarity index 100% rename from src/SMESH_SWIG/SMESH_reg.py rename to doc/salome/examples/SMESH_reg.py diff --git a/src/SMESH_SWIG/SMESH_test.py b/doc/salome/examples/SMESH_test.py similarity index 100% rename from src/SMESH_SWIG/SMESH_test.py rename to doc/salome/examples/SMESH_test.py diff --git a/src/SMESH_SWIG/SMESH_test0.py b/doc/salome/examples/SMESH_test0.py similarity index 100% rename from src/SMESH_SWIG/SMESH_test0.py rename to doc/salome/examples/SMESH_test0.py diff --git a/src/SMESH_SWIG/SMESH_test1.py b/doc/salome/examples/SMESH_test1.py similarity index 100% rename from src/SMESH_SWIG/SMESH_test1.py rename to doc/salome/examples/SMESH_test1.py diff --git a/src/SMESH_SWIG/SMESH_test1_AndDisplay.py b/doc/salome/examples/SMESH_test1_AndDisplay.py similarity index 100% rename from src/SMESH_SWIG/SMESH_test1_AndDisplay.py rename to doc/salome/examples/SMESH_test1_AndDisplay.py diff --git a/src/SMESH_SWIG/SMESH_test2.py b/doc/salome/examples/SMESH_test2.py similarity index 100% rename from src/SMESH_SWIG/SMESH_test2.py rename to doc/salome/examples/SMESH_test2.py diff --git a/src/SMESH_SWIG/SMESH_test3.py b/doc/salome/examples/SMESH_test3.py similarity index 100% rename from src/SMESH_SWIG/SMESH_test3.py rename to doc/salome/examples/SMESH_test3.py diff --git a/src/SMESH_SWIG/SMESH_test4.py b/doc/salome/examples/SMESH_test4.py similarity index 100% rename from src/SMESH_SWIG/SMESH_test4.py rename to doc/salome/examples/SMESH_test4.py diff --git a/src/SMESH_SWIG/SMESH_test5.py b/doc/salome/examples/SMESH_test5.py similarity index 100% rename from src/SMESH_SWIG/SMESH_test5.py rename to doc/salome/examples/SMESH_test5.py diff --git a/src/SMESH_SWIG/YACS_geomesh0.py b/doc/salome/examples/YACS_geomesh0.py similarity index 100% rename from src/SMESH_SWIG/YACS_geomesh0.py rename to doc/salome/examples/YACS_geomesh0.py diff --git a/src/SMESH_SWIG/ex01_cube2build.py b/doc/salome/examples/ex01_cube2build.py similarity index 100% rename from src/SMESH_SWIG/ex01_cube2build.py rename to doc/salome/examples/ex01_cube2build.py diff --git a/src/SMESH_SWIG/ex02_cube2primitive.py b/doc/salome/examples/ex02_cube2primitive.py similarity index 100% rename from src/SMESH_SWIG/ex02_cube2primitive.py rename to doc/salome/examples/ex02_cube2primitive.py diff --git a/src/SMESH_SWIG/ex03_cube2partition.py b/doc/salome/examples/ex03_cube2partition.py similarity index 100% rename from src/SMESH_SWIG/ex03_cube2partition.py rename to doc/salome/examples/ex03_cube2partition.py diff --git a/src/SMESH_SWIG/ex04_cube5tetraHexa.py b/doc/salome/examples/ex04_cube5tetraHexa.py similarity index 100% rename from src/SMESH_SWIG/ex04_cube5tetraHexa.py rename to doc/salome/examples/ex04_cube5tetraHexa.py diff --git a/src/SMESH_SWIG/ex05_hole1build.py b/doc/salome/examples/ex05_hole1build.py similarity index 100% rename from src/SMESH_SWIG/ex05_hole1build.py rename to doc/salome/examples/ex05_hole1build.py diff --git a/src/SMESH_SWIG/ex06_hole1boolean.py b/doc/salome/examples/ex06_hole1boolean.py similarity index 100% rename from src/SMESH_SWIG/ex06_hole1boolean.py rename to doc/salome/examples/ex06_hole1boolean.py diff --git a/src/SMESH_SWIG/ex07_hole1partition.py b/doc/salome/examples/ex07_hole1partition.py similarity index 100% rename from src/SMESH_SWIG/ex07_hole1partition.py rename to doc/salome/examples/ex07_hole1partition.py diff --git a/src/SMESH_SWIG/ex08_hole2build.py b/doc/salome/examples/ex08_hole2build.py similarity index 100% rename from src/SMESH_SWIG/ex08_hole2build.py rename to doc/salome/examples/ex08_hole2build.py diff --git a/src/SMESH_SWIG/ex09_grid4build.py b/doc/salome/examples/ex09_grid4build.py similarity index 100% rename from src/SMESH_SWIG/ex09_grid4build.py rename to doc/salome/examples/ex09_grid4build.py diff --git a/src/SMESH_SWIG/ex10_grid4geometry.py b/doc/salome/examples/ex10_grid4geometry.py similarity index 100% rename from src/SMESH_SWIG/ex10_grid4geometry.py rename to doc/salome/examples/ex10_grid4geometry.py diff --git a/src/SMESH_SWIG/ex11_grid3partition.py b/doc/salome/examples/ex11_grid3partition.py similarity index 100% rename from src/SMESH_SWIG/ex11_grid3partition.py rename to doc/salome/examples/ex11_grid3partition.py diff --git a/src/SMESH_SWIG/ex12_grid17partition.py b/doc/salome/examples/ex12_grid17partition.py similarity index 100% rename from src/SMESH_SWIG/ex12_grid17partition.py rename to doc/salome/examples/ex12_grid17partition.py diff --git a/src/SMESH_SWIG/ex13_hole1partial.py b/doc/salome/examples/ex13_hole1partial.py similarity index 100% rename from src/SMESH_SWIG/ex13_hole1partial.py rename to doc/salome/examples/ex13_hole1partial.py diff --git a/src/SMESH_SWIG/ex14_cyl1holed.py b/doc/salome/examples/ex14_cyl1holed.py similarity index 100% rename from src/SMESH_SWIG/ex14_cyl1holed.py rename to doc/salome/examples/ex14_cyl1holed.py diff --git a/src/SMESH_SWIG/ex15_cyl2geometry.py b/doc/salome/examples/ex15_cyl2geometry.py similarity index 100% rename from src/SMESH_SWIG/ex15_cyl2geometry.py rename to doc/salome/examples/ex15_cyl2geometry.py diff --git a/src/SMESH_SWIG/ex16_cyl2complementary.py b/doc/salome/examples/ex16_cyl2complementary.py similarity index 100% rename from src/SMESH_SWIG/ex16_cyl2complementary.py rename to doc/salome/examples/ex16_cyl2complementary.py diff --git a/src/SMESH_SWIG/ex17_dome1.py b/doc/salome/examples/ex17_dome1.py similarity index 100% rename from src/SMESH_SWIG/ex17_dome1.py rename to doc/salome/examples/ex17_dome1.py diff --git a/src/SMESH_SWIG/ex18_dome2.py b/doc/salome/examples/ex18_dome2.py similarity index 100% rename from src/SMESH_SWIG/ex18_dome2.py rename to doc/salome/examples/ex18_dome2.py diff --git a/src/SMESH_SWIG/ex19_sphereINcube.py b/doc/salome/examples/ex19_sphereINcube.py similarity index 100% rename from src/SMESH_SWIG/ex19_sphereINcube.py rename to doc/salome/examples/ex19_sphereINcube.py diff --git a/src/SMESH_SWIG/ex21_lamp.py b/doc/salome/examples/ex21_lamp.py similarity index 100% rename from src/SMESH_SWIG/ex21_lamp.py rename to doc/salome/examples/ex21_lamp.py diff --git a/src/SMESH_SWIG/ex24_cylinder.py b/doc/salome/examples/ex24_cylinder.py similarity index 100% rename from src/SMESH_SWIG/ex24_cylinder.py rename to doc/salome/examples/ex24_cylinder.py diff --git a/src/SMESH_SWIG/ex29_refine.py b/doc/salome/examples/ex29_refine.py similarity index 100% rename from src/SMESH_SWIG/ex29_refine.py rename to doc/salome/examples/ex29_refine.py diff --git a/src/SMESH_SWIG/ex30_groupsOp.py b/doc/salome/examples/ex30_groupsOp.py similarity index 100% rename from src/SMESH_SWIG/ex30_groupsOp.py rename to doc/salome/examples/ex30_groupsOp.py diff --git a/src/SMESH_SWIG/ex30_tepal.py b/doc/salome/examples/ex30_tepal.py similarity index 100% rename from src/SMESH_SWIG/ex30_tepal.py rename to doc/salome/examples/ex30_tepal.py diff --git a/src/SMESH_SWIG/ex31_dimGroup.py b/doc/salome/examples/ex31_dimGroup.py similarity index 100% rename from src/SMESH_SWIG/ex31_dimGroup.py rename to doc/salome/examples/ex31_dimGroup.py diff --git a/src/SMESH_SWIG/smesh_selection.py b/doc/salome/examples/smesh_selection.py similarity index 100% rename from src/SMESH_SWIG/smesh_selection.py rename to doc/salome/examples/smesh_selection.py diff --git a/doc/salome/examples/tests.set b/doc/salome/examples/tests.set index 6c2a12a1d..05e21ed6d 100644 --- a/doc/salome/examples/tests.set +++ b/doc/salome/examples/tests.set @@ -205,6 +205,75 @@ SET(GOOD_TESTS test_polyhedron_per_solid.py ) +set(SWIG_TESTS + ex01_cube2build.py + ex02_cube2primitive.py + ex03_cube2partition.py + ex04_cube5tetraHexa.py + ex05_hole1build.py + ex06_hole1boolean.py + ex07_hole1partition.py + ex08_hole2build.py + ex09_grid4build.py + ex10_grid4geometry.py + ex11_grid3partition.py + ex12_grid17partition.py + ex13_hole1partial.py + ex14_cyl1holed.py + ex15_cyl2geometry.py + ex16_cyl2complementary.py + ex17_dome1.py + ex18_dome2.py + ex19_sphereINcube.py + ex21_lamp.py + ex24_cylinder.py + ex29_refine.py + ex30_tepal.py + ex30_groupsOp.py + ex31_dimGroup.py + SMESH_test.py + SMESH_test0.py + SMESH_test1.py + SMESH_test1_AndDisplay.py + SMESH_test2.py + SMESH_test3.py + SMESH_test4.py + SMESH_test5.py + SMESH_mechanic.py + SMESH_mechanic_tetra.py + SMESH_mechanic_editor.py + SMESH_mechanic_netgen.py + SMESH_fixation.py + SMESH_fixation_hexa.py + SMESH_fixation_tetra.py + SMESH_fixation_netgen.py + SMESH_box_tetra.py + SMESH_box2_tetra.py + SMESH_box3_tetra.py + SMESH_flight_skin.py + SMESH_Partition1_tetra.py + SMESH_controls.py + SMESH_freebord.py + SMESH_blocks.py + SMESH_BelongToGeom.py + SMESH_GroupFromGeom2.py + SMESH_box.py + SMESH_demo_hexa2_upd.py + SMESH_hexaedre.py + SMESH_Sphere.py + SMESH_GroupFromGeom.py + SMESH_Nut.py + SMESH_GroupLyingOnGeom.py + SMESH_AdvancedEditor.py + SMESH_BuildCompound.py + PAL_MESH_041_mesh.py + PAL_MESH_043_2D.py + PAL_MESH_043_3D.py + SMESH_reg.py + smesh_selection.py + YACS_geomesh0.py +) + set(SESSION_FREE_TESTS basic_geom_smesh_without_session.py basic_shaper_smesh_without_session.py @@ -214,4 +283,4 @@ set(SESSION_FREE_TESTS doublenodes_polyhedra.py ) -SET(EXAMPLES_TESTS ${BAD_TESTS} ${GOOD_TESTS} ${SESSION_FREE_TESTS} testme.py) +SET(EXAMPLES_TESTS ${BAD_TESTS} ${GOOD_TESTS} ${SESSION_FREE_TESTS} ${SWIG_TESTS} testme.py) diff --git a/src/SMESH_SWIG/CMakeLists.txt b/src/SMESH_SWIG/CMakeLists.txt index bd3a578d4..16e61bf52 100644 --- a/src/SMESH_SWIG/CMakeLists.txt +++ b/src/SMESH_SWIG/CMakeLists.txt @@ -32,75 +32,6 @@ include_directories( ) # scripts / static -SET(_bin_SCRIPTS - ex00_all.py - ex01_cube2build.py - ex02_cube2primitive.py - ex03_cube2partition.py - ex04_cube5tetraHexa.py - ex05_hole1build.py - ex06_hole1boolean.py - ex07_hole1partition.py - ex08_hole2build.py - ex09_grid4build.py - ex10_grid4geometry.py - ex11_grid3partition.py - ex12_grid17partition.py - ex13_hole1partial.py - ex14_cyl1holed.py - ex15_cyl2geometry.py - ex16_cyl2complementary.py - ex17_dome1.py - ex18_dome2.py - ex19_sphereINcube.py - ex21_lamp.py - ex24_cylinder.py - ex29_refine.py - ex30_tepal.py - ex30_groupsOp.py - ex31_dimGroup.py - SMESH_test.py - SMESH_test0.py - SMESH_test1.py - SMESH_test1_AndDisplay.py - SMESH_test2.py - SMESH_test3.py - SMESH_test4.py - SMESH_test5.py - SMESH_mechanic.py - SMESH_mechanic_tetra.py - SMESH_mechanic_editor.py - SMESH_mechanic_netgen.py - SMESH_fixation.py - SMESH_fixation_hexa.py - SMESH_fixation_tetra.py - SMESH_fixation_netgen.py - SMESH_box_tetra.py - SMESH_box2_tetra.py - SMESH_box3_tetra.py - SMESH_flight_skin.py - SMESH_Partition1_tetra.py - SMESH_controls.py - SMESH_freebord.py - SMESH_blocks.py - SMESH_BelongToGeom.py - SMESH_GroupFromGeom2.py - SMESH_box.py - SMESH_demo_hexa2_upd.py - SMESH_hexaedre.py - SMESH_Sphere.py - SMESH_GroupFromGeom.py - SMESH_Nut.py - SMESH_GroupLyingOnGeom.py - SMESH_AdvancedEditor.py - SMESH_BuildCompound.py - PAL_MESH_041_mesh.py - PAL_MESH_043_2D.py - PAL_MESH_043_3D.py - SMESH_reg.py - smesh_selection.py - YACS_geomesh0.py -) SET(smesh_SCRIPTS smeshBuilder.py @@ -120,7 +51,7 @@ SET_SOURCE_FILES_PROPERTIES(SMeshHelper.i PROPERTIES CPLUSPLUS ON) SET_SOURCE_FILES_PROPERTIES(SMeshHelper.i PROPERTIES SWIG_FLAGS "-py3") SET_SOURCE_FILES_PROPERTIES(SMeshHelper_wrap.cpp PROPERTIES COMPILE_FLAGS "-DHAVE_CONFIG_H") SET(_swig_SCRIPTS ${CMAKE_CURRENT_BINARY_DIR}/SMeshHelper.py ) -IF(${CMAKE_VERSION} VERSION_LESS "3.8.0") +IF(${CMAKE_VERSION} VERSION_LESS "3.8.0") SWIG_ADD_MODULE(SMeshHelper python ${SMeshHelper_SOURCES}) ELSE() SWIG_ADD_LIBRARY(SMeshHelper LANGUAGE python SOURCES ${SMeshHelper_SOURCES}) @@ -135,7 +66,6 @@ install(FILES ${SMeshHelper_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) SALOME_INSTALL_SCRIPTS("${_swig_SCRIPTS}" ${SALOME_INSTALL_BINS} EXTRA_DPYS "${SWIG_MODULE_SMeshHelper_REAL_NAME}") # --- rules --- -SALOME_INSTALL_SCRIPTS("${_bin_SCRIPTS}" ${SALOME_INSTALL_PYTHON} DEF_PERMS) SALOME_INSTALL_SCRIPTS("${smesh_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/smesh DEF_PERMS) SALOME_INSTALL_SCRIPTS("${StdMeshers_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/StdMeshers DEF_PERMS) SALOME_INSTALL_SCRIPTS(SMESH_shared_modules.py ${SALOME_INSTALL_PYTHON}/shared_modules DEF_PERMS) diff --git a/src/SMESH_SWIG/ex00_all.py b/src/SMESH_SWIG/ex00_all.py deleted file mode 100644 index ccbdf2de9..000000000 --- a/src/SMESH_SWIG/ex00_all.py +++ /dev/null @@ -1,46 +0,0 @@ -# -*- coding: iso-8859-1 -*- -# Copyright (C) 2007-2021 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# ================================== -# Load all examples -# ----------------- -# -import ex01_cube2build -import ex02_cube2primitive -import ex03_cube2partition -import ex04_cube5tetraHexa -import ex05_hole1build -import ex06_hole1boolean -import ex07_hole1partition -import ex08_hole2build -import ex09_grid4build -import ex10_grid4geometry -import ex11_grid3partition -import ex12_grid17partition -import ex13_hole1partial -import ex14_cyl1holed -import ex15_cyl2geometry -import ex16_cyl2complementary -import ex17_dome1 -import ex18_dome2 -import ex19_sphereINcube -- 2.39.2