From: NATHALIE GORE <ng13417n@dsp0897499.atlas.edf.fr>
Date: Wed, 20 Nov 2019 09:54:45 +0000 (+0100)
Subject: Fix boulette
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Fngo%2FAddFilter;p=modules%2Fshaper.git

Fix boulette
---

diff --git a/src/FiltersPlugin/FiltersPlugin_SameNormalFaces.py b/src/FiltersPlugin/FiltersPlugin_SameNormalFaces.py
index 856d578cc..6a85bf554 100644
--- a/src/FiltersPlugin/FiltersPlugin_SameNormalFaces.py
+++ b/src/FiltersPlugin/FiltersPlugin_SameNormalFaces.py
@@ -17,6 +17,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
+import math
 
 from ModelAPI import *
 from GeomAPI import *
@@ -51,7 +52,7 @@ class FiltersPlugin_SameNormalFaces(ModelAPI_Filter):
   def isOk(self, theShape, theResult, theArgs):
     """ True if theShape is applicable for the filter """
 
-    selectedShapeAttr = modelAPI_AttributeSelection(theArgs.argument("SameNormalFaces"))
+    selectedShapeAttr = modelAPI_AttributeSelection(theArgs.argument("Face"))
     if selectedShapeAttr is None:
       return False
     selectedShape = selectedShapeAttr.value()
@@ -62,7 +63,7 @@ class FiltersPlugin_SameNormalFaces(ModelAPI_Filter):
 
     Face = GeomAPI_Face(theShape)
     if not Face.isPlanar():
-        return self.myCached[selectedShape]
+        return False
     Plane = Face.getPlane()
     Normal = Plane.direction()
     if selectedPlane.intersect(Plane) is None and selectedNormal.angle(Normal) < math.pi/360:
@@ -76,7 +77,7 @@ class FiltersPlugin_SameNormalFaces(ModelAPI_Filter):
 
   def initAttributes(self, theArgs):
     """ Initializes arguments of a filter """
-    theArgs.initAttribute("SameNormalFaces", ModelAPI_AttributeSelection_typeId())
+    theArgs.initAttribute("Face", ModelAPI_AttributeSelection_typeId())
 
   def adjacentFaces(self, theFace, theMapSA, theShapeType, theApplicableFaces, theRecursive = True):
     """ Find all faces neighbour to theFace """
diff --git a/src/FiltersPlugin/filter-SameNormalFaces.xml b/src/FiltersPlugin/filter-SameNormalFaces.xml
index dd7a251a2..3ec0dd023 100644
--- a/src/FiltersPlugin/filter-SameNormalFaces.xml
+++ b/src/FiltersPlugin/filter-SameNormalFaces.xml
@@ -1,5 +1,5 @@
 <filter id="SameNormalFaces">
-  <shape_selector id="SameNormalFaces__SameNormalFaces"
+  <shape_selector id="SameNormalFaces__Face"
                   label="Planes:"
                   tooltip="Select planes or planar faces."
                   shape_types="faces">