Skip to content
Snippets Groups Projects
Commit 9f687dd9 authored by JOSSOUD Olivier's avatar JOSSOUD Olivier
Browse files

IcbkTransition. Display distance to _hovered_ transition instead of _selected_ transition.

parent 75487a39
No related branches found
No related tags found
No related merge requests found
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QLabel" name="label_distancetoselected"> <widget class="QLabel" name="label_distancetohovered">
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
......
...@@ -84,10 +84,10 @@ class Ui_IcbktransitionDialog(object): ...@@ -84,10 +84,10 @@ class Ui_IcbktransitionDialog(object):
self.horizontalLayout_2.addWidget(self.checkbox_reftime_disable) self.horizontalLayout_2.addWidget(self.checkbox_reftime_disable)
spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
self.horizontalLayout_2.addItem(spacerItem) self.horizontalLayout_2.addItem(spacerItem)
self.label_distancetoselected = QtWidgets.QLabel(IcbktransitionDialog) self.label_distancetohovered = QtWidgets.QLabel(IcbktransitionDialog)
self.label_distancetoselected.setText("") self.label_distancetohovered.setText("")
self.label_distancetoselected.setObjectName("label_distancetoselected") self.label_distancetohovered.setObjectName("label_distancetohovered")
self.horizontalLayout_2.addWidget(self.label_distancetoselected) self.horizontalLayout_2.addWidget(self.label_distancetohovered)
spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum) spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
self.horizontalLayout_2.addItem(spacerItem1) self.horizontalLayout_2.addItem(spacerItem1)
self.label_cursor = QtWidgets.QLabel(IcbktransitionDialog) self.label_cursor = QtWidgets.QLabel(IcbktransitionDialog)
......
...@@ -109,7 +109,6 @@ class IcbktransitionUim: ...@@ -109,7 +109,6 @@ class IcbktransitionUim:
def __unselect_transition__(self): def __unselect_transition__(self):
self.selected_transition = None self.selected_transition = None
self.icbktransition_ui.label_distancetoselected.setText("")
self.__paint_transitions_in_table__() self.__paint_transitions_in_table__()
self.__paint_transitions_in_plot__() self.__paint_transitions_in_plot__()
...@@ -135,8 +134,10 @@ class IcbktransitionUim: ...@@ -135,8 +134,10 @@ class IcbktransitionUim:
if len(df.index) == 0: if len(df.index) == 0:
self.hovered_transition = None self.hovered_transition = None
self.icbktransition_ui.label_distancetohovered.setText("")
else: else:
self.hovered_transition = df.loc[[df["interval"].idxmin()]].index[0] self.hovered_transition = df.loc[[df["interval"].idxmin()]].index[0]
self.__update_distance_to_hovered_transition(timestamp_sec)
self.__paint_transitions_in_plot__() self.__paint_transitions_in_plot__()
self.__paint_transitions_in_table__() self.__paint_transitions_in_table__()
...@@ -294,8 +295,6 @@ class IcbktransitionUim: ...@@ -294,8 +295,6 @@ class IcbktransitionUim:
if self.selected_transition is None: if self.selected_transition is None:
self.__mark_hovered_transition__(mouse_point.x()) self.__mark_hovered_transition__(mouse_point.x())
else:
self.__update_distance_to_selected_transition(mouse_point.x())
def __mouse_clicked__(self, event: MouseClickEvent) -> None: def __mouse_clicked__(self, event: MouseClickEvent) -> None:
"""Function triggered when the user clicks on the plot. Display a vertical line under the mouse click and call """Function triggered when the user clicks on the plot. Display a vertical line under the mouse click and call
...@@ -406,16 +405,16 @@ class IcbktransitionUim: ...@@ -406,16 +405,16 @@ class IcbktransitionUim:
pos_x = pos_x.toUTC() pos_x = pos_x.toUTC()
self.icbktransition_ui.timeedit_cursor.setDateTime(pos_x) self.icbktransition_ui.timeedit_cursor.setDateTime(pos_x)
def __update_distance_to_selected_transition(self, timestamp_sec: int): def __update_distance_to_hovered_transition(self, timestamp_sec: int):
selected_transition_info = self.icbktransition_prvd.transitions_df.iloc[self.selected_transition] hovered_transition_info = self.icbktransition_prvd.transitions_df.iloc[self.hovered_transition]
# Distance in seconds # Distance in seconds
distance_sec = timestamp_sec - selected_transition_info["timestamp"] distance_sec = timestamp_sec - hovered_transition_info["timestamp"]
# Distance in mm # Distance in mm
position_selected = self.icbktransition_prvd.get_encoder_height_at(selected_transition_info["datetime"]) position_hovered = self.icbktransition_prvd.get_encoder_height_at(hovered_transition_info["datetime"])
position_cursor = self.icbktransition_prvd.get_encoder_height_at(pd.Timestamp(timestamp_sec*10**9, tz="UTC")) position_cursor = self.icbktransition_prvd.get_encoder_height_at(pd.Timestamp(timestamp_sec*10**9, tz="UTC"))
distance_mm = position_cursor - position_selected distance_mm = position_cursor - position_hovered
self.icbktransition_ui.label_distancetoselected.setText( self.icbktransition_ui.label_distancetohovered.setText(
"Distance to selected: " + "{:.1f}".format(distance_sec) + "s & " + "{:.1f}".format(distance_mm) + "mm") "Distance to hovered: " + "{:.1f}".format(distance_sec) + "s & " + "{:.1f}".format(distance_mm) + "mm")
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment