From: vsr <vsr@opencascade.com>
Date: Fri, 20 Feb 2015 14:41:54 +0000 (+0300)
Subject: 0022879: [CEA 1426] TestMeasureOperations fails
X-Git-Tag: V7_6_0a1~39
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=3ddada8e5219bdb234f974327830be362b83b627;p=modules%2Fgeom.git

0022879: [CEA 1426] TestMeasureOperations fails
---

diff --git a/src/GEOM_SWIG/GEOM_Nut.py b/src/GEOM_SWIG/GEOM_Nut.py
index 2f425a420..219c3bfc0 100755
--- a/src/GEOM_SWIG/GEOM_Nut.py
+++ b/src/GEOM_SWIG/GEOM_Nut.py
@@ -75,10 +75,10 @@ Fillet_1 = geompy.MakeFillet(Common_1, 10, geompy.ShapeType["EDGE"], [5])
 geompy.addToStudy(Fillet_1, "Fillet_1")
 
 #Chamfer applying
-Chamfer_1 = geompy.MakeChamferEdge(Fillet_1, 10, 10, 16, 50 )
+Chamfer_1 = geompy.MakeChamferEdge(Fillet_1, 10, 10, 15, 49 )
 geompy.addToStudy(Chamfer_1, "Chamfer_1")
 
-Chamfer_2 = geompy.MakeChamferEdge(Chamfer_1, 10, 10, 21, 31 )
+Chamfer_2 = geompy.MakeChamferEdge(Chamfer_1, 10, 10, 20, 30 )
 geompy.addToStudy(Chamfer_2, "Chamfer_2")
 
 #Import of the shape from "slots.brep"
diff --git a/src/GEOM_SWIG/GEOM_TestMeasures.py b/src/GEOM_SWIG/GEOM_TestMeasures.py
index 6384a2853..87c9a0d11 100644
--- a/src/GEOM_SWIG/GEOM_TestMeasures.py
+++ b/src/GEOM_SWIG/GEOM_TestMeasures.py
@@ -21,6 +21,8 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
+import salome_version
+
 def TestMeasureOperations (geompy, math):
 
   p0   = geompy.MakeVertex(0 ,  0,  0)
@@ -58,9 +60,10 @@ def TestMeasureOperations (geompy, math):
 
   ####### Detect Fast intersection #######
 
-  cylinder = geompy.MakeCylinderRH(100, 300)
-  if geompy.FastIntersect(box, cylinder) == False:
-    raise RuntimeError, "Existing intersection is not detected"
+  if salome_version.getXVersion() > "0x70501":
+    cylinder = geompy.MakeCylinderRH(100, 300)
+    if geompy.FastIntersect(box, cylinder)[0] == False:
+      raise RuntimeError, "Existing intersection is not detected"
 
   ####### WhatIs #######