Skip to content

Commit

Permalink
Added waveform right-click on Δt to manually set.
Browse files Browse the repository at this point in the history
  • Loading branch information
mliberty1 committed Jul 19, 2023
1 parent 1802281 commit 715bc96
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 1 deletion.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ This file contains the list of changes made to pyjoulescope_ui.
When open files using file association, just view the file.
Does not affect "normal" configuration or open widgets.
* Fixed elided tab text in dock manager.
* Added manual "Report Issue" option.
* Added manual "Report Issue" option.
* Added waveform right-click on Δt to manually set.
* Renamed joulescope_ui.json to joulescope_ui.json_plus to avoid name collision.
* Bumped dependency versions:
* joulescope 1.1.7 -> 1.1.8
Expand Down
37 changes: 37 additions & 0 deletions joulescope_ui/widgets/waveform/waveform_widget.py
Original file line number Diff line number Diff line change
Expand Up @@ -2483,6 +2483,8 @@ def plot_mousePressEvent(self, event: QtGui.QMouseEvent):
elif y_name == 'x_axis':
if x_name.startswith('plot'):
self._menu_x_axis(event)
elif x_name.startswith('statistics'):
self._menu_dt(event)
elif y_name == 'summary':
self._menu_summary(event)

Expand Down Expand Up @@ -2816,6 +2818,41 @@ def _menu_plot(self, idx, event: QtGui.QMouseEvent):
style_action]
return self._menu_show(event)

def _menu_dt(self, event: QtGui.QMouseEvent):
self._log.info('_menu_dt(%s)', event.pos())
menu = QtWidgets.QMenu('Waveform context menu', self)
x0, x1 = self.x_range
interval = abs(x1 - x0) / time64.SECOND
interval_widget = IntervalWidget(self, interval)
interval_widget.value.connect(self._on_dt_interval)
interval_action = QtWidgets.QWidgetAction(menu)
interval_action.setDefaultWidget(interval_widget)
menu.addAction(interval_action)

self._menu = [menu, interval_widget, interval_action]
return self._menu_show(event)

def _on_dt_interval(self, dt):
e0, e1 = self._extents()
er = e1 - e0
dt = int(dt * time64.SECOND)
dt = min(dt, er)
if dt < er and self.pin_left and self.pin_right:
self.pin_left = False # unpin from left

x0, x1 = self.x_range
xc = (x1 + x0) // 2
dt_half = dt // 2
x0, x1 = xc - dt_half, xc + dt_half
if self.pin_left or x0 < e0:
x0, x1 = e0, e0 + dt
elif self.pin_right or x1 > e0:
x0, x1 = e1 - dt, e1
self.x_range = [x0, x1]
self._plot_data_invalidate()

self._repaint_request = True

def _menu_statistics(self, idx, event: QtGui.QMouseEvent):
self._log.info('_menu_statistics(%s, %s)', idx, event.pos())
menu = QtWidgets.QMenu('Waveform context menu', self)
Expand Down

0 comments on commit 715bc96

Please sign in to comment.