From 815b2c8211566f1c7a094f24aee3657aa4bd7b2f Mon Sep 17 00:00:00 2001 From: =?utf8?q?G=C3=A9rald=20NICOLAS?= Date: Wed, 21 Jun 2023 09:19:58 +0200 Subject: [PATCH] ajout d'un test --- ...{TestmidSurface.py => TestmidSurface_1.py} | 0 src/PythonAddons/Test/TestmidSurface_2.py | 52 +++++++++++++++++++ .../macros/midSurface/surfaceMediane.py | 12 ----- src/PythonAddons/tests.set | 3 +- 4 files changed, 54 insertions(+), 13 deletions(-) rename src/PythonAddons/Test/{TestmidSurface.py => TestmidSurface_1.py} (100%) create mode 100755 src/PythonAddons/Test/TestmidSurface_2.py diff --git a/src/PythonAddons/Test/TestmidSurface.py b/src/PythonAddons/Test/TestmidSurface_1.py similarity index 100% rename from src/PythonAddons/Test/TestmidSurface.py rename to src/PythonAddons/Test/TestmidSurface_1.py diff --git a/src/PythonAddons/Test/TestmidSurface_2.py b/src/PythonAddons/Test/TestmidSurface_2.py new file mode 100755 index 000000000..77c56a38d --- /dev/null +++ b/src/PythonAddons/Test/TestmidSurface_2.py @@ -0,0 +1,52 @@ +# Copyright (C) 2014-2021 CEA/DEN, 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 +# + +from salome.shaper import model +from ModelAPI import * + +import os + +aSession = ModelAPI_Session.get() + +def getFilePath(fileName): + path = os.path.join(os.getenv("SHAPER_ROOT_DIR"), "bin", "salome", "macros", "midSurface") + return os.path.join(path, fileName) + +theFile = getFilePath("midSurface.stp") + +aSession.startOperation("Create part for mid surface") +aPartFeature = aSession.moduleDocument().addFeature("Part") +aSession.finishOperation() +aPart = aSession.activeDocument() + +aSession.startOperation("Import file") +aFeatureKind = "midSurface" +anImportFeature = aPart.addFeature(aFeatureKind) +aFieldName = "file_path" +aFile = anImportFeature.string(aFieldName) +aFile.setValue(theFile) +aSession.finishOperation() + +#for cle in ("Bodies", "Groups", "Construction", "Folders"): + #print (cle,":",aPart.size(cle)) + +assert(aPart.size("Bodies") == 8), "Right number of construction: {}".format(aPart.size("Bodies")) +assert(aPart.size("Construction") == 7), "Right number of construction: {}".format(aPart.size("Construction")) +assert(aPart.size("Groups") == 2), "Right number of construction: {}".format(aPart.size("Groups")) +assert(aPart.size("Folders") == 4), "Wrong number of folders: {}".format(aPart.size("Folders")) diff --git a/src/PythonAddons/macros/midSurface/surfaceMediane.py b/src/PythonAddons/macros/midSurface/surfaceMediane.py index 6675949a5..1e47e41d2 100755 --- a/src/PythonAddons/macros/midSurface/surfaceMediane.py +++ b/src/PythonAddons/macros/midSurface/surfaceMediane.py @@ -199,8 +199,6 @@ Sorties : objet_0 = objet.result() else: objet_0 = objet - #print (dir(objet)) - #print (dir(objet_0)) # 2. On descend dans l'arborescence des sous-objets jusqu'à en trouver un qui n'en n'a pas @@ -572,11 +570,7 @@ Sorties : # 1. Extraction du solide remove_subshapes = model.addRemoveSubShapes(self.part_doc, model.selection("COMPOUND", self.objet_principal.name())) - #exec_nom (remove_subshapes) - #print ('remove_subshapes = model.addRemoveSubShapes(part_doc, model.selection("COMPOUND", "{}"))'.format(self.objet_principal.name())) remove_subshapes.setSubShapesToKeep([model.selection("SOLID", solide.name())]) - #print ('remove_subshapes.setSubShapesToKeep([model.selection("SOLID", "{}")])'.format(solide.name())) - #exec_nom (remove_subshapes) self.nom_solide_aux = "{}_S".format(solide.name()) if self._verbose_max: @@ -880,9 +874,6 @@ Sorties : if face is not None: self._cree_face_mediane_0 ( face, n_recur ) - if self._verbose_max: - print_tab (n_recur, "Sortie de "+blabla) - return erreur, face #=========================== Fin de la méthode ================================== @@ -920,9 +911,6 @@ Entrées : # 4. Changement de statut pour le solide self.d_statut_so[self.nom_solide] = 1 - if self._verbose_max: - print_tab (n_recur, "Sortie de _cree_face_mediane_0") - #=========================== Fin de la méthode ================================== #=========================== Début de la méthode ================================= diff --git a/src/PythonAddons/tests.set b/src/PythonAddons/tests.set index 62f6853ce..66bdf4d73 100644 --- a/src/PythonAddons/tests.set +++ b/src/PythonAddons/tests.set @@ -22,7 +22,8 @@ SET(TEST_NAMES TestRectangleCentered.py TestcompoundVertices.py TestimportParameters.py - TestmidSurface.py + TestmidSurface_1.py + TestmidSurface_2.py TestpipeNetwork_2par2.py TestpipeNetwork_parligne.py ) -- 2.39.2