Commit c4da75fe authored by Theophile Terraz's avatar Theophile Terraz
Browse files

Merge branch 'master' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr

No related merge requests found
Pipeline #58826 failed with stages
in 2 minutes and 1 second
Showing with 11 additions and 2 deletions
+11 -2
doc/images/wiki/fr_cond-initiales.png

110 KB

doc/images/wiki/fr_cond-limites.png

18.3 KB

doc/images/wiki/fr_edit-cond-limites.png

59.8 KB

doc/images/wiki/fr_edit_geometrie.png

114 KB

doc/images/wiki/fr_geometrie.png

196 KB

doc/images/wiki/fr_meshing_geometrie.png

26.3 KB

doc/images/wiki/fr_nouvelle-etude.png

38.3 KB

doc/images/wiki/fr_reseau.png

32.5 KB

...@@ -632,8 +632,8 @@ class Reach(SQLSubModel): ...@@ -632,8 +632,8 @@ class Reach(SQLSubModel):
try: try:
list_profile, list_header = self.read_file_st(str(file_path_name)) list_profile, list_header = self.read_file_st(str(file_path_name))
profile_header = ["num", "code1", profile_header = ["num", "code1", "code2",
"code2", "nb_point", "rk", "name"] "nb_point", "rk", "name"]
if list_profile and list_header: if list_profile and list_header:
for ind, profile in enumerate(list_profile): for ind, profile in enumerate(list_profile):
...@@ -707,6 +707,15 @@ class Reach(SQLSubModel): ...@@ -707,6 +707,15 @@ class Reach(SQLSubModel):
line_is_header = True line_is_header = True
else: else:
list_point_profile.append(line) list_point_profile.append(line)
elif len(line) > 4:
x, y, z = line[:3]
if stop_code in x and stop_code in y:
line_is_header = True
list_profile.append(list_point_profile)
list_point_profile = []
else:
line.append("")
list_point_profile.append(line[:3])
else: else:
pass pass
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment