Commentaires

diff --git a/src/PythonAddons/Test/TestpipeNetwork_2par2.py b/src/PythonAddons/Test/TestpipeNetwork_2par2.py
index 90a82cc04a698597bf4261b17c25035c21885e01..40fad6c33d8740563689b276c06694ce758a750a 100755 (executable)
--- a/src/PythonAddons/Test/TestpipeNetwork_2par2.py
+++ b/src/PythonAddons/Test/TestpipeNetwork_2par2.py
@@ -16,9 +16,9 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
-"""Test de la création du réseau de tuyaux"""
+"""Test de la création du réseau de tuyaux - Description des lignes par paquets de 2 noeuds"""
 
-__revision__ = "V01.03"
+__revision__ = "V02.01"
 
 import os
 
@@ -31,8 +31,7 @@ def getFilePath(fileName):
     path = os.path.join(os.getenv("SHAPER_ROOT_DIR"), "bin", "salome", "macros", "pipeNetwork")
     return os.path.join(path, fileName)
 
-#theFile = getFilePath("pipeNetwork_2par2.txt")
-theFile = getFilePath("pipeNetwork_ligne.txt")
+theFile = getFilePath("pipeNetwork_2par2.txt")
 
 aSession.startOperation("Create part for pipe network")
 aPartFeature = aSession.moduleDocument().addFeature("Part")
@@ -47,6 +46,6 @@ aFile = anImportFeature.string(aFieldName)
 aFile.setValue(theFile)
 aSession.finishOperation()
 
-assert(aPart.size("Construction") == 46), "Right number of construction: {}".format(aPart.size("Construction"))
+assert(aPart.size("Construction") == 42), "Right number of construction: {}".format(aPart.size("Construction"))
 
 assert(aPart.size("Folders") == 1), "Right number of folders: {}".format(aPart.size("Folders"))

diff --git a/src/PythonAddons/Test/TestpipeNetwork_parligne.py b/src/PythonAddons/Test/TestpipeNetwork_parligne.py
index 90a82cc04a698597bf4261b17c25035c21885e01..f0f0d46cad9a87536cee21d5e8ada64bc3d1833f 100755 (executable)
--- a/src/PythonAddons/Test/TestpipeNetwork_parligne.py
+++ b/src/PythonAddons/Test/TestpipeNetwork_parligne.py
@@ -16,9 +16,9 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
-"""Test de la création du réseau de tuyaux"""
+"""Test de la création du réseau de tuyaux - Description par ligne entière"""
 
-__revision__ = "V01.03"
+__revision__ = "V01.04"
 
 import os
 
@@ -31,7 +31,6 @@ def getFilePath(fileName):
     path = os.path.join(os.getenv("SHAPER_ROOT_DIR"), "bin", "salome", "macros", "pipeNetwork")
     return os.path.join(path, fileName)
 
-#theFile = getFilePath("pipeNetwork_2par2.txt")
 theFile = getFilePath("pipeNetwork_ligne.txt")
 
 aSession.startOperation("Create part for pipe network")

diff --git a/src/PythonAddons/macros/pipeNetwork/feature.py b/src/PythonAddons/macros/pipeNetwork/feature.py
index 5f95840307b2a9c090c64f00558a53a5bed8f416..f1bcf0b2a5c695d3c764bef27adbd4df6a0872e4 100755 (executable)
--- a/src/PythonAddons/macros/pipeNetwork/feature.py
+++ b/src/PythonAddons/macros/pipeNetwork/feature.py
@@ -23,7 +23,7 @@ Author: Nathalie GORE - Gérald NICOLAS
 Remarque : la fonction de partitionnement pour un futur maillage en hexa est désactivée.
 """
 
-__revision__ = "V02.15"
+__revision__ = "V02.16"
 
 from salome.shaper import model
 import ModelAPI
@@ -59,7 +59,7 @@ class pipeNetwork(model.Feature):
     infoPoints = dict()
     connectivities = dict()
 
-    _verbose = True
+    _verbose = False
     _verbose_max = False
 
 # Feature initializations