diff --git a/src/Meshing/Mage.py b/src/Meshing/Mage.py index b39c25a2dc7bbe14c1f63552b84b113de2b82ca0..6150e59cf764f62624116b189f623b86c7ff0554 100644 --- a/src/Meshing/Mage.py +++ b/src/Meshing/Mage.py @@ -294,7 +294,7 @@ class MeshingWithMageMailleurTT(AMeshingTool): proc = QProcess() 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( self._exe_path(), [st_file, m_file, str(step)] ) diff --git a/src/Solver/Mage.py b/src/Solver/Mage.py index 8330767babcf33c22b453c02369d17cfe7d40dcd..bb552375e60072f9892aca958c5c2ef42ea446b7 100644 --- a/src/Solver/Mage.py +++ b/src/Solver/Mage.py @@ -1200,9 +1200,10 @@ class Mage8(Mage): logger.info(f"read_gra: ... end with {len(ts)} timestamp read") @timer - def results(self, study, repertory, qlog=None): + def results(self, study, repertory, qlog=None, name=None): self._study = study - name = study.name.replace(" ", "_") + if name is None: + name = study.name.replace(" ", "_") results = super(Mage8, self).results(study, repertory, qlog, name=name) self.read_gra(study, repertory, results, qlog, name=name) diff --git a/src/View/Geometry/Window.py b/src/View/Geometry/Window.py index f746c9c4fd032ae5bd3b7c807a3e61e9d398488e..b69531bd94571f02d9bbbc6c253a7457ced6add8 100644 --- a/src/View/Geometry/Window.py +++ b/src/View/Geometry/Window.py @@ -530,16 +530,16 @@ class GeometryWindow(PamhyrWindow): def _undo(self): self._table.undo() self.select_current_profile() - self.update_plot_ac() - self.update_plot_xy() - self.update_plot_kpc() + # self.update_plot_ac() + # self.update_plot_xy() + # self.update_plot_kpc() def _redo(self): self._table.redo() self.select_current_profile() - self.update_plot_ac() - self.update_plot_xy() - self.update_plot_kpc() + # self.update_plot_ac() + # self.update_plot_xy() + # self.update_plot_kpc() def export_to_file(self): settings = QSettings( diff --git a/src/View/MainWindow.py b/src/View/MainWindow.py index 8eacbd5b06e75c980d20ab5e9524b58fce579945..2a86b85cb0e513b0a11b7de6a19b50d81a5075ba 100644 --- a/src/View/MainWindow.py +++ b/src/View/MainWindow.py @@ -843,15 +843,19 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit): if self._last_results is None: results = solver.results( self._study, - self._solver_workdir(solver) + self._solver_workdir(solver), ) # Open from file if type(results) is str: logger.info(f"Open results from {os.path.dirname(results)}") + + name = os.path.basename(results).replace(".BIN", "") + results = solver.results( self._study, os.path.dirname(results), + name=name ) # No results available @@ -918,6 +922,7 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit): if dialog.exec_(): file_name = dialog.selectedFiles() + logger.info(f"Select results: {file_name}") self.open_solver_results( self._last_solver, results=file_name[0]