From c5c1a0cba5f3f03bac7b88655c01da7c42d4d3fe Mon Sep 17 00:00:00 2001 From: castany Date: Sun, 25 Mar 2018 17:50:40 +0200 Subject: [PATCH] Change hardcoded brackets for Toolbar message Remove the brackets that were harcoded in methods NavigationToolbar2.mouse_move() and ToolCursorPosition.send_message(). Move them rather to the method Artist.format_cursor_data(), because that method that can easily be overwritten. --- lib/matplotlib/artist.py | 5 +++-- lib/matplotlib/backend_bases.py | 4 +++- lib/matplotlib/backend_tools.py | 4 +++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/matplotlib/artist.py b/lib/matplotlib/artist.py index 6296d0b29cc6..55a57cbbe4b0 100644 --- a/lib/matplotlib/artist.py +++ b/lib/matplotlib/artist.py @@ -1059,8 +1059,9 @@ def format_cursor_data(self, data): data[0] except (TypeError, IndexError): data = [data] - return ', '.join('{:0.3g}'.format(item) for item in data if - isinstance(item, (np.floating, np.integer, int, float))) + data_str = ', '.join('{:0.3g}'.format(item) for item in data if + isinstance(item, (np.floating, np.integer, int, float))) + return "[" + data_str + "]" @property def mouseover(self): diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py index 97af9477e74e..e47e04eff8cc 100644 --- a/lib/matplotlib/backend_bases.py +++ b/lib/matplotlib/backend_bases.py @@ -2898,7 +2898,9 @@ def mouse_move(self, event): if a is not event.inaxes.patch: data = a.get_cursor_data(event) if data is not None: - s += ' [%s]' % a.format_cursor_data(data) + data_str = a.format_cursor_data(data) + if data_str is not None: + s = s + ' ' + data_str if len(self.mode): self.set_message('%s, %s' % (self.mode, s)) diff --git a/lib/matplotlib/backend_tools.py b/lib/matplotlib/backend_tools.py index 415fe8442b47..3f7c3d2f8ec7 100644 --- a/lib/matplotlib/backend_tools.py +++ b/lib/matplotlib/backend_tools.py @@ -344,7 +344,9 @@ def send_message(self, event): if a is not event.inaxes.patch: data = a.get_cursor_data(event) if data is not None: - s += ' [%s]' % a.format_cursor_data(data) + data_str = a.format_cursor_data(data) + if data_str is not None: + s = s + ' ' + data_str message = s self.toolmanager.message_event(message, self)