when adjusting a shapefile, modify it's name with a suffix _adj or _split

diff --git a/doc/salome/examples/h023_extensionSimpleAmont.py b/doc/salome/examples/h023_extensionSimpleAmont.py
index da3c04b783a0dba2f1dad014585819e82c1353ef..e940332ff21e9058bc47e53b583730fb6388f763 100644 (file)
--- a/doc/salome/examples/h023_extensionSimpleAmont.py
+++ b/doc/salome/examples/h023_extensionSimpleAmont.py
@@ -46,8 +46,8 @@ from salome.hydrotools.hydroGeoMeshUtils import importPolylines, importBathymetr
 hydro_doc = HYDROData_Document.Document()
 hydro_doc.SetLocalCS( offsetX, offsetY )
 
-limites_original = importPolylines(hydro_doc, os.path.join(tmpdir, "garonne_2_brd_FreeBorders_split.shp"), 'garonne_2_brd_FreeBorders', True, 4)
-limites_domaine  = importPolylines(hydro_doc, os.path.join(tmpdir, "extension_1_2_adj.shp"), 'extension_1_2', False, 2)
+limites_original = importPolylines(hydro_doc, os.path.join(tmpdir, "garonne_2_brd_FreeBorders_split.shp"), 'garonne_2_brd_FreeBorders_split', True, 4)
+limites_domaine  = importPolylines(hydro_doc, os.path.join(tmpdir, "extension_1_2_adj.shp"), 'extension_1_2_adj', False, 2)
 
 limite_extension = mergePolylines(hydro_doc, 'limite_extension', [limites_original[0], limites_domaine[0]])
 

diff --git a/doc/salome/examples/h024_extensionSimpleAval.py b/doc/salome/examples/h024_extensionSimpleAval.py
index 65ff61ac27cc292c223cfedf14de8b7f4ef51cb2..1df99482afc57fdc5d8842bacde745b6060e59e0 100644 (file)
--- a/doc/salome/examples/h024_extensionSimpleAval.py
+++ b/doc/salome/examples/h024_extensionSimpleAval.py
@@ -46,8 +46,8 @@ from salome.hydrotools.hydroGeoMeshUtils import importPolylines, importBathymetr
 hydro_doc = HYDROData_Document.Document()
 hydro_doc.SetLocalCS( offsetX, offsetY )
 
-limites_original = importPolylines(hydro_doc, os.path.join(tmpdir, "garonne_2_brd_FreeBorders_split.shp"), 'garonne_2_brd_FreeBorders', True, 4)
-limites_domaine  = importPolylines(hydro_doc, os.path.join(tmpdir, "extension_1_3_adj.shp"), 'extension_1_3', False, 2)
+limites_original = importPolylines(hydro_doc, os.path.join(tmpdir, "garonne_2_brd_FreeBorders_split.shp"), 'garonne_2_brd_FreeBorders_split', True, 4)
+limites_domaine  = importPolylines(hydro_doc, os.path.join(tmpdir, "extension_1_3_adj.shp"), 'extension_1_3_adj', False, 2)
 
 limite_extension = mergePolylines(hydro_doc, 'limite_extension', [limites_original[1], limites_domaine[1]])
 

diff --git a/doc/salome/examples/h025_extensionSimpleRiveDroite.py b/doc/salome/examples/h025_extensionSimpleRiveDroite.py
index d4b2831881c5f9b4ee3119f6dddcd5f7ffa1462b..fda878fad531f8522baa724fd56649122c3408bb 100644 (file)
--- a/doc/salome/examples/h025_extensionSimpleRiveDroite.py
+++ b/doc/salome/examples/h025_extensionSimpleRiveDroite.py
@@ -46,8 +46,8 @@ from salome.hydrotools.hydroGeoMeshUtils import importPolylines, importBathymetr
 hydro_doc = HYDROData_Document.Document()
 hydro_doc.SetLocalCS( offsetX, offsetY )
 
-limites_original = importPolylines(hydro_doc, os.path.join(tmpdir, "garonne_2_brd_FreeBorders_split.shp"), 'garonne_2_brd_FreeBorders', True, 4)
-limites_domaine  = importPolylines(hydro_doc, os.path.join(tmpdir, "extension_3_1_adj.shp"), 'extension_3_1', False, 2)
+limites_original = importPolylines(hydro_doc, os.path.join(tmpdir, "garonne_2_brd_FreeBorders_split.shp"), 'garonne_2_brd_FreeBorders_split', True, 4)
+limites_domaine  = importPolylines(hydro_doc, os.path.join(tmpdir, "extension_3_1_adj.shp"), 'extension_3_1_adj', False, 2)
 
 limite_extension = mergePolylines(hydro_doc, 'limite_extension', [limites_original[0], limites_domaine[0]])
 

diff --git a/doc/salome/examples/h026_extensionSimpleRiveGauche.py b/doc/salome/examples/h026_extensionSimpleRiveGauche.py
index 9f6e68ba2605cd426bfaba9116cdfcbe63912cdf..475cbd023d91f1e4f438505badf1232e96afa082 100644 (file)
--- a/doc/salome/examples/h026_extensionSimpleRiveGauche.py
+++ b/doc/salome/examples/h026_extensionSimpleRiveGauche.py
@@ -46,8 +46,8 @@ from salome.hydrotools.hydroGeoMeshUtils import importPolylines, importBathymetr
 hydro_doc = HYDROData_Document.Document()
 hydro_doc.SetLocalCS( offsetX, offsetY )
 
