diff --git a/src/Solver/Mage.py b/src/Solver/Mage.py index 8fdf25a0..697f8809 100644 --- a/src/Solver/Mage.py +++ b/src/Solver/Mage.py @@ -556,7 +556,8 @@ class Mage8(Mage): for bound in bounds: name = f"{bound.node.id:3}".replace(" ", "x") f.write(f"* {bound.node.name} ({name}) {bound.bctype}\n") - f.write(f"${name}\n") + f.write(f"${name} 0.002 1 default\n") + # f.write(f"${name}\n") header = bound.header f.write(f"*{header[0]:>9}|{header[1]:>10}\n") diff --git a/src/View/Plot/navigation_toolbar_2qt.py b/src/View/Plot/navigation_toolbar_2qt.py index a2f6ce31..ec57078d 100644 --- a/src/View/Plot/navigation_toolbar_2qt.py +++ b/src/View/Plot/navigation_toolbar_2qt.py @@ -76,9 +76,11 @@ class PamHyrNavigationToolbar2QT(NavigationToolbar2QT): icon_zoom = QtGui.QIcon() icon_zoom.addPixmap(QtGui.QPixmap( - f"{os.path.dirname(os.path.dirname(file_path))}/resources/icons/zoom.png" + os.path.abspath(f"{file_path}/../ui/ressources/zoom.png") )) + logger.info(os.path.abspath(f"{file_path}/../ui/ressources/zoom.png")) + icons.append(("zoom",icon_zoom)) if "iso" in items: @@ -98,13 +100,11 @@ class PamHyrNavigationToolbar2QT(NavigationToolbar2QT): icon_btn_isometric_view = QtGui.QIcon() icon_btn_isometric_view.addPixmap( - QtGui.QPixmap(f"{os.path.dirname(os.path.dirname(file_path))}/resources" - f"/icons/zoom_fit_11.png")) + QtGui.QPixmap(os.path.abspath(f"{file_path}/../ui/ressources/zoom_fit_11.png"))) icon_btn_global_view = QtGui.QIcon() icon_btn_global_view.addPixmap( - QtGui.QPixmap(f"{os.path.dirname(os.path.dirname(file_path))}/resources/icons" - f"/zoom_fit.png")) + QtGui.QPixmap(os.path.abspath(f"{file_path}/../ui/ressources/zoom_fit.png"))) icons.append(("isometric_view", icon_btn_isometric_view)) icons.append(("non_isometric_view", icon_btn_global_view)) @@ -175,12 +175,11 @@ class PamHyrNavigationToolbar2QT(NavigationToolbar2QT): self.my_canvas.figure.canvas.draw_idle() def toolitems_translation(self): - self._actions['home'].setToolTip(_translate("Toolbar", "Vue originale")) - self._actions['back'].setToolTip(_translate("Toolbar", "Retour à la vue précédente")) - self._actions['forward'].setToolTip(_translate("Toolbar", "Passer à la vue suivante")) - self._actions['pan'].setToolTip(_translate("Toolbar", "Panoramique des axes avec la " - "souris gauche, zoom avec la droite")) + self._actions['home'].setToolTip(_translate("Toolbar", "Default view")) + self._actions['back'].setToolTip(_translate("Toolbar", "Back to previous view")) + self._actions['forward'].setToolTip(_translate("Toolbar", "Return to next view")) + self._actions['pan'].setToolTip(_translate("Toolbar", "Axes panoramic")) self._actions['zoom'].setToolTip(_translate("Toolbar", "Zoom")) - self._actions['save_figure'].setToolTip(_translate("Toolbar", "Enregistrer la figure")) - self.action_isometric_view.setToolTip(_translate("Toolbar", "Vue isométrique (Shift+W)")) - self.action_auto_global_view.setToolTip(_translate("Toolbar", "Vue globale automatique (Shift+X)")) + self._actions['save_figure'].setToolTip(_translate("Toolbar", "Save the figure")) + self.action_isometric_view.setToolTip(_translate("Toolbar", "Isometric view (Shift+W)")) + self.action_auto_global_view.setToolTip(_translate("Toolbar", "Auto scale view (Shift+X)"))