Update ros-visualization#1 2019/02/07

haraisao · Feb 6, 2019 · 7d0afde · 7d0afde
1 parent 461fee7
commit 7d0afde
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/rqt_console/console_widget.py b/src/rqt_console/console_widget.py
@@ -114,22 +114,22 @@ def update_sort_indicator(logical_index, order):
         icon_dir = os.path.join(self._rospack.get_path('rqt_gui'), 'resource', 'icons')
         self.add_exclude_button.setIcon(QIcon.fromTheme('list-add', QIcon(QPixmap(os.path.join(icon_dir, 'list-add.png')))))
         self.add_highlight_button.setIcon(QIcon.fromTheme('list-add', QIcon(QPixmap(os.path.join(icon_dir, 'list-add.png')))))
-        self.pause_button.setIcon(QIcon.fromTheme('media-playback-pause', QIcon(QPixmap(os.path.join(icon_dir, 'media-playback-pause.png'))))
+        self.pause_button.setIcon(QIcon.fromTheme('media-playback-pause', QIcon(QPixmap(os.path.join(icon_dir, 'media-playback-pause.png')))))
         if not self.pause_button.icon().isNull():
             self.pause_button.setText('')
-        self.record_button.setIcon(QIcon.fromTheme('media-record', QIcon(QPixmap(os.path.join(icon_dir, 'media-record.png'))))
+        self.record_button.setIcon(QIcon.fromTheme('media-record', QIcon(QPixmap(os.path.join(icon_dir, 'media-record.png')))))
         if not self.record_button.icon().isNull():
             self.record_button.setText('')
-        self.load_button.setIcon(QIcon.fromTheme('document-open', QIcon(QPixmap(os.path.join(icon_dir, 'document-open.png'))))
+        self.load_button.setIcon(QIcon.fromTheme('document-open', QIcon(QPixmap(os.path.join(icon_dir, 'document-open.png')))))
         if not self.load_button.icon().isNull():
             self.load_button.setText('')
-        self.save_button.setIcon(QIcon.fromTheme('document-save', QIcon(QPixmap(os.path.join(icon_dir, 'document-save.png'))))
+        self.save_button.setIcon(QIcon.fromTheme('document-save', QIcon(QPixmap(os.path.join(icon_dir, 'document-save.png')))))
         if not self.save_button.icon().isNull():
             self.save_button.setText('')
-        self.clear_button.setIcon(QIcon.fromTheme('edit-clear', QIcon(QPixmap(os.path.join(icon_dir, 'edit-clear.png'))))
+        self.clear_button.setIcon(QIcon.fromTheme('edit-clear', QIcon(QPixmap(os.path.join(icon_dir, 'edit-clear.png')))))
         if not self.clear_button.icon().isNull():
             self.clear_button.setText('')
-        self.highlight_exclude_button.setIcon(QIcon.fromTheme('format-text-strikethrough', QIcon(QPixmap(os.path.join(icon_dir, 'format-text-strikethrough.png'))))
+        self.highlight_exclude_button.setIcon(QIcon.fromTheme('format-text-strikethrough', QIcon(QPixmap(os.path.join(icon_dir, 'format-text-strikethrough.png')))))
 
         self.pause_button.clicked[bool].connect(self._handle_pause_clicked)
         self.record_button.clicked[bool].connect(self._handle_record_clicked)

diff --git a/src/rqt_console/message_data_model.py b/src/rqt_console/message_data_model.py
@@ -29,6 +29,7 @@
 # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
 # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
+import os
 import rospkg
 
 from python_qt_binding.QtCore import QAbstractTableModel, QModelIndex, Qt, qWarning