restructure meshing

This commit is contained in:
Theophile Terraz committed 2024-05-14 11:55:38 +02:00
1 parent 9d0168a9ee
commit 9e79178d0f
6 files changed
+200 -123

No files matched your search

+82 -5
View File
@@ -297,7 +297,8 @@ class MeshingWithMageMailleurTT(AMeshingTool):
directrices=['un', 'np'],
lplan: bool = False,
lm: int = 3,
linear: bool = False):
linear: bool = False,
origin_value = 0.0):
if reach is None or len(reach.profiles) == 0:
return reach
@@ -320,11 +321,12 @@ class MeshingWithMageMailleurTT(AMeshingTool):
logger.info(
f"! {self._exe_path()} " +
f"{st_file} {m_file} " +
f"mesh " +
f"{str(step)} " +
f"{limites[0]} {limites[1]} " +
f"{directrices[0]} {directrices[1]} " +
f"{lplan} {lm} {linear} " +
f"mesh {origin}"
f"{origin} "
)
proc.start(
self._exe_path(),
@@ -332,11 +334,86 @@ class MeshingWithMageMailleurTT(AMeshingTool):
map(
str,
[
st_file, m_file, step,
st_file, m_file,
"mesh", step,
limites[0], limites[1],
directrices[0], directrices[1],
lplan, lm, linear,
"mesh", origin
lplan, lm, linear, origin, origin_value
]
)
)
)
proc.waitForFinished()
if proc.exitCode() != 0:
logger.error(
f"{logger_color_red()}" +
f"MailleurTT error: {proc.exitCode()}" +
f"{logger_color_reset()}"
)
outputs = proc.readAllStandardOutput()
logger.debug(outputs)
errors = proc.readAllStandardError()
logger.error(
f"{logger_color_red()}{errors}{logger_color_reset()}"
)
return reach
self.import_m_file(reach, m_file)
return reach
def update_kp(self, reach,
step: float = 50,
limites=[-1, -1],
origin=0,
directrices=['un', 'np'],
lplan: bool = False,
lm: int = 3,
linear: bool = False,
origin_value = 0.0):
if reach is None or len(reach.profiles) == 0:
return reach
with tempfile.TemporaryDirectory() as tmp:
logger.debug(f"temp file: {tmp}")
st_file = self.export_reach_to_st(reach, tmp)
m_file = st_file.rsplit(".ST", 1)[0] + ".M"
os.sync()
proc = QProcess()
proc.setWorkingDirectory(tmp)
# Mage section indices start at 1
origin += 1
limites[0] += 1
limites[1] += 1
lplan = 1 if lplan else 0
linear = 1 if linear else 0
logger.info(
f"! {self._exe_path()} " +
f"{st_file} {m_file} " +
f"update_kp " +
f"{str(step)} " +
f"{limites[0]} {limites[1]} " +
f"{directrices[0]} {directrices[1]} " +
f"{lplan} {lm} {linear} " +
f"{origin} "
)
proc.start(
self._exe_path(),
list(
map(
str,
[
st_file, m_file,
"update_kp", step,
limites[0], limites[1],
directrices[0], directrices[1],
lplan, lm, linear, origin, origin_value
]
)
)