From 4bd9a6f6feb990ba253c65ccd71081287f8fd288 Mon Sep 17 00:00:00 2001 From: vsr Date: Thu, 11 Nov 2021 17:35:16 +0300 Subject: [PATCH 1/2] Fix test script: correct textures location --- src/GEOM_SWIG/GEOM_example7.py | 42 ++++++++++++++++------------------ 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/src/GEOM_SWIG/GEOM_example7.py b/src/GEOM_SWIG/GEOM_example7.py index 48d84f83c..95945c53a 100644 --- a/src/GEOM_SWIG/GEOM_example7.py +++ b/src/GEOM_SWIG/GEOM_example7.py @@ -29,25 +29,23 @@ import GEOM from salome.geom import geomBuilder geompy = geomBuilder.New() -data_dir = os.getenv('DATA_DIR') -if data_dir: - texture_1 = geompy.LoadTexture(os.path.join(data_dir, "Textures", "texture1.dat")) - texture_2 = geompy.LoadTexture(os.path.join(data_dir, "Textures", "texture2.dat")) - texture_3 = geompy.LoadTexture(os.path.join(data_dir, "Textures", "texture3.dat")) - - Vertex_1 = geompy.MakeVertex(0, 0, 0) - Vertex_2 = geompy.MakeVertex(100, 0, 0) - Vertex_3 = geompy.MakeVertex(0, 100, 0) - Vertex_4 = geompy.MakeVertex(0, 0, 100) - Vertex_5 = geompy.MakeVertex(100, 0, 100) - Vertex_1.SetMarkerTexture(texture_1); - Vertex_2.SetMarkerTexture(texture_2); - Vertex_3.SetMarkerTexture(texture_3); - Vertex_4.SetMarkerStd(GEOM.MT_O_PLUS, GEOM.MS_25); - Vertex_5.SetMarkerStd(GEOM.MT_BALL, GEOM.MS_40); - geompy.addToStudy( Vertex_1, "Vertex_1" ) - geompy.addToStudy( Vertex_2, "Vertex_2" ) - geompy.addToStudy( Vertex_3, "Vertex_3" ) - geompy.addToStudy( Vertex_4, "Vertex_4" ) - geompy.addToStudy( Vertex_5, "Vertex_5" ) - pass +data_dir = os.path.join(os.getenv('GEOM_ROOT_DIR'), 'share', 'salome', 'resources', 'geom', 'textures') +texture_1 = geompy.LoadTexture(os.path.join(data_dir, "texture1.dat")) +texture_2 = geompy.LoadTexture(os.path.join(data_dir, "texture2.dat")) +texture_3 = geompy.LoadTexture(os.path.join(data_dir, "texture3.dat")) + +Vertex_1 = geompy.MakeVertex(0, 0, 0) +Vertex_2 = geompy.MakeVertex(100, 0, 0) +Vertex_3 = geompy.MakeVertex(0, 100, 0) +Vertex_4 = geompy.MakeVertex(0, 0, 100) +Vertex_5 = geompy.MakeVertex(100, 0, 100) +Vertex_1.SetMarkerTexture(texture_1); +Vertex_2.SetMarkerTexture(texture_2); +Vertex_3.SetMarkerTexture(texture_3); +Vertex_4.SetMarkerStd(GEOM.MT_O_PLUS, GEOM.MS_25); +Vertex_5.SetMarkerStd(GEOM.MT_BALL, GEOM.MS_40); +geompy.addToStudy( Vertex_1, "Vertex_1" ) +geompy.addToStudy( Vertex_2, "Vertex_2" ) +geompy.addToStudy( Vertex_3, "Vertex_3" ) +geompy.addToStudy( Vertex_4, "Vertex_4" ) +geompy.addToStudy( Vertex_5, "Vertex_5" ) From 71b630d73e01164234e101ec9bcc2b8ef0a26cb6 Mon Sep 17 00:00:00 2001 From: vsr Date: Fri, 26 Nov 2021 13:38:12 +0300 Subject: [PATCH 2/2] Increment version: 9.8.0 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c92530fca..f1fd9d819 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,7 +38,7 @@ ENDIF() # Versioning # =========== -SALOME_SETUP_VERSION(9.7.0 DEVELOPMENT) +SALOME_SETUP_VERSION(9.8.0) MESSAGE(STATUS "Building ${PROJECT_NAME_UC} ${${PROJECT_NAME_UC}_VERSION} from \"${${PROJECT_NAME_UC}_GIT_SHA1}\"") # Find KERNEL