Remove obsolete conditionals

[modules/geom.git] / src / GEOM_SWIG / GEOM_TestMeasures.py

diff --git a/src/GEOM_SWIG/GEOM_TestMeasures.py b/src/GEOM_SWIG/GEOM_TestMeasures.py
index 08d341090085406aa348dd18934c54c64d171fff..2aed6d6a5a2c3c4bb7c1454883956a1998f7c126 100644 (file)
--- a/src/GEOM_SWIG/GEOM_TestMeasures.py
+++ b/src/GEOM_SWIG/GEOM_TestMeasures.py
@@ -1,24 +1,26 @@
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#  -*- coding: iso-8859-1 -*-
+# Copyright (C) 2007-2014  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
+# 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.
+# 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.
+# 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
+# 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
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 def TestMeasureOperations (geompy, math):
 
   p0   = geompy.MakeVertex(0 ,  0,  0)
@@ -39,18 +41,38 @@ def TestMeasureOperations (geompy, math):
 
   ####### CheckShape #######
 
-  IsValid = geompy.CheckShape(box)
+  (IsValid, err) = geompy.CheckShape(box, 0, 2)
   if IsValid == 0:
+    geompy.PrintShapeError(box, err)
     raise RuntimeError, "Invalid box created"
   else:
     print "\nBox is valid"
 
+  ####### Detect Self-intersections #######
+
+  [Face_1,Face_2] = geompy.SubShapes(box, [33, 23])
+  Translation_1 = geompy.MakeTranslation(Face_1, 5, -15, -40)
+  Compound_1 = geompy.MakeCompound([Face_2, Translation_1])
+  if geompy.CheckSelfIntersections(Compound_1) == True:
+    raise RuntimeError, "Existing self-intersection is not detected"
+
   ####### WhatIs #######
 
   Descr = geompy.WhatIs(box)
   print "\nBox 10x30x70 description:"
   print Descr
 
+  ####### NbShapes #######
+
+  NbSolids = geompy.NbShapes(box, geompy.ShapeType["SOLID"])
+  print "\nBox 10x30x70 quantity of solids:", NbSolids
+
+  ####### ShapeInfo #######
+
+  BoxInfo = geompy.ShapeInfo(box)
+  print "\nBox 10x30x70 shapes:"
+  print BoxInfo
+
   ####### BasicProperties #######
 
   Props = geompy.BasicProperties(box)
@@ -77,6 +99,8 @@ def TestMeasureOperations (geompy, math):
   print " Xmin = ", BB[0], ", Xmax = ", BB[1]
   print " Ymin = ", BB[2], ", Ymax = ", BB[3]
   print " Zmin = ", BB[4], ", Zmax = ", BB[5]
+  BB = geompy.MakeBoundingBox(box)
+  geompy.addToStudy(BB, "BoundingBox")
 
   ####### Inertia #######
 
@@ -113,7 +137,7 @@ def TestMeasureOperations (geompy, math):
 
   ####### GetNormal #######
 
-  faces = geompy.SubShapeAllSorted(box, geompy.ShapeType["FACE"])
+  faces = geompy.SubShapeAllSortedCentres(box, geompy.ShapeType["FACE"])
   face0 = faces[0]
   vnorm = geompy.GetNormal(face0)
   if vnorm is None:
@@ -142,6 +166,16 @@ def TestMeasureOperations (geompy, math):
   print "\nMinimal distance between Box and Cube = ", MinDistComps[0]
   print "Its components are  (", MinDistComps[1], ", ", MinDistComps[2], ", ", MinDistComps[3], ")"
 
+  # Get all closest points
+  [nbSols, listCoords] = geompy.ClosestPoints(box, cube)
+  for i in range(nbSols):
+    v1 = geompy.MakeVertex(listCoords[i*6 + 0], listCoords[i*6 + 1], listCoords[i*6 + 2])
+    v2 = geompy.MakeVertex(listCoords[i*6 + 3], listCoords[i*6 + 4], listCoords[i*6 + 5])
+
+    geompy.addToStudy(v1, 'MinDist_%d_on_Box'%(i+1))
+    geompy.addToStudy(v2, 'MinDist_%d_on_Cube'%(i+1))
+    pass
+
   ####### Angle #######
 
   OX  = geompy.MakeVectorDXDYDZ(10, 0,0)