Merge branch 'master' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr
|
After Width: | Height: | Size: 110 KiB |
|
After Width: | Height: | Size: 18 KiB |
|
After Width: | Height: | Size: 60 KiB |
|
After Width: | Height: | Size: 114 KiB |
|
After Width: | Height: | Size: 196 KiB |
|
After Width: | Height: | Size: 26 KiB |
|
After Width: | Height: | Size: 38 KiB |
|
After Width: | Height: | Size: 32 KiB |
|
|
@ -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):
|
||||||
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
|
||||||
|
|
||||||
|
|
|
||||||