-limites_original = importPolylines(hydro_doc, os.path.join(tmpdir, "garonne_2_brd_FreeBorders_split.shp"), 'garonne_2_brd_FreeBorders', True, 4)
-limites_domaine  = importPolylines(hydro_doc, os.path.join(tmpdir, "extension_3_2_adj.shp"), 'extension_3_2', False, 2)
+limites_original = importPolylines(hydro_doc, os.path.join(tmpdir, "garonne_2_brd_FreeBorders_split.shp"), 'garonne_2_brd_FreeBorders_split', True, 4)
+limites_domaine  = importPolylines(hydro_doc, os.path.join(tmpdir, "extension_3_2_adj.shp"), 'extension_3_2_adj', False, 2)
 
 limite_extension = mergePolylines(hydro_doc, 'limite_extension', [limites_original[0], limites_domaine[1]])
 

diff --git a/doc/salome/examples/h029_regroupMeshesNonEnglobant.py b/doc/salome/examples/h029_regroupMeshesNonEnglobant.py
index c8c14e70f3abd1203fa35ccacfb5f3a2d7bec39c..c8e56b24dcfae4de63bc4c4add9e8ce47470c90b 100644 (file)
--- a/doc/salome/examples/h029_regroupMeshesNonEnglobant.py
+++ b/doc/salome/examples/h029_regroupMeshesNonEnglobant.py
@@ -54,7 +54,7 @@ fitShapePointsToMesh(os.path.join(tmpdir, "garonneAval_brd_FreeBorders.shp"),
 # TODO: if limites_aval imported as spline, problem on mesh with 2D triangle algorithm
 #limites_aval = importPolylines(hydro_doc, os.path.join(tmpdir, "garonneAval_brd_FreeBorders.shp"), 'garonneAval_brd_FreeBorders', True, 4)
 limites_aval = importPolylines(hydro_doc, os.path.join(tmpdir, "garonneAval_brd_FreeBorders.shp"), 'garonneAval_brd_FreeBorders', False, 4)
-limites_domaine1  = importPolylines(hydro_doc, os.path.join(tmpdir, "raccord_4_1_adj.shp"), 'raccord_4_1', False, 2)
+limites_domaine1  = importPolylines(hydro_doc, os.path.join(tmpdir, "raccord_4_1_adj.shp"), 'raccord_4_1_adj', False, 2)
 
 fitShapePointsToMesh(os.path.join(tmpdir, "garonneAmont_brd_FreeBorders.shp"),
                      os.path.join(tmpdir, 'raccord_4_1_adj.shp'),
@@ -64,7 +64,7 @@ fitShapePointsToMesh(os.path.join(tmpdir, "garonneAmont_brd_FreeBorders.shp"),
 # TODO: if limites_amont imported as spline, problem on mesh with 2D triangle algorithm
 #limites_amont = importPolylines(hydro_doc, os.path.join(tmpdir, "garonneAmont_brd_FreeBorders.shp"), 'garonneAmont_brd_FreeBorders', True, 5)
 limites_amont = importPolylines(hydro_doc, os.path.join(tmpdir, "garonneAmont_brd_FreeBorders.shp"), 'garonneAmont_brd_FreeBorders', False, 5)
-limites_domaine  = importPolylines(hydro_doc, os.path.join(tmpdir, "raccord_4_1_adj_adj.shp"), 'raccord_4_1_adj', False, 2)
+limites_domaine  = importPolylines(hydro_doc, os.path.join(tmpdir, "raccord_4_1_adj_adj.shp"), 'raccord_4_1_adj_adj', False, 2)
 
 Cloud_02 = importBathymetry(hydro_doc, os.path.join(HYDRO_SAMPLES, "Cloud_02.xyz"))
 

diff --git a/src/HYDROTools/shapesGroups.py b/src/HYDROTools/shapesGroups.py
index a5ffb49716a072afd7a78cd99fed460280986c5d..7f3b7e0b99794aaa46ea6c239253c48f092a2746 100644 (file)
--- a/src/HYDROTools/shapesGroups.py
+++ b/src/HYDROTools/shapesGroups.py
@@ -309,7 +309,7 @@ def fitShapePointsToMesh(freeBorderShapefile, shapefileToAdjust, outputDirectory
         outputDirectory = os.path.dirname(shapefileToAdjust)
     a = os.path.splitext(os.path.basename(shapefileToAdjust))
     shapefileAdjusted = os.path.join(outputDirectory, a[0] + '_adj' + a[1])
-    chainName = a[0]
+    chainName = a[0] + '_adj'
 
     w = shapefile.Writer(shapefileAdjusted)
     w.shapeType = 3
@@ -359,7 +359,7 @@ def fitShapePointsToMesh(freeBorderShapefile, shapefileToAdjust, outputDirectory
             outputDirectory = os.path.dirname(freeBorderShapefile)
         a = os.path.splitext(os.path.basename(freeBorderShapefile))
         freeBorderSplit = os.path.join(outputDirectory, a[0] + '_split' + a[1])
-        chainName = a[0]
+        chainName = a[0] + '_split'
 
         w = shapefile.Writer(freeBorderSplit)
         w.shapeType = 3