diff --git a/src/View/Results/Window.py b/src/View/Results/Window.py
index a5114ba957adaa857211ab1fb521eb9684cc154c..75682ed557915fd4945b304e4e4e0e4b639b470a 100644
--- a/src/View/Results/Window.py
+++ b/src/View/Results/Window.py
@@ -132,6 +132,8 @@ class ResultsWindow(PamhyrWindow):
self._button_play.setIcon(self._icon_start)
self._button_back = self.find(QPushButton, f"backButton")
self._button_next = self.find(QPushButton, f"nextButton")
+ self._button_first = self.find(QPushButton, f"firstButton")
+ self._button_last = self.find(QPushButton, f"lastButton")
self._timer = QTimer(self)
def setup_plot(self):
@@ -324,6 +326,8 @@ class ResultsWindow(PamhyrWindow):
self._button_play.clicked.connect(self._pause)
self._button_back.clicked.connect(self._back)
self._button_next.clicked.connect(self._next)
+ self._button_first.clicked.connect(self._first)
+ self._button_last.clicked.connect(self._last)
self._timer.timeout.connect(self._update_slider)
def update_table_selection_reach(self, ind):
@@ -554,10 +558,24 @@ class ResultsWindow(PamhyrWindow):
def _back(self):
self._slider_time.setValue(self._slider_time.value()-1)
+ def _first(self):
+ self._slider_time.setValue(self._slider_time.minimum())
+
+ def _last(self):
+ self._slider_time.setValue(self._slider_time.maximum())
+
def _pause(self):
if self._button_play.isChecked():
+ self._button_next.setEnabled(False)
+ self._button_back.setEnabled(False)
+ self._button_first.setEnabled(False)
+ self._button_last.setEnabled(False)
self._timer.start(100)
self._button_play.setIcon(self._icon_pause)
else:
self._timer.stop()
+ self._button_next.setEnabled(True)
+ self._button_back.setEnabled(True)
+ self._button_first.setEnabled(True)
+ self._button_last.setEnabled(True)
self._button_play.setIcon(self._icon_start)
diff --git a/src/View/ui/GeometryReach.ui b/src/View/ui/GeometryReach.ui
index e09d9d359ac1e163f710498e2a1f2214c1e17ff9..a11a2279caabc72fba0a586e430b2d86a9a60899 100644
--- a/src/View/ui/GeometryReach.ui
+++ b/src/View/ui/GeometryReach.ui
@@ -6,7 +6,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>1280</width>
+ <width>868</width>
<height>720</height>
</rect>
</property>
@@ -19,78 +19,80 @@
<widget class="QWidget" name="centralwidget">
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QSplitter" name="splitter_3">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <widget class="QTableView" name="tableView"/>
- <widget class="QSplitter" name="splitter_2">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <widget class="QSplitter" name="splitter">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <widget class="QWidget" name="verticalLayoutWidget">
- <layout class="QVBoxLayout" name="verticalLayout"/>
- </widget>
- <widget class="QWidget" name="verticalLayoutWidget_2">
- <layout class="QVBoxLayout" name="verticalLayout_2"/>
- </widget>
- </widget>
- <widget class="QWidget" name="verticalLayoutWidget_3">
- <layout class="QVBoxLayout" name="verticalLayout_3"/>
- </widget>
- </widget>
- </widget>
- </item>
- <item>
- <layout class="QVBoxLayout" name="verticalLayout_4">
+ <widget class="QSplitter" name="splitter_3">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <widget class="QWidget" name="horizontalLayoutWidget">
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QTableView" name="tableView"/>
+ </item>
<item>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <layout class="QVBoxLayout" name="verticalLayout_5">
<item>
- <widget class="QSlider" name="verticalSlider">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
+ <widget class="QPushButton" name="pushButton_up">
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset>
+ <normaloff>ressources/go-up2.png</normaloff>ressources/go-up2.png</iconset>
</property>
- <property name="invertedAppearance">
- <bool>true</bool>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QSlider" name="verticalSlider">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="invertedAppearance">
+ <bool>true</bool>
+ </property>
+ <property name="invertedControls">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushButton_down">
+ <property name="text">
+ <string/>
</property>
- <property name="invertedControls">
- <bool>true</bool>
+ <property name="icon">
+ <iconset>
+ <normaloff>ressources/go-down1.png</normaloff>ressources/go-down1.png</iconset>
</property>
</widget>
</item>
</layout>
</item>
- <item>
- <widget class="QPushButton" name="pushButton_up">
- <property name="text">
- <string/>
- </property>
- <property name="icon">
- <iconset>
- <normaloff>ressources/go-up2.png</normaloff>ressources/go-up2.png</iconset>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="pushButton_down">
- <property name="text">
- <string/>
- </property>
- <property name="icon">
- <iconset>
- <normaloff>ressources/go-down1.png</normaloff>ressources/go-down1.png</iconset>
- </property>
- </widget>
- </item>
</layout>
- </item>
- </layout>
+ </widget>
+ <widget class="QSplitter" name="splitter_2">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <widget class="QSplitter" name="splitter">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <widget class="QWidget" name="verticalLayoutWidget">
+ <layout class="QVBoxLayout" name="verticalLayout"/>
+ </widget>
+ <widget class="QWidget" name="verticalLayoutWidget_2">
+ <layout class="QVBoxLayout" name="verticalLayout_2"/>
+ </widget>
+ </widget>
+ <widget class="QWidget" name="verticalLayoutWidget_3">
+ <layout class="QVBoxLayout" name="verticalLayout_3"/>
+ </widget>
+ </widget>
+ </widget>
</item>
</layout>
</widget>
@@ -99,7 +101,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>1280</width>
+ <width>868</width>
<height>22</height>
</rect>
</property>
diff --git a/src/View/ui/Results.ui b/src/View/ui/Results.ui
index 54666dd983eb3d0e85fc568d695422b8625e41bd..9d879e2dc5ffacf071ac91ba7369ac386794c0a0 100644
--- a/src/View/ui/Results.ui
+++ b/src/View/ui/Results.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>942</width>
- <height>740</height>
+ <width>874</width>
+ <height>745</height>
</rect>
</property>
<property name="windowTitle">
@@ -17,6 +17,12 @@
<locale language="English" country="Europe"/>
</property>
<widget class="QWidget" name="centralwidget">
+ <property name="minimumSize">
+ <size>
+ <width>874</width>
+ <height>0</height>
+ </size>
+ </property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<widget class="QSplitter" name="splitter_4">
@@ -28,9 +34,28 @@
<enum>Qt::Vertical</enum>
</property>
<widget class="QTableView" name="tableView_reach"/>
- <widget class="QTableView" name="tableView_profile"/>
+ <widget class="QWidget" name="">
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QTableView" name="tableView_profile"/>
+ </item>
+ <item>
+ <widget class="QSlider" name="verticalSlider_profile">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="invertedAppearance">
+ <bool>true</bool>
+ </property>
+ <property name="invertedControls">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
</widget>
- <widget class="QWidget" name="layoutWidget">
+ <widget class="QWidget" name="">
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<widget class="QTabWidget" name="tabWidget">
@@ -107,21 +132,19 @@
</widget>
</widget>
</item>
- <item row="0" column="1">
- <widget class="QSlider" name="verticalSlider_profile">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="invertedAppearance">
- <bool>true</bool>
- </property>
- <property name="invertedControls">
- <bool>true</bool>
- </property>
- </widget>
- </item>
<item row="1" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QPushButton" name="firstButton">
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset>
+ <normaloff>ressources/media-skip-backward.png</normaloff>ressources/media-skip-backward.png</iconset>
+ </property>
+ </widget>
+ </item>
<item>
<widget class="QPushButton" name="backButton">
<property name="text">
@@ -174,6 +197,17 @@
</property>
</widget>
</item>
+ <item>
+ <widget class="QPushButton" name="lastButton">
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset>
+ <normaloff>ressources/media-skip-forward.png</normaloff>ressources/media-skip-forward.png</iconset>
+ </property>
+ </widget>
+ </item>
<item>
<widget class="QSlider" name="horizontalSlider_time">
<property name="orientation">
@@ -194,7 +228,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>942</width>
+ <width>874</width>
<height>22</height>
</rect>
</property>