parouby
/
Pamhyr2
mirror of https://gitlab.com/pamhyr/pamhyr2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pamhyr: Some hot fixes...

setup.py journees-modelisation-2024-4
Pierre-Antoine Rouby 2024-01-30 16:23:00 +01:00
parent f4ca2650e5
commit 34c9fbd77a
4 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Meshing/Mage.py
View File

@ -294,7 +294,7 @@ class MeshingWithMageMailleurTT(AMeshingTool):
proc = QProcess() proc = QProcess()
proc.setWorkingDirectory(tmp) proc.setWorkingDirectory(tmp)
logger.debug(f"mailleurTT '{st_file}, {m_file}, {str(step)}'") logger.debug(f"! mailleurTT {st_file} {m_file} {str(step)}")
proc.start( proc.start(
self._exe_path(), [st_file, m_file, str(step)] self._exe_path(), [st_file, m_file, str(step)]
) )

3
src/Solver/Mage.py
View File

@ -1200,8 +1200,9 @@ class Mage8(Mage):
logger.info(f"read_gra: ... end with {len(ts)} timestamp read") logger.info(f"read_gra: ... end with {len(ts)} timestamp read")
@timer @timer
def results(self, study, repertory, qlog=None): def results(self, study, repertory, qlog=None, name=None):
self._study = study self._study = study
if name is None:
name = study.name.replace(" ", "_") name = study.name.replace(" ", "_")
results = super(Mage8, self).results(study, repertory, qlog, name=name) results = super(Mage8, self).results(study, repertory, qlog, name=name)

12
src/View/Geometry/Window.py
View File

@ -530,16 +530,16 @@ class GeometryWindow(PamhyrWindow):
def _undo(self): def _undo(self):
self._table.undo() self._table.undo()
self.select_current_profile() self.select_current_profile()
self.update_plot_ac() # self.update_plot_ac()
self.update_plot_xy() # self.update_plot_xy()
self.update_plot_kpc() # self.update_plot_kpc()
def _redo(self): def _redo(self):
self._table.redo() self._table.redo()
self.select_current_profile() self.select_current_profile()
self.update_plot_ac() # self.update_plot_ac()
self.update_plot_xy() # self.update_plot_xy()
self.update_plot_kpc() # self.update_plot_kpc()
def export_to_file(self): def export_to_file(self):
settings = QSettings( settings = QSettings(

7
src/View/MainWindow.py
View File

@ -843,15 +843,19 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
if self._last_results is None: if self._last_results is None:
results = solver.results( results = solver.results(
self._study, self._study,
self._solver_workdir(solver) self._solver_workdir(solver),
) )
# Open from file # Open from file
if type(results) is str: if type(results) is str:
logger.info(f"Open results from {os.path.dirname(results)}") logger.info(f"Open results from {os.path.dirname(results)}")
name = os.path.basename(results).replace(".BIN", "")
results = solver.results( results = solver.results(
self._study, self._study,
os.path.dirname(results), os.path.dirname(results),
name=name
) )
# No results available # No results available
@ -918,6 +922,7 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
if dialog.exec_(): if dialog.exec_():
file_name = dialog.selectedFiles() file_name = dialog.selectedFiles()
logger.info(f"Select results: {file_name}")
self.open_solver_results( self.open_solver_results(
self._last_solver, self._last_solver,
results=file_name[0] results=file_name[0]