mirror of
https://gitlab.com/pamhyr/pamhyr2.git
synced 2026-10-30 03:20:41 +01:00
geometry: Cleanup some piece of code.
This commit is contained in:
1 parent
0d08ca3889
commit
8782056b1c
7 files changed
+101
-326
No files matched your search
@@ -88,6 +88,6 @@ class Profile(object):
|
||||
"""
|
||||
return self._profile_type
|
||||
|
||||
@type.setter
|
||||
@profile_type.setter
|
||||
def profile_type(self, value: str):
|
||||
self._profile_type = value
|
||||
+13
-13
@@ -13,17 +13,13 @@ from Model.Geometry.ProfileXYZ import ProfileXYZ
|
||||
from Model.Except import FileFormatError, exception_message_box
|
||||
|
||||
class Reach:
|
||||
def __init__(self, edge):
|
||||
self._edge = edge
|
||||
def __init__(self, parent):
|
||||
self._parent = parent
|
||||
self._profiles: List[Profile] = []
|
||||
|
||||
# Copy/Paste
|
||||
self.__list_copied_profiles = []
|
||||
|
||||
def __repr__(self):
|
||||
return f"\n===== Début liste des profils ======> {np.array(self._profiles)}" \
|
||||
f"\n<====== Fin liste des profils ====="
|
||||
|
||||
def profile(self, i):
|
||||
"""Returns profile at index i
|
||||
|
||||
@@ -38,6 +34,10 @@ class Reach:
|
||||
|
||||
return None
|
||||
|
||||
@property
|
||||
def name(self):
|
||||
return self._parent.name
|
||||
|
||||
@property
|
||||
def profiles(self):
|
||||
return self._profiles.copy()
|
||||
@@ -79,8 +79,9 @@ class Reach:
|
||||
nb_profile = self.number_profiles
|
||||
profile = ProfileXYZ()
|
||||
profile.num = nb_profile + 1
|
||||
|
||||
self._profiles.insert(profile, index + 1)
|
||||
# self._update_profile_numbers()
|
||||
self._update_profile_numbers()
|
||||
|
||||
def _update_profile_numbers(self):
|
||||
"""Update profiles index
|
||||
@@ -101,6 +102,7 @@ class Reach:
|
||||
Nothing.
|
||||
"""
|
||||
profile = ProfileXYZ()
|
||||
|
||||
self._profiles.insert(index, profile)
|
||||
self._update_profile_numbers()
|
||||
|
||||
@@ -117,7 +119,6 @@ class Reach:
|
||||
if list_index:
|
||||
indices = sorted(list(set(list_index)), reverse=True)
|
||||
for idx in indices:
|
||||
# if idx < len(self._profiles) :
|
||||
try:
|
||||
self._profiles.pop(idx)
|
||||
self._update_profile_numbers()
|
||||
@@ -217,7 +218,7 @@ class Reach:
|
||||
print(e)
|
||||
e.alert()
|
||||
|
||||
def read_file_st(self):
|
||||
def read_file_st(self, filename):
|
||||
"""Read the ST file
|
||||
|
||||
Returns:
|
||||
@@ -230,7 +231,7 @@ class Reach:
|
||||
list_header = []
|
||||
stop_code = "999.999"
|
||||
|
||||
with open(self.file_st, encoding="utf-8") as file_st:
|
||||
with open(filename, encoding="utf-8") as file_st:
|
||||
for line in file_st:
|
||||
if not (line.startswith("#") or line.startswith("*")):
|
||||
line = line.split()
|
||||
@@ -267,12 +268,11 @@ class Reach:
|
||||
pass
|
||||
|
||||
if list_profile and list_header:
|
||||
raise FileFormatError(self.file_st, f"{list_profile}, {list_header}")
|
||||
raise FileFormatError(filename, f"{list_profile}, {list_header}")
|
||||
|
||||
print("****** Fichier {} lu et traité en {} secondes *******".format(self.file_st, time() - t0))
|
||||
print("****** Fichier {} lu et traité en {} secondes *******".format(filename, time() - t0))
|
||||
return list_profile, list_header
|
||||
|
||||
|
||||
# TODO: Move this function to model reach
|
||||
def export_reach(self, filename):
|
||||
with open(f"{filename}", "w") as file_st:
|
||||
|
||||
Reference in new issue
Block a user