Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Add clear timeline button #41

Closed
wants to merge 2 commits into from
Closed

[WIP] Add clear timeline button #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
073b1d9
Save last directory opened to load a bag file
VictorLamoine Apr 4, 2019
35d2753
Add clear timeline button
VictorLamoine Apr 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion rqt_bag/resource/bag_widget.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,16 @@
<property name="spacing">
<number>0</number>
</property>
<property name="margin">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
Expand Down Expand Up @@ -54,6 +63,16 @@
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="clear_timeline_button">
<property name="toolTip">
<string>Clear timeline</string>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="save_button">
<property name="toolTip">
Expand Down
11 changes: 11 additions & 0 deletions rqt_bag/src/rqt_bag/bag_timeline.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,17 @@ def add_bag(self, bag):

self._timeline_frame.index_cache_cv.notify()

def clear(self):
"""
clears all previously loaded bags
"""
# FIXME Wrong
self._playhead_positions.clear()
self._messages_cvs.clear()
self._message_loaders.clear()
self._timeline_frame.reset_timeline()
del self._bags[:]

def file_size(self):
with self._bag_lock:
return sum(b.size for b in self._bags)
Expand Down
28 changes: 26 additions & 2 deletions rqt_bag/src/rqt_bag/bag_widget.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
import rospkg

from python_qt_binding import loadUi
from python_qt_binding.QtCore import qDebug, Qt, qWarning, Signal
from python_qt_binding.QtCore import qDebug, Qt, qWarning, Signal, QFileInfo
from python_qt_binding.QtGui import QIcon
from python_qt_binding.QtWidgets import QFileDialog, QGraphicsView, QWidget

Expand All @@ -60,6 +60,7 @@ class BagWidget(QWidget):
Handles all widget callbacks and contains the instance of BagTimeline for storing visualizing bag data
"""

last_open_dir = ""
set_status_text = Signal(str)

def __init__(self, context, publish_clock):
Expand Down Expand Up @@ -94,6 +95,7 @@ def __init__(self, context, publish_clock):
self.thumbs_button.setIcon(QIcon.fromTheme('insert-image'))
self.record_button.setIcon(QIcon.fromTheme('media-record'))
self.load_button.setIcon(QIcon.fromTheme('document-open'))
self.clear_timeline_button.setIcon(QIcon.fromTheme('edit-clear'))
self.save_button.setIcon(QIcon.fromTheme('document-save'))

self.play_button.clicked[bool].connect(self._handle_play_clicked)
Expand All @@ -109,6 +111,7 @@ def __init__(self, context, publish_clock):
self.end_button.clicked[bool].connect(self._handle_end_clicked)
self.record_button.clicked[bool].connect(self._handle_record_clicked)
self.load_button.clicked[bool].connect(self._handle_load_clicked)
self.clear_timeline_button.clicked[bool].connect(self._handle_clear_timeline_clicked)
self.save_button.clicked[bool].connect(self._handle_save_clicked)
self.graphics_view.mousePressEvent = self._timeline.on_mouse_down
self.graphics_view.mouseReleaseEvent = self._timeline.on_mouse_up
Expand Down Expand Up @@ -263,15 +266,36 @@ def _on_record_settings_selected(self, all_topics, selected_topics):
rospy.loginfo('Recording to %s.' % record_filename)

self.load_button.setEnabled(False)
self.load_clear_button.setEnabled(False)
self._recording = True
self._timeline.record_bag(record_filename, all_topics, selected_topics)

def _handle_load_clicked(self):
filenames = QFileDialog.getOpenFileNames(
self, self.tr('Load from Files'), '.', self.tr('Bag files {.bag} (*.bag)'))
self, self.tr('Load from Files'), self.last_open_dir, self.tr('Bag files {.bag} (*.bag)'))
if len(filenames) is not 0 and len(filenames[0]) is not 0:
self.last_open_dir = QFileInfo(filenames[0][0]).absoluteDir().absolutePath()
for filename in filenames[0]:
self.load_bag(filename)

def _handle_clear_timeline_clicked(self):
self._timeline.clear()
self.play_button.setEnabled(False)
self.thumbs_button.setEnabled(False)
self.zoom_in_button.setEnabled(False)
self.zoom_out_button.setEnabled(False)
self.zoom_all_button.setEnabled(False)
self.next_button.setEnabled(False)
self.previous_button.setEnabled(False)
self.faster_button.setEnabled(False)
self.slower_button.setEnabled(False)
self.begin_button.setEnabled(False)
self.end_button.setEnabled(False)
self.save_button.setEnabled(False)
self.record_button.setEnabled(True)
self.set_status_text.emit("Timeline cleared")
# FIXME Does something else needs to be done?

def load_bag(self, filename):
qDebug("Loading '%s'..." % filename.encode(errors='replace'))

Expand Down