Merge branch 'V9_2_BR'

This commit is contained in:
vsr 2018-12-10 17:26:08 +03:00
commit 1aa43a9db3
3 changed files with 83 additions and 3 deletions

View File

@ -33,11 +33,11 @@ ENDIF(WIN32)
STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC) STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
SET(${PROJECT_NAME_UC}_MAJOR_VERSION 9) SET(${PROJECT_NAME_UC}_MAJOR_VERSION 9)
SET(${PROJECT_NAME_UC}_MINOR_VERSION 1) SET(${PROJECT_NAME_UC}_MINOR_VERSION 2)
SET(${PROJECT_NAME_UC}_PATCH_VERSION 0) SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
SET(${PROJECT_NAME_UC}_VERSION SET(${PROJECT_NAME_UC}_VERSION
${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION}) ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
SET(${PROJECT_NAME_UC}_VERSION_DEV 0) SET(${PROJECT_NAME_UC}_VERSION_DEV 1)
# Common CMake macros # Common CMake macros
# =================== # ===================

View File

@ -24,6 +24,6 @@ SALOME_CONFIGURE_FILE(VERSION.in VERSION INSTALL ${SALOME_INSTALL_BINS})
# =============================================================== # ===============================================================
SET(_bin_scripts SET(_bin_scripts
addvars2notebook_GEOM.py geom_setenv.py addvars2notebook_GEOM.py geom_setenv.py geom_test.py
) )
SALOME_INSTALL_SCRIPTS("${_bin_scripts}" ${SALOME_INSTALL_SCRIPT_SCRIPTS}) SALOME_INSTALL_SCRIPTS("${_bin_scripts}" ${SALOME_INSTALL_SCRIPT_SCRIPTS})

80
bin/geom_test.py Normal file
View File

@ -0,0 +1,80 @@
# -*- coding: iso-8859-1 -*-
# Copyright (C) 2018 CEA/DEN, EDF R&D, OPEN CASCADE
#
# 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
#
import unittest
class TestGeometry(unittest.TestCase):
def setUp(self):
import salome
salome.salome_init()
def processGuiEvents(self):
import salome
if salome.sg.hasDesktop():
salome.sg.updateObjBrowser();
import SalomePyQt
SalomePyQt.SalomePyQt().processEvents()
def test_geometry(self):
"""Quick test for Geometry module"""
print()
print('Testing Geometry module')
from salome.geom import geomBuilder
geompy = geomBuilder.New()
# ---- create box
print('... Create box')
box = geompy.MakeBox(0., 0., 0., 100., 200., 300, theName='box')
self.assertIsNotNone(box)
self.assertEqual(box.GetName(), 'box')
self.processGuiEvents()
# ---- extract shell from box
print('... Extract shell from box')
shells = geompy.SubShapeAll(box, geompy.ShapeType['SHELL'], theName=['shell'])
self.assertEqual(len(shells), 1)
shell = shells[0]
self.assertIsNotNone(shell)
self.assertEqual(shell.GetName(), 'shell')
self.processGuiEvents()
# ---- extract faces from box
print('... Extract faces from box')
faces = geompy.SubShapeAll(box, geompy.ShapeType['FACE'], theName='face')
self.assertEqual(len(faces), 6)
for i, face in enumerate(faces):
self.assertIsNotNone(face)
self.assertEqual(face.GetName(), 'face_{}'.format(i+1))
self.processGuiEvents()
# ---- extract edges from 1st face
print('... Extract edges from 1st face')
edges = geompy.SubShapeAll(faces[0], geompy.ShapeType['EDGE'], theName='edge')
self.assertEqual(len(edges), 4)
for i, edge in enumerate(edges):
self.assertIsNotNone(edge)
self.assertEqual(edge.GetName(), 'edge_{}'.format(i+1))
self.processGuiEvents()
if __name__ == '__main__':
unittest.main()