Update of CheckDone

[modules/smesh.git] / src / Tools / blocFissure / gmu / facesVolumesToriques.py

diff --git a/src/Tools/blocFissure/gmu/facesVolumesToriques.py b/src/Tools/blocFissure/gmu/facesVolumesToriques.py
index 9826ab9a9206a85cd91dbe589cf8ad02576b85ad..a17880dfbcf29efadf7dd8a88687be1303cf36b8 100644 (file)
--- a/src/Tools/blocFissure/gmu/facesVolumesToriques.py
+++ b/src/Tools/blocFissure/gmu/facesVolumesToriques.py
@@ -1,17 +1,34 @@
 # -*- coding: utf-8 -*-
+# Copyright (C) 2014-2024  EDF
+#
+# 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
+#
+"""Tore : aces toriques et volumes du tore"""
 
 import logging
+
+from . import initLog
+
 from .geomsmesh import geompy
-from .geomsmesh import geomPublish
 from .geomsmesh import geomPublishInFather
-from . import initLog
+
 from .extractionOrientee import extractionOrientee
 from .getSubshapeIds import getSubshapeIds
 
-# -----------------------------------------------------------------------------
-# --- TORE
-# --- faces toriques  et volumes du tore
-
 def facesVolumesToriques(tore, plan, facesDefaut):
   """
   Extraction des deux faces  et volumes du tore partitionné, qui suivent la génératrice elliptique.
@@ -25,28 +42,25 @@ def facesVolumesToriques(tore, plan, facesDefaut):
   normal = geompy.GetNormal(plan, centre)
   reference = geompy.MakeTranslationVector(centre, normal)
 
-  [facesInPlan, facesOutPlan, facesOnPlan] = extractionOrientee(plan, tore, reference, "FACE", 1.e-2, "faceTorePlan_")
-  [facesInSide, facesOutSide, facesOnSide] = extractionOrientee(facesDefaut, tore, reference, "FACE", 1.e-2, "faceTorePeau_")
+  [facesInPlan, facesOutPlan, _] = extractionOrientee(plan, tore, reference, "FACE", 1.e-2, "faceTorePlan_")
   facesIdInPlan = getSubshapeIds(tore, facesInPlan)
   facesIdOutPlan = getSubshapeIds(tore, facesOutPlan)
+
+  [_, _, facesOnSide] = extractionOrientee(facesDefaut, tore, reference, "FACE", 1.e-2, "faceTorePeau_")
   facesIdOnSide = getSubshapeIds(tore, facesOnSide)
-  facesIdInSide = getSubshapeIds(tore, facesInSide)
-  facesIdOutSide = getSubshapeIds(tore, facesOutSide)
-  #facesIdInOutSide = facesIdInSide + facesIdOutSide
+
   facetore1 = None
-  faceTore2 = None
-  for i, faceId in enumerate(facesIdInPlan):
+  for i_aux, faceId in enumerate(facesIdInPlan):
     if faceId not in facesIdOnSide:
-      facetore1 = facesInPlan[i]
+      facetore1 = facesInPlan[i_aux]
       break
-  for i, faceId in enumerate(facesIdOutPlan):
+  geomPublishInFather(initLog.debug, tore, facetore1, 'facetore1' )
+
+  facetore2 = None
+  for i_aux, faceId in enumerate(facesIdOutPlan):
     if faceId not in facesIdOnSide:
-      facetore2 = facesOutPlan[i]
+      facetore2 = facesOutPlan[i_aux]
       break
-
-  #[facetore1,facetore2] = geompy.GetShapesOnShape(pipe0, tore, geompy.ShapeType["FACE"], GEOM.ST_ON)
-
-  geomPublishInFather(initLog.debug, tore, facetore1, 'facetore1' )
   geomPublishInFather(initLog.debug, tore, facetore2, 'facetore2' )
 
   [volumeTore1, volumeTore2] = geompy.ExtractShapes(tore, geompy.ShapeType["SOLID"], True)