simplification

[modules/smesh.git] / src / Tools / Verima / Stats / getStats.py

diff --git a/src/Tools/Verima/Stats/getStats.py b/src/Tools/Verima/Stats/getStats.py
index 70abcef2504d43f172813877fdbd828850103dd4..ac410c0c75c6f4ba298bd7ff80317bba45c6fa4d 100644 (file)
--- a/src/Tools/Verima/Stats/getStats.py
+++ b/src/Tools/Verima/Stats/getStats.py
@@ -1,10 +1,26 @@
 # -*- coding: utf-8 -*-
+# Copyright (C) 2013-2021  EDF R&D
+#
+# 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
+#
 
 import os
 import logging
 
-
-
 # -----------------------------------------------------------------------------
 # --- satistiques maillage
 
@@ -18,12 +34,13 @@ def getGroupesRef(fichierMed):
       return liste
 
 
-def getStatsMaillage(maillage,fichierStatMaillage):
+def getStatsMaillage(maillage,fichierMed):
   """
   """
   logging.info('start')
 
   OK = False
+  fichier=fichierMed.replace('.med','.res')
   if maillage is not None:
     mesures = maillage.GetMeshInfo()
     txt=""
@@ -31,9 +48,8 @@ def getStatsMaillage(maillage,fichierStatMaillage):
     for i in range(len(mesures)):
       txt += str(SMESH.EntityType._item(i))+ " " +str(mesures[SMESH.EntityType._item(i)]) + "\n"
 
-    from utiles import writeFile
-    writeFile(fichierStatMaillage,txt)
-
+    from .utiles import writeFile
+    writeFile(fichier,txt)
 
 
 def getStatsGroupes(maillage,fichierMedResult):
@@ -43,7 +59,7 @@ def getStatsGroupes(maillage,fichierMedResult):
   fichierGroupe=fichierMedResult.replace('.med','_groupesRef.res')
   lGroups=getGroupesRef(fichierGroupe)
   if len(lGroups)==0: 
-    print "pas de Groupe de Reference "
+    print("pas de Groupe de Reference ")
     try :
       os.remove(fichierGroupe)
       return
@@ -64,20 +80,8 @@ def getStatsStatSurGroupes(maillage,groupe,fichierStatGroupe):
   import SMESH
   for i in range(len(mesures)):
       txt += str(SMESH.EntityType._item(i))+ " " +str(mesures[SMESH.EntityType._item(i)]) + "\n"
-  from utiles import writeFile
+  from .utiles import writeFile
   writeFile(fichierStatGroupe,txt)
 
-def genHistogram(aMesh, aCriterion, nbIntervals, isLog, aFile,theStudy):
-  import SMESH,SALOMEDS
-  from salome.smesh import smeshBuilder
-  smesh = smeshBuilder.New(theStudy)
-  aFunctor = smesh.GetFunctor(aCriterion)
-  aFunctor.SetMesh(aMesh.GetMesh())
-  histogram = aFunctor.GetHistogram(nbIntervals,isLog)
-  f = open(aFile, 'w')
-  for tranche in histogram:
-    f.write(str(tranche.min) + " " + str(tranche.max) +  " " + str(tranche.nbEvents) + "\n")
-    pass
-  f.close()