Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit '6600bcec782fc8b6c72871fe6e08bd19a34a4e2b'
[modules/smesh.git]
/
src
/
Tools
/
blocFissure
/
gmu
/
sortGeneratrices.py
diff --git
a/src/Tools/blocFissure/gmu/sortGeneratrices.py
b/src/Tools/blocFissure/gmu/sortGeneratrices.py
index 579151700cd82faedd9ed3a02dd2763579d1a076..8615c6b2be25e45423486fb8e7ba65144b718ad4 100644
(file)
--- a/
src/Tools/blocFissure/gmu/sortGeneratrices.py
+++ b/
src/Tools/blocFissure/gmu/sortGeneratrices.py
@@
-1,5
+1,5
@@
# -*- coding: utf-8 -*-
# -*- coding: utf-8 -*-
-# Copyright (C) 2014-202
0 EDF R&D
+# Copyright (C) 2014-202
3 EDF
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@
-17,15
+17,14
@@
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
+"""tri par longueur des 3 generatrices"""
import logging
import logging
+
from .geomsmesh import geompy
from .geomsmesh import geompy
-from .geomsmesh import geomPublish
from .geomsmesh import geomPublishInFather
from .geomsmesh import geomPublishInFather
-from . import initLog
-# -----------------------------------------------------------------------------
-# --- tri par longueur des 3 generatrices
+from . import initLog
def sortGeneratrices(tore, geners):
"""
def sortGeneratrices(tore, geners):
"""
@@
-38,24
+37,23
@@
def sortGeneratrices(tore, geners):
genx = geompy.ExtractShapes(geners[0], geompy.ShapeType["EDGE"], True)
genx = geompy.ExtractShapes(geners[0], geompy.ShapeType["EDGE"], True)
- lenx =
[]
- for
i in range(len(genx))
:
- props = geompy.BasicProperties(gen
x[i]
)
+ lenx =
list()
+ for
gene in genx
:
+ props = geompy.BasicProperties(gen
e
)
lenx.append(props[0])
lenx.append(props[0])
- pass
+
minlen = min(lenx)
maxlen = max(lenx)
genext=None
gencnt=None
genint=None
minlen = min(lenx)
maxlen = max(lenx)
genext=None
gencnt=None
genint=None
- for i
in range(len(genx)
):
- if lenx[i] == minlen:
- genint = gen
x[i]
- elif lenx[i] == maxlen:
- genext = gen
x[i]
+ for i
_aux, gene in enumerate(genx
):
+ if lenx[i
_aux
] == minlen:
+ genint = gen
e
+ elif lenx[i
_aux
] == maxlen:
+ genext = gen
e
else:
else:
- gencnt= genx[i]
- pass
+ gencnt= gene
geomPublishInFather(initLog.debug, tore, genext, 'genext' )
geomPublishInFather(initLog.debug, tore, genint, 'genint' )
geomPublishInFather(initLog.debug, tore, genext, 'genext' )
geomPublishInFather(initLog.debug, tore, genint, 'genint' )