ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-01-24 06:20:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'V9_8_BR'

Browse Source
This commit is contained in:
vsr 2021-12-10 12:22:20 +03:00
commit 81ba4eae5b
2 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -38,7 +38,7 @@ ENDIF()
# Versioning
# ===========
SALOME_SETUP_VERSION(9.7.0 DEVELOPMENT)
SALOME_SETUP_VERSION(9.8.0 DEVELOPMENT)
MESSAGE(STATUS "Building ${PROJECT_NAME_UC} ${${PROJECT_NAME_UC}_VERSION} from \"${${PROJECT_NAME_UC}_GIT_SHA1}\"")
# Find KERNEL

42
src/GEOM_SWIG/GEOM_example7.py
View File

@ -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" )