Commit 83aa6a57 authored by Pierre-Antoine Rouby's avatar Pierre-Antoine Rouby
Browse files

Results, Plots: Fix icon paths.

Showing with 17 additions and 6 deletions
+17 -6
...@@ -16,9 +16,10 @@ ...@@ -16,9 +16,10 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import os
import logging import logging
from datetime import datetime
from datetime import datetime
from tools import trace, timer from tools import trace, timer
from View.Tools.PamhyrWindow import PamhyrWindow from View.Tools.PamhyrWindow import PamhyrWindow
...@@ -69,6 +70,14 @@ class ResultsWindow(PamhyrWindow): ...@@ -69,6 +70,14 @@ class ResultsWindow(PamhyrWindow):
_pamhyr_ui = "Results" _pamhyr_ui = "Results"
_pamhyr_name = "Results" _pamhyr_name = "Results"
def _path_file(self, filename):
return os.path.abspath(
os.path.join(
os.path.dirname(__file__),
"..", "..", filename
)
)
def __init__(self, study=None, config=None, def __init__(self, study=None, config=None,
solver=None, results=None, solver=None, results=None,
parent=None): parent=None):
...@@ -124,13 +133,15 @@ class ResultsWindow(PamhyrWindow): ...@@ -124,13 +133,15 @@ class ResultsWindow(PamhyrWindow):
self._slider_time.setMaximum(len(self._timestamps) - 1) self._slider_time.setMaximum(len(self._timestamps) - 1)
self._slider_time.setValue(len(self._timestamps) - 1) self._slider_time.setValue(len(self._timestamps) - 1)
file_path = os.path.abspath(os.path.dirname(__file__))
self._icon_start = QIcon() self._icon_start = QIcon()
self._icon_start.addPixmap( self._icon_start.addPixmap(
QPixmap('./src/View/ui/ressources/media-playback-start.png') QPixmap(f'{file_path}/../ui/ressources/media-playback-start.png')
) )
self._icon_pause = QIcon() self._icon_pause = QIcon()
self._icon_pause.addPixmap( self._icon_pause.addPixmap(
QPixmap('./src/View/ui/ressources/media-playback-pause.png') QPixmap(f'{file_path}/../ui/ressources/media-playback-pause.png')
) )
self._button_play = self.find(QPushButton, f"playButton") self._button_play = self.find(QPushButton, f"playButton")
self._button_play.setIcon(self._icon_start) self._button_play.setIcon(self._icon_start)
......
...@@ -98,7 +98,7 @@ class PamhyrPlotToolbar(NavigationToolbar2QT): ...@@ -98,7 +98,7 @@ class PamhyrPlotToolbar(NavigationToolbar2QT):
icon_zoom = QtGui.QIcon() icon_zoom = QtGui.QIcon()
icon_zoom.addPixmap(QtGui.QPixmap( icon_zoom.addPixmap(QtGui.QPixmap(
os.path.abspath(f"{file_path}/../ui/ressources/zoom.png") os.path.abspath(f"{file_path}/../../ui/ressources/zoom.png")
)) ))
icons.append(("zoom", icon_zoom)) icons.append(("zoom", icon_zoom))
...@@ -122,7 +122,7 @@ class PamhyrPlotToolbar(NavigationToolbar2QT): ...@@ -122,7 +122,7 @@ class PamhyrPlotToolbar(NavigationToolbar2QT):
icon_btn_isometric_view.addPixmap( icon_btn_isometric_view.addPixmap(
QtGui.QPixmap( QtGui.QPixmap(
os.path.abspath( os.path.abspath(
f"{file_path}/../ui/ressources/zoom_fit_11.png" f"{file_path}/../../ui/ressources/zoom_fit_11.png"
) )
) )
) )
...@@ -131,7 +131,7 @@ class PamhyrPlotToolbar(NavigationToolbar2QT): ...@@ -131,7 +131,7 @@ class PamhyrPlotToolbar(NavigationToolbar2QT):
icon_btn_global_view.addPixmap( icon_btn_global_view.addPixmap(
QtGui.QPixmap( QtGui.QPixmap(
os.path.abspath( os.path.abspath(
f"{file_path}/../ui/ressources/zoom_fit.png" f"{file_path}/../../ui/ressources/zoom_fit.png"
) )
) )
) )
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment